diff --git a/admin/themes/default/fonts/FontAwesome.otf b/admin/themes/default/fonts/FontAwesome.otf index f7936cc1e..401ec0f36 100644 Binary files a/admin/themes/default/fonts/FontAwesome.otf and b/admin/themes/default/fonts/FontAwesome.otf differ diff --git a/admin/themes/default/fonts/fontawesome-webfont.eot b/admin/themes/default/fonts/fontawesome-webfont.eot index 33b2bb800..e9f60ca95 100644 Binary files a/admin/themes/default/fonts/fontawesome-webfont.eot and b/admin/themes/default/fonts/fontawesome-webfont.eot differ diff --git a/admin/themes/default/fonts/fontawesome-webfont.svg b/admin/themes/default/fonts/fontawesome-webfont.svg index 1ee89d436..855c845e5 100644 --- a/admin/themes/default/fonts/fontawesome-webfont.svg +++ b/admin/themes/default/fonts/fontawesome-webfont.svg @@ -1,565 +1,2671 @@ - - + + +Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016 + By ,,, +Copyright Dave Gandy 2016. All rights reserved. + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/admin/themes/default/fonts/fontawesome-webfont.ttf b/admin/themes/default/fonts/fontawesome-webfont.ttf index ed9372f8e..35acda2fa 100644 Binary files a/admin/themes/default/fonts/fontawesome-webfont.ttf and b/admin/themes/default/fonts/fontawesome-webfont.ttf differ diff --git a/admin/themes/default/fonts/fontawesome-webfont.woff b/admin/themes/default/fonts/fontawesome-webfont.woff index 8b280b98f..400014a4b 100644 Binary files a/admin/themes/default/fonts/fontawesome-webfont.woff and b/admin/themes/default/fonts/fontawesome-webfont.woff differ diff --git a/admin/themes/default/fonts/fontawesome-webfont.woff2 b/admin/themes/default/fonts/fontawesome-webfont.woff2 index 3311d5851..4d13fc604 100644 Binary files a/admin/themes/default/fonts/fontawesome-webfont.woff2 and b/admin/themes/default/fonts/fontawesome-webfont.woff2 differ diff --git a/admin/themes/default/sass/admin-theme.sass b/admin/themes/default/sass/admin-theme.sass index 33b4084b0..1bbbcebb8 100644 --- a/admin/themes/default/sass/admin-theme.sass +++ b/admin/themes/default/sass/admin-theme.sass @@ -1,8 +1,5 @@ // Make sure the charset is set appropriately @charset "UTF-8" -//Compass is required to pre-compile this stylesheets to .css -@import "compass" - @import "modules/colors" @import "modules/variables" @import "modules/mixins" @@ -108,6 +105,8 @@ @import "partials/select2" @import "partials/ndv3" +@import "partials/tooltip" + //Backward compatibility @import "partials/backward" diff --git a/admin/themes/default/sass/admin-theme_rtl.sass b/admin/themes/default/sass/admin-theme_rtl.sass index 712d08aa9..63af964be 100644 --- a/admin/themes/default/sass/admin-theme_rtl.sass +++ b/admin/themes/default/sass/admin-theme_rtl.sass @@ -112,6 +112,8 @@ //RTL @import "partials/rtl" +@import "partials/tooltip" + //Backward compatibility @import "partials/backward" diff --git a/admin/themes/default/sass/modules/_mixins.sass b/admin/themes/default/sass/modules/_mixins.sass index 6d0a3215f..6c3a2bd48 100644 --- a/admin/themes/default/sass/modules/_mixins.sass +++ b/admin/themes/default/sass/modules/_mixins.sass @@ -14,3 +14,41 @@ i font-size: $size/3*2 line-height: $size + +// Vendor-prefix helper (replaces Compass experimental mixin) +@mixin experimental($property, $value) + -webkit-#{$property}: $value + -moz-#{$property}: $value + -ms-#{$property}: $value + #{$property}: $value + +// Returns $dark or $light based on $color luminance (replaces Compass contrast-color) +@function contrast-color($color, $dark, $light) + @if lightness($color) > 50% + @return $dark + @else + @return $light + +// Opacity with IE filter fallback +@mixin opacity($value) + opacity: $value + filter: alpha(opacity=#{$value * 100}) + +// Text shadow +@mixin text-shadow($values...) + text-shadow: $values + +// Transform with vendor prefixes +@mixin transform($values...) + -webkit-transform: $values + -ms-transform: $values + transform: $values + +// Transform style with vendor prefix +@mixin transform-style($value: preserve-3d) + -webkit-transform-style: $value + transform-style: $value + +// Background image wrapper +@mixin background-image($values...) + background-image: $values diff --git a/admin/themes/default/sass/partials/_footer.sass b/admin/themes/default/sass/partials/_footer.sass index 766181922..f396a519f 100644 --- a/admin/themes/default/sass/partials/_footer.sass +++ b/admin/themes/default/sass/partials/_footer.sass @@ -66,6 +66,12 @@ a.link-social text-decoration: none .link-twitter i + color: #FFFFFF + background-color: #000000 + &:hover + color: #000000 + background-color: #FFFFFF +.link-twitter-classic i color: white background-color: #7CCEEF &:hover diff --git a/admin/themes/default/sass/partials/_icons.sass b/admin/themes/default/sass/partials/_icons.sass index 4c6454e8c..7855cecd4 100644 --- a/admin/themes/default/sass/partials/_icons.sass +++ b/admin/themes/default/sass/partials/_icons.sass @@ -449,3 +449,14 @@ @extend .icon-mail-reply .process-icon-lock @extend .icon-lock + +$icon-x-twitter-svg: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'%3E%3Cpath d='M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z'/%3E%3C/svg%3E" +.icon-twitter + &:before + background-color: currentColor + -webkit-mask: url($icon-x-twitter-svg) center / contain no-repeat + mask: url($icon-x-twitter-svg) center / contain no-repeat + +.icon-twitter-classic + &:before + content: $fa-var-twitter diff --git a/admin/themes/default/sass/partials/_tooltip.sass b/admin/themes/default/sass/partials/_tooltip.sass new file mode 100644 index 000000000..986d49667 --- /dev/null +++ b/admin/themes/default/sass/partials/_tooltip.sass @@ -0,0 +1,30 @@ +.tooltip_cont + min-width: 280px + width: 100% + font-size: 14px + font-weight: 600 + .tip_header + margin-bottom: 10px + .tip-body > div + margin-bottom: 6px + +.tip_element_head + font-size: 12px + +.tip_element_value + font-size: 14px + font-weight: 400 + opacity: 0.8 + +.tip-body + display: grid + grid-template-columns: auto auto + &.tip-body-grid + grid-template-columns: 1fr 1fr + gap: 8px 16px + +.ui-tooltip, +.ui-tooltip.ui-widget-content + border: none + padding: 10px + box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, 0.15) diff --git a/admin/themes/default/sass/vendor/font-awesome/_bordered-pulled.scss b/admin/themes/default/sass/vendor/font-awesome/_bordered-pulled.scss index 9d3fdf3a0..d4b85a02f 100644 --- a/admin/themes/default/sass/vendor/font-awesome/_bordered-pulled.scss +++ b/admin/themes/default/sass/vendor/font-awesome/_bordered-pulled.scss @@ -7,6 +7,15 @@ border-radius: .1em; } +.#{$fa-css-prefix}-pull-left { float: left; } +.#{$fa-css-prefix}-pull-right { float: right; } + +.#{$fa-css-prefix} { + &.#{$fa-css-prefix}-pull-left { margin-right: .3em; } + &.#{$fa-css-prefix}-pull-right { margin-left: .3em; } +} + +/* Deprecated as of 4.4.0 */ .pull-right { float: right; } .pull-left { float: left; } diff --git a/admin/themes/default/sass/vendor/font-awesome/_core.scss b/admin/themes/default/sass/vendor/font-awesome/_core.scss index 5a2db9d56..7425ef85f 100644 --- a/admin/themes/default/sass/vendor/font-awesome/_core.scss +++ b/admin/themes/default/sass/vendor/font-awesome/_core.scss @@ -3,11 +3,10 @@ .#{$fa-css-prefix} { display: inline-block; - font: normal normal normal #{$fa-font-size-base}/1 FontAwesome; // shortening font declaration + font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base} FontAwesome; // shortening font declaration font-size: inherit; // can't have font-size inherit on line above, so need to override text-rendering: auto; // optimizelegibility throws things off #1094 -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - transform: translate(0, 0); // ensures no half-pixel rendering in firefox } diff --git a/admin/themes/default/sass/vendor/font-awesome/_icons.scss b/admin/themes/default/sass/vendor/font-awesome/_icons.scss index fbcfe8123..e63e702c4 100644 --- a/admin/themes/default/sass/vendor/font-awesome/_icons.scss +++ b/admin/themes/default/sass/vendor/font-awesome/_icons.scss @@ -163,6 +163,7 @@ .#{$fa-css-prefix}-github:before { content: $fa-var-github; } .#{$fa-css-prefix}-unlock:before { content: $fa-var-unlock; } .#{$fa-css-prefix}-credit-card:before { content: $fa-var-credit-card; } +.#{$fa-css-prefix}-feed:before, .#{$fa-css-prefix}-rss:before { content: $fa-var-rss; } .#{$fa-css-prefix}-hdd-o:before { content: $fa-var-hdd-o; } .#{$fa-css-prefix}-bullhorn:before { content: $fa-var-bullhorn; } @@ -437,7 +438,7 @@ .#{$fa-css-prefix}-stumbleupon:before { content: $fa-var-stumbleupon; } .#{$fa-css-prefix}-delicious:before { content: $fa-var-delicious; } .#{$fa-css-prefix}-digg:before { content: $fa-var-digg; } -.#{$fa-css-prefix}-pied-piper:before { content: $fa-var-pied-piper; } +.#{$fa-css-prefix}-pied-piper-pp:before { content: $fa-var-pied-piper-pp; } .#{$fa-css-prefix}-pied-piper-alt:before { content: $fa-var-pied-piper-alt; } .#{$fa-css-prefix}-drupal:before { content: $fa-var-drupal; } .#{$fa-css-prefix}-joomla:before { content: $fa-var-joomla; } @@ -487,11 +488,14 @@ .#{$fa-css-prefix}-life-ring:before { content: $fa-var-life-ring; } .#{$fa-css-prefix}-circle-o-notch:before { content: $fa-var-circle-o-notch; } .#{$fa-css-prefix}-ra:before, +.#{$fa-css-prefix}-resistance:before, .#{$fa-css-prefix}-rebel:before { content: $fa-var-rebel; } .#{$fa-css-prefix}-ge:before, .#{$fa-css-prefix}-empire:before { content: $fa-var-empire; } .#{$fa-css-prefix}-git-square:before { content: $fa-var-git-square; } .#{$fa-css-prefix}-git:before { content: $fa-var-git; } +.#{$fa-css-prefix}-y-combinator-square:before, +.#{$fa-css-prefix}-yc-square:before, .#{$fa-css-prefix}-hacker-news:before { content: $fa-var-hacker-news; } .#{$fa-css-prefix}-tencent-weibo:before { content: $fa-var-tencent-weibo; } .#{$fa-css-prefix}-qq:before { content: $fa-var-qq; } @@ -502,7 +506,6 @@ .#{$fa-css-prefix}-send-o:before, .#{$fa-css-prefix}-paper-plane-o:before { content: $fa-var-paper-plane-o; } .#{$fa-css-prefix}-history:before { content: $fa-var-history; } -.#{$fa-css-prefix}-genderless:before, .#{$fa-css-prefix}-circle-thin:before { content: $fa-var-circle-thin; } .#{$fa-css-prefix}-header:before { content: $fa-var-header; } .#{$fa-css-prefix}-paragraph:before { content: $fa-var-paragraph; } @@ -573,6 +576,7 @@ .#{$fa-css-prefix}-venus:before { content: $fa-var-venus; } .#{$fa-css-prefix}-mars:before { content: $fa-var-mars; } .#{$fa-css-prefix}-mercury:before { content: $fa-var-mercury; } +.#{$fa-css-prefix}-intersex:before, .#{$fa-css-prefix}-transgender:before { content: $fa-var-transgender; } .#{$fa-css-prefix}-transgender-alt:before { content: $fa-var-transgender-alt; } .#{$fa-css-prefix}-venus-double:before { content: $fa-var-venus-double; } @@ -582,6 +586,7 @@ .#{$fa-css-prefix}-mars-stroke-v:before { content: $fa-var-mars-stroke-v; } .#{$fa-css-prefix}-mars-stroke-h:before { content: $fa-var-mars-stroke-h; } .#{$fa-css-prefix}-neuter:before { content: $fa-var-neuter; } +.#{$fa-css-prefix}-genderless:before { content: $fa-var-genderless; } .#{$fa-css-prefix}-facebook-official:before { content: $fa-var-facebook-official; } .#{$fa-css-prefix}-pinterest-p:before { content: $fa-var-pinterest-p; } .#{$fa-css-prefix}-whatsapp:before { content: $fa-var-whatsapp; } @@ -594,3 +599,191 @@ .#{$fa-css-prefix}-train:before { content: $fa-var-train; } .#{$fa-css-prefix}-subway:before { content: $fa-var-subway; } .#{$fa-css-prefix}-medium:before { content: $fa-var-medium; } +.#{$fa-css-prefix}-yc:before, +.#{$fa-css-prefix}-y-combinator:before { content: $fa-var-y-combinator; } +.#{$fa-css-prefix}-optin-monster:before { content: $fa-var-optin-monster; } +.#{$fa-css-prefix}-opencart:before { content: $fa-var-opencart; } +.#{$fa-css-prefix}-expeditedssl:before { content: $fa-var-expeditedssl; } +.#{$fa-css-prefix}-battery-4:before, +.#{$fa-css-prefix}-battery:before, +.#{$fa-css-prefix}-battery-full:before { content: $fa-var-battery-full; } +.#{$fa-css-prefix}-battery-3:before, +.#{$fa-css-prefix}-battery-three-quarters:before { content: $fa-var-battery-three-quarters; } +.#{$fa-css-prefix}-battery-2:before, +.#{$fa-css-prefix}-battery-half:before { content: $fa-var-battery-half; } +.#{$fa-css-prefix}-battery-1:before, +.#{$fa-css-prefix}-battery-quarter:before { content: $fa-var-battery-quarter; } +.#{$fa-css-prefix}-battery-0:before, +.#{$fa-css-prefix}-battery-empty:before { content: $fa-var-battery-empty; } +.#{$fa-css-prefix}-mouse-pointer:before { content: $fa-var-mouse-pointer; } +.#{$fa-css-prefix}-i-cursor:before { content: $fa-var-i-cursor; } +.#{$fa-css-prefix}-object-group:before { content: $fa-var-object-group; } +.#{$fa-css-prefix}-object-ungroup:before { content: $fa-var-object-ungroup; } +.#{$fa-css-prefix}-sticky-note:before { content: $fa-var-sticky-note; } +.#{$fa-css-prefix}-sticky-note-o:before { content: $fa-var-sticky-note-o; } +.#{$fa-css-prefix}-cc-jcb:before { content: $fa-var-cc-jcb; } +.#{$fa-css-prefix}-cc-diners-club:before { content: $fa-var-cc-diners-club; } +.#{$fa-css-prefix}-clone:before { content: $fa-var-clone; } +.#{$fa-css-prefix}-balance-scale:before { content: $fa-var-balance-scale; } +.#{$fa-css-prefix}-hourglass-o:before { content: $fa-var-hourglass-o; } +.#{$fa-css-prefix}-hourglass-1:before, +.#{$fa-css-prefix}-hourglass-start:before { content: $fa-var-hourglass-start; } +.#{$fa-css-prefix}-hourglass-2:before, +.#{$fa-css-prefix}-hourglass-half:before { content: $fa-var-hourglass-half; } +.#{$fa-css-prefix}-hourglass-3:before, +.#{$fa-css-prefix}-hourglass-end:before { content: $fa-var-hourglass-end; } +.#{$fa-css-prefix}-hourglass:before { content: $fa-var-hourglass; } +.#{$fa-css-prefix}-hand-grab-o:before, +.#{$fa-css-prefix}-hand-rock-o:before { content: $fa-var-hand-rock-o; } +.#{$fa-css-prefix}-hand-stop-o:before, +.#{$fa-css-prefix}-hand-paper-o:before { content: $fa-var-hand-paper-o; } +.#{$fa-css-prefix}-hand-scissors-o:before { content: $fa-var-hand-scissors-o; } +.#{$fa-css-prefix}-hand-lizard-o:before { content: $fa-var-hand-lizard-o; } +.#{$fa-css-prefix}-hand-spock-o:before { content: $fa-var-hand-spock-o; } +.#{$fa-css-prefix}-hand-pointer-o:before { content: $fa-var-hand-pointer-o; } +.#{$fa-css-prefix}-hand-peace-o:before { content: $fa-var-hand-peace-o; } +.#{$fa-css-prefix}-trademark:before { content: $fa-var-trademark; } +.#{$fa-css-prefix}-registered:before { content: $fa-var-registered; } +.#{$fa-css-prefix}-creative-commons:before { content: $fa-var-creative-commons; } +.#{$fa-css-prefix}-gg:before { content: $fa-var-gg; } +.#{$fa-css-prefix}-gg-circle:before { content: $fa-var-gg-circle; } +.#{$fa-css-prefix}-tripadvisor:before { content: $fa-var-tripadvisor; } +.#{$fa-css-prefix}-odnoklassniki:before { content: $fa-var-odnoklassniki; } +.#{$fa-css-prefix}-odnoklassniki-square:before { content: $fa-var-odnoklassniki-square; } +.#{$fa-css-prefix}-get-pocket:before { content: $fa-var-get-pocket; } +.#{$fa-css-prefix}-wikipedia-w:before { content: $fa-var-wikipedia-w; } +.#{$fa-css-prefix}-safari:before { content: $fa-var-safari; } +.#{$fa-css-prefix}-chrome:before { content: $fa-var-chrome; } +.#{$fa-css-prefix}-firefox:before { content: $fa-var-firefox; } +.#{$fa-css-prefix}-opera:before { content: $fa-var-opera; } +.#{$fa-css-prefix}-internet-explorer:before { content: $fa-var-internet-explorer; } +.#{$fa-css-prefix}-tv:before, +.#{$fa-css-prefix}-television:before { content: $fa-var-television; } +.#{$fa-css-prefix}-contao:before { content: $fa-var-contao; } +.#{$fa-css-prefix}-500px:before { content: $fa-var-500px; } +.#{$fa-css-prefix}-amazon:before { content: $fa-var-amazon; } +.#{$fa-css-prefix}-calendar-plus-o:before { content: $fa-var-calendar-plus-o; } +.#{$fa-css-prefix}-calendar-minus-o:before { content: $fa-var-calendar-minus-o; } +.#{$fa-css-prefix}-calendar-times-o:before { content: $fa-var-calendar-times-o; } +.#{$fa-css-prefix}-calendar-check-o:before { content: $fa-var-calendar-check-o; } +.#{$fa-css-prefix}-industry:before { content: $fa-var-industry; } +.#{$fa-css-prefix}-map-pin:before { content: $fa-var-map-pin; } +.#{$fa-css-prefix}-map-signs:before { content: $fa-var-map-signs; } +.#{$fa-css-prefix}-map-o:before { content: $fa-var-map-o; } +.#{$fa-css-prefix}-map:before { content: $fa-var-map; } +.#{$fa-css-prefix}-commenting:before { content: $fa-var-commenting; } +.#{$fa-css-prefix}-commenting-o:before { content: $fa-var-commenting-o; } +.#{$fa-css-prefix}-houzz:before { content: $fa-var-houzz; } +.#{$fa-css-prefix}-vimeo:before { content: $fa-var-vimeo; } +.#{$fa-css-prefix}-black-tie:before { content: $fa-var-black-tie; } +.#{$fa-css-prefix}-fonticons:before { content: $fa-var-fonticons; } +.#{$fa-css-prefix}-reddit-alien:before { content: $fa-var-reddit-alien; } +.#{$fa-css-prefix}-edge:before { content: $fa-var-edge; } +.#{$fa-css-prefix}-credit-card-alt:before { content: $fa-var-credit-card-alt; } +.#{$fa-css-prefix}-codiepie:before { content: $fa-var-codiepie; } +.#{$fa-css-prefix}-modx:before { content: $fa-var-modx; } +.#{$fa-css-prefix}-fort-awesome:before { content: $fa-var-fort-awesome; } +.#{$fa-css-prefix}-usb:before { content: $fa-var-usb; } +.#{$fa-css-prefix}-product-hunt:before { content: $fa-var-product-hunt; } +.#{$fa-css-prefix}-mixcloud:before { content: $fa-var-mixcloud; } +.#{$fa-css-prefix}-scribd:before { content: $fa-var-scribd; } +.#{$fa-css-prefix}-pause-circle:before { content: $fa-var-pause-circle; } +.#{$fa-css-prefix}-pause-circle-o:before { content: $fa-var-pause-circle-o; } +.#{$fa-css-prefix}-stop-circle:before { content: $fa-var-stop-circle; } +.#{$fa-css-prefix}-stop-circle-o:before { content: $fa-var-stop-circle-o; } +.#{$fa-css-prefix}-shopping-bag:before { content: $fa-var-shopping-bag; } +.#{$fa-css-prefix}-shopping-basket:before { content: $fa-var-shopping-basket; } +.#{$fa-css-prefix}-hashtag:before { content: $fa-var-hashtag; } +.#{$fa-css-prefix}-bluetooth:before { content: $fa-var-bluetooth; } +.#{$fa-css-prefix}-bluetooth-b:before { content: $fa-var-bluetooth-b; } +.#{$fa-css-prefix}-percent:before { content: $fa-var-percent; } +.#{$fa-css-prefix}-gitlab:before { content: $fa-var-gitlab; } +.#{$fa-css-prefix}-wpbeginner:before { content: $fa-var-wpbeginner; } +.#{$fa-css-prefix}-wpforms:before { content: $fa-var-wpforms; } +.#{$fa-css-prefix}-envira:before { content: $fa-var-envira; } +.#{$fa-css-prefix}-universal-access:before { content: $fa-var-universal-access; } +.#{$fa-css-prefix}-wheelchair-alt:before { content: $fa-var-wheelchair-alt; } +.#{$fa-css-prefix}-question-circle-o:before { content: $fa-var-question-circle-o; } +.#{$fa-css-prefix}-blind:before { content: $fa-var-blind; } +.#{$fa-css-prefix}-audio-description:before { content: $fa-var-audio-description; } +.#{$fa-css-prefix}-volume-control-phone:before { content: $fa-var-volume-control-phone; } +.#{$fa-css-prefix}-braille:before { content: $fa-var-braille; } +.#{$fa-css-prefix}-assistive-listening-systems:before { content: $fa-var-assistive-listening-systems; } +.#{$fa-css-prefix}-asl-interpreting:before, +.#{$fa-css-prefix}-american-sign-language-interpreting:before { content: $fa-var-american-sign-language-interpreting; } +.#{$fa-css-prefix}-deafness:before, +.#{$fa-css-prefix}-hard-of-hearing:before, +.#{$fa-css-prefix}-deaf:before { content: $fa-var-deaf; } +.#{$fa-css-prefix}-glide:before { content: $fa-var-glide; } +.#{$fa-css-prefix}-glide-g:before { content: $fa-var-glide-g; } +.#{$fa-css-prefix}-signing:before, +.#{$fa-css-prefix}-sign-language:before { content: $fa-var-sign-language; } +.#{$fa-css-prefix}-low-vision:before { content: $fa-var-low-vision; } +.#{$fa-css-prefix}-viadeo:before { content: $fa-var-viadeo; } +.#{$fa-css-prefix}-viadeo-square:before { content: $fa-var-viadeo-square; } +.#{$fa-css-prefix}-snapchat:before { content: $fa-var-snapchat; } +.#{$fa-css-prefix}-snapchat-ghost:before { content: $fa-var-snapchat-ghost; } +.#{$fa-css-prefix}-snapchat-square:before { content: $fa-var-snapchat-square; } +.#{$fa-css-prefix}-pied-piper:before { content: $fa-var-pied-piper; } +.#{$fa-css-prefix}-first-order:before { content: $fa-var-first-order; } +.#{$fa-css-prefix}-yoast:before { content: $fa-var-yoast; } +.#{$fa-css-prefix}-themeisle:before { content: $fa-var-themeisle; } +.#{$fa-css-prefix}-google-plus-circle:before, +.#{$fa-css-prefix}-google-plus-official:before { content: $fa-var-google-plus-official; } +.#{$fa-css-prefix}-fa:before, +.#{$fa-css-prefix}-font-awesome:before { content: $fa-var-font-awesome; } +.#{$fa-css-prefix}-handshake-o:before { content: $fa-var-handshake-o; } +.#{$fa-css-prefix}-envelope-open:before { content: $fa-var-envelope-open; } +.#{$fa-css-prefix}-envelope-open-o:before { content: $fa-var-envelope-open-o; } +.#{$fa-css-prefix}-linode:before { content: $fa-var-linode; } +.#{$fa-css-prefix}-address-book:before { content: $fa-var-address-book; } +.#{$fa-css-prefix}-address-book-o:before { content: $fa-var-address-book-o; } +.#{$fa-css-prefix}-vcard:before, +.#{$fa-css-prefix}-address-card:before { content: $fa-var-address-card; } +.#{$fa-css-prefix}-vcard-o:before, +.#{$fa-css-prefix}-address-card-o:before { content: $fa-var-address-card-o; } +.#{$fa-css-prefix}-user-circle:before { content: $fa-var-user-circle; } +.#{$fa-css-prefix}-user-circle-o:before { content: $fa-var-user-circle-o; } +.#{$fa-css-prefix}-user-o:before { content: $fa-var-user-o; } +.#{$fa-css-prefix}-id-badge:before { content: $fa-var-id-badge; } +.#{$fa-css-prefix}-drivers-license:before, +.#{$fa-css-prefix}-id-card:before { content: $fa-var-id-card; } +.#{$fa-css-prefix}-drivers-license-o:before, +.#{$fa-css-prefix}-id-card-o:before { content: $fa-var-id-card-o; } +.#{$fa-css-prefix}-quora:before { content: $fa-var-quora; } +.#{$fa-css-prefix}-free-code-camp:before { content: $fa-var-free-code-camp; } +.#{$fa-css-prefix}-telegram:before { content: $fa-var-telegram; } +.#{$fa-css-prefix}-thermometer-4:before, +.#{$fa-css-prefix}-thermometer:before, +.#{$fa-css-prefix}-thermometer-full:before { content: $fa-var-thermometer-full; } +.#{$fa-css-prefix}-thermometer-3:before, +.#{$fa-css-prefix}-thermometer-three-quarters:before { content: $fa-var-thermometer-three-quarters; } +.#{$fa-css-prefix}-thermometer-2:before, +.#{$fa-css-prefix}-thermometer-half:before { content: $fa-var-thermometer-half; } +.#{$fa-css-prefix}-thermometer-1:before, +.#{$fa-css-prefix}-thermometer-quarter:before { content: $fa-var-thermometer-quarter; } +.#{$fa-css-prefix}-thermometer-0:before, +.#{$fa-css-prefix}-thermometer-empty:before { content: $fa-var-thermometer-empty; } +.#{$fa-css-prefix}-shower:before { content: $fa-var-shower; } +.#{$fa-css-prefix}-bathtub:before, +.#{$fa-css-prefix}-s15:before, +.#{$fa-css-prefix}-bath:before { content: $fa-var-bath; } +.#{$fa-css-prefix}-podcast:before { content: $fa-var-podcast; } +.#{$fa-css-prefix}-window-maximize:before { content: $fa-var-window-maximize; } +.#{$fa-css-prefix}-window-minimize:before { content: $fa-var-window-minimize; } +.#{$fa-css-prefix}-window-restore:before { content: $fa-var-window-restore; } +.#{$fa-css-prefix}-times-rectangle:before, +.#{$fa-css-prefix}-window-close:before { content: $fa-var-window-close; } +.#{$fa-css-prefix}-times-rectangle-o:before, +.#{$fa-css-prefix}-window-close-o:before { content: $fa-var-window-close-o; } +.#{$fa-css-prefix}-bandcamp:before { content: $fa-var-bandcamp; } +.#{$fa-css-prefix}-grav:before { content: $fa-var-grav; } +.#{$fa-css-prefix}-etsy:before { content: $fa-var-etsy; } +.#{$fa-css-prefix}-imdb:before { content: $fa-var-imdb; } +.#{$fa-css-prefix}-ravelry:before { content: $fa-var-ravelry; } +.#{$fa-css-prefix}-eercast:before { content: $fa-var-eercast; } +.#{$fa-css-prefix}-microchip:before { content: $fa-var-microchip; } +.#{$fa-css-prefix}-snowflake-o:before { content: $fa-var-snowflake-o; } +.#{$fa-css-prefix}-superpowers:before { content: $fa-var-superpowers; } +.#{$fa-css-prefix}-wpexplorer:before { content: $fa-var-wpexplorer; } +.#{$fa-css-prefix}-meetup:before { content: $fa-var-meetup; } diff --git a/admin/themes/default/sass/vendor/font-awesome/_mixins.scss b/admin/themes/default/sass/vendor/font-awesome/_mixins.scss index 6b7f16093..c3bbd5745 100644 --- a/admin/themes/default/sass/vendor/font-awesome/_mixins.scss +++ b/admin/themes/default/sass/vendor/font-awesome/_mixins.scss @@ -3,25 +3,58 @@ @mixin fa-icon() { display: inline-block; - font: normal normal normal #{$fa-font-size-base}/1 FontAwesome; // shortening font declaration + font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base} FontAwesome; // shortening font declaration font-size: inherit; // can't have font-size inherit on line above, so need to override text-rendering: auto; // optimizelegibility throws things off #1094 -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - transform: translate(0, 0); // ensures no half-pixel rendering in firefox } @mixin fa-icon-rotate($degrees, $rotation) { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}); + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation})"; -webkit-transform: rotate($degrees); -ms-transform: rotate($degrees); transform: rotate($degrees); } @mixin fa-icon-flip($horiz, $vert, $rotation) { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}); + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}, mirror=1)"; -webkit-transform: scale($horiz, $vert); -ms-transform: scale($horiz, $vert); transform: scale($horiz, $vert); } + + +// Only display content to screen readers. A la Bootstrap 4. +// +// See: http://a11yproject.com/posts/how-to-hide-content/ + +@mixin sr-only { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0,0,0,0); + border: 0; +} + +// Use in conjunction with .sr-only to only display content when it's focused. +// +// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1 +// +// Credit: HTML5 Boilerplate + +@mixin sr-only-focusable { + &:active, + &:focus { + position: static; + width: auto; + height: auto; + margin: 0; + overflow: visible; + clip: auto; + } +} diff --git a/admin/themes/default/sass/vendor/font-awesome/_screen-reader.scss b/admin/themes/default/sass/vendor/font-awesome/_screen-reader.scss new file mode 100644 index 000000000..637426f0d --- /dev/null +++ b/admin/themes/default/sass/vendor/font-awesome/_screen-reader.scss @@ -0,0 +1,5 @@ +// Screen Readers +// ------------------------- + +.sr-only { @include sr-only(); } +.sr-only-focusable { @include sr-only-focusable(); } diff --git a/admin/themes/default/sass/vendor/font-awesome/_variables.scss b/admin/themes/default/sass/vendor/font-awesome/_variables.scss index 7778fe14a..05962e26b 100644 --- a/admin/themes/default/sass/vendor/font-awesome/_variables.scss +++ b/admin/themes/default/sass/vendor/font-awesome/_variables.scss @@ -2,22 +2,30 @@ // -------------------------- $fa-font-path: "../fonts" !default; -$img-path: "../img" !default; +$img-path: "../img" !default; $fa-font-size-base: 14px !default; -//$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.3.0/fonts" !default; // for referencing Bootstrap CDN font files directly +$fa-line-height-base: 1 !default; +//$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.7.0/fonts" !default; // for referencing Bootstrap CDN font files directly $fa-css-prefix: fa !default; -$fa-version: "4.3.0" !default; +$fa-version: "4.7.0" !default; $fa-border-color: #eee !default; $fa-inverse: #fff !default; $fa-li-width: (30em / 14) !default; +$fa-var-500px: "\f26e"; +$fa-var-address-book: "\f2b9"; +$fa-var-address-book-o: "\f2ba"; +$fa-var-address-card: "\f2bb"; +$fa-var-address-card-o: "\f2bc"; $fa-var-adjust: "\f042"; $fa-var-adn: "\f170"; $fa-var-align-center: "\f037"; $fa-var-align-justify: "\f039"; $fa-var-align-left: "\f036"; $fa-var-align-right: "\f038"; +$fa-var-amazon: "\f270"; $fa-var-ambulance: "\f0f9"; +$fa-var-american-sign-language-interpreting: "\f2a3"; $fa-var-anchor: "\f13d"; $fa-var-android: "\f17b"; $fa-var-angellist: "\f209"; @@ -48,16 +56,34 @@ $fa-var-arrows: "\f047"; $fa-var-arrows-alt: "\f0b2"; $fa-var-arrows-h: "\f07e"; $fa-var-arrows-v: "\f07d"; +$fa-var-asl-interpreting: "\f2a3"; +$fa-var-assistive-listening-systems: "\f2a2"; $fa-var-asterisk: "\f069"; $fa-var-at: "\f1fa"; +$fa-var-audio-description: "\f29e"; $fa-var-automobile: "\f1b9"; $fa-var-backward: "\f04a"; +$fa-var-balance-scale: "\f24e"; $fa-var-ban: "\f05e"; +$fa-var-bandcamp: "\f2d5"; $fa-var-bank: "\f19c"; $fa-var-bar-chart: "\f080"; $fa-var-bar-chart-o: "\f080"; $fa-var-barcode: "\f02a"; $fa-var-bars: "\f0c9"; +$fa-var-bath: "\f2cd"; +$fa-var-bathtub: "\f2cd"; +$fa-var-battery: "\f240"; +$fa-var-battery-0: "\f244"; +$fa-var-battery-1: "\f243"; +$fa-var-battery-2: "\f242"; +$fa-var-battery-3: "\f241"; +$fa-var-battery-4: "\f240"; +$fa-var-battery-empty: "\f244"; +$fa-var-battery-full: "\f240"; +$fa-var-battery-half: "\f242"; +$fa-var-battery-quarter: "\f243"; +$fa-var-battery-three-quarters: "\f241"; $fa-var-bed: "\f236"; $fa-var-beer: "\f0fc"; $fa-var-behance: "\f1b4"; @@ -72,12 +98,17 @@ $fa-var-birthday-cake: "\f1fd"; $fa-var-bitbucket: "\f171"; $fa-var-bitbucket-square: "\f172"; $fa-var-bitcoin: "\f15a"; +$fa-var-black-tie: "\f27e"; +$fa-var-blind: "\f29d"; +$fa-var-bluetooth: "\f293"; +$fa-var-bluetooth-b: "\f294"; $fa-var-bold: "\f032"; $fa-var-bolt: "\f0e7"; $fa-var-bomb: "\f1e2"; $fa-var-book: "\f02d"; $fa-var-bookmark: "\f02e"; $fa-var-bookmark-o: "\f097"; +$fa-var-braille: "\f2a1"; $fa-var-briefcase: "\f0b1"; $fa-var-btc: "\f15a"; $fa-var-bug: "\f188"; @@ -90,7 +121,11 @@ $fa-var-buysellads: "\f20d"; $fa-var-cab: "\f1ba"; $fa-var-calculator: "\f1ec"; $fa-var-calendar: "\f073"; +$fa-var-calendar-check-o: "\f274"; +$fa-var-calendar-minus-o: "\f272"; $fa-var-calendar-o: "\f133"; +$fa-var-calendar-plus-o: "\f271"; +$fa-var-calendar-times-o: "\f273"; $fa-var-camera: "\f030"; $fa-var-camera-retro: "\f083"; $fa-var-car: "\f1b9"; @@ -106,7 +141,9 @@ $fa-var-cart-arrow-down: "\f218"; $fa-var-cart-plus: "\f217"; $fa-var-cc: "\f20a"; $fa-var-cc-amex: "\f1f3"; +$fa-var-cc-diners-club: "\f24c"; $fa-var-cc-discover: "\f1f2"; +$fa-var-cc-jcb: "\f24b"; $fa-var-cc-mastercard: "\f1f1"; $fa-var-cc-paypal: "\f1f4"; $fa-var-cc-stripe: "\f1f5"; @@ -128,12 +165,14 @@ $fa-var-chevron-left: "\f053"; $fa-var-chevron-right: "\f054"; $fa-var-chevron-up: "\f077"; $fa-var-child: "\f1ae"; +$fa-var-chrome: "\f268"; $fa-var-circle: "\f111"; $fa-var-circle-o: "\f10c"; $fa-var-circle-o-notch: "\f1ce"; $fa-var-circle-thin: "\f1db"; $fa-var-clipboard: "\f0ea"; $fa-var-clock-o: "\f017"; +$fa-var-clone: "\f24d"; $fa-var-close: "\f00d"; $fa-var-cloud: "\f0c2"; $fa-var-cloud-download: "\f0ed"; @@ -142,20 +181,26 @@ $fa-var-cny: "\f157"; $fa-var-code: "\f121"; $fa-var-code-fork: "\f126"; $fa-var-codepen: "\f1cb"; +$fa-var-codiepie: "\f284"; $fa-var-coffee: "\f0f4"; $fa-var-cog: "\f013"; $fa-var-cogs: "\f085"; $fa-var-columns: "\f0db"; $fa-var-comment: "\f075"; $fa-var-comment-o: "\f0e5"; +$fa-var-commenting: "\f27a"; +$fa-var-commenting-o: "\f27b"; $fa-var-comments: "\f086"; $fa-var-comments-o: "\f0e6"; $fa-var-compass: "\f14e"; $fa-var-compress: "\f066"; $fa-var-connectdevelop: "\f20e"; +$fa-var-contao: "\f26d"; $fa-var-copy: "\f0c5"; $fa-var-copyright: "\f1f9"; +$fa-var-creative-commons: "\f25e"; $fa-var-credit-card: "\f09d"; +$fa-var-credit-card-alt: "\f283"; $fa-var-crop: "\f125"; $fa-var-crosshairs: "\f05b"; $fa-var-css3: "\f13c"; @@ -166,6 +211,8 @@ $fa-var-cutlery: "\f0f5"; $fa-var-dashboard: "\f0e4"; $fa-var-dashcube: "\f210"; $fa-var-database: "\f1c0"; +$fa-var-deaf: "\f2a4"; +$fa-var-deafness: "\f2a4"; $fa-var-dedent: "\f03b"; $fa-var-delicious: "\f1a5"; $fa-var-desktop: "\f108"; @@ -176,17 +223,25 @@ $fa-var-dollar: "\f155"; $fa-var-dot-circle-o: "\f192"; $fa-var-download: "\f019"; $fa-var-dribbble: "\f17d"; +$fa-var-drivers-license: "\f2c2"; +$fa-var-drivers-license-o: "\f2c3"; $fa-var-dropbox: "\f16b"; $fa-var-drupal: "\f1a9"; +$fa-var-edge: "\f282"; $fa-var-edit: "\f044"; +$fa-var-eercast: "\f2da"; $fa-var-eject: "\f052"; $fa-var-ellipsis-h: "\f141"; $fa-var-ellipsis-v: "\f142"; $fa-var-empire: "\f1d1"; $fa-var-envelope: "\f0e0"; $fa-var-envelope-o: "\f003"; +$fa-var-envelope-open: "\f2b6"; +$fa-var-envelope-open-o: "\f2b7"; $fa-var-envelope-square: "\f199"; +$fa-var-envira: "\f299"; $fa-var-eraser: "\f12d"; +$fa-var-etsy: "\f2d7"; $fa-var-eur: "\f153"; $fa-var-euro: "\f153"; $fa-var-exchange: "\f0ec"; @@ -194,11 +249,13 @@ $fa-var-exclamation: "\f12a"; $fa-var-exclamation-circle: "\f06a"; $fa-var-exclamation-triangle: "\f071"; $fa-var-expand: "\f065"; +$fa-var-expeditedssl: "\f23e"; $fa-var-external-link: "\f08e"; $fa-var-external-link-square: "\f14c"; $fa-var-eye: "\f06e"; $fa-var-eye-slash: "\f070"; $fa-var-eyedropper: "\f1fb"; +$fa-var-fa: "\f2b4"; $fa-var-facebook: "\f09a"; $fa-var-facebook-f: "\f09a"; $fa-var-facebook-official: "\f230"; @@ -206,6 +263,7 @@ $fa-var-facebook-square: "\f082"; $fa-var-fast-backward: "\f049"; $fa-var-fast-forward: "\f050"; $fa-var-fax: "\f1ac"; +$fa-var-feed: "\f09e"; $fa-var-female: "\f182"; $fa-var-fighter-jet: "\f0fb"; $fa-var-file: "\f15b"; @@ -231,6 +289,8 @@ $fa-var-film: "\f008"; $fa-var-filter: "\f0b0"; $fa-var-fire: "\f06d"; $fa-var-fire-extinguisher: "\f134"; +$fa-var-firefox: "\f269"; +$fa-var-first-order: "\f2b0"; $fa-var-flag: "\f024"; $fa-var-flag-checkered: "\f11e"; $fa-var-flag-o: "\f11d"; @@ -243,9 +303,13 @@ $fa-var-folder-o: "\f114"; $fa-var-folder-open: "\f07c"; $fa-var-folder-open-o: "\f115"; $fa-var-font: "\f031"; +$fa-var-font-awesome: "\f2b4"; +$fa-var-fonticons: "\f280"; +$fa-var-fort-awesome: "\f286"; $fa-var-forumbee: "\f211"; $fa-var-forward: "\f04e"; $fa-var-foursquare: "\f180"; +$fa-var-free-code-camp: "\f2c5"; $fa-var-frown-o: "\f119"; $fa-var-futbol-o: "\f1e3"; $fa-var-gamepad: "\f11b"; @@ -254,29 +318,50 @@ $fa-var-gbp: "\f154"; $fa-var-ge: "\f1d1"; $fa-var-gear: "\f013"; $fa-var-gears: "\f085"; -$fa-var-genderless: "\f1db"; +$fa-var-genderless: "\f22d"; +$fa-var-get-pocket: "\f265"; +$fa-var-gg: "\f260"; +$fa-var-gg-circle: "\f261"; $fa-var-gift: "\f06b"; $fa-var-git: "\f1d3"; $fa-var-git-square: "\f1d2"; $fa-var-github: "\f09b"; $fa-var-github-alt: "\f113"; $fa-var-github-square: "\f092"; +$fa-var-gitlab: "\f296"; $fa-var-gittip: "\f184"; $fa-var-glass: "\f000"; +$fa-var-glide: "\f2a5"; +$fa-var-glide-g: "\f2a6"; $fa-var-globe: "\f0ac"; $fa-var-google: "\f1a0"; $fa-var-google-plus: "\f0d5"; +$fa-var-google-plus-circle: "\f2b3"; +$fa-var-google-plus-official: "\f2b3"; $fa-var-google-plus-square: "\f0d4"; $fa-var-google-wallet: "\f1ee"; $fa-var-graduation-cap: "\f19d"; $fa-var-gratipay: "\f184"; +$fa-var-grav: "\f2d6"; $fa-var-group: "\f0c0"; $fa-var-h-square: "\f0fd"; $fa-var-hacker-news: "\f1d4"; +$fa-var-hand-grab-o: "\f255"; +$fa-var-hand-lizard-o: "\f258"; $fa-var-hand-o-down: "\f0a7"; $fa-var-hand-o-left: "\f0a5"; $fa-var-hand-o-right: "\f0a4"; $fa-var-hand-o-up: "\f0a6"; +$fa-var-hand-paper-o: "\f256"; +$fa-var-hand-peace-o: "\f25b"; +$fa-var-hand-pointer-o: "\f25a"; +$fa-var-hand-rock-o: "\f255"; +$fa-var-hand-scissors-o: "\f257"; +$fa-var-hand-spock-o: "\f259"; +$fa-var-hand-stop-o: "\f256"; +$fa-var-handshake-o: "\f2b5"; +$fa-var-hard-of-hearing: "\f2a4"; +$fa-var-hashtag: "\f292"; $fa-var-hdd-o: "\f0a0"; $fa-var-header: "\f1dc"; $fa-var-headphones: "\f025"; @@ -287,16 +372,33 @@ $fa-var-history: "\f1da"; $fa-var-home: "\f015"; $fa-var-hospital-o: "\f0f8"; $fa-var-hotel: "\f236"; +$fa-var-hourglass: "\f254"; +$fa-var-hourglass-1: "\f251"; +$fa-var-hourglass-2: "\f252"; +$fa-var-hourglass-3: "\f253"; +$fa-var-hourglass-end: "\f253"; +$fa-var-hourglass-half: "\f252"; +$fa-var-hourglass-o: "\f250"; +$fa-var-hourglass-start: "\f251"; +$fa-var-houzz: "\f27c"; $fa-var-html5: "\f13b"; +$fa-var-i-cursor: "\f246"; +$fa-var-id-badge: "\f2c1"; +$fa-var-id-card: "\f2c2"; +$fa-var-id-card-o: "\f2c3"; $fa-var-ils: "\f20b"; $fa-var-image: "\f03e"; +$fa-var-imdb: "\f2d8"; $fa-var-inbox: "\f01c"; $fa-var-indent: "\f03c"; +$fa-var-industry: "\f275"; $fa-var-info: "\f129"; $fa-var-info-circle: "\f05a"; $fa-var-inr: "\f156"; $fa-var-instagram: "\f16d"; $fa-var-institution: "\f19c"; +$fa-var-internet-explorer: "\f26b"; +$fa-var-intersex: "\f224"; $fa-var-ioxhost: "\f208"; $fa-var-italic: "\f033"; $fa-var-joomla: "\f1aa"; @@ -324,6 +426,7 @@ $fa-var-line-chart: "\f201"; $fa-var-link: "\f0c1"; $fa-var-linkedin: "\f0e1"; $fa-var-linkedin-square: "\f08c"; +$fa-var-linode: "\f2b8"; $fa-var-linux: "\f17c"; $fa-var-list: "\f03a"; $fa-var-list-alt: "\f022"; @@ -335,13 +438,18 @@ $fa-var-long-arrow-down: "\f175"; $fa-var-long-arrow-left: "\f177"; $fa-var-long-arrow-right: "\f178"; $fa-var-long-arrow-up: "\f176"; +$fa-var-low-vision: "\f2a8"; $fa-var-magic: "\f0d0"; $fa-var-magnet: "\f076"; $fa-var-mail-forward: "\f064"; $fa-var-mail-reply: "\f112"; $fa-var-mail-reply-all: "\f122"; $fa-var-male: "\f183"; +$fa-var-map: "\f279"; $fa-var-map-marker: "\f041"; +$fa-var-map-o: "\f278"; +$fa-var-map-pin: "\f276"; +$fa-var-map-signs: "\f277"; $fa-var-mars: "\f222"; $fa-var-mars-double: "\f227"; $fa-var-mars-stroke: "\f229"; @@ -351,25 +459,37 @@ $fa-var-maxcdn: "\f136"; $fa-var-meanpath: "\f20c"; $fa-var-medium: "\f23a"; $fa-var-medkit: "\f0fa"; +$fa-var-meetup: "\f2e0"; $fa-var-meh-o: "\f11a"; $fa-var-mercury: "\f223"; +$fa-var-microchip: "\f2db"; $fa-var-microphone: "\f130"; $fa-var-microphone-slash: "\f131"; $fa-var-minus: "\f068"; $fa-var-minus-circle: "\f056"; $fa-var-minus-square: "\f146"; $fa-var-minus-square-o: "\f147"; +$fa-var-mixcloud: "\f289"; $fa-var-mobile: "\f10b"; $fa-var-mobile-phone: "\f10b"; +$fa-var-modx: "\f285"; $fa-var-money: "\f0d6"; $fa-var-moon-o: "\f186"; $fa-var-mortar-board: "\f19d"; $fa-var-motorcycle: "\f21c"; +$fa-var-mouse-pointer: "\f245"; $fa-var-music: "\f001"; $fa-var-navicon: "\f0c9"; $fa-var-neuter: "\f22c"; $fa-var-newspaper-o: "\f1ea"; +$fa-var-object-group: "\f247"; +$fa-var-object-ungroup: "\f248"; +$fa-var-odnoklassniki: "\f263"; +$fa-var-odnoklassniki-square: "\f264"; +$fa-var-opencart: "\f23d"; $fa-var-openid: "\f19b"; +$fa-var-opera: "\f26a"; +$fa-var-optin-monster: "\f23c"; $fa-var-outdent: "\f03b"; $fa-var-pagelines: "\f18c"; $fa-var-paint-brush: "\f1fc"; @@ -379,18 +499,22 @@ $fa-var-paperclip: "\f0c6"; $fa-var-paragraph: "\f1dd"; $fa-var-paste: "\f0ea"; $fa-var-pause: "\f04c"; +$fa-var-pause-circle: "\f28b"; +$fa-var-pause-circle-o: "\f28c"; $fa-var-paw: "\f1b0"; $fa-var-paypal: "\f1ed"; $fa-var-pencil: "\f040"; $fa-var-pencil-square: "\f14b"; $fa-var-pencil-square-o: "\f044"; +$fa-var-percent: "\f295"; $fa-var-phone: "\f095"; $fa-var-phone-square: "\f098"; $fa-var-photo: "\f03e"; $fa-var-picture-o: "\f03e"; $fa-var-pie-chart: "\f200"; -$fa-var-pied-piper: "\f1a7"; +$fa-var-pied-piper: "\f2ae"; $fa-var-pied-piper-alt: "\f1a8"; +$fa-var-pied-piper-pp: "\f1a7"; $fa-var-pinterest: "\f0d2"; $fa-var-pinterest-p: "\f231"; $fa-var-pinterest-square: "\f0d3"; @@ -403,28 +527,36 @@ $fa-var-plus: "\f067"; $fa-var-plus-circle: "\f055"; $fa-var-plus-square: "\f0fe"; $fa-var-plus-square-o: "\f196"; +$fa-var-podcast: "\f2ce"; $fa-var-power-off: "\f011"; $fa-var-print: "\f02f"; +$fa-var-product-hunt: "\f288"; $fa-var-puzzle-piece: "\f12e"; $fa-var-qq: "\f1d6"; $fa-var-qrcode: "\f029"; $fa-var-question: "\f128"; $fa-var-question-circle: "\f059"; +$fa-var-question-circle-o: "\f29c"; +$fa-var-quora: "\f2c4"; $fa-var-quote-left: "\f10d"; $fa-var-quote-right: "\f10e"; $fa-var-ra: "\f1d0"; $fa-var-random: "\f074"; +$fa-var-ravelry: "\f2d9"; $fa-var-rebel: "\f1d0"; $fa-var-recycle: "\f1b8"; $fa-var-reddit: "\f1a1"; +$fa-var-reddit-alien: "\f281"; $fa-var-reddit-square: "\f1a2"; $fa-var-refresh: "\f021"; +$fa-var-registered: "\f25d"; $fa-var-remove: "\f00d"; $fa-var-renren: "\f18b"; $fa-var-reorder: "\f0c9"; $fa-var-repeat: "\f01e"; $fa-var-reply: "\f112"; $fa-var-reply-all: "\f122"; +$fa-var-resistance: "\f1d0"; $fa-var-retweet: "\f079"; $fa-var-rmb: "\f157"; $fa-var-road: "\f018"; @@ -437,8 +569,11 @@ $fa-var-rss-square: "\f143"; $fa-var-rub: "\f158"; $fa-var-ruble: "\f158"; $fa-var-rupee: "\f156"; +$fa-var-s15: "\f2cd"; +$fa-var-safari: "\f267"; $fa-var-save: "\f0c7"; $fa-var-scissors: "\f0c4"; +$fa-var-scribd: "\f28a"; $fa-var-search: "\f002"; $fa-var-search-minus: "\f010"; $fa-var-search-plus: "\f00e"; @@ -456,10 +591,15 @@ $fa-var-sheqel: "\f20b"; $fa-var-shield: "\f132"; $fa-var-ship: "\f21a"; $fa-var-shirtsinbulk: "\f214"; +$fa-var-shopping-bag: "\f290"; +$fa-var-shopping-basket: "\f291"; $fa-var-shopping-cart: "\f07a"; +$fa-var-shower: "\f2cc"; $fa-var-sign-in: "\f090"; +$fa-var-sign-language: "\f2a7"; $fa-var-sign-out: "\f08b"; $fa-var-signal: "\f012"; +$fa-var-signing: "\f2a7"; $fa-var-simplybuilt: "\f215"; $fa-var-sitemap: "\f0e8"; $fa-var-skyatlas: "\f216"; @@ -468,6 +608,10 @@ $fa-var-slack: "\f198"; $fa-var-sliders: "\f1de"; $fa-var-slideshare: "\f1e7"; $fa-var-smile-o: "\f118"; +$fa-var-snapchat: "\f2ab"; +$fa-var-snapchat-ghost: "\f2ac"; +$fa-var-snapchat-square: "\f2ad"; +$fa-var-snowflake-o: "\f2dc"; $fa-var-soccer-ball-o: "\f1e3"; $fa-var-sort: "\f0dc"; $fa-var-sort-alpha-asc: "\f15d"; @@ -500,7 +644,11 @@ $fa-var-steam-square: "\f1b7"; $fa-var-step-backward: "\f048"; $fa-var-step-forward: "\f051"; $fa-var-stethoscope: "\f0f1"; +$fa-var-sticky-note: "\f249"; +$fa-var-sticky-note-o: "\f24a"; $fa-var-stop: "\f04d"; +$fa-var-stop-circle: "\f28d"; +$fa-var-stop-circle-o: "\f28e"; $fa-var-street-view: "\f21d"; $fa-var-strikethrough: "\f0cc"; $fa-var-stumbleupon: "\f1a4"; @@ -509,6 +657,7 @@ $fa-var-subscript: "\f12c"; $fa-var-subway: "\f239"; $fa-var-suitcase: "\f0f2"; $fa-var-sun-o: "\f185"; +$fa-var-superpowers: "\f2dd"; $fa-var-superscript: "\f12b"; $fa-var-support: "\f1cd"; $fa-var-table: "\f0ce"; @@ -518,6 +667,8 @@ $fa-var-tag: "\f02b"; $fa-var-tags: "\f02c"; $fa-var-tasks: "\f0ae"; $fa-var-taxi: "\f1ba"; +$fa-var-telegram: "\f2c6"; +$fa-var-television: "\f26c"; $fa-var-tencent-weibo: "\f1d5"; $fa-var-terminal: "\f120"; $fa-var-text-height: "\f034"; @@ -525,6 +676,18 @@ $fa-var-text-width: "\f035"; $fa-var-th: "\f00a"; $fa-var-th-large: "\f009"; $fa-var-th-list: "\f00b"; +$fa-var-themeisle: "\f2b2"; +$fa-var-thermometer: "\f2c7"; +$fa-var-thermometer-0: "\f2cb"; +$fa-var-thermometer-1: "\f2ca"; +$fa-var-thermometer-2: "\f2c9"; +$fa-var-thermometer-3: "\f2c8"; +$fa-var-thermometer-4: "\f2c7"; +$fa-var-thermometer-empty: "\f2cb"; +$fa-var-thermometer-full: "\f2c7"; +$fa-var-thermometer-half: "\f2c9"; +$fa-var-thermometer-quarter: "\f2ca"; +$fa-var-thermometer-three-quarters: "\f2c8"; $fa-var-thumb-tack: "\f08d"; $fa-var-thumbs-down: "\f165"; $fa-var-thumbs-o-down: "\f088"; @@ -534,6 +697,8 @@ $fa-var-ticket: "\f145"; $fa-var-times: "\f00d"; $fa-var-times-circle: "\f057"; $fa-var-times-circle-o: "\f05c"; +$fa-var-times-rectangle: "\f2d3"; +$fa-var-times-rectangle-o: "\f2d4"; $fa-var-tint: "\f043"; $fa-var-toggle-down: "\f150"; $fa-var-toggle-left: "\f191"; @@ -541,6 +706,7 @@ $fa-var-toggle-off: "\f204"; $fa-var-toggle-on: "\f205"; $fa-var-toggle-right: "\f152"; $fa-var-toggle-up: "\f151"; +$fa-var-trademark: "\f25c"; $fa-var-train: "\f238"; $fa-var-transgender: "\f224"; $fa-var-transgender-alt: "\f225"; @@ -548,6 +714,7 @@ $fa-var-trash: "\f1f8"; $fa-var-trash-o: "\f014"; $fa-var-tree: "\f1bb"; $fa-var-trello: "\f181"; +$fa-var-tripadvisor: "\f262"; $fa-var-trophy: "\f091"; $fa-var-truck: "\f0d1"; $fa-var-try: "\f195"; @@ -555,33 +722,45 @@ $fa-var-tty: "\f1e4"; $fa-var-tumblr: "\f173"; $fa-var-tumblr-square: "\f174"; $fa-var-turkish-lira: "\f195"; +$fa-var-tv: "\f26c"; $fa-var-twitch: "\f1e8"; $fa-var-twitter: "\f099"; $fa-var-twitter-square: "\f081"; $fa-var-umbrella: "\f0e9"; $fa-var-underline: "\f0cd"; $fa-var-undo: "\f0e2"; +$fa-var-universal-access: "\f29a"; $fa-var-university: "\f19c"; $fa-var-unlink: "\f127"; $fa-var-unlock: "\f09c"; $fa-var-unlock-alt: "\f13e"; $fa-var-unsorted: "\f0dc"; $fa-var-upload: "\f093"; +$fa-var-usb: "\f287"; $fa-var-usd: "\f155"; $fa-var-user: "\f007"; +$fa-var-user-circle: "\f2bd"; +$fa-var-user-circle-o: "\f2be"; $fa-var-user-md: "\f0f0"; +$fa-var-user-o: "\f2c0"; $fa-var-user-plus: "\f234"; $fa-var-user-secret: "\f21b"; $fa-var-user-times: "\f235"; $fa-var-users: "\f0c0"; +$fa-var-vcard: "\f2bb"; +$fa-var-vcard-o: "\f2bc"; $fa-var-venus: "\f221"; $fa-var-venus-double: "\f226"; $fa-var-venus-mars: "\f228"; $fa-var-viacoin: "\f237"; +$fa-var-viadeo: "\f2a9"; +$fa-var-viadeo-square: "\f2aa"; $fa-var-video-camera: "\f03d"; +$fa-var-vimeo: "\f27d"; $fa-var-vimeo-square: "\f194"; $fa-var-vine: "\f1ca"; $fa-var-vk: "\f189"; +$fa-var-volume-control-phone: "\f2a0"; $fa-var-volume-down: "\f027"; $fa-var-volume-off: "\f026"; $fa-var-volume-up: "\f028"; @@ -591,16 +770,32 @@ $fa-var-weibo: "\f18a"; $fa-var-weixin: "\f1d7"; $fa-var-whatsapp: "\f232"; $fa-var-wheelchair: "\f193"; +$fa-var-wheelchair-alt: "\f29b"; $fa-var-wifi: "\f1eb"; +$fa-var-wikipedia-w: "\f266"; +$fa-var-window-close: "\f2d3"; +$fa-var-window-close-o: "\f2d4"; +$fa-var-window-maximize: "\f2d0"; +$fa-var-window-minimize: "\f2d1"; +$fa-var-window-restore: "\f2d2"; $fa-var-windows: "\f17a"; $fa-var-won: "\f159"; $fa-var-wordpress: "\f19a"; +$fa-var-wpbeginner: "\f297"; +$fa-var-wpexplorer: "\f2de"; +$fa-var-wpforms: "\f298"; $fa-var-wrench: "\f0ad"; $fa-var-xing: "\f168"; $fa-var-xing-square: "\f169"; +$fa-var-y-combinator: "\f23b"; +$fa-var-y-combinator-square: "\f1d4"; $fa-var-yahoo: "\f19e"; +$fa-var-yc: "\f23b"; +$fa-var-yc-square: "\f1d4"; $fa-var-yelp: "\f1e9"; $fa-var-yen: "\f157"; +$fa-var-yoast: "\f2b1"; $fa-var-youtube: "\f167"; $fa-var-youtube-play: "\f16a"; $fa-var-youtube-square: "\f166"; + diff --git a/admin/themes/default/sass/vendor/font-awesome/font-awesome.scss b/admin/themes/default/sass/vendor/font-awesome/font-awesome.scss index 388ac6b0c..f1c83aaa5 100644 --- a/admin/themes/default/sass/vendor/font-awesome/font-awesome.scss +++ b/admin/themes/default/sass/vendor/font-awesome/font-awesome.scss @@ -1,5 +1,5 @@ /*! - * Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome + * Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) */ @@ -15,3 +15,4 @@ @import "rotated-flipped"; @import "stacked"; @import "icons"; +@import "screen-reader"; diff --git a/admin/themes/default/template/controllers/carts/helpers/view/view.tpl b/admin/themes/default/template/controllers/carts/helpers/view/view.tpl index a57ed0a63..b26103a19 100644 --- a/admin/themes/default/template/controllers/carts/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/carts/helpers/view/view.tpl @@ -26,9 +26,7 @@ {extends file="helpers/view/view.tpl"} {block name="override_tpl"} -
- {$kpi} -
+
diff --git a/admin/themes/default/template/controllers/languages/helpers/form/form.tpl b/admin/themes/default/template/controllers/languages/helpers/form/form.tpl index 8d1dc403e..77baa0e70 100644 --- a/admin/themes/default/template/controllers/languages/helpers/form/form.tpl +++ b/admin/themes/default/template/controllers/languages/helpers/form/form.tpl @@ -69,11 +69,11 @@
{foreach $list.files as $key => $file} {if !file_exists($key)} - + {/if} {$key} {if !file_exists($key)} - + {/if}
{/foreach} diff --git a/admin/themes/default/template/controllers/login/content.tpl b/admin/themes/default/template/controllers/login/content.tpl index e29607c74..687c668f3 100644 --- a/admin/themes/default/template/controllers/login/content.tpl +++ b/admin/themes/default/template/controllers/login/content.tpl @@ -150,9 +150,6 @@ - - -

diff --git a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl index e3405fa99..083021418 100644 --- a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl +++ b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl @@ -51,7 +51,12 @@ {assign var=curr_id value=$cart->id_currency|intval} {foreach from=$cart_detail_data item=data} - {$data.room_num|escape:'html':'UTF-8'} {hook h='displayRoomNumAfter' data=$data type='adminOrder'} + {$data.room_num|escape:'html':'UTF-8'} + {if isset($data['connected_rooms'][$data.id_room])} + {include file="controllers/products/connected-rooms.tpl" htl_connected_rooms=$data['connected_rooms'][$data.id_room]} + {/if} + + {hook h='displayRoomNumAfter' data=$data type='adminOrder'}

{$data.room_type|escape:'html':'UTF-8'}

@@ -130,7 +135,7 @@ {* {displayPrice price=$data.amt_with_qty} *} - {if (isset($data.extra_demands) && $data.extra_demands) || (isset($data.additional_service) && $data.additional_service)} + {if (isset($data.extra_demands) && $data.extra_demands) || (isset($data.additional_service) && $data.additional_service) || (isset($data.selected_services) && $data.selected_services)} {displayPrice price=($data.amt_with_qty + $data.additional_services_auto_add_price + $data.demand_price + $data.additional_service_price)|escape:'html':'UTF-8'} {else} {displayPrice price=$data.amt_with_qty|escape:'html':'UTF-8'} diff --git a/admin/themes/default/template/controllers/orders/_hotel_service_products_table.tpl b/admin/themes/default/template/controllers/orders/_hotel_service_products_table.tpl index 935498f70..3e5b1cc48 100644 --- a/admin/themes/default/template/controllers/orders/_hotel_service_products_table.tpl +++ b/admin/themes/default/template/controllers/orders/_hotel_service_products_table.tpl @@ -117,7 +117,7 @@ {l s='Delete'} {else} -
+
{*
-
-
-
- {/if}
 {l s='Order'} @@ -683,9 +599,11 @@
{/if} {else} + {if $addressAccess['add'] === 1} + {/if} {if $idCurrentAddress}
@@ -1120,7 +1038,7 @@
 {l s='Voucher'} - {if $can_edit && $order->total_paid > 0} + {if $can_edit && $order->total_paid > 0 && $cartRuleAccess['add'] === 1} diff --git a/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl b/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl index 12058bee8..7c94bc5d0 100644 --- a/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl +++ b/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl @@ -43,7 +43,7 @@
- +
{if isset($refundReqBookings) && $refundReqBookings && $data.id|in_array:$refundReqBookings && $data.is_refunded} @@ -55,7 +55,7 @@
- +
{if isset($refundReqBookings) && $refundReqBookings && $data.id|in_array:$refundReqBookings && $data.is_refunded} diff --git a/admin/themes/default/template/controllers/products/configuration.tpl b/admin/themes/default/template/controllers/products/configuration.tpl index 7f0bc0f60..37bd27107 100644 --- a/admin/themes/default/template/controllers/products/configuration.tpl +++ b/admin/themes/default/template/controllers/products/configuration.tpl @@ -67,6 +67,14 @@ + + + {hook h='displayHotelRoomListTableHeaderColumn'} {l s='--'} @@ -108,6 +116,21 @@ {* Since the data can also be used from post incase of errors, which will cause issues with the id index *} + + {if isset($room_info['id'])} + + + + + {if isset($room_info['connected_rooms_count'])}{$room_info['connected_rooms_count']|intval}{else}0{/if} + + + + {/if} + {if isset($room_info['id'])} {hook h='displayHotelRoomListTableRowColumn' index=$key id_room=$room_info['id']} {else} @@ -343,6 +366,7 @@
+ {assign var="connected_room_types" value=[]} + {if isset($htl_connected_rooms[$main_room_id].connected_room_types)} + {assign var="connected_room_types" value=$htl_connected_rooms[$main_room_id].connected_room_types} + {/if} + +
+
+
+
+ + + + + + + + + + {foreach from=$connected_room_types item=typeGroup} + {foreach from=$typeGroup.connected_rooms item=room} + + + + + + {/foreach} + {/foreach} + +
{l s='Room Type'}{l s='Connected Room'} + {l s='Action'} +
{$typeGroup.room_type_name|escape:'html':'UTF-8'}{$room.name|escape:'html':'UTF-8'} + + + +
+
+
+
+ + {l s='No connected rooms.'} +
+
+
+ {if isset($htl_not_connected_rooms) && $htl_not_connected_rooms|count > 0} + + {/if} +
+
+ {if isset($htl_not_connected_rooms) && $htl_not_connected_rooms|count > 0} + + + + + + + + +
+ + + + + + +
+ {/if} +
diff --git a/admin/themes/default/template/footer.tpl b/admin/themes/default/template/footer.tpl index cb46e18f0..34492ea63 100644 --- a/admin/themes/default/template/footer.tpl +++ b/admin/themes/default/template/footer.tpl @@ -45,9 +45,6 @@ - - -
diff --git a/classes/Cart.php b/classes/Cart.php index ad5ee4302..96fe2c68c 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -754,9 +754,8 @@ class CartCore extends ObjectModel $totalPriceByProductTaxExcl += $roomTotalPrice['total_price_tax_excl']; } - // Rounding as per configurations - $row['total'] = Tools::processPriceRounding($totalPriceByProductTaxExcl); - $row['total_wt'] = Tools::processPriceRounding($totalPriceByProductTaxIncl); + $row['total'] = $totalPriceByProductTaxExcl; + $row['total_wt'] = $totalPriceByProductTaxIncl; } } else { $row['total'] = 0; @@ -1768,10 +1767,11 @@ class CartCore extends ObjectModel } else { $priceAdd = $servicePorduct['unit_price_tax_excl']; } + $lineTotal = Tools::processPriceRounding($priceAdd, (int)$servicePorduct['quantity']); if ($ps_round_type == Order::ROUND_TOTAL) { - $products_total[$id_tax_rules_group.'_'.$id_address] += $priceAdd * (int)$servicePorduct['quantity']; + $products_total[$id_tax_rules_group.'_'.$id_address] += $lineTotal; } else { - $products_total[$id_tax_rules_group] += $priceAdd * (int)$servicePorduct['quantity']; + $products_total[$id_tax_rules_group] += $lineTotal; } } } @@ -1833,7 +1833,7 @@ class CartCore extends ObjectModel $this->id, [], 0, - isset($product['id_hotel_cart_booking']) ? $product['id_hotel_cart_booking'] : null, + null, null, (int)$product['id_product'], null, @@ -1862,53 +1862,55 @@ class CartCore extends ObjectModel // by webkul to calculate rates of the product from hotelreservation syatem tables with feature prices.... $totalPriceByProduct = 0; $priceDisplay = Group::getPriceDisplayMethod(Group::getCurrent()->id); - foreach ($roomTypesByIdProduct as $key => $cartRoomInfo) { - $occupancy = array( - array( - 'adults' => $cartRoomInfo['adults'], - 'children' => $cartRoomInfo['children'], - 'child_ages' => json_decode($cartRoomInfo['child_ages']) - ) + + if ($type == Cart::ADVANCE_PAYMENT || $type == Cart::ADVANCE_PAYMENT_ONLY_PRODUCTS) { + // getProductMinAdvPaymentAmountByIdCart already aggregates all rooms for this product internally, + // so call it once and add once — not inside the per-room loop. + $advProductPrice = $objAdvPayment->getProductMinAdvPaymentAmountByIdCart( + $this->id, + $product['id_product'], + 0, + 0, + $with_taxes ); - // get the real price of the room type - $roomTotalPrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( - $cartRoomInfo['id_product'], - $cartRoomInfo['date_from'], - $cartRoomInfo['date_to'], - $occupancy, - Group::getCurrent()->id, - $cartRoomInfo['id_cart'], - $cartRoomInfo['id_guest'], - $cartRoomInfo['id_room'], - 0 - ); - if ($with_taxes) { - $totalPriceByProduct = $roomTotalPrice['total_price_tax_incl']; - } else { - $totalPriceByProduct = $roomTotalPrice['total_price_tax_excl']; - } - - // If customer has selected advance payment of the cart - if ($type == Cart::ADVANCE_PAYMENT || $type == Cart::ADVANCE_PAYMENT_ONLY_PRODUCTS) { - $advProductPrice = $objAdvPayment->getProductMinAdvPaymentAmountByIdCart( - $this->id, - $cartRoomInfo['id_product'], - 0, - 0, - $with_taxes - ); - - // set advance payment price only if it is greater than real price - if ($advProductPrice < $totalPriceByProduct) { - $totalPriceByProduct = $advProductPrice; - } - } - - // Rounding as per configurations if ($ps_round_type == Order::ROUND_TOTAL) { - $products_total[$id_tax_rules_group.'_'.$id_address] += Tools::processPriceRounding($totalPriceByProduct); + $products_total[$id_tax_rules_group.'_'.$id_address] += Tools::processPriceRounding($advProductPrice); } else { - $products_total[$id_tax_rules_group] += Tools::processPriceRounding($totalPriceByProduct); + $products_total[$id_tax_rules_group] += Tools::processPriceRounding($advProductPrice); + } + } else { + foreach ($roomTypesByIdProduct as $key => $cartRoomInfo) { + $occupancy = array( + array( + 'adults' => $cartRoomInfo['adults'], + 'children' => $cartRoomInfo['children'], + 'child_ages' => json_decode($cartRoomInfo['child_ages']) + ) + ); + // get the real price of the room type + $roomTotalPrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( + $cartRoomInfo['id_product'], + $cartRoomInfo['date_from'], + $cartRoomInfo['date_to'], + $occupancy, + Group::getCurrent()->id, + $cartRoomInfo['id_cart'], + $cartRoomInfo['id_guest'], + $cartRoomInfo['id_room'], + 0 + ); + if ($with_taxes) { + $totalPriceByProduct = $roomTotalPrice['total_price_tax_incl']; + } else { + $totalPriceByProduct = $roomTotalPrice['total_price_tax_excl']; + } + + // Rounding as per configurations + if ($ps_round_type == Order::ROUND_TOTAL) { + $products_total[$id_tax_rules_group.'_'.$id_address] += Tools::processPriceRounding($totalPriceByProduct); + } else { + $products_total[$id_tax_rules_group] += Tools::processPriceRounding($totalPriceByProduct); + } } } } diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index fe1ce4392..79d31a788 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -229,12 +229,12 @@ abstract class PaymentModuleCore extends Module $this->currentOrderReference = $reference; $order_creation_failed = false; - $cart_total_paid = (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(true, Cart::BOTH), 2); + $cart_total_paid = (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(true, Cart::BOTH), _PS_PRICE_COMPUTE_PRECISION_); if ($this->context->cart->is_advance_payment) { $cart_total_paid = (float)Tools::ps_round( (float)$this->context->cart->getOrderTotal(true, CART::ADVANCE_PAYMENT), - 2 + _PS_PRICE_COMPUTE_PRECISION_ ); } @@ -314,7 +314,7 @@ abstract class PaymentModuleCore extends Module $order->gift_message = $this->context->cart->gift_message; $order->mobile_theme = $this->context->cart->mobile_theme; $order->conversion_rate = $this->context->currency->conversion_rate; - $amount_paid = !$dont_touch_amount ? Tools::ps_round((float)$amount_paid, 2) : $amount_paid; + $amount_paid = !$dont_touch_amount ? Tools::ps_round((float)$amount_paid, _PS_PRICE_COMPUTE_PRECISION_) : $amount_paid; $order->total_paid_real = 0; $order->total_products = (float)$this->context->cart->getOrderTotal(false, Cart::ONLY_PRODUCTS, $order->product_list, $id_carrier); @@ -389,7 +389,7 @@ abstract class PaymentModuleCore extends Module (float)$this->context->cart->getOrderTotal(true, Cart::BOTH, $order->product_list, $id_carrier), _PS_PRICE_COMPUTE_PRECISION_ ); - if ($orderTotal = $this->context->cart->getOrderTotal(true, Cart::BOTH, null, $id_carrier)) { + if ($orderTotal = Tools::ps_round((float)$this->context->cart->getOrderTotal(true, Cart::BOTH, null, $id_carrier), _PS_PRICE_COMPUTE_PRECISION_)) { $order->amount_paid = (float)Tools::ps_round( (($order->advance_paid_amount * $amount_paid) / $orderTotal), _PS_PRICE_COMPUTE_PRECISION_ @@ -677,7 +677,7 @@ abstract class PaymentModuleCore extends Module $orderTotals[$order->id]['excl'] -= $used['excl']; $cart_rules[$key]['remaining'] -= $used['excl']; } - + $order->addCartRule($cart_rule['obj']->id, $cart_rule['obj']->name, $values, 0, $cart_rule['obj']->free_shipping); if ($id_order_state != Configuration::get('PS_OS_ERROR') && $id_order_state != Configuration::get('PS_OS_CANCELED') && !in_array($cart_rule['obj']->id, $cart_rule_used)) { @@ -850,7 +850,8 @@ abstract class PaymentModuleCore extends Module $objCartBookingData->id_cart, $objCartBookingData->id_guest, $objCartBookingData->id_room, - 0 + 0, + 1 ); $objBookingDetail->date_from = $objCartBookingData->date_from; @@ -941,8 +942,8 @@ abstract class PaymentModuleCore extends Module ); } - $objBookingDemand->total_price_tax_excl = Tools::processPriceRounding(($objBookingDemand->unit_price_tax_excl * $numDays)); - $objBookingDemand->total_price_tax_incl = Tools::processPriceRounding(($objBookingDemand->unit_price_tax_incl * $numDays)); + $objBookingDemand->total_price_tax_excl = $objBookingDemand->unit_price_tax_excl * $numDays; + $objBookingDemand->total_price_tax_incl = $objBookingDemand->unit_price_tax_incl * $numDays; $objBookingDemand->price_calc_method = $objGlobalDemand->price_calc_method; $objBookingDemand->id_tax_rules_group = $objGlobalDemand->id_tax_rules_group; @@ -2042,6 +2043,7 @@ abstract class PaymentModuleCore extends Module // calculate averages now foreach ($cart_htl_data[$type_key]['date_diff'] as $key => &$value) { $value['avg_paid_unit_price_tax_incl'] = Tools::ps_round($value['avg_paid_unit_price_tax_incl'] / $value['num_rm'], 6); + $value['avg_paid_unit_price_tax_excl'] = Tools::ps_round($value['avg_paid_unit_price_tax_excl'] / $value['num_rm'], 6); } } } diff --git a/classes/RequestSql.php b/classes/RequestSql.php index cb4ee0ef8..087044308 100644 --- a/classes/RequestSql.php +++ b/classes/RequestSql.php @@ -227,8 +227,20 @@ class RequestSqlCore extends ObjectModel if (in_array($attr['expr_type'], array('operator', 'const'))) { continue; } - if ($attribut = $this->cutAttribute($attr['base_expr'], $from)) { - $tab[] = $attribut; + + if (!empty($attr['sub_tree'])) { + foreach ($attr['sub_tree'] as $tree_item) { + if ($tree_item['expr_type'] !== 'colref') { + continue; + } + if ($attribut = $this->cutAttribute($tree_item['base_expr'], $from)) { + $tab[] = $attribut; + } + } + } else { + if ($attribut = $this->cutAttribute($attr['base_expr'], $from)) { + $tab[] = $attribut; + } } } @@ -279,16 +291,25 @@ class RequestSqlCore extends ObjectModel { if ($alias) { foreach ($tables as $table) { - if (isset($table['alias']) && isset($table['table']) && $table['alias']['no_quotes'] == $alias) { - return array($table['table']); + if (!isset($table['alias'])) { + continue; } + $table_alias = $table['alias']['no_quotes']; + if ($table_alias != $alias && !(is_array($table_alias) && $table_alias['parts'][0] == $alias)) { + continue; + } + if (!isset($table['table'])) { + // derived table (subquery) - no real table name to verify columns against + return array(false); + } + return array($table['table']); } } elseif (count($tables) > 1) { if ($attr !== null) { $tab = array(); foreach ($tables as $table) { if ($this->attributExistInTable($attr, $table['table'])) { - $tab = $table['table']; + $tab[] = $table['table']; } } if (count($tab) == 1) { @@ -322,6 +343,10 @@ class RequestSqlCore extends ObjectModel if (is_array($table) && (count($table) == 1)) { $table = $table[0]; } + if (!$table) { + // derived table (subquery) - no real table to verify against, assume valid + return true; + } $attributs = $this->getAttributesByTable($table); foreach ($attributs as $attribut) { if ($attribut['Field'] == trim($attr, ' `')) { @@ -382,22 +407,14 @@ class RequestSqlCore extends ObjectModel return false; } if ($table['ref_type'] == 'ON' && (trim($table['join_type']) == 'LEFT' || trim($table['join_type']) == 'JOIN')) { - if ($attrs = $this->cutJoin($table['ref_clause'], $from)) { - foreach ($attrs as $attr) { - if (!$this->attributExistInTable($attr['attribut'], $attr['table'])) { - $this->error_sql['checkedFrom']['attribut'] = array($attr['attribut'], implode(', ', $attr['table'])); - return false; - } - } - } else { - if (isset($this->error_sql['returnNameTable'])) { - $this->error_sql['checkedFrom'] = $this->error_sql['returnNameTable']; - return false; - } else { - $this->error_sql['checkedFrom'] = false; + $attrs = $this->cutJoin($table['ref_clause'], $from); + foreach ($attrs as $attr) { + if (!$this->attributExistInTable($attr['attribut'], $attr['table'])) { + $this->error_sql['checkedFrom']['attribut'] = array($attr['attribut'], implode(', ', $attr['table'])); return false; } } + // derived-table joins (subquery as table) can't be resolved by cutJoin; nothing to check, not an error } } return true; @@ -416,7 +433,7 @@ class RequestSqlCore extends ObjectModel $nb = count($select); for ($i = 0; $i < $nb; $i++) { $attribut = $select[$i]; - if ($attribut['base_expr'] != '*' && !preg_match('/\.$/', $attribut['base_expr'])) { + if ($attribut['base_expr'] != '*' && !preg_match('/\.\*$/', $attribut['base_expr'])) { if ($attribut['expr_type'] == 'colref') { if ($attr = $this->cutAttribute(trim($attribut['base_expr']), $from)) { if (!$this->attributExistInTable($attr['attribut'], $attr['table'])) { @@ -433,6 +450,14 @@ class RequestSqlCore extends ObjectModel } } } + + while (is_array($attribut['sub_tree']) && isset($attribut['sub_tree'][0])) { + if ($attribut['expr_type'] === 'function' && in_array(strtoupper($attribut['base_expr']), $this->tested['unauthorized'])) { + $this->error_sql['checkedSelect']['function'] = $attribut['base_expr']; + return false; + } + $attribut = $attribut['sub_tree'][0]; + } } elseif ($in) { $this->error_sql['checkedSelect']['*'] = false; return false; @@ -454,7 +479,7 @@ class RequestSqlCore extends ObjectModel $nb = count($where); for ($i = 0; $i < $nb; $i++) { $attribut = $where[$i]; - if ($attribut['expr_type'] == 'colref' || $attribut['expr_type'] == 'reserved') { + if ($attribut['expr_type'] == 'colref') { if ($attr = $this->cutAttribute(trim($attribut['base_expr']), $from)) { if (!$this->attributExistInTable($attr['attribut'], $attr['table'])) { $this->error_sql['checkedWhere']['attribut'] = array($attr['attribut'], implode(', ', $attr['table'])); @@ -469,6 +494,11 @@ class RequestSqlCore extends ObjectModel return false; } } + } elseif ($attribut['expr_type'] == 'reserved') { + if ($attribut['base_expr'] !== 'EXISTS' || !isset($where[$i + 1]) || $where[$i + 1]['expr_type'] !== 'subquery') { + $this->error_sql['checkedWhere'] = isset($this->error_sql['returnNameTable']) ? $this->error_sql['returnNameTable'] : false; + return false; + } } elseif ($attribut['expr_type'] == 'operator') { if (!in_array(strtoupper($attribut['base_expr']), $this->tested['operator'])) { $this->error_sql['checkedWhere']['operator'] = array($attribut['base_expr']); @@ -531,7 +561,7 @@ class RequestSqlCore extends ObjectModel public function checkedOrder($order, $from) { $order = $order[0]; - if ($order['type'] == 'expression') { + if ($order['expr_type'] == 'colref') { if ($attr = $this->cutAttribute(trim($order['base_expr']), $from)) { if (!$this->attributExistInTable($attr['attribut'], $attr['table'])) { $this->error_sql['checkedOrder']['attribut'] = array($attr['attribut'], implode(', ', $attr['table'])); @@ -560,7 +590,7 @@ class RequestSqlCore extends ObjectModel public function checkedGroupBy($group, $from) { $group = $group[0]; - if ($group['type'] == 'expression') { + if ($group['expr_type'] == 'colref') { if ($attr = $this->cutAttribute(trim($group['base_expr']), $from)) { if (!$this->attributExistInTable($attr['attribut'], $attr['table'])) { $this->error_sql['checkedGroupBy']['attribut'] = array($attr['attribut'], implode(', ', $attr['table'])); @@ -587,7 +617,7 @@ class RequestSqlCore extends ObjectModel */ public function checkedLimit($limit) { - if (!preg_match('#^[0-9]+$#', trim($limit['start'])) || !preg_match('#^[0-9]+$#', trim($limit['end']))) { + if (!preg_match('#^[0-9]+$#', trim($limit['offset'])) || !preg_match('#^[0-9]+$#', trim($limit['rowcount']))) { $this->error_sql['checkedLimit'] = false; return false; } diff --git a/classes/SpecificPrice.php b/classes/SpecificPrice.php index 1dd3829a2..79c63995e 100644 --- a/classes/SpecificPrice.php +++ b/classes/SpecificPrice.php @@ -367,12 +367,12 @@ class SpecificPriceCore extends ObjectModel `id_shop` '.self::formatIntInQuery(0, $id_shop).' AND `id_currency` '.self::formatIntInQuery(0, $id_currency).' AND `id_country` '.self::formatIntInQuery(0, $id_country). - ' AND `id_htl_cart_booking`='.(int)$id_htl_cart_booking.' '. + ' AND `id_htl_cart_booking` '.self::formatIntInQuery(0, $id_htl_cart_booking).' '. (Group::isFeatureActive() ? ' AND `id_group` '.self::formatIntInQuery(0, $id_group) : '').' '.$query_extra.' AND IF(`from_quantity` > 1, `from_quantity`, 0) <= '; $query .= (Configuration::get('PS_QTY_DISCOUNT_ON_COMBINATION') || !$id_cart || !$real_quantity) ? (int)$quantity : max(1, (int)$real_quantity); - $query .= ' ORDER BY `id_product_attribute` DESC, `from_quantity` DESC, `score` DESC, `to` DESC, `from` DESC'; + $query .= ' ORDER BY `id_htl_cart_booking` DESC, `id_product_attribute` DESC, `from_quantity` DESC, `score` DESC, `to` DESC, `from` DESC'; SpecificPrice::$_specificPriceCache[$key] = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($query); } diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index bdf2d3f74..9166f1750 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -2010,7 +2010,9 @@ class AdminControllerCore extends Controller } if ($conf = Tools::getValue('conf')) { - $this->context->smarty->assign('conf', $this->json ? json_encode($this->_conf[(int)$conf]) : $this->_conf[(int)$conf]); + if (isset($this->_conf[$conf])) { + $this->context->smarty->assign('conf', $this->json ? json_encode($this->_conf[(int)$conf]) : $this->_conf[(int)$conf]); + } } foreach (array('errors', 'warnings', 'informations', 'confirmations') as $type) { diff --git a/classes/order/Order.php b/classes/order/Order.php index e5ed30602..e5d501141 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -2677,7 +2677,7 @@ class OrderCore extends ObjectModel 'unit_tax_base' => $autoAddedPriceExcl / $totalAutoAddedQty, 'total_tax_base' => $autoAddedPriceExcl, 'unit_amount' => $amount, - 'total_amount' => Tools::processPriceRounding($amount, $totalAutoAddedQty), + 'total_amount' => Tools::processPriceRounding($amount, $totalAutoAddedQty, $this->round_type, $this->round_mode), ); } } else { @@ -2724,7 +2724,7 @@ class OrderCore extends ObjectModel foreach ($tax_calculator->getTaxesAmount($unit_price_tax_excl) as $id_tax => $unit_amount) { $total_tax_base = 0; - $total_amount = Tools::processPriceRounding($unit_amount, $quantity); + $total_amount = Tools::processPriceRounding($unit_amount, $quantity, $this->round_type, $this->round_mode); if (!isset($groupedTaxDetails[$id_tax])) { $groupedTaxDetails[$id_tax] = array( diff --git a/classes/pdf/HTMLTemplateBookingVoucher.php b/classes/pdf/HTMLTemplateBookingVoucher.php new file mode 100644 index 000000000..c4e5d17df --- /dev/null +++ b/classes/pdf/HTMLTemplateBookingVoucher.php @@ -0,0 +1,396 @@ +order = $order; + $this->smarty = $smarty; + $this->date = Tools::displayDate(date('Y-m-d')); + $this->title = sprintf(self::l('Booking Voucher - %s'), $this->order->reference); + $this->shop = new Shop((int)$this->order->id_shop); + } + + /** + * @return string HTML header + */ + public function getHeader() + { + $this->assignCommonHeaderData(); + $this->smarty->assign(array('header' => self::l('Booking Voucher'))); + + return $this->smarty->fetch($this->getTemplate('header')); + } + + /** + * Assembles all voucher data inline and renders the template. + * + * @return string HTML content + */ + public function getContent() + { + // --- Bookings --- + $objHotelBookingDetail = new HotelBookingDetail(); + $bookings = $objHotelBookingDetail->getBookingDataByOrderId((int)$this->order->id); + if (!is_array($bookings)) { + $bookings = array(); + } + + // --- Order state --- + $orderState = $this->order->getCurrentStateFull((int)$this->order->id_lang); + + // --- Hotel / property --- + $objHotel = null; + $idHotel = HotelBookingDetail::getIdHotelByIdOrder((int)$this->order->id); + if ($idHotel) { + $objHotel = new HotelBranchInformation((int)$idHotel, (int)$this->order->id_lang); + if (!Validate::isLoadedObject($objHotel)) { + $objHotel = null; + } + } + + $hotelAddress = ''; + $paymentPolicy = ''; + $cancellationPolicy = ''; + + if ($objHotel) { + $policies = is_array($objHotel->policies) ? '' : (string)$objHotel->policies; + if ($policies) { + $policyText = html_entity_decode($policies, ENT_QUOTES, 'UTF-8'); + $policyText = preg_replace('//i', "\n", $policyText); + $policyText = strip_tags($policyText); + $policyText = preg_replace("/[\r\n]+/", "\n", $policyText); + $paymentPolicy = nl2br(trim($policyText)); + } + + $objBranchRefundRules = new HotelBranchRefundRules(); + $refundRules = $objBranchRefundRules->getHotelRefundRules( + (int)$objHotel->id, 0, 1, (int)$this->order->id_lang, 1 + ); + if (is_array($refundRules) && !empty($refundRules)) { + $policyBlocks = array(); + foreach ($refundRules as $rule) { + $ruleName = isset($rule['name']) ? trim(strip_tags($rule['name'])) : ''; + $ruleDescription = isset($rule['description']) ? trim($rule['description']) : ''; + if ($ruleName === '' && $ruleDescription === '') { + continue; + } + $block = $ruleName !== '' ? ''.Tools::safeOutput($ruleName).'' : ''; + if ($ruleDescription !== '') { + $block .= ($block !== '' ? ': ' : '').$ruleDescription; + } + $policyBlocks[] = $block; + } + if (!empty($policyBlocks)) { + $cancellationPolicy = implode('

', $policyBlocks); + } + } + + if ($idHotelAddress = $objHotel->getHotelIdAddress()) { + $objHotelAddress = new Address((int)$idHotelAddress); + if (Validate::isLoadedObject($objHotelAddress)) { + $objHotelAddress->firstname = $objHotel->hotel_name; + $hotelAddress = AddressFormat::generateAddress( + $objHotelAddress, + array('avoid' => array('lastname')), + '
', + ' ' + ); + } + } + } + + // --- Rooms, services, occupancy --- + $totalRooms = 0; + $totalRoomNights = 0; + $totalGuests = 0; + $serviceGroups = array(); + $roomTypeRows = array(); + + foreach ($bookings as $booking) { + $nights = (int)HotelHelper::getNumberOfDays($booking['date_from'], $booking['date_to']); + if ($nights <= 0) { + $nights = 1; + } + + $totalGuests += (int)$booking['adults'] + (int)$booking['children']; + $totalRoomNights += $nights; + $totalRooms++; + + $dateFrom = ($booking['date_from'] && $booking['date_from'] !== '0000-00-00 00:00:00') + ? Tools::displayDate($booking['date_from'], null, false) : '--'; + $dateTo = ($booking['date_to'] && $booking['date_to'] !== '0000-00-00 00:00:00') + ? Tools::displayDate($booking['date_to'], null, false) : '--'; + + // Services for this booking + $bookingServices = array(); + + $objBookingDemand = new HotelBookingDemands(); + $extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands( + (int)$this->order->id, 0, 0, 0, 0, 0, 0, 0, + (int)$booking['id'], (int)$booking['id_order_detail'] + ); + if (is_array($extraDemands)) { + foreach ($extraDemands as $demand) { + $bookingServices[] = array('name' => $demand['name'], 'quantity' => 1); + } + } + + // Auto-added services bundled with room price (for cost calculation only) + $objServiceProductOrderDetail = new ServiceProductOrderDetail(); + $autoAddedWithRoomPriceTaxExcl = (float)$objServiceProductOrderDetail->getRoomTypeServiceProducts( + (int)$this->order->id, 0, 0, + isset($booking['id_product']) ? (int)$booking['id_product'] : 0, + isset($booking['date_from']) ? $booking['date_from'] : 0, + isset($booking['date_to']) ? $booking['date_to'] : 0, + isset($booking['id_room']) ? (int)$booking['id_room'] : 0, + 1, 0, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM + ); + + // Additional services chosen by guest + $additionalServices = $objServiceProductOrderDetail->getRoomTypeServiceProducts( + 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, null, 0, (int)$booking['id'] + ); + if (isset($additionalServices[(int)$booking['id']]['additional_services'])) { + foreach ($additionalServices[(int)$booking['id']]['additional_services'] as $service) { + $bookingServices[] = array('name' => $service['name'], 'quantity' => (int)$service['quantity']); + } + } + + if (!empty($bookingServices)) { + $serviceGroups[] = array( + 'room_type_name' => isset($booking['room_type_name']) ? $booking['room_type_name'] : '', + 'check_in_date' => $dateFrom, + 'check_out_date' => $dateTo, + 'room_count' => $totalRooms, + 'services' => $bookingServices, + ); + } + + $roomTotalWithAutoServicesTaxExcl = (float)$booking['total_price_tax_excl'] + $autoAddedWithRoomPriceTaxExcl; + + // Aggregate per room type + date range + $roomTypeRowKey = implode('|', array( + (int)$booking['id_order_detail'], + isset($booking['room_type_name']) ? $booking['room_type_name'] : '', + isset($booking['date_from']) ? $booking['date_from'] : '', + isset($booking['date_to']) ? $booking['date_to'] : '', + )); + + if (!isset($roomTypeRows[$roomTypeRowKey])) { + $idOrderDetail = (int)$booking['id_order_detail']; + $detailTaxes = $idOrderDetail ? OrderDetail::getTaxListStatic($idOrderDetail) : null; + $orderDetailTaxLabel = self::l('No tax'); + if ($detailTaxes) { + $taxTemp = array(); + foreach ($detailTaxes as $tax) { + $objTax = new Tax($tax['id_tax']); + $taxTemp[] = sprintf(self::l('%1$s%2$s%%'), $objTax->rate + 0, ' '); + } + $orderDetailTaxLabel = implode(', ', $taxTemp); + } + + $roomTypeRows[$roomTypeRowKey] = array( + 'room_type_name' => isset($booking['room_type_name']) ? $booking['room_type_name'] : '', + 'order_detail_tax_label' => $orderDetailTaxLabel, + 'rooms' => 0, + 'adults' => 0, + 'children' => 0, + 'nights' => $nights, + 'check_in_date' => $dateFrom, + 'check_out_date' => $dateTo, + 'unit_price_tax_excl' => 0, + 'total_price_tax_excl' => 0, + ); + } + + $roomTypeRows[$roomTypeRowKey]['rooms'] += 1; + $roomTypeRows[$roomTypeRowKey]['adults'] += (int)$booking['adults']; + $roomTypeRows[$roomTypeRowKey]['children'] += (int)$booking['children']; + $roomTypeRows[$roomTypeRowKey]['total_price_tax_excl'] += $roomTotalWithAutoServicesTaxExcl; + } + + foreach ($roomTypeRows as &$roomTypeRow) { + $denominator = (int)$roomTypeRow['nights'] * (int)$roomTypeRow['rooms']; + if ($denominator > 0) { + $roomTypeRow['unit_price_tax_excl'] = Tools::ps_round( + $roomTypeRow['total_price_tax_excl'] / $denominator, + 6, + $this->order->round_mode + ); + } + } + unset($roomTypeRow); + + $guestAddress = ''; + $guest = new Customer((int)$this->order->id_customer); + + $addressId = (int)$this->order->id_address_invoice ?: (int)$this->order->id_address_delivery; + if ($addressId) { + $address = new Address($addressId); + if (Validate::isLoadedObject($address)) { + $guestAddress = AddressFormat::generateAddress($address, array(), '
', ' '); + } + } + + if ($idCustomerGuestDetail = OrderCustomerGuestDetail::isCustomerGuestBooking((int)$this->order->id)) { + $objGuest = new OrderCustomerGuestDetail((int)$idCustomerGuestDetail); + if (Validate::isLoadedObject($objGuest)) { + $guest = $objGuest; + } + } + // --- Totals --- + $objBookingDemand = new HotelBookingDemands(); + $totalDemandsPriceTE = (float)$objBookingDemand->getRoomTypeBookingExtraDemands( + (int)$this->order->id, 0, 0, 0, 0, 1, 1, 0 + ); + $totalDemandsPriceTI = (float)$objBookingDemand->getRoomTypeBookingExtraDemands( + (int)$this->order->id, 0, 0, 0, 0, 1, 1, 1 + ); + + $orderDetails = OrderDetail::getList((int)$this->order->id); + $idsOrderDetail = is_array($orderDetails) + ? array_unique(array_map('intval', array_column($orderDetails, 'id_order_detail'))) + : array(); + + $footer = array( + 'room_price_tax_excl' => 0, + 'service_products_price_tax_excl' => 0, + 'additional_service_price_tax_excl' => 0, + 'total_convenience_fee_te' => 0, + ); + $roomsCostTaxIncl = 0; + $serviceProductsCostTaxIncl = 0; + $additionalServicesCostTaxIncl = 0; + $convenienceFeeTaxIncl = 0; + + if (!empty($idsOrderDetail)) { + $footer['room_price_tax_excl'] = $this->order->getTotalProductsWithoutTaxes(false, true, null, null, null, $idsOrderDetail) + $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM, $idsOrderDetail); + $roomsCostTaxIncl = $this->order->getTotalProductsWithTaxes(false, true, null, null, null, $idsOrderDetail) + $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM, $idsOrderDetail); + $footer['service_products_price_tax_excl'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE, false, false, $idsOrderDetail) + $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_HOTEL_STANDALONE, false, false, $idsOrderDetail); + $serviceProductsCostTaxIncl = $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE, false, false, $idsOrderDetail) + $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_HOTEL_STANDALONE, false, false, $idsOrderDetail); + $footer['additional_service_price_tax_excl'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0, null, $idsOrderDetail) + $totalDemandsPriceTE; + $additionalServicesCostTaxIncl = $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0, null, $idsOrderDetail) + $totalDemandsPriceTI; + $footer['total_convenience_fee_te'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT, $idsOrderDetail); + $convenienceFeeTaxIncl = $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT, $idsOrderDetail); + } + + $productDiscountsTaxIncl = (float)$this->order->total_discounts_tax_incl; + foreach ($this->order->getCartRules() as $cartRule) { + if (!empty($cartRule['free_shipping'])) { + $productDiscountsTaxIncl -= (float)$this->order->total_shipping_tax_incl; + } + } + if ($productDiscountsTaxIncl < 0) { + $productDiscountsTaxIncl = 0; + } + + $footer['total_without_discount_te'] = $footer['room_price_tax_excl'] + $footer['total_convenience_fee_te'] + $footer['additional_service_price_tax_excl'] + $footer['service_products_price_tax_excl']; + $totalWithoutDiscountTaxIncl = $roomsCostTaxIncl + $serviceProductsCostTaxIncl + $additionalServicesCostTaxIncl + $convenienceFeeTaxIncl; + $footer['total_tax_without_discount'] = max(0, $totalWithoutDiscountTaxIncl - $footer['total_without_discount_te']); + $grandTotal = max(0.0, $totalWithoutDiscountTaxIncl - $productDiscountsTaxIncl); + $footer['product_discounts_tax_incl'] = $productDiscountsTaxIncl; + $footer['total_paid_tax_incl'] = $grandTotal; + $footer['amount_due'] = Tools::ps_round( + max(0, $grandTotal - (float)$this->order->getTotalPaid()), + _PS_PRICE_COMPUTE_PRECISION_, + $this->order->round_mode + ); + + $paymentMethods = array(); + $payments = $this->order->getOrderPaymentDetail(); + if (is_array($payments) && $payments) { + foreach ($payments as $paymentDetail) { + $method = isset($paymentDetail['payment_method']) ? trim($paymentDetail['payment_method']) : ''; + if (!$method) { + $method = $this->order->payment; + } + $amount = isset($paymentDetail['real_paid_amount']) + ? (float)$paymentDetail['real_paid_amount'] + : (float)$paymentDetail['amount']; + $idCurrency = isset($paymentDetail['id_currency']) + ? (int)$paymentDetail['id_currency'] + : (int)$this->order->id_currency; + $paymentMethods[] = $method.': '.Tools::displayPrice($amount, $idCurrency); + } + } + $paymentMethod = $paymentMethods ? implode('

', $paymentMethods) : $this->order->payment; + + $data = array( + 'order' => $this->order, + 'order_state' => $orderState, + 'booking_date' => Tools::displayDate($this->order->date_add, null, false), + 'issue_date' => Tools::displayDate(date('Y-m-d'), null, false), + 'hotel' => $objHotel, + 'hotel_address' => $hotelAddress, + 'guest' => $guest, + 'guest_address' => $guestAddress, + 'total_guests' => (int)$totalGuests, + 'total_rooms' => (int)$totalRooms, + 'total_room_nights' => (int)$totalRoomNights, + 'room_type_rows' => array_values($roomTypeRows), + 'service_groups' => $serviceGroups, + 'payment_method' => $paymentMethod, + 'footer' => $footer, + 'payment_policy' => $paymentPolicy, + 'cancellation_policy' => $cancellationPolicy, + ); + + if (Tools::getValue('debug')) { + die(json_encode($data)); + } + $this->smarty->assign($data); + + return $this->smarty->fetch($this->getTemplate('booking-voucher')); + } + + /** + * @return string + */ + public function getBulkFilename() + { + return self::l('BookingVouchers').'.pdf'; + } + + /** + * @return string + */ + public function getFilename() + { + return sprintf(self::l('BOOKING VOUCHER - Refrence No. #%s.pdf'), $this->order->reference); + } +} diff --git a/classes/pdf/PDF.php b/classes/pdf/PDF.php index 833d5b17e..69985fa7f 100644 --- a/classes/pdf/PDF.php +++ b/classes/pdf/PDF.php @@ -41,6 +41,7 @@ class PDFCore const TEMPLATE_ORDER_SLIP = 'OrderSlip'; const TEMPLATE_DELIVERY_SLIP = 'DeliverySlip'; const TEMPLATE_SUPPLY_ORDER_FORM = 'SupplyOrderForm'; + const TEMPLATE_BOOKING_VOUCHER = 'BookingVoucher'; const TEMPLATE_PAYMENT_RECEIPT = 'PaymentReceipt'; /** diff --git a/config/xml/themes/default.xml b/config/xml/themes/default.xml index 72ce2aae3..b8d22534f 100644 --- a/config/xml/themes/default.xml +++ b/config/xml/themes/default.xml @@ -18,8 +18,8 @@ - - + + @@ -32,8 +32,8 @@ - - + + @@ -45,7 +45,6 @@ - diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index f76331422..b72199d67 100644 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -181,69 +181,85 @@ class AdminCartsControllerCore extends AdminController public function renderKpis() { - $time = time(); - $kpis = array(); + $objCart = new Cart(Tools::getValue('id_cart')); + if (Validate::isLoadedObject($objCart)) { + $currency = new Currency($objCart->id_currency); + $summary = $objCart->getSummaryDetails(); + $tax_calculation_method = Group::getPriceDisplayMethod(Group::getCurrent()->id); + $total_price = ($tax_calculation_method == PS_TAX_EXC) + ? $summary['total_price_without_tax'] + : $summary['total_price']; - $daysForConversionRate = Configuration::get('PS_KPI_CONVERSION_RATE_NB_DAYS'); - - $helper = new HelperKpi(); - $helper->id = 'box-conversion-rate'; - $helper->icon = 'icon-sort-by-attributes-alt'; - //$helper->chart = true; - $helper->color = 'color1'; - $helper->title = $this->l('Conversion Rate', null, null, false); - if ($daysForConversionRate == 1) { - $helper->subtitle = $daysForConversionRate.' '.$this->l('day', null, null, false); + $helper = new HelperKpi(); + $helper->id = 'box-kpi-cart'; + $helper->icon = 'icon-shopping-cart'; + $helper->color = 'color1'; + $helper->title = $this->l('Total Cart', null, null, false); + $helper->subtitle = sprintf($this->l('Cart #%06d', null, null, false), $objCart->id); + $helper->value = Tools::displayPrice($total_price, $currency); + $this->kpis[] = $helper; } else { - $helper->subtitle = $daysForConversionRate.' '.$this->l('days', null, null, false); - } - if (ConfigurationKPI::get('CONVERSION_RATE_CHART') !== false) { - $helper->data = ConfigurationKPI::get('CONVERSION_RATE_CHART'); - } - $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=conversion_rate'; - $this->kpis[] = $helper; + $daysForConversionRate = Configuration::get('PS_KPI_CONVERSION_RATE_NB_DAYS'); - $helper = new HelperKpi(); - $helper->id = 'box-carts'; - $helper->icon = 'icon-shopping-cart'; - $helper->color = 'color2'; - $helper->title = $this->l('Abandoned Carts', null, null, false); - $date_from = date(Context::getContext()->language->date_format_lite, strtotime('-2 day')); - $date_to = date(Context::getContext()->language->date_format_lite, strtotime('-1 day')); - $helper->subtitle = sprintf($this->l('From %s to %s', null, null, false), $date_from, $date_to); - $helper->href = $this->context->link->getAdminLink('AdminCarts').'&action=filterOnlyAbandonedCarts&date_from='.date('Y-m-d', strtotime('-2 day')).'&date_to='.date('Y-m-d', strtotime('-1 day')); - $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=abandoned_cart'; - $this->kpis[] = $helper; + $helper = new HelperKpi(); + $helper->id = 'box-conversion-rate'; + $helper->icon = 'icon-sort-by-attributes-alt'; + //$helper->chart = true; + $helper->color = 'color1'; + $helper->title = $this->l('Conversion Rate', null, null, false); + if ($daysForConversionRate == 1) { + $helper->subtitle = $daysForConversionRate.' '.$this->l('day', null, null, false); + } else { + $helper->subtitle = $daysForConversionRate.' '.$this->l('days', null, null, false); + } + if (ConfigurationKPI::get('CONVERSION_RATE_CHART') !== false) { + $helper->data = ConfigurationKPI::get('CONVERSION_RATE_CHART'); + } + $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=conversion_rate'; + $this->kpis[] = $helper; - $daysForAvgOrderVal = Configuration::get('PS_ORDER_KPI_AVG_ORDER_VALUE_NB_DAYS'); - $helper = new HelperKpi(); - $helper->id = 'box-average-order'; - $helper->icon = 'icon-money'; - $helper->color = 'color3'; - $helper->title = $this->l('Average Order Value', null, null, false); - if ($daysForAvgOrderVal == 1) { - $helper->subtitle = $daysForAvgOrderVal.' '.$this->l('day', null, null, false); - } else { - $helper->subtitle = $daysForAvgOrderVal.' '.$this->l('days', null, null, false); + $helper = new HelperKpi(); + $helper->id = 'box-carts'; + $helper->icon = 'icon-shopping-cart'; + $helper->color = 'color2'; + $helper->title = $this->l('Abandoned Carts', null, null, false); + $date_from = date(Context::getContext()->language->date_format_lite, strtotime('-2 day')); + $date_to = date(Context::getContext()->language->date_format_lite, strtotime('-1 day')); + $helper->subtitle = sprintf($this->l('From %s to %s', null, null, false), $date_from, $date_to); + $helper->href = $this->context->link->getAdminLink('AdminCarts').'&action=filterOnlyAbandonedCarts&date_from='.date('Y-m-d', strtotime('-2 day')).'&date_to='.date('Y-m-d', strtotime('-1 day')); + $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=abandoned_cart'; + $this->kpis[] = $helper; + + $daysForAvgOrderVal = Configuration::get('PS_ORDER_KPI_AVG_ORDER_VALUE_NB_DAYS'); + $helper = new HelperKpi(); + $helper->id = 'box-average-order'; + $helper->icon = 'icon-money'; + $helper->color = 'color3'; + $helper->title = $this->l('Average Order Value', null, null, false); + if ($daysForAvgOrderVal == 1) { + $helper->subtitle = $daysForAvgOrderVal.' '.$this->l('day', null, null, false); + } else { + $helper->subtitle = $daysForAvgOrderVal.' '.$this->l('days', null, null, false); + } + + $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=average_order_value'; + $this->kpis[] = $helper; + + $daysForProfitPerVisitor = Configuration::get('PS_ORDER_KPI_PER_VISITOR_PROFIT_NB_DAYS'); + $helper = new HelperKpi(); + $helper->id = 'box-net-profit-visitor'; + $helper->icon = 'icon-user'; + $helper->color = 'color4'; + $helper->title = $this->l('Net Profit per Visitor', null, null, false); + if ($daysForProfitPerVisitor == 1) { + $helper->subtitle = $daysForProfitPerVisitor.' '.$this->l('day', null, null, false); + } else { + $helper->subtitle = $daysForProfitPerVisitor.' '.$this->l('days', null, null, false); + } + $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=netprofit_visit'; + $this->kpis[] = $helper; } - $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=average_order_value'; - $this->kpis[] = $helper; - - $daysForProfitPerVisitor = Configuration::get('PS_ORDER_KPI_PER_VISITOR_PROFIT_NB_DAYS'); - $helper = new HelperKpi(); - $helper->id = 'box-net-profit-visitor'; - $helper->icon = 'icon-user'; - $helper->color = 'color4'; - $helper->title = $this->l('Net Profit per Visitor', null, null, false); - if ($daysForProfitPerVisitor == 1) { - $helper->subtitle = $daysForProfitPerVisitor.' '.$this->l('day', null, null, false); - } else { - $helper->subtitle = $daysForProfitPerVisitor.' '.$this->l('days', null, null, false); - } - $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=netprofit_visit'; - $this->kpis[] = $helper; - return parent::renderKpis(); } @@ -254,6 +270,9 @@ class AdminCartsControllerCore extends AdminController if (!($cart = $this->loadObject(true))) { return; } + if ($this->tabAccess['kpi'] === 1) { + $this->content .= $this->renderKpis(); + } $customer = new Customer($cart->id_customer); $currency = new Currency($cart->id_currency); $this->context->cart = $cart; @@ -340,16 +359,6 @@ class AdminCartsControllerCore extends AdminController $cartHtlData = array(); } - $helper = new HelperKpi(); - $helper->id = 'box-kpi-cart'; - $helper->icon = 'icon-shopping-cart'; - $helper->color = 'color1'; - $helper->title = $this->l('Total Cart', null, null, false); - $helper->subtitle = sprintf($this->l('Cart #%06d', null, null, false), $cart->id); - $helper->value = Tools::displayPrice($total_price, $currency); - $kpi = $helper->generate(); - //end - // get standalone products in cart $objServiceProductCartDetail = new ServiceProductCartDetail(); $hotelProducts = $objServiceProductCartDetail->getServiceProductsInCart( @@ -381,7 +390,6 @@ class AdminCartsControllerCore extends AdminController 'cart_htl_data' => $cartHtlData,//by webkul hotel rooms in order data 'standalone_products' => $standaloneProducts, 'hotel_products' => $hotelProducts, - 'kpi' => $kpi, 'products' => $products, 'discounts' => $cart->getCartRules(), 'cart_orders' => $cartOrders, @@ -1121,7 +1129,7 @@ class AdminCartsControllerCore extends AdminController if ($bookingInfo['id'] == $idBookingData) { $amtWithQty = $bookingInfo['amt_with_qty']; $bookingInfo['amt_with_qty'] = Tools::displayPrice($amtWithQty); - $bookingInfo['total_price'] = Tools::displayPrice($amtWithQty + $bookingInfo['demand_price']); + $bookingInfo['total_price'] = Tools::displayPrice($amtWithQty + $bookingInfo['demand_price'] + $bookingInfo['additional_service_price'] + $bookingInfo['additional_services_auto_add_price']); $response = array( 'curr_booking_info' => $bookingInfo, 'cart_info' => $this->ajaxReturnVars(), diff --git a/controllers/admin/AdminLanguagesController.php b/controllers/admin/AdminLanguagesController.php index f655284a7..f176f3517 100644 --- a/controllers/admin/AdminLanguagesController.php +++ b/controllers/admin/AdminLanguagesController.php @@ -552,7 +552,7 @@ class AdminLanguagesControllerCore extends AdminController } // Get all iso code available - if ($lang_packs = Tools::file_get_contents('http://www.prestashop.com/download/lang_packs/get_language_pack.php?version='.Tools::getValue('ps_version').'&iso_lang='.Tools::strtolower(Tools::getValue('iso_lang')))) { + if ($lang_packs = Tools::file_get_contents(_QLO_API_URL_.'/lang_pack/get_lang_pack.php?version='.Tools::getValue('ps_version').'&iso_lang='.Tools::strtolower(Tools::getValue('iso_lang')))) { $result = json_decode($lang_packs); if ($lang_packs !== '' && $result && !isset($result->error)) { $this->status = 'ok'; diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 8e76b8a48..250072782 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -391,12 +391,15 @@ class AdminOrdersControllerCore extends AdminController ); } - $this->page_header_toolbar_btn['print'] = array( - 'short' => $this->l('Print'), - 'href' => 'javascript:window.print()', - 'desc' => $this->l('Print order'), - 'class' => 'icon-print', - ); + if (HotelBookingDetail::getIdHotelByIdOrder($order->id, false) && !$this->lite_display) { + $this->page_header_toolbar_btn['booking_voucher'] = array( + 'short' => $this->l('Booking Voucher'), + 'href' => $this->context->link->getAdminLink('AdminPdf').'&submitAction=generateBookingVoucherPDF&id_order='.$order->id, + 'desc' => $this->l('View booking voucher'), + 'class' => 'icon-file-text', + 'target' => true, + ); + } if ($this->tabAccess['edit'] === 1) { if (((int) $order->isReturnable()) @@ -1031,7 +1034,11 @@ class AdminOrdersControllerCore extends AdminController $taxRulesGroups = TaxRulesGroup::getTaxRulesGroups(true); $smartyVars['taxRulesGroups'] = $taxRulesGroups; $smartyVars['invoices_collection'] = $objOrder->getInvoicesCollection(); - $smartyVars['customServiceAllowed'] = Configuration::get('PS_ALLOW_CREATE_CUSTOM_SERVICES_IN_BOOKING'); + $serviceProductAccess = Profile::getProfileAccess( + $this->context->employee->id_profile, + Tab::getIdFromClassName('AdminNormalProducts') + ); + $smartyVars['customServiceAllowed'] = $serviceProductAccess['add'] && Configuration::get('PS_ALLOW_CREATE_CUSTOM_SERVICES_IN_BOOKING'); $smartyVars['current_id_lang'] = $this->context->language->id; $this->context->smarty->assign($smartyVars); @@ -1346,6 +1353,8 @@ class AdminOrdersControllerCore extends AdminController parent::setMedia(); $this->addJqueryUI('ui.datepicker'); + $this->addJqueryUI('ui.tooltip', 'base', true); + $this->addJS(_PS_JS_DIR_.'vendor/d3.v3.min.js'); if ($this->display == 'view') { @@ -3215,6 +3224,7 @@ class AdminOrdersControllerCore extends AdminController if (!Validate::isLoadedObject($order = new Order(Tools::getValue('id_order')))) { return; } + if ($this->tabAccess['kpi'] === 1) { $this->content .= $this->renderKpis(); } @@ -3577,6 +3587,8 @@ class AdminOrdersControllerCore extends AdminController $order_detail_data[$key]['amt_with_qty_tax_incl'] = $value['total_price_tax_incl']; $order_detail_data[$key]['room_type_info'] = $objHotelRoomType->getRoomTypeInfoByIdProduct($value['id_product']); $order_detail_data[$key]['total_room_tax'] = $order_detail_data[$key]['total_room_price_ti'] - $order_detail_data[$key]['total_room_price_te']; + $order_detail_data[$key]['num_checkin_documents'] = HotelBookingDocument::getCountByIdHtlBooking($value['id']); + $order_detail_data[$key]['connected_rooms'] = HotelConnectedRoom::getConnectedRooms($value['id_room'], null, null, (int) Context::getContext()->language->id); if (isset($value['refund_info']) && $value['refund_info']['refunded'] @@ -3695,6 +3707,8 @@ class AdminOrdersControllerCore extends AdminController $objProduct = new Product(); $hotelStandaloneProducts = $objProduct->getServiceProducts(null, Product::SELLING_PREFERENCE_HOTEL_STANDALONE); $standaloneProducts = $objProduct->getServiceProducts(null, Product::SELLING_PREFERENCE_STANDALONE); + $cartRuleAccess = Profile::getProfileAccess($this->context->employee->id_profile, (int)Tab::getIdFromClassName('AdminCartRules')); + $addressAccess = Profile::getProfileAccess($this->context->employee->id_profile, (int)Tab::getIdFromClassName('AdminAddresses')); $this->tpl_view_vars = array( 'hotelStandaloneProducts' => $hotelStandaloneProducts, @@ -3762,6 +3776,8 @@ class AdminOrdersControllerCore extends AdminController 'iso_code_lang' => $this->context->language->iso_code, 'id_lang' => $this->context->language->id, 'can_edit' => ($this->tabAccess['edit'] === 1), + 'cartRuleAccess' => $cartRuleAccess, + 'addressAccess' => $addressAccess, 'current_id_lang' => $this->context->language->id, 'invoices_collection' => $order->getInvoicesCollection(), 'not_paid_invoices_collection' => $order->getNotPaidInvoicesCollection(), @@ -5164,8 +5180,8 @@ class AdminOrdersControllerCore extends AdminController $carrier = new Carrier((int)$order->id_carrier); $tax_calculator = $carrier->getTaxCalculator($invoice_address); - $order_invoice->total_paid_tax_excl = Tools::ps_round((float)$cart->getOrderTotal(false, $total_method), 2); - $order_invoice->total_paid_tax_incl = Tools::ps_round((float)$cart->getOrderTotal($use_taxes, $total_method), 2); + $order_invoice->total_paid_tax_excl = Tools::ps_round((float)$cart->getOrderTotal(false, $total_method), _PS_PRICE_COMPUTE_PRECISION_); + $order_invoice->total_paid_tax_incl = Tools::ps_round((float)$cart->getOrderTotal($use_taxes, $total_method), _PS_PRICE_COMPUTE_PRECISION_); $order_invoice->total_products = (float)$cart->getOrderTotal(false, Cart::ONLY_PRODUCTS); $order_invoice->total_products_wt = (float)$cart->getOrderTotal($use_taxes, Cart::ONLY_PRODUCTS); $order_invoice->total_shipping_tax_excl = (float)$cart->getTotalShippingCost(null, false); @@ -5402,7 +5418,8 @@ class AdminOrdersControllerCore extends AdminController $this->context->cart->id, $this->context->cookie->id_guest, $objCartBookingData->id_room, - 0 + 0, + 1 ); $objBookingDetail->total_price_tax_excl = $total_price['total_price_tax_excl']; $objBookingDetail->total_price_tax_incl = $total_price['total_price_tax_incl']; @@ -5722,8 +5739,8 @@ class AdminOrdersControllerCore extends AdminController $invoice_address = new Address((int) $objOrder->{Configuration::get('PS_TAX_ADDRESS_TYPE', null, null, $objOrder->id_shop)}); $carrier = new Carrier((int)$objOrder->id_carrier); $tax_calculator = $carrier->getTaxCalculator($invoice_address); - $objOrderInvoice->total_paid_tax_excl = Tools::ps_round((float)$objCart->getOrderTotal(false, $totalMethod), 2); - $objOrderInvoice->total_paid_tax_incl = Tools::ps_round((float)$objCart->getOrderTotal($useTaxes, $totalMethod), 2); + $objOrderInvoice->total_paid_tax_excl = Tools::ps_round((float)$objCart->getOrderTotal(false, $totalMethod), _PS_PRICE_COMPUTE_PRECISION_); + $objOrderInvoice->total_paid_tax_incl = Tools::ps_round((float)$objCart->getOrderTotal($useTaxes, $totalMethod), _PS_PRICE_COMPUTE_PRECISION_); $objOrderInvoice->total_products = (float)$objCart->getOrderTotal(false, Cart::ONLY_PRODUCTS); $objOrderInvoice->total_products_wt = (float)$objCart->getOrderTotal($useTaxes, Cart::ONLY_PRODUCTS); $objOrderInvoice->total_shipping_tax_excl = (float)$objCart->getTotalShippingCost(null, false); @@ -5864,25 +5881,28 @@ class AdminOrdersControllerCore extends AdminController $objOrderHistory->changeIdOrderState($idOrderState, $objOrder, $useExistingPayment); $objOrderHistory->add(); } else { - // check if new order amount is greater that old order amount and order payment is accepted - // then update order status to partial payment accepted $currentOrderState = $objOrder->getCurrentOrderState(); - $psOsPartialPaymentAccepted = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED'); - if ($currentOrderState->paid == 1 && $currentOrderState->id != $psOsPartialPaymentAccepted) { + if ($currentOrderState->paid == 1) { // calculate due amount $dueAmount = $objOrder->total_paid_tax_incl - $objOrder->total_paid_real; if ($dueAmount > 0) { - // now change order status to partial payment + $psOsPartialPaymentAccepted = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED'); + $psOSPaymentComplete = Configuration::get('PS_OS_PAYMENT_ACCEPTED'); + + if ($objOrder->total_paid_real == 0) { + $targetState = Configuration::get('PS_OS_AWAITING_PAYMENT'); + } elseif ($currentOrderState->id != $psOsPartialPaymentAccepted) { + $targetState = $psOsPartialPaymentAccepted; + } $objOrderHistory = new OrderHistory(); $objOrderHistory->id_order = $objOrder->id; $objOrderHistory->id_employee = (int) $this->context->employee->id; - $useExistingPayment = false; if (!$objOrder->hasInvoice()) { $useExistingPayment = true; } - $objOrderHistory->changeIdOrderState($psOsPartialPaymentAccepted, $objOrder, $useExistingPayment); + $objOrderHistory->changeIdOrderState($targetState, $objOrder, $useExistingPayment); $objOrderHistory->add(); } } @@ -5980,7 +6000,8 @@ class AdminOrdersControllerCore extends AdminController $cart->id, $cart->id_guest, $id_room, - 0 + 0, + 1 ); $totalRoomPriceAfterTE = (float) $roomTotalPrice['total_price_tax_excl']; @@ -7731,6 +7752,7 @@ class AdminOrdersControllerCore extends AdminController $response['hasError'] = true; $response['errors'][] = Tools::displayError('Error while updating service, please try again after refresing the page'); } else { + $this->sendChangedNotification($objOrder); $response['service_panel']= $servicesBlock = $this->processRenderServicesPanel( $objOrderDetail->id_order, $objHotelBookingDetail->id_product, @@ -7987,6 +8009,8 @@ class AdminOrdersControllerCore extends AdminController } } } + + $this->sendChangedNotification($order); $response['service_panel'] = $this->processRenderServicesPanel( $order->id, $objHotelBookingDetail->id_product, @@ -8269,6 +8293,7 @@ class AdminOrdersControllerCore extends AdminController // Save changes of order if ($objOrder->update()) { + $this->sendChangedNotification($objOrder); $response['service_panel'] = $this->processRenderServicesPanel( $objOrder->id, $objHotelBookingDetail->id_product, @@ -8522,7 +8547,7 @@ class AdminOrdersControllerCore extends AdminController $objBookingDetail->date_to ); } - $objBookingDemand->total_price_tax_excl = $totalPriceTaxIncl = Tools::processPriceRounding( + $objBookingDemand->total_price_tax_excl = $totalPriceTaxExcl = Tools::processPriceRounding( ($objBookingDemand->unit_price_tax_excl * $numDays), 1, $order->round_type, @@ -8622,7 +8647,7 @@ class AdminOrdersControllerCore extends AdminController $order->round_type, $order->round_mode ); - $objBookingDemand->total_price_tax_excl = Tools::processPriceRounding( + $objBookingDemand->total_price_tax_incl = Tools::processPriceRounding( ($objBookingDemand->unit_price_tax_incl * $numDays), 1, $order->round_type, @@ -8928,7 +8953,8 @@ class AdminOrdersControllerCore extends AdminController 0, 0, 0, - 0 + 0, + 1 ); if ($objHotelBooking->total_price_tax_excl != $newRoomTotalPrice['total_price_tax_excl']) { $result['has_price_changes'] = 1; diff --git a/controllers/admin/AdminPdfController.php b/controllers/admin/AdminPdfController.php index 2e534d75b..2b74dad25 100644 --- a/controllers/admin/AdminPdfController.php +++ b/controllers/admin/AdminPdfController.php @@ -64,6 +64,15 @@ class AdminPdfControllerCore extends AdminController } } + public function processGenerateBookingVoucherPDF() + { + if (Tools::isSubmit('id_order')) { + $this->generateBookingVoucherPDFByIdOrder(Tools::getValue('id_order')); + } else { + die(Tools::displayError('The order ID is missing.')); + } + } + public function processGenerateOrderSlipPDF() { $order_slip = new OrderSlip((int)Tools::getValue('id_order_slip')); @@ -225,6 +234,23 @@ class AdminPdfControllerCore extends AdminController $this->generatePDF($order_invoice, PDF::TEMPLATE_INVOICE); } + public function generateBookingVoucherPDFByIdOrder($id_order) + { + $order = new Order((int)$id_order); + if (!Validate::isLoadedObject($order)) { + die(Tools::displayError('The order cannot be found within your database.')); + } + + $objHotelBookingDetail = new HotelBookingDetail(); + $bookingDetails = $objHotelBookingDetail->getBookingDataByOrderId((int)$order->id); + if (empty($bookingDetails)) { + die(Tools::displayError('No booking voucher is available for this order.')); + } + + $pdf = new PDF($order, PDF::TEMPLATE_BOOKING_VOUCHER, Context::getContext()->smarty); + $pdf->render('I'); + } + public function generatePDF($object, $template) { $pdf = new PDF($object, $template, Context::getContext()->smarty); diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 9b8e1ab48..1664501e9 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -1602,7 +1602,8 @@ class AdminProductsControllerCore extends AdminController ) { $this->addJqueryUI(array( 'ui.core', - 'ui.widget' + 'ui.widget', + 'ui.tooltip' )); $this->addjQueryPlugin(array( @@ -3159,6 +3160,7 @@ class AdminProductsControllerCore extends AdminController $disableDates = $objRoomDisableDates->getRoomDisableDates($room['id']); $room['disable_dates_json'] = json_encode($disableDates); } + $room['connected_rooms_count'] = HotelConnectedRoom::getTotalConnectedRooms($room['id']); } $data->assign('htl_room_info', $hotelRoomInfo); @@ -3170,7 +3172,10 @@ class AdminProductsControllerCore extends AdminController 'product' => $obj, 'htl_info' => $hotelInfo, 'rm_status' => $roomStatus, - 'locale' => $this->context->language->iso_code + 'id_lang' => $this->context->language->id, + 'locale' => $this->context->language->iso_code, + 'room_type_acronym' => preg_replace( + '/(?:(?name[$this->context->language->id]), ) ); } else { @@ -3786,6 +3791,7 @@ class AdminProductsControllerCore extends AdminController $this->errors[] = $this->l('This room cannot be deleted as this room contains future booking.'); } if (empty($this->errors)) { + $response['affected_rooms'] = HotelConnectedRoom::getTotalConnectedRooms(null, $idRoom); if ($objRoomInfo->delete()) { $response['success'] = true; } else { @@ -5506,7 +5512,9 @@ class AdminProductsControllerCore extends AdminController if (empty($this->errors)) { foreach ($roomsInfo as $roomInfo) { $objHotelRoomInfo = new HotelRoomInformation($roomInfo['id']); - $objHotelRoomInfo->id_status = $roomInfo['id_status']; + if (!empty($roomInfo['id_status'])) { + $objHotelRoomInfo->id_status = $roomInfo['id_status']; + } if (isset($roomInfo['floor']) && $roomInfo['floor'] != '') { $objHotelRoomInfo->floor = $roomInfo['floor']; } @@ -5589,6 +5597,8 @@ class AdminProductsControllerCore extends AdminController $this->errors[] = Tools::displayError('Number of rooms is required.'); } else if (!Validate::isUnsignedInt($roomQuantity) || $roomQuantity < 1) { $this->errors[] = Tools::displayError('Invalid value for number of rooms.'); + } else if ($roomQuantity > 50) { + $this->errors[] = Tools::displayError('You cannot create more than 50 rooms at a time.'); } if (trim($comment = Tools::getValue('room_comment'))) { @@ -5618,16 +5628,19 @@ class AdminProductsControllerCore extends AdminController } if (empty($this->errors)) { - if (!$prefix) { - $roomsInfo['prefix'] = $objProduct->name[0].'R'; - } else { + if ($prefix) { $roomsInfo['prefix'] = $prefix; + } elseif (!(int) $roomNumber) { + $roomsInfo['prefix'] = preg_replace('/(?:(?name); + } else { + $roomsInfo['prefix'] = ''; } + $startingRoomNumber = (int) $roomNumber; for ($i = 0; $i < $roomQuantity; $i++) { $roomNum = $roomsInfo['prefix']; - if ((int) $roomNumber) { - $roomNum .= '-'.($roomNumber + $i); + if ($startingRoomNumber) { + $roomNum .= ($roomsInfo['prefix'] !== '' ? '-' : '').($startingRoomNumber + $i); } $objHotelRoomInfo = new HotelRoomInformation(); @@ -5707,4 +5720,102 @@ class AdminProductsControllerCore extends AdminController return $tpl->fetch(); } + + public function ajaxProcessGetNotConnectedRooms() + { + $roomId = (int) Tools::getValue('room_id'); + $roomTypeId = (int) Tools::getValue('room_type_id'); + $allGroups = HotelConnectedRoom::getNotConnectedRooms($roomId, $this->context->language->id); + $rooms = isset($allGroups[$roomTypeId]) ? $allGroups[$roomTypeId]['rooms'] : array(); + die(Tools::jsonEncode(['success' => true, 'rooms' => $rooms])); + } + + public function ajaxProcessInitConnectedRoomModal() + { + $response['hasError'] = 1; + $roomId = (int) Tools::getValue('room_id'); + $objRoom = new HotelRoomInformation($roomId); + $idProduct = (int) $objRoom->id_product; + $idHotel = (int) $objRoom->id_hotel; + + $this->context->smarty->assign(array( + 'htl_connected_rooms' => HotelConnectedRoom::getConnectedRooms($roomId, null, null, $this->context->language->id), + 'htl_not_connected_rooms' => HotelConnectedRoom::getNotConnectedRooms($roomId, $this->context->language->id), + 'main_room_id' => $roomId, + 'current_roomtype' => $idProduct, + )); + + $modal = array( + 'modal_id' => 'connectedRoomModal', + 'modal_class' => 'modal-md', + 'modal_title' => '  '.$this->l('Connected Room').' ', + 'modal_content' => $this->context->smarty->fetch('controllers/products/modal-connected-rooms.tpl'), + 'modal_actions' => array(), + ); + + $this->context->smarty->assign($modal); + $response['hasError'] = 0; + $response['modalHtml'] = $this->context->smarty->fetch('modal.tpl'); + + die(Tools::jsonEncode($response)); + } + + public function ajaxProcessManageConnectedRoom() + { + if ($this->tabAccess['edit'] !== 1) { + die(json_encode(['success' => false, 'message' => $this->l('You do not have permission to edit this.')])); + } + + $mode = Tools::getValue('mode'); + $roomId = (int) Tools::getValue('room_id'); + $connectedRoomId = (int) Tools::getValue('connected_room_id'); + $connectedId = (int) Tools::getValue('connected_id'); + $objRoom = new HotelRoomInformation($roomId); + $idProduct = (int) $objRoom->id_product; + $idHotel = (int) $objRoom->id_hotel; + + if ($mode === 'add') { + $connection = new HotelConnectedRoom(); + $connection->id_room = $roomId; + $connection->id_room_connected = $connectedRoomId; + if ($connection->add()) { + $this->context->smarty->assign(array( + 'htl_connected_rooms' => HotelConnectedRoom::getConnectedRooms($roomId, null, null, $this->context->language->id), + 'htl_not_connected_rooms' => HotelConnectedRoom::getNotConnectedRooms($roomId, $this->context->language->id), + 'main_room_id' => $roomId, + 'current_roomtype' => $idProduct, + )); + die(json_encode([ + 'html' => $this->context->smarty->fetch('controllers/products/modal-connected-rooms.tpl'), + 'success' => true, + 'message' => $this->l('Room connected successfully.'), + 'connected_count' => HotelConnectedRoom::getTotalConnectedRooms($roomId), + ])); + } + die(json_encode(['success' => false, 'message' => $this->l('Failed to connect room.')])); + } + + if ($mode === 'delete') { + if (!$connectedId) { + die(json_encode(['success' => false, 'message' => $this->l('Invalid data.')])); + } + $objHotelConnectedRoom = new HotelConnectedRoom($connectedId); + if ($objHotelConnectedRoom->delete()) { + $this->context->smarty->assign(array( + 'htl_connected_rooms' => HotelConnectedRoom::getConnectedRooms($roomId, null, null, $this->context->language->id), + 'htl_not_connected_rooms' => HotelConnectedRoom::getNotConnectedRooms($roomId, $this->context->language->id), + 'main_room_id' => $roomId, + 'current_roomtype' => $idProduct, + )); + die(json_encode([ + 'success' => true, + 'html' => $this->context->smarty->fetch('controllers/products/modal-connected-rooms.tpl'), + 'message' => $this->l('Connected room removed successfully.'), + 'connected_count' => HotelConnectedRoom::getTotalConnectedRooms($roomId), + ])); + } + die(json_encode(['success' => false, 'message' => $this->l('Failed to remove connected room.')])); + } + } + } diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php index f83b1fd7e..f00addd43 100644 --- a/controllers/front/OrderConfirmationController.php +++ b/controllers/front/OrderConfirmationController.php @@ -201,8 +201,8 @@ class OrderConfirmationControllerCore extends FrontController //// By webkul New way to calculate product prices with feature Prices $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days; - $cart_htl_data[$type_key]['date_diff'][$date_join]['amount_tax_incl'] = $data_v['total_price_tax_incl']*$var_quant; - $cart_htl_data[$type_key]['date_diff'][$date_join]['amount_tax_excl'] = $data_v['total_price_tax_excl']*$var_quant; + $cart_htl_data[$type_key]['date_diff'][$date_join]['amount_tax_incl'] += $data_v['total_price_tax_incl']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['amount_tax_excl'] += $data_v['total_price_tax_excl']; $cart_htl_data[$type_key]['date_diff'][$date_join]['is_backorder'] = $data_v['is_back_order']; if ($data_v['is_back_order']) { $any_back_order = 1; diff --git a/controllers/front/PdfBookingVoucherController.php b/controllers/front/PdfBookingVoucherController.php new file mode 100644 index 000000000..0ba3302c9 --- /dev/null +++ b/controllers/front/PdfBookingVoucherController.php @@ -0,0 +1,70 @@ +context->customer->isLogged() && !Tools::getValue('secure_key')) { + Tools::redirect('index.php?controller=authentication&back=pdf-booking-voucher'); + } + + $idOrder = (int)Tools::getValue('id_order'); + if (!Validate::isUnsignedId($idOrder)) { + die(Tools::displayError('The booking voucher was not found.')); + } + + $order = new Order($idOrder); + if (!Validate::isLoadedObject($order)) { + die(Tools::displayError('The booking voucher was not found.')); + } + + $secureKey = Tools::getValue('secure_key'); + if ($secureKey) { + if ($order->secure_key !== $secureKey) { + die(Tools::displayError('The booking voucher was not found.')); + } + } elseif ($order->id_customer != (int)$this->context->customer->id) { + die(Tools::displayError('The booking voucher was not found.')); + } + + $this->order = $order; + } + + public function display() + { + $pdf = new PDF($this->order, PDF::TEMPLATE_BOOKING_VOUCHER, $this->context->smarty); + $pdf->render(); + } +} diff --git a/install/classes/datas.php b/install/classes/datas.php index f002ca12d..a5b3cf59c 100644 --- a/install/classes/datas.php +++ b/install/classes/datas.php @@ -150,7 +150,12 @@ class Datas 'name' => 'newsletter', 'default' => 1, 'help' => 'Get news from QloApps', - ) + ), + 'enable_ssl' => array( + 'name' => 'ssl', + 'default' => 0, + 'help' => 'Enable SSL for QloApps', + ), ); protected $datas = array(); diff --git a/install/controllers/console/process.php b/install/controllers/console/process.php index def56c22b..ffa033860 100644 --- a/install/controllers/console/process.php +++ b/install/controllers/console/process.php @@ -238,6 +238,7 @@ class InstallControllerConsoleProcess extends InstallControllerConsole 'admin_lastname' => $this->datas->admin_lastname, 'admin_password' => $this->datas->admin_password, 'admin_email' => $this->datas->admin_email, + 'enable_ssl' => $this->datas->enable_ssl, 'marketing_consent' => $this->datas->marketing_consent, 'configuration_agrement' => true, 'send_informations' => true, diff --git a/install/data/db_structure.sql b/install/data/db_structure.sql index 9520ec459..097000718 100644 --- a/install/data/db_structure.sql +++ b/install/data/db_structure.sql @@ -1496,7 +1496,7 @@ CREATE TABLE `PREFIX_order_payment` ( `id_order_payment` INT NOT NULL auto_increment, `order_reference` VARCHAR(9), `id_currency` INT UNSIGNED NOT NULL, - `amount` DECIMAL(10,2) NOT NULL, + `amount` DECIMAL(20,6) NOT NULL, `payment_method` varchar(255) NOT NULL, `payment_type` INT UNSIGNED NOT NULL, `conversion_rate` decimal(13,6) NOT NULL DEFAULT 1, @@ -1514,7 +1514,7 @@ CREATE TABLE `PREFIX_order_payment_detail` ( `id_order_payment_detail` INT(10) unsigned NOT NULL auto_increment, `id_order_payment` INT(10) unsigned NOT NULL, `id_order` INT(10) unsigned NOT NULL, - `amount` DECIMAL(10,2) NOT NULL, + `amount` DECIMAL(20,6) NOT NULL, `receipt_number` INT(10) NOT NULL, `date_add` DATETIME NOT NULL, PRIMARY KEY (`id_order_payment_detail`) diff --git a/install/data/xml/meta.xml b/install/data/xml/meta.xml index 4c9a0b225..581bd5ca3 100644 --- a/install/data/xml/meta.xml +++ b/install/data/xml/meta.xml @@ -32,14 +32,18 @@ password 1 + + supplier 1 @@ -92,14 +96,18 @@ order 1 + + order-opc 1 @@ -144,10 +152,12 @@ module-cashondelivery-validation 0 + our-properties 1 diff --git a/install/data/xml/theme_meta.xml b/install/data/xml/theme_meta.xml index ce42c1a27..0a23d98fd 100644 --- a/install/data/xml/theme_meta.xml +++ b/install/data/xml/theme_meta.xml @@ -39,9 +39,5 @@ - - - - diff --git a/install/langs/bg/data/meta.xml b/install/langs/bg/data/meta.xml index 2cb836a57..477b6da88 100644 --- a/install/langs/bg/data/meta.xml +++ b/install/langs/bg/data/meta.xml @@ -19,8 +19,8 @@ contact-us - Hotel Prime - A place where comfort and luxury are blended with nature! + + @@ -42,18 +42,22 @@ password-recovery + + Suppliers Suppliers list @@ -138,18 +142,22 @@ order + + Order @@ -168,10 +176,12 @@ order-confirmation + diff --git a/install/langs/bn/data/meta.xml b/install/langs/bn/data/meta.xml index 57422b652..712181078 100644 --- a/install/langs/bn/data/meta.xml +++ b/install/langs/bn/data/meta.xml @@ -19,8 +19,8 @@ contact-us - হোটেল প্রাইম - এটি এমন একটি স্থান যেখানে আরাম এবং বিলাসিতা প্রকৃতির সাথে মিলিত হয়েছে! + + @@ -42,18 +42,22 @@ password-recovery + + সরবরাহকারী সরবরাহকারির তালিকা @@ -138,18 +142,22 @@ order + + অর্ডার @@ -168,10 +176,12 @@ order-confirmation + diff --git a/install/langs/br/data/meta.xml b/install/langs/br/data/meta.xml index 064e8ab57..ce3e8cbb4 100644 --- a/install/langs/br/data/meta.xml +++ b/install/langs/br/data/meta.xml @@ -19,8 +19,8 @@ entrar-em-contato-conosco - Hotel Prime - Um lugar onde o conforto e o luxo se misturam com a natureza! + + @@ -42,18 +42,22 @@ forgot, password, e-mail, new, reset recuperar-senha + + Fornecedores Lista de fornecedores @@ -138,18 +142,22 @@ pedido + + Pedido @@ -168,10 +176,12 @@ confirmação-do-pedido + diff --git a/install/langs/cs/data/meta.xml b/install/langs/cs/data/meta.xml index c566a1a06..d15d88d00 100644 --- a/install/langs/cs/data/meta.xml +++ b/install/langs/cs/data/meta.xml @@ -19,8 +19,8 @@ napiste-nam - Hotel Prime - Místo, kde se komfort a luxus mísí s přírodou! + + @@ -42,18 +42,22 @@ password-recovery + + Dodavatelé Suppliers list @@ -138,18 +142,22 @@ objednavka + + Rychlá Objednávka @@ -168,10 +176,12 @@ potvrzeni-objednavky + diff --git a/install/langs/de/data/meta.xml b/install/langs/de/data/meta.xml index f79a747c2..b490fa981 100644 --- a/install/langs/de/data/meta.xml +++ b/install/langs/de/data/meta.xml @@ -19,8 +19,8 @@ kontaktieren-sie-uns - Hotel Prime - Ein Ort, an dem Komfort und Luxus mit der Natur verschmelzen! + + @@ -42,18 +42,22 @@ vergessen, Kennwort, E-Mail, neu, Reset kennwort-wiederherstellung + + Zulieferer Zuliefererliste @@ -138,18 +142,22 @@ bestellung + + Bestellung @@ -168,10 +176,12 @@ bestellbestatigung + diff --git a/install/langs/en/data/meta.xml b/install/langs/en/data/meta.xml index 531c61efb..5f4fa253b 100644 --- a/install/langs/en/data/meta.xml +++ b/install/langs/en/data/meta.xml @@ -19,8 +19,8 @@ contact-us - Hotel Prime - A place where comfort and luxury are blended with nature! + + @@ -42,18 +42,22 @@ password-recovery + + Suppliers Suppliers list @@ -138,18 +142,22 @@ order + + Order @@ -168,10 +176,12 @@ order-confirmation + diff --git a/install/langs/es/data/meta.xml b/install/langs/es/data/meta.xml index ba7665bca..2f7f8eb60 100644 --- a/install/langs/es/data/meta.xml +++ b/install/langs/es/data/meta.xml @@ -19,8 +19,8 @@ contactanos - Hotel Prime - ¡Un lugar donde el confort y el lujo se mezclan con la naturaleza! + + @@ -42,18 +42,22 @@ contraseña, has olvidado, e-mail, nuevo, regeneración recuperacion-contraseña + + Proveedores Lista de proveedores @@ -138,18 +142,22 @@ pedido + + Pedido @@ -168,10 +176,12 @@ confirmacion-pedido + diff --git a/install/langs/fa/data/meta.xml b/install/langs/fa/data/meta.xml index 6cccce71b..efe792c08 100644 --- a/install/langs/fa/data/meta.xml +++ b/install/langs/fa/data/meta.xml @@ -19,8 +19,8 @@ contact-us - هتل پرایم - مکانی که در آن راحتی و لوکس بودن با طبیعت ترکیب شده‌اند! + + @@ -42,18 +42,22 @@ password-recovery + + تامین کننده ها لیست تامین کننده ها @@ -138,18 +142,22 @@ order + + سفارش @@ -168,10 +176,12 @@ order-confirmation + diff --git a/install/langs/fr/data/meta.xml b/install/langs/fr/data/meta.xml index 5939be426..a3f4b6356 100644 --- a/install/langs/fr/data/meta.xml +++ b/install/langs/fr/data/meta.xml @@ -19,8 +19,8 @@ nous-contacter - Hôtel Prime - Un endroit où le confort et le luxe se mélangent avec la nature ! + + @@ -42,18 +42,22 @@ recuperation-mot-de-passe + + Fournisseurs Liste des fournisseurs @@ -138,18 +142,22 @@ commande + + Commande @@ -168,10 +176,12 @@ confirmation-commande + diff --git a/install/langs/he/data/meta.xml b/install/langs/he/data/meta.xml index 758bcf4fb..6e4e74b0c 100644 --- a/install/langs/he/data/meta.xml +++ b/install/langs/he/data/meta.xml @@ -19,8 +19,8 @@ צור-קשר - מלון פריים - מקום שבו נוחות ולוקסוס משתלבים עם הטבע! + + @@ -42,18 +42,22 @@ שחזור-סיסמה + + ספקים רשימת ספקים @@ -138,18 +142,22 @@ הזמנה + + הזמנה @@ -168,10 +176,12 @@ אימות-הזמנה + diff --git a/install/langs/hr/data/meta.xml b/install/langs/hr/data/meta.xml index 7057dfacb..c1b1b4d50 100644 --- a/install/langs/hr/data/meta.xml +++ b/install/langs/hr/data/meta.xml @@ -19,8 +19,8 @@ contact-us - Hotel Prime - A place where comfort and luxury are blended with nature! + + @@ -42,18 +42,22 @@ password-recovery + + Suppliers Suppliers list @@ -138,18 +142,22 @@ order + + Order @@ -168,10 +176,12 @@ order-confirmation + diff --git a/install/langs/hu/data/meta.xml b/install/langs/hu/data/meta.xml index 8d36562c3..2eaba831e 100644 --- a/install/langs/hu/data/meta.xml +++ b/install/langs/hu/data/meta.xml @@ -19,8 +19,8 @@ contact-us - Hotel Prime - A place where comfort and luxury are blended with nature! + + @@ -42,18 +42,22 @@ password-recovery + + Suppliers Suppliers list @@ -138,18 +142,22 @@ order + + Order @@ -168,10 +176,12 @@ order-confirmation + diff --git a/install/langs/id/data/meta.xml b/install/langs/id/data/meta.xml index 77819f8cd..a2d237d81 100644 --- a/install/langs/id/data/meta.xml +++ b/install/langs/id/data/meta.xml @@ -19,8 +19,8 @@ hubungi-kami - Hotel Prime - Tempat di mana kenyamanan dan kemewahan berpadu dengan alam! + + @@ -42,18 +42,22 @@ forgot, password, e-mail, new, reset lupa-password + + Supplier Daftar supplier @@ -138,18 +142,22 @@ order + + Order @@ -168,10 +176,12 @@ konfirmasi-pembelian + diff --git a/install/langs/it/data/meta.xml b/install/langs/it/data/meta.xml index 22485f8c0..d76e76389 100644 --- a/install/langs/it/data/meta.xml +++ b/install/langs/it/data/meta.xml @@ -19,8 +19,8 @@ contattarci - Hotel Prime -Un luogo dove il comfort e il lusso si mescolano con la natura! + + @@ -42,18 +42,22 @@ dimenticato, password, e-mail, nuovo, reset recupero-password + + Fornitori Elenco fornitori @@ -138,18 +142,22 @@ ordine + + Ordine @@ -168,10 +176,12 @@ conferma-ordine + diff --git a/install/langs/lt/data/meta.xml b/install/langs/lt/data/meta.xml index 3a18628ef..9edaf7602 100644 --- a/install/langs/lt/data/meta.xml +++ b/install/langs/lt/data/meta.xml @@ -19,8 +19,8 @@ contact-us - Hotel Prime - Vieta, kur komfortas ir prabanga dera su gamta! + + @@ -42,18 +42,22 @@ password-recovery + + Suppliers Suppliers list @@ -138,18 +142,22 @@ order + + Order @@ -168,10 +176,12 @@ order-confirmation + diff --git a/install/langs/mk/data/meta.xml b/install/langs/mk/data/meta.xml index 541576642..56f0d3810 100644 --- a/install/langs/mk/data/meta.xml +++ b/install/langs/mk/data/meta.xml @@ -19,8 +19,8 @@ contact-us - Hotel Prime - A place where comfort and luxury are blended with nature! + + @@ -42,18 +42,22 @@ password-recovery + + Suppliers Suppliers list @@ -138,18 +142,22 @@ order + + Order @@ -168,10 +176,12 @@ order-confirmation + diff --git a/install/langs/nl/data/meta.xml b/install/langs/nl/data/meta.xml index 3a6cfe94d..d2ad17c19 100644 --- a/install/langs/nl/data/meta.xml +++ b/install/langs/nl/data/meta.xml @@ -19,8 +19,8 @@ contact-met-ons-opnemen - Hotel Prime - Een plek waar comfort en luxe samengaan met de natuur! + + @@ -42,18 +42,22 @@ forgot, password, e-mail, new, reset wachtwoord-opvragen + + Leveranciers Lijst met leveranciers @@ -132,18 +136,22 @@ bestelling + + Bestelling @@ -162,10 +170,12 @@ order-bevestiging + diff --git a/install/langs/no/data/meta.xml b/install/langs/no/data/meta.xml index 9fb17959f..442acfa9e 100644 --- a/install/langs/no/data/meta.xml +++ b/install/langs/no/data/meta.xml @@ -19,8 +19,8 @@ contact-us - Hotel Prime - A place where comfort and luxury are blended with nature! + + @@ -42,18 +42,22 @@ password-recovery + + Suppliers Suppliers list @@ -138,18 +142,22 @@ order + + Order @@ -168,10 +176,12 @@ order-confirmation + diff --git a/install/langs/pl/data/meta.xml b/install/langs/pl/data/meta.xml index 0934c53e1..61c8f1c8c 100644 --- a/install/langs/pl/data/meta.xml +++ b/install/langs/pl/data/meta.xml @@ -19,8 +19,8 @@ kontakt - Hotel Prime - Miejsce, gdzie komfort i luksus łączą się z naturą! + + @@ -42,18 +42,22 @@ przypomnienie, hasło, e-mail, nowy odzyskiwanie-hasla + + Dostawcy Lista dostawców @@ -138,18 +142,22 @@ zamowienie + + Zamówienie @@ -168,10 +176,12 @@ potwierdzenie-zamowienia + diff --git a/install/langs/pt/data/meta.xml b/install/langs/pt/data/meta.xml index 25504b1e0..f46abbe2d 100644 --- a/install/langs/pt/data/meta.xml +++ b/install/langs/pt/data/meta.xml @@ -19,8 +19,8 @@ contacte-nos - Hotel Prime - Um lugar onde o conforto e o luxo se misturam com a natureza! + + @@ -42,18 +42,22 @@ esqueci-me, recuperar, palavra-passe, e-mail, nova, reset recuperar-palavra-passe + + Fornecedores Lista de Fornecedores @@ -138,18 +142,22 @@ encomenda + + Encomenda Rápida @@ -168,10 +176,12 @@ confirmacao-encomenda + diff --git a/install/langs/qc/data/meta.xml b/install/langs/qc/data/meta.xml index 551c9e9e9..d83c56aa5 100644 --- a/install/langs/qc/data/meta.xml +++ b/install/langs/qc/data/meta.xml @@ -19,8 +19,8 @@ nous-contacter - Hôtel Prime - Un endroit où le confort et le luxe se mêlent à la nature ! + + @@ -42,18 +42,22 @@ recuperation-mot-de-passe + + Fournisseurs Liste des fournisseurs @@ -132,18 +136,22 @@ commande + + Commande @@ -162,10 +170,12 @@ confirmation-commande + diff --git a/install/langs/ro/data/meta.xml b/install/langs/ro/data/meta.xml index 1183e23ba..6b93eee1e 100644 --- a/install/langs/ro/data/meta.xml +++ b/install/langs/ro/data/meta.xml @@ -19,8 +19,8 @@ contact - Hotel Prime - Un loc unde confortul și luxul se îmbină cu natura! + + @@ -42,18 +42,22 @@ recuperare-parola + + Furnizori Lista furnizorilor @@ -138,18 +142,22 @@ comanda + + Comandă @@ -168,10 +176,12 @@ confirmare-comanda + diff --git a/install/langs/ru/data/meta.xml b/install/langs/ru/data/meta.xml index f32b4d38c..908c81c4b 100644 --- a/install/langs/ru/data/meta.xml +++ b/install/langs/ru/data/meta.xml @@ -19,8 +19,8 @@ contact-us - Отель Прайм - Место, где комфорт и роскошь сочетаются с природой! + + @@ -42,18 +42,22 @@ забыли пароль, e-mail, новый пароль,восстановить пароль password-recovery + + Поставщики Список поставщиков @@ -138,18 +142,22 @@ order + + Быстрый заказ @@ -162,10 +170,12 @@ guest-tracking + diff --git a/install/langs/si/data/meta.xml b/install/langs/si/data/meta.xml index 33e1e78b2..a6b3d6a23 100644 --- a/install/langs/si/data/meta.xml +++ b/install/langs/si/data/meta.xml @@ -19,8 +19,8 @@ contact-us - Hotel Prime - A place where comfort and luxury are blended with nature! + + @@ -42,18 +42,22 @@ password-recovery + + Suppliers Suppliers list @@ -138,18 +142,22 @@ order + + Order @@ -168,10 +176,12 @@ order-confirmation + diff --git a/install/langs/sr/data/meta.xml b/install/langs/sr/data/meta.xml index 1c68f04c5..7aff1d638 100644 --- a/install/langs/sr/data/meta.xml +++ b/install/langs/sr/data/meta.xml @@ -19,8 +19,8 @@ contact-us - Hotel Prime - A place where comfort and luxury are blended with nature! + + @@ -42,18 +42,22 @@ password-recovery + + Suppliers Suppliers list @@ -138,18 +142,22 @@ order + + Order @@ -168,10 +176,12 @@ order-confirmation + diff --git a/install/langs/sv/data/meta.xml b/install/langs/sv/data/meta.xml index 0c8036887..ef818fd95 100644 --- a/install/langs/sv/data/meta.xml +++ b/install/langs/sv/data/meta.xml @@ -19,8 +19,8 @@ contact-us - Hotel Prime - A place where comfort and luxury are blended with nature! + + @@ -42,18 +42,22 @@ password-recovery + + Suppliers Suppliers list @@ -138,18 +142,22 @@ order + + Order @@ -168,10 +176,12 @@ order-confirmation + diff --git a/install/langs/tw/data/meta.xml b/install/langs/tw/data/meta.xml index c1a2ca7ed..a73b12ef7 100644 --- a/install/langs/tw/data/meta.xml +++ b/install/langs/tw/data/meta.xml @@ -19,8 +19,8 @@ contact-us - Prime 酒店 - 一個舒適與奢華與自然融合的地方！ + + @@ -42,18 +42,22 @@ forgot, password, e-mail, new, reset password-recovery + + 供應商 供應商列表 @@ -138,18 +142,22 @@ order + + 訂單 @@ -168,10 +176,12 @@ order-confirmation + diff --git a/install/langs/vn/data/meta.xml b/install/langs/vn/data/meta.xml index 69a0bba3d..1a84b1dc9 100644 --- a/install/langs/vn/data/meta.xml +++ b/install/langs/vn/data/meta.xml @@ -19,8 +19,8 @@ contact-us - Khách sạn Prime - Nơi mà sự thoải mái và sang trọng hòa quyện với thiên nhiên! + + @@ -42,18 +42,22 @@ password-recovery + + Nhà cung cấp Suppliers list @@ -138,18 +142,22 @@ order + + Đơn hàng @@ -168,10 +176,12 @@ order-confirmation + diff --git a/install/langs/zh/data/meta.xml b/install/langs/zh/data/meta.xml index 9fb5a12ce..2c6fe190c 100644 --- a/install/langs/zh/data/meta.xml +++ b/install/langs/zh/data/meta.xml @@ -19,8 +19,8 @@ contact-us - Hotel Prime - A place where comfort and luxury are blended with nature! + + @@ -42,18 +42,22 @@ password-recovery + + Suppliers Suppliers list @@ -138,18 +142,22 @@ order + + Order @@ -168,10 +176,12 @@ order-confirmation + diff --git a/localization/ae.xml b/localization/ae.xml index a396613dc..5eb9b97c9 100644 --- a/localization/ae.xml +++ b/localization/ae.xml @@ -1,7 +1,7 @@ - + diff --git a/localization/ar.xml b/localization/ar.xml index aafcb96b3..cc36fc4ab 100644 --- a/localization/ar.xml +++ b/localization/ar.xml @@ -1,24 +1,60 @@ - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/at.xml b/localization/at.xml index 4bb93470f..08d288a82 100644 --- a/localization/at.xml +++ b/localization/at.xml @@ -1,7 +1,7 @@ - + @@ -9,33 +9,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -44,8 +47,10 @@ + + @@ -64,7 +69,37 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -74,8 +109,10 @@ + + @@ -94,7 +131,6 @@ - @@ -104,8 +140,10 @@ + + @@ -124,39 +162,81 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/au.xml b/localization/au.xml index 99110438c..3bd2b2b46 100644 --- a/localization/au.xml +++ b/localization/au.xml @@ -3,9 +3,9 @@ - + - + diff --git a/localization/az.xml b/localization/az.xml index 943719eb8..bfa97f6b5 100644 --- a/localization/az.xml +++ b/localization/az.xml @@ -1,22 +1,21 @@ - + - - - + + - - + + diff --git a/localization/be.xml b/localization/be.xml index 7b5a99eb6..0c8f73aee 100644 --- a/localization/be.xml +++ b/localization/be.xml @@ -1,7 +1,7 @@ - + @@ -18,12 +18,12 @@ - + - + - + @@ -31,14 +31,15 @@ - - - - - - - - + + + + + + + + + @@ -47,8 +48,10 @@ + + @@ -67,7 +70,6 @@ - @@ -77,8 +79,10 @@ + + @@ -97,7 +101,6 @@ - @@ -107,8 +110,10 @@ + + @@ -127,7 +132,6 @@ - @@ -137,8 +141,10 @@ + + @@ -157,7 +163,6 @@ - @@ -167,8 +172,10 @@ + + @@ -187,7 +194,6 @@ - @@ -210,14 +216,15 @@ - - - - - - - - + + + + + + + + + diff --git a/localization/bg.xml b/localization/bg.xml index 52c894980..0b3abab14 100644 --- a/localization/bg.xml +++ b/localization/bg.xml @@ -1,41 +1,43 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -44,8 +46,10 @@ + + @@ -64,9 +68,8 @@ - - + @@ -74,8 +77,10 @@ + + @@ -94,99 +99,100 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/bo.xml b/localization/bo.xml index f7e53312b..f38a844f9 100644 --- a/localization/bo.xml +++ b/localization/bo.xml @@ -1,18 +1,29 @@ - + - + + + + + + + + + + + + diff --git a/localization/br.xml b/localization/br.xml index 4e4324b1c..cc6cd8082 100644 --- a/localization/br.xml +++ b/localization/br.xml @@ -1,7 +1,7 @@ - + @@ -9,7 +9,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/localization/by.xml b/localization/by.xml index 226d187b1..7d43300fc 100644 --- a/localization/by.xml +++ b/localization/by.xml @@ -1,24 +1,16 @@ - + + - + - - - - - - - - - diff --git a/localization/ca.xml b/localization/ca.xml index 10abd6e9f..778fe2cf1 100644 --- a/localization/ca.xml +++ b/localization/ca.xml @@ -1,7 +1,7 @@ - + diff --git a/localization/ch.xml b/localization/ch.xml index bccf7b12f..2e066ef80 100644 --- a/localization/ch.xml +++ b/localization/ch.xml @@ -1,7 +1,7 @@ - + @@ -9,15 +9,15 @@ - - + + - + - + @@ -25,6 +25,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/cl.xml b/localization/cl.xml index 36c79c76a..8e641ad7a 100644 --- a/localization/cl.xml +++ b/localization/cl.xml @@ -1,18 +1,36 @@ - + - + + + + + + + + + + + + + + + + + + + diff --git a/localization/cn.xml b/localization/cn.xml index e89d3407a..c1aef4abe 100644 --- a/localization/cn.xml +++ b/localization/cn.xml @@ -1,33 +1,28 @@ - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/localization/co.xml b/localization/co.xml index 0e90a27af..b4247ceb5 100644 --- a/localization/co.xml +++ b/localization/co.xml @@ -1,7 +1,7 @@ - + @@ -9,10 +9,20 @@ - + + + + + + + + + + + @@ -25,19 +35,19 @@ - - - + + + - + - - + + - + @@ -46,14 +56,14 @@ - + - + - + diff --git a/localization/cr.xml b/localization/cr.xml index bec413be0..4df95b314 100644 --- a/localization/cr.xml +++ b/localization/cr.xml @@ -1,17 +1,37 @@ - + + + + + + + + + + + + + + + + + + + + + @@ -19,13 +39,4 @@ - - - - - - - - - - \ No newline at end of file + diff --git a/localization/cy.xml b/localization/cy.xml index c4bd10aef..4d6d09e9c 100644 --- a/localization/cy.xml +++ b/localization/cy.xml @@ -1,7 +1,7 @@ - + @@ -17,12 +17,12 @@ - + - + - + @@ -30,14 +30,15 @@ - - - - - - - - + + + + + + + + + @@ -46,8 +47,10 @@ + + @@ -66,7 +69,6 @@ - @@ -76,8 +78,10 @@ + + @@ -96,7 +100,6 @@ - @@ -106,8 +109,10 @@ + + @@ -126,7 +131,6 @@ - @@ -136,8 +140,10 @@ + + @@ -156,7 +162,6 @@ - @@ -179,16 +184,25 @@ - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/localization/cz.xml b/localization/cz.xml index c5f0ca17b..f3e2437a6 100644 --- a/localization/cz.xml +++ b/localization/cz.xml @@ -1,27 +1,26 @@ - - + - + - + - + - + @@ -29,15 +28,16 @@ - - - - - - - - - + + + + + + + + + + @@ -45,8 +45,10 @@ + + @@ -65,37 +67,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -118,19 +120,20 @@ - - - - - - - - + + + + + + + + + - + diff --git a/localization/de.xml b/localization/de.xml index 2434f4db6..8185b7996 100644 --- a/localization/de.xml +++ b/localization/de.xml @@ -1,7 +1,7 @@ - + @@ -15,12 +15,12 @@ - + - + - + @@ -28,14 +28,15 @@ - - - - - - - - + + + + + + + + + @@ -44,8 +45,10 @@ + + @@ -64,7 +67,6 @@ - @@ -74,8 +76,10 @@ + + @@ -94,7 +98,6 @@ - @@ -104,8 +107,10 @@ + + @@ -124,7 +129,6 @@ - @@ -134,8 +138,10 @@ + + @@ -154,7 +160,6 @@ - @@ -177,16 +182,35 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/default.xml b/localization/default.xml index 8ec509490..8fcb7ed83 100644 --- a/localization/default.xml +++ b/localization/default.xml @@ -1,8 +1,8 @@ - - + + diff --git a/localization/dk.xml b/localization/dk.xml index 2be976cac..57e37c487 100644 --- a/localization/dk.xml +++ b/localization/dk.xml @@ -1,7 +1,7 @@ - + @@ -14,12 +14,12 @@ - + - + - + @@ -27,14 +27,15 @@ - - - - - - - - + + + + + + + + + @@ -43,8 +44,10 @@ + + @@ -63,67 +66,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -146,21 +88,29 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + diff --git a/localization/do.xml b/localization/do.xml index b23cc8d0e..402be211a 100644 --- a/localization/do.xml +++ b/localization/do.xml @@ -1,23 +1,67 @@ - + - - - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/ec.xml b/localization/ec.xml index 576eb47f2..bf5f2e3ab 100644 --- a/localization/ec.xml +++ b/localization/ec.xml @@ -1,18 +1,48 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/ee.xml b/localization/ee.xml index de7fb9c70..93b110476 100644 --- a/localization/ee.xml +++ b/localization/ee.xml @@ -1,13 +1,13 @@ - + - + @@ -17,10 +17,10 @@ - + - + @@ -28,14 +28,15 @@ - - - - - - - - + + + + + + + + + @@ -44,8 +45,10 @@ + + @@ -64,7 +67,6 @@ - @@ -74,8 +76,10 @@ + + @@ -94,7 +98,6 @@ - @@ -104,8 +107,10 @@ + + @@ -124,7 +129,6 @@ - @@ -134,8 +138,10 @@ + + @@ -154,7 +160,6 @@ - @@ -177,16 +182,35 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/eg.xml b/localization/eg.xml index b7eea09a7..8f42819e7 100644 --- a/localization/eg.xml +++ b/localization/eg.xml @@ -1,21 +1,25 @@ - + - - - - + + + + + - - + + + + + diff --git a/localization/es.xml b/localization/es.xml index 55be33e0c..bbd1ab212 100644 --- a/localization/es.xml +++ b/localization/es.xml @@ -1,12 +1,10 @@ - + - - @@ -19,11 +17,11 @@ - - + + - + @@ -31,14 +29,15 @@ - - - - - - - - + + + + + + + + + @@ -47,8 +46,10 @@ + + @@ -67,7 +68,6 @@ - @@ -77,8 +77,10 @@ + + @@ -97,7 +99,6 @@ - @@ -107,8 +108,10 @@ + + @@ -127,7 +130,6 @@ - @@ -137,8 +139,10 @@ + + @@ -157,7 +161,6 @@ - @@ -167,8 +170,10 @@ + + @@ -187,7 +192,6 @@ - @@ -210,14 +214,15 @@ - - - - - - - - + + + + + + + + + @@ -278,7 +283,7 @@ - - + + diff --git a/localization/fi.xml b/localization/fi.xml index 6847f2b0e..5d6ec6367 100644 --- a/localization/fi.xml +++ b/localization/fi.xml @@ -1,14 +1,14 @@ - + - - + + @@ -17,11 +17,11 @@ - + - + @@ -29,15 +29,16 @@ - - - - - - - - - + + + + + + + + + + @@ -45,8 +46,10 @@ + + @@ -65,9 +68,8 @@ - - + @@ -75,8 +77,10 @@ + + @@ -95,9 +99,8 @@ - - + @@ -105,8 +108,10 @@ + + @@ -125,9 +130,8 @@ - - + @@ -135,8 +139,10 @@ + + @@ -155,9 +161,8 @@ - - + @@ -165,8 +170,10 @@ + + @@ -185,7 +192,6 @@ - @@ -208,16 +214,38 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/fj.xml b/localization/fj.xml index fe4852fe3..8b39fbec9 100644 --- a/localization/fj.xml +++ b/localization/fj.xml @@ -1,18 +1,18 @@ - + - + - + - - - + + + diff --git a/localization/fr.xml b/localization/fr.xml index 5189a36b0..1eb9498f4 100644 --- a/localization/fr.xml +++ b/localization/fr.xml @@ -1,7 +1,7 @@ - + @@ -27,11 +27,11 @@ - + - + - + @@ -39,14 +39,15 @@ - - - - - - - - + + + + + + + + + @@ -55,8 +56,10 @@ + + @@ -75,7 +78,6 @@ - @@ -85,8 +87,10 @@ + + @@ -105,7 +109,6 @@ - @@ -115,8 +118,10 @@ + + @@ -135,7 +140,6 @@ - @@ -145,8 +149,10 @@ + + @@ -165,7 +171,6 @@ - @@ -188,14 +193,15 @@ - - - - - - - - + + + + + + + + + diff --git a/localization/gb.xml b/localization/gb.xml index 3d6778734..306e7dfbe 100644 --- a/localization/gb.xml +++ b/localization/gb.xml @@ -1,7 +1,7 @@ - + @@ -16,11 +16,11 @@ - + - + - + @@ -28,14 +28,15 @@ - - - - - - - - + + + + + + + + + @@ -44,8 +45,10 @@ + + @@ -64,7 +67,6 @@ - @@ -74,8 +76,10 @@ + + @@ -94,7 +98,6 @@ - @@ -117,14 +120,15 @@ - - - - - - - - + + + + + + + + + diff --git a/localization/ge.xml b/localization/ge.xml index c97f76156..8a786e130 100644 --- a/localization/ge.xml +++ b/localization/ge.xml @@ -1,14 +1,14 @@ - + - + diff --git a/localization/gr.xml b/localization/gr.xml index f66ba324a..290d8edc3 100644 --- a/localization/gr.xml +++ b/localization/gr.xml @@ -1,46 +1,44 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -48,8 +46,10 @@ + + @@ -68,7 +68,6 @@ - @@ -78,8 +77,10 @@ + + @@ -98,9 +99,8 @@ - - + @@ -108,8 +108,10 @@ + + @@ -128,127 +130,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/gt.xml b/localization/gt.xml index 7ed863ff0..978a96278 100644 --- a/localization/gt.xml +++ b/localization/gt.xml @@ -1,18 +1,42 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/gy.xml b/localization/gy.xml index 0278fce7b..9ea20f368 100644 --- a/localization/gy.xml +++ b/localization/gy.xml @@ -1,23 +1,35 @@ - + - - - + + + + + + + + + + + + + + + - - - + + + diff --git a/localization/hk.xml b/localization/hk.xml index 3cd24098f..952ba5a5d 100644 --- a/localization/hk.xml +++ b/localization/hk.xml @@ -1,7 +1,7 @@ - + diff --git a/localization/hr.xml b/localization/hr.xml index e1825a93e..ca4b572ca 100644 --- a/localization/hr.xml +++ b/localization/hr.xml @@ -1,163 +1,223 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -165,27 +225,4 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/localization/hu.xml b/localization/hu.xml index 942644d96..70326bcb1 100644 --- a/localization/hu.xml +++ b/localization/hu.xml @@ -1,7 +1,7 @@ - + @@ -17,26 +17,27 @@ - + - + - + - - - - - - - - + + + + + + + + + @@ -45,8 +46,10 @@ + + @@ -65,7 +68,6 @@ - @@ -75,8 +77,10 @@ + + @@ -95,7 +99,6 @@ - @@ -105,8 +108,10 @@ + + @@ -125,7 +130,6 @@ - @@ -135,8 +139,10 @@ + + @@ -155,7 +161,6 @@ - @@ -165,8 +170,10 @@ + + @@ -185,7 +192,6 @@ - @@ -208,16 +214,62 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/id.xml b/localization/id.xml index 79afd8809..874882e38 100644 --- a/localization/id.xml +++ b/localization/id.xml @@ -1,20 +1,20 @@ - + - - + + - - + + @@ -25,4 +25,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/ie.xml b/localization/ie.xml index b94f767d4..9c270a311 100644 --- a/localization/ie.xml +++ b/localization/ie.xml @@ -4,7 +4,7 @@ - + @@ -18,26 +18,27 @@ - + - + - + - - - - - - - - + + + + + + + + + @@ -46,8 +47,10 @@ + + @@ -66,7 +69,6 @@ - @@ -76,8 +78,10 @@ + + @@ -96,7 +100,6 @@ - @@ -106,8 +109,10 @@ + + @@ -126,7 +131,6 @@ - @@ -136,8 +140,10 @@ + + @@ -156,7 +162,6 @@ - @@ -179,16 +184,23 @@ - - - - - - - - + + + + + + + + + + + + + + + diff --git a/localization/il.xml b/localization/il.xml index bb8523406..77a8c6a54 100644 --- a/localization/il.xml +++ b/localization/il.xml @@ -1,19 +1,23 @@ - + - + - + + + + + diff --git a/localization/in.xml b/localization/in.xml index 0a6712f28..02194bda5 100644 --- a/localization/in.xml +++ b/localization/in.xml @@ -1,63 +1,72 @@ - + - - - + + + + + + - + - - - - - + + + + + + - - + + - - + + + + + + - + - - + + - - - - + + + + - + - + - + - + - + - + + - + - - - + + + diff --git a/localization/index.php b/localization/index.php index 9491604bc..3606cd066 100644 --- a/localization/index.php +++ b/localization/index.php @@ -1,35 +1,15 @@ -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - +/** + * For the full copyright and license information, please view the + * docs/licenses/LICENSE.txt file that was distributed with this source code. + */ + header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - + header("Cache-Control: no-store, no-cache, must-revalidate"); header("Cache-Control: post-check=0, pre-check=0", false); header("Pragma: no-cache"); - + header("Location: ../"); exit; diff --git a/localization/ir.xml b/localization/ir.xml index acca1c358..19d2b61e6 100644 --- a/localization/ir.xml +++ b/localization/ir.xml @@ -1,7 +1,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -57,4 +57,4 @@ - \ No newline at end of file + diff --git a/localization/it.xml b/localization/it.xml index 004799209..410afb8b4 100644 --- a/localization/it.xml +++ b/localization/it.xml @@ -1,7 +1,7 @@ - + @@ -9,34 +9,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -45,8 +48,10 @@ + + @@ -65,7 +70,6 @@ - @@ -75,8 +79,10 @@ + + @@ -95,9 +101,8 @@ - - + @@ -105,8 +110,10 @@ + + @@ -125,104 +132,106 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -240,7 +249,6 @@ - @@ -272,9 +280,8 @@ - + - @@ -282,15 +289,13 @@ - - - + @@ -312,6 +317,7 @@ + diff --git a/localization/je.xml b/localization/je.xml index 7a060e0a9..ba9a1c6ce 100644 --- a/localization/je.xml +++ b/localization/je.xml @@ -1,7 +1,7 @@ - + @@ -9,7 +9,7 @@ - + diff --git a/localization/jp.xml b/localization/jp.xml index c5d063bcd..cc859ac80 100644 --- a/localization/jp.xml +++ b/localization/jp.xml @@ -1,17 +1,27 @@ - + - - - + + + + + + + + + + + + + diff --git a/localization/ke.xml b/localization/ke.xml index 488d06b86..7a9ff336c 100644 --- a/localization/ke.xml +++ b/localization/ke.xml @@ -1,10 +1,11 @@ - + - + + diff --git a/localization/li.xml b/localization/li.xml index c6c175dd1..3284ea376 100644 --- a/localization/li.xml +++ b/localization/li.xml @@ -1,7 +1,7 @@ - + @@ -10,15 +10,15 @@ - + - + - + diff --git a/localization/lt.xml b/localization/lt.xml index d74acf838..1eac5bed6 100644 --- a/localization/lt.xml +++ b/localization/lt.xml @@ -1,228 +1,235 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/lu.xml b/localization/lu.xml index e50bb9e7d..7067c5a8c 100644 --- a/localization/lu.xml +++ b/localization/lu.xml @@ -1,7 +1,7 @@ - + @@ -19,26 +19,27 @@ - + - + - + - - - - - - - - + + + + + + + + + @@ -47,8 +48,10 @@ + + @@ -67,7 +70,6 @@ - @@ -77,8 +79,10 @@ + + @@ -97,7 +101,6 @@ - @@ -107,8 +110,10 @@ + + @@ -127,7 +132,6 @@ - @@ -137,8 +141,10 @@ + + @@ -157,7 +163,6 @@ - @@ -167,8 +172,10 @@ + + @@ -187,7 +194,6 @@ - @@ -197,8 +203,10 @@ + + @@ -217,7 +225,6 @@ - @@ -240,14 +247,15 @@ - - - - - - - - + + + + + + + + + diff --git a/localization/lv.xml b/localization/lv.xml index ad0266fbe..5d523284b 100644 --- a/localization/lv.xml +++ b/localization/lv.xml @@ -1,7 +1,7 @@ - + @@ -9,33 +9,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -44,8 +47,10 @@ + + @@ -64,7 +69,6 @@ - @@ -74,8 +78,10 @@ + + @@ -94,97 +100,99 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/md.xml b/localization/md.xml index cba1cc5aa..6655fb426 100644 --- a/localization/md.xml +++ b/localization/md.xml @@ -1,29 +1,17 @@ - + - - - - - + - - - - - - - - diff --git a/localization/mt.xml b/localization/mt.xml index e51e375b9..25d91193f 100644 --- a/localization/mt.xml +++ b/localization/mt.xml @@ -4,38 +4,41 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -44,8 +47,10 @@ + + @@ -64,97 +69,130 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/mx.xml b/localization/mx.xml index 39ca83529..8d6b1eb0e 100644 --- a/localization/mx.xml +++ b/localization/mx.xml @@ -1,7 +1,7 @@ - + @@ -9,21 +9,21 @@ - - + + - - + + - - - + + + diff --git a/localization/my.xml b/localization/my.xml index 38a00cdbe..440fd4ab9 100644 --- a/localization/my.xml +++ b/localization/my.xml @@ -1,7 +1,7 @@ - + diff --git a/localization/ng.xml b/localization/ng.xml index d6a676d87..f546941d6 100644 --- a/localization/ng.xml +++ b/localization/ng.xml @@ -1,7 +1,7 @@ - + diff --git a/localization/nl.xml b/localization/nl.xml index dff561347..4986613f7 100644 --- a/localization/nl.xml +++ b/localization/nl.xml @@ -1,14 +1,14 @@ - + - + @@ -16,12 +16,12 @@ - + - + - + @@ -29,13 +29,14 @@ - - - - - - - + + + + + + + + @@ -44,8 +45,10 @@ + + @@ -64,9 +67,8 @@ - - + @@ -74,8 +76,10 @@ + + @@ -94,9 +98,8 @@ - - + @@ -104,8 +107,10 @@ + + @@ -124,9 +129,8 @@ - - + @@ -134,8 +138,10 @@ + + @@ -154,7 +160,7 @@ - + @@ -178,15 +184,30 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/no.xml b/localization/no.xml index a3459437b..d56009683 100644 --- a/localization/no.xml +++ b/localization/no.xml @@ -1,28 +1,39 @@ - + + - - + + + + - + - - + + - + + + + + + + + + diff --git a/localization/nz.xml b/localization/nz.xml index 6abdd8a19..dd7d36614 100644 --- a/localization/nz.xml +++ b/localization/nz.xml @@ -1,15 +1,25 @@ - + - + + + - + + + + + + + + + diff --git a/localization/pa.xml b/localization/pa.xml index 7cf1e0e9e..68d6fb792 100644 --- a/localization/pa.xml +++ b/localization/pa.xml @@ -1,21 +1,45 @@ - + - - + + + + + + - - + + + + + + + + - - + + + + + + + + + + + + + + + + diff --git a/localization/pe.xml b/localization/pe.xml index 68eb0fe4b..760e2d971 100644 --- a/localization/pe.xml +++ b/localization/pe.xml @@ -1,9 +1,10 @@ - + + @@ -11,9 +12,36 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/ph.xml b/localization/ph.xml index b3d56d67f..c9c5116aa 100644 --- a/localization/ph.xml +++ b/localization/ph.xml @@ -1,20 +1,25 @@ - + + - - + + + + + - - + + + + + - - diff --git a/localization/pk.xml b/localization/pk.xml index 61da19546..21f323503 100644 --- a/localization/pk.xml +++ b/localization/pk.xml @@ -1,22 +1,22 @@ - + - + - + - + - + diff --git a/localization/pl.xml b/localization/pl.xml index bfc285e25..b6e203230 100644 --- a/localization/pl.xml +++ b/localization/pl.xml @@ -1,7 +1,7 @@ - + @@ -18,12 +18,12 @@ - + - + - + @@ -31,13 +31,14 @@ - - - - - - - + + + + + + + + @@ -46,8 +47,10 @@ + + @@ -66,7 +69,6 @@ - @@ -76,8 +78,10 @@ + + @@ -96,7 +100,6 @@ - @@ -106,8 +109,10 @@ + + @@ -125,7 +130,6 @@ - @@ -135,8 +139,10 @@ + + @@ -154,7 +160,6 @@ - @@ -178,13 +183,14 @@ - - - - - - - + + + + + + + + diff --git a/localization/pt.xml b/localization/pt.xml index cd18d9adf..5e6bca8e9 100644 --- a/localization/pt.xml +++ b/localization/pt.xml @@ -1,7 +1,7 @@ - + @@ -10,33 +10,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -45,8 +47,10 @@ + + @@ -65,7 +69,6 @@ - @@ -75,8 +78,10 @@ + + @@ -95,7 +100,6 @@ - @@ -105,8 +109,10 @@ + + @@ -125,97 +131,68 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/py.xml b/localization/py.xml index fc5573ae9..d7fa6cc1c 100644 --- a/localization/py.xml +++ b/localization/py.xml @@ -1,7 +1,7 @@ - + @@ -9,20 +9,40 @@ - + - + + + + + + + + + + + + + + + + + + + + + - - - + + + diff --git a/localization/ro.xml b/localization/ro.xml index 6c7c66604..ef4633b37 100644 --- a/localization/ro.xml +++ b/localization/ro.xml @@ -1,43 +1,45 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -45,8 +47,10 @@ + + @@ -65,7 +69,6 @@ - @@ -75,8 +78,10 @@ + + @@ -95,127 +100,99 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/rs.xml b/localization/rs.xml index 4904780da..40e7a6263 100644 --- a/localization/rs.xml +++ b/localization/rs.xml @@ -1,12 +1,28 @@ - + - + + + + + + + + + + + + + + + + + diff --git a/localization/ru.xml b/localization/ru.xml index 6ae39065c..39844b2a5 100644 --- a/localization/ru.xml +++ b/localization/ru.xml @@ -1,23 +1,28 @@ - + - - - - + + + + + - - + + - + + + + + diff --git a/localization/sa.xml b/localization/sa.xml index da45b11df..96db39312 100644 --- a/localization/sa.xml +++ b/localization/sa.xml @@ -1,11 +1,23 @@ - + + + + + + + + + + + + + diff --git a/localization/se.xml b/localization/se.xml index 0243428c7..4c67f75be 100644 --- a/localization/se.xml +++ b/localization/se.xml @@ -1,7 +1,7 @@ - + @@ -10,33 +10,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -45,8 +47,10 @@ + + @@ -64,8 +68,7 @@ - - + @@ -75,8 +78,10 @@ + + @@ -94,8 +99,7 @@ - - + @@ -105,8 +109,10 @@ + + @@ -124,38 +130,69 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/sg.xml b/localization/sg.xml index 7bf58571d..cdf22ddba 100644 --- a/localization/sg.xml +++ b/localization/sg.xml @@ -1,16 +1,17 @@ - + + - + diff --git a/localization/si.xml b/localization/si.xml index 4ab65c6c6..2131efc4c 100644 --- a/localization/si.xml +++ b/localization/si.xml @@ -1,7 +1,7 @@ - + @@ -16,12 +16,12 @@ - + - + - + @@ -29,13 +29,14 @@ - - - - - - - + + + + + + + + @@ -44,8 +45,10 @@ + + @@ -64,7 +67,6 @@ - @@ -74,8 +76,10 @@ + + @@ -94,7 +98,6 @@ - @@ -104,8 +107,10 @@ + + @@ -124,7 +129,6 @@ - @@ -134,8 +138,10 @@ + + @@ -154,7 +160,6 @@ - @@ -178,13 +183,14 @@ - - - - - - - + + + + + + + + diff --git a/localization/sk.xml b/localization/sk.xml index adf6d311e..d2020fdc5 100644 --- a/localization/sk.xml +++ b/localization/sk.xml @@ -1,42 +1,44 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -44,8 +46,10 @@ + + @@ -64,9 +68,8 @@ - - + @@ -74,8 +77,10 @@ + + @@ -94,97 +99,68 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/sv.xml b/localization/sv.xml index 51cab3aee..bb32124ca 100644 --- a/localization/sv.xml +++ b/localization/sv.xml @@ -1,18 +1,34 @@ - + - + + + + + + + + + + + + + + + + + diff --git a/localization/th.xml b/localization/th.xml index e3cc32314..6d88d5f5d 100644 --- a/localization/th.xml +++ b/localization/th.xml @@ -1,21 +1,100 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/tn.xml b/localization/tn.xml index 772c22009..141d5eba9 100644 --- a/localization/tn.xml +++ b/localization/tn.xml @@ -1,17 +1,29 @@ - + - - - + + + + + + - + + + + + + + + + + diff --git a/localization/tr.xml b/localization/tr.xml index bf9acd994..6081ad199 100644 --- a/localization/tr.xml +++ b/localization/tr.xml @@ -1,24 +1,24 @@ - + - - + + - - + + - - + + - + diff --git a/localization/tw.xml b/localization/tw.xml index b69d0e669..193d888f6 100644 --- a/localization/tw.xml +++ b/localization/tw.xml @@ -1,7 +1,7 @@ - + @@ -9,7 +9,7 @@ - + diff --git a/localization/ua.xml b/localization/ua.xml index 5d960e694..3f5ef0c40 100644 --- a/localization/ua.xml +++ b/localization/ua.xml @@ -1,52 +1,62 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/us.xml b/localization/us.xml index 7961bc407..fc33dbb8e 100644 --- a/localization/us.xml +++ b/localization/us.xml @@ -1,12 +1,11 @@ - - + - + @@ -229,6 +228,7 @@ + @@ -252,6 +252,7 @@ + @@ -270,9 +271,13 @@ + + + + + - @@ -289,4 +294,3 @@ - diff --git a/localization/uy.xml b/localization/uy.xml index f96338929..438522444 100644 --- a/localization/uy.xml +++ b/localization/uy.xml @@ -1,7 +1,7 @@ - + @@ -9,20 +9,41 @@ - + - + + + + + + + + + + + + + + + + + + + + + + - - - + + + diff --git a/localization/ve.xml b/localization/ve.xml index 23480f630..ec159b910 100644 --- a/localization/ve.xml +++ b/localization/ve.xml @@ -1,28 +1,66 @@ - + + - - - - + + + + + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + diff --git a/localization/vn.xml b/localization/vn.xml index 390275895..540117358 100644 --- a/localization/vn.xml +++ b/localization/vn.xml @@ -1,23 +1,33 @@ - + - - - - + + + + + + - - + + - + + + + + + + + + diff --git a/mails/en/account.html b/mails/en/account.html index c80631219..d5e047532 100644 --- a/mails/en/account.html +++ b/mails/en/account.html @@ -68,10 +68,10 @@ - + Hi {firstname} {lastname},
Thank you for creating a customer account at {shop_name}. - + @@ -83,14 +83,14 @@   - +

Your {shop_name} login details

Here are your login details:
E-mail address: {email}
 - +   @@ -106,7 +106,7 @@   - +

Important Security Tips:

  1. Always keep your account details safe.
    2. @@ -114,7 +114,7 @@
  2. Change your password regularly.
  3. Should you suspect someone is using your account illegally, please notify us immediately.
- +   @@ -126,9 +126,9 @@ - + You can now place orders on our website: {shop_name} - + diff --git a/mails/en/awaiting_payment.html b/mails/en/awaiting_payment.html index c6bc613c6..d83fbe902 100644 --- a/mails/en/awaiting_payment.html +++ b/mails/en/awaiting_payment.html @@ -69,10 +69,10 @@ - + Hi {firstname} {lastname},
{order_header_line_html} - + @@ -84,13 +84,13 @@   - +

Order {order_name} - Awaiting payment

Order reference: {order_name}
Payment method: {payment_method}
- +   @@ -103,18 +103,18 @@ {extra_mail_content_html} - + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - + - + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. - + diff --git a/mails/en/backoffice_order.html b/mails/en/backoffice_order.html index 0b40f8b35..f779ea6ef 100644 --- a/mails/en/backoffice_order.html +++ b/mails/en/backoffice_order.html @@ -69,9 +69,9 @@ - + Hi {firstname} {lastname}, - + @@ -83,12 +83,12 @@   - +

A new order has been generated on your behalf.

Please go on {order_link} to finalize the payment. - +   diff --git a/mails/en/booking_extra_demands.tpl b/mails/en/booking_extra_demands.tpl index b43ac4bed..fe38cdadd 100644 --- a/mails/en/booking_extra_demands.tpl +++ b/mails/en/booking_extra_demands.tpl @@ -23,22 +23,22 @@ {if $smarty.foreach.demandRow.first} - + {$data_v['name']}
{$rm_v['data_form']|date_format:"%d-%m-%Y"} {l s='to'} {$rm_v['data_to']|date_format:"%d-%m-%Y"}
{l s='Room'} - {$roomCount} - + {/if} - + {$demand['name']} - + - + {convertPrice price=$demand['total_price_tax_excl']} - + {/foreach} @@ -81,31 +81,31 @@ {if $smarty.foreach.serviceRow.first} - + {$data_v['name']}
{$rm_v['data_form']|date_format:"%d-%m-%Y"} {l s='to'} {$rm_v['data_to']|date_format:"%d-%m-%Y"}
{l s='Room'} - {$roomCount} - + {/if} - + {$service['name']} - + - + {if $service['allow_multiple_quantity']} {$service['quantity']} {else} {l s='--'} {/if} - + - + {convertPrice price=$service['total_price_tax_excl']} - + {/foreach} diff --git a/mails/en/booking_extra_demands.txt b/mails/en/booking_extra_demands.txt index 3139f8ce3..21f96098b 100644 --- a/mails/en/booking_extra_demands.txt +++ b/mails/en/booking_extra_demands.txt @@ -13,22 +13,22 @@ {foreach name=demandRow from=$roomDemand['extra_demands'] item=demand} {if $smarty.foreach.demandRow.first} - + {$data_v['name']}
{$rm_v['data_form']|date_format:"%d-%m-%Y"} {l s='to'} {$rm_v['data_to']|date_format:"%d-%m-%Y"}
{l s='Room'} - {$roomCount} - + {/if} - + {$demand['name']} - + - + {convertPrice price=$demand['total_price_tax_excl']} - + {/foreach} diff --git a/mails/en/contact.html b/mails/en/contact.html index 5c5aa9d53..210b11f5d 100644 --- a/mails/en/contact.html +++ b/mails/en/contact.html @@ -68,9 +68,9 @@ - + Message from a {shop_name} customer - + @@ -82,11 +82,11 @@   - + {contact_content_html} - +   diff --git a/mails/en/contact_form.html b/mails/en/contact_form.html index 73a8a7143..2a6cc0301 100644 --- a/mails/en/contact_form.html +++ b/mails/en/contact_form.html @@ -69,9 +69,9 @@ - + Your message to {shop_name} Customer Service - + @@ -83,7 +83,7 @@   - + Your message has been sent successfully.

Message: {message}

@@ -91,7 +91,7 @@ Product: {product_name}
Attached file: {attached_file} - +   @@ -103,10 +103,10 @@ - + We will answer as soon as possible. - + diff --git a/mails/en/credit_slip.html b/mails/en/credit_slip.html index 6aee0c304..40928b0e2 100644 --- a/mails/en/credit_slip.html +++ b/mails/en/credit_slip.html @@ -69,9 +69,9 @@ - + Hi {firstname} {lastname}, - + @@ -83,12 +83,12 @@   - +

Order {order_name} - Credit slip created

We have generated a credit slip in your name for order with the reference {order_name}. - +   @@ -100,10 +100,10 @@ - + You can review this credit slip and download your invoice from the "My credit slips" section of your account by clicking "My account" on our website. - + diff --git a/mails/en/credit_slip_voucher.html b/mails/en/credit_slip_voucher.html index e864fd62b..6f5ba20a6 100644 --- a/mails/en/credit_slip_voucher.html +++ b/mails/en/credit_slip_voucher.html @@ -71,9 +71,9 @@ - + Hi {firstname} {lastname},
- + @@ -85,7 +85,7 @@   - +

VOUCHER GENERATED

@@ -95,7 +95,7 @@ Voucher Code: {voucher_code} for an amount of {voucher_amount}.

To use this voucher just copy and paste this code during payment process for your next order. - +   diff --git a/mails/en/download_product.html b/mails/en/download_product.html index a9d6b6e9a..a42775e85 100644 --- a/mails/en/download_product.html +++ b/mails/en/download_product.html @@ -69,10 +69,10 @@ - + Hi {firstname} {lastname},
Thank you for your order with the reference {order_name} from {shop_name} - + @@ -84,14 +84,14 @@   - +

Product(s) now available for download

You have {nbProducts} product(s) now available for download using the following link(s):

{virtualProducts} - +   @@ -103,18 +103,18 @@ - + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - + - + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. - + diff --git a/mails/en/employee_password.html b/mails/en/employee_password.html index 7b1b059c9..d17759824 100644 --- a/mails/en/employee_password.html +++ b/mails/en/employee_password.html @@ -69,9 +69,9 @@ - + Hi {firstname} {lastname}, - + @@ -83,7 +83,7 @@   - +

Your {shop_name} login information

@@ -93,7 +93,7 @@ Password: {passwd}
E-mail address: {email} - +   diff --git a/mails/en/forward_msg.html b/mails/en/forward_msg.html index 07728db09..f9d56a845 100644 --- a/mails/en/forward_msg.html +++ b/mails/en/forward_msg.html @@ -69,9 +69,9 @@ - + Hi {firstname} {lastname}, - + @@ -83,7 +83,7 @@   - +

Customer service - Forwarded discussion

@@ -91,7 +91,7 @@ Discussion history: {messages}

{employee} added "{comment}" - +   diff --git a/mails/en/guest_to_customer.html b/mails/en/guest_to_customer.html index 0dc1e5c9a..fbed53b8a 100644 --- a/mails/en/guest_to_customer.html +++ b/mails/en/guest_to_customer.html @@ -69,9 +69,9 @@ - + Hi {firstname} {lastname}, - + @@ -83,7 +83,7 @@   - +

Your customer account creation

@@ -91,7 +91,7 @@ E-mail address: {email}

Password: {passwd} - +   @@ -103,19 +103,19 @@ - + Please be careful when sharing these login details with others. - + - + You can access your customer account on our website: {shop_url} - + diff --git a/mails/en/in_transit.html b/mails/en/in_transit.html index 6c5318515..56b82dd3e 100644 --- a/mails/en/in_transit.html +++ b/mails/en/in_transit.html @@ -69,9 +69,9 @@ - + Hi {firstname} {lastname}, - + @@ -83,14 +83,14 @@   - +

Order {order_name} - In transit

Your order with the reference {order_name} is currently in transit.

You can track your package using the following link: {followup} - +   @@ -102,18 +102,18 @@ - + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - + - + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. - + diff --git a/mails/en/log_alert.html b/mails/en/log_alert.html index 13766029f..66299ede6 100644 --- a/mails/en/log_alert.html +++ b/mails/en/log_alert.html @@ -69,9 +69,9 @@ - + Hi {firstname} {lastname}, - + @@ -83,13 +83,13 @@   - +

You have received a new log alert

Warning: you have received a new log alert in your Back Office.

You can check for it in the "Tools" > "Logs" section of your Back Office. - +   diff --git a/mails/en/order_canceled.html b/mails/en/order_canceled.html index 5271ab209..52f2eb3f4 100644 --- a/mails/en/order_canceled.html +++ b/mails/en/order_canceled.html @@ -69,9 +69,9 @@ - + Hi {firstname} {lastname}, - + @@ -83,12 +83,12 @@   - +

Order canceled - {order_name}

Your order with the reference {order_name} has been canceled. - +   @@ -104,7 +104,7 @@   - +

Here are your order details:

@@ -112,7 +112,7 @@ Order reference: {order_name}
Order total: {total_paid}

- +
{order_hotel_detail_html} @@ -127,18 +127,18 @@ {extra_mail_content_html} - + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - + - + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. - + diff --git a/mails/en/order_changed.html b/mails/en/order_changed.html index c224bc3ff..4e700defb 100644 --- a/mails/en/order_changed.html +++ b/mails/en/order_changed.html @@ -69,9 +69,9 @@ - + Hi {firstname} {lastname}, - + @@ -83,12 +83,12 @@   - +

Order {order_name} - Order changed

Your order with the reference {order_name} from {hotel_hotel_name} has been changed by the merchant. - +   @@ -100,18 +100,18 @@ - + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - + - + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. - + diff --git a/mails/en/order_conf.html b/mails/en/order_conf.html index 5e58397d2..dc29689fd 100755 --- a/mails/en/order_conf.html +++ b/mails/en/order_conf.html @@ -71,10 +71,10 @@ - + Hi {firstname} {lastname},
{order_header_line_html} - + @@ -86,14 +86,14 @@   - +

Order details

Order: {order_name} Placed on {date}

Payment: {payment} - +   @@ -123,18 +123,18 @@ - + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - + - + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. - + diff --git a/mails/en/order_conf_admin.html b/mails/en/order_conf_admin.html index 28729c428..a5117aa9e 100755 --- a/mails/en/order_conf_admin.html +++ b/mails/en/order_conf_admin.html @@ -70,10 +70,10 @@ - + Hi {firstname} {lastname},
{order_header_line_html} - + @@ -85,14 +85,14 @@   - +

Customer details

Name: {customer_name}

Email: {customer_email} - +   @@ -108,14 +108,14 @@   - +

Order details

Order: {order_name} Placed on {date}

Payment: {payment} - +   diff --git a/mails/en/order_conf_cart_rules.tpl b/mails/en/order_conf_cart_rules.tpl index 7a1a683b0..bf4468f07 100644 --- a/mails/en/order_conf_cart_rules.tpl +++ b/mails/en/order_conf_cart_rules.tpl @@ -5,9 +5,9 @@ - + {$cart_rule['voucher_name']} - + @@ -18,9 +18,9 @@ - + {$cart_rule['voucher_reduction']} - + diff --git a/mails/en/order_conf_product_list.tpl b/mails/en/order_conf_product_list.tpl index 525e38b70..ba0127f33 100644 --- a/mails/en/order_conf_product_list.tpl +++ b/mails/en/order_conf_product_list.tpl @@ -5,9 +5,9 @@   - + {$product['reference']} - +   @@ -18,9 +18,9 @@   - + {$product['name']} - +   @@ -31,9 +31,9 @@   - + {$product['unit_price']} - +   @@ -44,9 +44,9 @@   - + {$product['quantity']} - +   @@ -57,9 +57,9 @@   - + {$product['price']} - +   @@ -73,10 +73,10 @@   - + {$product['name']}
{$customization['customization_text']} - +   @@ -87,9 +87,9 @@   - + {$product['unit_price']} - +   @@ -100,9 +100,9 @@   - + {$customization['customization_quantity']} - +   @@ -113,9 +113,9 @@   - + {$customization['quantity']} - +   diff --git a/mails/en/order_customer_comment.html b/mails/en/order_customer_comment.html index 6dd6fedcf..c9c18b7f1 100644 --- a/mails/en/order_customer_comment.html +++ b/mails/en/order_customer_comment.html @@ -68,9 +68,9 @@ - + Message from a customer - + @@ -82,14 +82,14 @@   - + You have received a new message regarding booking with the reference {order_name}.

Name: {firstname} {lastname}

E-mail: {email}

Customer message:
{message}

 - +   diff --git a/mails/en/order_hotel_detail.tpl b/mails/en/order_hotel_detail.tpl index 710025127..a6d98eb90 100644 --- a/mails/en/order_hotel_detail.tpl +++ b/mails/en/order_hotel_detail.tpl @@ -1,5 +1,5 @@ {if isset($list['hotel_name']) && $list['hotel_name']} - +

{l s='Hotel details'}:

@@ -9,5 +9,5 @@ {l s='Hotel Email'}: {$list['hotel_email']}
{l s='Total Rooms'}: {$list['num_rooms']}

- +
{/if} \ No newline at end of file diff --git a/mails/en/order_merchant_comment.html b/mails/en/order_merchant_comment.html index 4cbc9d7b8..e57e34375 100644 --- a/mails/en/order_merchant_comment.html +++ b/mails/en/order_merchant_comment.html @@ -68,9 +68,9 @@ - + Hi {firstname} {lastname}, - + @@ -82,7 +82,7 @@   - +

Message from {shop_name}

@@ -90,7 +90,7 @@ You have received a new message from {shop_name} regarding booking with the reference {order_name}.

Message:
{message} - +   diff --git a/mails/en/order_refund_completed_admin.html b/mails/en/order_refund_completed_admin.html index 0c1baf06c..d1647d8fc 100755 --- a/mails/en/order_refund_completed_admin.html +++ b/mails/en/order_refund_completed_admin.html @@ -71,10 +71,10 @@ - + Hi {firstname} {lastname},
A request has been completed for the {refund_for_txt} cancellation. - + @@ -87,7 +87,7 @@   - +

Order details

Order: {order_reference} Placed on {order_date}

@@ -96,7 +96,7 @@ Payment Mode: {payment_mode}

Transaction Id: {id_transaction}

 - +   @@ -119,12 +119,12 @@   - +

Customer details

Customer name: {customer_name}

Customer email: {customer_email}

- +   diff --git a/mails/en/order_refund_completed_customer.html b/mails/en/order_refund_completed_customer.html index 211a19f11..0cb997673 100755 --- a/mails/en/order_refund_completed_customer.html +++ b/mails/en/order_refund_completed_customer.html @@ -71,10 +71,10 @@ - + Hi {firstname} {lastname},
Your request for {refund_for_txt} cancellation has been completed. - + @@ -86,7 +86,7 @@   - +

Order details

Order: {order_reference} Placed on {order_date}

@@ -95,7 +95,7 @@ Payment Mode: {payment_mode}

Transaction Id: {id_transaction}

 - +   @@ -117,10 +117,10 @@ - + You can review your booking cancelation requests from the "Booking Refund Requests" section of your customer account by clicking "My account". - + diff --git a/mails/en/order_refund_denied_admin.html b/mails/en/order_refund_denied_admin.html index 2a1ef1624..ddb75a8d2 100755 --- a/mails/en/order_refund_denied_admin.html +++ b/mails/en/order_refund_denied_admin.html @@ -71,10 +71,10 @@ - + Hi {firstname} {lastname},
A request has been denied for the {refund_for_txt} cancellation. - + @@ -87,13 +87,13 @@   - +

Order details

Order: {order_reference} Placed on {order_date}

Refund Status: {status_name}

 - +   @@ -116,12 +116,12 @@   - +

Customer details

Customer name: {customer_name}

Customer email: {customer_email}

- +   diff --git a/mails/en/order_refund_denied_customer.html b/mails/en/order_refund_denied_customer.html index c997eb0a3..67ea54f76 100755 --- a/mails/en/order_refund_denied_customer.html +++ b/mails/en/order_refund_denied_customer.html @@ -71,10 +71,10 @@ - + Hi {firstname} {lastname},
Your request for {refund_for_txt} cancellation has been denied. - + @@ -86,13 +86,13 @@   - +

Order details

Order: {order_reference} Placed on {order_date}

Refund Status: {status_name}

 - +   @@ -114,10 +114,10 @@ - + You can review your booking cancelation requests from the "Booking Refund Requests" section of your customer account by clicking "My account". - + diff --git a/mails/en/order_refund_pending_admin.html b/mails/en/order_refund_pending_admin.html index 36d245469..e85a274c7 100755 --- a/mails/en/order_refund_pending_admin.html +++ b/mails/en/order_refund_pending_admin.html @@ -71,10 +71,10 @@ - + Hi {firstname} {lastname},
A request has been generated for {refund_for_txt} cancellations. - + @@ -87,14 +87,14 @@   - +

Order details

Order: {order_reference} Placed on {order_date}

Refund Status: {status_name}

Cancelation Reason: {cancelation_reason}

 - +   @@ -117,12 +117,12 @@   - +

Customer details

Customer name: {customer_name}

Customer email: {customer_email}

- +   diff --git a/mails/en/order_refund_pending_customer.html b/mails/en/order_refund_pending_customer.html index 2b439d093..6e885fa96 100755 --- a/mails/en/order_refund_pending_customer.html +++ b/mails/en/order_refund_pending_customer.html @@ -71,10 +71,10 @@ - + Hi {firstname} {lastname},
Your request for {refund_for_txt} cancellation has been submitted successfully. - + @@ -86,13 +86,13 @@   - +

Order details

Order: {order_reference} Placed on {order_date}

Refund Status: {status_name}

 - +   @@ -114,10 +114,10 @@ - + You can review your booking cancelation requests from the "Booking Refund Requests" section of your customer account by clicking "My account". - + diff --git a/mails/en/order_return_state.html b/mails/en/order_return_state.html index fd3de585a..104104849 100644 --- a/mails/en/order_return_state.html +++ b/mails/en/order_return_state.html @@ -69,9 +69,9 @@ - + Hi {firstname} {lastname}, - + @@ -83,13 +83,13 @@   - +

Return #{id_order_return} - update

We have updated the progress on your return #{id_order_return}, the new status is: "{state_order_return}"
 - +   @@ -102,10 +102,10 @@ {extra_mail_content_html} - + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - + diff --git a/mails/en/overbooking.html b/mails/en/overbooking.html index b58f70c8b..8ca343851 100755 --- a/mails/en/overbooking.html +++ b/mails/en/overbooking.html @@ -71,12 +71,12 @@ - + Hi {firstname} {lastname},

Thank you for booking with {hotel_hotel_name}!

Bookings in this order are Not Confirmed yet !!
We are sorry for your inconvenience. Please contact hotel to get final confirmation for your bookings. - + @@ -88,14 +88,14 @@   - +

Order details

Order: {order_name} Placed on {date}

Payment: {payment}

Status: {order_status} - +   @@ -127,18 +127,18 @@ - + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop. - + - + If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. - + diff --git a/mails/en/overbooking_admin.html b/mails/en/overbooking_admin.html index a19795a02..c64acd1ec 100755 --- a/mails/en/overbooking_admin.html +++ b/mails/en/overbooking_admin.html @@ -70,12 +70,12 @@ - + Hi {firstname} {lastname},

New bookings are created on {hotel_hotel_name}!

Bookings in this order have Overbookings !!
This order is not confirmed yet. Please check the order details to resolve overbookings. - + @@ -87,14 +87,14 @@   - +

Customer details

Name: {customer_name}

Email: {customer_email} - +   @@ -110,7 +110,7 @@   - +

Order details

@@ -118,7 +118,7 @@ Payment: {payment}

Status: {order_status} - +   diff --git a/mails/en/partial_payment_accepted.html b/mails/en/partial_payment_accepted.html index 61b578477..953846164 100644 --- a/mails/en/partial_payment_accepted.html +++ b/mails/en/partial_payment_accepted.html @@ -69,10 +69,10 @@ - + Hi {firstname} {lastname},
{order_header_line_html} - + @@ -84,7 +84,7 @@   - +

Order {order_name} - Payment processed

@@ -93,7 +93,7 @@ Total Booking Amount: {total_paid}

Partial Payment Amount: {advance_paid_amount}

Total Paid Amount: {total_paid_real}

- +   @@ -106,18 +106,18 @@ {extra_mail_content_html} - + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - + - + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. - + diff --git a/mails/en/password.html b/mails/en/password.html index e6fd5726b..803a94c72 100644 --- a/mails/en/password.html +++ b/mails/en/password.html @@ -69,9 +69,9 @@ - + Hi {firstname} {lastname}, - + @@ -83,14 +83,14 @@   - +

Your new {shop_name} login details

E-mail address: {email}
Password: {passwd} - +   @@ -102,18 +102,18 @@ - + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - + - + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. - + diff --git a/mails/en/password_query.html b/mails/en/password_query.html index 3a9071826..3825facc8 100644 --- a/mails/en/password_query.html +++ b/mails/en/password_query.html @@ -69,9 +69,9 @@ - + Hi {firstname} {lastname}, - + @@ -83,7 +83,7 @@   - +

Password reset request for {shop_name}

@@ -91,7 +91,7 @@ Please note that this will change your current password.

To confirm this action, please use the following link:
{url} - +   diff --git a/mails/en/payment_accepted.html b/mails/en/payment_accepted.html index 97d84f255..b99974481 100644 --- a/mails/en/payment_accepted.html +++ b/mails/en/payment_accepted.html @@ -69,10 +69,10 @@ - + Hi {firstname} {lastname},
{order_header_line_html} - + @@ -84,12 +84,12 @@   - +

Order {order_name} - Payment processed

Your payment for order with the reference {order_name} was successfully processed. - +   @@ -102,18 +102,18 @@ {extra_mail_content_html} - + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - + - + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. - + diff --git a/mails/en/payment_error.html b/mails/en/payment_error.html index ba3a129d7..af3d28bb5 100644 --- a/mails/en/payment_error.html +++ b/mails/en/payment_error.html @@ -69,9 +69,9 @@ - + Hi {firstname} {lastname}, - + @@ -83,13 +83,13 @@   - +

Order {order_name} - Payment processing error

There is a problem with your payment for {shop_name} order with the reference {order_name}. Please contact us at your earliest convenience.
 - +   @@ -102,18 +102,18 @@ {extra_mail_content_html} - + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - + - + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. - + diff --git a/mails/en/processing.html b/mails/en/processing.html index de01bd0ab..cc1fabbe7 100644 --- a/mails/en/processing.html +++ b/mails/en/processing.html @@ -69,9 +69,9 @@ - + Hi {firstname} {lastname}, - + @@ -83,12 +83,12 @@   - +

Order {order_name} - Processing

We are currently processing your {shop_name} order with the reference {order_name}. - +   @@ -101,18 +101,18 @@ {extra_mail_content_html} - + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - + - + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. - + diff --git a/mails/en/refund.html b/mails/en/refund.html index 5004f8183..b0f59304a 100644 --- a/mails/en/refund.html +++ b/mails/en/refund.html @@ -69,9 +69,9 @@ - + Hi {firstname} {lastname}, - + @@ -83,12 +83,12 @@   - +

Order {order_name} - Refund processed

We have processed your {shop_name} refund for order with the reference {order_name}. - +   @@ -101,18 +101,18 @@ {extra_mail_content_html} - + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - + - + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. - + diff --git a/mails/en/reply_msg.html b/mails/en/reply_msg.html index 7eafe00e4..de24a620d 100644 --- a/mails/en/reply_msg.html +++ b/mails/en/reply_msg.html @@ -80,7 +80,7 @@   - +

Message from {contact_name}


Title: {subject}

diff --git a/mails/en/shipped.html b/mails/en/shipped.html index f0e3c9a5e..815ce0a3b 100644 --- a/mails/en/shipped.html +++ b/mails/en/shipped.html @@ -69,10 +69,10 @@ - + Hi {firstname} {lastname},
Your order has been shipped - + @@ -84,13 +84,13 @@   - +

Order {order_name} - Shipped

Your order with the reference {order_name} has been shipped.
Thank you for booking with {shop_name}! - +   diff --git a/mails/en/voucher.html b/mails/en/voucher.html index 5be2a4031..471eebe48 100644 --- a/mails/en/voucher.html +++ b/mails/en/voucher.html @@ -69,9 +69,9 @@ - + Hi {firstname} {lastname}, - + @@ -83,14 +83,14 @@   - +

Order {order_name} - Voucher created

A voucher has been created in your name as a result of your order with the reference {order_name}.

Voucher code: {voucher_num} in the amount of {voucher_amount}

Simply copy/paste this code during the payment process for your next order. - +   diff --git a/mails/en/voucher_new.html b/mails/en/voucher_new.html index 634666db7..6bc02205d 100644 --- a/mails/en/voucher_new.html +++ b/mails/en/voucher_new.html @@ -69,9 +69,9 @@ - + Hi {firstname} {lastname}, - + @@ -83,13 +83,13 @@   - +

This is to inform you about the creation of a voucher.

Here is the code of your voucher: {voucher_num}

Simply copy/paste this code during the payment process for your next order. - +   diff --git a/modules/bankwire/views/templates/mail/mail_template_html.tpl b/modules/bankwire/views/templates/mail/mail_template_html.tpl index 7d1634d33..012591c35 100644 --- a/modules/bankwire/views/templates/mail/mail_template_html.tpl +++ b/modules/bankwire/views/templates/mail/mail_template_html.tpl @@ -25,7 +25,7 @@   - +

{l s='Here are the bank details for your transfer:' mod='bankwire' lang=$lang}

@@ -35,7 +35,7 @@ {l s='Account details:' mod='bankwire' lang=$lang} {$bankwire_details}
{l s='Bank address:' mod='bankwire' lang=$lang} {$bankwire_address} - +
  diff --git a/modules/blocknewsletter/blocknewsletter.php b/modules/blocknewsletter/blocknewsletter.php index 39dfb1639..681f0c98f 100644 --- a/modules/blocknewsletter/blocknewsletter.php +++ b/modules/blocknewsletter/blocknewsletter.php @@ -54,8 +54,6 @@ class Blocknewsletter extends Module $this->tab = 'front_office_features'; $this->need_instance = 0; - $this->controllers = array('verification'); - $this->bootstrap = true; parent::__construct(); diff --git a/modules/blocknewsletter/mails/en/newsletter_conf.html b/modules/blocknewsletter/mails/en/newsletter_conf.html index cff837649..2c5f51f75 100644 --- a/modules/blocknewsletter/mails/en/newsletter_conf.html +++ b/modules/blocknewsletter/mails/en/newsletter_conf.html @@ -68,9 +68,9 @@ - + Hi, - + @@ -82,13 +82,13 @@   - + Thank you for subscribing to our newsletter! If you wish to unsubscribe, please click here. - +   diff --git a/modules/blocknewsletter/mails/en/newsletter_verif.html b/modules/blocknewsletter/mails/en/newsletter_verif.html index 1c55f012e..9ec521952 100644 --- a/modules/blocknewsletter/mails/en/newsletter_verif.html +++ b/modules/blocknewsletter/mails/en/newsletter_verif.html @@ -68,9 +68,9 @@ - + Hi, - + @@ -82,11 +82,11 @@   - + Thank you for subscribing to our newsletter, please confirm your request by clicking here. - +   diff --git a/modules/blocknewsletter/mails/en/newsletter_voucher.html b/modules/blocknewsletter/mails/en/newsletter_voucher.html index 457b8a35e..89cbaa5e7 100644 --- a/modules/blocknewsletter/mails/en/newsletter_voucher.html +++ b/modules/blocknewsletter/mails/en/newsletter_voucher.html @@ -69,9 +69,9 @@ - + Hi, - + @@ -83,7 +83,7 @@   - +

Newsletter subscription

@@ -94,7 +94,7 @@ Please note that the voucher will be valid on your first order. - +   diff --git a/modules/blocksocial/blocksocial.tpl b/modules/blocksocial/blocksocial.tpl index 08c703dee..af6846355 100644 --- a/modules/blocksocial/blocksocial.tpl +++ b/modules/blocksocial/blocksocial.tpl @@ -60,13 +60,6 @@ {/if} - {if isset($google_plus_url) && $google_plus_url != ''} -
  • - - {l s='Google Plus' mod='blocksocial'} - -
    • - {/if} {if isset($pinterest_url) && $pinterest_url != ''}
  • diff --git a/modules/cheque/views/templates/mail/mail_template_html.tpl b/modules/cheque/views/templates/mail/mail_template_html.tpl index 8b33da90c..607e4fe81 100644 --- a/modules/cheque/views/templates/mail/mail_template_html.tpl +++ b/modules/cheque/views/templates/mail/mail_template_html.tpl @@ -25,7 +25,7 @@   - +

    {l s='Here are the bank details for your check:' mod='cheque' lang=$lang}

    @@ -34,7 +34,7 @@ {l s='Payable to the order of:' mod='cheque' lang=$lang} {$cheque_name}
    {l s='Please mail your check to:' mod='cheque' lang=$lang} {$cheque_address_html} -     +
      diff --git a/modules/hotelreservationsystem/classes/HotelBookingDemands.php b/modules/hotelreservationsystem/classes/HotelBookingDemands.php index 32fde53aa..fe0c0efd0 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDemands.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDemands.php @@ -126,9 +126,9 @@ class HotelBookingDemands extends ObjectModel if ($getTotalPrice) { foreach ($roomTypeDemands as $demand) { if ($useTax) { - $totalDemandsPrice += Tools::processPriceRounding($demand['total_price_tax_incl']); + $totalDemandsPrice += (float)$demand['total_price_tax_incl']; } else { - $totalDemandsPrice += Tools::processPriceRounding($demand['total_price_tax_excl']); + $totalDemandsPrice += (float)$demand['total_price_tax_excl']; } } } else { @@ -203,15 +203,16 @@ class HotelBookingDemands extends ObjectModel } $values = ''; $priceTaxExcl = $this->unit_price_tax_excl; + $objBkDetail = new HotelBookingDetail($this->id_htl_booking); + $objOrder = new Order($objBkDetail->id_order); foreach ($taxCalculator->getTaxesAmount($priceTaxExcl) as $idTax => $amount) { $quantity = 1; if ($this->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) { - $objBkDetail = new HotelBookingDetail($this->id_htl_booking); $quantity = HotelHelper::getNumberOfDays($objBkDetail->date_from, $objBkDetail->date_to); } - // Rounding as per configurations - $totalAmount = Tools::processPriceRounding($amount, $quantity); + // Rounding as per configurations — use order's stored round settings + $totalAmount = Tools::processPriceRounding($amount, $quantity, $objOrder->round_type, $objOrder->round_mode); $values .= '('.(int)$this->id.','.(int)$idTax.','.(float)$amount.','. (float)$totalAmount.'),'; diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php index 68086cde4..60ec3fde2 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php @@ -2096,7 +2096,8 @@ class HotelBookingDetail extends ObjectModel $context->cart->id, $context->cookie->id_guest, $objCartBookingData->id_room, - 0 + 0, + 1 ); $objBookingDetail->total_price_tax_excl = $totalRoomTypePrice['total_price_tax_excl']; $objBookingDetail->total_price_tax_incl = $totalRoomTypePrice['total_price_tax_incl']; diff --git a/modules/hotelreservationsystem/classes/HotelCartBookingData.php b/modules/hotelreservationsystem/classes/HotelCartBookingData.php index be3cabc94..a6a0800bf 100644 --- a/modules/hotelreservationsystem/classes/HotelCartBookingData.php +++ b/modules/hotelreservationsystem/classes/HotelCartBookingData.php @@ -1331,6 +1331,7 @@ class HotelCartBookingData extends ObjectModel ); $cart_detail_data[$key]['amt_with_qty'] = $roomTypeDateRangePrice['total_price_tax_excl']; + $cart_detail_data[$key]['connected_rooms'] = HotelConnectedRoom::getConnectedRooms((int) $obj_htl_room_info->id, null, null, Context::getContext()->language->id); } } if ($cart_detail_data) { diff --git a/modules/hotelreservationsystem/classes/HotelConnectedRoom.php b/modules/hotelreservationsystem/classes/HotelConnectedRoom.php new file mode 100644 index 000000000..f1142d51d --- /dev/null +++ b/modules/hotelreservationsystem/classes/HotelConnectedRoom.php @@ -0,0 +1,180 @@ + 'htl_connected_room', + 'primary' => 'id_connected_room', + 'fields' => array( + 'id_room' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), + 'id_room_connected' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), + 'date_add' => array('type' => self::TYPE_DATE), + 'date_upd' => array('type' => self::TYPE_DATE), + ), + ); + + public static function getConnectedRooms($idRoom = null, $idRoomType = null, $idHotel = null, $idLang = null) + { + $idLang = $idLang ? (int) $idLang : (int) Context::getContext()->language->id; + + $sql = 'SELECT + hcr.id_connected_room, + hcr.id_room, + base_room.room_num AS room_name, + connected_room.id AS id_room_connected, + connected_room.id_product AS id_room_type, + conn_pl.name AS room_type_name, + connected_room.room_num AS connected_room_name + FROM `' . _DB_PREFIX_ . 'htl_connected_room` hcr + INNER JOIN `' . _DB_PREFIX_ . 'htl_room_information` connected_room + ON connected_room.id = hcr.id_room_connected + INNER JOIN `' . _DB_PREFIX_ . 'htl_room_information` base_room + ON base_room.id = hcr.id_room + LEFT JOIN `' . _DB_PREFIX_ . 'product_lang` conn_pl + ON (conn_pl.id_product = connected_room.id_product AND conn_pl.id_lang = ' . $idLang . ') + WHERE 1'; + + if ($idRoom !== null) { + $sql .= ' AND hcr.id_room = ' . $idRoom; + } + if ($idRoomType !== null) { + $sql .= ' AND base_room.id_product = ' . (int) $idRoomType; + } + if ($idHotel !== null) { + $sql .= ' AND base_room.id_hotel = ' . (int) $idHotel; + } + + $sql .= ' ORDER BY hcr.id_room, connected_room.id_product, connected_room.room_num'; + + $results = Db::getInstance()->executeS($sql); + if ($results === false) { + return array(); + } + + $connectedRooms = array(); + foreach ($results as $row) { + $roomId = (int) $row['id_room']; + $roomTypeId = (int) $row['id_room_type']; + + if (!isset($connectedRooms[$roomId])) { + $connectedRooms[$roomId] = array( + 'name' => $row['room_name'], + 'connected_room_types' => array(), + ); + } + + if (!isset($connectedRooms[$roomId]['connected_room_types'][$roomTypeId])) { + $connectedRooms[$roomId]['connected_room_types'][$roomTypeId] = array( + 'room_type_name' => $row['room_type_name'], + 'connected_rooms' => array(), + ); + } + + $connectedRooms[$roomId]['connected_room_types'][$roomTypeId]['connected_rooms'][] = array( + 'id_connected_room' => (int) $row['id_connected_room'], + 'id_room' => (int) $row['id_room_connected'], + 'name' => $row['connected_room_name'], + ); + } + + return $connectedRooms; + } + + public static function getNotConnectedRooms($idRoom, $idLang = null) + { + $idRoom = (int) $idRoom; + if ($idRoom <= 0) { + return array(); + } + $idLang = $idLang ? (int) $idLang : (int) Context::getContext()->language->id; + + $sql = 'SELECT hri.id AS id_room, hri.id_product AS id_room_type, pl.name AS room_type_name, hri.room_num AS room_name + FROM `' . _DB_PREFIX_ . 'htl_room_information` hri + LEFT JOIN `' . _DB_PREFIX_ . 'product_lang` pl + ON (pl.id_product = hri.id_product AND pl.id_lang = ' . $idLang . ') + WHERE hri.id != ' . $idRoom . ' + AND hri.id_hotel = ( + SELECT id_hotel FROM `' . _DB_PREFIX_ . 'htl_room_information` WHERE id = ' . $idRoom . ' + ) + AND NOT EXISTS ( + SELECT 1 FROM `' . _DB_PREFIX_ . 'htl_connected_room` cr + WHERE cr.id_room = ' . $idRoom . ' AND cr.id_room_connected = hri.id + ) + ORDER BY pl.name ASC, hri.room_num ASC'; + + $results = Db::getInstance()->executeS($sql); + + $grouped = array(); + foreach ($results as $row) { + $typeId = (int) $row['id_room_type']; + if (!isset($grouped[$typeId])) { + $grouped[$typeId] = array( + 'id_room_type' => $typeId, + 'name' => $row['room_type_name'], + 'rooms' => array(), + ); + } + $grouped[$typeId]['rooms'][] = array( + 'id_room' => (int) $row['id_room'], + 'name' => $row['room_name'], + ); + } + return $grouped; + } + + public static function getTotalConnectedRooms($idRoom = 0, $idRoomConnected = 0) + { + $idRoom = (int) $idRoom; + $idRoomConnected = (int) $idRoomConnected; + + if ($idRoom <= 0 && $idRoomConnected > 0) { + $sql = 'SELECT DISTINCT id_room + FROM `' . _DB_PREFIX_ . 'htl_connected_room` + WHERE id_room_connected = ' . $idRoomConnected; + + $results = Db::getInstance()->executeS($sql); + if ($results === false) { + return array(); + } + return array_column($results, 'id_room'); + } + + $sql = 'SELECT COUNT(*) FROM `' . _DB_PREFIX_ . 'htl_connected_room` hcr + INNER JOIN `' . _DB_PREFIX_ . 'htl_room_information` hri + ON hri.id = hcr.id_room_connected + WHERE hcr.id_room = ' . $idRoom; + + return (int) Db::getInstance()->getValue($sql); + } + +} diff --git a/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php b/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php index bc5372a90..5ce9d376d 100644 --- a/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php +++ b/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php @@ -262,7 +262,7 @@ class HotelOrderRefundRules extends ObjectModel ON (horr.`id_refund_rule` = hbrr.`id_refund_rule`) LEFT JOIN `'._DB_PREFIX_.'htl_order_refund_rules_lang` horrl ON (horrl.`id_refund_rule` = horr.`id_refund_rule` AND horrl.`id_lang` = '.(int) $idLang.') - LEFT JOIN `'._DB_PREFIX_.'htl_booking_detail` hbd + INNER JOIN `'._DB_PREFIX_.'htl_booking_detail` hbd ON (hbd.`id_hotel` = hbrr.`id_hotel` AND hbd.`id_order` = '.(int) $idOrder.') WHERE horr.`days` <= '.(int) $days.' GROUP BY hbrr.`id_refund_rule` diff --git a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php index ca44a2826..4dfdabc01 100644 --- a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php +++ b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php @@ -552,6 +552,17 @@ class HotelReservationSystemDb SELECT 5, `id_lang`, 'Hotel Amenities Block', 'Configure Hotels Amenities settings. You can display hotel amenities images using this block. This block will be displayed on home page.' FROM `"._DB_PREFIX_."lang` ORDER BY `id_lang`;", + "CREATE TABLE IF NOT EXISTS `"._DB_PREFIX_."htl_connected_room` ( + `id_connected_room` int(11) NOT NULL AUTO_INCREMENT, + `id_room` int(11) NOT NULL, + `id_room_connected` int(11) NOT NULL, + `date_add` datetime NOT NULL, + `date_upd` datetime NOT NULL, + PRIMARY KEY (`id_connected_room`), + UNIQUE KEY `uniq_room_connection` (`id_room`, `id_room_connected`), + KEY `idx_id_room` (`id_room`), + KEY `idx_id_room_connected` (`id_room_connected`) + ) ENGINE="._MYSQL_ENGINE_." DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;", ); } @@ -615,7 +626,8 @@ class HotelReservationSystemDb `'._DB_PREFIX_.'htl_room_type_bed_type`, `'._DB_PREFIX_.'htl_access`, `'._DB_PREFIX_.'htl_settings_link`, - `'._DB_PREFIX_.'htl_settings_link_lang`' + `'._DB_PREFIX_.'htl_settings_link_lang`, + `'._DB_PREFIX_.'htl_connected_room`' ); } } diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeDemandPrice.php b/modules/hotelreservationsystem/classes/HotelRoomTypeDemandPrice.php index cc6b97773..1351264ce 100644 --- a/modules/hotelreservationsystem/classes/HotelRoomTypeDemandPrice.php +++ b/modules/hotelreservationsystem/classes/HotelRoomTypeDemandPrice.php @@ -90,17 +90,14 @@ class HotelRoomTypeDemandPrice extends ObjectModel $useTax ); } + $numDays = 1; if ($objGlobalDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) { if ($dateFrom && $dateTo) { - $numDays = HotelHelper::getNumberOfDays($dateFrom, $dateTo); - if ($numDays > 1) { - $price *= $numDays; - } + $numDays = max(1, HotelHelper::getNumberOfDays($dateFrom, $dateTo)); } } - // Rounding as per configurations - $totalDemandsPrice += Tools::processPriceRounding($price); + $totalDemandsPrice += $price * $numDays; } } diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php index dd4f7da37..817b017c4 100644 --- a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php +++ b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php @@ -409,7 +409,7 @@ class HotelRoomTypeFeaturePricing extends ObjectModel $use_reduc )) { foreach($servicesWithTax as $service) { - $totalPrice['total_price_tax_incl'] += Tools::processPriceRounding($service['price']); + $totalPrice['total_price_tax_incl'] += $service['price']; } } if ($servicesWithoutTax = RoomTypeServiceProduct::getAutoAddServices( @@ -421,7 +421,7 @@ class HotelRoomTypeFeaturePricing extends ObjectModel $use_reduc )) { foreach($servicesWithoutTax as $service) { - $totalPrice['total_price_tax_excl'] += Tools::processPriceRounding($service['price']); + $totalPrice['total_price_tax_excl'] += $service['price']; } } } @@ -430,8 +430,8 @@ class HotelRoomTypeFeaturePricing extends ObjectModel if (!$quantity) { $quantity = 1; } - $totalPrice['total_price_tax_incl'] = Tools::processPriceRounding($totalPrice['total_price_tax_incl'], $quantity); - $totalPrice['total_price_tax_excl'] = Tools::processPriceRounding($totalPrice['total_price_tax_excl'], $quantity); + $totalPrice['total_price_tax_incl'] = $totalPrice['total_price_tax_incl'] * $quantity; + $totalPrice['total_price_tax_excl'] = $totalPrice['total_price_tax_excl'] * $quantity; return $totalPrice; } diff --git a/modules/hotelreservationsystem/classes/ServiceProductCartDetail.php b/modules/hotelreservationsystem/classes/ServiceProductCartDetail.php index 25a1edfcb..e2d08d14a 100644 --- a/modules/hotelreservationsystem/classes/ServiceProductCartDetail.php +++ b/modules/hotelreservationsystem/classes/ServiceProductCartDetail.php @@ -324,13 +324,13 @@ class ServiceProductCartDetail extends ObjectModel 'unit_price_tax_incl' => $priceTaxIncl, 'unit_price_tax_excl' => $priceTaxExcl, 'quantity' => $product['quantity'], - 'total_price_tax_incl' => $priceTaxIncl * (int)$product['quantity'] * $numDays, - 'total_price_tax_excl' => $priceTaxExcl * (int)$product['quantity'] * $numDays, + 'total_price_tax_incl' => $priceTaxIncl * $numDays * (int)$product['quantity'], + 'total_price_tax_excl' => $priceTaxExcl * $numDays * (int)$product['quantity'], 'cover_img' => $coverImg, 'price_calculation_method' => $product['price_calculation_method'], 'auto_add_to_cart' => $product['auto_add_to_cart'], 'price_addition_type' => $product['price_addition_type'], - 'total_price' => ($useTax ? $priceTaxIncl * (int)$product['quantity'] * $numDays : $priceTaxExcl * (int)$product['quantity'] * $numDays), + 'total_price' => ($useTax ? $priceTaxIncl : $priceTaxExcl) * $numDays * (int)$product['quantity'], ); if ($product['htl_cart_booking_id']) { diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php index 87c31f89b..2d180ee1d 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php @@ -386,6 +386,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController 'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'), 'link' => $this->context->link, 'ALLOTMENT_MANUAL' => HotelBookingDetail::ALLOTMENT_MANUAL, + 'htl_connected_rooms' => HotelConnectedRoom::getConnectedRooms(null, null, $this->id_hotel, $this->context->language->id), )); if (Configuration::get('PS_BACKOFFICE_SEARCH_TYPE') == HotelBookingDetail::SEARCH_TYPE_OWS) { @@ -891,6 +892,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController // if room is changing in the reallocation if ($objHotelBooking->id_product != $idNewRoomType) { $result['has_room_type_change'] = 1; + $objOrder = new Order($objHotelBooking->id_order); $occupancy = array( array( 'adults' => $objHotelBooking->adults, @@ -907,7 +909,8 @@ class AdminHotelRoomsBookingController extends ModuleAdminController 0, 0, 0, - 0 + 0, + 1 ); if ($objHotelBooking->total_price_tax_excl != $newRoomTotalPrice['total_price_tax_excl']) { @@ -1035,6 +1038,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController // add fullcalender plugin $this->addJqueryUI('ui.tooltip', 'base', true); $this->removeJS(Media::getJqueryUIPath('effects.core', 'base', false), false); + $this->addCSS(array(_MODULE_DIR_.'hotelreservationsystem/views/css/HotelReservationAdmin.css')); $this->addCSS(_PS_JS_DIR_.'fullcalendar/main.css'); $this->addJs(_PS_JS_DIR_.'fullcalendar/main.js'); diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelfeaturesController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelfeaturesController.php index 994511b33..9f30938fe 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelfeaturesController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelfeaturesController.php @@ -141,13 +141,13 @@ class AdminHotelFeaturesController extends ModuleAdminController $this->errors[] = $this->l('Child features name is required at least in '). $objDefaultLanguage['name']; } elseif (!Validate::isGenericName($childftr)) { - $this->errors[] = $this->l('Child features name is invalid : ').$childftr; + $this->errors[] = $this->l('Child features name is invalid : ').Tools::safeOutput($childftr); } else { foreach ($languages as $lang) { if ($childFtrLang = Tools::getValue('child_features_'.$lang['id_lang'])) { if (!Validate::isGenericName($childFtrLang[$kChild])) { $this->errors[] = $this->l('Invalid child feature name in ').$lang['name']. - ' : '.$childFtrLang[$kChild]; + ' : '.Tools::safeOutput($childFtrLang[$kChild]); } } } diff --git a/modules/hotelreservationsystem/define.php b/modules/hotelreservationsystem/define.php index e8a7cc909..46ac79645 100644 --- a/modules/hotelreservationsystem/define.php +++ b/modules/hotelreservationsystem/define.php @@ -49,6 +49,7 @@ require_once 'classes/HotelRoomDisableDates.php'; require_once 'classes/HotelBranchRefundRules.php'; require_once 'classes/HotelBedType.php'; require_once 'classes/HotelRoomTypeBedType.php'; +require_once 'classes/HotelConnectedRoom.php'; // linked products require_once 'classes/RoomTypeServiceProduct.php'; diff --git a/modules/hotelreservationsystem/views/css/HotelReservationAdmin.css b/modules/hotelreservationsystem/views/css/HotelReservationAdmin.css index a207087a6..e3b6077b2 100644 --- a/modules/hotelreservationsystem/views/css/HotelReservationAdmin.css +++ b/modules/hotelreservationsystem/views/css/HotelReservationAdmin.css @@ -577,36 +577,6 @@ p.room_cat_data .fc-today-button:disabled { display: none; } -/* book now page tooltip */ -.tooltip_cont { - min-width: 280px; - width: 100%; - font-size: 14px; - font-weight: 600; - /* display: grid; */ -} -.tooltip_cont .tip_header { - margin-bottom: 10px; -} -.tooltip_cont .tip-body > div { - margin-bottom: 6px; -} -.tip_element_head { - font-size: 12px; -} -.tip_element_value { - font-size: 16px; - opacity: 0.6; -} -.tip-body { - display: grid; - grid-template-columns: auto auto; -} -body.adminhotelroomsbooking .ui-tooltip { - border: unset; - padding: 10px; - box-shadow: 0px 0px 15px 0px #00000026; -} #room-reallocation-modal .modal-footer { padding: 15px 0px 0px 0px diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl index ccc73a37c..8c9d0fe57 100644 --- a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl @@ -40,7 +40,12 @@ {foreach from=$book_v['data']['available'] key=avai_k item=avai_v} - {$avai_v['room_num']|escape:'htmlall':'UTF-8'} {hook h='displayRoomNumAfter' data=$avai_v type='available'} + {$avai_v['room_num']|escape:'htmlall':'UTF-8'} + {if isset($htl_connected_rooms[$avai_v['id_room']]) && $htl_connected_rooms[$avai_v['id_room']]|@count > 0} + {include file="controllers/products/connected-rooms.tpl" htl_connected_rooms=$htl_connected_rooms[$avai_v['id_room']]} + {/if} + + {hook h='displayRoomNumAfter' data=$avai_v type='available'} {assign var="is_full_date" value=($show_full_date && ($date_from|date_format:'%D' == $date_to|date_format:'%D'))} {dateFormat date=$date_from full=$is_full_date} - {dateFormat date=$date_to full=$is_full_date} {$avai_v['room_comment']|escape:'htmlall':'UTF-8'} @@ -132,7 +137,11 @@

    {dateFormat date=$part_v['date_from'] full=$is_full_date} - {dateFormat date=$part_v['date_to'] full=$is_full_date}

    {/if} - {$sub_part_v['room_num']|escape:'htmlall':'UTF-8'} {hook h='displayRoomNumAfter' data=$sub_part_v type='partially_available'} + {$sub_part_v['room_num']|escape:'htmlall':'UTF-8'} + {if isset($htl_connected_rooms[$sub_part_v['id_room']]) && $htl_connected_rooms[$sub_part_v['id_room']]|@count > 0} + {include file="controllers/products/connected-rooms.tpl" htl_connected_rooms=$htl_connected_rooms[$sub_part_v['id_room']]} + {/if} + {hook h='displayRoomNumAfter' data=$sub_part_v type='partially_available'} {foreach $allotment_types as $allotment_type}     #{$rm_dtl_v['id_order']} @@ -257,7 +270,11 @@ {foreach from=$unavai_v['detail'] key=rm_dtl_k item=unavail_dtl_v} {if $unavail_dtl_v@first} - {$unavai_v['room_num']|escape:'htmlall':'UTF-8'} + {$unavai_v['room_num']|escape:'htmlall':'UTF-8'} + {if isset($htl_connected_rooms[$unavai_v['id_room']]) && $htl_connected_rooms[$unavai_v['id_room']]|@count > 0} + {include file="controllers/products/connected-rooms.tpl" htl_connected_rooms=$htl_connected_rooms[$unavai_v['id_room']]} + {/if} + {/if} {HotelRoomInformation::getRoomStatusTitle($unavail_dtl_v['id_status'])|escape:'htmlall':'UTF-8'} diff --git a/modules/qlocrontaskmanager/CHANGELOG.txt b/modules/qlocrontaskmanager/CHANGELOG.txt new file mode 100644 index 000000000..7ad8ca469 --- /dev/null +++ b/modules/qlocrontaskmanager/CHANGELOG.txt @@ -0,0 +1,7 @@ +# v1.0.0 - 2026-03-24 +- Initial release +- Centralized cron task management for QloApps modules +- Single server cron entry dispatches all module tasks +- Admin panel for viewing tasks, logs, and configuration +- Automatic task discovery on module install/uninstall +- Cron expression support via dragonmantank/cron-expression library diff --git a/modules/qlocrontaskmanager/LICENSE.md b/modules/qlocrontaskmanager/LICENSE.md new file mode 100644 index 000000000..86ba7fd7d --- /dev/null +++ b/modules/qlocrontaskmanager/LICENSE.md @@ -0,0 +1,15 @@ +SOFTWARE LICENCE AGREEMENT +=============================== + +This source file is subject to the Open Software License version 3.0 +that is bundled with this package in the file LICENSE.md +It is also available through the world-wide-web at this URL: +https://opensource.org/license/osl-3-0-php + +If you did not receive a copy of the license and are unable to +obtain it through the world-wide-web, please send an email +to support@qloapps.com so we can send you a copy immediately. + +@author Webkul IN +@copyright Since 2010 Webkul +@license https://opensource.org/license/osl-3-0-php Open Software License version 3.0 diff --git a/modules/qlocrontaskmanager/README.md b/modules/qlocrontaskmanager/README.md new file mode 100644 index 000000000..0954dbf58 --- /dev/null +++ b/modules/qlocrontaskmanager/README.md @@ -0,0 +1,42 @@ +## Overview + +The **QloApps Cron Task Manager** module enables centralized management and execution of scheduled (cron) tasks within QloApps. It allows developers and administrators to define, register, and execute automated jobs efficiently. + +**QloApps Cron Task Manager 1.0.0** + +- Current version: 1.0.0 + +- Module V1.0.0 compatible with QloApps version 1.7.0 and V1.8.x. + + + +## Usage (QloApps version 1.7.0) + +To register a cron task, add a new hook inside your module's main class file. + +### Step 1: Register Cron Tasks Hook + +```php +public function hookRegisterCronTasks() +{ + return array( + array( + 'name' => 'cron_success_probe', + 'description' => $this->l('Sample cron task for scheduler verification.'), + 'cron' => '* * * * *', + 'callback' => 'cronSuccessProbe', + ) + ); +} + +``` + +### Support Policy: +https://store.webkul.com/support.html + + +### Explore Addons: +https://qloapps.com/addons/ + +### Refund Policy: +https://store.webkul.com/refund-policy.html/ \ No newline at end of file diff --git a/modules/qlocrontaskmanager/classes/QctmCronExpressionTranslator.php b/modules/qlocrontaskmanager/classes/QctmCronExpressionTranslator.php new file mode 100644 index 000000000..68e04abf4 --- /dev/null +++ b/modules/qlocrontaskmanager/classes/QctmCronExpressionTranslator.php @@ -0,0 +1,370 @@ +module = Module::getInstanceByName('qlocrontaskmanager'); + } + + public function getCronExpressionTranslation($expression) + { + $parts = preg_split('/\s+/', trim($expression)); + + if (count($parts) !== 5) { + return $this->module->l('Invalid cron expression'); + } + + list($minute, $hour, $day, $month, $weekday) = $parts; + + $hasFixedTime = $this->isNumeric($hour) && $this->isNumeric($minute); + $dayMonthWildcard = ($day == '*' && $month == '*'); + $monthWeekdayWildcard = ($month == '*' && $weekday == '*'); + $everyMinuteWildcard = ($minute == '*' && $hour == '*'); + + if ($expression === '* * * * *') { + return $this->module->l('Every minute'); + } + + if (preg_match('/^\*\/(\d+)$/', $minute, $m) && $hour == '*' && $dayMonthWildcard && $weekday == '*') { + return ((int) $m[1] === 1) + ? $this->module->l('Every minute') + : vsprintf($this->module->l('Every %d minutes'), array((int) $m[1])); + } + + if ($minute == '0' && $hour == '*' && $dayMonthWildcard && $weekday == '*') { + return $this->module->l('Every hour'); + } + + if ($minute == '0' && preg_match('/^\*\/(\d+)$/', $hour, $m) && $dayMonthWildcard && $weekday == '*') { + return ((int) $m[1] === 1) + ? $this->module->l('Every hour') + : vsprintf($this->module->l('Every %d hours'), array((int) $m[1])); + } + + if ($hasFixedTime && $dayMonthWildcard && $weekday == '*') { + return vsprintf($this->module->l('Every day at %s'), array($this->hourLabel($hour, $minute))); + } + + if ($hasFixedTime && $day == '*' && $weekday == '*' && preg_match('/^\*\/(\d+)$/', $month, $mm)) { + return ((int) $mm[1] === 1) + ? vsprintf($this->module->l('Every day every month at %s'), array($this->hourLabel($hour, $minute))) + : vsprintf( + $this->module->l('Every day every %1$d months at %2$s'), + array((int) $mm[1], $this->hourLabel($hour, $minute)) + ); + } + + if ($hasFixedTime && $dayMonthWildcard && $weekday == '1-5') { + return vsprintf($this->module->l('Every weekday at %s'), array($this->hourLabel($hour, $minute))); + } + + if ($hasFixedTime && $dayMonthWildcard && $weekday == '0,6') { + return vsprintf($this->module->l('Every weekend at %s'), array($this->hourLabel($hour, $minute))); + } + + if ($hasFixedTime && $dayMonthWildcard && $this->isNumeric($weekday)) { + return vsprintf( + $this->module->l('Every %1$s at %2$s'), + array($this->weekdayName($weekday), $this->hourLabel($hour, $minute)) + ); + } + + if (strpos($weekday, ',') !== false && $hasFixedTime && $dayMonthWildcard) { + return vsprintf( + $this->module->l('Every %1$s at %2$s'), + array($this->joinNames($weekday, 'weekdayName'), $this->hourLabel($hour, $minute)) + ); + } + + if ($this->isNumeric($day) && $hasFixedTime && $monthWeekdayWildcard) { + return vsprintf( + $this->module->l('On the %1$s of every month at %2$s'), + array($this->ordinal($day), $this->hourLabel($hour, $minute)) + ); + } + + if (preg_match('/^(\d+)-(\d+)$/', $day, $dm) && $hasFixedTime && $monthWeekdayWildcard) { + return vsprintf( + $this->module->l('Every day from the %1$s to the %2$s of each month at %3$s'), + array($this->ordinal($dm[1]), $this->ordinal($dm[2]), $this->hourLabel($hour, $minute)) + ); + } + + if (strpos($day, ',') !== false && $hasFixedTime && $monthWeekdayWildcard) { + return vsprintf( + $this->module->l('On the %1$s of each month at %2$s'), + array($this->joinOrdinals($day), $this->hourLabel($hour, $minute)) + ); + } + + if ($this->isNumeric($day) && $this->isNumeric($month) && $hasFixedTime && $weekday == '*') { + return vsprintf( + $this->module->l('Every %1$s %2$s at %3$s'), + array($this->monthName($month), $this->ordinal($day), $this->hourLabel($hour, $minute)) + ); + } + + if ($everyMinuteWildcard && $dayMonthWildcard && $this->isNumeric($weekday)) { + return vsprintf($this->module->l('Every minute on %s'), array($this->weekdayName($weekday))); + } + + if ($everyMinuteWildcard && $dayMonthWildcard && $weekday == '1-5') { + return $this->module->l('Every minute on weekdays'); + } + + if ($everyMinuteWildcard && $dayMonthWildcard && $weekday == '0,6') { + return $this->module->l('Every minute on weekends'); + } + + if ($hasFixedTime) { + $when = vsprintf($this->module->l('At %s'), array($this->hourLabel($hour, $minute))); + } else { + $minuteFreq = null; + if ($minute === '*') { + $minuteFreq = $this->module->l('Every minute'); + } elseif (preg_match('/^\*\/(\d+)$/', $minute, $m)) { + $minuteFreq = ((int) $m[1] === 1) + ? $this->module->l('Every minute') + : vsprintf($this->module->l('Every %d minutes'), array((int) $m[1])); + } + + if (preg_match('/^(\d+)-(\d+)\/(\d+)$/', $hour, $hs) && $this->isNumeric($minute)) { + $when = ((int) $hs[3] === 1) + ? vsprintf( + $this->module->l('Every hour between %1$s and %2$s'), + array($this->hourLabel($hs[1], $minute), $this->hourLabel($hs[2], $minute)) + ) + : vsprintf( + $this->module->l('Every %1$d hours between %2$s and %3$s'), + array((int) $hs[3], $this->hourLabel($hs[1], $minute), $this->hourLabel($hs[2], $minute)) + ); + } elseif ($minuteFreq !== null) { + if ($hour === '*') { + $when = $minuteFreq; + } elseif ($this->isNumeric($hour)) { + $when = vsprintf($this->module->l('%1$s, during hour %2$s'), array($minuteFreq, $hour)); + } elseif (preg_match('/^(\d+)-(\d+)$/', $hour, $hm)) { + $when = vsprintf( + $this->module->l('%1$s between %2$s and %3$s'), + array($minuteFreq, $this->hourLabel($hm[1], 0), $this->hourLabel($hm[2], 59)) + ); + } else { + $when = vsprintf($this->module->l('%1$s, during hour %2$s'), array($minuteFreq, $hour)); + } + } elseif ($this->isNumeric($minute) && $hour === '*') { + $when = vsprintf($this->module->l('Every hour, at minute %s'), array($minute)); + } elseif ($this->isNumeric($minute) && preg_match('/^(\d+)-(\d+)$/', $hour, $hm)) { + $when = vsprintf( + $this->module->l('At minute %1$s, between %2$s and %3$s'), + array($minute, $this->hourLabel($hm[1], $minute), $this->hourLabel($hm[2], $minute)) + ); + } else { + $when = vsprintf($this->module->l('At minute %1$s, hour %2$s'), array($minute, $hour)); + } + } + + $conditions = array(); + + if ($day !== '*') { + if (preg_match('/^(\d+)-(\d+)$/', $day, $dm)) { + $conditions[] = vsprintf( + $this->module->l('from the %1$s to the %2$s of the month'), + array($this->ordinal($dm[1]), $this->ordinal($dm[2])) + ); + } elseif (strpos($day, ',') !== false) { + $conditions[] = vsprintf($this->module->l('on the %s of the month'), array($this->joinOrdinals($day))); + } elseif ($this->isNumeric($day)) { + $conditions[] = vsprintf($this->module->l('on the %s of the month'), array($this->ordinal($day))); + } else { + $conditions[] = vsprintf($this->module->l('on day %s of the month'), array($day)); + } + } + + if ($month !== '*') { + if (preg_match('/^\*\/(\d+)$/', $month, $mf)) { + $conditions[] = ((int) $mf[1] === 1) + ? $this->module->l('every month') + : vsprintf($this->module->l('every %d months'), array((int) $mf[1])); + } else { + if (preg_match('/^(\d+)-(\d+)$/', $month, $mm)) { + $monthDesc = vsprintf( + $this->module->l('%1$s through %2$s'), + array($this->monthName($mm[1]), $this->monthName($mm[2])) + ); + } elseif (strpos($month, ',') !== false) { + $monthDesc = $this->joinNames($month, 'monthName'); + } else { + $monthDesc = $this->monthName($month); + } + $conditions[] = vsprintf($this->module->l('in %s'), array($monthDesc)); + } + } + + if ($weekday !== '*') { + if ($weekday === '1-5') { + $weekdayDesc = $this->module->l('weekdays'); + } elseif ($weekday === '0,6' || $weekday === '6,0') { + $weekdayDesc = $this->module->l('weekends'); + } elseif (preg_match('/^(\d+)-(\d+)$/', $weekday, $wm)) { + $weekdayDesc = vsprintf( + $this->module->l('%1$s through %2$s'), + array($this->weekdayName($wm[1]), $this->weekdayName($wm[2])) + ); + } elseif (strpos($weekday, ',') !== false) { + $weekdayDesc = $this->joinNames($weekday, 'weekdayName'); + } else { + $weekdayDesc = $this->weekdayName($weekday); + } + $conditions[] = vsprintf($this->module->l('on %s'), array($weekdayDesc)); + } + + if (empty($conditions)) { + return $when; + } + + return $when . ' ' . implode(', ', $conditions); + } + + public function isNumeric($value) + { + return preg_match('/^\d+$/', $value) === 1; + } + + public function weekdayName($weekday) + { + $weekdays = array( + 0 => $this->module->l('Sunday'), + 1 => $this->module->l('Monday'), + 2 => $this->module->l('Tuesday'), + 3 => $this->module->l('Wednesday'), + 4 => $this->module->l('Thursday'), + 5 => $this->module->l('Friday'), + 6 => $this->module->l('Saturday'), + 7 => $this->module->l('Sunday'), + ); + + return ($this->isNumeric($weekday) && isset($weekdays[(int) $weekday])) ? $weekdays[(int) $weekday] : $weekday; + } + + public function monthName($month) + { + $months = array( + 1 => $this->module->l('January'), + 2 => $this->module->l('February'), + 3 => $this->module->l('March'), + 4 => $this->module->l('April'), + 5 => $this->module->l('May'), + 6 => $this->module->l('June'), + 7 => $this->module->l('July'), + 8 => $this->module->l('August'), + 9 => $this->module->l('September'), + 10 => $this->module->l('October'), + 11 => $this->module->l('November'), + 12 => $this->module->l('December'), + ); + + return ($this->isNumeric($month) && isset($months[(int) $month])) ? $months[(int) $month] : $month; + } + + public function hourLabel($hour, $minute = null) + { + $h = (int) $hour; + $suffix = $h >= 12 ? $this->module->l('PM') : $this->module->l('AM'); + $h12 = $h % 12; + + if ($h12 === 0) { + $h12 = 12; + } + + return $minute === null + ? sprintf('%d %s', $h12, $suffix) + : sprintf('%d:%02d %s', $h12, (int) $minute, $suffix); + } + + public function joinNames($csv, $nameMethod) + { + $names = array(); + + foreach (explode(',', $csv) as $token) { + $names[] = $this->$nameMethod($token); + } + + if (count($names) === 1) { + return $names[0]; + } + + $last = array_pop($names); + + return implode(', ', $names) . ' ' . $this->module->l('and') . ' ' . $last; + } + + public function ordinal($number) + { + $number = (int) $number; + + if ($number % 100 >= 11 && $number % 100 <= 13) { + $suffix = 'th'; + } else { + switch ($number % 10) { + case 1: + $suffix = 'st'; + break; + case 2: + $suffix = 'nd'; + break; + case 3: + $suffix = 'rd'; + break; + default: + $suffix = 'th'; + } + } + + return $number . $suffix; + } + + public function joinOrdinals($csv) + { + $ordinals = array(); + + foreach (explode(',', $csv) as $token) { + $ordinals[] = $this->isNumeric($token) ? $this->ordinal($token) : $token; + } + + if (count($ordinals) === 1) { + return $ordinals[0]; + } + + $last = array_pop($ordinals); + + return implode(', ', $ordinals) . ' ' . $this->module->l('and') . ' ' . $last; + } +} diff --git a/modules/qlocrontaskmanager/classes/QctmCronTask.php b/modules/qlocrontaskmanager/classes/QctmCronTask.php new file mode 100644 index 000000000..b7b157366 --- /dev/null +++ b/modules/qlocrontaskmanager/classes/QctmCronTask.php @@ -0,0 +1,256 @@ + 'qctm_cron_task', + 'primary' => 'id_cron_task', + 'fields' => array( + 'id_module' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), + 'task_name' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'size' => 128, 'required' => true), + 'description' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'size' => 255, 'required' => true), + 'cron_expression' => array('type' => self::TYPE_STRING, 'validate' => 'isString', 'size' => 64, 'required' => true), + 'callback' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'size' => 128, 'required' => true), + 'active' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'), + 'is_system' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'), + 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), + 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), + ), + ); + + public static function getActiveTasks() + { + return Db::getInstance()->executeS( + 'SELECT `id_cron_task`, `id_module`, `task_name`, `description`, + `cron_expression`, `callback`, `active` + FROM `' . _DB_PREFIX_ . 'qctm_cron_task` + WHERE `active` = 1' + ); + } + + public function dispatch() + { + $tasks = self::getActiveTasks(); + if (empty($tasks)) { + return; + } + + $now = new DateTime('now', new DateTimeZone(Configuration::get('PS_TIMEZONE') ?: date_default_timezone_get())); + $moduleCache = []; + foreach ($tasks as $task) { + if (!\Cron\CronExpression::isValidExpression($task['cron_expression'])) { + QctmCronTaskLog::addLog( + $task['id_cron_task'], + QctmCronTaskLog::QCTM_CRON_TASK_LOG_STATUS_ERROR, + 'Invalid cron expression "' . $task['cron_expression'] . '"' + ); + continue; + } + + $cron = \Cron\CronExpression::factory($task['cron_expression']); + + if (!$cron->isDue($now)) { + continue; + } + + $idModule = (int) $task['id_module']; + if (!array_key_exists($idModule, $moduleCache)) { + $moduleCache[$idModule] = Module::getInstanceById($idModule); + } + $module = $moduleCache[$idModule]; + + if (!$module) { + QctmCronTaskLog::addLog( + $task['id_cron_task'], + QctmCronTaskLog::QCTM_CRON_TASK_LOG_STATUS_ERROR, + 'Module with ID "' . (int) $task['id_module'] . '" could not be loaded' + ); + continue; + } + + if (!$module->active) { + continue; + } + + $callback = $task['callback']; + + if (!method_exists($module, $callback)) { + QctmCronTaskLog::addLog( + $task['id_cron_task'], + QctmCronTaskLog::QCTM_CRON_TASK_LOG_STATUS_ERROR, + 'Callback method "' . $callback . '" not found on module "' . $module->name . '"' + ); + continue; + } + + $startTime = microtime(true); + + try { + $module->{$callback}(); + + QctmCronTaskLog::addLog( + $task['id_cron_task'], + QctmCronTaskLog::QCTM_CRON_TASK_LOG_STATUS_SUCCESS, + null, + round(microtime(true) - $startTime, 4) + ); + } catch (\Throwable $e) { + QctmCronTaskLog::addLog( + $task['id_cron_task'], + QctmCronTaskLog::QCTM_CRON_TASK_LOG_STATUS_ERROR, + $e->getMessage(), + round(microtime(true) - $startTime, 4) + ); + } + } + + } + + + public function syncAllExistingModules() + { + $allTasks = Hook::exec('registerCronTasks', array(), null, true); + + if (!empty($allTasks) && is_array($allTasks)) { + foreach ($allTasks as $moduleName => $tasks) { + if (!empty($tasks) && is_array($tasks)) { + $module = Module::getInstanceByName($moduleName); + if($module){ + $this->registerTasksForModule($module->id, $tasks); + } + } + } + } + } + + /** + * Register tasks for a specific module after validation + * + * @param int $idModule + * @param array $tasks + */ + public function registerTasksForModule($idModule, $tasks) + { + $module = Module::getInstanceById($idModule); + if (!$module) { + return; + } + + + foreach ($tasks as $task) { + if (!$this->validateTask($module, $task)) { + continue; + } + + if (QctmCronTask::getByModuleAndName($idModule, $task['name'])) { + continue; + } + + $cronTask = new QctmCronTask(); + $cronTask->id_module = $idModule; + $cronTask->task_name = $task['name']; + $cronTask->description = $task['description']; + $cronTask->cron_expression = $task['cron']; + $cronTask->callback = $task['callback']; + $cronTask->active = 1; + $cronTask->is_system = 0; + if (!$cronTask->save()) { + PrestaShopLogger::addLog( + 'QloCronTaskManager: failed to register task "' . $task['name'] . '" for module "' . $module->name . '"', + 3 + ); + } + } + } + + /** + * Validate a task definition array + * + * @param object $module + * @param array $task + * @return bool + */ + public function validateTask(Module $module, $task) + { + if (!Validate::isGenericName($task['name']) || !Validate::isGenericName($task['description']) + || !Validate::isString($task['cron']) || !Validate::isString($task['callback'])) { + return false; + } + + if (!\Cron\CronExpression::isValidExpression($task['cron'])) { + return false; + } + + if (!method_exists($module, $task['callback'])) { + return false; + } + + return true; + } + + /** + * @param int $idModule + * @param string $taskName + * @return int|false + */ + public static function getByModuleAndName($idModule, $taskName) + { + return Db::getInstance()->getValue( + 'SELECT `id_cron_task` + FROM `' . _DB_PREFIX_ . 'qctm_cron_task` + WHERE `id_module` = ' . (int) $idModule . ' + AND `task_name` = \'' . pSQL($taskName) . '\'' + ); + } + + /** + * Delete all tasks belonging to a module. + * Logs are intentionally preserved for history tracking. + * + * @param int $idModule + * @return bool + */ + public static function deleteByModule($idModule) + { + return Db::getInstance()->execute( + 'DELETE FROM `' . _DB_PREFIX_ . 'qctm_cron_task` + WHERE `id_module` = ' . (int) $idModule + ); + } +} diff --git a/modules/qlocrontaskmanager/classes/QctmCronTaskLog.php b/modules/qlocrontaskmanager/classes/QctmCronTaskLog.php new file mode 100644 index 000000000..1b0e17df1 --- /dev/null +++ b/modules/qlocrontaskmanager/classes/QctmCronTaskLog.php @@ -0,0 +1,100 @@ + 'qctm_cron_task_log', + 'primary' => 'id_cron_task_log', + 'fields' => array( + 'id_cron_task' => array('type' => self::TYPE_INT,'validate' => 'isUnsignedId','required' => true), + 'status' => array('type' => self::TYPE_INT,'validate' => 'isUnsignedId','required' => true), + 'error_message' => array('type' => self::TYPE_STRING,'validate' => 'isString'), + 'execution_time' => array('type' => self::TYPE_FLOAT,'validate' => 'isFloat'), + 'date_add' => array('type' => self::TYPE_DATE,'validate' => 'isDate'), + ), + ); + + /** + * Add a log entry for a task execution + * + * @param int $idCronTask + * @param int $status + * @param string|null $errorMessage + * @param float $executionTime + * @return bool + */ + public static function addLog($idCronTask, $status, $errorMessage = null, $executionTime = 0) + { + $log = new self(); + $log->id_cron_task = (int) $idCronTask; + $log->status = $status; + $log->error_message = $errorMessage; + $log->execution_time = (float) $executionTime; + + return $log->add(); + } + + /** + * Delete logs older than specified number of days + * + * @param int $days + * @return bool + */ + public static function deleteOlderThan($days) + { + return Db::getInstance()->execute( + 'DELETE FROM `' . _DB_PREFIX_ . 'qctm_cron_task_log` + WHERE `date_add` < DATE_SUB(NOW(), INTERVAL ' . (int) $days . ' DAY)' + ); + } + + public static function getStatuses() + { + static $statuses = null; + + if ($statuses === null) { + $module = Module::getInstanceByName('qlocrontaskmanager'); + $statuses = array( + self::QCTM_CRON_TASK_LOG_STATUS_SUCCESS => $module->l('Success'), + self::QCTM_CRON_TASK_LOG_STATUS_ERROR => $module->l('Error'), + ); + } + + return $statuses; + } +} diff --git a/modules/qlocrontaskmanager/classes/QctmCronTaskManagerDb.php b/modules/qlocrontaskmanager/classes/QctmCronTaskManagerDb.php new file mode 100644 index 000000000..f08ae839e --- /dev/null +++ b/modules/qlocrontaskmanager/classes/QctmCronTaskManagerDb.php @@ -0,0 +1,102 @@ +execute($query)) { + return false; + } + } + + return true; + } + + public function dropTables() + { + $sql = array( + 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'qctm_cron_task_log`', + 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'qctm_cron_task`' + ); + + foreach ($sql as $query) { + if (!Db::getInstance()->execute($query)) { + return false; + } + } + + return true; + } + + public function installDefaultData() + { + Configuration::updateValue('QCTM_CRON_TASK_MANAGER_TOKEN', Tools::passwdGen(32)); + Configuration::updateValue('QCTM_CRON_TASK_MANAGER_LOG_RETENTION_DAYS', 30); + + return true; + } + + public function deleteConfigurations() + { + Configuration::deleteByName('QCTM_CRON_TASK_MANAGER_TOKEN'); + Configuration::deleteByName('QCTM_CRON_TASK_MANAGER_LOG_RETENTION_DAYS'); + + return true; + } +} diff --git a/modules/qlocrontaskmanager/classes/QctmRequiredClasses.php b/modules/qlocrontaskmanager/classes/QctmRequiredClasses.php new file mode 100644 index 000000000..9f2e9b4f4 --- /dev/null +++ b/modules/qlocrontaskmanager/classes/QctmRequiredClasses.php @@ -0,0 +1,28 @@ +bootstrap = true; + $this->list_no_link = true; + $this->table = 'qctm_cron_task_log'; + $this->className = 'QctmCronTaskLog'; + $this->identifier = 'id_cron_task_log'; + + parent::__construct(); + + $this->initLogList(); + } + + public function init() + { + parent::init(); + + $idCronTask = (int) Tools::getValue('id_cron_task'); + $prefix = $this->getCookieFilterPrefix(); + $cookieKey = $prefix . $this->table . 'Filter_ct!task_name'; + + if ($idCronTask > 0) { + $cronTask = new QctmCronTask($idCronTask); + if (Validate::isLoadedObject($cronTask)) { + $this->_where .= ' AND a.`id_cron_task` = ' . $idCronTask; + $this->context->cookie->{$cookieKey} = $cronTask->task_name; + $this->context->cookie->{'submitFilter' . $this->table} = 1; + $this->toolbar_title = $this->l('Logs for: ') . $cronTask->task_name; + } else { + $this->toolbar_title = $this->l('Cron Task Logs'); + } + } else { + $this->context->cookie->{'submitFilter' . $this->table} = 0; + $this->toolbar_title = $this->l('All Cron Task Logs'); + } + + $this->page_header_toolbar_btn['back_to_tasks'] = array( + 'href' => $this->context->link->getAdminLink('AdminCronTaskManager'), + 'icon' => 'process-icon-back', + 'desc' => $this->l('Back to Tasks'), + ); + } + + protected function initLogList() + { + $this->lang = false; + $this->_orderBy = 'id_cron_task_log'; + $this->_orderWay = 'DESC'; + + $this->_join = 'LEFT JOIN `' . _DB_PREFIX_ . 'qctm_cron_task` ct + ON (a.`id_cron_task` = ct.`id_cron_task`) + LEFT JOIN `' . _DB_PREFIX_ . 'module` m + ON (m.`id_module` = ct.`id_module`)'; + + $this->_select = 'm.`name` AS `module_name`, ct.`task_name`, ct.`description` AS task_description'; + + $cronTaskLogStatuses = QctmCronTaskLog::getStatuses(); + + $this->fields_list = array( + 'id_cron_task_log' => array( + 'title' => $this->l('ID'), + 'align' => 'center', + 'class' => 'fixed-width-xs', + ), + 'module_name' => array( + 'title' => $this->l('Module'), + 'filter_key' => 'm!name', + 'order_key' => 'm!name', + 'callback' => 'displayModuleName', + ), + 'task_name' => array( + 'title' => $this->l('Task Name'), + 'filter_key' => 'ct!task_name', + 'search' => true, + ), + 'status' => array( + 'title' => $this->l('Status'), + 'align' => 'center', + 'type' => 'select', + 'list' => $cronTaskLogStatuses, + 'filter_key' => 'a!status', + 'callback' => 'getStatusBadge', + ), + 'error_message' => array( + 'title' => $this->l('Error Message'), + 'maxlength' => 80, + ), + 'execution_time' => array( + 'title' => $this->l('Execution Time'), + 'align' => 'center', + 'suffix' => ' s', + 'class' => 'fixed-width-md', + ), + 'date_add' => array( + 'title' => $this->l('Date'), + 'type' => 'datetime', + 'align' => 'right', + 'filter_key' => 'a!date_add', + ), + ); + } + + public function initToolbar() + { + parent::initToolbar(); + unset($this->toolbar_btn['new']); + } + + public function getStatusBadge($status, $row) + { + $this->context->smarty->assign('status', $status); + return $this->createTemplate('qctm_badge_status.tpl')->fetch(); + } + + public function displayModuleName($moduleName, $row) + { + $cacheKey = 'displayModuleName_' . $moduleName; + + if (!Cache::isStored($cacheKey)) { + $module = Module::getInstanceByName($moduleName); + $displayName = ($module && $module->displayName) ? $module->displayName : $moduleName; + Cache::store($cacheKey, $displayName); + } + + return Cache::retrieve($cacheKey); + } + + public function setMedia() + { + parent::setMedia(); + + $this->addCSS($this->module->getPathUri() . 'views/css/admin/qlo_cron_task_manager_admin.css'); + } +} diff --git a/modules/qlocrontaskmanager/controllers/admin/AdminCronTaskManagerController.php b/modules/qlocrontaskmanager/controllers/admin/AdminCronTaskManagerController.php new file mode 100644 index 000000000..30b4ee5b6 --- /dev/null +++ b/modules/qlocrontaskmanager/controllers/admin/AdminCronTaskManagerController.php @@ -0,0 +1,446 @@ +bootstrap = true; + $this->list_no_link = true; + $this->table = 'qctm_cron_task'; + $this->className = 'QctmCronTask'; + $this->identifier = 'id_cron_task'; + $this->_orderBy = 'id_cron_task'; + + $this->lang = false; + $this->_orderWay = 'ASC'; + + parent::__construct(); + // Exclude hidden system tasks from the listing + $this->_where = ' AND a.`is_system` = 0'; + + $this->_join = 'LEFT JOIN ( + SELECT ctl.`id_cron_task`, ctl.`date_add` AS `last_run`, ctl.`status` AS `last_status` + FROM `' . _DB_PREFIX_ . 'qctm_cron_task_log` ctl + INNER JOIN ( + SELECT `id_cron_task`, MAX(`id_cron_task_log`) AS `max_id` + FROM `' . _DB_PREFIX_ . 'qctm_cron_task_log` + GROUP BY `id_cron_task` + ) latest ON ctl.`id_cron_task_log` = latest.`max_id` + ) AS llog ON (llog.`id_cron_task` = a.`id_cron_task`) + LEFT JOIN `' . _DB_PREFIX_ . 'module` m ON (m.`id_module` = a.`id_module`)'; + + $this->_select = 'm.`name` as `module_name`, llog.`last_run`, llog.`last_status`, a.`cron_expression` AS `next_run_expression`'; + + $this->addRowAction('viewLogs'); + $this->addRowAction('edit'); + $this->addRowAction('resetModuleCrons'); + + $this->bulk_actions = array( + 'enableSelection' => array( + 'text' => $this->l('Enable selected'), + 'icon' => 'icon-power-off text-success', + ), + 'disableSelection' => array( + 'text' => $this->l('Disable selected'), + 'icon' => 'icon-power-off text-danger', + ), + ); + + $this->fields_list = array( + 'id_cron_task' => array( + 'title' => $this->l('ID'), + 'align' => 'center', + 'class' => 'fixed-width-xs', + ), + 'module_name' => array( + 'title' => $this->l('Module Name'), + 'filter_key' => 'm!name', + 'order_key' => 'm!name', + 'callback' => 'displayModuleName', + ), + 'task_name' => array( + 'title' => $this->l('Task Name'), + 'filter_key' => 'a!task_name', + ), + 'cron_expression' => array( + 'title' => $this->l('Cron Expression'), + 'align' => 'center', + 'class' => 'fixed-width-lg', + 'search' => false, + 'callback' => 'getCronWithReadable', + ), + 'last_run' => array( + 'title' => $this->l('Last Run'), + 'align' => 'center', + 'filter' => false, + 'search' => false, + ), + 'last_status' => array( + 'title' => $this->l('Last Status'), + 'align' => 'center', + 'filter' => false, + 'search' => false, + 'callback' => 'getLastStatus', + ), + 'next_run_expression' => array( + 'title' => $this->l('Next Run'), + 'align' => 'center', + 'filter' => false, + 'search' => false, + 'callback' => 'getNextRun', + ), + 'date_add' => array( + 'title' => $this->l('Added Time'), + 'align' => 'center', + 'filter' => false, + 'search' => false, + ), + 'active' => array( + 'title' => $this->l('Active'), + 'active' => 'status', + 'type' => 'bool', + 'align' => 'center', + 'class' => 'fixed-width-sm', + 'filter_key' => 'a!active', + ), + ); + + } + + public function init() + { + parent::init(); + + if(!Validate::isUnsignedInt($idCronTask = Tools::getValue('id_cron_task')) && $this->display == 'edit') { + $this->errors = array($this->l('Invalid Cron Task ID')); + $this->display = 'list'; + }else{ + if (Validate::isUnsignedInt($idCronTask = Tools::getValue('id_cron_task')) && Validate::isLoadedObject($objCronTask = new QctmCronTask($idCronTask)) && $this->display == 'edit' ) { + $this->toolbar_title = $this->l('Edit Cron Task: ') . $objCronTask->task_name; + } + } + + } + + public function initToolbar() + { + parent::initToolbar(); + unset($this->toolbar_btn['new']); + if($this->display && $this->display == 'list') { + $this->page_header_toolbar_btn['view_all_logs'] = array( + 'href' => $this->context->link->getAdminLink('AdminCronTaskLogs'), + 'desc' => $this->l('View All Logs'), + 'icon' => 'icon-history', + ); + }else if($this->display && $this->display == 'edit') { + $idCronTask = Tools::getValue('id_cron_task'); + $this->page_header_toolbar_btn['view_logs'] = array( + 'href' => $this->context->link->getAdminLink('AdminCronTaskLogs') . '&id_cron_task=' . (int) $idCronTask, + 'desc' => $this->l('View Logs'), + 'icon' => 'icon-history', + ); + } + } + + + + public function renderForm() + { + $cronExpression = '* * * * *'; + if(Validate::isLoadedObject($this->object)){ + $cronExpression = $this->object->cron_expression; + } + + $isValidExpression = \Cron\CronExpression::isValidExpression($cronExpression); + if ($isValidExpression) { + $readable = $this->l('Runs ') . (new QctmCronExpressionTranslator())->getCronExpressionTranslation($cronExpression); + } else { + $readable = $this->l('Invalid cron expression.'); + } + + $moduleDisplayName = ''; + if (Validate::isLoadedObject($this->object) && $this->object->id_module) { + $module = Module::getInstanceById($this->object->id_module); + $moduleDisplayName = ($module && $module->displayName) ? $module->displayName : '#' . (int) $this->object->id_module; + } + $this->fields_value['module_display_name'] = $moduleDisplayName; + + $this->context->smarty->assign(array( + 'qctmCronExpression' => $cronExpression, + 'qctmCronReadable' => $readable, + 'qctmAjaxUrl' => $this->context->link->getAdminLink($this->controller_name) . '&ajax=1', + )); + + $this->fields_form = array( + 'legend' => array( + 'title' => $this->l('Cron Task'), + 'icon' => 'icon-time', + ), + 'input' => array( + array( + 'type' => 'text', + 'label' => $this->l('Module Name'), + 'name' => 'module_display_name', + 'disabled' => true, + 'col' => 5, + 'desc' => $this->l('The module that owns this task.'), + ), + array( + 'type' => 'text', + 'label' => $this->l('Task Name'), + 'name' => 'task_name', + 'disabled' => true, + 'required' => true, + 'col' => 5, + 'hint' => $this->l('e.g. send_daily_report'), + 'desc' => $this->l('A unique identifier for this task within the module.'), + ), + array( + 'type' => 'text', + 'label' => $this->l('Description'), + 'name' => 'description', + 'required' => true, + 'disabled' => true, + 'col' => 7, + 'hint' => $this->l('e.g. Sends the daily booking summary report'), + 'desc' => $this->l('A short human-readable description of what this task does.'), + ), + array( + 'type' => 'text', + 'label' => $this->l('Cron Expression'), + 'name' => 'cron_expression', + 'required' => true, + 'col' => 4, + 'class' => 'qctm-cron-expression', + 'hint' => $this->l('e.g. 0 0 * * *'), + 'desc' => $readable, + ), + array( + 'type' => 'html', + 'name' => 'qctm_cron_helper', + 'html_content' => $this->createTemplate('qctm_cron_expression_helper.tpl')->fetch(), + ), + array( + 'type' => 'switch', + 'label' => $this->l('Active'), + 'name' => 'active', + 'required' => false, + 'desc' => $this->l('Disabled tasks are skipped.'), + 'values' => array( + array('id' => 'active_on', 'value' => 1, 'label' => $this->l('Enabled')), + array('id' => 'active_off', 'value' => 0, 'label' => $this->l('Disabled')), + ), + ), + ), + 'submit' => array( + 'title' => $this->l('Save'), + ), + ); + return parent::renderForm(); + } + + public function ajaxProcessGetCronReadable() + { + $expression = Tools::getValue('cron_expression'); + $result = array('readable' => $this->l('Invalid cron expression'), 'valid' => false); + + if (\Cron\CronExpression::isValidExpression($expression)) { + $result['valid'] = true; + $result['readable'] = $this->l('Runs ') . (new QctmCronExpressionTranslator())->getCronExpressionTranslation($expression); + } + + die(Tools::jsonEncode($result)); + } + + public function processSave() + { + if (!$this->validateCronExpression()) { + $this->display = 'edit'; + return false; + } + + return parent::processSave(); + } + + protected function validateCronExpression() + { + $cronExpression = Tools::getValue('cron_expression'); + + if (!\Cron\CronExpression::isValidExpression($cronExpression)) { + $this->errors[] = $this->l('Invalid cron expression. Must have exactly 5 parts: minute hour day month weekday. Example: * * * * *'); + return false; + } + + return true; + } + + public function processStatus() + { + return parent::processStatus(); + } + + protected function processBulkEnableSelection() + { + return parent::processBulkEnableSelection(); + } + + protected function processBulkDisableSelection() + { + return parent::processBulkDisableSelection(); + } + + public function displayViewLogsLink($token = null, $id = null, $row = array()) + { + $this->context->smarty->assign( + 'viewLogsLink', + $this->context->link->getAdminLink('AdminCronTaskLogs') . '&id_cron_task=' . (int) $id + ); + return $this->createTemplate('qctm_view_logs_link.tpl')->fetch(); + } + + public function displayResetModuleCronsLink($token = null, $id = null, $row = array()) + { + $this->context->smarty->assign( + 'resetLink', + $this->context->link->getAdminLink('AdminCronTaskManager') + . '&action=resetModuleCrons&' . $this->identifier . '=' . (int) $id + ); + return $this->createTemplate('qctm_reset_module_crons_link.tpl')->fetch(); + } + + public function processResetModuleCrons() + { + $idCronTask = (int) Tools::getValue($this->identifier); + $cronTask = new QctmCronTask($idCronTask); + + if (!Validate::isLoadedObject($cronTask)) { + $this->errors[] = $this->l('Cron task not found.'); + return false; + } + + $module = Module::getInstanceById($cronTask->id_module); + + if (!$module) { + $this->errors[] = $this->l('Module not found.'); + return false; + } + + if (!method_exists($module, 'hookRegisterCronTasks')) { + $this->errors[] = $this->l('Module does not define any cron tasks.'); + return false; + } + + $tasks = $module->hookRegisterCronTasks(); + + if (empty($tasks) || !is_array($tasks)) { + $this->errors[] = $this->l('No tasks returned by module.'); + return false; + } + + foreach ($tasks as $task) { + if ($task['name'] === $cronTask->task_name) { + if (!$cronTask->validateTask($module, $task)) { + $this->errors[] = $this->l('Module returned an invalid task definition (bad cron expression or missing callback).'); + return false; + } + + $cronTask->cron_expression = $task['cron']; + $cronTask->description = $task['description']; + $cronTask->callback = $task['callback']; + + if (!$cronTask->save()) { + $this->errors[] = $this->l('Failed to reset cron task.'); + return false; + } + + $this->confirmations[] = $this->l('Cron task reset to module defaults successfully.'); + return true; + } + } + + $this->errors[] = $this->l('Task definition not found in module.'); + return false; + } + + public function getCronWithReadable($cronExpression, $row) + { + $readable = \Cron\CronExpression::isValidExpression($cronExpression) + ? (new QctmCronExpressionTranslator())->getCronExpressionTranslation($cronExpression) + : $cronExpression; + + return '' . htmlspecialchars($cronExpression) . '' + . '
    ' . htmlspecialchars($readable) . ''; + } + + public function displayModuleName($moduleName, $row) + { + $cacheKey = 'displayModuleName_' . $moduleName; + + if (!Cache::isStored($cacheKey)) { + $module = Module::getInstanceByName($moduleName); + $displayName = ($module && $module->displayName) ? $module->displayName : $moduleName; + Cache::store($cacheKey, $displayName); + } + + return Cache::retrieve($cacheKey); + } + + public function getNextRun($cronExpression, $row) + { + if (!$cronExpression || !\Cron\CronExpression::isValidExpression($cronExpression)) { + return '-'; + } + + try { + $next = \Cron\CronExpression::factory($cronExpression)->getNextRunDate(); + return $next->format('Y-m-d H:i:s'); + } catch (\Exception $e) { + return '-'; + } + } + + public function getLastStatus($lastStatus, $row) + { + $this->context->smarty->assign('status', $lastStatus); + return $this->createTemplate('qctm_badge_status.tpl')->fetch(); + } + + + public function setMedia() + { + parent::setMedia(); + + Media::addJsDef( + array( + 'INVALID_CRON_EXPRESSION' => $this->l('Invalid cron expression.'), + ) + ); + $this->addCSS($this->module->getPathUri() . 'views/css/admin/qlo_cron_task_manager_admin.css'); + $this->addJS($this->module->getPathUri() . 'views/js/admin/qlo_cron_task_manager_admin.js'); + } +} diff --git a/modules/qlocrontaskmanager/controllers/admin/index.php b/modules/qlocrontaskmanager/controllers/admin/index.php new file mode 100644 index 000000000..409280877 --- /dev/null +++ b/modules/qlocrontaskmanager/controllers/admin/index.php @@ -0,0 +1,32 @@ +active) { + die('Cron module not active'); +} + +require_once dirname(__FILE__) . '/classes/QctmCronTask.php'; +$objCronTask = new QctmCronTask(); +$objCronTask->dispatch(); diff --git a/modules/qlocrontaskmanager/index.php b/modules/qlocrontaskmanager/index.php new file mode 100644 index 000000000..409280877 --- /dev/null +++ b/modules/qlocrontaskmanager/index.php @@ -0,0 +1,32 @@ +name = 'qlocrontaskmanager'; + $this->tab = 'administration'; + $this->version = '1.0.0'; + $this->author = 'Webkul'; + $this->need_instance = 0; + $this->bootstrap = true; + + parent::__construct(); + + $this->displayName = $this->l('Cron Task Manager'); + $this->description = $this->l('A centralized cron scheduling system where a single server cron entry manages all module tasks.'); + $this->confirmUninstall = $this->l('Are you sure you want to uninstall this module? All cron task data will be lost.'); + } + + + public function getContent() + { + $output = ''; + + if (Tools::isSubmit('submitCronTaskManagerSettings')) { + $output .= $this->processSaveSettings(); + } + + if (Tools::isSubmit('regenerateToken')) { + Configuration::updateValue('QCTM_CRON_TASK_MANAGER_TOKEN', Tools::passwdGen(32)); + $output .= $this->displayConfirmation($this->l('Token has been regenerated. Update your server cron entry with the new URL.')); + } + + if(Tools::getValue('module_name') === $this->name) { + $this->context->controller->addCSS($this->_path . 'views/css/admin/qlo_cron_task_manager_admin.css'); + $this->context->controller->addJS($this->_path . 'views/js/admin/qlo_cron_task_manager_admin.js'); + } + + $output .= $this->renderCronCommandPanel(); + $output .= $this->renderSettingsForm(); + + return $output; + } + + protected function processSaveSettings() + { + $logRetention = Tools::getValue('QCTM_CRON_TASK_MANAGER_LOG_RETENTION_DAYS'); + + if(!Validate::isUnsignedInt($logRetention)) { + return $this->displayError($this->l('Log retention must be an integer value.')); + } + + if ($logRetention < 1 || $logRetention > 365) { + return $this->displayError($this->l('Log retention must be between 1 and 365 days.')); + } + + Configuration::updateValue('QCTM_CRON_TASK_MANAGER_LOG_RETENTION_DAYS', $logRetention); + + return $this->displayConfirmation($this->l('Settings saved successfully.')); + } + + protected function renderCronCommandPanel() + { + $token = Configuration::get('QCTM_CRON_TASK_MANAGER_TOKEN'); + $cronUrl = Tools::getShopDomainSsl(true) . __PS_BASE_URI__ + . 'modules/qlocrontaskmanager/cron.php?token=' . $token; + $cronCommand = '* * * * * curl -s "' . $cronUrl . '"'; + + $this->context->smarty->assign(array( + 'cronCommand' => $cronCommand, + )); + + return $this->display(__FILE__, 'views/templates/admin/configure.tpl'); + } + + protected function renderSettingsForm() + { + $token = Configuration::get('QCTM_CRON_TASK_MANAGER_TOKEN'); + + $helper = new HelperForm(); + $helper->module = $this; + $helper->name_controller = $this->name; + $helper->token = Tools::getAdminTokenLite('AdminModules'); + $helper->currentIndex = AdminController::$currentIndex . '&configure=' . $this->name; + $helper->default_form_language = (int) Configuration::get('PS_LANG_DEFAULT'); + + $helper->fields_value = array( + 'QCTM_CRON_TASK_MANAGER_TOKEN' => $token, + 'QCTM_CRON_TASK_MANAGER_LOG_RETENTION_DAYS' => (int) Configuration::get('QCTM_CRON_TASK_MANAGER_LOG_RETENTION_DAYS'), + ); + + $fields_form = array( + 'form' => array( + 'legend' => array( + 'title' => $this->l('Settings'), + 'icon' => 'icon-cogs', + ), + 'input' => array( + array( + 'type' => 'text', + 'label' => $this->l('Secure Token'), + 'name' => 'QCTM_CRON_TASK_MANAGER_TOKEN', + 'readonly' => true, + 'col' => 6, + 'desc' => $this->l('This token secures the cron endpoint. After regenerating it, you will need to update your server cron entry.'), + ), + array( + 'type' => 'text', + 'label' => $this->l('Log Retention (days)'), + 'name' => 'QCTM_CRON_TASK_MANAGER_LOG_RETENTION_DAYS', + 'col' => 2, + 'required' => true, + 'validation' => 'isUnsignedInt', + 'suffix' => $this->l('days'), + 'desc' => $this->l('Number of days to keep execution logs.'), + ), + ), + 'submit' => array( + 'title' => $this->l('Save'), + 'class' => 'btn btn-default pull-right', + 'name' => 'submitCronTaskManagerSettings', + ), + 'buttons' => array( + array( + 'title' => $this->l('Regenerate Token'), + 'icon' => 'process-icon-refresh', + 'name' => 'regenerateToken', + 'type' => 'submit', + 'class' => 'btn btn-default', + ), + ), + ), + ); + + return $helper->generateForm(array($fields_form)); + } + + public function hookActionModuleInstallAfter($params) + { + if (!isset($params['object']) || !($params['object'] instanceof Module)) { + return; + } + + $module = $params['object']; + + if (method_exists($module, 'hookRegisterCronTasks')) { + $tasks = $module->hookRegisterCronTasks(); + if (!empty($tasks) && is_array($tasks)) { + $objCronTask = new QctmCronTask(); + $objCronTask->registerTasksForModule($module->id, $tasks); + } + } + } + + public function hookDashboardZoneThree($params) + { + if ($this->isCrontabConfigured() !== false) { + return ''; + } + + $this->context->smarty->assign(array( + 'qctmConfigureLink' => $this->context->link->getAdminLink('AdminModules') . '&configure=' . $this->name, + )); + + return $this->display(__FILE__, 'views/templates/admin/dashboard/qctm_cron_not_configured.tpl'); + } + + public function isCrontabConfigured() + { + if (!function_exists('shell_exec')) { + return null; + } + + $disabled = array_map('trim', explode(',', (string) ini_get('disable_functions'))); + if (in_array('shell_exec', $disabled, true)) { + return null; + } + + $output = @shell_exec('crontab -l 2>/dev/null'); + + return strpos((string) $output, 'qlocrontaskmanager/cron.php') !== false; + } + + public function hookActionModuleUninstallBefore($params) + { + if (!isset($params['object']) || !($params['object'] instanceof Module) || $params['object']->id == $this->id) { + return; + } + + QctmCronTask::deleteByModule($params['object']->id); + } + + /** + * Called by the system log-cleanup cron task (daily at midnight). + */ + public function runLogCleanup() + { + $days = (int) Configuration::get('QCTM_CRON_TASK_MANAGER_LOG_RETENTION_DAYS'); + if ($days > 0) { + QctmCronTaskLog::deleteOlderThan($days); + } + + } + + public function install() + { + $db = new QctmCronTaskManagerDb(); + $objCronTask = new QctmCronTask(); + + if (!parent::install() + || !$this->registerHooks() + || !$db->createTables() + || !$db->installDefaultData() + || !$this->installTabs() + || !$this->installDefaultTasks() + ) { + return false; + } + + $objCronTask->syncAllExistingModules(); + + return true; + } + + public function registerHooks() + { + return $this->registerHook( + array( + 'actionModuleInstallAfter', + 'actionModuleUninstallBefore', + 'dashboardZoneThree', + ) + ); + } + + public function uninstall() + { + $db = new QctmCronTaskManagerDb(); + + if (!$this->uninstallTabs() + || !$db->deleteConfigurations() + || !$db->dropTables() + || !parent::uninstall() + ) { + return false; + } + + return true; + } + + protected function installDefaultTasks() + { + if (QctmCronTask::getByModuleAndName($this->id, 'log_cleanup')) { + return true; + } + + $task = new QctmCronTask(); + $task->id_module = (int) $this->id; + $task->task_name = 'log_cleanup'; + $task->description = 'Automatic log cleanup'; + $task->cron_expression = '0 0 * * *'; + $task->callback = 'runLogCleanup'; + $task->active = 1; + $task->is_system = 1; + + return $task->save(); + } + + protected function installTabs() + { + $tabCronTasks = new Tab(); + $tabCronTasks->class_name = 'AdminCronTaskManager'; + $tabCronTasks->id_parent = (int) Tab::getIdFromClassName('AdminTools'); + $tabCronTasks->module = $this->name; + $tabCronTasks->position = Tab::getNewLastPosition($tabCronTasks->id_parent); + + foreach (Language::getLanguages(false) as $language) { + $tabCronTasks->name[$language['id_lang']] = $this->l('Cron Task Manager'); + } + + if (!$tabCronTasks->add()) { + return false; + } + + // Hidden tab — accessible via URL but not shown in navigation menu + $tabLogs = new Tab(); + $tabLogs->class_name = 'AdminCronTaskLogs'; + $tabLogs->id_parent = -1; + $tabLogs->module = $this->name; + + foreach (Language::getLanguages(false) as $language) { + $tabLogs->name[$language['id_lang']] = $this->l('Cron Task Logs'); + } + + return $tabLogs->add(); + } + + protected function uninstallTabs() + { + foreach (array('AdminCronTaskManager', 'AdminCronTaskLogs') as $className) { + $idTab = (int) Tab::getIdFromClassName($className); + if ($idTab) { + $tab = new Tab($idTab); + if (!$tab->delete()) { + return false; + } + } + } + + return true; + } +} diff --git a/modules/qlocrontaskmanager/upgrade/index.php b/modules/qlocrontaskmanager/upgrade/index.php new file mode 100644 index 000000000..409280877 --- /dev/null +++ b/modules/qlocrontaskmanager/upgrade/index.php @@ -0,0 +1,32 @@ + + * Jordi Boggiano + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Composer\Autoload; + +/** + * ClassLoader implements a PSR-0, PSR-4 and classmap class loader. + * + * $loader = new \Composer\Autoload\ClassLoader(); + * + * // register classes with namespaces + * $loader->add('Symfony\Component', __DIR__.'/component'); + * $loader->add('Symfony', __DIR__.'/framework'); + * + * // activate the autoloader + * $loader->register(); + * + * // to enable searching the include path (eg. for PEAR packages) + * $loader->setUseIncludePath(true); + * + * In this example, if you try to use a class in the Symfony\Component + * namespace or one of its children (Symfony\Component\Console for instance), + * the autoloader will first look for the class under the component/ + * directory, and it will then fallback to the framework/ directory if not + * found before giving up. + * + * This class is loosely based on the Symfony UniversalClassLoader. + * + * @author Fabien Potencier + * @author Jordi Boggiano + * @see https://www.php-fig.org/psr/psr-0/ + * @see https://www.php-fig.org/psr/psr-4/ + */ +class ClassLoader +{ + /** @var \Closure(string):void */ + private static $includeFile; + + /** @var string|null */ + private $vendorDir; + + // PSR-4 + /** + * @var array> + */ + private $prefixLengthsPsr4 = array(); + /** + * @var array> + */ + private $prefixDirsPsr4 = array(); + /** + * @var list + */ + private $fallbackDirsPsr4 = array(); + + // PSR-0 + /** + * List of PSR-0 prefixes + * + * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2'))) + * + * @var array>> + */ + private $prefixesPsr0 = array(); + /** + * @var list + */ + private $fallbackDirsPsr0 = array(); + + /** @var bool */ + private $useIncludePath = false; + + /** + * @var array + */ + private $classMap = array(); + + /** @var bool */ + private $classMapAuthoritative = false; + + /** + * @var array + */ + private $missingClasses = array(); + + /** @var string|null */ + private $apcuPrefix; + + /** + * @var array + */ + private static $registeredLoaders = array(); + + /** + * @param string|null $vendorDir + */ + public function __construct($vendorDir = null) + { + $this->vendorDir = $vendorDir; + self::initializeIncludeClosure(); + } + + /** + * @return array> + */ + public function getPrefixes() + { + if (!empty($this->prefixesPsr0)) { + return call_user_func_array('array_merge', array_values($this->prefixesPsr0)); + } + + return array(); + } + + /** + * @return array> + */ + public function getPrefixesPsr4() + { + return $this->prefixDirsPsr4; + } + + /** + * @return list + */ + public function getFallbackDirs() + { + return $this->fallbackDirsPsr0; + } + + /** + * @return list + */ + public function getFallbackDirsPsr4() + { + return $this->fallbackDirsPsr4; + } + + /** + * @return array Array of classname => path + */ + public function getClassMap() + { + return $this->classMap; + } + + /** + * @param array $classMap Class to filename map + * + * @return void + */ + public function addClassMap(array $classMap) + { + if ($this->classMap) { + $this->classMap = array_merge($this->classMap, $classMap); + } else { + $this->classMap = $classMap; + } + } + + /** + * Registers a set of PSR-0 directories for a given prefix, either + * appending or prepending to the ones previously set for this prefix. + * + * @param string $prefix The prefix + * @param list|string $paths The PSR-0 root directories + * @param bool $prepend Whether to prepend the directories + * + * @return void + */ + public function add($prefix, $paths, $prepend = false) + { + $paths = (array) $paths; + if (!$prefix) { + if ($prepend) { + $this->fallbackDirsPsr0 = array_merge( + $paths, + $this->fallbackDirsPsr0 + ); + } else { + $this->fallbackDirsPsr0 = array_merge( + $this->fallbackDirsPsr0, + $paths + ); + } + + return; + } + + $first = $prefix[0]; + if (!isset($this->prefixesPsr0[$first][$prefix])) { + $this->prefixesPsr0[$first][$prefix] = $paths; + + return; + } + if ($prepend) { + $this->prefixesPsr0[$first][$prefix] = array_merge( + $paths, + $this->prefixesPsr0[$first][$prefix] + ); + } else { + $this->prefixesPsr0[$first][$prefix] = array_merge( + $this->prefixesPsr0[$first][$prefix], + $paths + ); + } + } + + /** + * Registers a set of PSR-4 directories for a given namespace, either + * appending or prepending to the ones previously set for this namespace. + * + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param list|string $paths The PSR-4 base directories + * @param bool $prepend Whether to prepend the directories + * + * @throws \InvalidArgumentException + * + * @return void + */ + public function addPsr4($prefix, $paths, $prepend = false) + { + $paths = (array) $paths; + if (!$prefix) { + // Register directories for the root namespace. + if ($prepend) { + $this->fallbackDirsPsr4 = array_merge( + $paths, + $this->fallbackDirsPsr4 + ); + } else { + $this->fallbackDirsPsr4 = array_merge( + $this->fallbackDirsPsr4, + $paths + ); + } + } elseif (!isset($this->prefixDirsPsr4[$prefix])) { + // Register directories for a new namespace. + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { + throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); + } + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; + $this->prefixDirsPsr4[$prefix] = $paths; + } elseif ($prepend) { + // Prepend directories for an already registered namespace. + $this->prefixDirsPsr4[$prefix] = array_merge( + $paths, + $this->prefixDirsPsr4[$prefix] + ); + } else { + // Append directories for an already registered namespace. + $this->prefixDirsPsr4[$prefix] = array_merge( + $this->prefixDirsPsr4[$prefix], + $paths + ); + } + } + + /** + * Registers a set of PSR-0 directories for a given prefix, + * replacing any others previously set for this prefix. + * + * @param string $prefix The prefix + * @param list|string $paths The PSR-0 base directories + * + * @return void + */ + public function set($prefix, $paths) + { + if (!$prefix) { + $this->fallbackDirsPsr0 = (array) $paths; + } else { + $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths; + } + } + + /** + * Registers a set of PSR-4 directories for a given namespace, + * replacing any others previously set for this namespace. + * + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param list|string $paths The PSR-4 base directories + * + * @throws \InvalidArgumentException + * + * @return void + */ + public function setPsr4($prefix, $paths) + { + if (!$prefix) { + $this->fallbackDirsPsr4 = (array) $paths; + } else { + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { + throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); + } + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; + $this->prefixDirsPsr4[$prefix] = (array) $paths; + } + } + + /** + * Turns on searching the include path for class files. + * + * @param bool $useIncludePath + * + * @return void + */ + public function setUseIncludePath($useIncludePath) + { + $this->useIncludePath = $useIncludePath; + } + + /** + * Can be used to check if the autoloader uses the include path to check + * for classes. + * + * @return bool + */ + public function getUseIncludePath() + { + return $this->useIncludePath; + } + + /** + * Turns off searching the prefix and fallback directories for classes + * that have not been registered with the class map. + * + * @param bool $classMapAuthoritative + * + * @return void + */ + public function setClassMapAuthoritative($classMapAuthoritative) + { + $this->classMapAuthoritative = $classMapAuthoritative; + } + + /** + * Should class lookup fail if not found in the current class map? + * + * @return bool + */ + public function isClassMapAuthoritative() + { + return $this->classMapAuthoritative; + } + + /** + * APCu prefix to use to cache found/not-found classes, if the extension is enabled. + * + * @param string|null $apcuPrefix + * + * @return void + */ + public function setApcuPrefix($apcuPrefix) + { + $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null; + } + + /** + * The APCu prefix in use, or null if APCu caching is not enabled. + * + * @return string|null + */ + public function getApcuPrefix() + { + return $this->apcuPrefix; + } + + /** + * Registers this instance as an autoloader. + * + * @param bool $prepend Whether to prepend the autoloader or not + * + * @return void + */ + public function register($prepend = false) + { + spl_autoload_register(array($this, 'loadClass'), true, $prepend); + + if (null === $this->vendorDir) { + return; + } + + if ($prepend) { + self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders; + } else { + unset(self::$registeredLoaders[$this->vendorDir]); + self::$registeredLoaders[$this->vendorDir] = $this; + } + } + + /** + * Unregisters this instance as an autoloader. + * + * @return void + */ + public function unregister() + { + spl_autoload_unregister(array($this, 'loadClass')); + + if (null !== $this->vendorDir) { + unset(self::$registeredLoaders[$this->vendorDir]); + } + } + + /** + * Loads the given class or interface. + * + * @param string $class The name of the class + * @return true|null True if loaded, null otherwise + */ + public function loadClass($class) + { + if ($file = $this->findFile($class)) { + $includeFile = self::$includeFile; + $includeFile($file); + + return true; + } + + return null; + } + + /** + * Finds the path to the file where the class is defined. + * + * @param string $class The name of the class + * + * @return string|false The path if found, false otherwise + */ + public function findFile($class) + { + // class map lookup + if (isset($this->classMap[$class])) { + return $this->classMap[$class]; + } + if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) { + return false; + } + if (null !== $this->apcuPrefix) { + $file = apcu_fetch($this->apcuPrefix.$class, $hit); + if ($hit) { + return $file; + } + } + + $file = $this->findFileWithExtension($class, '.php'); + + // Search for Hack files if we are running on HHVM + if (false === $file && defined('HHVM_VERSION')) { + $file = $this->findFileWithExtension($class, '.hh'); + } + + if (null !== $this->apcuPrefix) { + apcu_add($this->apcuPrefix.$class, $file); + } + + if (false === $file) { + // Remember that this class does not exist. + $this->missingClasses[$class] = true; + } + + return $file; + } + + /** + * Returns the currently registered loaders keyed by their corresponding vendor directories. + * + * @return array + */ + public static function getRegisteredLoaders() + { + return self::$registeredLoaders; + } + + /** + * @param string $class + * @param string $ext + * @return string|false + */ + private function findFileWithExtension($class, $ext) + { + // PSR-4 lookup + $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext; + + $first = $class[0]; + if (isset($this->prefixLengthsPsr4[$first])) { + $subPath = $class; + while (false !== $lastPos = strrpos($subPath, '\\')) { + $subPath = substr($subPath, 0, $lastPos); + $search = $subPath . '\\'; + if (isset($this->prefixDirsPsr4[$search])) { + $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1); + foreach ($this->prefixDirsPsr4[$search] as $dir) { + if (file_exists($file = $dir . $pathEnd)) { + return $file; + } + } + } + } + } + + // PSR-4 fallback dirs + foreach ($this->fallbackDirsPsr4 as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) { + return $file; + } + } + + // PSR-0 lookup + if (false !== $pos = strrpos($class, '\\')) { + // namespaced class name + $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1) + . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR); + } else { + // PEAR-like class name + $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext; + } + + if (isset($this->prefixesPsr0[$first])) { + foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) { + if (0 === strpos($class, $prefix)) { + foreach ($dirs as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { + return $file; + } + } + } + } + } + + // PSR-0 fallback dirs + foreach ($this->fallbackDirsPsr0 as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { + return $file; + } + } + + // PSR-0 include paths. + if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) { + return $file; + } + + return false; + } + + /** + * @return void + */ + private static function initializeIncludeClosure() + { + if (self::$includeFile !== null) { + return; + } + + /** + * Scope isolated include. + * + * Prevents access to $this/self from included files. + * + * @param string $file + * @return void + */ + self::$includeFile = \Closure::bind(static function($file) { + include $file; + }, null, null); + } +} diff --git a/modules/qlocrontaskmanager/vendor/composer/InstalledVersions.php b/modules/qlocrontaskmanager/vendor/composer/InstalledVersions.php new file mode 100644 index 000000000..2052022fd --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/composer/InstalledVersions.php @@ -0,0 +1,396 @@ + + * Jordi Boggiano + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Composer; + +use Composer\Autoload\ClassLoader; +use Composer\Semver\VersionParser; + +/** + * This class is copied in every Composer installed project and available to all + * + * See also https://getcomposer.org/doc/07-runtime.md#installed-versions + * + * To require its presence, you can require `composer-runtime-api ^2.0` + * + * @final + */ +class InstalledVersions +{ + /** + * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to + * @internal + */ + private static $selfDir = null; + + /** + * @var mixed[]|null + * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array}|array{}|null + */ + private static $installed; + + /** + * @var bool + */ + private static $installedIsLocalDir; + + /** + * @var bool|null + */ + private static $canGetVendors; + + /** + * @var array[] + * @psalm-var array}> + */ + private static $installedByVendor = array(); + + /** + * Returns a list of all package names which are present, either by being installed, replaced or provided + * + * @return string[] + * @psalm-return list + */ + public static function getInstalledPackages() + { + $packages = array(); + foreach (self::getInstalled() as $installed) { + $packages[] = array_keys($installed['versions']); + } + + if (1 === \count($packages)) { + return $packages[0]; + } + + return array_keys(array_flip(\call_user_func_array('array_merge', $packages))); + } + + /** + * Returns a list of all package names with a specific type e.g. 'library' + * + * @param string $type + * @return string[] + * @psalm-return list + */ + public static function getInstalledPackagesByType($type) + { + $packagesByType = array(); + + foreach (self::getInstalled() as $installed) { + foreach ($installed['versions'] as $name => $package) { + if (isset($package['type']) && $package['type'] === $type) { + $packagesByType[] = $name; + } + } + } + + return $packagesByType; + } + + /** + * Checks whether the given package is installed + * + * This also returns true if the package name is provided or replaced by another package + * + * @param string $packageName + * @param bool $includeDevRequirements + * @return bool + */ + public static function isInstalled($packageName, $includeDevRequirements = true) + { + foreach (self::getInstalled() as $installed) { + if (isset($installed['versions'][$packageName])) { + return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false; + } + } + + return false; + } + + /** + * Checks whether the given package satisfies a version constraint + * + * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call: + * + * Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3') + * + * @param VersionParser $parser Install composer/semver to have access to this class and functionality + * @param string $packageName + * @param string|null $constraint A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package + * @return bool + */ + public static function satisfies(VersionParser $parser, $packageName, $constraint) + { + $constraint = $parser->parseConstraints((string) $constraint); + $provided = $parser->parseConstraints(self::getVersionRanges($packageName)); + + return $provided->matches($constraint); + } + + /** + * Returns a version constraint representing all the range(s) which are installed for a given package + * + * It is easier to use this via isInstalled() with the $constraint argument if you need to check + * whether a given version of a package is installed, and not just whether it exists + * + * @param string $packageName + * @return string Version constraint usable with composer/semver + */ + public static function getVersionRanges($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + $ranges = array(); + if (isset($installed['versions'][$packageName]['pretty_version'])) { + $ranges[] = $installed['versions'][$packageName]['pretty_version']; + } + if (array_key_exists('aliases', $installed['versions'][$packageName])) { + $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']); + } + if (array_key_exists('replaced', $installed['versions'][$packageName])) { + $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']); + } + if (array_key_exists('provided', $installed['versions'][$packageName])) { + $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']); + } + + return implode(' || ', $ranges); + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present + */ + public static function getVersion($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + if (!isset($installed['versions'][$packageName]['version'])) { + return null; + } + + return $installed['versions'][$packageName]['version']; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present + */ + public static function getPrettyVersion($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + if (!isset($installed['versions'][$packageName]['pretty_version'])) { + return null; + } + + return $installed['versions'][$packageName]['pretty_version']; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference + */ + public static function getReference($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + if (!isset($installed['versions'][$packageName]['reference'])) { + return null; + } + + return $installed['versions'][$packageName]['reference']; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path. + */ + public static function getInstallPath($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @return array + * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool} + */ + public static function getRootPackage() + { + $installed = self::getInstalled(); + + return $installed[0]['root']; + } + + /** + * Returns the raw installed.php data for custom implementations + * + * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect. + * @return array[] + * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} + */ + public static function getRawData() + { + @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED); + + if (null === self::$installed) { + // only require the installed.php file if this file is loaded from its dumped location, + // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 + if (substr(__DIR__, -8, 1) !== 'C') { + self::$installed = include __DIR__ . '/installed.php'; + } else { + self::$installed = array(); + } + } + + return self::$installed; + } + + /** + * Returns the raw data of all installed.php which are currently loaded for custom implementations + * + * @return array[] + * @psalm-return list}> + */ + public static function getAllRawData() + { + return self::getInstalled(); + } + + /** + * Lets you reload the static array from another file + * + * This is only useful for complex integrations in which a project needs to use + * this class but then also needs to execute another project's autoloader in process, + * and wants to ensure both projects have access to their version of installed.php. + * + * A typical case would be PHPUnit, where it would need to make sure it reads all + * the data it needs from this class, then call reload() with + * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure + * the project in which it runs can then also use this class safely, without + * interference between PHPUnit's dependencies and the project's dependencies. + * + * @param array[] $data A vendor/composer/installed.php data set + * @return void + * + * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $data + */ + public static function reload($data) + { + self::$installed = $data; + self::$installedByVendor = array(); + + // when using reload, we disable the duplicate protection to ensure that self::$installed data is + // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not, + // so we have to assume it does not, and that may result in duplicate data being returned when listing + // all installed packages for example + self::$installedIsLocalDir = false; + } + + /** + * @return string + */ + private static function getSelfDir() + { + if (self::$selfDir === null) { + self::$selfDir = strtr(__DIR__, '\\', '/'); + } + + return self::$selfDir; + } + + /** + * @return array[] + * @psalm-return list}> + */ + private static function getInstalled() + { + if (null === self::$canGetVendors) { + self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders'); + } + + $installed = array(); + $copiedLocalDir = false; + + if (self::$canGetVendors) { + $selfDir = self::getSelfDir(); + foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { + $vendorDir = strtr($vendorDir, '\\', '/'); + if (isset(self::$installedByVendor[$vendorDir])) { + $installed[] = self::$installedByVendor[$vendorDir]; + } elseif (is_file($vendorDir.'/composer/installed.php')) { + /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */ + $required = require $vendorDir.'/composer/installed.php'; + self::$installedByVendor[$vendorDir] = $required; + $installed[] = $required; + if (self::$installed === null && $vendorDir.'/composer' === $selfDir) { + self::$installed = $required; + self::$installedIsLocalDir = true; + } + } + if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) { + $copiedLocalDir = true; + } + } + } + + if (null === self::$installed) { + // only require the installed.php file if this file is loaded from its dumped location, + // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 + if (substr(__DIR__, -8, 1) !== 'C') { + /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */ + $required = require __DIR__ . '/installed.php'; + self::$installed = $required; + } else { + self::$installed = array(); + } + } + + if (self::$installed !== array() && !$copiedLocalDir) { + $installed[] = self::$installed; + } + + return $installed; + } +} diff --git a/modules/qlocrontaskmanager/vendor/composer/LICENSE b/modules/qlocrontaskmanager/vendor/composer/LICENSE new file mode 100644 index 000000000..f27399a04 --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/composer/LICENSE @@ -0,0 +1,21 @@ + +Copyright (c) Nils Adermann, Jordi Boggiano + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/modules/qlocrontaskmanager/vendor/composer/autoload_classmap.php b/modules/qlocrontaskmanager/vendor/composer/autoload_classmap.php new file mode 100644 index 000000000..0fb0a2c19 --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/composer/autoload_classmap.php @@ -0,0 +1,10 @@ + $vendorDir . '/composer/InstalledVersions.php', +); diff --git a/modules/qlocrontaskmanager/vendor/composer/autoload_namespaces.php b/modules/qlocrontaskmanager/vendor/composer/autoload_namespaces.php new file mode 100644 index 000000000..15a2ff3ad --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/composer/autoload_namespaces.php @@ -0,0 +1,9 @@ + array($vendorDir . '/dragonmantank/cron-expression/src/Cron'), +); diff --git a/modules/qlocrontaskmanager/vendor/composer/autoload_real.php b/modules/qlocrontaskmanager/vendor/composer/autoload_real.php new file mode 100644 index 000000000..30d40765b --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/composer/autoload_real.php @@ -0,0 +1,38 @@ +register(true); + + return $loader; + } +} diff --git a/modules/qlocrontaskmanager/vendor/composer/autoload_static.php b/modules/qlocrontaskmanager/vendor/composer/autoload_static.php new file mode 100644 index 000000000..e173eaa32 --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/composer/autoload_static.php @@ -0,0 +1,36 @@ + + array ( + 'Cron\\' => 5, + ), + ); + + public static $prefixDirsPsr4 = array ( + 'Cron\\' => + array ( + 0 => __DIR__ . '/..' . '/dragonmantank/cron-expression/src/Cron', + ), + ); + + public static $classMap = array ( + 'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php', + ); + + public static function getInitializer(ClassLoader $loader) + { + return \Closure::bind(function () use ($loader) { + $loader->prefixLengthsPsr4 = ComposerStaticInitc2f08a32af23ee5d749fb28358c620b3::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitc2f08a32af23ee5d749fb28358c620b3::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitc2f08a32af23ee5d749fb28358c620b3::$classMap; + + }, null, ClassLoader::class); + } +} diff --git a/modules/qlocrontaskmanager/vendor/composer/installed.json b/modules/qlocrontaskmanager/vendor/composer/installed.json new file mode 100644 index 000000000..0228ed9d2 --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/composer/installed.json @@ -0,0 +1,73 @@ +{ + "packages": [ + { + "name": "dragonmantank/cron-expression", + "version": "v3.6.0", + "version_normalized": "3.6.0.0", + "source": { + "type": "git", + "url": "https://github.com/dragonmantank/cron-expression.git", + "reference": "d61a8a9604ec1f8c3d150d09db6ce98b32675013" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/d61a8a9604ec1f8c3d150d09db6ce98b32675013", + "reference": "d61a8a9604ec1f8c3d150d09db6ce98b32675013", + "shasum": "" + }, + "require": { + "php": "^8.2|^8.3|^8.4|^8.5" + }, + "replace": { + "mtdowling/cron-expression": "^1.0" + }, + "require-dev": { + "phpstan/extension-installer": "^1.4.3", + "phpstan/phpstan": "^1.12.32|^2.1.31", + "phpunit/phpunit": "^8.5.48|^9.0" + }, + "time": "2025-10-31T18:51:33+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Cron\\": "src/Cron/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Chris Tankersley", + "email": "chris@ctankersley.com", + "homepage": "https://github.com/dragonmantank" + } + ], + "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due", + "keywords": [ + "cron", + "schedule" + ], + "support": { + "issues": "https://github.com/dragonmantank/cron-expression/issues", + "source": "https://github.com/dragonmantank/cron-expression/tree/v3.6.0" + }, + "funding": [ + { + "url": "https://github.com/dragonmantank", + "type": "github" + } + ], + "install-path": "../dragonmantank/cron-expression" + } + ], + "dev": true, + "dev-package-names": [] +} diff --git a/modules/qlocrontaskmanager/vendor/composer/installed.php b/modules/qlocrontaskmanager/vendor/composer/installed.php new file mode 100644 index 000000000..65c12da9b --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/composer/installed.php @@ -0,0 +1,38 @@ + array( + 'name' => 'qloapps/qlocrontaskmanager', + 'pretty_version' => 'dev-develop', + 'version' => 'dev-develop', + 'reference' => 'f7d1d629ca72fc5ffd3349dea2877013367cea81', + 'type' => 'library', + 'install_path' => __DIR__ . '/../../', + 'aliases' => array(), + 'dev' => true, + ), + 'versions' => array( + 'dragonmantank/cron-expression' => array( + 'pretty_version' => 'v3.6.0', + 'version' => '3.6.0.0', + 'reference' => 'd61a8a9604ec1f8c3d150d09db6ce98b32675013', + 'type' => 'library', + 'install_path' => __DIR__ . '/../dragonmantank/cron-expression', + 'aliases' => array(), + 'dev_requirement' => false, + ), + 'mtdowling/cron-expression' => array( + 'dev_requirement' => false, + 'replaced' => array( + 0 => '^1.0', + ), + ), + 'qloapps/qlocrontaskmanager' => array( + 'pretty_version' => 'dev-develop', + 'version' => 'dev-develop', + 'reference' => 'f7d1d629ca72fc5ffd3349dea2877013367cea81', + 'type' => 'library', + 'install_path' => __DIR__ . '/../../', + 'aliases' => array(), + 'dev_requirement' => false, + ), + ), +); diff --git a/modules/qlocrontaskmanager/vendor/composer/platform_check.php b/modules/qlocrontaskmanager/vendor/composer/platform_check.php new file mode 100644 index 000000000..d32d90c6a --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/composer/platform_check.php @@ -0,0 +1,26 @@ += 80200)) { + $issues[] = 'Your Composer dependencies require a PHP version ">= 8.2.0". You are running ' . PHP_VERSION . '.'; +} + +if ($issues) { + if (!headers_sent()) { + header('HTTP/1.1 500 Internal Server Error'); + } + if (!ini_get('display_errors')) { + if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') { + fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL); + } elseif (!headers_sent()) { + echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL; + } + } + trigger_error( + 'Composer detected issues in your platform: ' . implode(' ', $issues), + E_USER_ERROR + ); +} diff --git a/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/CHANGELOG.md b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/CHANGELOG.md new file mode 100644 index 000000000..17ab2ce44 --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/CHANGELOG.md @@ -0,0 +1,240 @@ +# Change Log + +## [3.3.3] - 2024-08-10 + +### Added +- N/A + +### Changed +- N/A + +### Fixed +- Added fixes for making sure `?` is not passed for both DOM and DOW (#148, thank you https://github.com/LeoVie) +- Fixed bug in Next Execution Time by sorting minutes properly (#160, thank you https://github.com/imyip) + +## [3.3.2] - 2022-09-19 + +### Added +- N/A + +### Changed +- Skip some daylight savings time tests for PHP 8.1 daylight savings time weirdness (#146) + +### Fixed +- Changed string interpolations to work better with PHP 8.2 (#142) + +## [3.3.1] - 2022-01-18 + +### Added +- N/A + +### Changed +- N/A + +### Fixed +- Fixed issue when timezones had no transition, which can occur over very short timespans (#134) + +## [3.3.0] - 2022-01-13 + +### Added +- Added ability to register your own expression aliases (#132) + +### Changed +- Changed how Day of Week and Day of Month resolve when one or the other is `*` or `?` + +### Fixed +- PHPStan should no longer error out + +## [3.2.4] - 2022-01-12 + +### Added +- N/A + +### Changed +- Changed how Day of Week increment/decrement to help with DST changes (#131) + +### Fixed +- N/A + +## [3.2.3] - 2022-01-05 + +### Added +- N/A + +### Changed +- Changed how minutes and hours increment/decrement to help with DST changes (#131) + +### Fixed +- N/A + +## [3.2.2] - 2022-01-05 + +### Added +- N/A + +### Changed +- Marked some methods `@internal` (#124) + +### Fixed +- Fixed issue with small ranges and large steps that caused an error with `range()` (#88) +- Fixed issue where wraparound logic incorrectly considered high bound on range (#89) + +## [3.2.1] - 2022-01-04 + +### Added +- N/A + +### Changed +- Added PHP 8.1 to testing (#125) + +### Fixed +- Allow better mixture of ranges, steps, and lists (#122) +- Fixed return order when multiple dates are requested and inverted (#121) +- Better handling over DST (#115) +- Fixed PHPStan tests (#130) + +## [3.2.0] - 2022-01-04 + +### Added +- Added alias for `@midnight` (#117) + +### Changed +- Improved testing for instance of field in tests (#105) +- Optimization for determining multiple run dates (#75) +- `CronExpression` properties changed from private to protected (#106) + +### Fixed +- N/A + +## [3.1.0] - 2020-11-24 + +### Added +- Added `CronExpression::getParts()` method to get parts of the expression as an array (#83) + +### Changed +- Changed to Interfaces for some type hints (#97, #86) +- Dropped minimum PHP version to 7.2 +- Few syntax changes for phpstan compatibility (#93) + +### Fixed +- N/A + +### Deprecated +- Deprecated `CronExpression::factory` in favor of the constructor (#56) +- Deprecated `CronExpression::YEAR` as a formality, the functionality is already removed (#87) + +## [3.0.1] - 2020-10-12 +### Added +- Added support for PHP 8 (#92) +### Changed +- N/A +### Fixed +- N/A + +## [3.0.0] - 2020-03-25 + +**MAJOR CHANGE** - In previous versions of this library, setting both a "Day of Month" and a "Day of Week" would be interpreted as an `AND` statement, not an `OR` statement. For example: + +`30 0 1 * 1` + +would evaluate to "Run 30 minutes after the 0 hour when the Day Of Month is 1 AND a Monday" instead of "Run 30 minutes after the 0 hour on Day Of Month 1 OR a Monday", where the latter is more inline with most cron systems. This means that if your cron expression has both of these fields set, you may see your expression fire more often starting with v3.0.0. + +### Added +- Additional docblocks for IDE and documentation +- Added phpstan as a development dependency +- Added a `Cron\FieldFactoryInterface` to make migrations easier (#38) +### Changed +- Changed some DI testing during TravisCI runs +- `\Cron\CronExpression::determineTimezone()` now checks for `\DateTimeInterface` instead of just `\DateTime` +- Errors with fields now report a more human-understandable error and are 1-based instead of 0-based +- Better support for `\DateTimeImmutable` across the library by typehinting for `\DateTimeInterface` now +- Literals should now be less case-sensative across the board +- Changed logic for when both a Day of Week and a Day of Month are supplied to now be an OR statement, not an AND +### Fixed +- Fixed infinite loop when determining last day of week from literals +- Fixed bug where single number ranges were allowed (ex: `1/10`) +- Fixed nullable FieldFactory in CronExpression where no factory could be supplied +- Fixed issue where logic for dropping seconds to 0 could lead to a timezone change + +## [2.3.1] - 2020-10-12 +### Added +- Added support for PHP 8 (#92) +### Changed +- N/A +### Fixed +- N/A + +## [2.3.0] - 2019-03-30 +### Added +- Added support for DateTimeImmutable via DateTimeInterface +- Added support for PHP 7.3 +- Started listing projects that use the library +### Changed +- Errors should now report a human readable position in the cron expression, instead of starting at 0 +### Fixed +- N/A + +## [2.2.0] - 2018-06-05 +### Added +- Added support for steps larger than field ranges (#6) +## Changed +- N/A +### Fixed +- Fixed validation for numbers with leading 0s (#12) + +## [2.1.0] - 2018-04-06 +### Added +- N/A +### Changed +- Upgraded to PHPUnit 6 (#2) +### Fixed +- Refactored timezones to deal with some inconsistent behavior (#3) +- Allow ranges and lists in same expression (#5) +- Fixed regression where literals were not converted to their numerical counterpart (#) + +## [2.0.0] - 2017-10-12 +### Added +- N/A + +### Changed +- Dropped support for PHP 5.x +- Dropped support for the YEAR field, as it was not part of the cron standard + +### Fixed +- Reworked validation for all the field types +- Stepping should now work for 1-indexed fields like Month (#153) + +## [1.2.0] - 2017-01-22 +### Added +- Added IDE, CodeSniffer, and StyleCI.IO support + +### Changed +- Switched to PSR-4 Autoloading + +### Fixed +- 0 step expressions are handled better +- Fixed `DayOfMonth` validation to be more strict +- Typos + +## [1.1.0] - 2016-01-26 +### Added +- Support for non-hourly offset timezones +- Checks for valid expressions + +### Changed +- Max Iterations no longer hardcoded for `getRunDate()` +- Supports DateTimeImmutable for newer PHP verions + +### Fixed +- Fixed looping bug for PHP 7 when determining the last specified weekday of a month + +## [1.0.3] - 2013-11-23 +### Added +- Now supports expressions with any number of extra spaces, tabs, or newlines + +### Changed +- Using static instead of self in `CronExpression::factory` + +### Fixed +- Fixes issue [#28](https://github.com/mtdowling/cron-expression/issues/28) where PHP increments of ranges were failing due to PHP casting hyphens to 0 +- Only set default timezone if the given $currentTime is not a DateTime instance ([#34](https://github.com/mtdowling/cron-expression/issues/34)) diff --git a/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/LICENSE b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/LICENSE new file mode 100644 index 000000000..3e38bbc88 --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2011 Michael Dowling , 2016 Chris Tankersley , and contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/README.md b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/README.md new file mode 100644 index 000000000..5c3ef5d57 --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/README.md @@ -0,0 +1,131 @@ +PHP Cron Expression Parser +========================== + +[![Latest Stable Version](https://poser.pugx.org/dragonmantank/cron-expression/v)](https://packagist.org/packages/dragonmantank/cron-expression) [![Total Downloads](https://poser.pugx.org/dragonmantank/cron-expression/downloads)](https://packagist.org/packages/dragonmantank/cron-expression) [![Tests](https://github.com/dragonmantank/cron-expression/actions/workflows/tests.yml/badge.svg)](https://github.com/dragonmantank/cron-expression/actions/workflows/tests.yml) [![StyleCI](https://github.styleci.io/repos/103715337/shield?branch=master)](https://github.styleci.io/repos/103715337) + +The PHP cron expression parser can parse a CRON expression, determine if it is +due to run, calculate the next run date of the expression, and calculate the previous +run date of the expression. You can calculate dates far into the future or past by +skipping **n** number of matching dates. + +The parser can handle increments of ranges (e.g. */12, 2-59/3), intervals (e.g. 0-9), +lists (e.g. 1,2,3), **W** to find the nearest weekday for a given day of the month, **L** to +find the last day of the month, **L** to find the last given weekday of a month, and hash +(#) to find the nth weekday of a given month. + +More information about this fork can be found in the blog post [here](http://ctankersley.com/2017/10/12/cron-expression-update/). tl;dr - v2.0.0 is a major breaking change, and @dragonmantank can better take care of the project in a separate fork. + +Installing +========== + +Add the dependency to your project: + +```bash +composer require dragonmantank/cron-expression +``` + +Usage +===== +```php +isDue(); +echo $cron->getNextRunDate()->format('Y-m-d H:i:s'); +echo $cron->getPreviousRunDate()->format('Y-m-d H:i:s'); + +// Works with complex expressions +$cron = new Cron\CronExpression('3-59/15 6-12 */15 1 2-5'); +echo $cron->getNextRunDate()->format('Y-m-d H:i:s'); + +// Calculate a run date two iterations into the future +$cron = new Cron\CronExpression('@daily'); +echo $cron->getNextRunDate(null, 2)->format('Y-m-d H:i:s'); + +// Calculate a run date relative to a specific time +$cron = new Cron\CronExpression('@monthly'); +echo $cron->getNextRunDate('2010-01-12 00:00:00')->format('Y-m-d H:i:s'); +``` + +CRON Expressions +================ + +A CRON expression is a string representing the schedule for a particular command to execute. The parts of a CRON schedule are as follows: + +``` +* * * * * +- - - - - +| | | | | +| | | | | +| | | | +----- day of week (0-7) (Sunday = 0 or 7) (or SUN-SAT) +| | | +--------- month (1-12) (or JAN-DEC) +| | +------------- day of month (1-31) +| +----------------- hour (0-23) ++--------------------- minute (0-59) +``` + +Each part of expression can also use wildcard, lists, ranges and steps: + +- wildcard - match always + - `* * * * *` - At every minute. + - day of week and day of month also support `?`, an alias to `*` +- lists - match list of values, ranges and steps + - e.g. `15,30 * * * *` - At minute 15 and 30. +- ranges - match values in range + - e.g. `1-9 * * * *` - At every minute from 1 through 9. +- steps - match every nth value in range + - e.g. `*/5 * * * *` - At every 5th minute. + - e.g. `0-30/5 * * * *` - At every 5th minute from 0 through 30. +- combinations + - e.g. `0-14,30-44 * * * *` - At every minute from 0 through 14 and every minute from 30 through 44. + +You can also use macro instead of an expression: + +- `@yearly`, `@annually` - At 00:00 on 1st of January. (same as `0 0 1 1 *`) +- `@monthly` - At 00:00 on day-of-month 1. (same as `0 0 1 * *`) +- `@weekly` - At 00:00 on Sunday. (same as `0 0 * * 0`) +- `@daily`, `@midnight` - At 00:00. (same as `0 0 * * *`) +- `@hourly` - At minute 0. (same as `0 * * * *`) + +Day of month extra features: + +- nearest weekday - weekday (Monday-Friday) nearest to the given day + - e.g. `* * 15W * *` - At every minute on a weekday nearest to the 15th. + - If you were to specify `15W` as the value, the meaning is: "the nearest weekday to the 15th of the month" + So if the 15th is a Saturday, the trigger will fire on Friday the 14th. + If the 15th is a Sunday, the trigger will fire on Monday the 16th. + If the 15th is a Tuesday, then it will fire on Tuesday the 15th. + - However, if you specify `1W` as the value for day-of-month, + and the 1st is a Saturday, the trigger will fire on Monday the 3rd, + as it will not 'jump' over the boundary of a month's days. +- last day of the month + - e.g. `* * L * *` - At every minute on a last day-of-month. +- last weekday of the month + - e.g. `* * LW * *` - At every minute on a last weekday. + +Day of week extra features: + +- nth day + - e.g. `* * * * 7#4` - At every minute on 4th Sunday. + - 1-5 + - Every day of week repeats 4-5 times a month. To target the last one, use "last day" feature instead. +- last day + - e.g. `* * * * 7L` - At every minute on the last Sunday. + +Requirements +============ + +- PHP 7.2+ +- PHPUnit is required to run the unit tests +- Composer is required to run the unit tests + +Projects that Use cron-expression +================================= +* Part of the [Laravel Framework](https://github.com/laravel/framework/) +* Available as a [Symfony Bundle - setono/cron-expression-bundle](https://github.com/Setono/CronExpressionBundle) +* Framework agnostic, PHP-based job scheduler - [Crunz](https://github.com/crunzphp/crunz) +* Framework agnostic job scheduler - with locks, parallelism, per-second scheduling and more - [orisai/scheduler](https://github.com/orisai/scheduler) +* Explain expression in English (and other languages) with [orisai/cron-expression-explainer](https://github.com/orisai/cron-expression-explainer) diff --git a/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/composer.json b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/composer.json new file mode 100644 index 000000000..d2e23b860 --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/composer.json @@ -0,0 +1,50 @@ +{ + "name": "dragonmantank/cron-expression", + "type": "library", + "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due", + "keywords": ["cron", "schedule"], + "license": "MIT", + "authors": [ + { + "name": "Chris Tankersley", + "email": "chris@ctankersley.com", + "homepage": "https://github.com/dragonmantank" + } + ], + "require": { + "php": "^8.2|^8.3|^8.4|^8.5" + }, + "require-dev": { + "phpstan/phpstan": "^1.12.32|^2.1.31", + "phpunit/phpunit": "^8.5.48|^9.0", + "phpstan/extension-installer": "^1.4.3" + }, + "autoload": { + "psr-4": { + "Cron\\": "src/Cron/" + } + }, + "autoload-dev": { + "psr-4": { + "Cron\\Tests\\": "tests/Cron/" + } + }, + "replace": { + "mtdowling/cron-expression": "^1.0" + }, + "scripts": { + "phpstan": "./vendor/bin/phpstan analyze", + "test": "phpunit" + }, + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "config": { + "allow-plugins": { + "ocramius/package-versions": true, + "phpstan/extension-installer": true + } + } +} diff --git a/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/AbstractField.php b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/AbstractField.php new file mode 100644 index 000000000..55c9a9de5 --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/AbstractField.php @@ -0,0 +1,345 @@ + + */ + protected $fullRange = []; + + /** + * Literal values we need to convert to integers. + * + * @var array + */ + protected $literals = []; + + /** + * Start value of the full range. + * + * @var int + */ + protected $rangeStart; + + /** + * End value of the full range. + * + * @var int + */ + protected $rangeEnd; + + /** + * Constructor + */ + public function __construct() + { + $this->fullRange = range($this->rangeStart, $this->rangeEnd); + } + + /** + * Check to see if a field is satisfied by a value. + * + * @internal + * @param int $dateValue Date value to check + * @param string $value Value to test + * + * @return bool + */ + public function isSatisfied(int $dateValue, string $value): bool + { + if ($this->isIncrementsOfRanges($value)) { + return $this->isInIncrementsOfRanges($dateValue, $value); + } + + if ($this->isRange($value)) { + return $this->isInRange($dateValue, $value); + } + + return '*' === $value || $dateValue === (int) $value; + } + + /** + * Check if a value is a range. + * + * @internal + * @param string $value Value to test + * + * @return bool + */ + public function isRange(string $value): bool + { + return false !== strpos($value, '-'); + } + + /** + * Check if a value is an increments of ranges. + * + * @internal + * @param string $value Value to test + * + * @return bool + */ + public function isIncrementsOfRanges(string $value): bool + { + return false !== strpos($value, '/'); + } + + /** + * Test if a value is within a range. + * + * @internal + * @param int $dateValue Set date value + * @param string $value Value to test + * + * @return bool + */ + public function isInRange(int $dateValue, $value): bool + { + $parts = array_map( + function ($value) { + $value = trim($value); + + return $this->convertLiterals($value); + }, + explode('-', $value, 2) + ); + + return $dateValue >= $parts[0] && $dateValue <= $parts[1]; + } + + /** + * Test if a value is within an increments of ranges (offset[-to]/step size). + * + * @internal + * @param int $dateValue Set date value + * @param string $value Value to test + * + * @return bool + */ + public function isInIncrementsOfRanges(int $dateValue, string $value): bool + { + $chunks = array_map('trim', explode('/', $value, 2)); + $range = $chunks[0]; + $step = $chunks[1] ?? 0; + + // No step or 0 steps aren't cool + if (null === $step || '0' === $step || 0 === $step) { + return false; + } + + // Expand the * to a full range + if ('*' === $range) { + $range = $this->rangeStart . '-' . $this->rangeEnd; + } + + // Generate the requested small range + $rangeChunks = explode('-', $range, 2); + $rangeStart = (int) $rangeChunks[0]; + $rangeEnd = $rangeChunks[1] ?? $rangeStart; + $rangeEnd = (int) $rangeEnd; + + if ($rangeStart < $this->rangeStart || $rangeStart > $this->rangeEnd || $rangeStart > $rangeEnd) { + throw new \OutOfRangeException('Invalid range start requested'); + } + + if ($rangeEnd < $this->rangeStart || $rangeEnd > $this->rangeEnd || $rangeEnd < $rangeStart) { + throw new \OutOfRangeException('Invalid range end requested'); + } + + // Steps larger than the range need to wrap around and be handled + // slightly differently than smaller steps + + // UPDATE - This is actually false. The C implementation will allow a + // larger step as valid syntax, it never wraps around. It will stop + // once it hits the end. Unfortunately this means in future versions + // we will not wrap around. However, because the logic exists today + // per the above documentation, fixing the bug from #89 + if ($step > $this->rangeEnd) { + $thisRange = [$this->fullRange[(int) $step % \count($this->fullRange)]]; + } else { + if ($step > ($rangeEnd - $rangeStart)) { + $thisRange[$rangeStart] = (int) $rangeStart; + } else { + $thisRange = range($rangeStart, $rangeEnd, (int) $step); + } + } + + return \in_array($dateValue, $thisRange, true); + } + + /** + * Returns a range of values for the given cron expression. + * + * @param string $expression The expression to evaluate + * @param int $max Maximum offset for range + * + * @return array + */ + public function getRangeForExpression(string $expression, int $max): array + { + $values = []; + $expression = $this->convertLiterals($expression); + + if (false !== strpos($expression, ',')) { + $ranges = explode(',', $expression); + $values = []; + foreach ($ranges as $range) { + $expanded = $this->getRangeForExpression($range, $this->rangeEnd); + $values = array_merge($values, $expanded); + } + + return $values; + } + + if ($this->isRange($expression) || $this->isIncrementsOfRanges($expression)) { + if (!$this->isIncrementsOfRanges($expression)) { + [$offset, $to] = explode('-', $expression); + $offset = $this->convertLiterals($offset); + $to = $this->convertLiterals($to); + $stepSize = 1; + } else { + $range = array_map('trim', explode('/', $expression, 2)); + $stepSize = $range[1] ?? 0; + $range = $range[0]; + $range = explode('-', $range, 2); + $offset = $range[0]; + $to = $range[1] ?? $max; + } + $offset = '*' === $offset ? $this->rangeStart : $offset; + if ($stepSize >= $this->rangeEnd) { + $values = [$this->fullRange[(int) $stepSize % \count($this->fullRange)]]; + } else { + for ($i = $offset; $i <= $to; $i += $stepSize) { + $values[] = (int) $i; + } + } + sort($values); + } else { + $values = [$expression]; + } + + return $values; + } + + /** + * Convert literal. + * + * @param string $value + * + * @return string + */ + protected function convertLiterals(string $value): string + { + if (\count($this->literals)) { + $key = array_search(strtoupper($value), $this->literals, true); + if (false !== $key) { + return (string) $key; + } + } + + return $value; + } + + /** + * Checks to see if a value is valid for the field. + * + * @param string $value + * + * @return bool + */ + public function validate(string $value): bool + { + $value = $this->convertLiterals($value); + + // All fields allow * as a valid value + if ('*' === $value) { + return true; + } + + // Validate each chunk of a list individually + if (false !== strpos($value, ',')) { + foreach (explode(',', $value) as $listItem) { + if (!$this->validate($listItem)) { + return false; + } + } + + return true; + } + + if (false !== strpos($value, '/')) { + [$range, $step] = explode('/', $value); + + // Don't allow numeric ranges + if (is_numeric($range)) { + return false; + } + + return $this->validate($range) && filter_var($step, FILTER_VALIDATE_INT); + } + + if (false !== strpos($value, '-')) { + if (substr_count($value, '-') > 1) { + return false; + } + + $chunks = explode('-', $value); + $chunks[0] = $this->convertLiterals($chunks[0]); + $chunks[1] = $this->convertLiterals($chunks[1]); + + if ('*' === $chunks[0] || '*' === $chunks[1]) { + return false; + } + + return $this->validate($chunks[0]) && $this->validate($chunks[1]); + } + + if (!is_numeric($value)) { + return false; + } + + if (false !== strpos($value, '.')) { + return false; + } + + // We should have a numeric by now, so coerce this into an integer + $value = (int) $value; + + return \in_array($value, $this->fullRange, true); + } + + protected function timezoneSafeModify(DateTimeInterface $dt, string $modification): DateTimeInterface + { + $timezone = $dt->getTimezone(); + $dt = $dt->setTimezone(new \DateTimeZone("UTC")); + $dt = $dt->modify($modification); + $dt = $dt->setTimezone($timezone); + return $dt; + } + + protected function setTimeHour(DateTimeInterface $date, bool $invert, int $originalTimestamp): DateTimeInterface + { + $date = $date->setTime((int)$date->format('H'), ($invert ? 59 : 0)); + + // setTime caused the offset to change, moving time in the wrong direction + $actualTimestamp = $date->format('U'); + if ((! $invert) && ($actualTimestamp <= $originalTimestamp)) { + $date = $this->timezoneSafeModify($date, "+1 hour"); + } elseif ($invert && ($actualTimestamp >= $originalTimestamp)) { + $date = $this->timezoneSafeModify($date, "-1 hour"); + } + + return $date; + } +} diff --git a/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/CronExpression.php b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/CronExpression.php new file mode 100644 index 000000000..33f0d6c95 --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/CronExpression.php @@ -0,0 +1,591 @@ + '0 0 1 1 *', + '@annually' => '0 0 1 1 *', + '@monthly' => '0 0 1 * *', + '@weekly' => '0 0 * * 0', + '@daily' => '0 0 * * *', + '@midnight' => '0 0 * * *', + '@hourly' => '0 * * * *', + ]; + + /** + * @var array CRON expression parts + */ + protected $cronParts; + + /** + * @var FieldFactoryInterface CRON field factory + */ + protected $fieldFactory; + + /** + * @var int Max iteration count when searching for next run date + */ + protected $maxIterationCount = 1000; + + /** + * @var array Order in which to test of cron parts + */ + protected static $order = [ + self::YEAR, + self::MONTH, + self::DAY, + self::WEEKDAY, + self::HOUR, + self::MINUTE, + ]; + + /** + * @var array + */ + private static $registeredAliases = self::MAPPINGS; + + /** + * Registered a user defined CRON Expression Alias. + * + * @throws LogicException If the expression or the alias name are invalid + * or if the alias is already registered. + */ + public static function registerAlias(string $alias, string $expression): void + { + try { + new self($expression); + } catch (InvalidArgumentException $exception) { + throw new LogicException("The expression `$expression` is invalid", 0, $exception); + } + + $shortcut = strtolower($alias); + if (1 !== preg_match('/^@\w+$/', $shortcut)) { + throw new LogicException("The alias `$alias` is invalid. It must start with an `@` character and contain alphanumeric (letters, numbers, regardless of case) plus underscore (_)."); + } + + if (isset(self::$registeredAliases[$shortcut])) { + throw new LogicException("The alias `$alias` is already registered."); + } + + self::$registeredAliases[$shortcut] = $expression; + } + + /** + * Unregistered a user defined CRON Expression Alias. + * + * @throws LogicException If the user tries to unregister a built-in alias + */ + public static function unregisterAlias(string $alias): bool + { + $shortcut = strtolower($alias); + if (isset(self::MAPPINGS[$shortcut])) { + throw new LogicException("The alias `$alias` is a built-in alias; it can not be unregistered."); + } + + if (!isset(self::$registeredAliases[$shortcut])) { + return false; + } + + unset(self::$registeredAliases[$shortcut]); + + return true; + } + + /** + * Tells whether a CRON Expression alias is registered. + */ + public static function supportsAlias(string $alias): bool + { + return isset(self::$registeredAliases[strtolower($alias)]); + } + + /** + * Returns all registered aliases as an associated array where the aliases are the key + * and their associated expressions are the values. + * + * @return array + */ + public static function getAliases(): array + { + return self::$registeredAliases; + } + + /** + * @deprecated since version 3.0.2, use __construct instead. + */ + public static function factory(string $expression, ?FieldFactoryInterface $fieldFactory = null): CronExpression + { + /** @phpstan-ignore-next-line */ + return new static($expression, $fieldFactory); + } + + /** + * Validate a CronExpression. + * + * @param string $expression the CRON expression to validate + * + * @return bool True if a valid CRON expression was passed. False if not. + */ + public static function isValidExpression(string $expression): bool + { + try { + new CronExpression($expression); + } catch (InvalidArgumentException $e) { + return false; + } + + return true; + } + + /** + * Parse a CRON expression. + * + * @param string $expression CRON expression (e.g. '8 * * * *') + * @param null|FieldFactoryInterface $fieldFactory Factory to create cron fields + * @throws InvalidArgumentException + */ + public function __construct(string $expression, ?FieldFactoryInterface $fieldFactory = null) + { + $shortcut = strtolower($expression); + $expression = self::$registeredAliases[$shortcut] ?? $expression; + + $this->fieldFactory = $fieldFactory ?: new FieldFactory(); + $this->setExpression($expression); + } + + /** + * Set or change the CRON expression. + * + * @param string $value CRON expression (e.g. 8 * * * *) + * + * @throws \InvalidArgumentException if not a valid CRON expression + * + * @return CronExpression + */ + public function setExpression(string $value): CronExpression + { + $split = preg_split('/\s/', $value, -1, PREG_SPLIT_NO_EMPTY); + + if (!\is_array($split)) { + throw new InvalidArgumentException( + $value . ' is not a valid CRON expression' + ); + } + + $notEnoughParts = \count($split) < 5; + + $questionMarkInInvalidPart = array_key_exists(0, $split) && $split[0] === '?' + || array_key_exists(1, $split) && $split[1] === '?' + || array_key_exists(3, $split) && $split[3] === '?'; + + $tooManyQuestionMarks = array_key_exists(2, $split) && $split[2] === '?' + && array_key_exists(4, $split) && $split[4] === '?'; + + if ($notEnoughParts || $questionMarkInInvalidPart || $tooManyQuestionMarks) { + throw new InvalidArgumentException( + $value . ' is not a valid CRON expression' + ); + } + + $this->cronParts = $split; + foreach ($this->cronParts as $position => $part) { + $this->setPart($position, $part); + } + + return $this; + } + + /** + * Set part of the CRON expression. + * + * @param int $position The position of the CRON expression to set + * @param string $value The value to set + * + * @throws \InvalidArgumentException if the value is not valid for the part + * + * @return CronExpression + */ + public function setPart(int $position, string $value): CronExpression + { + if (!$this->fieldFactory->getField($position)->validate($value)) { + throw new InvalidArgumentException( + 'Invalid CRON field value ' . $value . ' at position ' . $position + ); + } + + $this->cronParts[$position] = $value; + + return $this; + } + + /** + * Set max iteration count for searching next run dates. + * + * @param int $maxIterationCount Max iteration count when searching for next run date + * + * @return CronExpression + */ + public function setMaxIterationCount(int $maxIterationCount): CronExpression + { + $this->maxIterationCount = $maxIterationCount; + + return $this; + } + + /** + * Get a next run date relative to the current date or a specific date + * + * @param string|\DateTimeInterface $currentTime Relative calculation date + * @param int $nth Number of matches to skip before returning a + * matching next run date. 0, the default, will return the + * current date and time if the next run date falls on the + * current date and time. Setting this value to 1 will + * skip the first match and go to the second match. + * Setting this value to 2 will skip the first 2 + * matches and so on. + * @param bool $allowCurrentDate Set to TRUE to return the current date if + * it matches the cron expression. + * @param null|string $timeZone TimeZone to use instead of the system default + * + * @throws \RuntimeException on too many iterations + * @throws \Exception + * + * @return \DateTime + */ + public function getNextRunDate($currentTime = 'now', int $nth = 0, bool $allowCurrentDate = false, $timeZone = null): DateTime + { + return $this->getRunDate($currentTime, $nth, false, $allowCurrentDate, $timeZone); + } + + /** + * Get a previous run date relative to the current date or a specific date. + * + * @param string|\DateTimeInterface $currentTime Relative calculation date + * @param int $nth Number of matches to skip before returning + * @param bool $allowCurrentDate Set to TRUE to return the + * current date if it matches the cron expression + * @param null|string $timeZone TimeZone to use instead of the system default + * + * @throws \RuntimeException on too many iterations + * @throws \Exception + * + * @return \DateTime + * + * @see \Cron\CronExpression::getNextRunDate + */ + public function getPreviousRunDate($currentTime = 'now', int $nth = 0, bool $allowCurrentDate = false, $timeZone = null): DateTime + { + return $this->getRunDate($currentTime, $nth, true, $allowCurrentDate, $timeZone); + } + + /** + * Get multiple run dates starting at the current date or a specific date. + * + * @param int $total Set the total number of dates to calculate + * @param string|\DateTimeInterface|null $currentTime Relative calculation date + * @param bool $invert Set to TRUE to retrieve previous dates + * @param bool $allowCurrentDate Set to TRUE to return the + * current date if it matches the cron expression + * @param null|string $timeZone TimeZone to use instead of the system default + * + * @return \DateTime[] Returns an array of run dates + */ + public function getMultipleRunDates(int $total, $currentTime = 'now', bool $invert = false, bool $allowCurrentDate = false, $timeZone = null): array + { + $timeZone = $this->determineTimeZone($currentTime, $timeZone); + + if ('now' === $currentTime) { + $currentTime = new DateTime(); + } elseif ($currentTime instanceof DateTime) { + $currentTime = clone $currentTime; + } elseif ($currentTime instanceof DateTimeImmutable) { + $currentTime = DateTime::createFromFormat('U', $currentTime->format('U')); + } elseif (\is_string($currentTime)) { + $currentTime = new DateTime($currentTime); + } + + if (!$currentTime instanceof DateTime) { + throw new InvalidArgumentException('invalid current time'); + } + + $currentTime->setTimezone(new DateTimeZone($timeZone)); + + $matches = []; + for ($i = 0; $i < $total; ++$i) { + try { + $result = $this->getRunDate($currentTime, 0, $invert, $allowCurrentDate, $timeZone); + } catch (RuntimeException $e) { + break; + } + + $allowCurrentDate = false; + $currentTime = clone $result; + $matches[] = $result; + } + + return $matches; + } + + /** + * Get all or part of the CRON expression. + * + * @param int|string|null $part specify the part to retrieve or NULL to get the full + * cron schedule string + * + * @return null|string Returns the CRON expression, a part of the + * CRON expression, or NULL if the part was specified but not found + */ + public function getExpression($part = null): ?string + { + if (null === $part) { + return implode(' ', $this->cronParts); + } + + if (array_key_exists($part, $this->cronParts)) { + return $this->cronParts[$part]; + } + + return null; + } + + /** + * Gets the parts of the cron expression as an array. + * + * @return string[] + * The array of parts that make up this expression. + */ + public function getParts() + { + return $this->cronParts; + } + + /** + * Helper method to output the full expression. + * + * @return string Full CRON expression + */ + public function __toString(): string + { + return (string) $this->getExpression(); + } + + /** + * Determine if the cron is due to run based on the current date or a + * specific date. This method assumes that the current number of + * seconds are irrelevant, and should be called once per minute. + * + * @param string|\DateTimeInterface $currentTime Relative calculation date + * @param null|string $timeZone TimeZone to use instead of the system default + * + * @return bool Returns TRUE if the cron is due to run or FALSE if not + */ + public function isDue($currentTime = 'now', $timeZone = null): bool + { + $timeZone = $this->determineTimeZone($currentTime, $timeZone); + + if ('now' === $currentTime) { + $currentTime = new DateTime(); + } elseif ($currentTime instanceof DateTime) { + $currentTime = clone $currentTime; + } elseif ($currentTime instanceof DateTimeImmutable) { + $currentTime = DateTime::createFromFormat('U', $currentTime->format('U')); + } elseif (\is_string($currentTime)) { + $currentTime = new DateTime($currentTime); + } + + if (!$currentTime instanceof DateTime) { + throw new InvalidArgumentException('invalid current time'); + } + + $currentTime->setTimezone(new DateTimeZone($timeZone)); + + // drop the seconds to 0 + $currentTime->setTime((int) $currentTime->format('H'), (int) $currentTime->format('i'), 0); + + try { + return $this->getNextRunDate($currentTime, 0, true)->getTimestamp() === $currentTime->getTimestamp(); + } catch (Exception $e) { + return false; + } + } + + /** + * Get the next or previous run date of the expression relative to a date. + * + * @param string|\DateTimeInterface|null $currentTime Relative calculation date + * @param int $nth Number of matches to skip before returning + * @param bool $invert Set to TRUE to go backwards in time + * @param bool $allowCurrentDate Set to TRUE to return the + * current date if it matches the cron expression + * @param string|null $timeZone TimeZone to use instead of the system default + * + * @throws \RuntimeException on too many iterations + * @throws Exception + * + * @return \DateTime + */ + protected function getRunDate($currentTime = null, int $nth = 0, bool $invert = false, bool $allowCurrentDate = false, $timeZone = null): DateTime + { + $timeZone = $this->determineTimeZone($currentTime, $timeZone); + + if ($currentTime instanceof DateTime) { + $currentDate = clone $currentTime; + } elseif ($currentTime instanceof DateTimeImmutable) { + $currentDate = DateTime::createFromFormat('U', $currentTime->format('U')); + } elseif (\is_string($currentTime)) { + $currentDate = new DateTime($currentTime); + } else { + $currentDate = new DateTime('now'); + } + + if (!$currentDate instanceof DateTime) { + throw new InvalidArgumentException('invalid current date'); + } + + $currentDate->setTimezone(new DateTimeZone($timeZone)); + // Workaround for setTime causing an offset change: https://bugs.php.net/bug.php?id=81074 + $currentDate = DateTime::createFromFormat("!Y-m-d H:iO", $currentDate->format("Y-m-d H:iP"), $currentDate->getTimezone()); + if ($currentDate === false) { + throw new \RuntimeException('Unable to create date from format'); + } + $currentDate->setTimezone(new DateTimeZone($timeZone)); + + $nextRun = clone $currentDate; + + // We don't have to satisfy * or null fields + $parts = []; + $fields = []; + foreach (self::$order as $position) { + $part = $this->getExpression($position); + if (null === $part || '*' === $part) { + continue; + } + $parts[$position] = $part; + $fields[$position] = $this->fieldFactory->getField($position); + } + + if (isset($parts[self::DAY]) && isset($parts[self::WEEKDAY])) { + $domExpression = sprintf('%s %s %s %s *', $this->getExpression(0), $this->getExpression(1), $this->getExpression(2), $this->getExpression(3)); + $dowExpression = sprintf('%s %s * %s %s', $this->getExpression(0), $this->getExpression(1), $this->getExpression(3), $this->getExpression(4)); + + $domExpression = new self($domExpression); + $dowExpression = new self($dowExpression); + + $domRunDates = $domExpression->getMultipleRunDates($nth + 1, $currentTime, $invert, $allowCurrentDate, $timeZone); + $dowRunDates = $dowExpression->getMultipleRunDates($nth + 1, $currentTime, $invert, $allowCurrentDate, $timeZone); + + if ($parts[self::DAY] === '?' || $parts[self::DAY] === '*') { + $domRunDates = []; + } + + if ($parts[self::WEEKDAY] === '?' || $parts[self::WEEKDAY] === '*') { + $dowRunDates = []; + } + + $combined = array_merge($domRunDates, $dowRunDates); + usort($combined, function ($a, $b) { + return $a->format('Y-m-d H:i:s') <=> $b->format('Y-m-d H:i:s'); + }); + if ($invert) { + $combined = array_reverse($combined); + } + + return $combined[$nth]; + } + + // Set a hard limit to bail on an impossible date + for ($i = 0; $i < $this->maxIterationCount; ++$i) { + foreach ($parts as $position => $part) { + $satisfied = false; + // Get the field object used to validate this part + $field = $fields[$position]; + // Check if this is singular or a list + if (false === strpos($part, ',')) { + $satisfied = $field->isSatisfiedBy($nextRun, $part, $invert); + } else { + foreach (array_map('trim', explode(',', $part)) as $listPart) { + if ($field->isSatisfiedBy($nextRun, $listPart, $invert)) { + $satisfied = true; + + break; + } + } + } + + // If the field is not satisfied, then start over + if (!$satisfied) { + $field->increment($nextRun, $invert, $part); + + continue 2; + } + } + + // Skip this match if needed + if ((!$allowCurrentDate && $nextRun == $currentDate) || --$nth > -1) { + $this->fieldFactory->getField(self::MINUTE)->increment($nextRun, $invert, $parts[self::MINUTE] ?? null); + continue; + } + + return $nextRun; + } + + // @codeCoverageIgnoreStart + throw new RuntimeException('Impossible CRON expression'); + // @codeCoverageIgnoreEnd + } + + /** + * Workout what timeZone should be used. + * + * @param string|\DateTimeInterface|null $currentTime Relative calculation date + * @param string|null $timeZone TimeZone to use instead of the system default + * + * @return string + */ + protected function determineTimeZone($currentTime, ?string $timeZone): string + { + if (null !== $timeZone) { + return $timeZone; + } + + if ($currentTime instanceof DateTimeInterface) { + return $currentTime->getTimezone()->getName(); + } + + return date_default_timezone_get(); + } +} diff --git a/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/DayOfMonthField.php b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/DayOfMonthField.php new file mode 100644 index 000000000..39ff59783 --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/DayOfMonthField.php @@ -0,0 +1,164 @@ + + */ +class DayOfMonthField extends AbstractField +{ + /** + * {@inheritdoc} + */ + protected $rangeStart = 1; + + /** + * {@inheritdoc} + */ + protected $rangeEnd = 31; + + /** + * Get the nearest day of the week for a given day in a month. + * + * @param int $currentYear Current year + * @param int $currentMonth Current month + * @param int $targetDay Target day of the month + * + * @return \DateTime|null Returns the nearest date + */ + private static function getNearestWeekday(int $currentYear, int $currentMonth, int $targetDay): ?DateTime + { + $tday = str_pad((string) $targetDay, 2, '0', STR_PAD_LEFT); + $target = DateTime::createFromFormat('Y-m-d', "{$currentYear}-{$currentMonth}-{$tday}"); + + if ($target === false) { + return null; + } + + $currentWeekday = (int) $target->format('N'); + + if ($currentWeekday < 6) { + return $target; + } + + $lastDayOfMonth = $target->format('t'); + foreach ([-1, 1, -2, 2] as $i) { + $adjusted = $targetDay + $i; + if ($adjusted > 0 && $adjusted <= $lastDayOfMonth) { + $target->setDate($currentYear, $currentMonth, $adjusted); + + if ((int) $target->format('N') < 6 && (int) $target->format('m') === $currentMonth) { + return $target; + } + } + } + + return null; + } + + /** + * {@inheritdoc} + */ + public function isSatisfiedBy(DateTimeInterface $date, $value, bool $invert): bool + { + // ? states that the field value is to be skipped + if ('?' === $value) { + return true; + } + + $fieldValue = $date->format('d'); + + // Check to see if this is the last day of the month + if ('L' === $value) { + return $fieldValue === $date->format('t'); + } + + // Check to see if this is the nearest weekday to a particular value + if ($wPosition = strpos($value, 'W')) { + // Parse the target day + $targetDay = (int) substr($value, 0, $wPosition); + // Find out if the current day is the nearest day of the week + $nearest = self::getNearestWeekday( + (int) $date->format('Y'), + (int) $date->format('m'), + $targetDay + ); + if ($nearest) { + return $date->format('j') === $nearest->format('j'); + } + + throw new \RuntimeException('Unable to return nearest weekday'); + } + + return $this->isSatisfied((int) $date->format('d'), $value); + } + + /** + * @inheritDoc + * + * @param \DateTime|\DateTimeImmutable $date + */ + public function increment(DateTimeInterface &$date, $invert = false, $parts = null): FieldInterface + { + if (! $invert) { + $date = $date->add(new \DateInterval('P1D')); + $date = $date->setTime(0, 0); + } else { + $date = $date->sub(new \DateInterval('P1D')); + $date = $date->setTime(23, 59); + } + + return $this; + } + + /** + * {@inheritdoc} + */ + public function validate(string $value): bool + { + $basicChecks = parent::validate($value); + + // Validate that a list don't have W or L + if (false !== strpos($value, ',') && (false !== strpos($value, 'W') || false !== strpos($value, 'L'))) { + return false; + } + + if (!$basicChecks) { + if ('?' === $value) { + return true; + } + + if ('L' === $value) { + return true; + } + + if (preg_match('/^(.*)W$/', $value, $matches)) { + return $this->validate($matches[1]); + } + + return false; + } + + return $basicChecks; + } +} diff --git a/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/DayOfWeekField.php b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/DayOfWeekField.php new file mode 100644 index 000000000..6fae740ad --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/DayOfWeekField.php @@ -0,0 +1,194 @@ + Weekday range + */ + protected $nthRange; + + /** + * {@inheritdoc} + */ + protected $literals = [1 => 'MON', 2 => 'TUE', 3 => 'WED', 4 => 'THU', 5 => 'FRI', 6 => 'SAT', 7 => 'SUN']; + + /** + * Constructor + */ + public function __construct() + { + $this->nthRange = range(1, 5); + parent::__construct(); + } + + /** + * @inheritDoc + */ + public function isSatisfiedBy(DateTimeInterface $date, $value, bool $invert): bool + { + if ('?' === $value) { + return true; + } + + // Convert text day of the week values to integers + $value = $this->convertLiterals($value); + + $currentYear = (int) $date->format('Y'); + $currentMonth = (int) $date->format('m'); + $lastDayOfMonth = (int) $date->format('t'); + + // Find out if this is the last specific weekday of the month + if ($lPosition = strpos($value, 'L')) { + $weekday = (int) $this->convertLiterals(substr($value, 0, $lPosition)); + $weekday %= 7; + + $daysInMonth = (int) $date->format('t'); + $remainingDaysInMonth = $daysInMonth - (int) $date->format('d'); + return (($weekday === (int) $date->format('w')) && ($remainingDaysInMonth < 7)); + } + + // Handle # hash tokens + if (strpos($value, '#')) { + [$weekday, $nth] = explode('#', $value); + + if (!is_numeric($nth)) { + throw new InvalidArgumentException("Hashed weekdays must be numeric, {$nth} given"); + } else { + $nth = (int) $nth; + } + + // 0 and 7 are both Sunday, however 7 matches date('N') format ISO-8601 + if ('0' === $weekday) { + $weekday = 7; + } + + $weekday = (int) $this->convertLiterals((string) $weekday); + + // Validate the hash fields + if ($weekday < 0 || $weekday > 7) { + throw new InvalidArgumentException("Weekday must be a value between 0 and 7. {$weekday} given"); + } + + if (!\in_array($nth, $this->nthRange, true)) { + throw new InvalidArgumentException("There are never more than 5 or less than 1 of a given weekday in a month, {$nth} given"); + } + + // The current weekday must match the targeted weekday to proceed + if ((int) $date->format('N') !== $weekday) { + return false; + } + + $tdate = clone $date; + $tdate = $tdate->setDate($currentYear, $currentMonth, 1); + $dayCount = 0; + $currentDay = 1; + while ($currentDay < $lastDayOfMonth + 1) { + if ((int) $tdate->format('N') === $weekday) { + if (++$dayCount >= $nth) { + break; + } + } + $tdate = $tdate->setDate($currentYear, $currentMonth, ++$currentDay); + } + + return (int) $date->format('j') === $currentDay; + } + + // Handle day of the week values + if (false !== strpos($value, '-')) { + $parts = explode('-', $value); + if ('7' === $parts[0]) { + $parts[0] = 0; + } elseif ('0' === $parts[1]) { + $parts[1] = 7; + } + $value = implode('-', $parts); + } + + // Test to see which Sunday to use -- 0 == 7 == Sunday + $format = \in_array(7, array_map(function ($value) { + return (int) $value; + }, str_split($value)), true) ? 'N' : 'w'; + $fieldValue = (int) $date->format($format); + + return $this->isSatisfied($fieldValue, $value); + } + + /** + * @inheritDoc + */ + public function increment(DateTimeInterface &$date, $invert = false, $parts = null): FieldInterface + { + if (! $invert) { + $date = $date->add(new \DateInterval('P1D')); + $date = $date->setTime(0, 0); + } else { + $date = $date->sub(new \DateInterval('P1D')); + $date = $date->setTime(23, 59); + } + + return $this; + } + + /** + * {@inheritdoc} + */ + public function validate(string $value): bool + { + $basicChecks = parent::validate($value); + + if (!$basicChecks) { + if ('?' === $value) { + return true; + } + + // Handle the # value + if (false !== strpos($value, '#')) { + $chunks = explode('#', $value); + $chunks[0] = $this->convertLiterals($chunks[0]); + + if (parent::validate($chunks[0]) && is_numeric($chunks[1]) && \in_array((int) $chunks[1], $this->nthRange, true)) { + return true; + } + } + + if (preg_match('/^(.*)L$/', $value, $matches)) { + return $this->validate($matches[1]); + } + + return false; + } + + return $basicChecks; + } +} diff --git a/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/FieldFactory.php b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/FieldFactory.php new file mode 100644 index 000000000..4d3a764b1 --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/FieldFactory.php @@ -0,0 +1,52 @@ + Cache of instantiated fields + */ + private $fields = []; + + /** + * Get an instance of a field object for a cron expression position. + * + * @param int $position CRON expression position value to retrieve + * + * @throws InvalidArgumentException if a position is not valid + */ + public function getField(int $position): FieldInterface + { + return $this->fields[$position] ?? $this->fields[$position] = $this->instantiateField($position); + } + + private function instantiateField(int $position): FieldInterface + { + switch ($position) { + case CronExpression::MINUTE: + return new MinutesField(); + case CronExpression::HOUR: + return new HoursField(); + case CronExpression::DAY: + return new DayOfMonthField(); + case CronExpression::MONTH: + return new MonthField(); + case CronExpression::WEEKDAY: + return new DayOfWeekField(); + } + + throw new InvalidArgumentException( + ($position + 1) . ' is not a valid position' + ); + } +} diff --git a/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/FieldFactoryInterface.php b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/FieldFactoryInterface.php new file mode 100644 index 000000000..8bd3c6581 --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/FieldFactoryInterface.php @@ -0,0 +1,8 @@ +>|null Transitions returned by DateTimeZone::getTransitions() + */ + protected $transitions = []; + + /** + * @var int|null Timestamp of the start of the transitions range + */ + protected $transitionsStart = null; + + /** + * @var int|null Timestamp of the end of the transitions range + */ + protected $transitionsEnd = null; + + /** + * {@inheritdoc} + */ + public function isSatisfiedBy(DateTimeInterface $date, $value, bool $invert): bool + { + $checkValue = (int) $date->format('H'); + $retval = $this->isSatisfied($checkValue, $value); + if ($retval) { + return $retval; + } + + // Are we on the edge of a transition + $lastTransition = $this->getPastTransition($date); + if (($lastTransition !== null) && ($lastTransition["ts"] > ((int) $date->format('U') - 3600))) { + $dtLastOffset = clone $date; + $this->timezoneSafeModify($dtLastOffset, "-1 hour"); + $lastOffset = $dtLastOffset->getOffset(); + + $dtNextOffset = clone $date; + $this->timezoneSafeModify($dtNextOffset, "+1 hour"); + $nextOffset = $dtNextOffset->getOffset(); + + $offsetChange = $nextOffset - $lastOffset; + if ($offsetChange >= 3600) { + $checkValue -= 1; + return $this->isSatisfied($checkValue, $value); + } + if ((! $invert) && ($offsetChange <= -3600)) { + $checkValue += 1; + return $this->isSatisfied($checkValue, $value); + } + } + + return $retval; + } + + /** + * @return non-empty-array|null + */ + public function getPastTransition(DateTimeInterface $date): ?array + { + $currentTimestamp = (int) $date->format('U'); + if ( + ($this->transitions === null) + || ($this->transitionsStart < ($currentTimestamp + 86400)) + || ($this->transitionsEnd > ($currentTimestamp - 86400)) + ) { + // We start a day before current time so we can differentiate between the first transition entry + // and a change that happens now + $dtLimitStart = clone $date; + $dtLimitStart = $dtLimitStart->modify("-12 months"); + $dtLimitEnd = clone $date; + $dtLimitEnd = $dtLimitEnd->modify('+12 months'); + + $this->transitions = $date->getTimezone()->getTransitions( + $dtLimitStart->getTimestamp(), + $dtLimitEnd->getTimestamp() + ); + if (empty($this->transitions)) { + return null; + } + $this->transitionsStart = $dtLimitStart->getTimestamp(); + $this->transitionsEnd = $dtLimitEnd->getTimestamp(); + } + + $nextTransition = null; + foreach ($this->transitions as $transition) { + if ($transition["ts"] > $currentTimestamp) { + continue; + } + + if (($nextTransition !== null) && ($transition["ts"] < $nextTransition["ts"])) { + continue; + } + + $nextTransition = $transition; + } + + return ($nextTransition ?? null); + } + + /** + * {@inheritdoc} + * + * @param string|null $parts + */ + public function increment(DateTimeInterface &$date, $invert = false, $parts = null): FieldInterface + { + $originalTimestamp = (int) $date->format('U'); + + // Change timezone to UTC temporarily. This will + // allow us to go back or forwards and hour even + // if DST will be changed between the hours. + if (null === $parts || '*' === $parts) { + if ($invert) { + $date = $date->sub(new \DateInterval('PT1H')); + } else { + $date = $date->add(new \DateInterval('PT1H')); + } + + $date = $this->setTimeHour($date, $invert, $originalTimestamp); + return $this; + } + + $parts = false !== strpos($parts, ',') ? explode(',', $parts) : [$parts]; + $hours = []; + foreach ($parts as $part) { + $hours = array_merge($hours, $this->getRangeForExpression($part, 23)); + } + + $current_hour = (int) $date->format('H'); + $position = $invert ? \count($hours) - 1 : 0; + $countHours = \count($hours); + if ($countHours > 1) { + for ($i = 0; $i < $countHours - 1; ++$i) { + if ((!$invert && $current_hour >= $hours[$i] && $current_hour < $hours[$i + 1]) || + ($invert && $current_hour > $hours[$i] && $current_hour <= $hours[$i + 1])) { + $position = $invert ? $i : $i + 1; + + break; + } + } + } + + $target = (int) $hours[$position]; + $originalHour = (int)$date->format('H'); + $originalDst = (int)$date->format('I'); + + $originalDay = (int)$date->format('d'); + $previousOffset = $date->getOffset(); + + if (! $invert) { + if ($originalHour >= $target) { + $distance = 24 - $originalHour; + $date = $this->timezoneSafeModify($date, "+{$distance} hours"); + + $actualDay = (int)$date->format('d'); + $actualHour = (int)$date->format('H'); + if (($actualDay !== ($originalDay + 1)) && ($actualHour !== 0)) { + $offsetChange = ($previousOffset - $date->getOffset()); + $date = $this->timezoneSafeModify($date, "+{$offsetChange} seconds"); + } + + $originalHour = (int)$date->format('H'); + } + + $distance = $target - $originalHour; + $date = $this->timezoneSafeModify($date, "+{$distance} hours"); + } else { + if ($originalHour <= $target) { + $distance = ($originalHour + 1); + $date = $this->timezoneSafeModify($date, "-" . $distance . " hours"); + + $actualDay = (int)$date->format('d'); + $actualHour = (int)$date->format('H'); + if (($actualDay !== ($originalDay - 1)) && ($actualHour !== 23)) { + $offsetChange = ($previousOffset - $date->getOffset()); + $date = $this->timezoneSafeModify($date, "+{$offsetChange} seconds"); + } + + $originalHour = (int)$date->format('H'); + } + + $distance = $originalHour - $target; + $date = $this->timezoneSafeModify($date, "-{$distance} hours"); + } + + $actualDst = (int)$date->format('I'); + if ($originalDst < $actualDst) { + $date = $this->timezoneSafeModify($date, "-1 hours"); + } + + $date = $this->setTimeHour($date, $invert, $originalTimestamp); + + $actualHour = (int)$date->format('H'); + if ($invert && ($actualHour === ($target - 1) || (($actualHour === 23) && ($target === 0)))) { + $date = $this->timezoneSafeModify($date, "+1 hour"); + } + + return $this; + } +} diff --git a/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/MinutesField.php b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/MinutesField.php new file mode 100644 index 000000000..f077e6ec5 --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/MinutesField.php @@ -0,0 +1,97 @@ +isSatisfied((int)$date->format('i'), $value); + } + + /** + * {@inheritdoc} + * {@inheritDoc} + * + * @param string|null $parts + */ + public function increment(DateTimeInterface &$date, $invert = false, $parts = null): FieldInterface + { + if (is_null($parts)) { + $date = $this->timezoneSafeModify($date, ($invert ? "-" : "+") ."1 minute"); + return $this; + } + + $current_minute = (int) $date->format('i'); + + $parts = false !== strpos($parts, ',') ? explode(',', $parts) : [$parts]; + sort($parts); + $minutes = []; + foreach ($parts as $part) { + $minutes = array_merge($minutes, $this->getRangeForExpression($part, 59)); + } + + $position = $invert ? \count($minutes) - 1 : 0; + if (\count($minutes) > 1) { + for ($i = 0; $i < \count($minutes) - 1; ++$i) { + if ((!$invert && $current_minute >= $minutes[$i] && $current_minute < $minutes[$i + 1]) || + ($invert && $current_minute > $minutes[$i] && $current_minute <= $minutes[$i + 1])) { + $position = $invert ? $i : $i + 1; + + break; + } + } + } + + $target = (int) $minutes[$position]; + $originalMinute = (int) $date->format("i"); + + if (! $invert) { + if ($originalMinute >= $target) { + $distance = 60 - $originalMinute; + $date = $this->timezoneSafeModify($date, "+{$distance} minutes"); + + $originalMinute = (int) $date->format("i"); + } + + $distance = $target - $originalMinute; + $date = $this->timezoneSafeModify($date, "+{$distance} minutes"); + } else { + if ($originalMinute <= $target) { + $distance = ($originalMinute + 1); + $date = $this->timezoneSafeModify($date, "-{$distance} minutes"); + + $originalMinute = (int) $date->format("i"); + } + + $distance = $originalMinute - $target; + $date = $this->timezoneSafeModify($date, "-{$distance} minutes"); + } + + return $this; + } +} diff --git a/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/MonthField.php b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/MonthField.php new file mode 100644 index 000000000..5a15fbb8b --- /dev/null +++ b/modules/qlocrontaskmanager/vendor/dragonmantank/cron-expression/src/Cron/MonthField.php @@ -0,0 +1,61 @@ + 'JAN', 2 => 'FEB', 3 => 'MAR', 4 => 'APR', 5 => 'MAY', 6 => 'JUN', 7 => 'JUL', + 8 => 'AUG', 9 => 'SEP', 10 => 'OCT', 11 => 'NOV', 12 => 'DEC', ]; + + /** + * {@inheritdoc} + */ + public function isSatisfiedBy(DateTimeInterface $date, $value, bool $invert): bool + { + if ($value === '?') { + return true; + } + + $value = $this->convertLiterals($value); + + return $this->isSatisfied((int) $date->format('m'), $value); + } + + /** + * @inheritDoc + * + * @param \DateTime|\DateTimeImmutable $date + */ + public function increment(DateTimeInterface &$date, $invert = false, $parts = null): FieldInterface + { + if (! $invert) { + $date = $date->modify('first day of next month'); + $date = $date->setTime(0, 0); + } else { + $date = $date->modify('last day of previous month'); + $date = $date->setTime(23, 59); + } + + return $this; + } +} diff --git a/modules/qlocrontaskmanager/views/css/admin/index.php b/modules/qlocrontaskmanager/views/css/admin/index.php new file mode 100644 index 000000000..409280877 --- /dev/null +++ b/modules/qlocrontaskmanager/views/css/admin/index.php @@ -0,0 +1,32 @@ + ' + copiedText); + + setTimeout(function () { + $button.html(originalHtml); + }, 2000); + }, + + getRegenerateConfirmText: function () { + return $(this.selectors.textContainer).data('regenerate-confirm') || ''; + }, +}; + +var QctmCronHelper = { + $input: null, + cronRegex: /^(\*|[\d\/*,\-]+)\s+(\*|[\d\/*,\-]+)\s+(\*|[\d\/*,\-]+)\s+(\*|[\d\/*,\-]+)\s+(\*|[\d\/*,\-]+)$/, + + init: function () { + this.$input = $('.qctm-cron-expression'); + + if (!this.$input.length) { + return; + } + this.$input.on('input keyup', this.onInput.bind(this)); + }, + + onInput: function (e) { + var $input = $(e.currentTarget); + var val = $input.val(); + val = val.replace(/[^0-9*\/,\-\s]/g, ''); + $input.val(val); + var $readable = $input.closest('.col-lg-4').find('.help-block'); + if (this.cronRegex.test(val)) { + this.fetchReadable(val, $readable); + } else { + $readable.removeClass('cron-expression-valid').addClass('cron-expression-invalid').text(INVALID_CRON_EXPRESSION); + } + }, + + fetchReadable: function (val, $readable) { + var ajaxUrl = $('#qctm-ajax-url').val(); + + if (!ajaxUrl || !val) { + return; + } + + $.ajax({ + url: ajaxUrl, + type: 'GET', + data: { + action: 'getCronReadable', + cron_expression: val + }, + dataType: 'json', + success: function (response) { + if (response && response.valid) { + $readable.removeClass('cron-expression-invalid').addClass('cron-expression-valid').text(response.readable ); + } else { + $readable.removeClass('cron-expression-valid').addClass('cron-expression-invalid').text(response.readable); + } + } + }); + } +}; + +$(document).ready(function () { + QctmAdmin.init(); + QctmCronHelper.init(); +}); diff --git a/modules/qlocrontaskmanager/views/js/index.php b/modules/qlocrontaskmanager/views/js/index.php new file mode 100644 index 000000000..409280877 --- /dev/null +++ b/modules/qlocrontaskmanager/views/js/index.php @@ -0,0 +1,32 @@ + +
    + {l s='Cron Command' mod='qlocrontaskmanager'} +
    +
    +
    + {l s='Add the following cron entry to your server. This single command will manage all module cron tasks automatically.' mod='qlocrontaskmanager'} +
    +
    + +
    +
    + + + + +
    +

    + {l s='This command runs every minute and dispatches all registered module tasks based on their cron expressions.' mod='qlocrontaskmanager'} +

    +
    +
    +
    +
    • + + diff --git a/modules/qlocrontaskmanager/views/templates/admin/cron_task_logs/index.php b/modules/qlocrontaskmanager/views/templates/admin/cron_task_logs/index.php new file mode 100644 index 000000000..409280877 --- /dev/null +++ b/modules/qlocrontaskmanager/views/templates/admin/cron_task_logs/index.php @@ -0,0 +1,32 @@ +{l s='Success' mod='qlocrontaskmanager'} +{elseif $status == QctmCronTaskLog::QCTM_CRON_TASK_LOG_STATUS_ERROR} + {l s='Error' mod='qlocrontaskmanager'} +{else} + {l s='N/A' mod='qlocrontaskmanager'} +{/if} + diff --git a/modules/qlocrontaskmanager/views/templates/admin/cron_task_manager/index.php b/modules/qlocrontaskmanager/views/templates/admin/cron_task_manager/index.php new file mode 100644 index 000000000..409280877 --- /dev/null +++ b/modules/qlocrontaskmanager/views/templates/admin/cron_task_manager/index.php @@ -0,0 +1,32 @@ +{l s='Success' mod='qlocrontaskmanager'} +{elseif $status == QctmCronTaskLog::QCTM_CRON_TASK_LOG_STATUS_ERROR} + {l s='Error' mod='qlocrontaskmanager'} +{else} + {l s='N/A' mod='qlocrontaskmanager'} +{/if} + diff --git a/modules/qlocrontaskmanager/views/templates/admin/cron_task_manager/qctm_cron_expression_helper.tpl b/modules/qlocrontaskmanager/views/templates/admin/cron_task_manager/qctm_cron_expression_helper.tpl new file mode 100644 index 000000000..71fa155cf --- /dev/null +++ b/modules/qlocrontaskmanager/views/templates/admin/cron_task_manager/qctm_cron_expression_helper.tpl @@ -0,0 +1,48 @@ +{* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.md +* It is also available through the world-wide-web at this URL: +* https://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to support@qloapps.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade this module to a newer +* versions in the future. If you wish to customize this module for your needs +* please refer to https://store.webkul.com/customisation-guidelines for more information. +* +* @author Webkul IN +* @copyright Since 2010 Webkul +* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0 +*} + +
    +
    +

    The cron expression is made of five fields. Each field can have the following values.

    + + + + + + + + + + + + + + + + + + + +
    *****
    {l s='minute (0-59)' mod='qlocrontaskmanager'}{l s='hour (0 - 23)' mod='qlocrontaskmanager'}{l s='day of the month (1 - 31)' mod='qlocrontaskmanager'}{l s='month (1 - 12)' mod='qlocrontaskmanager'}{l s='day of the week (0 - 6)' mod='qlocrontaskmanager'}
    +
    +
    + \ No newline at end of file diff --git a/modules/qlocrontaskmanager/views/templates/admin/cron_task_manager/qctm_reset_module_crons_link.tpl b/modules/qlocrontaskmanager/views/templates/admin/cron_task_manager/qctm_reset_module_crons_link.tpl new file mode 100644 index 000000000..d73f43e90 --- /dev/null +++ b/modules/qlocrontaskmanager/views/templates/admin/cron_task_manager/qctm_reset_module_crons_link.tpl @@ -0,0 +1,26 @@ +{* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.md +* It is also available through the world-wide-web at this URL: +* https://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to support@qloapps.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade this module to a newer +* versions in the future. If you wish to customize this module for your needs +* please refer to https://store.webkul.com/customisation-guidelines for more information. +* +* @author Webkul IN +* @copyright Since 2010 Webkul +* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0 +*} + + + {l s='Reset Task' mod='qlocrontaskmanager'} + diff --git a/modules/qlocrontaskmanager/views/templates/admin/cron_task_manager/qctm_view_logs_link.tpl b/modules/qlocrontaskmanager/views/templates/admin/cron_task_manager/qctm_view_logs_link.tpl new file mode 100644 index 000000000..c81c1bc50 --- /dev/null +++ b/modules/qlocrontaskmanager/views/templates/admin/cron_task_manager/qctm_view_logs_link.tpl @@ -0,0 +1,27 @@ +{* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.md +* It is also available through the world-wide-web at this URL: +* https://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to support@qloapps.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade this module to a newer +* versions in the future. If you wish to customize this module for your needs +* please refer to https://store.webkul.com/customisation-guidelines for more information. +* +* @author Webkul IN +* @copyright Since 2010 Webkul +* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0 +*} + + + + {l s='View Logs' mod='qlocrontaskmanager'} + + diff --git a/modules/qlocrontaskmanager/views/templates/admin/dashboard/index.php b/modules/qlocrontaskmanager/views/templates/admin/dashboard/index.php new file mode 100644 index 000000000..409280877 --- /dev/null +++ b/modules/qlocrontaskmanager/views/templates/admin/dashboard/index.php @@ -0,0 +1,32 @@ + +
    +

    {l s='Cron Task Manager' mod='qlocrontaskmanager'}

    +
    +
    {l s='Server cron job not detected' mod='qlocrontaskmanager'}
    +
    {l s='Scheduled tasks will not run automatically until the cron command is added to your server. Click here to view it.' mod='qlocrontaskmanager'}
    +
    +
    +
    diff --git a/modules/qlocrontaskmanager/views/templates/admin/index.php b/modules/qlocrontaskmanager/views/templates/admin/index.php new file mode 100644 index 000000000..409280877 --- /dev/null +++ b/modules/qlocrontaskmanager/views/templates/admin/index.php @@ -0,0 +1,32 @@ + $file) { $ext = pathinfo($file['rename'], PATHINFO_EXTENSION); + if (!in_array($ext, $allowedExtensions, true)) { + continue; + } $dir = _PS_MODULE_DIR_.'qlohotelreview/views/img/review/'.Image::getImgFolderStatic($this->id); QhrHotelReviewHelper::createDirectory($dir); $useSameExt = false; diff --git a/modules/qlohotelreview/controllers/front/default.php b/modules/qlohotelreview/controllers/front/default.php index 0156e3112..0d2ca4f45 100644 --- a/modules/qlohotelreview/controllers/front/default.php +++ b/modules/qlohotelreview/controllers/front/default.php @@ -85,6 +85,17 @@ class QloHotelReviewDefaultModuleFrontController extends ModuleFrontController } } + if (is_array($_FILES) && array_key_exists('images', $_FILES) ) { + $allowedExtensions = array('jpg', 'png', 'jpeg',); + foreach ($_FILES['images']['name'] as $key => $imageName) { + $extension = Tools::strtolower(pathinfo($imageName, PATHINFO_EXTENSION)); + if (!in_array($extension, $allowedExtensions)) { + $errors['general'][] = $objModule->l('Only images with the following extensions are allowed: jpg, jpeg, png','default'); + } + } + } + + if (!count($errors['by_key']) && !count($errors['general'])) { $customerReview = QhrHotelReview::getByCustomer( $objOrder->id_customer, diff --git a/modules/qlohotelreview/mails/en/review_approve.html b/modules/qlohotelreview/mails/en/review_approve.html index eff0f4fa4..582dc6d3f 100644 --- a/modules/qlohotelreview/mails/en/review_approve.html +++ b/modules/qlohotelreview/mails/en/review_approve.html @@ -194,7 +194,7 @@ - + Dear {firstname} {lastname}, @@ -202,7 +202,7 @@ Your review has been approved - + @@ -214,7 +214,7 @@   - +

    Review approved

    @@ -237,7 +237,7 @@ You can view your review from here. -     +   @@ -249,20 +249,20 @@ - + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - + - + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. - + diff --git a/modules/qlohotelreview/mails/en/review_reply_with_link.html b/modules/qlohotelreview/mails/en/review_reply_with_link.html index 56de1edbc..634157f71 100644 --- a/modules/qlohotelreview/mails/en/review_reply_with_link.html +++ b/modules/qlohotelreview/mails/en/review_reply_with_link.html @@ -194,7 +194,7 @@ - + Dear {firstname} {lastname}, @@ -202,7 +202,7 @@ Hotel management has replied to your review - + @@ -214,7 +214,7 @@   - +

    Management reply

    @@ -244,7 +244,7 @@ You can view your review from here. -     +   @@ -256,20 +256,20 @@ - + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - + - + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. - + diff --git a/modules/qlohotelreview/mails/en/review_reply_without_link.html b/modules/qlohotelreview/mails/en/review_reply_without_link.html index 5c3b9a84a..7011057a9 100644 --- a/modules/qlohotelreview/mails/en/review_reply_without_link.html +++ b/modules/qlohotelreview/mails/en/review_reply_without_link.html @@ -194,7 +194,7 @@ - + Dear {firstname} {lastname}, @@ -202,7 +202,7 @@ Hotel management has replied to your review - + @@ -214,7 +214,7 @@   - +

    Management reply

    @@ -238,7 +238,7 @@ Management reply: {management_reply}     -     +   @@ -250,20 +250,20 @@ - + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - + - + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. - + diff --git a/modules/qlohotelreview/mails/en/review_request.html b/modules/qlohotelreview/mails/en/review_request.html index 60d1c5269..cfb573262 100644 --- a/modules/qlohotelreview/mails/en/review_request.html +++ b/modules/qlohotelreview/mails/en/review_request.html @@ -194,7 +194,7 @@ - + Dear {firstname} {lastname}, @@ -202,7 +202,7 @@ Thank you for choosing our hotel for your recent stay! - + @@ -214,7 +214,7 @@   - +

    Please review us!

    @@ -222,7 +222,7 @@ Could you please take a moment to review us? Please review your stay at {hotel_name} by clicking here. We would love to hear your feedback and use it to improve our services!     -     +   @@ -234,20 +234,20 @@ - + You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website. - + - + If you have a guest account, you can follow your order via the "Guest Tracking" section on our website. - + diff --git a/modules/qlohotelreview/qlohotelreview.php b/modules/qlohotelreview/qlohotelreview.php index 405f12ff4..086265f15 100644 --- a/modules/qlohotelreview/qlohotelreview.php +++ b/modules/qlohotelreview/qlohotelreview.php @@ -182,6 +182,7 @@ class QloHotelReview extends Module $this->l('You can upload a maximum of %d images.', false, true), (int) Configuration::get('QHR_MAX_IMAGES_PER_REVIEW') ), + 'allowed_extensions' => $this->l('Only images with the following extensions are allowed: jpg, jpeg, png', false, true), ), ))); diff --git a/modules/qlohotelreview/views/css/front/review.css b/modules/qlohotelreview/views/css/front/review.css index 0c7346dce..539d10199 100644 --- a/modules/qlohotelreview/views/css/front/review.css +++ b/modules/qlohotelreview/views/css/front/review.css @@ -52,6 +52,10 @@ margin-bottom: 14px; } +#add-review-popup .hint { + margin-top: 6px; +} + #add-review-popup .review-error { margin-top: 2px; color: #E85757; diff --git a/modules/qlohotelreview/views/js/hook/review.js b/modules/qlohotelreview/views/js/hook/review.js index 57227636a..2db6b37b9 100644 --- a/modules/qlohotelreview/views/js/hook/review.js +++ b/modules/qlohotelreview/views/js/hook/review.js @@ -132,6 +132,29 @@ var QhrReviewImages = { init: function() { QhrReviewImages.inputHtml = ''; }, + validateFiles: function () { + $('#review-general-errors').hide(); + let isValid = true; + $('.images-field input.input-images').each(function (iInput, input) { + let files = input.files; + let dataTransfer = new DataTransfer(); + $.each(files, function (iFile, file) { + if (file.type.startsWith('image/')) { + dataTransfer.items.add(file); + } else { + isValid = false; + } + }); + input.files = dataTransfer.files; + if (!input.files.length) { + $(input).remove(); + } + }); + if (!isValid) { + QhrReviewForm.showGeneralErrors(qlo_hotel_review_js_vars.texts.allowed_extensions); + } + return isValid; + }, getFilesCount: function() { var count = 0; $('.images-field input.input-images').each(function(i, input) { @@ -156,6 +179,9 @@ var QhrReviewImages = { } }); input.files = dataTransfer.files; + if (input.files.length === 0) { + $(input).remove(); + } }, resetPreviews: function() { $('.previews-wrap').html(''); @@ -241,8 +267,9 @@ $(document).on('change', 'input.input-images', function(e) { var filesCount = QhrReviewImages.getFilesCount(); if (filesCount > qlo_hotel_review_js_vars.num_images_max) { QhrReviewImages.removeLastInput(); - alert(qlo_hotel_review_js_vars.texts.num_files); + QhrReviewForm.showGeneralErrors(qlo_hotel_review_js_vars.texts.num_files); } else { + QhrReviewImages.validateFiles(); QhrReviewImages.updatePreviews(); if (filesCount == qlo_hotel_review_js_vars.num_images_max) { diff --git a/modules/qlohotelreview/views/templates/hook/add-review-popup.tpl b/modules/qlohotelreview/views/templates/hook/add-review-popup.tpl index a838127d8..1ba6f6936 100644 --- a/modules/qlohotelreview/views/templates/hook/add-review-popup.tpl +++ b/modules/qlohotelreview/views/templates/hook/add-review-popup.tpl @@ -40,6 +40,7 @@
    +

    {l s='Allowed formats are: .jpg, .jpeg, .png' mod='qlohotelreview'}

    diff --git a/pdf/booking-voucher.tpl b/pdf/booking-voucher.tpl new file mode 100644 index 000000000..15cfe229e --- /dev/null +++ b/pdf/booking-voucher.tpl @@ -0,0 +1,339 @@ +{** +* NOTICE OF LICENSE +* +* This source file is subject to the Open Software License version 3.0 +* that is bundled with this package in the file LICENSE.md +* It is also available through the world-wide-web at this URL: +* https://opensource.org/license/osl-3-0-php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to support@qloapps.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade this module to a newer +* versions in the future. If you wish to customize this module for your needs +* please refer to https://store.webkul.com/customisation-guidelines for more information. +* +* @author Webkul IN +* @copyright Since 2010 Webkul +* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0 +*} + +{assign var=pdf_style_template value=$smarty.const._PS_PDF_DIR_|cat:'invoice.style-tab.tpl'} +{include file=$pdf_style_template} + + + + + + + + + + + + + + {* *} + + + + + + + + + + + + {if $service_groups} + + + + + + + {/if} + +
    + + + + + + + + + + + + + + + + + + + + + + +
    {l s='BOOKING INFORMATION' pdf='true'}
    {l s='Booking Reference' pdf='true'}{$order->reference|escape:'html':'UTF-8'}{l s='Booking Date' pdf='true'}{$booking_date|escape:'html':'UTF-8'}{l s='Voucher Issue Date' pdf='true'}{$issue_date|escape:'html':'UTF-8'}
    {l s='Status' pdf='true'}{if $order_state && isset($order_state.name)}{$order_state.name|escape:'html':'UTF-8'}{/if}{l s='Total Rooms' pdf='true'}{$total_rooms|intval}{l s='Total Nights' pdf='true'}{$total_room_nights|intval}
    +
     
    + + + + + + + + + + + + + + + + + + + + + + +
    {l s='PROPERTY DETAILS' pdf='true'}
    {l s='Property' pdf='true'}{if $hotel}{$hotel->hotel_name|escape:'html':'UTF-8'}{/if}
    {l s='Email' pdf='true'}{if $hotel}{$hotel->email|escape:'html':'UTF-8'}{/if}
    {l s='Phone' pdf='true'}{if $hotel}{$hotel->phone|escape:'html':'UTF-8'}{/if}
    {l s='Address' pdf='true'}{if $hotel_address}{$hotel_address nofilter}{else}--{/if}
    +     		  + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {l s='GUEST INFORMATION' pdf='true'}
    {l s='Primary Guest' pdf='true'}{$guest->firstname|escape:'html':'UTF-8'} {$guest->lastname|escape:'html':'UTF-8'}
    {l s='Email' pdf='true'}{$guest->email|escape:'html':'UTF-8'}
    {l s='Phone' pdf='true'}{$guest->phone|escape:'html':'UTF-8'}
    {l s='Address' pdf='true'}{if $guest_address|strip_tags|trim}{$guest_address nofilter}{else}--{/if}
    {l s='Total Guests' pdf='true'}{$total_guests|intval}
    +
     
    + + + + + + + + + + + + + + + + + {if $room_type_rows} + {foreach from=$room_type_rows item=room_type_row} + {cycle values="color_line_even,color_line_odd" assign=bgcolor_class} + + + + + + + + + + {/foreach} + {else} + + + + {/if} + +
    {l s='ROOM DETAILS' pdf='true'}
    {l s='Room Description' pdf='true'}{l s='Tax Rate(s)' pdf='true'}{l s='Unit Price' pdf='true'}
    {l s='(Tax excl.)' pdf='true'}    		{l s='Rooms' pdf='true'}{l s='Check-in Date' pdf='true'}{l s='Check-out Date' pdf='true'}{l s='Total' pdf='true'}
    {l s='(Tax excl.)' pdf='true'}
    {$room_type_row.room_type_name|escape:'html':'UTF-8'}{$room_type_row.order_detail_tax_label}{displayPrice currency=$order->id_currency price=$room_type_row.unit_price_tax_excl} + {if $room_type_row.adults <= 9}0{/if}{$room_type_row.adults|intval} {if $room_type_row.adults > 1}{l s='Adults' pdf='true'}{else}{l s='Adult' pdf='true'}{/if}{if $room_type_row.children}, {if $room_type_row.children <= 9}0{/if}{$room_type_row.children|intval} {if $room_type_row.children > 1}{l s='Children' pdf='true'}{else}{l s='Child' pdf='true'}{/if}{/if}
    {if $room_type_row.rooms <= 9}0{/if}{$room_type_row.rooms|intval} {if $room_type_row.rooms > 1}{l s='Rooms' pdf='true'}{else}{l s='Room' pdf='true'}{/if} +     		{$room_type_row.check_in_date|escape:'html':'UTF-8'}{$room_type_row.check_out_date|escape:'html':'UTF-8'}{displayPrice currency=$order->id_currency price=$room_type_row.total_price_tax_excl}
    {l s='No room details available.' pdf='true'}
    +
     
    + + + + + + + + + + + {foreach from=$service_groups item=group} + {foreach from=$group.services item=service name=service_loop} + + {if $smarty.foreach.service_loop.first} + + {/if} + + + + {/foreach} + {/foreach} + +
    {l s='SERVICES DETAILS' pdf='true'}
    {l s='Room Type' pdf='true'}{l s='Service Name' pdf='true'}{l s='Qty' pdf='true'}
    {$group.room_type_name|escape:'html':'UTF-8'}
    + {$group.check_in_date|escape:'html':'UTF-8'} - {$group.check_out_date|escape:'html':'UTF-8'}
    + {l s='Room' pdf='true'} - {$group.room_count|intval} +     		{$service.name|escape:'html':'UTF-8'}{$service.quantity|intval}
    +
    + +
     
    + + + + + + +
    + + + + + + + + + + + + + + +
    {l s='PAYMENT INFORMATION' pdf='true'}
    {l s='Payment Method' pdf='true'}{$payment_method nofilter}
    {l s='Payment Status' pdf='true'}{if $order_state && isset($order_state.name)}{$order_state.name|escape:'html':'UTF-8'}{/if}
    +     		+ + + + + + {if isset($footer.room_price_tax_excl) && $footer.room_price_tax_excl} + + + + + {/if} + {if isset($footer.service_products_price_tax_excl) && $footer.service_products_price_tax_excl} + + + + + {/if} + {if isset($footer.additional_service_price_tax_excl) && $footer.additional_service_price_tax_excl} + + + + + {/if} + {if isset($footer.total_convenience_fee_te) && $footer.total_convenience_fee_te} + + + + + {/if} + + + + + {if $footer.total_tax_without_discount > 0} + + + + + {/if} + {if isset($footer.product_discounts_tax_incl) && $footer.product_discounts_tax_incl > 0} + + + + + {/if} + + + + + {if $footer.amount_due > 0} + + + + + {/if} + +
    {l s='TOTAL AMOUNT' pdf='true'}
    {l s='Total Rooms Cost (tax excl.)' pdf='true'}{displayPrice currency=$order->id_currency price=$footer.room_price_tax_excl}
    {l s='Total Products cost (tax excl.)' pdf='true'}{displayPrice currency=$order->id_currency price=$footer.service_products_price_tax_excl}
    {l s='Extra Services Cost (tax excl.)' pdf='true'}{displayPrice currency=$order->id_currency price=$footer.additional_service_price_tax_excl}
    {l s='Convenience Fee (tax excl.)' pdf='true'}{displayPrice currency=$order->id_currency price=$footer.total_convenience_fee_te}
    {l s='Total (Tax excl.)' pdf='true'}{displayPrice currency=$order->id_currency price=$footer.total_without_discount_te}
    {l s='Total Tax' pdf='true'}{displayPrice currency=$order->id_currency price=$footer.total_tax_without_discount}
    {l s='Total Discounts' pdf='true'}- {displayPrice currency=$order->id_currency price=$footer.product_discounts_tax_incl}
    {l s='Final Booking Amount' pdf='true'}{displayPrice currency=$order->id_currency price=$footer.total_paid_tax_incl}
    {l s='Due Amount' pdf='true'}{displayPrice currency=$order->id_currency price=$footer.amount_due}
    +
    + +{if $cancellation_policy} +
     
    + + + + + + + + + +
    {l s='CANCELLATION POLICY' pdf='true'}
    {$cancellation_policy nofilter}
    +{/if} + +
     
    + + + + + + + + + + + + + +
    {l s='PROPERTY POLICIES' pdf='true'}
    + {l s='Check-in Time:' pdf='true'} + {if $hotel && $hotel->check_in && $hotel->check_in != '00:00:00'}{$hotel->check_in|escape:'html':'UTF-8'}{else}__________{/if} +            + {l s='Check-out Time:' pdf='true'} + {if $hotel && $hotel->check_out && $hotel->check_out != '00:00:00'}{$hotel->check_out|escape:'html':'UTF-8'}{else}__________{/if} +
    + {l s='Hotel Policies:' pdf='true'}
    +
    + {if isset($payment_policy) && $payment_policy|strip_tags|trim} + {$payment_policy nofilter} + {else} + ______________________________
    + ______________________________
    + ______________________________ + {/if} +
    + +{if isset($HOOK_DISPLAY_PDF) && $HOOK_DISPLAY_PDF|strip_tags|trim} +
     
    + + + + +
    {$HOOK_DISPLAY_PDF}
    +{/if} diff --git a/pdf/invoice.extra-demands-tab.tpl b/pdf/invoice.extra-demands-tab.tpl index e7edf7fa4..cba5a8aed 100644 --- a/pdf/invoice.extra-demands-tab.tpl +++ b/pdf/invoice.extra-demands-tab.tpl @@ -114,8 +114,8 @@ {/foreach} {/if} + {assign var=roomCount value=$roomCount+1} {/foreach} - {assign var=roomCount value=$roomCount+1} diff --git a/themes/debug.tpl b/themes/debug.tpl index 87fef347d..ebe7b79f4 100644 --- a/themes/debug.tpl +++ b/themes/debug.tpl @@ -103,6 +103,10 @@ font-style: italic; } + .template-name { + color: brown; + } + #table_assigned_vars th { color: blue; } @@ -123,7 +127,7 @@

    included templates & config files (load time in seconds)

    {foreach $template_data as $template} - {$template.name} + {$template.name} (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"} ) diff --git a/themes/hotel-reservation-theme/css/global.css b/themes/hotel-reservation-theme/css/global.css index 1f84e79ca..b11262b08 100644 --- a/themes/hotel-reservation-theme/css/global.css +++ b/themes/hotel-reservation-theme/css/global.css @@ -3936,15 +3936,15 @@ td.visible-print { td.hidden-print { display: none !important; } } /*! - * Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome + * Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) */ /* FONT PATH * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url("../fonts/fontawesome-webfont.eot?v=4.3.0"); - src: url("../fonts/fontawesome-webfont.eot?#iefix&v=4.3.0") format("embedded-opentype"), url("../fonts/fontawesome-webfont.woff2?v=4.3.0") format("woff2"), url("../fonts/fontawesome-webfont.woff?v=4.3.0") format("woff"), url("../fonts/fontawesome-webfont.ttf?v=4.3.0") format("truetype"), url("../fonts/fontawesome-webfont.svg?v=4.3.0#fontawesomeregular") format("svg"); + src: url("../fonts/fontawesome-webfont.eot?v=4.7.0"); + src: url("../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0") format("embedded-opentype"), url("../fonts/fontawesome-webfont.woff2?v=4.7.0") format("woff2"), url("../fonts/fontawesome-webfont.woff?v=4.7.0") format("woff"), url("../fonts/fontawesome-webfont.ttf?v=4.7.0") format("truetype"), url("../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular") format("svg"); font-weight: normal; font-style: normal; } .icon, [class^="icon-"] { @@ -5747,6 +5747,202 @@ td.visible-print { .icon-medium:before { content: ""; } +/* FA 4.7.0 additions*/ +.icon-500px:before { content: "\f26e"; } +.icon-address-book:before { content: "\f2b9"; } +.icon-address-book-o:before { content: "\f2ba"; } +.icon-address-card:before { content: "\f2bb"; } +.icon-address-card-o:before { content: "\f2bc"; } +.icon-amazon:before { content: "\f270"; } +.icon-american-sign-language-interpreting:before { content: "\f2a3"; } +.icon-asl-interpreting:before { content: "\f2a3"; } +.icon-assistive-listening-systems:before { content: "\f2a2"; } +.icon-audio-description:before { content: "\f29e"; } +.icon-balance-scale:before { content: "\f24e"; } +.icon-bandcamp:before { content: "\f2d5"; } +.icon-bath:before { content: "\f2cd"; } +.icon-bathtub:before { content: "\f2cd"; } +.icon-battery:before { content: "\f240"; } +.icon-battery-0:before { content: "\f244"; } +.icon-battery-1:before { content: "\f243"; } +.icon-battery-2:before { content: "\f242"; } +.icon-battery-3:before { content: "\f241"; } +.icon-battery-4:before { content: "\f240"; } +.icon-battery-empty:before { content: "\f244"; } +.icon-battery-full:before { content: "\f240"; } +.icon-battery-half:before { content: "\f242"; } +.icon-battery-quarter:before { content: "\f243"; } +.icon-battery-three-quarters:before { content: "\f241"; } +.icon-black-tie:before { content: "\f27e"; } +.icon-blind:before { content: "\f29d"; } +.icon-bluetooth:before { content: "\f293"; } +.icon-bluetooth-b:before { content: "\f294"; } +.icon-braille:before { content: "\f2a1"; } +.icon-calendar-check-o:before { content: "\f274"; } +.icon-calendar-minus-o:before { content: "\f272"; } +.icon-calendar-plus-o:before { content: "\f271"; } +.icon-calendar-times-o:before { content: "\f273"; } +.icon-cc-diners-club:before { content: "\f24c"; } +.icon-cc-jcb:before { content: "\f24b"; } +.icon-chrome:before { content: "\f268"; } +.icon-clone:before { content: "\f24d"; } +.icon-codiepie:before { content: "\f284"; } +.icon-commenting:before { content: "\f27a"; } +.icon-commenting-o:before { content: "\f27b"; } +.icon-contao:before { content: "\f26d"; } +.icon-creative-commons:before { content: "\f25e"; } +.icon-credit-card-alt:before { content: "\f283"; } +.icon-deaf:before { content: "\f2a4"; } +.icon-deafness:before { content: "\f2a4"; } +.icon-drivers-license:before { content: "\f2c2"; } +.icon-drivers-license-o:before { content: "\f2c3"; } +.icon-edge:before { content: "\f282"; } +.icon-eercast:before { content: "\f2da"; } +.icon-envelope-open:before { content: "\f2b6"; } +.icon-envelope-open-o:before { content: "\f2b7"; } +.icon-envira:before { content: "\f299"; } +.icon-etsy:before { content: "\f2d7"; } +.icon-expeditedssl:before { content: "\f23e"; } +.icon-fa:before { content: "\f2b4"; } +.icon-feed:before { content: "\f09e"; } +.icon-firefox:before { content: "\f269"; } +.icon-first-order:before { content: "\f2b0"; } +.icon-font-awesome:before { content: "\f2b4"; } +.icon-fonticons:before { content: "\f280"; } +.icon-fort-awesome:before { content: "\f286"; } +.icon-free-code-camp:before { content: "\f2c5"; } +.icon-get-pocket:before { content: "\f265"; } +.icon-gg:before { content: "\f260"; } +.icon-gg-circle:before { content: "\f261"; } +.icon-gitlab:before { content: "\f296"; } +.icon-glide:before { content: "\f2a5"; } +.icon-glide-g:before { content: "\f2a6"; } +.icon-google-plus-circle:before { content: "\f2b3"; } +.icon-google-plus-official:before { content: "\f2b3"; } +.icon-grav:before { content: "\f2d6"; } +.icon-hand-grab-o:before { content: "\f255"; } +.icon-hand-lizard-o:before { content: "\f258"; } +.icon-hand-paper-o:before { content: "\f256"; } +.icon-hand-peace-o:before { content: "\f25b"; } +.icon-hand-pointer-o:before { content: "\f25a"; } +.icon-hand-rock-o:before { content: "\f255"; } +.icon-hand-scissors-o:before { content: "\f257"; } +.icon-hand-spock-o:before { content: "\f259"; } +.icon-hand-stop-o:before { content: "\f256"; } +.icon-handshake-o:before { content: "\f2b5"; } +.icon-hard-of-hearing:before { content: "\f2a4"; } +.icon-hashtag:before { content: "\f292"; } +.icon-hourglass:before { content: "\f254"; } +.icon-hourglass-1:before { content: "\f251"; } +.icon-hourglass-2:before { content: "\f252"; } +.icon-hourglass-3:before { content: "\f253"; } +.icon-hourglass-end:before { content: "\f253"; } +.icon-hourglass-half:before { content: "\f252"; } +.icon-hourglass-o:before { content: "\f250"; } +.icon-hourglass-start:before { content: "\f251"; } +.icon-houzz:before { content: "\f27c"; } +.icon-i-cursor:before { content: "\f246"; } +.icon-id-badge:before { content: "\f2c1"; } +.icon-id-card:before { content: "\f2c2"; } +.icon-id-card-o:before { content: "\f2c3"; } +.icon-imdb:before { content: "\f2d8"; } +.icon-industry:before { content: "\f275"; } +.icon-internet-explorer:before { content: "\f26b"; } +.icon-intersex:before { content: "\f224"; } +.icon-linode:before { content: "\f2b8"; } +.icon-low-vision:before { content: "\f2a8"; } +.icon-map:before { content: "\f279"; } +.icon-map-o:before { content: "\f278"; } +.icon-map-pin:before { content: "\f276"; } +.icon-map-signs:before { content: "\f277"; } +.icon-meetup:before { content: "\f2e0"; } +.icon-microchip:before { content: "\f2db"; } +.icon-mixcloud:before { content: "\f289"; } +.icon-modx:before { content: "\f285"; } +.icon-mouse-pointer:before { content: "\f245"; } +.icon-object-group:before { content: "\f247"; } +.icon-object-ungroup:before { content: "\f248"; } +.icon-odnoklassniki:before { content: "\f263"; } +.icon-odnoklassniki-square:before { content: "\f264"; } +.icon-opencart:before { content: "\f23d"; } +.icon-opera:before { content: "\f26a"; } +.icon-optin-monster:before { content: "\f23c"; } +.icon-pause-circle:before { content: "\f28b"; } +.icon-pause-circle-o:before { content: "\f28c"; } +.icon-percent:before { content: "\f295"; } +.icon-pied-piper-pp:before { content: "\f1a7"; } +.icon-podcast:before { content: "\f2ce"; } +.icon-product-hunt:before { content: "\f288"; } +.icon-question-circle-o:before { content: "\f29c"; } +.icon-quora:before { content: "\f2c4"; } +.icon-ravelry:before { content: "\f2d9"; } +.icon-reddit-alien:before { content: "\f281"; } +.icon-registered:before { content: "\f25d"; } +.icon-resistance:before { content: "\f1d0"; } +.icon-s15:before { content: "\f2cd"; } +.icon-safari:before { content: "\f267"; } +.icon-scribd:before { content: "\f28a"; } +.icon-shopping-bag:before { content: "\f290"; } +.icon-shopping-basket:before { content: "\f291"; } +.icon-shower:before { content: "\f2cc"; } +.icon-sign-language:before { content: "\f2a7"; } +.icon-signing:before { content: "\f2a7"; } +.icon-snapchat:before { content: "\f2ab"; } +.icon-snapchat-ghost:before { content: "\f2ac"; } +.icon-snapchat-square:before { content: "\f2ad"; } +.icon-snowflake-o:before { content: "\f2dc"; } +.icon-sticky-note:before { content: "\f249"; } +.icon-sticky-note-o:before { content: "\f24a"; } +.icon-stop-circle:before { content: "\f28d"; } +.icon-stop-circle-o:before { content: "\f28e"; } +.icon-superpowers:before { content: "\f2dd"; } +.icon-telegram:before { content: "\f2c6"; } +.icon-television:before { content: "\f26c"; } +.icon-themeisle:before { content: "\f2b2"; } +.icon-thermometer:before { content: "\f2c7"; } +.icon-thermometer-0:before { content: "\f2cb"; } +.icon-thermometer-1:before { content: "\f2ca"; } +.icon-thermometer-2:before { content: "\f2c9"; } +.icon-thermometer-3:before { content: "\f2c8"; } +.icon-thermometer-4:before { content: "\f2c7"; } +.icon-thermometer-empty:before { content: "\f2cb"; } +.icon-thermometer-full:before { content: "\f2c7"; } +.icon-thermometer-half:before { content: "\f2c9"; } +.icon-thermometer-quarter:before { content: "\f2ca"; } +.icon-thermometer-three-quarters:before { content: "\f2c8"; } +.icon-times-rectangle:before { content: "\f2d3"; } +.icon-times-rectangle-o:before { content: "\f2d4"; } +.icon-trademark:before { content: "\f25c"; } +.icon-tripadvisor:before { content: "\f262"; } +.icon-tv:before { content: "\f26c"; } +.icon-universal-access:before { content: "\f29a"; } +.icon-usb:before { content: "\f287"; } +.icon-user-circle:before { content: "\f2bd"; } +.icon-user-circle-o:before { content: "\f2be"; } +.icon-user-o:before { content: "\f2c0"; } +.icon-vcard:before { content: "\f2bb"; } +.icon-vcard-o:before { content: "\f2bc"; } +.icon-viadeo:before { content: "\f2a9"; } +.icon-viadeo-square:before { content: "\f2aa"; } +.icon-vimeo:before { content: "\f27d"; } +.icon-volume-control-phone:before { content: "\f2a0"; } +.icon-wheelchair-alt:before { content: "\f29b"; } +.icon-wikipedia-w:before { content: "\f266"; } +.icon-window-close:before { content: "\f2d3"; } +.icon-window-close-o:before { content: "\f2d4"; } +.icon-window-maximize:before { content: "\f2d0"; } +.icon-window-minimize:before { content: "\f2d1"; } +.icon-window-restore:before { content: "\f2d2"; } +.icon-wpbeginner:before { content: "\f297"; } +.icon-wpexplorer:before { content: "\f2de"; } +.icon-wpforms:before { content: "\f298"; } +.icon-y-combinator:before { content: "\f23b"; } +.icon-y-combinator-square:before { content: "\f1d4"; } +.icon-yc:before { content: "\f23b"; } +.icon-yc-square:before { content: "\f1d4"; } +.icon-yoast:before { content: "\f2b1"; } +.icon-ok:before { content: "\f00c"; } + a:hover { text-decoration: none; } @@ -7497,6 +7693,14 @@ div.star a:hover { .footer-container #footer #social_block ul li.facebook a:before { content: "\f09a"; } .footer-container #footer #social_block ul li.twitter a:before { + content: ""; + width: 1em; + height: 1em; + vertical-align: -13px; + background-color: currentColor; + -webkit-mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'%3E%3Cpath d='M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z'/%3E%3C/svg%3E") center / contain no-repeat; + mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'%3E%3Cpath d='M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z'/%3E%3C/svg%3E") center / contain no-repeat; } + .footer-container #footer #social_block ul li.twitter-classic a:before { content: "\f099"; } .footer-container #footer #social_block ul li.rss a:before { content: "\f09e"; } @@ -9192,3 +9396,4 @@ div a.our_properties_link{ color: #fff; font-size: 17px; font-weight: 400;} + diff --git a/themes/hotel-reservation-theme/fonts/FontAwesome.otf b/themes/hotel-reservation-theme/fonts/FontAwesome.otf index f7936cc1e..401ec0f36 100644 Binary files a/themes/hotel-reservation-theme/fonts/FontAwesome.otf and b/themes/hotel-reservation-theme/fonts/FontAwesome.otf differ diff --git a/themes/hotel-reservation-theme/fonts/fontawesome-webfont.eot b/themes/hotel-reservation-theme/fonts/fontawesome-webfont.eot index 33b2bb800..e9f60ca95 100644 Binary files a/themes/hotel-reservation-theme/fonts/fontawesome-webfont.eot and b/themes/hotel-reservation-theme/fonts/fontawesome-webfont.eot differ diff --git a/themes/hotel-reservation-theme/fonts/fontawesome-webfont.svg b/themes/hotel-reservation-theme/fonts/fontawesome-webfont.svg index 1ee89d436..855c845e5 100644 --- a/themes/hotel-reservation-theme/fonts/fontawesome-webfont.svg +++ b/themes/hotel-reservation-theme/fonts/fontawesome-webfont.svg @@ -1,565 +1,2671 @@ - - + + +Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016 + By ,,, +Copyright Dave Gandy 2016. All rights reserved. + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/themes/hotel-reservation-theme/fonts/fontawesome-webfont.ttf b/themes/hotel-reservation-theme/fonts/fontawesome-webfont.ttf index ed9372f8e..35acda2fa 100644 Binary files a/themes/hotel-reservation-theme/fonts/fontawesome-webfont.ttf and b/themes/hotel-reservation-theme/fonts/fontawesome-webfont.ttf differ diff --git a/themes/hotel-reservation-theme/fonts/fontawesome-webfont.woff b/themes/hotel-reservation-theme/fonts/fontawesome-webfont.woff index 8b280b98f..400014a4b 100644 Binary files a/themes/hotel-reservation-theme/fonts/fontawesome-webfont.woff and b/themes/hotel-reservation-theme/fonts/fontawesome-webfont.woff differ diff --git a/themes/hotel-reservation-theme/fonts/fontawesome-webfont.woff2 b/themes/hotel-reservation-theme/fonts/fontawesome-webfont.woff2 index 3311d5851..4d13fc604 100644 Binary files a/themes/hotel-reservation-theme/fonts/fontawesome-webfont.woff2 and b/themes/hotel-reservation-theme/fonts/fontawesome-webfont.woff2 differ diff --git a/themes/hotel-reservation-theme/modules/blocksocial/blocksocial.tpl b/themes/hotel-reservation-theme/modules/blocksocial/blocksocial.tpl index b355dc40f..1863e85e8 100644 --- a/themes/hotel-reservation-theme/modules/blocksocial/blocksocial.tpl +++ b/themes/hotel-reservation-theme/modules/blocksocial/blocksocial.tpl @@ -60,13 +60,6 @@ {/if} - {if isset($google_plus_url) && $google_plus_url != ''} -
  • - - {l s='Google Plus' mod='blocksocial'} - -
    • - {/if} {if isset($pinterest_url) && $pinterest_url != ''}
  • diff --git a/themes/hotel-reservation-theme/order-detail.tpl b/themes/hotel-reservation-theme/order-detail.tpl index 9402a240d..efa462dc0 100644 --- a/themes/hotel-reservation-theme/order-detail.tpl +++ b/themes/hotel-reservation-theme/order-detail.tpl @@ -148,6 +148,16 @@
    • +
    +
    {l s='Booking Voucher'}
    +
    + + + {l s='Booking Voucher'} + +
    +
    +
    {l s='Status'}
    @@ -647,6 +657,16 @@
    +
    +
    {l s='Booking Voucher'}
    +
    + + + {l s='Booking Voucher'} + +
    +
    +
    {l s='Status'}