Merge branch 'develop' into gli-2934

This commit is contained in:
shazar rahman
2026-08-24 15:45:20 +05:30
462 changed files with 20588 additions and 15577 deletions

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 306 KiB

After

Width:  |  Height:  |  Size: 434 KiB

View File

@@ -0,0 +1,4 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="8" cy="8" r="8" fill="#7EC77B"/>
<path d="M8.06536 3C8.30937 3 8.51561 3.07032 8.6841 3.21097C8.85839 3.34693 8.94553 3.51336 8.94553 3.71027C8.94553 3.90717 8.85839 4.07595 8.6841 4.2166C8.51561 4.35724 8.30937 4.42757 8.06536 4.42757C7.82135 4.42757 7.6122 4.35724 7.43791 4.2166C7.26362 4.07595 7.17647 3.90717 7.17647 3.71027C7.17647 3.51336 7.26071 3.34693 7.42919 3.21097C7.60349 3.07032 7.81554 3 8.06536 3ZM8.78867 6.3685V11.5443C8.78867 11.9475 8.82353 12.2171 8.89325 12.353C8.96877 12.4843 9.07625 12.5827 9.21569 12.6484C9.36093 12.714 9.62237 12.7468 10 12.7468V13H6.122V12.7468C6.51126 12.7468 6.77269 12.7164 6.90632 12.6554C7.03994 12.5945 7.14452 12.4937 7.22004 12.353C7.30138 12.2124 7.34205 11.9428 7.34205 11.5443V9.06188C7.34205 8.36334 7.3159 7.91092 7.26362 7.70464C7.22295 7.55462 7.15904 7.45148 7.0719 7.39522C6.98475 7.33427 6.86565 7.3038 6.7146 7.3038C6.55192 7.3038 6.35439 7.33896 6.122 7.40928L6 7.15612L8.40523 6.3685H8.78867Z" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -478,4 +478,42 @@ $(document).ready(function() {
$('.no-htl-access-option').on('click', function() {
$(this).prop('selected', false);
});
initTooltip();
}); //end dom ready
function initTooltip($target, contentFn, items) {
var $elements = $target || $('.tooltip-trigger');
if (!$elements.length) {
return;
}
$elements.each(function () {
var $this = $(this);
if (!contentFn && $this.data('ui-tooltip')) {
return;
}
$this.tooltip({
content: contentFn || $this.next('.tooltip-content').html(),
items: items || 'span',
trigger: 'hover',
tooltipClass: 'tooltip-popup',
open: function (event, ui) {
if (event.buttons == 1 || event.buttons == 3) {
ui.tooltip.remove();
}
if (typeof event.originalEvent === 'undefined') {
return false;
}
var $id = $(ui.tooltip).attr('id');
if ($('div.ui-tooltip').not('#' + $id).length) {
return false;
}
},
close: function (event, ui) {
ui.tooltip.hover(
function () { $(this).stop(true).fadeTo(300, 1); },
function () { $(this).fadeOut(300, function () { $(this).remove(); }); }
);
}
});
});
}

View File

@@ -3,6 +3,10 @@ Modernizr.load([
test: window.matchMedia,
nope: ["themes/default/js/vendor/matchMedia.js", "themes/default/js/vendor/matchMedia.addListener.js"]
},
"themes/default/js/vendor/enquire.min.js",
"themes/default/js/admin-theme.js",
{
load: ["themes/default/js/vendor/enquire.min.js", "themes/default/js/admin-theme.js"],
complete: function() {
$(document).trigger('admin-theme.js.ready');
}
}
]);

View File

@@ -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"

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -1,5 +1,4 @@
.tooltip_cont
min-width: 280px
width: 100%
font-size: 14px
font-weight: 600
@@ -7,6 +6,7 @@
margin-bottom: 10px
.tip-body > div
margin-bottom: 6px
margin-right: 10px
.tip_element_head
font-size: 12px
@@ -28,3 +28,30 @@
border: none
padding: 10px
box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, 0.15)
width: auto
.tooltip-trigger
cursor: pointer
display: inline-block
vertical-align: middle
.ui-tooltip.tooltip-popup
ul
margin: 0
padding: 0 0 0 16px
list-style: disc
li
padding: 2px 0
.tooltip-popup-row
display: flex
justify-content: space-between
align-items: center
gap: 12px
margin: 3px 0
white-space: nowrap
label
font-weight: 600
margin: 0

View File

@@ -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; }

View File

@@ -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
}

View File

@@ -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; }

View File

@@ -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;
}
}

View File

@@ -0,0 +1,5 @@
// Screen Readers
// -------------------------
.sr-only { @include sr-only(); }
.sr-only-focusable { @include sr-only-focusable(); }

View File

@@ -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";

View File

@@ -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";

View File

@@ -0,0 +1,68 @@
{**
* 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
*}
<div class="panel">
<div class="panel-heading">
<i class="icon-list-ul"></i>
{l s='Guest Registration Card Information'}
</div>
<form id="grcCardInfoForm" method="post" action="{$guest_reg_card_form_action|escape:'html':'UTF-8'}" class="form-horizontal">
<input type="hidden" name="submitGrcCardInfo" value="1" />
<div class="form-group">
<label class="control-label col-lg-3">
<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{l s='Select sections and fields to display on the Guest Registration Card PDF.'}">{l s='Select fields'}</span>
</label>
<div class="col-xs-7">
{$guest_reg_card_info_tree}
</div>
<div class="col-xs-2">
<a href="#" class="btn btn-default" data-toggle="modal" data-target="#guestRegPreviewModal">
<i class="icon-eye"></i> {l s='Preview'}
</a>
</div>
</div>
<div class="panel-footer">
<button type="submit" class="btn btn-default pull-right">
<i class="process-icon-save"></i> {l s='Save'}
</button>
</div>
</form>
</div>
<div class="modal fade" id="guestRegPreviewModal" tabindex="-1" role="dialog" aria-labelledby="guestRegPreviewModalLabel">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="guestRegPreviewModalLabel">{$guest_reg_card_preview_title|escape:'html':'UTF-8'}</h4>
</div>
<div class="modal-body text-center">
<img src="{$guest_reg_card_preview_img_url|escape:'html':'UTF-8'}" alt="{$guest_reg_card_preview_title|escape:'html':'UTF-8'}" class="img-responsive" style="max-width:100%;" />
</div>
</div>
</div>
</div>

View File

@@ -0,0 +1,32 @@
<?php
/**
* 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
*/
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;

View File

@@ -150,9 +150,6 @@
<a class="link-social link-github _blank" href="https://github.com/webkul/hotelcommerce" title="Github">
<i class="icon-github"></i>
</a>
<a class="link-social link-google _blank" href="https://plus.google.com/110221570427070809661" title="Google">
<i class="icon-google-plus"></i>
</a>
</p>
</div>
</div>

View File

@@ -124,8 +124,15 @@
{/if}
<td id="cart_detail_data_unit_price_{$data.id|escape:'html':'UTF-8'}">
{assign var=shown_room_type_price value=$data.feature_price_tax_excl}
{if isset($can_edit_booking_carts)}
{assign var=can_edit_booking_cart_price value=$can_edit_booking_carts}
{elseif isset($can_edit)}
{assign var=can_edit_booking_cart_price value=$can_edit}
{else}
{assign var=can_edit_booking_cart_price value=0}
{/if}
<div class="input-group">
<input type="text" class="room_unit_price" value="{Tools::ps_round($shown_room_type_price, $smarty.const._PS_PRICE_DISPLAY_PRECISION_)|escape:'html':'UTF-8'}">
<input type="text" class="room_unit_price" value="{Tools::ps_round($shown_room_type_price, $smarty.const._PS_PRICE_DISPLAY_PRECISION_)|escape:'html':'UTF-8'}"{if !$can_edit_booking_cart_price} readonly="readonly"{/if}>
<span class="input-group-addon">{$currency->prefix}{$currency->suffix}</span>
</div>
</td>

View File

@@ -164,6 +164,11 @@
<span class="badge badge-info">{if $data.num_checkin_documents > 0}{$data.num_checkin_documents}{else}0{/if}</span>
</a>
</li>
<li>
<a title="{l s='Guest Registration Card'}" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&amp;submitAction=generateGuestRegistrationFormPDF&amp;id_hotel_booking_detail={$data['id']}" target="_blank">
<i class="icon-download"></i> {l s='GRC'}
</a>
</li>
<li>
<a href="#" class="room_reallocate_swap" id="reallocate_room_{$data['id']}" data-room_type_name="{$data['room_type_name']}" data-toggle="modal" data-target="#mySwappigModal" data-id_htl_booking="{$data['id']}" data-id_order="{$data['id_order']}" data-room_num='{$data.room_num}' data-id_room_type='{$data.id_product}' data-cust_name='{$data.alloted_cust_name}' data-cust_email='{$data.alloted_cust_email}' data-avail_rm_swap='{$data.avail_rooms_to_swap|@json_encode}' data-avail_realloc_room_types='{$data.avail_room_types_to_realloc|@json_encode}' data-allotment_type='{$data.booking_type}' data-allotment_type_label='{if $data.booking_type == $ALLOTMENT_MANUAL}{l s='Manual'}{else}{l s='Auto'}{/if}' data-comment='{$data.comment}'>
<i class="icon-refresh"></i>

View File

@@ -0,0 +1,47 @@
{**
* 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
*}
{capture name='stay_periods_tooltip'}
<div class="bootstrap tooltip_cont">
<div class="tip_header">
<div>{l s='Stay Periods'}</div>
</div>
<table class="table">
<thead>
<tr>
<th class="tip_element_head">{l s='Duration'}</th>
<th class="tip_element_head">{l s='Rooms'}</th>
</tr>
</thead>
<tbody>
{foreach from=$stay_periods item=stay_period}
<tr>
<td class="tip_element_value">{$stay_period.from} &ndash; {$stay_period.to}</td>
<td class="tip_element_value center">{$stay_period.count}</td>
</tr>
{/foreach}
</tbody>
</table>
</div>
{/capture}
{capture name='stay_periods_tooltip_title'}<span class="badge tooltip-trigger">+{$extra_stay_periods_count}</span>{/capture}
{include file='helpers/tooltip.tpl' tooltip_content=$smarty.capture.stay_periods_tooltip tooltip_title=$smarty.capture.stay_periods_tooltip_title}

View File

@@ -27,6 +27,8 @@
var id_cart = {$cart->id|intval};
{/if}
var id_customer = 0;
var can_edit_booking_carts = {if isset($can_edit_booking_carts) && $can_edit_booking_carts}true{else}false{/if};
var can_add_addresses = {if isset($can_add_addresses) && $can_add_addresses}true{else}false{/if};
var admin_order_tab_link = "{$link->getAdminLink('AdminOrders')|addslashes}";
var changed_shipping_price = false;
var shipping_price_selected_carrier = '';
@@ -620,6 +622,10 @@
$(booking_occupancy_wrapper).siblings('.booking_guest_occupancy').find('span').text(guestButtonVal);
}
{/literal}
if (!can_edit_booking_carts || !can_add_addresses) {
$('#address_part').hide();
}
});
function resetBind()
@@ -953,7 +959,9 @@
{if isset($cart->id) && $cart->id}
id_cart = "{$cart->id}";
{/if}
$('#new_address').attr('href', address_link.replace(/id_customer=[0-9]+/, 'id_customer='+id_customer));
if (address_link) {
$('#new_address').attr('href', address_link.replace(/id_customer=[0-9]+/, 'id_customer='+id_customer));
}
$.ajax({
type:"POST",
url : "{$link->getAdminLink('AdminCarts')|addslashes}",
@@ -1396,6 +1404,7 @@
{
$("#customer_cart_details").empty();
$("#customer_cart_details").append(res.cart_detail_html);
initTooltip();
displaySummary(res);
}
@@ -1505,13 +1514,20 @@
if (addresses.length == 0)
{
$('#address_delivery, #address_invoice').hide();
$("#new_address").show();
if (can_edit_booking_carts && can_add_addresses) {
$('#address_part').show();
$("#new_address").show();
} else {
$('#address_part').hide();
}
}
else
{
$('#addresses_err').hide();
$("#new_address").hide();
$('#address_delivery, #address_invoice').show();
$('#address_part').show();
$('#address_part .panel-heading').show();
}
$('#id_address_delivery').html(addresses_delivery_options).hide();
@@ -1894,13 +1910,15 @@
</span>
</div>
</div>
<div class="col-lg-6">
<span class="form-control-static">{l s='Or'}&nbsp;</span>
<a class="fancybox_customer btn btn-default" href="{$link->getAdminLink('AdminCustomers')|escape:'html':'UTF-8'}&amp;addcustomer&amp;liteDisplaying=1&amp;submitFormAjax=1#">
<i class="icon-plus-sign-alt"></i>
{l s='Add new customer'}
</a>
</div>
{if isset($can_edit_booking_carts) && $can_edit_booking_carts && isset($can_add_customers) && $can_add_customers}
<div class="col-lg-6">
<span class="form-control-static">{l s='Or'}&nbsp;</span>
<a class="fancybox_customer btn btn-default" href="{$link->getAdminLink('AdminCustomers')|escape:'html':'UTF-8'}&amp;addcustomer&amp;liteDisplaying=1&amp;submitFormAjax=1#">
<i class="icon-plus-sign-alt"></i>
{l s='Add new customer'}
</a>
</div>
{/if}
</div>
</div>
</div>
@@ -1918,7 +1936,7 @@
<a href="{$link->getAdminLink('AdminCustomers')}&id_customer={$customer->id}&viewcustomer&liteDisplaying=1" class="btn btn-default fancybox">
<i class="icon-search"></i> Details </a>
<button type="button" data-id_cart="6" data-customer="2" class="btn btn-default pull-right change-customer">
<i class="icon-refresh"></i>&nbsp;Change
<i class="icon-refresh"></i>&nbsp;Change
</button>
</div>
</div>
@@ -2127,13 +2145,15 @@
</div>
</div>
</div>
<div class="col-lg-6">
<span class="form-control-static">{l s='Or'}&nbsp;</span>
<a class="fancybox btn btn-default" href="{$link->getAdminLink('AdminCartRules')|escape:'html':'UTF-8'}&amp;addcart_rule&amp;liteDisplaying=1&amp;submitFormAjax=1#">
<i class="icon-plus-sign-alt"></i>
{l s='Add new voucher'}
</a>
</div>
{if isset($can_edit_booking_carts) && $can_edit_booking_carts && isset($can_add_vouchers) && $can_add_vouchers}
<div class="col-lg-6">
<span class="form-control-static">{l s='Or'}&nbsp;</span>
<a class="fancybox btn btn-default" href="{$link->getAdminLink('AdminCartRules')|escape:'html':'UTF-8'}&amp;addcart_rule&amp;liteDisplaying=1&amp;submitFormAjax=1#">
<i class="icon-plus-sign-alt"></i>
{l s='Add new voucher'}
</a>
</div>
{/if}
</div>
</div>
</div>
@@ -2155,7 +2175,7 @@
</div>
<div class="panel" id="address_part" style="">
<div class="panel-heading">
<div class="panel-heading" id="address_panel_heading">
<i class="icon-envelope"></i>
{l s='Addresses'}
</div>
@@ -2189,6 +2209,7 @@
</div>
</div>
</div>
{if isset($can_edit_booking_carts) && $can_edit_booking_carts && isset($can_add_addresses) && $can_add_addresses}
<div class="row">
<div class="col-lg-12">
<a class="fancybox btn btn-default" id="new_address" href="{$link->getAdminLink('AdminAddresses')|escape:'html':'UTF-8'}&amp;addaddress&amp;id_customer=42&amp;liteDisplaying=1&amp;submitFormAjax=1#">
@@ -2197,6 +2218,7 @@
</a>
</div>
</div>
{/if}
</div>
<div class="panel" id="carriers_part" style="display:none;">
<div class="panel-heading">

View File

@@ -599,9 +599,11 @@
</div>
{/if}
{else}
{if $addressAccess['add'] === 1}
<button id="add_guest_address" class="btn btn-primary pull-right fancybox" href="{$link->getAdminLink('AdminAddresses')}&amp;addaddress&amp;id_order={$order->id|intval}&amp;address_type=2&amp;id_customer={$order->id_customer}&amp;liteDisplaying=1&amp;submitFormAjax=1#">
<i class="icon-plus-circle"></i> {l s='Add Address'}
</button>
{/if}
{if $idCurrentAddress}
<div class="guest_address_actions dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
@@ -1036,7 +1038,7 @@
<div class="panel panel-vouchers">
<div class="panel-heading">
<span><i class="icon-tag"></i> &nbsp;{l s='Voucher'}</span>
{if $can_edit && $order->total_paid > 0}
{if $can_edit && $order->total_paid > 0 && $cartRuleAccess['add'] === 1}
<button id="add_voucher" class="btn btn-primary pull-right" type="button" >
<i class="icon-ticket"></i> {l s='Add new voucher'}
</button>

View File

@@ -90,7 +90,7 @@
<span class="input-group-addon">
{$cartCurrency->sign}
</span>
<input class="service_cart_price_input" id="service_cart_price_{$selectedRoomServiceProduct['id']}_{$product['id_product']}" type="text" value="{$product.price_tax_exc}" name="service_price[{$product['id_product']|escape:'html':'UTF-8'}]"/>
<input class="service_cart_price_input" id="service_cart_price_{$selectedRoomServiceProduct['id']}_{$product['id_product']}" type="text" value="{$product.price_tax_exc}" name="service_price[{$product['id_product']|escape:'html':'UTF-8'}]"{if isset($can_edit) && !$can_edit} readonly{/if}/>
{if Product::PRICE_CALCULATION_METHOD_PER_DAY == $product['price_calculation_method']}
<span class="input-group-addon">{l s='/ night'}</span>
{/if}

View File

@@ -0,0 +1,124 @@
{**
* 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
*}
{if isset($product->id)}
<div id="product-amenities" class="panel product-tab">
<input type="hidden" name="submitted_tabs[]" value="Amenities" />
<h3>{l s='Amenities'}</h3>
<div class="alert alert-info">
<p>{l s='If you want to add a new amenity, please use the following link.'}
<a href="{$link->getAdminLink('AdminHotelAmenities')|escape:'html':'UTF-8'}" class="btn btn-link button" target="_blank">
<i class="icon-plus-sign"></i> {l s='Manage amenities'} <i class="icon-external-link-sign"></i>
</a>
</p>
</div>
{if isset($room_type_amenities_tree) && $room_type_amenities_tree}
<div class="form-group">
<label for="room-type-amenities-tree" class="control-label col-sm-3">
<span class="label-tooltip" data-toggle="tooltip" data-original-title="{l s='Select the amenities available for this room type.'}">
{l s='Select amenities'}
</span>
</label>
<div class="col-sm-7 room_features_tree">
{$room_type_amenities_tree}
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-3">
<span class="label-tooltip" data-toggle="tooltip" data-original-title="{l s='Select which of the chosen amenities should be featured for this room type.'}">
{l s='Featured amenities'}
</span>
</label>
<div class="col-sm-7">
<select name="featured_amenities[]" id="rt_featured_amenities" class="form-control" multiple>
</select>
</div>
</div>
{else}
<div class="alert alert-warning">
<i class="icon-warning-sign"></i> {l s='No amenities have been defined yet.'}
</div>
{/if}
<div class="panel-footer">
<a href="{$link->getAdminLink('AdminProducts')|escape:'html':'UTF-8'}{if isset($smarty.request.page) && $smarty.request.page > 1}&amp;submitFilterproduct={$smarty.request.page|intval}{/if}" class="btn btn-default"><i class="process-icon-cancel"></i> {l s='Cancel'}</a>
<button type="submit" name="submitAddproduct" class="btn btn-default pull-right" disabled="disabled"><i class="process-icon-loading"></i> {l s='Save'}</button>
<button type="submit" name="submitAddproductAndStay" class="btn btn-default pull-right" disabled="disabled"><i class="process-icon-loading"></i> {l s='Save and stay'}</button>
</div>
</div>
<script type="text/javascript">
(function ($) {
var featuredIds = {if isset($featured_amenity_ids)}{$featured_amenity_ids|json_encode}{else}[]{/if};
var chosenReady = false;
function syncAmenitiesToFeatured() {
var $select = $('#rt_featured_amenities');
var existing = {};
$select.find('option').each(function () {
existing[$(this).val()] = true;
});
$('input[name="room_type_amenities[]"]').each(function () {
var $checkbox = $(this);
var id = $checkbox.val();
var name = $checkbox.siblings('label.tree-toggler').text().trim();
if ($checkbox.is(':checked')) {
if (!existing[id]) {
var selected = featuredIds.indexOf(parseInt(id)) !== -1;
$select.append($('<option></option>').val(id).text(name).prop('selected', selected));
}
} else {
$select.find('option[value="' + id + '"]').remove();
}
});
if (chosenReady) {
$select.trigger('chosen:updated');
}
}
$(document).on('click', '#room-type-amenities-tree :input[type="checkbox"]', function () {
setTimeout(syncAmenitiesToFeatured, 0);
});
$(document).on('click', '#check-all-room-type-amenities-tree, #uncheck-all-room-type-amenities-tree', function () {
setTimeout(syncAmenitiesToFeatured, 0);
});
function initChosen() {
var $select = $('#rt_featured_amenities');
syncAmenitiesToFeatured();
$select.chosen({ disable_search_threshold: 5, search_contains: true });
chosenReady = true;
$select.trigger('chosen:updated');
}
var $tabContent = $('#product-tab-content-Amenities');
if ($tabContent.is(':visible')) {
initChosen();
} else {
$tabContent.one('displayed', initChosen);
}
}(jQuery));
</script>
{/if}

View File

@@ -428,6 +428,17 @@
</div>
<div class="modal-body padding-top-20">
<div class="text-left errors-wrap" style="display: none;"></div>
<div class="alert alert-info">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<p>{l s='If both the Room Prefix and Starting Room No. fields are left blank, the room name will be generated using the acronym of the Room Type name.'}</p>
<p>
<strong>{l s='Example:'}</strong>
{l s='For the Room Type'}
<strong id="bulk_create_room_example_name">{$product->name[$id_lang]|escape:'html':'UTF-8'}</strong>,
{l s='the room name will be'}
<strong id="room_type_acronym">{$room_type_acronym|escape:'html':'UTF-8'}</strong>.
</p>
</div>
<div class="form-group">
<label class="control-label col-lg-3">
<span>{l s='Room prefix'}</span>
@@ -635,6 +646,7 @@
$(document).ready(function() {
var tooltipCounter = 0;
var disableDatesCounter = {};
// Setting the Date object without current time.
const dateToday = new Date("{date('Y-m-d')}");
{literal}

View File

@@ -20,63 +20,22 @@
* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
*}
{if isset($htl_connected_rooms) && $htl_connected_rooms|@count > 0}
<span class="connected-room-tooltip-trigger"
data-connected-details='{json_encode($htl_connected_rooms.connected_room_types)|escape:'html':'UTF-8'}'>
<i class="icon-random" style="color: #008abd; cursor: pointer;"></i>
</span>
{capture name='connected_room_tooltip'}
<div class="tooltip_cont">
<div class="tip_header"><div class="tip_date">{l s='Connected Rooms'}</div></div>
<div class="tip-body tip-body-grid">
{foreach from=$htl_connected_rooms.connected_room_types item=group}
<div>
<div class="tip_element_head">{$group.room_type_name|escape:'html':'UTF-8'}</div>
<div class="tip_element_value">
{foreach from=$group.connected_rooms item=room name=connected_rooms}
{$room.name|escape:'html':'UTF-8'}{if !$smarty.foreach.connected_rooms.last}, {/if}
{/foreach}
</div>
</div>
{/foreach}
</div>
</div>
{/capture}
{include file='helpers/tooltip.tpl' tooltip_content=$smarty.capture.connected_room_tooltip tooltip_icon_class='icon-random' tooltip_icon_style='color: #008abd;' }
{/if}
<script>
$(document).ready(function() {
{literal}
if (typeof window.initConnectedRoomTooltips === 'undefined') {
window.initConnectedRoomTooltips = function() {
if (typeof $.fn.tooltip === 'undefined' || typeof $.ui === 'undefined' || typeof $.ui.tooltip === 'undefined') {
return;
}
$('.connected-room-tooltip-trigger').each(function() {
if ($(this).data('ui-tooltip')) {
return;
}
$(this).tooltip({
items: '.connected-room-tooltip-trigger',
content: function() {
var details = $(this).data('connected-details');
if (!details || $.isEmptyObject(details)) {
return "{/literal}{l s='No rooms connected' js=1}{literal}";
}
var html = '<div class="tooltip_cont">';
html += '<div class="tip_header"><div class="tip_date">{/literal}{l s="Connected Rooms" js=1}{literal}</div></div>';
html += '<div class="tip-body tip-body-grid">';
for (var typeId in details) {
var group = details[typeId];
var names = [];
for (var i = 0; i < group.connected_rooms.length; i++) {
names.push(group.connected_rooms[i].name);
}
html += '<div>';
html += '<div class="tip_element_head">' + group.room_type_name + '</div>';
html += '<div class="tip_element_value">' + names.join(', ') + '</div>';
html += '</div>';
}
html += '</div></div>';
return html;
},
position: { my: "left top+10", at: "left bottom", collision: "flipfit", within: "#content" },
close: function(event, ui) {
ui.tooltip.hover(function() {
$(this).stop(true).fadeTo(300, 1);
},
function() {
$(this).fadeOut('300', function() {
$(this).remove();
});
});
}
});
});
};
}
window.initConnectedRoomTooltips();
{/literal}
});
</script>

View File

@@ -28,162 +28,35 @@
<input type="hidden" name="submitted_tabs[]" value="Features" />
<h3>{l s='Assign features to this room type'}</h3>
{if isset($room_type_features_tree) && $room_type_features_tree}
<div class="alert alert-info">
{l s='You can specify a value for each relevant feature regarding this room type. Empty fields will not be displayed.'}<br/>
{l s='You can either create a specific value, or select among the existing pre-defined values you\'ve previously added.'}
<p>{l s='If you want to add a new feature, please use the following link.'}
<a href="{$link->getAdminLink('AdminFeatures')|escape:'html':'UTF-8'}" class="btn btn-link button" target="_blank">
<i class="icon-plus-sign"></i> {l s='Add a new feature'} <i class="icon-external-link-sign"></i>
</a>
</p>
</div>
<div class="form-group">
<label for="room-type-features-tree" class="control-label col-sm-3">
<span class="label-tooltip" data-toggle="tooltip" data-original-title="{l s='Select the feature values available for this room type.'}">
{l s='Select feature values'}
</span>
</label>
<div class="col-sm-7 room_features_tree">
{$room_type_features_tree}
</div>
</div>
{else}
<div class="alert alert-warning">
<i class="icon-warning-sign"></i> {l s='No features have been defined'}
</div>
{/if}
<table class="table">
<thead>
<tr>
<th></th>
<th><span class="title_box">{l s='Feature'}</span></th>
<th><span class="title_box">{l s='Feature Image'}</span></th>
<!-- <th><span class="title_box"><u>{l s='or'}</u> {l s='Customized value'}</span></th> --><!-- by webkul -->
</tr>
</thead>
<tbody>
{foreach from=$available_features item=available_feature}
<tr>
{foreach from=$available_feature.featureValues item=value}
<td>
<input type="checkbox" class="checkbox select_hotel_feature" name="feature_{$available_feature.id_feature}_check" value="{$value.id_feature_value}" {if $available_feature.current_item == $value.id_feature_value}checked="checked"{/if}/>
</td>
<td>{$available_feature.name}</td>
<td>
<input type="hidden" id="feature_{$available_feature.id_feature}_value" name="feature_{$available_feature.id_feature}_value" value="{$value.id_feature_value}">
<img class="img img-responsive" width="15px" src="{$base_url}img/rf/{$value.value}" title="Room image" />
</td>
{/foreach}
{*--<td>
{if sizeof($available_feature.featureValues)}
<select id="feature_{$available_feature.id_feature}_value" name="feature_{$available_feature.id_feature}_value"
onchange="$('.custom_{$available_feature.id_feature}_').val('');">
<option value="0">---</option>
{foreach from=$available_feature.featureValues item=value}
<option value="{$value.id_feature_value}"{if $available_feature.current_item == $value.id_feature_value}selected="selected"{/if} >
{$value.value|truncate:40}
</option>
{/foreach}
</select>
{else}
<input type="hidden" name="feature_{$available_feature.id_feature}_value" value="0" />
<span>{l s='N/A'} -
<a href="{$link->getAdminLink('AdminFeatures')|escape:'html':'UTF-8'}&amp;addfeature_value&amp;id_feature={$available_feature.id_feature}"
class="confirm_leave btn btn-link"><i class="icon-plus-sign"></i> {l s='Add pre-defined values first'} <i class="icon-external-link-sign"></i></a>
</span>
{/if} *}<!-- By Webkul -->
</td>
{* <td>
<div class="row lang-0" style='display: none;'>
<div class="col-lg-9">
<textarea class="custom_{$available_feature.id_feature}_ALL textarea-autosize" name="custom_{$available_feature.id_feature}_ALL"
cols="40" style='background-color:#CCF' rows="1" onkeyup="{foreach from=$languages key=k item=language}$('.custom_{$available_feature.id_feature}_{$language.id_lang}').val($(this).val());{/foreach}" >{$available_feature.val[1].value|escape:'html':'UTF-8'|default:""}</textarea>
</div>
{if $languages|count > 1}
<div class="col-lg-3">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
{l s='ALL'}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{foreach from=$languages item=language}
<li>
<a href="javascript:void(0);" onclick="restore_lng($(this),{$language.id_lang});">{$language.iso_code}</a>
</li>
{/foreach}
</ul>
</div>
{/if}
</div>
{foreach from=$languages key=k item=language}
{if $languages|count > 1}
<div class="row translatable-field lang-{$language.id_lang}">
<div class="col-lg-9">
{/if}
<textarea
class="custom_{$available_feature.id_feature}_{$language.id_lang} textarea-autosize"
name="custom_{$available_feature.id_feature}_{$language.id_lang}"
cols="40"
rows="1"
onkeyup="if (isArrowKey(event)) return ;$('#feature_{$available_feature.id_feature}_value').val(0);" >{$available_feature.val[$language.id_lang].value|escape:'html':'UTF-8'|default:""}</textarea>
{if $languages|count > 1}
</div>
<div class="col-lg-3">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
{$language.iso_code}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a href="javascript:void(0);" onclick="all_languages($(this));">{l s='ALL'}</a></li>
{foreach from=$languages item=language}
<li>
<a href="javascript:hideOtherLanguage({$language.id_lang});">{$language.iso_code}</a>
</li>
{/foreach}
</ul>
</div>
</div>
{/if}
{/foreach}
</td> *}<!-- By Webkul -->
</tr>
{foreachelse}
<tr>
<td colspan="3" style="text-align:center;"><i class="icon-warning-sign"></i> {l s='No features have been defined'}</td>
</tr>
{/foreach}
</tbody>
</table>
<a href="{$link->getAdminLink('AdminFeatures')|escape:'html':'UTF-8'}&amp;addfeature" class="btn btn-link confirm_leave button">
<i class="icon-plus-sign"></i> {l s='Add a new feature'} <i class="icon-external-link-sign"></i>
</a>
<div class="panel-footer">
<a href="{$link->getAdminLink('AdminProducts')|escape:'html':'UTF-8'}{if isset($smarty.request.page) && $smarty.request.page > 1}&amp;submitFilterproduct={$smarty.request.page|intval}{/if}" class="btn btn-default"><i class="process-icon-cancel"></i> {l s='Cancel'}</a>
<button type="submit" name="submitAddproduct" class="btn btn-default pull-right" disabled="disabled"><i class="process-icon-loading"></i> {l s='Save'}</button>
<button type="submit" name="submitAddproductAndStay" class="btn btn-default pull-right" disabled="disabled"><i class="process-icon-loading"></i> {l s='Save and stay'}</button>
</div>
</div>
<script type="text/javascript">
if (tabs_manager.allow_hide_other_languages)
hideOtherLanguage({$default_form_language});
{literal}
$(".textarea-autosize").autosize();
function all_languages(pos)
{
{/literal}
{if isset($languages) && is_array($languages)}
{foreach from=$languages key=k item=language}
pos.parents('td').find('.lang-{$language.id_lang}').addClass('nolang-{$language.id_lang}').removeClass('lang-{$language.id_lang}');
{/foreach}
{/if}
pos.parents('td').find('.translatable-field').hide();
pos.parents('td').find('.lang-0').show();
{literal}
}
function restore_lng(pos,i)
{
{/literal}
{if isset($languages) && is_array($languages)}
{foreach from=$languages key=k item=language}
pos.parents('td').find('.nolang-{$language.id_lang}').addClass('lang-{$language.id_lang}').removeClass('nolang-{$language.id_lang}');
{/foreach}
{/if}
{literal}
pos.parents('td').find('.lang-0').hide();
hideOtherLanguage(i);
}
</script>
{/literal}
{/if}

View File

@@ -465,21 +465,6 @@
</div>
{/if}
<div class="form-group" id="bed_types_selection">
<label class="control-label col-sm-3">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select all bed types available for this room type.'}">
{l s='Bed Types'}
</span>
</label>
<div class="col-sm-5">
<select name="id_bed_types[]" id="id_bed_types" class="form-control chosen" multiple>
{foreach from=$bed_types_info item=bed_type_info}
<option value="{$bed_type_info['id_bed_type']}" {if isset($selected_bed_types) && in_array($bed_type_info['id_bed_type'], $selected_bed_types)}selected{/if}>{$bed_type_info['name']}</option>
{/foreach}
</select>
</div>
</div>
{* <div class="form-group">
<label class="control-label col-lg-3" for="tags_{$id_lang}">
<span class="label-tooltip" data-toggle="tooltip"

View File

@@ -45,9 +45,6 @@
<a class="link-social link-github _blank" href="https://github.com/webkul/hotelcommerce" title="Github">
<i class="icon-github"></i>
</a>
<a class="link-social link-google _blank" href="https://plus.google.com/110221570427070809661" title="Google">
<i class="icon-google-plus"></i>
</a>
</div>
</div>
<div class="col-sm-5">

View File

@@ -300,8 +300,8 @@
{if $params.type == 'range'}
{$field_name="`$list_id`Filter_{if isset($params.filter_key)}`$params.filter_key`{else}`$key`{/if}"}
<div class="input_range">
<input type="text" class="filter form-control" name="{$field_name}[0]" placeholder="{l s='From'}" value="{if isset($smarty.post[$field_name][0]) && $smarty.post[$field_name][0]}{$smarty.post[$field_name][0]}{elseif isset($params.value.0)}{$params.value.0}{/if}">
<input type="text" class="filter form-control" name="{$field_name}[1]" placeholder="{l s='To'}" value="{if isset($smarty.post[$field_name][1]) && $smarty.post[$field_name][1]}{$smarty.post[$field_name][1]}{elseif isset($params.value.1)}{$params.value.1}{/if}">
<input type="text" class="filter form-control" name="{$field_name}[0]" placeholder="{l s='From'}" value="{if isset($smarty.post[$field_name][0]) && $smarty.post[$field_name][0]}{$smarty.post[$field_name][0]|escape:'html':'UTF-8'}{elseif isset($params.value.0)}{$params.value.0}{/if}">
<input type="text" class="filter form-control" name="{$field_name}[1]" placeholder="{l s='To'}" value="{if isset($smarty.post[$field_name][1]) && $smarty.post[$field_name][1]}{$smarty.post[$field_name][1]|escape:'html':'UTF-8'}{elseif isset($params.value.1)}{$params.value.1}{/if}">
</div>
{elseif $params.type == 'bool'}
{$field_name="`$list_id`Filter_{if isset($params.filter_key)}`$params.filter_key`{else}`$key`{/if}"}
@@ -314,14 +314,14 @@
<div class="date_range">
<div class="input-group center">
<input type="text" class="filter datepicker date-input form-control" id="local_{$params.id_date}_0" name="local_{$params.name_date}[0]" placeholder="{l s='From'}" autocomplete="off"/>
<input type="hidden" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($smarty.post[$params.name_date][0]) && $smarty.post[$params.name_date][0]}{$smarty.post[$params.name_date][0]}{elseif isset($params.value.0)}{$params.value.0}{/if}">
<input type="hidden" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($smarty.post[$params.name_date][0]) && $smarty.post[$params.name_date][0]}{$smarty.post[$params.name_date][0]|escape:'html':'UTF-8'}{elseif isset($params.value.0)}{$params.value.0}{/if}">
<span class="input-group-addon">
<i class="icon-calendar"></i>
</span>
</div>
<div class="input-group center">
<input type="text" class="filter datepicker date-input form-control" id="local_{$params.id_date}_1" name="local_{$params.name_date}[1]" placeholder="{l s='To'}" autocomplete="off"/>
<input type="hidden" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($smarty.post[$params.name_date][1]) && $smarty.post[$params.name_date][1]}{$smarty.post[$params.name_date][1]}{elseif isset($params.value.1)}{$params.value.1}{/if}">
<input type="hidden" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($smarty.post[$params.name_date][1]) && $smarty.post[$params.name_date][1]}{$smarty.post[$params.name_date][1]|escape:'html':'UTF-8'}{elseif isset($params.value.1)}{$params.value.1}{/if}">
<span class="input-group-addon">
<i class="icon-calendar"></i>
</span>
@@ -398,7 +398,7 @@
{/if}
{else}
{$field_name="`$list_id`Filter_{if isset($params.filter_key)}`$params.filter_key`{else}`$key`{/if}"}
<input type="text" id="filter_input_{$key}" class="filter" name="{$field_name}" value="{if isset($smarty.post.$field_name) && $smarty.post.$field_name}{$smarty.post.$field_name}{else}{$params.value|escape:'html':'UTF-8'}{/if}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{/if} />
<input type="text" id="filter_input_{$key}" class="filter" name="{$field_name}" value="{if isset($smarty.post.$field_name) && $smarty.post.$field_name}{$smarty.post.$field_name|escape:'html':'UTF-8'}{else}{$params.value|escape:'html':'UTF-8'}{/if}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{/if} />
{/if}
</div>
</div>

View File

@@ -0,0 +1,38 @@
{*
* 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
*}
<span class="tooltip-trigger{if isset($tooltip_class) && $tooltip_class} {$tooltip_class|escape:'html':'UTF-8'}{/if}">
{if isset($tooltip_title) && $tooltip_title}
{$tooltip_title nofilter}
{elseif isset($tooltip_icon_class) && $tooltip_icon_class}
<i class="{$tooltip_icon_class|escape:'html':'UTF-8'}"{if isset($tooltip_icon_style) && $tooltip_icon_style} style="{$tooltip_icon_style|escape:'html':'UTF-8'}"{/if}></i>
{else}
<img src="themes/default/img/icon-info.svg" alt="" />
{/if}
</span>
<div class="tooltip-content" style="display: none;">
{if isset($allow_html) && !$allow_html}
{$tooltip_content|escape:'html':'UTF-8'}
{else}
{$tooltip_content nofilter}
{/if}
</div>

View File

@@ -0,0 +1,26 @@
{**
* 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
*}
<div class="tree-panel-heading-controls clearfix">
{if isset($title) && $title}<span class="tree-panel-label-title">{$title}</span>{/if}
{if isset($toolbar)}{$toolbar}{/if}
</div>

View File

@@ -543,14 +543,14 @@ class AddressCore extends ObjectModel
LEFT JOIN `'._DB_PREFIX_.'state` s
ON s.`id_country` = cl.`id_country` AND s.`id_state` = a.`id_state`
WHERE id_customer > 0 AND a.`deleted` = 0 AND
(a.`address1` LIKE \'%'.$query.'%\' OR
a.`postcode` LIKE \'%'.$query.'%\' OR
a.`city` LIKE \'%'.$query.'%\' OR
a.`phone` LIKE \'%'.$query.'%\' OR
a.`company` LIKE \'%'.$query.'%\' OR
a.`alias` LIKE \'%'.$query.'%\' OR
s.`name` LIKE \'%'.$query.'%\' OR
cl.`name` LIKE \'%'.$query.'%\'
(a.`address1` LIKE \'%'.pSQL($query).'%\' OR
a.`postcode` LIKE \'%'.pSQL($query).'%\' OR
a.`city` LIKE \'%'.pSQL($query).'%\' OR
a.`phone` LIKE \'%'.pSQL($query).'%\' OR
a.`company` LIKE \'%'.pSQL($query).'%\' OR
a.`alias` LIKE \'%'.pSQL($query).'%\' OR
s.`name` LIKE \'%'.pSQL($query).'%\' OR
cl.`name` LIKE \'%'.pSQL($query).'%\'
)
');
}

View File

@@ -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;
}
}
}

View File

@@ -146,7 +146,7 @@ class CustomerMessageCore extends ObjectModel
ON (ct.`id_customer_thread` = cm.`id_customer_thread`)
LEFT JOIN '._DB_PREFIX_.'customer c
ON (IFNULL(ct.`id_customer`, ct.`email`) = IFNULL(c.`id_customer`, c.`email`))
WHERE `message` LIKE \'%'.$query.'%\'
WHERE `message` LIKE \'%'.pSQL($query).'%\'
');
}

View File

@@ -919,9 +919,9 @@ class LanguageCore extends ObjectModel
$file = _PS_TRANSLATIONS_DIR_.(string)$iso.'.gzip';
if (!$lang_pack_link = Tools::file_get_contents(_QLO_API_URL_.'/lang_pack/get_lang_pack.php?version='.$version.'&iso_lang='.Tools::strtolower((string)$iso))) {
$errors[] = Tools::displayError('Archive cannot be downloaded from prestashop.com.');
$errors[] = Tools::displayError('Archive cannot be downloaded from QloApps Api.');
} elseif (!$lang_pack = json_decode($lang_pack_link)) {
$errors[] = Tools::displayError('Error occurred when language was checked according to your Prestashop version.');
$errors[] = Tools::displayError('Error occurred when language was checked according to your QloApps version.');
} elseif (empty($lang_pack->error) && ($content = Tools::file_get_contents($lang_pack->download_link))) {
if (!@file_put_contents($file, $content)) {
if (is_writable(dirname($file))) {

View File

@@ -229,12 +229,18 @@ 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);
if ($this->context->cart->is_advance_payment) {
$full_cart_total = (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(true, Cart::BOTH), _PS_PRICE_COMPUTE_PRECISION_);
$amount_paid = !$dont_touch_amount ? Tools::ps_round((float)$amount_paid, _PS_PRICE_COMPUTE_PRECISION_) : $amount_paid;
if ($amount_paid >= $full_cart_total) {
$is_advance_payment = false;
$cart_total_paid = $full_cart_total;
} else {
$is_advance_payment = true;
$cart_total_paid = (float)Tools::ps_round(
(float)$this->context->cart->getOrderTotal(true, CART::ADVANCE_PAYMENT),
2
(float)$this->context->cart->getOrderTotal(true, Cart::ADVANCE_PAYMENT),
_PS_PRICE_COMPUTE_PRECISION_
);
}
@@ -314,7 +320,6 @@ 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;
$order->total_paid_real = 0;
$order->total_products = (float)$this->context->cart->getOrderTotal(false, Cart::ONLY_PRODUCTS, $order->product_list, $id_carrier);
@@ -371,7 +376,7 @@ abstract class PaymentModuleCore extends Module
}
// advance payment information
$order->is_advance_payment = $this->context->cart->is_advance_payment;
$order->is_advance_payment = (int)$is_advance_payment;
$order->amount_paid = 0;
if ($order->is_advance_payment) {
$order->advance_paid_amount = (float)Tools::ps_round(
@@ -389,7 +394,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_
@@ -678,7 +683,13 @@ abstract class PaymentModuleCore extends Module
$cart_rules[$key]['remaining'] -= $used['excl'];
}
$order->addCartRule($cart_rule['obj']->id, $cart_rule['obj']->name, $values, 0, $cart_rule['obj']->free_shipping);
$order->addCartRule(
$cart_rule['obj']->id,
$cart_rule['obj']->name,
array('tax_incl' => $used['incl'], 'tax_excl' => $used['excl']),
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)) {
$cart_rule_used[] = $cart_rule['obj']->id;
@@ -691,7 +702,7 @@ abstract class PaymentModuleCore extends Module
$cart_rules_list[] = array(
'voucher_name' => $cart_rule['obj']->name,
'voucher_reduction' => ($values['tax_incl'] != 0.00 ? '-' : '').Tools::displayPrice($values['tax_incl'], $this->context->currency, false)
'voucher_reduction' => ($used['incl'] != 0.00 ? '-' : '').Tools::displayPrice($used['incl'], $this->context->currency, false)
);
}
@@ -850,7 +861,8 @@ abstract class PaymentModuleCore extends Module
$objCartBookingData->id_cart,
$objCartBookingData->id_guest,
$objCartBookingData->id_room,
0
0,
1
);
$objBookingDetail->date_from = $objCartBookingData->date_from;
@@ -885,7 +897,7 @@ abstract class PaymentModuleCore extends Module
/*for saving details of the advance payment product wise*/
$objBookingDetail->total_paid_amount = $total_price['total_price_tax_incl'];
if ($this->context->cart->is_advance_payment) {
if ($is_advance_payment) {
$prod_adv_payment = $objAdvancedPayment->getIdAdvPaymentByIdProduct($idProduct);
if (!$prod_adv_payment
|| (isset($prod_adv_payment['payment_type']) && $prod_adv_payment['payment_type'])
@@ -941,8 +953,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 +2054,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);
}
}
}

View File

@@ -1073,9 +1073,6 @@ class ProductCore extends ObjectModel
if (!$this->deleteServiceInfo()) {
return false;
}
} else {
$objHotelRoomTypeBedType = new HotelRoomTypeBedType();
$objHotelRoomTypeBedType->deleteRoomTypeBedTypes(false, $this->id);
}
Hook::exec('actionProductDelete', array('id_product' => (int)$this->id, 'product' => $this));
@@ -1083,6 +1080,7 @@ class ProductCore extends ObjectModel
!GroupReduction::deleteProductReduction($this->id) ||
!$this->deleteCategories(true) ||
!$this->deleteProductFeatures() ||
!HotelRoomTypeAmenities::deleteByProduct((int)$this->id) ||
!$this->deleteTags() ||
!$this->deleteAttributesImpacts() ||
!$this->deleteAttachments(false) ||
@@ -6873,4 +6871,55 @@ class ProductCore extends ObjectModel
return $price * (int)$quantity;
}
/**
* Prepare grouped core features and values for a room type, with selection state.
*
* @param int $idProduct
* @param int $idLang defaults to current context language
* @return array
*/
public static function getRoomTypeFeatureTreeData($idProduct, $idLang = 0)
{
if (!$idLang) {
$idLang = Context::getContext()->language->id;
}
$product = new self((int) $idProduct);
$features = Feature::getFeatures(
$idLang,
(Shop::isFeatureActive() && Shop::getContext() == Shop::CONTEXT_SHOP)
);
$selectedFeatureValues = array();
foreach ($product->getFeatures() as $productFeature) {
$selectedFeatureValues[(int) $productFeature['id_feature']][] = (int) $productFeature['id_feature_value'];
}
foreach ($features as &$feature) {
$featureValues = FeatureValue::getFeatureValuesWithLang(
$idLang,
(int) $feature['id_feature']
);
$feature['value'] = (int) $feature['id_feature'];
$feature['input_name'] = 'feature_value_parents';
$feature['children'] = array();
$selectedValues = isset($selectedFeatureValues[(int) $feature['id_feature']])
? $selectedFeatureValues[(int) $feature['id_feature']]
: array();
foreach ($featureValues as $featureValue) {
$featureValue['name'] = $featureValue['value'];
$featureValue['value'] = (int) $featureValue['id_feature_value'];
$featureValue['input_name'] = 'feature_values['.(int) $feature['id_feature'].']';
$featureValue['selected'] = in_array((int) $featureValue['id_feature_value'], $selectedValues);
$feature['children'][] = $featureValue;
}
if ($feature['children'] && count($selectedValues) === count($feature['children'])) {
$feature['selected'] = true;
}
}
return $features;
}
}

View File

@@ -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;
}

View File

@@ -1211,10 +1211,25 @@ class AdminControllerCore extends Controller
if (ob_get_level() && ob_get_length() > 0) {
ob_clean();
}
$fields_to_export = array();
if((int)Configuration::get('PS_EXPORT_FIELDS_TYPE') === HelperList::QLO_EXPORT_FIELDS_SELECTED){
$list_visibility = json_decode($this->context->cookie->{'list_visibility_'.$this->context->controller->controller_name});
foreach ($this->fields_list as $key => $field) {
if ((!isset($field['displayed']) || $field['displayed'])
&& (empty($field['optional'])
|| (!is_array($list_visibility) && !empty($field['visible_default']))
|| (is_array($list_visibility) && in_array($key, $list_visibility))
)) {
$fields_to_export[$key] = $field;
}
}
}
$this->getList($this->context->language->id, null, null, 0, false);
if (!count($this->_list)) {
return;
}
$fields_to_export = (int)Configuration::get('PS_EXPORT_FIELDS_TYPE') === HelperList::QLO_EXPORT_FIELDS_SELECTED ? $fields_to_export : $this->fields_list;
header('Content-type: text/csv');
header('Content-Type: application/force-download; charset=UTF-8');
@@ -1223,9 +1238,9 @@ class AdminControllerCore extends Controller
$fd = fopen('php://output', 'wb');
$headers = array();
foreach ($this->fields_list as $key => $datas) {
foreach ($fields_to_export as $key => $datas) {
if ('PDF' === $datas['title']) {
unset($this->fields_list[$key]);
unset($fields_to_export[$key]);
} else {
if ('ID' === $datas['title']) {
$headers[] = strtolower(Tools::htmlentitiesDecodeUTF8($datas['title']));
@@ -1239,7 +1254,7 @@ class AdminControllerCore extends Controller
foreach ($this->_list as $i => $row) {
$content = array();
$path_to_image = false;
foreach ($this->fields_list as $key => $params) {
foreach ($fields_to_export as $key => $params) {
$field_value = isset($row[$key]) ? Tools::htmlentitiesDecodeUTF8(Tools::nl2br($row[$key])) : '';
if ($key == 'image') {
if ($params['image'] != 'p' || Configuration::get('PS_LEGACY_IMAGES')) {

View File

@@ -29,6 +29,8 @@
*/
class HelperListCore extends Helper
{
const QLO_EXPORT_FIELDS_ALL = 0;
const QLO_EXPORT_FIELDS_SELECTED = 1;
/**
* @var int|null
*/

View File

@@ -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(

View File

@@ -0,0 +1,292 @@
<?php
/**
* 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
*/
class HTMLTemplateGuestRegistrationFormCore extends HTMLTemplate
{
public $order;
public $available_in_your_account = false;
protected $hotelBookingDetail = null;
/**
* @param int $idHotelBookingDetail
* @param $smarty
*/
public function __construct($idHotelBookingDetail, $smarty)
{
$this->hotelBookingDetail = new HotelBookingDetail((int)$idHotelBookingDetail);
$this->order = new Order((int)$this->hotelBookingDetail->id_order);
$this->smarty = $smarty;
$this->date = Tools::displayDate($this->order->date_add);
$this->title = $this->order->getUniqReference();
$this->shop = new Shop((int)$this->order->id_shop);
}
/**
* Returns the template's HTML header
*
* @return string HTML header
*/
public function getHeader()
{
$this->assignCommonHeaderData();
$this->smarty->assign(array('header' => HTMLTemplateGuestRegistrationForm::l('Guest Registration Card')));
return $this->smarty->fetch($this->getTemplate('header'));
}
/**
* Returns the template's HTML content
*
* @return string HTML content
*/
public function getContent()
{
$idLang = (int)$this->order->id_lang;
$objHotelBookingDetail = $this->hotelBookingDetail;
$idHotel = (int)$objHotelBookingDetail->id_hotel;
$objHotelBranchInformation = null;
$hotelCountry = '';
if ($idHotel) {
$objHotelBranchInformation = new HotelBranchInformation($idHotel, $idLang);
if (Validate::isLoadedObject($objHotelBranchInformation)) {
if ($objHotelBranchInformation->id_country) {
$objCountry = new Country((int)$objHotelBranchInformation->id_country, $idLang);
if (Validate::isLoadedObject($objCountry)) {
$hotelCountry = (string)$objCountry->name;
}
}
} else {
$objHotelBranchInformation = null;
}
}
$ratePerNight = '';
$arrivalDateTime = '';
$departureDateTime = '';
if (Validate::isLoadedObject($objHotelBookingDetail)) {
$nights = (int)HotelHelper::getNumberOfDays($objHotelBookingDetail->date_from, $objHotelBookingDetail->date_to);
if ($nights > 0) {
$currency = new Currency((int)$this->order->id_currency);
$ratePerNight = Tools::displayPrice((float)$objHotelBookingDetail->total_price_tax_incl / $nights, $currency, false);
}
$arrivalDateTime = $objHotelBookingDetail->date_from ? Tools::displayDate($objHotelBookingDetail->date_from) : '';
$departureDateTime = $objHotelBookingDetail->date_to ? Tools::displayDate($objHotelBookingDetail->date_to) : '';
if ($arrivalDateTime && $objHotelBranchInformation && $objHotelBranchInformation->check_in && $objHotelBranchInformation->check_in != '00:00:00') {
$arrivalDateTime .= ' '.date('h:i a', strtotime($objHotelBranchInformation->check_in));
}
if ($departureDateTime && $objHotelBranchInformation && $objHotelBranchInformation->check_out && $objHotelBranchInformation->check_out != '00:00:00') {
$departureDateTime .= ' '.date('h:i a', strtotime($objHotelBranchInformation->check_out));
}
}
$additionalGuestsRows = 0;
if (Validate::isLoadedObject($objHotelBookingDetail)) {
$totalGuests = (int)$objHotelBookingDetail->adults + (int)$objHotelBookingDetail->children;
$additionalGuestsRows = ($totalGuests > 1) ? ($totalGuests - 1) : 0;
}
// Build saved config: [sectionId => [fieldId => true, ...]]
$grcFields = array();
$grcInfoJson = Configuration::get('QLO_GUEST_REGISTRATION_CARD_INFO');
if ($grcInfoJson !== false && $grcInfoJson !== '') {
$grcData = Tools::jsonDecode($grcInfoJson, true);
if (is_array($grcData)) {
foreach ($grcData as $sectionId => $fieldIds) {
$fieldIds = array_map('intval', (array)$fieldIds);
if (!empty($fieldIds)) {
$grcFields[(int)$sectionId] = array_flip($fieldIds);
}
}
}
}
// When nothing saved, show all sections and fields
$allVisible = empty($grcFields);
// One pass: build false|string label for every field directly.
// false = hidden, non-empty string = visible (used for both visibility check and label text in template).
$grcInfo = $this->hotelBookingDetail->getRegistrationCardInfo();
$fieldLabels = array();
foreach ($grcInfo as $sectionId => $section) {
$isSectionEnabled = $allVisible || isset($grcFields[$sectionId]);
$fieldLabels[$sectionId] = array();
foreach ($section['fields'] as $fieldId => $fieldLabel) {
$isVisible = $isSectionEnabled && ($allVisible || isset($grcFields[$sectionId][$fieldId]));
$fieldLabels[$sectionId][$fieldId] = $isVisible ? $fieldLabel : false;
}
}
$section1 = HotelBookingDetail::GRC_SECTION_GUEST_INFO;
$section2 = HotelBookingDetail::GRC_SECTION_TRAVEL_INFO;
$section3 = HotelBookingDetail::GRC_SECTION_BOOKING_INFO;
$section4 = HotelBookingDetail::GRC_SECTION_IDENTIFICATION;
$section5 = HotelBookingDetail::GRC_SECTION_ADDITIONAL_GUESTS;
$section6 = HotelBookingDetail::GRC_SECTION_BILLING_CORPORATE;
$section7 = HotelBookingDetail::GRC_SECTION_PAYMENT_DEPOSIT;
$section8 = HotelBookingDetail::GRC_SECTION_GUEST_SIGNATURE;
$section9 = HotelBookingDetail::GRC_SECTION_PROPERTY_REGS;
$section10 = HotelBookingDetail::GRC_SECTION_OFFICE_USE_ONLY;
// $labels: false = field hidden, label string = field visible.
// Template uses {if $labels.key} for visibility AND {$labels.key} for label — no separate boolean assigns.
$labels = array(
// Section 1: Guest Information
'title' => $fieldLabels[$section1][HotelBookingDetail::GRC_GUEST_TITLE],
'full_name' => $fieldLabels[$section1][HotelBookingDetail::GRC_GUEST_FULL_NAME],
'phone' => $fieldLabels[$section1][HotelBookingDetail::GRC_GUEST_PHONE],
'email' => $fieldLabels[$section1][HotelBookingDetail::GRC_GUEST_EMAIL],
'dob' => $fieldLabels[$section1][HotelBookingDetail::GRC_GUEST_DOB],
'nationality' => $fieldLabels[$section1][HotelBookingDetail::GRC_GUEST_NATIONALITY],
'city_country' => $fieldLabels[$section1][HotelBookingDetail::GRC_GUEST_CITY_COUNTRY],
'postal_code' => $fieldLabels[$section1][HotelBookingDetail::GRC_GUEST_POSTAL_CODE],
'address' => $fieldLabels[$section1][HotelBookingDetail::GRC_GUEST_ADDRESS],
// Section 2: Travel Information
'arrived_from' => $fieldLabels[$section2][HotelBookingDetail::GRC_TRAVEL_ARRIVED_FROM],
'next_dest' => $fieldLabels[$section2][HotelBookingDetail::GRC_TRAVEL_NEXT_DESTINATION],
'flight' => $fieldLabels[$section2][HotelBookingDetail::GRC_TRAVEL_FLIGHT_TRAIN],
'vehicle' => $fieldLabels[$section2][HotelBookingDetail::GRC_TRAVEL_VEHICLE_REG],
'purpose' => $fieldLabels[$section2][HotelBookingDetail::GRC_TRAVEL_PURPOSE_OF_VISIT],
// Section 3: Booking Information
'booking_ref' => $fieldLabels[$section3][HotelBookingDetail::GRC_BOOKING_REFERENCE],
'booking_rate' => $fieldLabels[$section3][HotelBookingDetail::GRC_BOOKING_RATE_PER_NIGHT],
'booking_arrival' => $fieldLabels[$section3][HotelBookingDetail::GRC_BOOKING_ARRIVAL],
'booking_departure' => $fieldLabels[$section3][HotelBookingDetail::GRC_BOOKING_DEPARTURE],
'booking_room_type' => $fieldLabels[$section3][HotelBookingDetail::GRC_BOOKING_ROOM_TYPE],
'booking_room_number' => $fieldLabels[$section3][HotelBookingDetail::GRC_BOOKING_ROOM_NUMBER],
'num_guests' => $fieldLabels[$section3][HotelBookingDetail::GRC_BOOKING_NUM_GUESTS],
// Section 4: Identification Document
'id_proof' => $fieldLabels[$section4][HotelBookingDetail::GRC_ID_IDENTITY_PROOF],
'id_number' => $fieldLabels[$section4][HotelBookingDetail::GRC_ID_NUMBER],
'passport' => $fieldLabels[$section4][HotelBookingDetail::GRC_ID_PASSPORT_NO],
'place_of_issue' => $fieldLabels[$section4][HotelBookingDetail::GRC_ID_PLACE_OF_ISSUE],
'date_of_issue' => $fieldLabels[$section4][HotelBookingDetail::GRC_ID_DATE_OF_ISSUE],
'date_of_expiry' => $fieldLabels[$section4][HotelBookingDetail::GRC_ID_DATE_OF_EXPIRY],
'visa' => $fieldLabels[$section4][HotelBookingDetail::GRC_ID_VISA_NUMBER],
'valid_until' => $fieldLabels[$section4][HotelBookingDetail::GRC_ID_VALID_UNTIL],
'arrival_in_country' => $fieldLabels[$section4][HotelBookingDetail::GRC_ID_ARRIVAL_DATE_IN_COUNTRY],
// Section 5: Additional Guests
'addguest_name' => $fieldLabels[$section5][HotelBookingDetail::GRC_ADD_GUEST_NAME],
'addguest_id_type' => $fieldLabels[$section5][HotelBookingDetail::GRC_ADD_GUEST_ID_TYPE],
'addguest_id_number' => $fieldLabels[$section5][HotelBookingDetail::GRC_ADD_GUEST_ID_NUMBER],
'addguest_nationality' => $fieldLabels[$section5][HotelBookingDetail::GRC_ADD_GUEST_NATIONALITY],
// Section 6: Billing & Corporate
'company' => $fieldLabels[$section6][HotelBookingDetail::GRC_BILLING_COMPANY],
'tax_id' => $fieldLabels[$section6][HotelBookingDetail::GRC_BILLING_TAX_ID],
// Section 7: Payment & Deposit
'payment_method' => $fieldLabels[$section7][HotelBookingDetail::GRC_PAYMENT_METHOD],
'card_number' => $fieldLabels[$section7][HotelBookingDetail::GRC_PAYMENT_CARD_NUMBER],
'security_deposit' => $fieldLabels[$section7][HotelBookingDetail::GRC_PAYMENT_SECURITY_DEPOSIT],
// Section 8: Guest Signature
'signature' => $fieldLabels[$section8][HotelBookingDetail::GRC_SIG_SIGNATURE],
'sig_date' => $fieldLabels[$section8][HotelBookingDetail::GRC_SIG_DATE],
// Section 9: Property Regulations (checkin/checkout share one visibility flag; two separate PDF sub-labels)
'checkin_time' => $fieldLabels[$section9][HotelBookingDetail::GRC_PROP_CHECKIN_CHECKOUT_TIME] ? 'Check-in Time' : false,
'checkout_time' => $fieldLabels[$section9][HotelBookingDetail::GRC_PROP_CHECKIN_CHECKOUT_TIME] ? 'Check-out Time' : false,
'hotel_policies' => $fieldLabels[$section9][HotelBookingDetail::GRC_PROP_HOTEL_POLICIES],
// Section 10: For Office Use Only
'staff_name' => $fieldLabels[$section10][HotelBookingDetail::GRC_OFFICE_STAFF_NAME],
'office_checkin_time' => $fieldLabels[$section10][HotelBookingDetail::GRC_OFFICE_CHECKIN_TIME],
'id_verified' => $fieldLabels[$section10][HotelBookingDetail::GRC_OFFICE_ID_VERIFIED],
'reg_no' => $fieldLabels[$section10][HotelBookingDetail::GRC_OFFICE_REG_NO],
);
$showLocalIdGroup = (bool)$labels['id_proof'] || (bool)$labels['id_number'];
$showIntIdGroup = (bool)$labels['passport'] || (bool)$labels['place_of_issue'] || (bool)$labels['date_of_issue']
|| (bool)$labels['date_of_expiry'] || (bool)$labels['visa'] || (bool)$labels['valid_until']
|| (bool)$labels['arrival_in_country'];
$this->smarty->assign(array(
'style_tab' => $this->smarty->fetch($this->getTemplate('invoice.style-tab')),
'hotel' => $objHotelBranchInformation,
'hotel_country' => $hotelCountry,
'booking_reference' => $this->order->getUniqReference(),
'arrival_date_time' => $arrivalDateTime,
'departure_date_time' => $departureDateTime,
'room_type' => Validate::isLoadedObject($objHotelBookingDetail) ? $objHotelBookingDetail->room_type_name : '',
'room_number' => Validate::isLoadedObject($objHotelBookingDetail) ? $objHotelBookingDetail->room_num : '',
'adults' => Validate::isLoadedObject($objHotelBookingDetail) ? (int)$objHotelBookingDetail->adults : 0,
'children' => Validate::isLoadedObject($objHotelBookingDetail) ? (int)$objHotelBookingDetail->children : 0,
'rate_per_night' => $ratePerNight,
'additional_guests_rows' => $additionalGuestsRows,
// Section visibility
'show_section_guest_info' => !empty(array_filter($fieldLabels[$section1])),
'show_section_travel_info' => !empty(array_filter($fieldLabels[$section2])),
'show_section_booking_info' => !empty(array_filter($fieldLabels[$section3])),
'show_section_identification' => !empty(array_filter($fieldLabels[$section4])),
'show_section_additional_guests' => !empty(array_filter($fieldLabels[$section5])),
'show_section_billing_corporate' => !empty(array_filter($fieldLabels[$section6])),
'show_section_payment_deposit' => !empty(array_filter($fieldLabels[$section7])),
'show_section_guest_signature' => !empty(array_filter($fieldLabels[$section8])),
'show_section_property_regs' => !empty(array_filter($fieldLabels[$section9])),
'show_section_office_use' => !empty(array_filter($fieldLabels[$section10])),
'section_additional_guests' => $grcInfo[$section5]['name'],
'section_property_regs' => $grcInfo[$section9]['name'],
'local_id' => $showLocalIdGroup,
'int_id' => $showIntIdGroup,
'labels' => $labels,
));
return $this->smarty->fetch($this->getTemplate('guest-registration-form'));
}
/**
* Returns the template filename when using bulk rendering
*
* @return string filename
*/
public function getBulkFilename()
{
return 'guest-registration-forms.pdf';
}
/**
* Returns the template filename
*
* @return string filename
*/
public function getFilename()
{
$filename = 'guest-registration-form-'.$this->order->reference;
if ($this->hotelBookingDetail->id) {
$filename .= '-room-'.$this->hotelBookingDetail->id;
}
return $filename.'.pdf';
}
}

View File

@@ -37,6 +37,7 @@ class PDFCore
protected $smarty;
const TEMPLATE_INVOICE = 'Invoice';
const TEMPLATE_GUEST_REGISTRATION_FORM = 'GuestRegistrationForm';
const TEMPLATE_ORDER_RETURN = 'OrderReturn';
const TEMPLATE_ORDER_SLIP = 'OrderSlip';
const TEMPLATE_DELIVERY_SLIP = 'DeliverySlip';

View File

@@ -384,13 +384,13 @@ class AdminAddressesControllerCore extends AdminController
public function processExport($text_delimiter = '"')
{
$this->fields_list = array_merge($this->fields_list, array(
'email' => array('title' => $this->l('Customer Email')),
'phone' => array('title' => $this->l('Phone'), 'filter_key' => 'a!phone'),
'phone_mobile' => array('title' => $this->l('Mobile phone')),
'address1' => array('title' => $this->l('Address (2)')),
'dni' => array('title' => $this->l('Identification Number')),
'vat_number' => array('title' => $this->l('VAT number')),
'other' => array('title' => $this->l('Other')),
'email' => array('title' => $this->l('Customer Email'), 'displayed' => false),
'phone' => array('title' => $this->l('Phone'), 'filter_key' => 'a!phone', 'displayed' => false),
'phone_mobile' => array('title' => $this->l('Mobile phone'), 'displayed' => false),
'address2' => array('title' => $this->l('Address (2)'), 'displayed' => false),
'dni' => array('title' => $this->l('Identification Number'), 'displayed' => false),
'vat_number' => array('title' => $this->l('VAT number'), 'displayed' => false),
'other' => array('title' => $this->l('Other'), 'displayed' => false),
));
return parent::processExport($text_delimiter);

View File

@@ -695,6 +695,7 @@ class AdminCartsControllerCore extends AdminController
'cart_detail_data' => $cart_detail_data,
'cart' => $objCart,
'currency' => new Currency((int)$this->context->cart->id_currency),
'can_edit_booking_carts' => ($this->tabAccess['edit'] === 1),
'occupancy_required_for_booking' => $occupancyRequiredForBooking,
'ajax' => true
));
@@ -1265,7 +1266,8 @@ class AdminCartsControllerCore extends AdminController
'serviceProducts' => $serviceProducts,
'selectedRoomServiceProduct' => $selectedRoomServiceProduct,
'customServiceAllowed' => Configuration::get('PS_ALLOW_CREATE_CUSTOM_SERVICES_IN_BOOKING'),
'loaderImg' => $this->context->link->getMediaLink(_PS_IMG_.'admin/ajax-loader.gif')
'loaderImg' => $this->context->link->getMediaLink(_PS_IMG_.'admin/ajax-loader.gif'),
'can_edit' => $this->tabAccess['edit'],
));
$response['html_exta_demands'] = $this->context->smarty->fetch(
@@ -1574,6 +1576,7 @@ class AdminCartsControllerCore extends AdminController
'serviceProducts' => $serviceProducts,
'selectedRoomServiceProduct' => $selectedRoomServiceProduct,
'customServiceAllowed' => Configuration::get('PS_ALLOW_CREATE_CUSTOM_SERVICES_IN_BOOKING'),
'can_edit' => $this->tabAccess['edit'],
));
$servicesTpl = $this->context->smarty->fetch(
@@ -1589,7 +1592,9 @@ class AdminCartsControllerCore extends AdminController
{
$response = array('hasError' => false);
// Check tab access is allowed to edit
if ($this->tabAccess['add'] === 1) {
$canAdd = ($this->tabAccess['add'] === 1);
$canEdit = ($this->tabAccess['edit'] === 1);
if ($canAdd || $canEdit) {
$idCartBooking = Tools::getValue('id_hotel_cart_booking');
if (Validate::isLoadedObject($objHotelCartBookingData = new HotelCartBookingData($idCartBooking))) {
$objCart = new Cart($objHotelCartBookingData->id_cart);
@@ -1667,7 +1672,7 @@ class AdminCartsControllerCore extends AdminController
))) {
$originalPrice = Product::getPriceStatic($idServiceProduct, false);
// if price is different than the original service price then update the price
if ($operator == 'up' && $originalPrice != $unitPrice) {
if ($canEdit && $operator == 'up' && $originalPrice != $unitPrice) {
if ($specificPriceInfo = SpecificPrice::getSpecificPrice(
(int)$idServiceProduct,
0,

View File

@@ -80,6 +80,9 @@ class AdminCustomersControllerCore extends AdminController
$this->_join = 'LEFT JOIN '._DB_PREFIX_.'gender_lang gl ON (a.id_gender = gl.id_gender AND gl.id_lang = '.(int)$this->context->language->id.')';
$this->_join .= ' LEFT JOIN '._DB_PREFIX_.'group_lang grl ON (a.id_default_group = grl.id_group AND grl.id_lang = '.(int)$this->context->language->id.')';
$this->_join .= ' LEFT JOIN '._DB_PREFIX_.'orders o ON (a.id_customer = o.id_customer)';
$this->_join .= ' LEFT JOIN '._DB_PREFIX_.'address ad ON (ad.id_customer = a.id_customer AND ad.deleted = 0)';
$this->_join .= ' LEFT JOIN '._DB_PREFIX_.'state adstate ON (adstate.id_state = ad.id_state)';
$this->_join .= ' LEFT JOIN '._DB_PREFIX_.'country_lang adcountry ON (adcountry.id_country = ad.id_country AND adcountry.id_lang = '.(int)$this->context->language->id.')';
$this->_group = 'GROUP BY a.`id_customer`';
$this->fields_list = array(
@@ -119,6 +122,11 @@ class AdminCustomersControllerCore extends AdminController
}
$this->fields_list = array_merge($this->fields_list, array(
'phone' => array(
'title' => $this->l('Phone'),
'filter_key' => 'a!phone',
'visible_default' => true,
),
'default_group_name' => array(
'title' => $this->l('Default Group'),
'optional' => true,
@@ -144,11 +152,82 @@ class AdminCustomersControllerCore extends AdminController
'align' => 'text-right',
'badge_success' => true
),
'phone' => array(
'title' => $this->l('Phone'),
'filter_key' => 'a!phone',
'address_company' => array(
'title' => $this->l('Company'),
'optional' => true,
'visible_default' => false,
'havingFilter' => true,
'orderby' => false,
),
'vat_number' => array(
'title' => $this->l('VAT number'),
'optional' => true,
'visible_default' => false,
'havingFilter' => true,
'orderby' => false,
),
'address1' => array(
'title' => $this->l('Address'),
'optional' => true,
'visible_default' => false,
'search' => false,
'orderby' => false,
),
'address2' => array(
'title' => $this->l('Address (2)'),
'optional' => true,
'visible_default' => false,
'search' => false,
'orderby' => false,
),
'city' => array(
'title' => $this->l('City'),
'optional' => true,
'visible_default' => false,
'havingFilter' => true,
'orderby' => false,
),
'state' => array(
'title' => $this->l('State'),
'optional' => true,
'visible_default' => false,
'havingFilter' => true,
'orderby' => false,
),
'postcode' => array(
'title' => $this->l('Zip/Postal Code'),
'optional' => true,
'visible_default' => false,
'havingFilter' => true,
'orderby' => false,
),
'country' => array(
'title' => $this->l('Country'),
'optional' => true,
'visible_default' => false,
'havingFilter' => true,
'orderby' => false,
),
'address_phone' => array(
'title' => $this->l('Home phone'),
'optional' => true,
'visible_default' => false,
'havingFilter' => true,
'orderby' => false,
),
'phone_mobile' => array(
'title' => $this->l('Mobile phone'),
'optional' => true,
'visible_default' => false,
'havingFilter' => true,
'orderby' => false,
),
'dni' => array(
'title' => $this->l('Identification Number'),
'optional' => true,
'visible_default' => false,
'search' => false,
'orderby' => false,
),
'active' => array(
'title' => $this->l('Enabled'),
@@ -171,7 +250,9 @@ class AdminCustomersControllerCore extends AdminController
'align' => 'text-center',
'type' => 'bool',
'callback' => 'printOptinIcon',
'orderby' => false
'orderby' => false,
'optional' => true,
'visible_default' => false
),
'date_add' => array(
'title' => $this->l('Registration'),
@@ -183,12 +264,15 @@ class AdminCustomersControllerCore extends AdminController
'title' => $this->l('Last visit'),
'type' => 'datetime',
'search' => false,
'havingFilter' => true
'havingFilter' => true,
'optional' => true,
'visible_default' => false,
),
'deleted' => array(
'title' => $this->l('Banned'),
'type' => 'bool',
'displayed' => false,
'filter_key' => 'a!deleted',
'callback' => 'getCustomerStatusLabel',
),
'order_date' => array(
@@ -211,7 +295,11 @@ class AdminCustomersControllerCore extends AdminController
WHERE g.id_customer = a.id_customer
ORDER BY c.date_add DESC
LIMIT 1
) as connect';
) as connect,
ad.company as address_company, ad.vat_number,
ad.address1, ad.address2, ad.city, adstate.name as state,
ad.postcode, adcountry.name as country, ad.phone as address_phone,
ad.phone_mobile, ad.dni';
// Check if we can add a customer
if (Shop::isFeatureActive() && (Shop::getContext() == Shop::CONTEXT_ALL || Shop::getContext() == Shop::CONTEXT_GROUP)) {

View File

@@ -91,13 +91,22 @@ class AdminFeaturesControllerCore extends AdminController
parent::__construct();
}
public function init()
{
parent::init();
if (($id = Tools::getValue('id_feature')) && Tools::getIsset('viewfeature')) {
self::$currentIndex .= '&id_feature='.(int)$id.'&viewfeature';
}
}
/**
* AdminController::renderList() override
* @see AdminController::renderList()
*/
public function renderList()
{
/*$this->addRowAction('view');*//*by webkul*/
$this->addRowAction('view');
$this->addRowAction('edit');
$this->addRowAction('delete');
@@ -154,7 +163,6 @@ class AdminFeaturesControllerCore extends AdminController
);
$this->_where = sprintf('AND `id_feature` = %d', (int)$id);
self::$currentIndex = self::$currentIndex.'&id_feature='.(int)$id.'&viewfeature';
$this->processFilter();
return parent::renderList();
}
@@ -322,8 +330,14 @@ class AdminFeaturesControllerCore extends AdminController
break;
case 'view':
$bread_extended[] = $this->feature_name[$this->context->employee->id_lang];
$this->addMetaTitle($bread_extended[count($bread_extended) - 1]);
if (!$this->feature_name && ($id = Tools::getValue('id_feature'))) {
$obj = new Feature((int)$id);
$this->feature_name = $obj->name;
}
if ($this->feature_name) {
$bread_extended[] = $this->feature_name[$this->context->employee->id_lang];
$this->addMetaTitle($bread_extended[count($bread_extended) - 1]);
}
break;
case 'editFeatureValue':
@@ -334,7 +348,7 @@ class AdminFeaturesControllerCore extends AdminController
}
if (Validate::isLoadedObject($obj = new FeatureValue((int)Tools::getValue('id_feature_value')))) {
$bread_extended[] = sprintf($this->l('Edit: %s'), $obj->value[$this->context->employee->id_lang]);
$bread_extended[] = sprintf($this->l('Edit: %s'), $obj->value[$this->context->employee->id_lang]);
}
} else {
$bread_extended[] = $this->l('Edit Value');
@@ -549,13 +563,15 @@ class AdminFeaturesControllerCore extends AdminController
{
$object = parent::processAdd();
if (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && !count($this->errors)) {
if ($this->table == 'feature_value' && ($this->display == 'edit' || $this->display == 'add')) {
$this->redirect_after = self::$currentIndex.'&addfeature_value&id_feature='.(int)Tools::getValue('id_feature').'&token='.$this->token;
if ('feature_value' === $this->table && !count($this->errors)) {
if (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && ($this->display == 'edit' || $this->display == 'add')) {
$this->redirect_after = self::$currentIndex.'&addfeature_value&id_feature='.(int)Tools::getValue('id_feature').'&conf=3&token='.$this->token;
} else {
$this->redirect_after = self::$currentIndex.'&'.$this->identifier.'='.(int) $object->id.'&conf=3&update'.$this->table.'&token='.$this->token;
$this->redirect_after = self::$currentIndex.'&id_feature='.(int)Tools::getValue('id_feature').'&viewfeature&conf=3&token='.$this->token;
}
} elseif (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && count($this->errors) && $this->table == 'feature_value') { // enter only if feature is submitted
} elseif (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && !count($this->errors)) {
$this->redirect_after = self::$currentIndex.'&'.$this->identifier.'='.(int) $object->id.'&conf=3&update'.$this->table.'&token='.$this->token;
} elseif (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && count($this->errors) && 'feature_value' === $this->table) { // enter only if feature is submitted
$this->display = 'editFeatureValue';
}
@@ -570,8 +586,14 @@ class AdminFeaturesControllerCore extends AdminController
{
$object = parent::processUpdate();
if (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && !count($this->errors)) {
$this->redirect_after = self::$currentIndex.'&'.$this->identifier.'='.(int) Tools::getValue('id_feature').'&conf=4&update'.$this->table.'&token='.$this->token;
if ('feature_value' === $this->table && !count($this->errors)) {
if (Tools::isSubmit('submitAdd'.$this->table.'AndStay')) {
$this->redirect_after = self::$currentIndex.'&addfeature_value&id_feature='.(int)Tools::getValue('id_feature').'&conf=4&token='.$this->token;
} else {
$this->redirect_after = self::$currentIndex.'&id_feature='.(int)Tools::getValue('id_feature').'&viewfeature&conf=4&token='.$this->token;
}
} elseif (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && !count($this->errors)) {
$this->redirect_after = self::$currentIndex.'&'.$this->identifier.'='.(int)$object->id.'&conf=4&update'.$this->table.'&token='.$this->token;
}
return $object;
@@ -628,24 +650,12 @@ class AdminFeaturesControllerCore extends AdminController
$this->errors[] = $this->l('Some error occurred while uploding room feature logo. Please try again.');
}
}
if ($featureValues = FeatureValue::getFeatureValuesWithLang(
$this->context->language->id,
$objFeature->id
)) {
$objFeatureValue = new FeatureValue($featureValues[0]['id_feature_value']);
} else {
$objFeatureValue = new FeatureValue();
}
$objFeatureValue->id_feature = $objFeature->id;
foreach (Language::getLanguages(true) as $lang) {
$objFeatureValue->value[$lang['id_lang']] = $objFeature->id.'.jpg';
}
$objFeatureValue->save();
return $objFeature;
}
return $objFeature;
}
return parent::processSave();
}
/**

View File

@@ -0,0 +1,123 @@
<?php
/**
* 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
*/
class AdminGuestRegistrationControllerCore extends AdminController
{
public function __construct()
{
$this->bootstrap = true;
$this->table = 'configuration';
$this->className = 'Configuration';
$this->identifier = 'id_configuration';
parent::__construct();
}
public function initContent()
{
$this->display = 'view';
$this->initToolbar();
parent::initContent();
}
public function renderView()
{
$grcInfoJson = Configuration::get('QLO_GUEST_REGISTRATION_CARD_INFO');
$savedSections = array();
if ($grcInfoJson !== false && $grcInfoJson !== '') {
$grcData = Tools::jsonDecode($grcInfoJson, true);
if (is_array($grcData)) {
$savedSections = $grcData;
}
}
$allSelected = empty($savedSections);
$nodes = array();
$objHotelBookingDetail = new HotelBookingDetail();
foreach ($objHotelBookingDetail->getRegistrationCardInfo() as $sectionId => $section) {
$sectionFields = isset($savedSections[$sectionId]) ? $savedSections[$sectionId] : array();
$fieldNodes = array();
foreach ($section['fields'] as $fieldId => $fieldName) {
$fieldSelected = $allSelected || in_array($fieldId, $sectionFields);
$fieldNodes[] = array(
'value' => $fieldId,
'name' => $fieldName,
'input_name' => 'grc_field_'.$sectionId,
'selected' => $fieldSelected,
);
}
$fieldsSelected = $allSelected || !empty(array_filter($fieldNodes, function ($n) { return $n['selected']; }));
$nodes[] = array(
'value' => $sectionId,
'name' => $section['name'],
'input_name' => 'grc_section',
'selected' => $fieldsSelected,
'children' => $fieldNodes,
);
}
$tree = new HelperTree('grc-card-info-tree');
$tree->setData($nodes)
->setUseCheckBox(true)
->setAutoSelectChildren(true)
->setUseBulkActions(true);
$this->context->smarty->assign(array(
'guest_reg_card_info_tree' => $tree->render(),
'guest_reg_card_form_action' => self::$currentIndex.'&token='.$this->token,
'guest_reg_card_preview_img_url' => $this->context->link->getBaseLink().'img/admin/guest_registration_preview.jpg',
'guest_reg_card_preview_title' => $this->l('Guest Registration Card Preview'),
));
return parent::renderView();
}
public function initToolbarTitle()
{
$this->toolbar_title = array($this->l('Guest Registration Card'));
}
public function postProcess()
{
if (Tools::isSubmit('submitGrcCardInfo')) {
$grcInfo = array();
$objHotelBookingDetail = new HotelBookingDetail();
foreach (array_keys($objHotelBookingDetail->getRegistrationCardInfo()) as $sectionId) {
$fields = array_values(array_filter(array_map('intval', (array)Tools::getValue('grc_field_'.$sectionId, array()))));
if (!empty($fields)) {
$grcInfo[$sectionId] = $fields;
}
}
if (empty($grcInfo)) {
$this->errors[] = $this->l('Please select at least one field for the Guest Registration Card.');
return;
}
Configuration::updateValue('QLO_GUEST_REGISTRATION_CARD_INFO', Tools::jsonEncode($grcInfo));
Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token.'&conf=4');
return;
}
parent::postProcess();
}
}

View File

@@ -3326,7 +3326,7 @@ class AdminImportControllerCore extends AdminController
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_image`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_access`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_booking_detail`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_branch_features`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_branch_amenity`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_cart_booking_data`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_branch_refund_rules`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_order_restrict_date`');

View File

@@ -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';

View File

@@ -72,6 +72,7 @@ class AdminOrdersControllerCore extends AdminController
) FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`id_order` = a.`id_order`) as total_guests,
(SELECT SUM(DATEDIFF(hbd.`date_to`, hbd.`date_from`)) FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`id_order` = a.`id_order`) as los,
hbd.`id_room` AS id_room_information,
(SELECT GROUP_CONCAT(CONCAT(ps.period, \'~\', ps.cnt) ORDER BY ps.period SEPARATOR \'::\') FROM (SELECT CONCAT(hbd.`date_from`, \'|\', hbd.`date_to`) AS period, COUNT(*) AS cnt FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`id_order` = a.`id_order` GROUP BY hbd.`date_from`, hbd.`date_to`) AS ps) AS stay_periods,
(SELECT COUNT(spod.`id_service_product_order_detail`) FROM `'._DB_PREFIX_.'service_product_order_detail` spod WHERE spod.`id_order` = a.`id_order` AND spod.`id_htl_booking_detail`=0) as num_products';
$this->_join = '
@@ -196,6 +197,15 @@ class AdminOrdersControllerCore extends AdminController
'type'=>'date',
'displayed' => false,
),
'stay_periods' => array(
'title' => $this->l('Stay Periods'),
'type' => 'text',
'callback' => 'formatStayPeriods',
'optional' => true,
'search' => false,
'displayed' => true,
'visible_default' => true,
),
'total_guests' => array(
'title' => $this->l('Guests'),
'type' => 'range',
@@ -212,7 +222,7 @@ class AdminOrdersControllerCore extends AdminController
'visible_default' => true
),
'los' => array(
'title' => $this->l('Stay period'),
'title' => $this->l('Stay duration'),
'align' => 'text-center',
'type' => 'range',
'havingFilter' => true,
@@ -359,6 +369,43 @@ class AdminOrdersControllerCore extends AdminController
return Tools::displayPrice($echo, (int)$idCurrency);
}
public function formatStayPeriods($value, $row)
{
if (empty($value)) {
return '--';
}
$stayPeriods = array();
foreach (explode('::', $value) as $stays) {
$countStays = explode('~', $stays);
$stayDates = explode('|', $countStays[0]);
if (count($stayDates) === 2) {
$stayPeriods[] = array(
'from' => Tools::displayDate(trim($stayDates[0])),
'to' => Tools::displayDate(trim($stayDates[1])),
'count' => isset($countStays[1]) ? (int)$countStays[1] : 1,
);
}
}
$datesDisplay = array();
foreach (array_slice($stayPeriods, 0, 1) as $stayPeriod) {
$datesDisplay[] = $stayPeriod['from'].' - '.$stayPeriod['to'];
}
$stayPeriodHtml = implode('<br>', $datesDisplay);
$uniqueStayPeriods = count($stayPeriods);
if ($uniqueStayPeriods > 1) {
$this->context->smarty->assign(array(
'stay_periods' => $stayPeriods,
'extra_stay_periods_count' => $uniqueStayPeriods - 1,
));
$stayPeriodHtml .= ' '.$this->createTemplate('_stay_periods_tooltip.tpl')->fetch();
}
return $stayPeriodHtml;
}
public function initPageHeaderToolbar()
{
if (empty($this->display)) {
@@ -484,6 +531,22 @@ class AdminOrdersControllerCore extends AdminController
}
$objHotelAdvancedPayment = new HotelAdvancedPayment();
$adminCartsAccess = Profile::getProfileAccess(
(int) $this->context->employee->id_profile,
(int) Tab::getIdFromClassName('AdminCarts')
);
$adminCustomersAccess = Profile::getProfileAccess(
(int) $this->context->employee->id_profile,
(int) Tab::getIdFromClassName('AdminCustomers')
);
$adminCartRulesAccess = Profile::getProfileAccess(
(int) $this->context->employee->id_profile,
(int) Tab::getIdFromClassName('AdminCartRules')
);
$adminAddressesAccess = Profile::getProfileAccess(
(int) $this->context->employee->id_profile,
(int) Tab::getIdFromClassName('AdminAddresses')
);
$this->context->smarty->assign(array(
'order_total' => $cart->getOrderTotal(true),
'is_advance_payment_active' => $objHotelAdvancedPayment->isAdvancePaymentAvailableForCurrentCart(),
@@ -497,6 +560,11 @@ class AdminOrdersControllerCore extends AdminController
'payment_types' => $paymentTypes,
'PAYMENT_TYPE_PAY_AT_HOTEL' => OrderPayment::PAYMENT_TYPE_PAY_AT_HOTEL,
'currency' => new Currency((int)$cart->id_currency),
'can_edit_booking_carts' => (!empty($adminCartsAccess['edit']) && (int) $adminCartsAccess['edit'] === 1),
'can_add_customers' => (!empty($adminCustomersAccess['add']) && (int) $adminCustomersAccess['add'] === 1),
'can_add_vouchers' => (!empty($adminCartRulesAccess['add']) && (int) $adminCartRulesAccess['add'] === 1),
'can_add_addresses' => (!empty($adminAddressesAccess['add']) && (int) $adminAddressesAccess['add'] === 1),
'max_child_in_room' => Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM'),
'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'),
'occupancy_required_for_booking' => $occupancyRequiredForBooking,
));
@@ -1034,7 +1102,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);
@@ -1350,7 +1422,6 @@ class AdminOrdersControllerCore extends AdminController
$this->addJqueryUI('ui.datepicker');
$this->addJqueryUI('ui.tooltip', 'base', true);
$this->addJS(_PS_JS_DIR_.'vendor/d3.v3.min.js');
if ($this->display == 'view') {
@@ -3703,6 +3774,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,
@@ -3770,6 +3843,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(),
@@ -3940,10 +4015,11 @@ class AdminOrdersControllerCore extends AdminController
$this->errors[] = $this->l('Please select a file to upload.');
} elseif ($objHotelBookingDocument->fileInfo['size'] > Tools::getMaxUploadSize()) {
$this->errors[] = $this->l('Uploaded file size is too large.');
} elseif(!(ImageManager::isRealImage($objHotelBookingDocument->fileInfo['tmp_name'])
|| $objHotelBookingDocument->fileInfo['mime'] == 'application/pdf')
) {
$this->errors[] = $this->l('Please upload an image or a PDF file only. Allowed image formats: .gif, .jpg, .jpeg and .png');
} else {
$objHotelBookingDocument->setFileType();
if (!$objHotelBookingDocument->file_type) {
$this->errors[] = $this->l('Please upload an image or a PDF file only. Allowed image formats: .gif, .jpg, .jpeg and .png');
}
}
} else {
$this->errors[] = Tools::displayError('You do not have permission to edit this order.');
@@ -5172,8 +5248,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);
@@ -5410,7 +5486,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'];
@@ -5730,8 +5807,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);
@@ -5872,25 +5949,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();
}
}
@@ -5988,7 +6068,8 @@ class AdminOrdersControllerCore extends AdminController
$cart->id,
$cart->id_guest,
$id_room,
0
0,
1
);
$totalRoomPriceAfterTE = (float) $roomTotalPrice['total_price_tax_excl'];
@@ -7739,6 +7820,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,
@@ -7995,6 +8077,8 @@ class AdminOrdersControllerCore extends AdminController
}
}
}
$this->sendChangedNotification($order);
$response['service_panel'] = $this->processRenderServicesPanel(
$order->id,
$objHotelBookingDetail->id_product,
@@ -8277,6 +8361,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,
@@ -8530,7 +8615,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,
@@ -8630,7 +8715,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,
@@ -8936,7 +9021,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;

View File

@@ -64,6 +64,15 @@ class AdminPdfControllerCore extends AdminController
}
}
public function processGenerateGuestRegistrationFormPDF()
{
if (Tools::isSubmit('id_hotel_booking_detail')) {
$this->generateGuestRegistrationFormPDF((int)Tools::getValue('id_hotel_booking_detail'));
} else {
die(Tools::displayError('The hotel booking detail ID is missing.'));
}
}
public function processGenerateBookingVoucherPDF()
{
if (Tools::isSubmit('id_order')) {
@@ -234,6 +243,17 @@ class AdminPdfControllerCore extends AdminController
$this->generatePDF($order_invoice, PDF::TEMPLATE_INVOICE);
}
public function generateGuestRegistrationFormPDF($idHotelBookingDetail)
{
$idHotelBookingDetail = (int)$idHotelBookingDetail;
if (!$idHotelBookingDetail || !Validate::isLoadedObject(new HotelBookingDetail($idHotelBookingDetail))) {
die(Tools::displayError('The hotel booking cannot be found within your database.'));
}
$pdf = new PDF($idHotelBookingDetail, PDF::TEMPLATE_GUEST_REGISTRATION_FORM, Context::getContext()->smarty);
$pdf->render('I');
}
public function generateBookingVoucherPDFByIdOrder($id_order)
{
$order = new Order((int)$id_order);

View File

@@ -195,6 +195,19 @@ class AdminPreferencesControllerCore extends AdminController
'class' => 'fixed-width-xl',
'desc' => sprintf($this->l('If set to 0, the maximum limit will be %d characters.'), Configuration::PS_SHORT_DESC_LIMIT)
),
'PS_EXPORT_FIELDS_TYPE' => array(
'title' => $this->l('CSV export fields'),
'desc' => $this->l('Choose whether list CSV exports include all fields, or only the fields currently checked in the "Available Fields" selector of the list being exported.'),
'validation' => 'isInt',
'cast' => 'intval',
'type' => 'select',
'list' => array(
array('id' => HelperList::QLO_EXPORT_FIELDS_ALL, 'name' => $this->l('All Fields')),
array('id' => HelperList::QLO_EXPORT_FIELDS_SELECTED, 'name' => $this->l('Selected Fields')),
),
'identifier' => 'id',
'defaultValue' => HelperList::QLO_EXPORT_FIELDS_ALL,
),
// 'PS_DISPLAY_SUPPLIERS' => array(
// 'title' => $this->l('Display suppliers and manufacturers'),
// 'desc' => $this->l('Enable suppliers and manufacturers pages on your front office even when their respective modules are disabled.'),

View File

@@ -107,6 +107,7 @@ class AdminProductsControllerCore extends AdminController
'Images' => $this->l('Images'),
'ServiceProduct' => $this->l('Service Products'),
// 'Associations' => $this->l('Associations'),
'Amenities' => $this->l('Amenities'),
'Features' => $this->l('Features'),
'Configuration' => $this->l('Rooms'),
'Occupancy' => $this->l('Occupancy'),
@@ -121,9 +122,10 @@ class AdminProductsControllerCore extends AdminController
'Seo' => 2,
// 'Associations' => 3,
'Images' => 4,
'Features' => 5,
'Configuration' => 6,
'Occupancy' => 7,
'Amenities' => 5,
'Features' => 6,
'Configuration' => 7,
'Occupancy' => 8,
'ServiceProduct' => 9,
'LengthOfStay' => 10,
'AdditionalFacilities' => 11,
@@ -944,12 +946,6 @@ class AdminProductsControllerCore extends AdminController
$id_hotel_new = $room_type_info['id_hotel'];
}
$objHotelRoomTypeBedType = new HotelRoomTypeBedType();
if ($roomTypeBedTypes = $objHotelRoomTypeBedType->getRoomTypeBedTypes($id_product_old)) {
$roomTypeBedTypes = array_column($roomTypeBedTypes, 'id_bed_type');
$objHotelRoomTypeBedType->updateRoomTypeBedTypes($roomTypeBedTypes, $product->id);
}
if ($product->hasAttributes()) {
Product::updateDefaultAttribute($product->id);
} else {
@@ -1143,34 +1139,45 @@ class AdminProductsControllerCore extends AdminController
}
if (Validate::isLoadedObject($product = new Product((int)Tools::getValue('id_product')))) {
// delete all objects
$product->deleteFeatures();
// add new objects
$languages = Language::getLanguages(false);
foreach ($_POST as $key => $val) {
if (preg_match('/^feature_([0-9]+)_check/i', $key, $match)) {
if ($val) {
$product->addFeaturesToDB($match[1], $val);
} else {
if ($default_value = $this->checkFeatures($languages, $match[1])) {
$id_value = $product->addFeaturesToDB($match[1], 0, 1);
foreach ($languages as $language) {
if ($cust = Tools::getValue('custom_'.$match[1].'_'.(int)$language['id_lang'])) {
$product->addFeaturesCustomToDB($id_value, (int)$language['id_lang'], $cust);
} else {
$product->addFeaturesCustomToDB($id_value, (int)$language['id_lang'], $default_value);
}
}
}
}
}
if (!$this->saveRoomTypeFeatures($product)) {
$this->errors[] = Tools::displayError('An error occurred while saving room type features.');
}
} else {
$this->errors[] = Tools::displayError('A room type must be created before adding features.');
}
}
/**
* Save assigned core feature values for a room type.
*
* @param Product $product
*
* @return bool
*/
protected function saveRoomTypeFeatures(Product $product)
{
$product->deleteFeatures();
$featureValues = Tools::getValue('feature_values', array());
if (!is_array($featureValues) || empty($featureValues)) {
return true;
}
foreach ($featureValues as $idFeature => $selectedValues) {
$idFeature = (int)$idFeature;
if (!$idFeature) {
continue;
}
foreach (array_unique(array_map('intval', $selectedValues)) as $idFeatureValue) {
if ($idFeatureValue) {
$product->addFeaturesToDB($idFeature, $idFeatureValue);
}
}
}
return true;
}
/**
* This function is never called at the moment (specific prices cannot be edited)
*/
@@ -1925,14 +1932,29 @@ class AdminProductsControllerCore extends AdminController
$this->copyFromPost($this->object, $this->table);
$this->object->booking_product = true;
if ($this->object->add()) {
$objHotelRoomTypeBedType = new HotelRoomTypeBedType();
$objHotelRoomTypeBedType->updateRoomTypeBedTypes(Tools::getValue('id_bed_types'), $this->object->id);
// associateroom type to hotel
// if ($this->object->is_virtual) {
// }
$this->assignRoomType($this->object);
if ($this->isTabSubmitted('Amenities')) {
$categories = HotelAmenities::getCategories();
if ($categories && !HotelAmenities::getAmenities()) {
$this->errors[] = Tools::displayError('No amenities have been created. Please add amenities to at least one category before assigning them.');
return false;
}
$selectedAmenities = Tools::getValue('room_type_amenities', array());
$featuredAmenities = Tools::getValue('featured_amenities', array());
if (!(new HotelRoomTypeAmenities())->saveRoomTypeAmenities((int)$this->object->id, $selectedAmenities, $featuredAmenities)) {
$this->errors[] = Tools::displayError('An error occurred while saving room type amenities.');
return false;
}
}
if ($this->isTabSubmitted('Features') && !$this->saveRoomTypeFeatures($this->object)) {
$this->errors[] = Tools::displayError('An error occurred while saving room type features.');
return false;
}
PrestaShopLogger::addLog(sprintf($this->l('%s addition', 'AdminTab', false, false), $this->className), 1, null, $this->className, (int)$this->object->id, true, (int)$this->context->employee->id);
@@ -2175,8 +2197,18 @@ class AdminProductsControllerCore extends AdminController
}
if ($object->update()) {
$objHotelRoomTypeBedType = new HotelRoomTypeBedType();
$objHotelRoomTypeBedType->updateRoomTypeBedTypes(Tools::getValue('id_bed_types'), $object->id);
if ($this->isTabSubmitted('Amenities')) {
$selectedAmenities = Tools::getValue('room_type_amenities', array());
$featuredAmenities = Tools::getValue('featured_amenities', array());
if (!(new HotelRoomTypeAmenities())->saveRoomTypeAmenities((int)$object->id, $selectedAmenities, $featuredAmenities)) {
$this->errors[] = Tools::displayError('An error occurred while saving room type amenities.');
return false;
}
}
if ($this->isTabSubmitted('Features') && !$this->saveRoomTypeFeatures($object)) {
$this->errors[] = Tools::displayError('An error occurred while saving room type features.');
return false;
}
// update position in category
$object->setPositionInCategory(Tools::getValue('category_position'));
@@ -2200,9 +2232,6 @@ class AdminProductsControllerCore extends AdminController
if ($this->isTabSubmitted('Suppliers')) {
// $this->processSuppliers();
}
if ($this->isTabSubmitted('Features')) {
$this->processFeatures();
}
if ($this->isTabSubmitted('Combinations')) {
$this->processProductAttribute();
}
@@ -3172,7 +3201,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(
'/(?:(?<!^)(?<!\s)\p{L}|\P{L})+/u','',(string) $obj->name[$this->context->language->id]),
)
);
} else {
@@ -4598,15 +4630,6 @@ class AdminProductsControllerCore extends AdminController
$data->assign('htl_full_info', $hotelFullInfo);
}
$objHotelBedType = new HotelBedType();
$bedTypes = $objHotelBedType->getAllBedTypes($this->context->language->id);
$data->assign('bed_types_info', $bedTypes);
$objHotelRoomTypeBedType = new HotelRoomTypeBedType();
if ($selectedBedTypes = $objHotelRoomTypeBedType->getRoomTypeBedTypes($product->id)) {
$selectedBedTypes = array_column($selectedBedTypes, 'id_bed_type');
$data->assign('selected_bed_types', $selectedBedTypes);
}
$this->tpl_form_vars['product'] = $product;
$this->tpl_form_vars['custom_form'] = $data->fetch();
}
@@ -4848,37 +4871,17 @@ class AdminProductsControllerCore extends AdminController
} else {
if ($obj->id) {
if ($this->product_exists_in_shop) {
$features = Feature::getFeatures($this->context->language->id, (Shop::isFeatureActive() && Shop::getContext() == Shop::CONTEXT_SHOP));
foreach ($features as $k => $tab_features) {
$features[$k]['current_item'] = false;
$features[$k]['val'] = array();
$custom = true;
foreach ($obj->getFeatures() as $tab_products) {
if ($tab_products['id_feature'] == $tab_features['id_feature']) {
$features[$k]['current_item'] = $tab_products['id_feature_value'];
}
}
$features[$k]['featureValues'] = FeatureValue::getFeatureValuesWithLang($this->context->language->id, (int)$tab_features['id_feature']);
if (count($features[$k]['featureValues'])) {
foreach ($features[$k]['featureValues'] as $value) {
if ($features[$k]['current_item'] == $value['id_feature_value']) {
$custom = false;
}
}
}
if ($custom) {
$feature_values_lang = FeatureValue::getFeatureValueLang($features[$k]['current_item']);
foreach ($feature_values_lang as $feature_value) {
$features[$k]['val'][$feature_value['id_lang']] = $feature_value;
}
}
$features = Product::getRoomTypeFeatureTreeData($obj->id);
if ($features) {
$tree = new HelperTree('room-type-features-tree', $features);
$tree->setShowCollapseExpandButton(true)
->setUseCheckBox(true)
->setAutoSelectChildren(true)
->setUseBulkActions(true)
->setUseSearch(true)
->setHeaderTemplate('tree_header_room.tpl');
$data->assign('room_type_features_tree', $tree->render());
}
$data->assign('available_features', $features);
$data->assign('product', $obj);
$data->assign('link', $this->context->link);
$data->assign('default_form_language', $this->default_form_language);
@@ -4892,6 +4895,50 @@ class AdminProductsControllerCore extends AdminController
$this->tpl_form_vars['custom_form'] = $data->fetch();
}
/**
* Prepare the amenities form tab for a room type.
*
* @param Product $obj
*
* @throws Exception
* @throws SmartyException
*/
public function initFormAmenities($obj)
{
if (!$this->default_form_language) {
$this->getLanguages();
}
$data = $this->createTemplate($this->tpl_form);
$data->assign('default_form_language', $this->default_form_language);
$data->assign('languages', $this->_languages);
$data->assign('link', $this->context->link);
$data->assign('product', $obj);
if ($obj->id) {
if ($this->product_exists_in_shop) {
$roomTypeAmenities = HotelRoomTypeAmenities::getRoomTypeAmenitiesTreeData((int) $obj->id);
if ($roomTypeAmenities) {
$tree = new HelperTree('room-type-amenities-tree', $roomTypeAmenities);
$tree->setShowCollapseExpandButton(true)
->setUseCheckBox(true)
->setAutoSelectChildren(true)
->setUseBulkActions(true)
->setUseSearch(true)
->setHeaderTemplate('tree_header_room.tpl');
$data->assign('room_type_amenities_tree', $tree->render());
$data->assign('featured_amenity_ids', array_column(HotelRoomTypeAmenities::getAmenities((int)$obj->id, 0, true), 'id'));
}
} else {
$this->displayWarning($this->l('You must save the room type in this shop before adding amenities.'));
}
} else {
$this->displayWarning($this->l('You must save this room type before adding amenities.'));
}
$this->tpl_form_vars['custom_form'] = $data->fetch();
}
public function getModalDuplicateOptions()
{
$idsHotel = HotelBranchInformation::getProfileAccessedHotels($this->context->employee->id_profile, 1, 1);
@@ -5594,6 +5641,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'))) {
@@ -5623,16 +5672,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('/(?:(?<!^)(?<!\s)\p{L}|\P{L})+/u', '', (string) $objProduct->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();

View File

@@ -38,7 +38,7 @@ class AdminSearchControllerCore extends AdminController
'AdminOrderRefundRules' => 1,
'AdminRoomTypeGlobalDemand' => 1,
'AdminGroups' => 1,
'AdminHotelFeatures' => 1,
'AdminHotelAmenities' => 1,
'AdminCustomers' => 1,
'AdminAddHotel' => 1,
'AdminNormalProducts' => 1,
@@ -190,7 +190,7 @@ class AdminSearchControllerCore extends AdminController
if (!$searchType) {
$this->searchAddress();
$this->searchHotelFeatures();
$this->searchHotelAmenities();
$this->searchAdditionalFacilities();
$this->searchRefundRules();
}
@@ -428,23 +428,23 @@ class AdminSearchControllerCore extends AdminController
}
}
public function searchHotelFeatures()
public function searchHotelAmenities()
{
if (class_exists('HotelFeatures')) {
if (isset($this->controllerAccess['AdminHotelFeatures']) && $this->controllerAccess['AdminHotelFeatures']) {
$objHotelFeatures = new HotelFeatures();
if ($hotelFeatures = $objHotelFeatures->searchByName($this->query, $this->context->language->id)) {
$features = array();
foreach ($hotelFeatures as $key => $hotelFeature) {
$features[$hotelFeature['id']]['name'] = $hotelFeature['name'];
if ($hotelFeature['parent_feature_id']) {
$features[$hotelFeature['id']]['id'] = $hotelFeature['parent_feature_id'];
if (class_exists('HotelAmenities')) {
if (isset($this->controllerAccess['AdminHotelAmenities']) && $this->controllerAccess['AdminHotelAmenities']) {
$objHotelAmenities = new HotelAmenities();
if ($hotelAmenities = $objHotelAmenities->searchByName($this->query, $this->context->language->id)) {
$amenities = array();
foreach ($hotelAmenities as $key => $hotelAmenity) {
$amenities[$hotelAmenity['id_amenity']]['name'] = $hotelAmenity['name'];
if ($hotelAmenity['id_parent']) {
$amenities[$hotelAmenity['id_amenity']]['id'] = $hotelAmenity['id_parent'];
} else {
$features[$hotelFeature['id']]['id'] = $hotelFeature['id'];
$amenities[$hotelAmenity['id_amenity']]['id'] = $hotelAmenity['id_amenity'];
}
}
$this->_list['hotel_features'] = $features;
$this->_list['hotel_amenities'] = $amenities;
}
}
}
@@ -681,10 +681,10 @@ class AdminSearchControllerCore extends AdminController
);
}
protected function initHotelFeatureList()
protected function initHotelAmenityList()
{
$this->show_toolbar = false;
$this->fields_list['hotel_features'] = array(
$this->fields_list['hotel_amenities'] = array(
'name' => array('title' => $this->l('name'), 'width' => 'auto'),
);
}
@@ -929,26 +929,26 @@ class AdminSearchControllerCore extends AdminController
$this->tpl_view_vars['customers'] = $view;
}
if (isset($this->_list['hotel_features']) && count($this->_list['hotel_features'])) {
if (isset($this->_list['hotel_amenities']) && count($this->_list['hotel_amenities'])) {
$view = '';
$this->initHotelFeatureList();
$this->initHotelAmenityList();
$helper = new HelperList();
$helper->shopLinkType = '';
$helper->simple_header = true;
$helper->identifier = 'id';
$helper->identifier = 'id_amenity';
$helper->actions = array('edit', 'view');
$helper->show_toolbar = false;
$helper->table = 'htl_features';
$helper->currentIndex = $this->context->link->getAdminLink('AdminHotelFeatures', false);
$helper->token = Tools::getAdminTokenLite('AdminHotelFeatures');
$helper->table = 'htl_amenity';
$helper->currentIndex = $this->context->link->getAdminLink('AdminHotelAmenities', false);
$helper->token = Tools::getAdminTokenLite('AdminHotelAmenities');
if ($this->_list['hotel_features']) {
$view = $helper->generateList($this->_list['hotel_features'], $this->fields_list['hotel_features']);
if ($this->_list['hotel_amenities']) {
$view = $helper->generateList($this->_list['hotel_amenities'], $this->fields_list['hotel_amenities']);
}
$this->tpl_view_vars['num_hotel_features'] = count($this->_list['hotel_features']);
$this->tpl_view_vars['hotel_features'] = $view;
$this->tpl_view_vars['num_hotel_amenities'] = count($this->_list['hotel_amenities']);
$this->tpl_view_vars['hotel_amenities'] = $view;
}
if (isset($this->_list['groups']) && count($this->_list['groups'])) {
$view = '';

View File

@@ -92,37 +92,45 @@ class CategoryControllerCore extends FrontController
public function init()
{
// Get category ID
$id_category = (int)Tools::getValue('id_category');
if (!$id_category || !Validate::isUnsignedId($id_category)) {
$this->errors[] = Tools::displayError('Missing category ID');
}
$idCategory = (int) Tools::getValue('id_category');
$this->category = new Category($idCategory, $this->context->language->id);
// validate dates if available
$dateFrom = Tools::getValue('date_from');
$dateTo = Tools::getValue('date_to');
$idHotel = HotelBranchInformation::getHotelIdByIdCategory($id_category);
if (!HotelHelper::validateDateRangeForHotel($dateFrom, $dateTo, $idHotel)) {
$idHotel = HotelBranchInformation::getHotelIdByIdCategory($idCategory);
if (!$idCategory || !Validate::isUnsignedId($idCategory)) {
Tools::redirect($this->context->link->getPageLink('pagenotfound'));
}
// Instantiate category
$this->category = new Category($id_category, $this->context->language->id);
parent::init();
// Check if the category is active and return 404 error if is disable.
if (!$this->category->active || !Validate::isLoadedObject($this->category) || !$this->category->inShop() || !$this->category->isAssociatedToShop() || in_array($this->category->id, array(Configuration::get('PS_HOME_CATEGORY'), Configuration::get('PS_ROOT_CATEGORY')))) {
header('HTTP/1.1 404 Not Found');
header('Status: 404 Not Found');
} elseif (!Validate::isLoadedObject($this->category) || !$this->category->active) {
Tools::redirect($this->context->link->getPageLink('pagenotfound'));
} else
// Check if category can be accessible by current customer and return 403 if not
if (!$this->category->checkAccess($this->context->customer->id)) {
} elseif ($idHotel && !(new HotelBranchInformation())->hotelBranchInfoByCategoryId($idCategory)) {
Tools::redirect($this->context->link->getPageLink('pagenotfound'));
} elseif ($idHotel && !HotelHelper::validateDateRangeForHotel($dateFrom, $dateTo, $idHotel)) {
Tools::redirect($this->context->link->getPageLink('pagenotfound'));
} else {
parent::init();
if (
!$this->category->inShop()
|| !$this->category->isAssociatedToShop()
|| in_array(
$this->category->id,
array(
Configuration::get('PS_HOME_CATEGORY'),
Configuration::get('PS_ROOT_CATEGORY')
)
)
) {
header('HTTP/1.1 404 Not Found');
header('Status: 404 Not Found');
Tools::redirect($this->context->link->getPageLink('pagenotfound'));
} elseif (!$this->category->checkAccess($this->context->customer->id)) {
header('HTTP/1.1 403 Forbidden');
header('Status: 403 Forbidden');
$this->errors[] = Tools::displayError('You do not have access to this category.');
$this->customer_access = false;
}
}
}
/**
@@ -130,14 +138,15 @@ class CategoryControllerCore extends FrontController
*/
public function initContent()
{
if (!$this->customer_access) {
$this->display_column_left = false;
$this->display_column_right = false;
}
parent::initContent();
$this->setTemplate(_PS_THEME_DIR_.'category.tpl');
if (!$this->customer_access) {
return;
}
$id_category = Tools::getValue('id_category');
$displayAllRoomsTypes = false;
@@ -236,7 +245,6 @@ class CategoryControllerCore extends FrontController
}
}
$feat_img_dir = _PS_IMG_.'rf/';
$ratting_img = _MODULE_DIR_.'hotelreservationsystem/views/img/Slices/icons-sprite.png';
$this->context->smarty->assign(array(
'warning_num' => $warning_num,
@@ -249,7 +257,7 @@ class CategoryControllerCore extends FrontController
'display_all_room_types' => $displayAllRoomsTypes,
'id_hotel' => $id_hotel,
'currency' => $currency,
'feat_img_dir' => $feat_img_dir,
'amenity_img_dir' => _MODULE_DIR_.'hotelreservationsystem/views/img/hotel_amenities/',
'ratting_img' => $ratting_img,
));

View File

@@ -237,11 +237,11 @@ class ContactControllerCore extends FrontController
$this->addJS(_PS_JS_DIR_.'validate.js');
// GOOGLE MAP
if (($PS_API_KEY = Configuration::get('PS_API_KEY')) && ($PS_MAP_ID = Configuration::get('PS_MAP_ID')) && Configuration::get('WK_GOOGLE_ACTIVE_MAP')) {
if (($PS_API_KEY = Configuration::get('PS_API_KEY')) && Configuration::get('WK_GOOGLE_ACTIVE_MAP')) {
Media::addJsDef(
array(
'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')),
'PS_MAP_ID' => $PS_MAP_ID,
'PS_MAP_ID' => Configuration::get('PS_MAP_ID'),
)
);
$this->addJS(

View File

@@ -639,7 +639,6 @@ class GuestTrackingControllerCore extends FrontController
if (Validate::isLoadedObject($objHotelBranchInformation)) {
if (($apiKey = Configuration::get('PS_API_KEY'))
&& Configuration::get('WK_GOOGLE_ACTIVE_MAP')
&& ($PS_MAP_ID = Configuration::get('PS_MAP_ID'))
) {
if (floatval($objHotelBranchInformation->latitude) != 0
&& floatval($objHotelBranchInformation->longitude) != 0
@@ -647,7 +646,7 @@ class GuestTrackingControllerCore extends FrontController
Media::addJsDef(array(
'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')),
'initiateMap' => 1,
'PS_MAP_ID' => $PS_MAP_ID,
'PS_MAP_ID' => Configuration::get('PS_MAP_ID'),
));
$this->addJS(

View File

@@ -523,8 +523,18 @@ class OrderDetailControllerCore extends FrontController
{
$response = array('extra_demands' => false);
$idOrder = (int) Tools::getValue('id_order');
$order = new Order($idOrder);
if (!Validate::isLoadedObject($order)
|| $order->id_customer != $this->context->customer->id
|| $order->secure_key != Tools::getValue('secure_key')
) {
$this->ajaxDie(json_encode($response));
}
if (($idProduct = Tools::getValue('id_product'))
&& ($idOrder = Tools::getValue('id_order'))
&& $idOrder
&& ($dateFrom = Tools::getValue('date_from'))
&& ($dateTo = Tools::getValue('date_to'))
) {
@@ -568,7 +578,7 @@ class OrderDetailControllerCore extends FrontController
}
$this->context->smarty->assign(array(
'objOrder' => new Order($idOrder),
'objOrder' => $order,
));
$response['extra_demands'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order-extra-services.tpl');
@@ -874,7 +884,6 @@ class OrderDetailControllerCore extends FrontController
if (Validate::isLoadedObject($objHotelBranchInformation)) {
if (($apiKey = Configuration::get('PS_API_KEY'))
&& Configuration::get('WK_GOOGLE_ACTIVE_MAP')
&& ($PS_MAP_ID = Configuration::get('PS_MAP_ID'))
) {
if (floatval($objHotelBranchInformation->latitude) != 0
&& floatval($objHotelBranchInformation->longitude) != 0
@@ -882,7 +891,7 @@ class OrderDetailControllerCore extends FrontController
Media::addJsDef(array(
'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')),
'initiateMap' => 1,
'PS_MAP_ID' => $PS_MAP_ID,
'PS_MAP_ID' => Configuration::get('PS_MAP_ID'),
));
$this->addJS(
'https://maps.googleapis.com/maps/api/js?key='.$apiKey.'&libraries=places,marker&loading=async&callback=initMap&language='.

View File

@@ -111,7 +111,7 @@ class OurPropertiesControllerCore extends FrontController
$hotelsInfo = array_slice($hotelsInfo, $page * 10, 10);
}
if ($displayHotelMap && Configuration::get('PS_API_KEY') && Configuration::get('WK_GOOGLE_ACTIVE_MAP') && Configuration::get('PS_MAP_ID')) {
if ($displayHotelMap && Configuration::get('PS_API_KEY') && Configuration::get('WK_GOOGLE_ACTIVE_MAP')) {
if ($hotelLocations = $objHotelInfo->getMapFormatHotelsInfo(Configuration::get('WK_MAP_HOTEL_ACTIVE_ONLY'))) {
$hotelLocationArray = str_replace(array('\n', '\r'), '', json_encode($hotelLocations));
}
@@ -144,11 +144,11 @@ class OurPropertiesControllerCore extends FrontController
$this->addJS(_THEME_JS_DIR_.'our-properties.js');
$this->addCSS(_THEME_CSS_DIR_.'our-properties.css');
// GOOGLE MAP
if (($PS_API_KEY = Configuration::get('PS_API_KEY')) && ($PS_MAP_ID = Configuration::get('PS_MAP_ID')) && Configuration::get('WK_GOOGLE_ACTIVE_MAP')) {
if (($PS_API_KEY = Configuration::get('PS_API_KEY')) && Configuration::get('WK_GOOGLE_ACTIVE_MAP')) {
Media::addJsDef(
array(
'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')),
'PS_MAP_ID' => $PS_MAP_ID
'PS_MAP_ID' => Configuration::get('PS_MAP_ID')
)
);

View File

@@ -66,9 +66,7 @@ class ProductControllerCore extends FrontController
$this->addJqueryPlugin('jqzoom');
}
if (($PS_API_KEY = Configuration::get('PS_API_KEY'))
&& ($PS_MAP_ID = Configuration::get('PS_MAP_ID'))
) {
if ($PS_API_KEY = Configuration::get('PS_API_KEY')) {
$objHotelRoomType = new HotelRoomType();
if ($roomTypeInfo = $objHotelRoomType->getRoomTypeInfoByIdProduct($this->product->id)) {
$objHotelBranchInformation = new HotelBranchInformation($roomTypeInfo['id_hotel']);
@@ -81,7 +79,7 @@ class ProductControllerCore extends FrontController
'longitude' => $objHotelBranchInformation->longitude,
),
'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')),
'PS_MAP_ID' => $PS_MAP_ID
'PS_MAP_ID' => Configuration::get('PS_MAP_ID')
));
$this->addJS(
@@ -126,6 +124,12 @@ class ProductControllerCore extends FrontController
$objHotelRoomType = new HotelRoomType();
if ($hotelRoomInfo = $objHotelRoomType->getRoomTypeInfoByIdProduct($this->product->id)) {
$idHotel = (int) $hotelRoomInfo['id_hotel'];
// If the hotel this room type belongs to is disabled, redirect to home page
if (!(new HotelBranchInformation())->hotelBranchesInfo(false, 1, 0, $idHotel)) {
Tools::redirect($this->context->link->getPageLink('pagenotfound'));
}
if (!HotelHelper::validateDateRangeForHotel($dateFrom, $dateTo, $idHotel)) {
Tools::redirect($this->context->link->getPageLink('pagenotfound'));
}
@@ -346,12 +350,12 @@ class ProductControllerCore extends FrontController
$hotel_location = $addressInfo['city'].
($addressInfo['id_state']?', '.$addressInfo['state']:'').', '.$addressInfo['country'];
$obj_hotel_feaures_ids = $obj_hotel_branch->getFeaturesOfHotelByHotelId($hotel_id);
$obj_hotel_amenities_ids = $obj_hotel_branch->getAmenitiesOfHotelByHotelId($hotel_id);
if (isset($obj_hotel_feaures_ids) && $obj_hotel_feaures_ids) {
foreach ($obj_hotel_feaures_ids as $key => $value) {
$obj_htl_ftr = new HotelFeatures();
$htl_info = $obj_htl_ftr->getFeatureInfoById($value['feature_id']);
if (isset($obj_hotel_amenities_ids) && $obj_hotel_amenities_ids) {
foreach ($obj_hotel_amenities_ids as $key => $value) {
$obj_htl_amenity = new HotelAmenities();
$htl_info = $obj_htl_amenity->getAmenityInfoById($value['amenity_id']);
$htl_features[] = $htl_info['name'];
}
}
@@ -409,19 +413,9 @@ class ProductControllerCore extends FrontController
}
}
$objHotelBedType = new HotelBedType();
if ($bedTypes = $objHotelBedType->getAllBedTypes($this->context->language->id)) {
foreach ($bedTypes as $bedTypeKey => $bedType) {
$bedTypes[$bedTypeKey]['area'] = Tools::ps_round($bedType['width'], 2).' * '.Tools::ps_round($bedType['length'], 2);
}
$bedTypes = array_column($bedTypes, null, 'id_bed_type');
}
$objHotelRoomTypeBedType = new HotelRoomTypeBedType();
if ($selectedBedTypes = $objHotelRoomTypeBedType->getRoomTypeBedTypes($this->product->id)) {
$selectedBedTypes = array_column($selectedBedTypes, 'id_bed_type');
}
$roomFeatures = $this->product->getFrontFeatures($this->context->language->id);
$roomAmenities = HotelRoomTypeAmenities::getAmenities($this->product->id, $this->context->language->id);
$hotelAmenities = HotelBranchAmenities::getAmenities($hotel_id, $this->context->language->id);
$this->context->smarty->assign(
array(
@@ -449,14 +443,14 @@ class ProductControllerCore extends FrontController
'hotel_description' => $hotel_info_by_id['description'],
'hotel_policies' => $hotel_policies,
'hotel_features' => $htl_features,
'room_type_features' => $roomFeatures,
'room_dynamic_amenities' => $roomAmenities,
'hotel_dynamic_amenities' => $hotelAmenities,
'amenity_img_dir' => _MODULE_DIR_.'hotelreservationsystem/views/img/hotel_amenities/',
'hotel_image_link' => $hotelImageLink,
'hotel_has_images' => (bool) HotelImage::getCover($hotel_id),
'ftr_img_src' => _PS_IMG_.'rf/',
'order_date_restrict' => $order_date_restrict,
'PS_SERVICE_PRODUCT_CATEGORY_FILTER' => Configuration::get('PS_SERVICE_PRODUCT_CATEGORY_FILTER'),
'bed_types_info' => $bedTypes,
'selected_bed_types' => $selectedBedTypes,
'dimension_unit' => Configuration::get('WK_DIMENSION_UNIT', $this->context->language->id),
)
);

File diff suppressed because it is too large Load Diff

View File

@@ -1,17 +0,0 @@
Adress ID;Alias*;Active (0/1);Customer e-mail*;Customer ID;Manufacturer;Supplier;Company;Lastname*;Firstname*;Address 1*;Address 2;Zipcode*;City*;Country*;State;Other;Phone;Mobile Phone;VAT number;DNI
1;Peter.Pan / New York;1;Peter.Pan@prestashop.com;;;;;Pan;Peter;360W, 42nd Street;;12001;New York;United States;New York;;01 02 03 04 05;06 02 03 04 05;;;
2;Wendy.Moira.Darling / New York;1;Wendy.Moira.Darling@prestashop.com;;;;;Darling;Wendy Moira;360W, 42nd Street;;12001;New York;United States;New York;;01 02 03 04 05;06 02 03 04 05;;;
3;Wendy.Moira.Darling / London;1;Wendy.Moira.Darling@prestashop.com;;;;;Darling;Wendy Moira;Lansdowne road 50 London;Kensington;W11;London;United Kingdom;;;01 02 03 04 05;06 02 03 04 05;;;
4;Tiger.Lily / Arizona;1;Tiger.Lily@prestashop.com;;;;;Lily;Tiger;Brackin Ranch Road;;86001;Flagstaff;United States;Arizona;;01 02 03 04 05;06 02 03 04 05;;;
5;Tiger.Lily / Le Chesnay;1;Tiger.Lily@prestashop.com;;;;;Lily;Tiger;53 passage des pas sages;;78150;Le Chesnay;France;;;01 02 03 04 05;06 02 03 04 05;;;
6;James.Hook / Home;1;James.Hook@prestashop.com;;;;;Hook;James;Mass Gravesite;P.O. Box 007;2101;Cayman Brac;Cayman Islands;;;01 02 03 04 05;06 02 03 04 05;;;
7;James Hook / Pro;1;James.Hook@prestashop.com;;;;Räuber Schätze GmBH;Hook;James;12 Leipziger Platz;;13505;Berlin;Germany;;;01 02 03 04 05;06 02 03 04 05;;;
8;Tinker.Bell / Napaiiri;1;Tinker.Bell@prestashop.com;;;;Santa Clauss Inc.;Bell;Tinker;Tähtikuja 1;;96930;Napapiiri;Finland;;;01 02 03 04 05;06 02 03 04 05;;;
9;Smee / Fiji;1;Bob.Smee@prestashop.com;;;;;Smee;Bob;Cross Island rd 321;Vanua Levu;;Savusavu;Fiji;;;01 02 03 04 05;06 02 03 04 05;;;
10;Smee / Portland;1;Bob.Smee@prestashop.com;;;;Lattice Semiconductor;Smee;Bob;5555 NE Moore Ct;;97124;Hillsboro;United States;Oregon;;01 02 03 04 05;06 02 03 04 05;;;
11;Tictac Crocodile / Home;1;Tictac.Crocodile@prestashop.com;;;;;Crocodile;Tictac;Old State Rd 4A;Saddlebunch keys;33040;Bay Point;United States;Florida;Beware the Shark :);01 02 03 04 05;06 02 03 04 05;;;
12;Apple / address1;1;;;Apple;;;Doe;John;1–6 Infinite Loop;;95014;Cupertino;United States;California;;01 02 03 04 05;06 02 03 04 05;;;
13;Shure / address1;1;;;Shure;;;Non-Doe;John;5800W Touhy Avenue;;60714;Niles;United States;Illinois;;01 02 03 04 05;06 02 03 04 05;;;
14;Shure / address2;1;;;Shure;;;Schuss-mayer;Kurt;Jakob-Dieffenbacher-Str. 12;;75031;Eppingen;Germany;;;01 02 03 04 05;06 02 03 04 05;;;
15;UPS / address1;1;;;;U.P.S;;Austin;Steve;55NE Glenlake Parkway;;30328;Atlanta;United States;Georgia;;01 02 03 04 05;06 02 03 04 05;;;
16;FedEX / address1;1;;;;FedEX;;Noland;Chuck;3640 Hacks Cross Rd;;32125;Memphis;United States;Tennessee;;01 02 03 04 05;06 02 03 04 05;;;
1 Adress ID;Alias*;Active (0/1);Customer e-mail*;Customer ID;Manufacturer;Supplier;Company;Lastname*;Firstname*;Address 1*;Address 2;Zipcode*;City*;Country*;State;Other;Phone;Mobile Phone;VAT number;DNI
2 1;Peter.Pan / New York;1;Peter.Pan@prestashop.com;;;;;Pan;Peter;360W, 42nd Street;;12001;New York;United States;New York;;01 02 03 04 05;06 02 03 04 05;;;
3 2;Wendy.Moira.Darling / New York;1;Wendy.Moira.Darling@prestashop.com;;;;;Darling;Wendy Moira;360W, 42nd Street;;12001;New York;United States;New York;;01 02 03 04 05;06 02 03 04 05;;;
4 3;Wendy.Moira.Darling / London;1;Wendy.Moira.Darling@prestashop.com;;;;;Darling;Wendy Moira;Lansdowne road 50 London;Kensington;W11;London;United Kingdom;;;01 02 03 04 05;06 02 03 04 05;;;
5 4;Tiger.Lily / Arizona;1;Tiger.Lily@prestashop.com;;;;;Lily;Tiger;Brackin Ranch Road;;86001;Flagstaff;United States;Arizona;;01 02 03 04 05;06 02 03 04 05;;;
6 5;Tiger.Lily / Le Chesnay;1;Tiger.Lily@prestashop.com;;;;;Lily;Tiger;53 passage des pas sages;;78150;Le Chesnay;France;;;01 02 03 04 05;06 02 03 04 05;;;
7 6;James.Hook / Home;1;James.Hook@prestashop.com;;;;;Hook;James;Mass Gravesite;P.O. Box 007;2101;Cayman Brac;Cayman Islands;;;01 02 03 04 05;06 02 03 04 05;;;
8 7;James Hook / Pro;1;James.Hook@prestashop.com;;;;Räuber Schätze GmBH;Hook;James;12 Leipziger Platz;;13505;Berlin;Germany;;;01 02 03 04 05;06 02 03 04 05;;;
9 8;Tinker.Bell / Napaiiri;1;Tinker.Bell@prestashop.com;;;;Santa Clauss Inc.;Bell;Tinker;Tähtikuja 1;;96930;Napapiiri;Finland;;;01 02 03 04 05;06 02 03 04 05;;;
10 9;Smee / Fiji;1;Bob.Smee@prestashop.com;;;;;Smee;Bob;Cross Island rd 321;Vanua Levu;;Savusavu;Fiji;;;01 02 03 04 05;06 02 03 04 05;;;
11 10;Smee / Portland;1;Bob.Smee@prestashop.com;;;;Lattice Semiconductor;Smee;Bob;5555 NE Moore Ct;;97124;Hillsboro;United States;Oregon;;01 02 03 04 05;06 02 03 04 05;;;
12 11;Tictac Crocodile / Home;1;Tictac.Crocodile@prestashop.com;;;;;Crocodile;Tictac;Old State Rd 4A;Saddlebunch keys;33040;Bay Point;United States;Florida;Beware the Shark :);01 02 03 04 05;06 02 03 04 05;;;
13 12;Apple / address1;1;;;Apple;;;Doe;John;1–6 Infinite Loop;;95014;Cupertino;United States;California;;01 02 03 04 05;06 02 03 04 05;;;
14 13;Shure / address1;1;;;Shure;;;Non-Doe;John;5800W Touhy Avenue;;60714;Niles;United States;Illinois;;01 02 03 04 05;06 02 03 04 05;;;
15 14;Shure / address2;1;;;Shure;;;Schuss-mayer;Kurt;Jakob-Dieffenbacher-Str. 12;;75031;Eppingen;Germany;;;01 02 03 04 05;06 02 03 04 05;;;
16 15;UPS / address1;1;;;;U.P.S;;Austin;Steve;55NE Glenlake Parkway;;30328;Atlanta;United States;Georgia;;01 02 03 04 05;06 02 03 04 05;;;
17 16;FedEX / address1;1;;;;FedEX;;Noland;Chuck;3640 Hacks Cross Rd;;32125;Memphis;United States;Tennessee;;01 02 03 04 05;06 02 03 04 05;;;

View File

@@ -1,5 +0,0 @@
Alias ID;Alias *;Search *;Active (0/1)
1;htl, hotle;Hotel;1
2;rom, roms;Room;1
2;romblk, romblk;Room Block;1
3;ordre;Order;1
1 Alias ID Alias * Search * Active (0/1)
2 1 htl, hotle Hotel 1
3 2 rom, roms Room 1
4 2 romblk, romblk Room Block 1
5 3 ordre Order 1

View File

@@ -1,28 +0,0 @@
Product ID*;Attribute (Name:Type:Position)*;Value (Value:Position)*;Supplier reference;Reference;EAN13;UPC;Wholesale price;Impact on price;Ecotax;Quantity;Minimal quantity;Impact on weight;Default (0 = No, 1 = Yes);Combination available date;Image position;Image URL;Delete existing images (0 = No, 1 = Yes);ID / Name of shop;Advanced Stock Managment;Depends on stock;Warehouse
1;Color:color:0, Disk space:select:1;Blue:0, 16GB:1;RF-Nano-Blue-16GB;RP-Nano-Blue-16GB;0000080446392;116052426077;100;40;0;10;1;0;0;2014-01-01;1;http://youdomain.com/img.jpg;1;0;0;0;
1;Color:color:0, Disk space:select:1;Blue:0, 8GB:1;RF-Nano-Blue-8GB;RP-Nano-Blue-8GB;0000080446393;457698445011;80;0;0;10;1;0;0;2014-01-02;2;http://youdomain.com/img.jpg;1;0;0;0;
1;Color:color:0, Disk space:select:1;Yellow:0, 16GB:1;RF-Nano-Yellow-16GB;RP-Nano-Yellow-16GB;0000080446394;541661772012;100;40;0;10;1;0;0;2014-01-03;3;http://youdomain.com/img.jpg;1;0;0;0;
1;Color:color:0, Disk space:select:1;Yellow:0, 8GB:1;RF-Nano-Yellow-8GB;RP-Nano-Yellow-8GB;0000080446395;080064075921;80;0;0;10;1;0;1;2014-01-04;4;http://youdomain.com/img.jpg;1;0;0;0;
1;Color:color:0, Disk space:select:1;Metal:0, 16GB:1;RF-Nano-Metal-16GB;RP-Nano-Metal-16GB;0000080446396;943284585394;100;40;0;10;1;0;0;2014-01-05;5;http://youdomain.com/img.jpg;1;0;0;0;
1;Color:color:0, Disk space:select:1;Metal:0, 8GB:1;RF-Nano-Metal-8GB;RP-Nano-Metal-8GB;0000080446397;779589194980;80;0;0;10;1;0;0;2014-01-06;6;http://youdomain.com/img.jpg;1;0;0;0;
1;Color:color:0, Disk space:select:1;Black:0, 16GB:1;RF-Nano-Black-16GB;RP-Nano-Black-16GB;0000080446398;633319125866;100;40;0;10;1;0;0;2014-01-07;7;http://youdomain.com/img.jpg;1;0;0;0;
1;Color:color:0, Disk space:select:1;Black:0, 8GB:1;RF-Nano-Black-8GB;RP-Nano-Black-8GB;0000080446399;397444719890;80;0;0;10;1;0;0;2014-01-08;8;http://youdomain.com/img.jpg;1;0;0;0;
1;Color:color:0, Disk space:select:1;Orange:0, 16GB:1;RF-Nano-Orange-16GB;RP-Nano-Orange-16GB;0000080446400;295437962413;100;40;0;10;1;0;0;2014-01-09;9;http://youdomain.com/img.jpg;1;0;0;0;
1;Color:color:0, Disk space:select:1;Orange:0, 8GB:1;RF-Nano-Orange-8GB;RP-Nano-Orange-8GB;0000080446401;879526174964;80;0;0;10;1;0;0;2014-01-10;10;http://youdomain.com/img.jpg;1;0;0;0;
1;Color:color:0, Disk space:select:1;Pink:0, 16GB:1;RF-Nano-Pink-16GB;RP-Nano-Pink-16GB;0000080446402;850089888307;100;40;0;10;1;0;0;2014-01-11;11;http://youdomain.com/img.jpg;1;0;0;0;
1;Color:color:0, Disk space:select:1;Pink:0, 8GB:1;RF-Nano-Pink-8GB;RP-Nano-Pink-8GB;0000080446403;681363175404;80;0;0;10;1;0;0;2014-01-12;12;http://youdomain.com/img.jpg;1;0;0;0;
1;Color:color:0, Disk space:select:1;Green:0, 16GB:1;RF-Nano-Green-16GB;RP-Nano-Green-16GB;0000080446404;343278201887;100;40;0;10;1;0;0;2014-01-13;13;http://youdomain.com/img.jpg;1;0;0;0;
1;Color:color:0, Disk space:select:1;Green:0, 8GB:1;RF-Nano-Green-8GB;RP-Nano-Green-8GB;0000080446405;910409113499;80;0;0;10;1;0;0;2014-01-14;14;http://youdomain.com/img.jpg;1;0;0;0;
1;Color:color:0, Disk space:select:1;Purple:0, 16GB:1;RF-Nano-Purple-16GB;RP-Nano-Purple-16GB;0000080446406;835747175053;100;40;0;10;1;0;0;2014-01-15;15;http://youdomain.com/img.jpg;1;0;0;0;
1;Color:color:0, Disk space:select:1;Purple:0, 8GB:1;RF-Nano-Purple-8GB;RP-Nano-Purple-8GB;0000080446407;825739577313;80;0;0;10;1;0;0;2014-01-16;16;http://youdomain.com/img.jpg;1;0;0;0;
2;Color:color:0;Metal:0;RF-Shuffle-Metal;RP-Shuffle-Metal;0685387000000;623892618739;40;0;0;12;1;0;1;2014-01-17;1;http://youdomain.com/img.jpg;1;0;0;0;
2;Color:color:0;Blue:0;RF-Shuffle-Blue;RP-Shuffle-Blue;0685387000000;848279119061;40;0;0;12;1;0;0;2014-01-18;2;http://youdomain.com/img.jpg;1;0;0;0;
2;Color:color:0;Pink:0;RF-Shuffle-Pink;RP-Shuffle-Pink;0685387000000;745140261407;40;0;0;12;1;0;0;2014-01-19;3;http://youdomain.com/img.jpg;1;0;0;0;
2;Color:color:0;Green:0;RF-Shuffle-Green;RP-Shuffle-Green;0685387000000;180143857886;40;0;0;12;1;0;0;2014-01-20;4;http://youdomain.com/img.jpg;1;0;0;0;
3;Color:color:0, Disk space:select:1, ICU:select:2;Metal:0, 80GB Parallel ATA Drive @ 4200 rpm:1, 1.60GHz Intel Core 2 Duo:2;RF-MacBookAir80GB-1.6MHz;RP-MacBookAir80GB-1.6MHz;0123457000000;959149242374;0;750;0;10;1;0;0;2014-01-21;1;http://youdomain.com/img.jpg;1;0;0;0;
3;Color:color:0, Disk space:select:1, ICU:select:2;Metal:0, 80GB Parallel ATA Drive @ 4200 rpm:1, 1.80GHz Intel Core 2 Duo:2;RF-MacBookAir80GB-1.6MHz;RP-MacBookAir80GB-1.6MHz;0123457000000;110179337894;0;0;0;10;1;0;1;2014-01-22;2;http://youdomain.com/img.jpg;1;0;0;0;
3;Color:color:0, Disk space:select:1, ICU:select:2;Metal:0, Optional 64GB solid-state drive:1, 1.60GHz Intel Core 2 Duo:2;RF-MacBookAir64GB-1.8MHz;RP-MacBookAir64GB-1.8MHz;0123457000000;576786535242;0;225;0;10;1;0;0;2014-01-23;3;http://youdomain.com/img.jpg;1;0;0;0;
3;Color:color:0, Disk space:select:1, ICU:select:2;Metal:0, Optional 64GB solid-state drive:1, 1.60GHz Intel Core 2 Duo:2;RF-MacBookAir64GB-1.8MHz;RP-MacBookAir64GB-1.8MHz;0123457000000;288200093419;0;975;0;10;1;0;0;2014-01-24;4;http://youdomain.com/img.jpg;1;0;0;0;
5;Disk space:select:1;8GB:0;RF-IpodTouch8GB;RP-IpodTouch8GB;8456120000000;626733005930;200;0;0;10;1;0;1;2014-01-25;1;http://youdomain.com/img.jpg;1;0;0;0;
5;Disk space:select:1;16GB:0;RF-IpodTouch16GB;RP-IpodTouch16GB;8456120000000;604116319829;250;75;0;10;1;0;0;2014-01-26;2;http://youdomain.com/img.jpg;1;0;0;0;
5;Disk space:select:1;32GB:0;RF-IpodTouch32GB;RP-IpodTouch32GB;8456120000000;635894030063;300;150;0;10;1;0;0;2014-01-27;3;http://youdomain.com/img.jpg;1;0;0;0;
1 Product ID* Attribute (Name:Type:Position)* Value (Value:Position)* Supplier reference Reference EAN13 UPC Wholesale price Impact on price Ecotax Quantity Minimal quantity Impact on weight Default (0 = No, 1 = Yes) Combination available date Image position Image URL Delete existing images (0 = No, 1 = Yes) ID / Name of shop Advanced Stock Managment Depends on stock Warehouse
2 1 Color:color:0, Disk space:select:1 Blue:0, 16GB:1 RF-Nano-Blue-16GB RP-Nano-Blue-16GB 0000080446392 116052426077 100 40 0 10 1 0 0 2014-01-01 1 http://youdomain.com/img.jpg 1 0 0 0
3 1 Color:color:0, Disk space:select:1 Blue:0, 8GB:1 RF-Nano-Blue-8GB RP-Nano-Blue-8GB 0000080446393 457698445011 80 0 0 10 1 0 0 2014-01-02 2 http://youdomain.com/img.jpg 1 0 0 0
4 1 Color:color:0, Disk space:select:1 Yellow:0, 16GB:1 RF-Nano-Yellow-16GB RP-Nano-Yellow-16GB 0000080446394 541661772012 100 40 0 10 1 0 0 2014-01-03 3 http://youdomain.com/img.jpg 1 0 0 0
5 1 Color:color:0, Disk space:select:1 Yellow:0, 8GB:1 RF-Nano-Yellow-8GB RP-Nano-Yellow-8GB 0000080446395 080064075921 80 0 0 10 1 0 1 2014-01-04 4 http://youdomain.com/img.jpg 1 0 0 0
6 1 Color:color:0, Disk space:select:1 Metal:0, 16GB:1 RF-Nano-Metal-16GB RP-Nano-Metal-16GB 0000080446396 943284585394 100 40 0 10 1 0 0 2014-01-05 5 http://youdomain.com/img.jpg 1 0 0 0
7 1 Color:color:0, Disk space:select:1 Metal:0, 8GB:1 RF-Nano-Metal-8GB RP-Nano-Metal-8GB 0000080446397 779589194980 80 0 0 10 1 0 0 2014-01-06 6 http://youdomain.com/img.jpg 1 0 0 0
8 1 Color:color:0, Disk space:select:1 Black:0, 16GB:1 RF-Nano-Black-16GB RP-Nano-Black-16GB 0000080446398 633319125866 100 40 0 10 1 0 0 2014-01-07 7 http://youdomain.com/img.jpg 1 0 0 0
9 1 Color:color:0, Disk space:select:1 Black:0, 8GB:1 RF-Nano-Black-8GB RP-Nano-Black-8GB 0000080446399 397444719890 80 0 0 10 1 0 0 2014-01-08 8 http://youdomain.com/img.jpg 1 0 0 0
10 1 Color:color:0, Disk space:select:1 Orange:0, 16GB:1 RF-Nano-Orange-16GB RP-Nano-Orange-16GB 0000080446400 295437962413 100 40 0 10 1 0 0 2014-01-09 9 http://youdomain.com/img.jpg 1 0 0 0
11 1 Color:color:0, Disk space:select:1 Orange:0, 8GB:1 RF-Nano-Orange-8GB RP-Nano-Orange-8GB 0000080446401 879526174964 80 0 0 10 1 0 0 2014-01-10 10 http://youdomain.com/img.jpg 1 0 0 0
12 1 Color:color:0, Disk space:select:1 Pink:0, 16GB:1 RF-Nano-Pink-16GB RP-Nano-Pink-16GB 0000080446402 850089888307 100 40 0 10 1 0 0 2014-01-11 11 http://youdomain.com/img.jpg 1 0 0 0
13 1 Color:color:0, Disk space:select:1 Pink:0, 8GB:1 RF-Nano-Pink-8GB RP-Nano-Pink-8GB 0000080446403 681363175404 80 0 0 10 1 0 0 2014-01-12 12 http://youdomain.com/img.jpg 1 0 0 0
14 1 Color:color:0, Disk space:select:1 Green:0, 16GB:1 RF-Nano-Green-16GB RP-Nano-Green-16GB 0000080446404 343278201887 100 40 0 10 1 0 0 2014-01-13 13 http://youdomain.com/img.jpg 1 0 0 0
15 1 Color:color:0, Disk space:select:1 Green:0, 8GB:1 RF-Nano-Green-8GB RP-Nano-Green-8GB 0000080446405 910409113499 80 0 0 10 1 0 0 2014-01-14 14 http://youdomain.com/img.jpg 1 0 0 0
16 1 Color:color:0, Disk space:select:1 Purple:0, 16GB:1 RF-Nano-Purple-16GB RP-Nano-Purple-16GB 0000080446406 835747175053 100 40 0 10 1 0 0 2014-01-15 15 http://youdomain.com/img.jpg 1 0 0 0
17 1 Color:color:0, Disk space:select:1 Purple:0, 8GB:1 RF-Nano-Purple-8GB RP-Nano-Purple-8GB 0000080446407 825739577313 80 0 0 10 1 0 0 2014-01-16 16 http://youdomain.com/img.jpg 1 0 0 0
18 2 Color:color:0 Metal:0 RF-Shuffle-Metal RP-Shuffle-Metal 0685387000000 623892618739 40 0 0 12 1 0 1 2014-01-17 1 http://youdomain.com/img.jpg 1 0 0 0
19 2 Color:color:0 Blue:0 RF-Shuffle-Blue RP-Shuffle-Blue 0685387000000 848279119061 40 0 0 12 1 0 0 2014-01-18 2 http://youdomain.com/img.jpg 1 0 0 0
20 2 Color:color:0 Pink:0 RF-Shuffle-Pink RP-Shuffle-Pink 0685387000000 745140261407 40 0 0 12 1 0 0 2014-01-19 3 http://youdomain.com/img.jpg 1 0 0 0
21 2 Color:color:0 Green:0 RF-Shuffle-Green RP-Shuffle-Green 0685387000000 180143857886 40 0 0 12 1 0 0 2014-01-20 4 http://youdomain.com/img.jpg 1 0 0 0
22 3 Color:color:0, Disk space:select:1, ICU:select:2 Metal:0, 80GB Parallel ATA Drive @ 4200 rpm:1, 1.60GHz Intel Core 2 Duo:2 RF-MacBookAir80GB-1.6MHz RP-MacBookAir80GB-1.6MHz 0123457000000 959149242374 0 750 0 10 1 0 0 2014-01-21 1 http://youdomain.com/img.jpg 1 0 0 0
23 3 Color:color:0, Disk space:select:1, ICU:select:2 Metal:0, 80GB Parallel ATA Drive @ 4200 rpm:1, 1.80GHz Intel Core 2 Duo:2 RF-MacBookAir80GB-1.6MHz RP-MacBookAir80GB-1.6MHz 0123457000000 110179337894 0 0 0 10 1 0 1 2014-01-22 2 http://youdomain.com/img.jpg 1 0 0 0
24 3 Color:color:0, Disk space:select:1, ICU:select:2 Metal:0, Optional 64GB solid-state drive:1, 1.60GHz Intel Core 2 Duo:2 RF-MacBookAir64GB-1.8MHz RP-MacBookAir64GB-1.8MHz 0123457000000 576786535242 0 225 0 10 1 0 0 2014-01-23 3 http://youdomain.com/img.jpg 1 0 0 0
25 3 Color:color:0, Disk space:select:1, ICU:select:2 Metal:0, Optional 64GB solid-state drive:1, 1.60GHz Intel Core 2 Duo:2 RF-MacBookAir64GB-1.8MHz RP-MacBookAir64GB-1.8MHz 0123457000000 288200093419 0 975 0 10 1 0 0 2014-01-24 4 http://youdomain.com/img.jpg 1 0 0 0
26 5 Disk space:select:1 8GB:0 RF-IpodTouch8GB RP-IpodTouch8GB 8456120000000 626733005930 200 0 0 10 1 0 1 2014-01-25 1 http://youdomain.com/img.jpg 1 0 0 0
27 5 Disk space:select:1 16GB:0 RF-IpodTouch16GB RP-IpodTouch16GB 8456120000000 604116319829 250 75 0 10 1 0 0 2014-01-26 2 http://youdomain.com/img.jpg 1 0 0 0
28 5 Disk space:select:1 32GB:0 RF-IpodTouch32GB RP-IpodTouch32GB 8456120000000 635894030063 300 150 0 10 1 0 0 2014-01-27 3 http://youdomain.com/img.jpg 1 0 0 0

View File

@@ -1,35 +1,32 @@
<?php
/*
* 2007-2017 PrestaShop
*
/**
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* 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:
* http://opensource.org/licenses/osl-3.0.php
* 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 license@prestashop.com so we can send you a copy immediately.
* 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 PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
* 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 PrestaShop SA <contact@prestashop.com>
* @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
* @author Webkul IN
* @copyright Since 2010 Webkul
* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
*/
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;
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;

View File

@@ -1,63 +0,0 @@
Manufacturer ID;Active (0/1);Name *;Description;Short description;Meta title;Meta keywords;Meta description;Image URL
1;1;Apple;"<p style=""text-align: justify;"">The company was founded on April 1, 1976, and incorporated as Apple Computer, Inc. on January 3, 1977.The word ""Computer"" was removed from its name on January 9, 2007, the same day Steve Jobs introduced the iPhone, reflecting its shifted focus towards consumer electronics.<br /><br />Apple is the world's second-largest information technology company by revenue after Samsung Electronics, and the world's third-largest mobile phone maker after Samsung and Nokia.Fortune magazine named Apple the most admired company in the United States in 2008, and in the world from 2008 to 2012. However, the company has received criticism for its contractors' labor practices, and for Apple's own environmental and business practices.<br /><br />As of May 2013, Apple maintains 408 retail stores in fourteen countries as well as the online Apple Store and iTunes Store, the latter of which is the world's largest music retailer. Apple is the largest publicly traded corporation in the world by market capitalization, with an estimated value of US$415 billion as of March 2013. As of Sept 29 2012, the company had 72,800 permanent full-time employees and 3,300 temporary full-time employees worldwide. Its worldwide annual revenue in 2012 totalled $156 billion. In May 2013, Apple entered the top ten of the Fortune 500 list of companies for the first time, rising 11 places above its 2012 ranking to take the sixth position.</p>
<p> </p>
<p style=""text-align: right;""><a href=""http://en.wikipedia.org/wiki/Apple_Inc."" target=""_blank""><span style=""color: #008080;""><em><span style=""color: #008080;""><span id=""result_box"" lang=""en""><span class=""hps atn"">(</span><span>For more,</span> <span class=""hps"">go to the</span> </span></span><span style=""color: #008080;""><span id=""result_box"" lang=""en""><span class=""hps"">original article</span></span></span><span style=""color: #008080;""><span id=""result_box"" lang=""en""> <span class=""hps"">on</span> </span></span><span style=""color: #008080;""><span id=""result_box"" lang=""en""><span class=""hps"">Wikipedia)</span></span></span></em></span></a></p>";"<p> </p>
<div class=""floatnone""><strong><span class=""image""><img style=""display: block; margin-left: auto; margin-right: auto;"" src=""http://upload.wikimedia.org/wikipedia/commons/thumb/f/fa/Apple_logo_black.svg/101px-Apple_logo_black.svg.png"" alt=""1998-present"" width=""101"" height=""121"" /></span></strong></div>
<div class=""floatnone""> </div>
<p style=""text-align: justify;""> </p>
<p style=""text-align: justify;""><strong>Apple Inc.,</strong> formerly Apple Computer, Inc., is an American multinational corporation headquartered in Cupertino, California that designs, develops, and sells consumer electronics, computer software and personal computers.</p>";MetaTitle-Apple;MetaKeywords-Apple;Meta description-Apple;http://localhost/prestashop/img/m/1.jpg
2;1;Shure;"<h2 style=""text-align: justify;""><span class=""mw-headline""><br /></span></h2>
<h2 style=""text-align: justify;""><span id=""Company_history"" class=""mw-headline"">Company history</span></h2>
<p style=""text-align: justify;"">Shure was founded by Sidney N. Shure in 1925 as ""The Shure Radio Company"", selling radio parts kits in the days before complete manufactured radios were available. The company's office was located at 19 South Wells Street in downtown Chicago, Illinois. The following year, Shure published its first direct mail catalog, which was one of only six radio parts catalogs in the United States at the time. By 1928, the company had grown to over 75 employees, and Sidney's brother, Samuel J. Shure, joined the company, which was renamed Shure Brothers Company. The company moved into new offices at 335 West Madison Street in Chicago. In 1929, with the advent of the Great Depression and the increased availability of factory-built radios, Shure Brothers Company was forced to greatly reduce their staff and became the exclusive US distributor of a small microphone manufacturer. In 1930, Samuel J. Shure left the company.</p>
<p style=""text-align: justify;"">In 1931, Shure and engineer Ralph Glover began development of the first Shure microphone, and the following year, the Model 33N Two-Button Carbon Microphone was introduced, making Shure one of only four microphone manufacturers in the U.S.. Shure's first condenser microphone, crystal microphone, and microphone suspension support system (for which they received their first patent) were all introduced that same decade. In 1939, Shure introduced the Model 55 Unidyne Microphone, which went on to become one of the world's most recognized microphones.</p>
<p style=""text-align: justify;"">In 1941, Shure was contracted by the United States armed forces to supply microphones during World War II, and by the following year, the T-17B was the microphone most widely used by the U.S. Army and Navy. Shure also manufactured throat, headset, and oxygen mask microphones, and adopted the United States Military Standard for all Shure microphones.</p>
<p style=""text-align: justify;"">By the mid-1940s, Shure was also manufacturing and supplying phonograph cartridges to major phonograph manufacturers including Philco, RCA, Emerson, Magnavox, Admiral, and Motorola, and was the largest producer of phonograph cartridges in the U.S. at that time. Among Shure's innovations in phonograph cartridge design was Ralph Glover and Ben Bauer's ""needle-tilt"" principle for minimizing record wear while improving sound reproduction, and Jim Kogen's engineering concept of ""trackability."" Shure produced the first phonograph cartridge capable of playing both long-playing and 78 rpm records, the first cartridge with tracking force of only one gram, and the first cartridge meeting the requirements of stereo recording. At the peak of Shure's phonograph cartridge production, the company was producing approximately 28,000 cartridges per day, with 25,000 of those coming from a Shure phonograph cartridge plant in Phoenix, Arizona. After the introduction of compact discs in the 1980s reduced the demand for phonograph cartridges, Shure closed the Phoenix facility but continued manufacturing phonograph cartridges, and continues to manufacture them today.</p>
<p style=""text-align: justify;"">Shure also developed and produced products for medical applications. In 1937, their 66A piezoelectric stethophone was designed to accurately reproduce chest sounds, and in the early 1960s, the SP-5, SP-5S and SP-6 stethoscope pickups were produced. Shure also produced hearing aid cartridges used in hearing aid products from manufacturers like Maico, Telex, Dictograph, Otarian, Vocalite, and Trimm.</p>
<p style=""text-align: justify;"">In 1956, Shure moved its corporate headquarters to Hartrey Avenue in Evanston, Illinois, where it remained for 47 years. Beginning in the 1956, Shure manufactured magnetic tape recording heads and two years later, the company announced it was ready to mass-produce 4-ch recording heads. By 1964, however, Shure announced it would no longer produce tape recording heads due to increased competition.</p>
<p style=""text-align: justify;"">In 1953, Shure introduced their first wireless microphone system for performers, and in 1959, they introduced the Unidyne III Microphone, which was the predecessor to the SM57, which would be introduced, along with the SM58, six years later. Shure also produced portable equipment for broadcast field recording like Vocal Master, the M67 Portable Mixer, and the FP31 Portable Mixer. In 1990, Shure entered the wireless microphone market with the L-Series.</p>
<p style=""text-align: justify;"">In 1981, James Kogen, Executive Vice President, Operations, was promoted to President and General Manager of Shure. In 1995, Sidney N. Shure died at the age of 93, and Rose L. Shure was elected Chairman of the Board of Directors. In 1996, James Kogen retired; Santo (Sandy) LaMantia, Vice President of Engineering, was named President and CEO. Shure Brothers Incorporated was officially renamed Shure Incorporated in 1999.</p>
<p>In 2001, Shure acquired the Popper Stopper brand of studio pop filters from Middle Atlantic Products Inc. The following year, Shure adopted hearing conservation as the company’s corporate cause and established the Shure Bid for Hearing program. In 2003, Shure moved into new corporate headquarters in Niles, Illinois, into a building designed by architect Helmut Jahn which was originally the headquarters of <span class=""new"">HA•LO Industries</span>. The 65,000-square-foot (6,000 m<sup>2</sup>) Technology Annex designed by Krueck and Sexton Architects, opened in 2005, houses Shure's Performance Listening Center. In 2008, Shure celebrated the opening of The S.N. Shure Theater and Interactive Display at their corporate headquarters.</p>
<h3 style=""text-align: justify;""><span id=""International_offices"" class=""mw-headline"">International offices</span></h3>
<ul style=""text-align: justify;"">
<li>1991: Shure Europe GmbH opened in Heilbronn, Germany to provide sales, service and support to Shure distribution centers in 34 European countries.</li>
<li>1999: Shure Asia Limited is opened in Hong Kong to serve Distribution Centers and distributors throughout Asia and the Pacific Rim.</li>
<li>2002: Shure Distribution GmbH established as a subsidiary of Shure Europe GmbH, to handle direct sales with Shure dealers in Germany.</li>
<li>2003: HW International, Shure's United Kingdom Distribution Center, acquired and renamed Shure Distribution UK.</li>
<li>2005: Sales and marketing office opened in Shanghai, China.</li>
<li>2006: Sales and marketing office opened in Tokyo, Japan.</li>
<li>2010: New subsidiary formed in the Netherlands</li>
</ul>
<h3 style=""text-align: justify;""><span id=""Production_facility_expansion"" class=""mw-headline"">Production facility expansion</span></h3>
<ul style=""text-align: justify;"">
<li>1982: Manufacturing facility opened in Wheeling, Illinois</li>
<li>1983: Phonograph cartridge manufacturing facility opened in Agua Prieta, Mexico</li>
<li>1984: Wired microphone manufacturing facility opened in Juarez, Mexico</li>
<li>1989: Juarez, Mexico facility expanded</li>
<li>1994: Agua Prieta facility expanded in 1994</li>
<li>2005: Manufacturing facility opened in Suzhou, China</li>
</ul>
<p><sup id=""cite_ref-The_History_of_Shure_Incorporated_7-1"" class=""reference""><span><a href=""http://en.wikipedia.org/wiki/Samsung"" target=""_blank""><span style=""color: #008080;""><em><span style=""color: #008080;""><span id=""result_box"" lang=""en""><span class=""hps""><br class=""hps atn"" /></span></span></span></em></span></a></span></sup></p>
<p style=""text-align: right;""><a href=""http://en.wikipedia.org/wiki/Shure"" target=""_blank""><span><span style=""color: #008080;""><em><span style=""color: #008080;""><span lang=""en""><span class=""hps""><span style=""color: #008080;""><em><span style=""color: #008080;""><span id=""result_box"" lang=""en""><span class=""hps atn"">(</span><span>For more,</span> <span class=""hps"">go to the</span> <span class=""hps"">original article</span> <span class=""hps"">on</span> <span class=""hps"">Wikipedia)</span></span></span></em></span></span></span></span></em></span></span></a></p>";"<p> </p>
<p style=""text-align: center;""><span class=""image""><img class=""thumbimage"" src=""http://upload.wikimedia.org/wikipedia/en/thumb/f/f7/Shure_us_pro_circle_s_logo.gif/220px-Shure_us_pro_circle_s_logo.gif"" alt="""" width=""131"" height=""131"" /></span></p>
<p> </p>
<p style=""text-align: justify;""><strong>Shure Incorporated</strong> is an American corporation originally founded by Sidney N. Shure in Chicago, Illinois in 1925 as a supplier of radio parts kits. The company became a consumer and professional audio-electronics manufacturer of microphones, wireless microphone systems, phonograph cartridges, discussion systems, mixers, and digital signal processing.</p>
<p style=""text-align: justify;"">The company also produces listening products, including headphones, high-end earbuds and personal monitor systems.</p>";MetaTitle-Shure;MetaKeywords-Shure;Meta description-Shure;http://localhost/prestashop/img/m/2.jpg
3;1;Sony;"<h2><span class=""mw-headline""><br /></span></h2>
<h2><span id=""History"" class=""mw-headline"">History</span></h2>
<p>Sony found its beginning in the wake of World War II. In 1946, Masaru Ibuka started an electronics shop in a bomb-damaged department store building in Tokyo. The company had $530 in capital and a total of eight employees. The next year, he was joined by his colleague, Akio Morita, and they founded a company called <strong>Tokyo Tsushin Kogyo</strong> (Tokyo Telecommunications Engineering Corporation). The company built Japan's first tape recorder, called the Type-G. In 1958 the company name was changed to Sony.</p>
<p style=""text-align: justify;"">In the early 1950s, Ibuka traveled in the United States and heard about Bell Labs' invention of the...</p>
<p style=""text-align: right;""><span style=""color: #008080;""><em><a href=""http://en.wikipedia.org/wiki/Sony"" target=""_blank""><span style=""color: #008080;""><span id=""result_box"" lang=""en""><span class=""hps atn"">(</span><span>For more,</span> <span class=""hps"">go to the</span> <span class=""hps"">original article</span> <span class=""hps"">on</span> <span class=""hps"">Wikipedia)</span></span><br /></span></a></em></span></p>";"<p style=""text-align: justify;""> </p>
<p><span class=""image""><img style=""display: block; margin-left: auto; margin-right: auto;"" src=""http://upload.wikimedia.org/wikipedia/commons/thumb/c/ca/Sony_logo.svg/220px-Sony_logo.svg.png"" alt=""Sony logo.svg"" width=""220"" height=""37"" /></span></p>
<p> </p>
<p><strong><br /></strong></p>
<p style=""text-align: justify;""><strong>Sony Corporation</strong>, commonly referred to as Sony, is a Japanese multinational conglomerate corporation headquartered in Konan Minato, Tokyo, Japan. Its diversified business is primarily focused on the electronics, game, entertainment and financial services sectors. The company is one of the leading manufacturers of electronic products for the consumer and professional markets. Sony is ranked 87th on the 2012 list of Fortune Global 500.</p>";MetaTitle-Sony;MetaKeywords-Sony;Meta description-Sony;http://localhost/prestashop/img/m/3.jpg
4;1;Samsung;"<p style=""text-align: justify;"">Samsung was founded by Lee Byung-chul in 1938 as a trading company. Over the next three decades the group diversified into areas including food processing, textiles, insurance, securities and retail. Samsung entered the electronics industry in the late 1960s and the construction and shipbuilding industries in the mid-1970s; these areas would drive its subsequent growth. Following Lee's death in 1987, Samsung was separated into four business groups – Samsung Group, Shinsegae Group, CJ Group and Hansol Group. Since the 1990s Samsung has increasingly globalized its activities, and electronics, particularly mobile phones and semiconductors, have become its most important source of income.</p>
<p>Notable Samsung industrial subsidiaries include Samsung Electronics (the <span class=""mw-redirect"">world's largest information technology company</span> measured by 2012 revenues, and 4th in market value), Samsung Heavy Industries (the world's 2nd-largest <span class=""mw-redirect"">shipbuilder</span> measured by 2010 revenues), and Samsung Engineering and <span class=""mw-redirect"">Samsung C&amp;T</span> (respectively the world's 13th and 36th-largest construction companies). Other notable subsidiaries include Samsung Life Insurance (the world's 14th-largest life insurance company), Samsung Everland (operator of Everland Resort, the oldest <span class=""mw-redirect"">theme park</span> in South Korea), Samsung Techwin (an aerospace, surveillance and defense company) and <span class=""new"">Cheil Worldwide</span> (the world's 16th-largest advertising agency measured by 2011 revenues).</p>
<p>Samsung has a powerful influence on South Korea's economic development, politics, media and culture, and has been a major driving force behind the ""Miracle on the Han River"". Its affiliate companies produce around a fifth of South Korea's total exports. Samsung's revenue was equal to 17% of the South Korea's $1,082 billion GDP.</p>
<p style=""text-align: justify;"">In 2013, Samsung began construction on building the world's largest ...</p>
<p style=""text-align: right;""><a href=""http://en.wikipedia.org/wiki/Samsung"" target=""_blank""><span style=""color: #008080;""><em><span style=""color: #008080;""><span id=""result_box"" lang=""en""><span class=""hps atn"">(</span><span>For more,</span> <span class=""hps"">go to the</span> <span class=""hps"">original article</span> <span class=""hps"">on</span> <span class=""hps"">Wikipedia)</span></span></span></em></span></a></p>";"<p><strong><br /></strong></p>
<div class=""center"">
<div class=""floatnone"" style=""text-align: center;""><span class=""image""><img src=""http://upload.wikimedia.org/wikipedia/commons/thumb/2/24/Samsung_Logo.svg/200px-Samsung_Logo.svg.png"" alt=""Samsung Logo.svg"" width=""200"" height=""68"" /></span></div>
</div>
<p><strong><br /></strong></p>
<p style=""text-align: justify;""><strong>Samsung Group</strong> is a South Korean multinational conglomerate company headquartered in Samsung Town, Seoul. It comprises numerous subsidiaries and affiliated businesses, most of them united under the <em>Samsung</em> brand, and is the largest South Korean <em>chaebol</em> (business conglomerate).</p>";MetaTitle-Samsung;MetaKeywords-Samsung;Meta description-Samsung;http://localhost/prestashop/img/m/4.jpg
1 Manufacturer ID Active (0/1) Name * Description Short description Meta title Meta keywords Meta description Image URL
2 1 1 Apple <p style="text-align: justify;">The company was founded on April 1, 1976, and incorporated as Apple Computer, Inc. on January 3, 1977.The word "Computer" was removed from its name on January 9, 2007, the same day Steve Jobs introduced the iPhone, reflecting its shifted focus towards consumer electronics.<br /><br />Apple is the world's second-largest information technology company by revenue after Samsung Electronics, and the world's third-largest mobile phone maker after Samsung and Nokia.Fortune magazine named Apple the most admired company in the United States in 2008, and in the world from 2008 to 2012. However, the company has received criticism for its contractors' labor practices, and for Apple's own environmental and business practices.<br /><br />As of May 2013, Apple maintains 408 retail stores in fourteen countries as well as the online Apple Store and iTunes Store, the latter of which is the world's largest music retailer. Apple is the largest publicly traded corporation in the world by market capitalization, with an estimated value of US$415 billion as of March 2013. As of Sept 29 2012, the company had 72,800 permanent full-time employees and 3,300 temporary full-time employees worldwide. Its worldwide annual revenue in 2012 totalled $156 billion. In May 2013, Apple entered the top ten of the Fortune 500 list of companies for the first time, rising 11 places above its 2012 ranking to take the sixth position.</p> <p> </p> <p style="text-align: right;"><a href="http://en.wikipedia.org/wiki/Apple_Inc." target="_blank"><span style="color: #008080;"><em><span style="color: #008080;"><span id="result_box" lang="en"><span class="hps atn">(</span><span>For more,</span> <span class="hps">go to the</span> </span></span><span style="color: #008080;"><span id="result_box" lang="en"><span class="hps">original article</span></span></span><span style="color: #008080;"><span id="result_box" lang="en"> <span class="hps">on</span> </span></span><span style="color: #008080;"><span id="result_box" lang="en"><span class="hps">Wikipedia)</span></span></span></em></span></a></p> <p> </p> <div class="floatnone"><strong><span class="image"><img style="display: block; margin-left: auto; margin-right: auto;" src="http://upload.wikimedia.org/wikipedia/commons/thumb/f/fa/Apple_logo_black.svg/101px-Apple_logo_black.svg.png" alt="1998-present" width="101" height="121" /></span></strong></div> <div class="floatnone"> </div> <p style="text-align: justify;"> </p> <p style="text-align: justify;"><strong>Apple Inc.,</strong> formerly Apple Computer, Inc., is an American multinational corporation headquartered in Cupertino, California that designs, develops, and sells consumer electronics, computer software and personal computers.</p> MetaTitle-Apple MetaKeywords-Apple Meta description-Apple http://localhost/prestashop/img/m/1.jpg
3 2 1 Shure <h2 style="text-align: justify;"><span class="mw-headline"><br /></span></h2> <h2 style="text-align: justify;"><span id="Company_history" class="mw-headline">Company history</span></h2> <p style="text-align: justify;">Shure was founded by Sidney N. Shure in 1925 as "The Shure Radio Company", selling radio parts kits in the days before complete manufactured radios were available. The company's office was located at 19 South Wells Street in downtown Chicago, Illinois. The following year, Shure published its first direct mail catalog, which was one of only six radio parts catalogs in the United States at the time. By 1928, the company had grown to over 75 employees, and Sidney's brother, Samuel J. Shure, joined the company, which was renamed Shure Brothers Company. The company moved into new offices at 335 West Madison Street in Chicago. In 1929, with the advent of the Great Depression and the increased availability of factory-built radios, Shure Brothers Company was forced to greatly reduce their staff and became the exclusive US distributor of a small microphone manufacturer. In 1930, Samuel J. Shure left the company.</p> <p style="text-align: justify;">In 1931, Shure and engineer Ralph Glover began development of the first Shure microphone, and the following year, the Model 33N Two-Button Carbon Microphone was introduced, making Shure one of only four microphone manufacturers in the U.S.. Shure's first condenser microphone, crystal microphone, and microphone suspension support system (for which they received their first patent) were all introduced that same decade. In 1939, Shure introduced the Model 55 Unidyne Microphone, which went on to become one of the world's most recognized microphones.</p> <p style="text-align: justify;">In 1941, Shure was contracted by the United States armed forces to supply microphones during World War II, and by the following year, the T-17B was the microphone most widely used by the U.S. Army and Navy. Shure also manufactured throat, headset, and oxygen mask microphones, and adopted the United States Military Standard for all Shure microphones.</p> <p style="text-align: justify;">By the mid-1940s, Shure was also manufacturing and supplying phonograph cartridges to major phonograph manufacturers including Philco, RCA, Emerson, Magnavox, Admiral, and Motorola, and was the largest producer of phonograph cartridges in the U.S. at that time. Among Shure's innovations in phonograph cartridge design was Ralph Glover and Ben Bauer's "needle-tilt" principle for minimizing record wear while improving sound reproduction, and Jim Kogen's engineering concept of "trackability." Shure produced the first phonograph cartridge capable of playing both long-playing and 78 rpm records, the first cartridge with tracking force of only one gram, and the first cartridge meeting the requirements of stereo recording. At the peak of Shure's phonograph cartridge production, the company was producing approximately 28,000 cartridges per day, with 25,000 of those coming from a Shure phonograph cartridge plant in Phoenix, Arizona. After the introduction of compact discs in the 1980s reduced the demand for phonograph cartridges, Shure closed the Phoenix facility but continued manufacturing phonograph cartridges, and continues to manufacture them today.</p> <p style="text-align: justify;">Shure also developed and produced products for medical applications. In 1937, their 66A piezoelectric stethophone was designed to accurately reproduce chest sounds, and in the early 1960s, the SP-5, SP-5S and SP-6 stethoscope pickups were produced. Shure also produced hearing aid cartridges used in hearing aid products from manufacturers like Maico, Telex, Dictograph, Otarian, Vocalite, and Trimm.</p> <p style="text-align: justify;">In 1956, Shure moved its corporate headquarters to Hartrey Avenue in Evanston, Illinois, where it remained for 47 years. Beginning in the 1956, Shure manufactured magnetic tape recording heads and two years later, the company announced it was ready to mass-produce 4-ch recording heads. By 1964, however, Shure announced it would no longer produce tape recording heads due to increased competition.</p> <p style="text-align: justify;">In 1953, Shure introduced their first wireless microphone system for performers, and in 1959, they introduced the Unidyne III Microphone, which was the predecessor to the SM57, which would be introduced, along with the SM58, six years later. Shure also produced portable equipment for broadcast field recording like Vocal Master, the M67 Portable Mixer, and the FP31 Portable Mixer. In 1990, Shure entered the wireless microphone market with the L-Series.</p> <p style="text-align: justify;">In 1981, James Kogen, Executive Vice President, Operations, was promoted to President and General Manager of Shure. In 1995, Sidney N. Shure died at the age of 93, and Rose L. Shure was elected Chairman of the Board of Directors. In 1996, James Kogen retired; Santo (Sandy) LaMantia, Vice President of Engineering, was named President and CEO. Shure Brothers Incorporated was officially renamed Shure Incorporated in 1999.</p> <p>In 2001, Shure acquired the Popper Stopper brand of studio pop filters from Middle Atlantic Products Inc. The following year, Shure adopted hearing conservation as the company’s corporate cause and established the Shure Bid for Hearing program. In 2003, Shure moved into new corporate headquarters in Niles, Illinois, into a building designed by architect Helmut Jahn which was originally the headquarters of <span class="new">HA•LO Industries</span>. The 65,000-square-foot (6,000 m<sup>2</sup>) Technology Annex designed by Krueck and Sexton Architects, opened in 2005, houses Shure's Performance Listening Center. In 2008, Shure celebrated the opening of The S.N. Shure Theater and Interactive Display at their corporate headquarters.</p> <h3 style="text-align: justify;"><span id="International_offices" class="mw-headline">International offices</span></h3> <ul style="text-align: justify;"> <li>1991: Shure Europe GmbH opened in Heilbronn, Germany to provide sales, service and support to Shure distribution centers in 34 European countries.</li> <li>1999: Shure Asia Limited is opened in Hong Kong to serve Distribution Centers and distributors throughout Asia and the Pacific Rim.</li> <li>2002: Shure Distribution GmbH established as a subsidiary of Shure Europe GmbH, to handle direct sales with Shure dealers in Germany.</li> <li>2003: HW International, Shure's United Kingdom Distribution Center, acquired and renamed Shure Distribution UK.</li> <li>2005: Sales and marketing office opened in Shanghai, China.</li> <li>2006: Sales and marketing office opened in Tokyo, Japan.</li> <li>2010: New subsidiary formed in the Netherlands</li> </ul> <h3 style="text-align: justify;"><span id="Production_facility_expansion" class="mw-headline">Production facility expansion</span></h3> <ul style="text-align: justify;"> <li>1982: Manufacturing facility opened in Wheeling, Illinois</li> <li>1983: Phonograph cartridge manufacturing facility opened in Agua Prieta, Mexico</li> <li>1984: Wired microphone manufacturing facility opened in Juarez, Mexico</li> <li>1989: Juarez, Mexico facility expanded</li> <li>1994: Agua Prieta facility expanded in 1994</li> <li>2005: Manufacturing facility opened in Suzhou, China</li> </ul> <p><sup id="cite_ref-The_History_of_Shure_Incorporated_7-1" class="reference"><span><a href="http://en.wikipedia.org/wiki/Samsung" target="_blank"><span style="color: #008080;"><em><span style="color: #008080;"><span id="result_box" lang="en"><span class="hps"><br class="hps atn" /></span></span></span></em></span></a></span></sup></p> <p style="text-align: right;"><a href="http://en.wikipedia.org/wiki/Shure" target="_blank"><span><span style="color: #008080;"><em><span style="color: #008080;"><span lang="en"><span class="hps"><span style="color: #008080;"><em><span style="color: #008080;"><span id="result_box" lang="en"><span class="hps atn">(</span><span>For more,</span> <span class="hps">go to the</span> <span class="hps">original article</span> <span class="hps">on</span> <span class="hps">Wikipedia)</span></span></span></em></span></span></span></span></em></span></span></a></p> <p> </p> <p style="text-align: center;"><span class="image"><img class="thumbimage" src="http://upload.wikimedia.org/wikipedia/en/thumb/f/f7/Shure_us_pro_circle_s_logo.gif/220px-Shure_us_pro_circle_s_logo.gif" alt="" width="131" height="131" /></span></p> <p> </p> <p style="text-align: justify;"><strong>Shure Incorporated</strong> is an American corporation originally founded by Sidney N. Shure in Chicago, Illinois in 1925 as a supplier of radio parts kits. The company became a consumer and professional audio-electronics manufacturer of microphones, wireless microphone systems, phonograph cartridges, discussion systems, mixers, and digital signal processing.</p> <p style="text-align: justify;">The company also produces listening products, including headphones, high-end earbuds and personal monitor systems.</p> MetaTitle-Shure MetaKeywords-Shure Meta description-Shure http://localhost/prestashop/img/m/2.jpg
4 3 1 Sony <h2><span class="mw-headline"><br /></span></h2> <h2><span id="History" class="mw-headline">History</span></h2> <p>Sony found its beginning in the wake of World War II. In 1946, Masaru Ibuka started an electronics shop in a bomb-damaged department store building in Tokyo. The company had $530 in capital and a total of eight employees. The next year, he was joined by his colleague, Akio Morita, and they founded a company called <strong>Tokyo Tsushin Kogyo</strong> (Tokyo Telecommunications Engineering Corporation). The company built Japan's first tape recorder, called the Type-G. In 1958 the company name was changed to Sony.</p> <p style="text-align: justify;">In the early 1950s, Ibuka traveled in the United States and heard about Bell Labs' invention of the...</p> <p style="text-align: right;"><span style="color: #008080;"><em><a href="http://en.wikipedia.org/wiki/Sony" target="_blank"><span style="color: #008080;"><span id="result_box" lang="en"><span class="hps atn">(</span><span>For more,</span> <span class="hps">go to the</span> <span class="hps">original article</span> <span class="hps">on</span> <span class="hps">Wikipedia)</span></span><br /></span></a></em></span></p> <p style="text-align: justify;"> </p> <p><span class="image"><img style="display: block; margin-left: auto; margin-right: auto;" src="http://upload.wikimedia.org/wikipedia/commons/thumb/c/ca/Sony_logo.svg/220px-Sony_logo.svg.png" alt="Sony logo.svg" width="220" height="37" /></span></p> <p> </p> <p><strong><br /></strong></p> <p style="text-align: justify;"><strong>Sony Corporation</strong>, commonly referred to as Sony, is a Japanese multinational conglomerate corporation headquartered in Konan Minato, Tokyo, Japan. Its diversified business is primarily focused on the electronics, game, entertainment and financial services sectors. The company is one of the leading manufacturers of electronic products for the consumer and professional markets. Sony is ranked 87th on the 2012 list of Fortune Global 500.</p> MetaTitle-Sony MetaKeywords-Sony Meta description-Sony http://localhost/prestashop/img/m/3.jpg
5 4 1 Samsung <p style="text-align: justify;">Samsung was founded by Lee Byung-chul in 1938 as a trading company. Over the next three decades the group diversified into areas including food processing, textiles, insurance, securities and retail. Samsung entered the electronics industry in the late 1960s and the construction and shipbuilding industries in the mid-1970s; these areas would drive its subsequent growth. Following Lee's death in 1987, Samsung was separated into four business groups – Samsung Group, Shinsegae Group, CJ Group and Hansol Group. Since the 1990s Samsung has increasingly globalized its activities, and electronics, particularly mobile phones and semiconductors, have become its most important source of income.</p> <p>Notable Samsung industrial subsidiaries include Samsung Electronics (the <span class="mw-redirect">world's largest information technology company</span> measured by 2012 revenues, and 4th in market value), Samsung Heavy Industries (the world's 2nd-largest <span class="mw-redirect">shipbuilder</span> measured by 2010 revenues), and Samsung Engineering and <span class="mw-redirect">Samsung C&amp;T</span> (respectively the world's 13th and 36th-largest construction companies). Other notable subsidiaries include Samsung Life Insurance (the world's 14th-largest life insurance company), Samsung Everland (operator of Everland Resort, the oldest <span class="mw-redirect">theme park</span> in South Korea), Samsung Techwin (an aerospace, surveillance and defense company) and <span class="new">Cheil Worldwide</span> (the world's 16th-largest advertising agency measured by 2011 revenues).</p> <p>Samsung has a powerful influence on South Korea's economic development, politics, media and culture, and has been a major driving force behind the "Miracle on the Han River". Its affiliate companies produce around a fifth of South Korea's total exports. Samsung's revenue was equal to 17% of the South Korea's $1,082 billion GDP.</p> <p style="text-align: justify;">In 2013, Samsung began construction on building the world's largest ...</p> <p style="text-align: right;"><a href="http://en.wikipedia.org/wiki/Samsung" target="_blank"><span style="color: #008080;"><em><span style="color: #008080;"><span id="result_box" lang="en"><span class="hps atn">(</span><span>For more,</span> <span class="hps">go to the</span> <span class="hps">original article</span> <span class="hps">on</span> <span class="hps">Wikipedia)</span></span></span></em></span></a></p> <p><strong><br /></strong></p> <div class="center"> <div class="floatnone" style="text-align: center;"><span class="image"><img src="http://upload.wikimedia.org/wikipedia/commons/thumb/2/24/Samsung_Logo.svg/200px-Samsung_Logo.svg.png" alt="Samsung Logo.svg" width="200" height="68" /></span></div> </div> <p><strong><br /></strong></p> <p style="text-align: justify;"><strong>Samsung Group</strong> is a South Korean multinational conglomerate company headquartered in Samsung Town, Seoul. It comprises numerous subsidiaries and affiliated businesses, most of them united under the <em>Samsung</em> brand, and is the largest South Korean <em>chaebol</em> (business conglomerate).</p> MetaTitle-Samsung MetaKeywords-Samsung Meta description-Samsung http://localhost/prestashop/img/m/4.jpg

View File

@@ -1,8 +0,0 @@
Product ID;Active (0/1);Name *;Categories (x,y,z...);Price tax excluded or Price tax included;Tax rules ID;Wholesale price;On sale (0/1);Discount amount;Discount percent;Discount from (yyyy-mm-dd);Discount to (yyyy-mm-dd);Reference #;Supplier reference #;Supplier;Manufacturer;EAN13;UPC;Ecotax;Width;Height;Depth;Weight;Quantity;Minimal quantity;Visibility;Additional shipping cost;Unity;Unit price;Short description;Description;Tags (x,y,z...);Meta title;Meta keywords;Meta description;URL rewritten;Text when in stock;Text when backorder allowed;Available for order (0 = No, 1 = Yes);Product available date;Product creation date;Show price (0 = No, 1 = Yes);Image URLs (x,y,z...);Delete existing images (0 = No, 1 = Yes);Feature(Name:Value:Position);Available online only (0 = No, 1 = Yes);Condition;Customizable (0 = No, 1 = Yes);Uploadable files (0 = No, 1 = Yes);Text fields (0 = No, 1 = Yes);Out of stock;ID / Name of shop;Advanced stock management;Depends On Stock;Warehouse
1;1;iPod Nano;iPods;100;1;80;1;;5.5;2013-06-01;2018-12-31;RP-demo_1;RF-demo_1;Applestore;Apple;1234567890123;;1;0.6;0.2;0.4;0.068357;160;1;;;;;<p>New design.</p>;<p>New design.</p>;apple, ipod, nano;Meta title-Nano;Meta keywords-Nano;Meta description-Nano;iPod-Nano;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-01;1;http://localhost/prestashop/img/p/1/5/15.jpg;0;;0;new;0;0;0;0;0;0;0;0
2;1;iPod shuffle;iPods;60;1;40;1;;;2013-06-01;2018-12-31;RP-demo_2;RF-demo_2;Applestore;Apple;1234567890123;;1;0.1;0.1;0.1;0.027563;120;1;both;;;;<p>New design.</p>;<p>New design.</p>;ipod, shuffle;Meta title-Shuffle;Meta keywords-Shuffle;Meta description-Shuffle;iPod-shuffle;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-02;1;http://localhost/prestashop/img/p/2/3/23.jpg;0;;0;new;0;0;0;0;0;0;0;0
3;1;MacBook Air;Laptops;1500;1;1000;1;100;;2013-06-01;2018-12-31;RP-demo_3;RF-demo_3;Applestore;Apple;1234567890123;;2;1.31;0.3;1;2.976846;400;1;catalog;;;;<p>New design.</p>;<p>New design.</p>;MacBook, Air;Meta title-McBookAir;Meta keywords-McBookAir;Meta description-McBookAir;MacBook-Air;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-03;1;http://localhost/prestashop/img/p/1/1.jpg;1;;0;new;0;0;0;0;0;0;0;0
4;1;MacBook;Laptops;1150;1;750;1;;;2013-06-01;2018-12-31;RP-demo_4;RF-demo_4;Applestore;Apple;1234567890123;;2;1.31;0.3;1;4.454244;75;1;search;;;;<p>New design.</p>;<p>New design.</p>;MacBook, Pro;Meta title-McBookPro;Meta keywords-McBookPro;Meta description-McBookPro;MacBook;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-04;1;http://localhost/prestashop/img/p/6/6.jpg;1;;0;new;0;0;0;0;0;0;0;0
5;1;iPod touch;iPods;240;1;150;1;;;2013-06-01;2018-12-31;RP-demo_5;RF-demo_5;Applestore;Apple;1234567890123;;1;0.6;0.2;0.4;0.194046;120;1;none;;;;<p>New design.</p>;<p>New design.</p>;Ipod touch;Meta title-IpodTouch;Meta keywords-IpodTouch;Meta description-IpodTouch;iPod-touch;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-05;1;http://localhost/prestashop/img/p/7/7.jpg;0;;1;used;0;0;0;0;0;0;0;0
6;1;Belkin Leather Folio for iPod nano - Black / Chocolate;Accessories;25;1;150;1;;;2013-06-01;2018-12-31;RP-demo_6;RF-demo_6;Nippon Electronic Import;Belkin;1234567890123;;0;0.6;0.2;0.4;0.038588;25;1;;20;;;<p>New design.</p>;<p>New design.</p>;Folio, leather;Meta title-BelkinLeatherFolio;Meta keywords-BelkinLeatherFolio;Meta description-BelkinLeatherFolio;Belkin-Leather-Folio-for-iPod-nano---Black-Chocolate;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-06;1;http://localhost/prestashop/img/p/1/3/13.jpg;0;;1;refurbished;0;0;0;0;0;0;0;0
7;1;Shure SE210 Sound-Isolating Earphones for iPod and iPhone;Accessories;125;2;80;1;;;2013-06-01;2018-12-31;RP-demo_7;RF-demo_7;Shure Online Store;Shure;1234567890123;;0;0.1;0.1;0.1;0.040793;15;1;;;;;<p>New design.</p>;<p>New design.</p>;Headphones;Meta title-ShureEarphones;Meta keywords-ShureEarphones;Meta description-ShureEarphones;Shure-SE210-Sound-Isolating-Earphones-for-iPod-and-iPhone;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-07;1;http://localhost/prestashop/img/p/1/4/14.jpg;0;;1;new;0;0;0;0;0;0;0;0
1 Product ID Active (0/1) Name * Categories (x,y,z...) Price tax excluded or Price tax included Tax rules ID Wholesale price On sale (0/1) Discount amount Discount percent Discount from (yyyy-mm-dd) Discount to (yyyy-mm-dd) Reference # Supplier reference # Supplier Manufacturer EAN13 UPC Ecotax Width Height Depth Weight Quantity Minimal quantity Visibility Additional shipping cost Unity Unit price Short description Description Tags (x,y,z...) Meta title Meta keywords Meta description URL rewritten Text when in stock Text when backorder allowed Available for order (0 = No, 1 = Yes) Product available date Product creation date Show price (0 = No, 1 = Yes) Image URLs (x,y,z...) Delete existing images (0 = No, 1 = Yes) Feature(Name:Value:Position) Available online only (0 = No, 1 = Yes) Condition Customizable (0 = No, 1 = Yes) Uploadable files (0 = No, 1 = Yes) Text fields (0 = No, 1 = Yes) Out of stock ID / Name of shop Advanced stock management Depends On Stock Warehouse
2 1 1 iPod Nano iPods 100 1 80 1 5.5 2013-06-01 2018-12-31 RP-demo_1 RF-demo_1 Applestore Apple 1234567890123 1 0.6 0.2 0.4 0.068357 160 1 <p>New design.</p> <p>New design.</p> apple, ipod, nano Meta title-Nano Meta keywords-Nano Meta description-Nano iPod-Nano In Stock Current supply. Ordering availlable 1 2013-03-01 2013-01-01 1 http://localhost/prestashop/img/p/1/5/15.jpg 0 0 new 0 0 0 0 0 0 0 0
3 2 1 iPod shuffle iPods 60 1 40 1 2013-06-01 2018-12-31 RP-demo_2 RF-demo_2 Applestore Apple 1234567890123 1 0.1 0.1 0.1 0.027563 120 1 both <p>New design.</p> <p>New design.</p> ipod, shuffle Meta title-Shuffle Meta keywords-Shuffle Meta description-Shuffle iPod-shuffle In Stock Current supply. Ordering availlable 1 2013-03-01 2013-01-02 1 http://localhost/prestashop/img/p/2/3/23.jpg 0 0 new 0 0 0 0 0 0 0 0
4 3 1 MacBook Air Laptops 1500 1 1000 1 100 2013-06-01 2018-12-31 RP-demo_3 RF-demo_3 Applestore Apple 1234567890123 2 1.31 0.3 1 2.976846 400 1 catalog <p>New design.</p> <p>New design.</p> MacBook, Air Meta title-McBookAir Meta keywords-McBookAir Meta description-McBookAir MacBook-Air In Stock Current supply. Ordering availlable 1 2013-03-01 2013-01-03 1 http://localhost/prestashop/img/p/1/1.jpg 1 0 new 0 0 0 0 0 0 0 0
5 4 1 MacBook Laptops 1150 1 750 1 2013-06-01 2018-12-31 RP-demo_4 RF-demo_4 Applestore Apple 1234567890123 2 1.31 0.3 1 4.454244 75 1 search <p>New design.</p> <p>New design.</p> MacBook, Pro Meta title-McBookPro Meta keywords-McBookPro Meta description-McBookPro MacBook In Stock Current supply. Ordering availlable 1 2013-03-01 2013-01-04 1 http://localhost/prestashop/img/p/6/6.jpg 1 0 new 0 0 0 0 0 0 0 0
6 5 1 iPod touch iPods 240 1 150 1 2013-06-01 2018-12-31 RP-demo_5 RF-demo_5 Applestore Apple 1234567890123 1 0.6 0.2 0.4 0.194046 120 1 none <p>New design.</p> <p>New design.</p> Ipod touch Meta title-IpodTouch Meta keywords-IpodTouch Meta description-IpodTouch iPod-touch In Stock Current supply. Ordering availlable 1 2013-03-01 2013-01-05 1 http://localhost/prestashop/img/p/7/7.jpg 0 1 used 0 0 0 0 0 0 0 0
7 6 1 Belkin Leather Folio for iPod nano - Black / Chocolate Accessories 25 1 150 1 2013-06-01 2018-12-31 RP-demo_6 RF-demo_6 Nippon Electronic Import Belkin 1234567890123 0 0.6 0.2 0.4 0.038588 25 1 20 <p>New design.</p> <p>New design.</p> Folio, leather Meta title-BelkinLeatherFolio Meta keywords-BelkinLeatherFolio Meta description-BelkinLeatherFolio Belkin-Leather-Folio-for-iPod-nano---Black-Chocolate In Stock Current supply. Ordering availlable 1 2013-03-01 2013-01-06 1 http://localhost/prestashop/img/p/1/3/13.jpg 0 1 refurbished 0 0 0 0 0 0 0 0
8 7 1 Shure SE210 Sound-Isolating Earphones for iPod and iPhone Accessories 125 2 80 1 2013-06-01 2018-12-31 RP-demo_7 RF-demo_7 Shure Online Store Shure 1234567890123 0 0.1 0.1 0.1 0.040793 15 1 <p>New design.</p> <p>New design.</p> Headphones Meta title-ShureEarphones Meta keywords-ShureEarphones Meta description-ShureEarphones Shure-SE210-Sound-Isolating-Earphones-for-iPod-and-iPhone In Stock Current supply. Ordering availlable 1 2013-03-01 2013-01-07 1 http://localhost/prestashop/img/p/1/4/14.jpg 0 1 new 0 0 0 0 0 0 0 0

View File

@@ -1,4 +0,0 @@
Supplier ID;Active (0/1);Name *;Description;Short description;Meta title;Meta keywords;Meta description;Image URL
1;1;Applestore;<p>The Apple Store is a chain of retail stores owned and operated by Apple Inc., dealing in computers and consumer electronics. The stores sell Macintosh personal computers, software, iPods, iPads, iPhones, third-party accessories, and other consumer electronics such as Apple TV. Some high profile stores feature a Theatre for presentations and workshops and a Studio for training with Apple products; all stores offer a Genius Bar for technical support and repairs, as well as free workshops available to the public. Under the leadership of Ron Johnson, the former Senior Vice President of Retail Operations, the Apple Stores have, according to an article in the New York Times, been responsible for "[turning] the boring computer sales floor into a sleek playroom filled with gadgets".</p>;Meta title-Applestore;Meta keywords-Applestore;Meta description-Applestore;http://localhost/prestashop/img/su/Pic-of-this-supplier.jpg
2;1;Shure Online Store;<p><em>- No description -</em></p>;<p><em>- No description -</em></p>;Meta title-Shure Online Store;Meta keywords-Shure Online Store;Meta description-Shure Online Store;http://localhost/prestashop/img/su/Pic-of-this-supplier-2.jpg
3;1;Nippon Electronic Import;<p><em>- No description -</em></p>;<p><em>- No description -</em></p>;Meta title-Nippon Electronic Import;Meta keywords-Nippon Electronic Import;Meta description-Nippon Electronic Import;http://localhost/prestashop/img/su/Pic-of-this-supplier-3.jpg
Can't render this file because it contains an unexpected character in line 2 and column 718.

View File

@@ -1,21 +0,0 @@
Supply Order Reference *;Product ID *;Product Attribute ID;Unit Price (tax excl.)*;Quantity Expected *;Discount Rate;Tax Rate
Ref Apple 01;1;1;100;25;0;19,6
Ref Apple 01;1;2;80;25;0;19,6
Ref Apple 01;1;3;100;25;0;19,6
Ref Apple 01;1;4;80;25;0;19,6
Ref Apple 01;1;5;100;25;0;19,6
Ref Apple 01;1;6;80;25;0;19,6
Ref Apple 01;1;7;100;25;0;19,6
Ref Apple 01;1;8;80;25;0;19,6
Ref Apple 01;1;9;100;25;0;19,6
Ref Apple 01;1;10;80;25;0;19,6
Ref Apple 01;1;11;100;25;0;19,6
Ref Apple 01;1;12;80;25;0;19,6
Ref Apple 01;1;13;100;25;0;19,6
Ref Apple 01;1;14;80;25;0;19,6
Ref Apple 01;1;15;100;25;0;19,6
Ref Apple 01;1;16;80;25;0;19,6
Ref Apple 01;2;17;40;25;0;19,6
Ref Apple 01;2;18;40;25;0;19,6
Ref Apple 01;2;19;40;25;0;19,6
Ref Apple 01;2;20;40;25;0;19,6
1 Supply Order Reference * Product ID * Product Attribute ID Unit Price (tax excl.)* Quantity Expected * Discount Rate Tax Rate
2 Ref Apple 01 1 1 100 25 0 19,6
3 Ref Apple 01 1 2 80 25 0 19,6
4 Ref Apple 01 1 3 100 25 0 19,6
5 Ref Apple 01 1 4 80 25 0 19,6
6 Ref Apple 01 1 5 100 25 0 19,6
7 Ref Apple 01 1 6 80 25 0 19,6
8 Ref Apple 01 1 7 100 25 0 19,6
9 Ref Apple 01 1 8 80 25 0 19,6
10 Ref Apple 01 1 9 100 25 0 19,6
11 Ref Apple 01 1 10 80 25 0 19,6
12 Ref Apple 01 1 11 100 25 0 19,6
13 Ref Apple 01 1 12 80 25 0 19,6
14 Ref Apple 01 1 13 100 25 0 19,6
15 Ref Apple 01 1 14 80 25 0 19,6
16 Ref Apple 01 1 15 100 25 0 19,6
17 Ref Apple 01 1 16 80 25 0 19,6
18 Ref Apple 01 2 17 40 25 0 19,6
19 Ref Apple 01 2 18 40 25 0 19,6
20 Ref Apple 01 2 19 40 25 0 19,6
21 Ref Apple 01 2 20 40 25 0 19,6

View File

@@ -1,5 +0,0 @@
Supply Order ID;Supplier ID *;Lang ID;Warehouse ID *;Currency ID *;Supply Order Reference *;Delivery Date (Y-M-D)*;Discount Rate;Template
1;1;1;1;1;Ref Apple 01;2013-11-01;;
2;3;1;1;1;Nippon Electronic Import;2013-11-01;;
3;2;1;1;1;Shure Online Store;2013-11-01;;
4;1;1;2;2;Ref Apple 02;2013-11-01;;
1 Supply Order ID Supplier ID * Lang ID Warehouse ID * Currency ID * Supply Order Reference * Delivery Date (Y-M-D)* Discount Rate Template
2 1 1 1 1 1 Ref Apple 01 2013-11-01
3 2 3 1 1 1 Nippon Electronic Import 2013-11-01
4 3 2 1 1 1 Shure Online Store 2013-11-01
5 4 1 1 2 2 Ref Apple 02 2013-11-01

View File

@@ -1,35 +1,32 @@
<?php
/*
* 2007-2017 PrestaShop
*
/**
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* 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:
* http://opensource.org/licenses/osl-3.0.php
* 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 license@prestashop.com so we can send you a copy immediately.
* 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 PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
* 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 PrestaShop SA <contact@prestashop.com>
* @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
* @author Webkul IN
* @copyright Since 2010 Webkul
* @license https://opensource.org/licenses/afl-3.0.php Academic Free License 3.0
*/
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;
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;

View File

@@ -1,35 +1,32 @@
<?php
/*
* 2007-2017 PrestaShop
*
/**
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* 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:
* http://opensource.org/licenses/osl-3.0.php
* 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 license@prestashop.com so we can send you a copy immediately.
* 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 PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
* 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 PrestaShop SA <contact@prestashop.com>
* @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
* @author Webkul IN
* @copyright Since 2010 Webkul
* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
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('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;
header('Location: ../../../');
exit;

View File

@@ -1,79 +0,0 @@
2007-2017 PrestaShop
NOTICE OF LICENSE
This source file is subject to the Open Software License (OSL 3.0)
that is bundled with this package in the file LICENSE.txt.
It is also available through the world-wide-web at this URL:
http://opensource.org/licenses/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 license@prestashop.com so we can send you a copy immediately.
DISCLAIMER
Do not edit or add to this file if you wish to upgrade PrestaShop to newer
versions in the future. If you wish to customize PrestaShop for your
needs please refer to http://www.prestashop.com for more information.
@author PrestaShop SA <contact@prestashop.com>
@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
VORBEREITUNG
===========
Zur Installation von PrestaShop benötigen Sie einen Remote-Web-Server oder
Ihren Computer (MAMP) mit Zugriff auf eine Datenbank wie MySQL.
Sie benötigen Zugriff auf phpMyAdmin, um eine Datenbank zu erstellen und die
Informationen in der Datenbank im Installer anzuzeigen.
Wenn Sie keinen Hosting-Provider haben und Ihren Shop selbst nicht erstellen
können, bieten wir einen schlüsselfertigen Shop, mit dem Sie Ihren eigenen
Online-Shop in weniger als 10 Minuten ohne jegliche technische Kenntnisse
erstellen können.
Besuchen Sie:
http://www.prestabox.com/
INSTALLATION
============
Gehen Sie einfach zu Ihrem PrestaShop Web-Verzeichnis und verwenden Sie den
Installer :-)
Falls ein PHP-Fehler auftritt, haben Sie vielleicht kein PHP5 oder müssen es
auf Ihrem Web-Host aktivieren.
Die Vorinstallationseinstellungen (PHP 5, htaccess) für bestimmte
Hosting-Dienste (1&1, Free, Lycos, OVH, Infomaniak, Amen, GoDaddy, etc.)
finden Sie in unserem Forum.
Spezifische englische Webhosting-Einstellungen:
http://www.prestashop.com/forums/viewthread/2946/installation_configuration___upgrade/preinstallation_settings_php_5_htaccess_for_certain_hosting_servi
ces
Wenn Sie keine Lösung zum Starten des Installers finden, posten Sie bitte
Ihr Problem in unserem Forum:
http://www.prestashop.com/forums/viewforum/7/installation_configuration___upgrade
Es gibt immer Lösungen für Ihre Fragen ;-)
DOKUMENTATION
=============
Für zusätzliche Benutzerhinweise (how-to), lesen Sie bitte unser Wiki:
http://doc.prestashop.com
FOREN
======
Sie können außerdem mit der PrestaShop Community in unseren Foren
diskutieren, Hilfe finden und eigene Beiträge liefern unter:
http://www.prestashop.com/forums/
Danke für Ihren Download und die Nutzung der PrestaShop E-Commerce-Open-Source-Lösung!
==========================
= The PrestaTeam' =
= www.PrestaShop.com =
==========================

View File

@@ -1,61 +0,0 @@
2007-2017 PrestaShop
NOTICE OF LICENSE
This source file is subject to the Open Software License (OSL 3.0)
that is bundled with this package in the file LICENSE.txt.
It is also available through the world-wide-web at this URL:
http://opensource.org/licenses/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 license@prestashop.com so we can send you a copy immediately.
DISCLAIMER
Do not edit or add to this file if you wish to upgrade PrestaShop to newer
versions in the future. If you wish to customize PrestaShop for your
needs please refer to http://www.prestashop.com for more information.
@author PrestaShop SA <contact@prestashop.com>
@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
PREPARATION
===========
To install PrestaShop, you need a remote web server or on your computer (MAMP), with access to a database like MySQL.
You'll need access to phpMyAdmin to create a database and to indicate the information in the database in the installer.
If you do not host and unable to create your store, we offer a turnkey store, which lets you create your online store in less than 10 minutes without any technical knowledge.
We invite you to visit: http://www.prestabox.com/
INSTALLATION
============
Simply go to your PrestaShop web directory and use installer :-)
If you have any PHP error, perhaps you don't have PHP5 or you need to activate it on your web host.
Please go to our forum to find pre-installation settings (PHP 5, htaccess) for certain hosting services (1&1, Free, Lycos, OVH, Infomaniak, Amen, GoDaddy, etc).
English webhost specifics settings:
http://www.prestashop.com/forums/topic/2946-pre-installation-settings-php-5-htaccess-for-certain-hosting-services/
If you don't find any solution to launch installer, please post on our forum:
http://www.prestashop.com/forums/forum/7-installing-prestashop/
There are always solutions for your issues ;-)
DOCUMENTATION
=============
For any extra documentation (how-to), please read our Online documentation:
http://doc.prestashop.com/dashboard.action
FORUMS
======
You can also discuss, help and contribute with PrestaShop community on our forums:
http://www.prestashop.com/forums/
Thanks for downloading and using PrestaShop e-commerce Open-source solution!

View File

@@ -1,67 +0,0 @@
2007-2017 PrestaShop
NOTICE OF LICENSE
This source file is subject to the Open Software License (OSL 3.0)
that is bundled with this package in the file LICENSE.txt.
It is also available through the world-wide-web at this URL:
http://opensource.org/licenses/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 license@prestashop.com so we can send you a copy immediately.
DISCLAIMER
Do not edit or add to this file if you wish to upgrade PrestaShop to newer
versions in the future. If you wish to customize PrestaShop for your
needs please refer to http://www.prestashop.com for more information.
@author PrestaShop SA <contact@prestashop.com>
@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
PREPARACIÓN
===========
Para instalar PrestaShop, necesita un servidor web remoto o en su ordenador (MAMP), con acceso a una base de datos como MySQL.
Tendrá acceso a phpMyAdmin para crear una base de datos y para indicar la información en la base de datos en el instalador.
Si no de acogida y no puede crear su tienda, le ofrecemos una tienda "llave en mano, que le permite crear su tienda en línea en menos de 10 minutos sin ningún conocimiento técnico.
Le invitamos a visitar:
http://www.prestabox.com/
INSTALACIÓN
============
Simplemente vaya a su directorio web y el uso PrestaShop instalador :-)
Si usted tiene cualquier error de PHP, tal vez usted no tiene PHP5 o necesitas activarlo en su web host.
Por favor, vaya a nuestro foro para encontrar la configuración de la instalación pre-(PHP 5, htaccess) para determinados servicios de hospedaje (1 & 1, gratis, Lycos, OVH, Infomaniak, Amén, GoDaddy, etc.)
Inglés webhost ajustes específicos:
http://www.prestashop.com/forums/viewthread/2946/installation_configuration___upgrade/preinstallation_settings_php_5_htaccess_for_certain_hosting_services
Si usted no encuentra ninguna solución para lanzar el instalador, por favor enviar en nuestro foro:
http://www.prestashop.com/forums/viewforum/7/installation_configuration___upgrade
Siempre hay soluciones para sus problemas ;-)
DOCUMENTACIÓN
=============
Para cualquier documentación adicional (procedimientos), por favor lea nuestra wiki:
http://doc.prestashop.com
FOROS
======
Usted puede también discute, ayudar y contribuir con la comunidad PrestaShop en nuestros foros:
http://www.prestashop.com/forums/
Gracias por descargar y utilizar el comercio electrónico PrestaShop solución de código abierto!
==========================
= The PrestaTeam' =
= www.PrestaShop.com =
==========================

View File

@@ -1,67 +0,0 @@
2007-2017 PrestaShop
NOTICE OF LICENSE
This source file is subject to the Open Software License (OSL 3.0)
that is bundled with this package in the file LICENSE.txt.
It is also available through the world-wide-web at this URL :
http://opensource.org/licenses/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 license@prestashop.com so we can send you a copy immediately.
DISCLAIMER
Do not edit or add to this file if you wish to upgrade PrestaShop to newer
versions in the future. If you wish to customize PrestaShop for your
needs please refer to http://www.prestashop.com for more information.
@author PrestaShop SA <contact@prestashop.com>
@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
PREPARATION
===========
Pour installer PrestaShop, vous avez besoin d'un serveur web distant ou sur votre ordinateur (MAMP), avec un accès à une base de données de type MySQL.
Vous aurez besoin d'un accès à PhpMyAdmin afin de créer un base de données, et d'indiquer les informations de la base de données dans l'installeur.
Si vous n'avez pas d'hébergeur et pas la possibilité de créer votre boutique, nous vous proposons un service de boutique clé en main, qui vous permet de créer votre boutique en ligne en moins de 10 minutes sans aucunes notions techniques.
Nous vous invitons à vous rendre sur :
http://www.prestabox.com/
INSTALLATION
============
Il suffit d'aller dans votre répertoire web PrestaShop et de lancer l'installateur (dans /install) :-)
Si vous avez des erreurs de PHP, peut-être que vous n'avez pas PHP5 ou peut être devez vous l'activer via votre hébergeur.
Merci de vous rendre sur notre forum pour trouver les paramètres de pré-installation (PHP 5, htaccess) pour certains services d'hébergement (1 & 1, Free, Lycos, OVH, Infomaniak, Amen, GoDaddy, etc.)
Topic français sur notre forum officiel :
http://www.prestashop.com/forums/viewthread/446/installation_configuration_et_mise_a_jour/preinstallation_settings_php_5_htaccess_for_certain_hosting_services
Si vous ne trouvez pas de solution pour lancer l'installateur, merci de vous rendre à cette adresse:
http://www.prestashop.com/forums/viewforum/7/installation_configuration___upgrade
Il ya toujours des solutions pour vos questions ;-)
DOCUMENTATION
=============
Pour toute documentation supplémentaire (how-to), vous trouverez notre wiki à cette adresse :
http://doc.prestashop.com
FORUMS
======
Vous pouvez également discuter, aider et contribuer avec la communauté PrestaShop sur nos forums :
http://www.prestashop.com/forums/
Merci d'avoir télécharger et d'utiliser PrestaShop, solution e-commerce open-source !
==========================
= The PrestaTeam' =
= www.PrestaShop.com =
==========================

View File

@@ -1,67 +0,0 @@
2007-2017 PrestaShop
NOTICE OF LICENSE
This source file is subject to the Open Software License (OSL 3.0)
that is bundled with this package in the file LICENSE.txt.
It is also available through the world-wide-web at this URL:
http://opensource.org/licenses/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 license@prestashop.com so we can send you a copy immediately.
DISCLAIMER
Do not edit or add to this file if you wish to upgrade PrestaShop to newer
versions in the future. If you wish to customize PrestaShop for your
needs please refer to http://www.prestashop.com for more information.
@author PrestaShop SA <contact@prestashop.com>
@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
PREPARAZIONE
===========
Per installare PrestaShop, hai bisogno di un server remoto o nel tuo computer (MAMP), con accesso ad un database come MySQL.
Dovrai accedere a phpMyAdmin per creare un database e per indicare le informazioni nel database all'installatore.
Sei non hai un host e non sai come creare il tuo negozio, ti offriamo un negozio già pronto che ti farà realizzare il tuo negozio online in meno di 10 minuti senza nessun bisogno di competenze tecniche.
Ti invitiamo a visitare:
http://www.prestabox.com/
INSTALLAZIONE
============
Devi solo andare nella tua directory PrestaShop e usare l'installatore :-)
Se si verifica un qualsiasi errore PHP, forse non hai PHP5 oppure devi attivarlo nel tuo web host.
Vai nel nostro forum e cerca le impostazioni di pre-installazione (PHP 5, htaccess) per alcuni hosting services (1&1, Free, Lycos, OVH, Infomaniak, Amen, GoDaddy, etc).
Impostazioni specifiche per web host in inglese:
http://www.prestashop.com/forums/viewthread/2946/installation_configuration___upgrade/preinstallation_settings_php_5_htaccess_for_certain_hosting_services
Se non trovi nessuna soluzione per lanciare l'installatore, scrivi un post sul nostro forum:
http://www.prestashop.com/forums/viewforum/7/installation_configuration___upgrade
Troverai sempre una soluzione ai tuoi problemi :-)
INFORMAZIONI
=============
Per qualsiasi informazione ulteriore (come fare per?), leggi il nostro wiki:
http://doc.prestashop.com
FORUM
======
Puoi anche inserirti, chattare, e contribuire alla community PrestaShop nei nostri forum:
http://www.prestashop.com/forums/
Ti ringraziamo per l'uso della soluzione open-source PrestaShop per il commercio online!
==========================
= The PrestaTeam' =
= www.PrestaShop.com =
==========================

Binary file not shown.

After

Width:  |  Height:  |  Size: 481 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 384 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
img/rf/10.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
img/rf/11.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
img/rf/12.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
img/rf/13.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 328 B

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 524 B

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 148 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 333 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 322 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 184 B

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
img/rf/8.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
img/rf/9.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Some files were not shown because too many files have changed in this diff Show More