diff --git a/Adapter/Adapter_ProductPriceCalculator.php b/Adapter/Adapter_ProductPriceCalculator.php index d26887f7e..91e9b370f 100644 --- a/Adapter/Adapter_ProductPriceCalculator.php +++ b/Adapter/Adapter_ProductPriceCalculator.php @@ -43,7 +43,8 @@ class Adapter_ProductPriceCalculator $with_ecotax = true, $use_group_reduction = true, Context $context = null, - $use_customer_price = true + $use_customer_price = true, + $id_roomtype = false ) { return Product::getPriceStatic( $id_product, @@ -62,7 +63,8 @@ class Adapter_ProductPriceCalculator $with_ecotax, $use_group_reduction, $context, - $use_customer_price + $use_customer_price, + $id_roomtype ); } } diff --git a/admin/themes/default/js/tree.js b/admin/themes/default/js/tree.js index d3fd63ecb..5ff936395 100644 --- a/admin/themes/default/js/tree.js +++ b/admin/themes/default/js/tree.js @@ -168,58 +168,15 @@ Tree.prototype = expandAll : function($speed) { - var idTree = this.$element.parent().find('.cattree.tree').first().attr('id'); - if (typeof(idTree) != 'undefined' && !$('#'+idTree).hasClass('full_loaded')) - { - var selected = []; - that = this; - $('#'+idTree).find('.tree-selected input').each( - function() - { - selected.push($(this).val()); - } - ); - var name = $('#'+idTree).find('ul.tree input').first().attr('name'); - var inputType = $('#'+idTree).find('ul.tree input').first().attr('type'); - var useCheckBox = 0; - if (inputType == 'checkbox') + this.$element.find("label.tree-toggler").each( + function() { - useCheckBox = 1; + $(this).parent().children(".icon-folder-close") + .removeClass("icon-folder-close") + .addClass("icon-folder-open"); + $(this).parent().parent().children("ul.tree").show($speed); } - - $.get( - 'ajax-tab.php', - {controller:'AdminProducts',token:currentToken,action:'getCategoryTree',type:idTree,fullTree:1,selected:selected, inputName:name,useCheckBox:useCheckBox}, - function(content) - { - $('#' + idTree).html(content); - organizeTree(); - $('#' + idTree).tree('init'); - that.$element.find("label.tree-toggler").each( - function() - { - $(this).parent().children(".icon-folder-close") - .removeClass("icon-folder-close") - .addClass("icon-folder-open"); - $(this).parent().parent().children("ul.tree").show($speed); - $('#'+idTree).addClass('full_loaded'); - } - ); - } - ); - } - else - { - this.$element.find("label.tree-toggler").each( - function() - { - $(this).parent().children(".icon-folder-close") - .removeClass("icon-folder-close") - .addClass("icon-folder-open"); - $(this).parent().parent().children("ul.tree").show($speed); - } - ); - } + ); return $(this); } diff --git a/admin/themes/default/template/controllers/normal_products/associations.tpl b/admin/themes/default/template/controllers/normal_products/associations.tpl new file mode 100644 index 000000000..9217cb7b9 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/associations.tpl @@ -0,0 +1,124 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} +{if isset($product)} +
+ +

{l s='Associations'}

+ {include file="controllers/products/multishop/check_fields.tpl" product_tab="Associations"} +
+ {l s='Please select a default category.'} +
+
+ {l s='To create new categories '} {l s='click here.'} +
+
+
{include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"}
+ +
+
+ {$category_tree} +
+ {* + {l s='Create new category'} + *} +
+
+
+
+ {l s='Associations are used to display service product category wise on room type page when'} {l s='Category filter'} {l s='is enabled'} +
+
+
+
{include file="controllers/products/multishop/checkbox.tpl" field="id_category_default" type="default"}
+ +
+ +
+
+ + + + +
+ {l s='Cancel'} + + +
+
+{/if} diff --git a/admin/themes/default/template/controllers/normal_products/features.tpl b/admin/themes/default/template/controllers/normal_products/features.tpl new file mode 100644 index 000000000..cd84b2933 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/features.tpl @@ -0,0 +1,188 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +{if isset($product->id)} +
+ +

{l s='Assign features to this room type'}

+ +
+ {l s='You can specify a value for each relevant feature regarding this room type. Empty fields will not be displayed.'}
+ {l s='You can either create a specific value, or select among the existing pre-defined values you\'ve previously added.'} +
+ + + + + + + + + + + + + {foreach from=$available_features item=available_feature} + + {foreach from=$available_feature.featureValues item=value} + + + + {/foreach} + + + + + + {foreachelse} + + + + {/foreach} + +
{l s='Feature'}{l s='Feature Image'}
+ + {$available_feature.name} + + +
{l s='No features have been defined'}
+ + + {l s='Add a new feature'} + +
+ {l s='Cancel'} + + +
+
+ +{/literal} + +{/if} diff --git a/admin/themes/default/template/controllers/normal_products/helpers/form/form.tpl b/admin/themes/default/template/controllers/normal_products/helpers/form/form.tpl new file mode 100644 index 000000000..7b70d1c05 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/helpers/form/form.tpl @@ -0,0 +1,337 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +{extends file="helpers/form/form.tpl"} + +{block name="autoload_tinyMCE"} + // Execute when tab Informations has finished loading + tabs_manager.onLoad('Informations', function(){ + tinySetup({ + editor_selector :"autoload_rte", + setup : function(ed) { + ed.on('init', function(ed) + { + if (typeof ProductMultishop.load_tinymce[ed.target.id] != 'undefined') + { + if (typeof ProductMultishop.load_tinymce[ed.target.id]) + tinyMCE.get(ed.target.id).hide(); + else + tinyMCE.get(ed.target.id).show(); + } + }); + + ed.on('keydown', function(ed, e) { + tinyMCE.triggerSave(); + textarea = $('#'+tinymce.activeEditor.id); + var max = textarea.parent('div').find('span.counter').data('max'); + if (max != 'none') + { + count = tinyMCE.activeEditor.getBody().textContent.length; + rest = max - count; + if (rest < 0) + textarea.parent('div').find('span.counter').html('{l s='Maximum'} '+ max +' {l s='characters'} : '+rest+''); + else + textarea.parent('div').find('span.counter').html(' '); + } + }); + } + }); + }); +{/block} + +{block name="defaultForm"} +
+
+
+ {foreach $product_tabs key=numStep item=tab} + {if $tab.name != "Pack"} + {$tab.name} + {/if} + {/foreach} +
+
+ + + + + + +
+ + {* *} + + + + {if isset($smarty.request.page) && $smarty.request.page > 1} + + {/if} + {if !$product->active && $product->isAssociatedToShop()} +
+ {l s='Your product will be saved as a draft.'} +  {l s='Save'} + +
+ {/if} + {* all input are here *} + {foreach $product_tabs key=numStep item=tab} + {if $tab.id != "Pack" } +
+ {if $tab.selected} + {$custom_form} + {/if} +
+ {/if} + {/foreach} + + +
+
+ +{/block} + diff --git a/admin/themes/default/template/controllers/normal_products/helpers/form/index.php b/admin/themes/default/template/controllers/normal_products/helpers/form/index.php new file mode 100644 index 000000000..2cba03ab6 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/helpers/form/index.php @@ -0,0 +1,35 @@ + +* @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 +*/ + +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../../../../../../../../'); +exit; diff --git a/admin/themes/default/template/controllers/normal_products/helpers/index.php b/admin/themes/default/template/controllers/normal_products/helpers/index.php new file mode 100644 index 000000000..c4c862b0d --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/helpers/index.php @@ -0,0 +1,35 @@ + +* @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 +*/ + +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../../../../../../../'); +exit; diff --git a/admin/themes/default/template/controllers/normal_products/helpers/list/index.php b/admin/themes/default/template/controllers/normal_products/helpers/list/index.php new file mode 100644 index 000000000..2cba03ab6 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/helpers/list/index.php @@ -0,0 +1,35 @@ + +* @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 +*/ + +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../../../../../../../../'); +exit; diff --git a/admin/themes/default/template/controllers/normal_products/helpers/list/list_header.tpl b/admin/themes/default/template/controllers/normal_products/helpers/list/list_header.tpl new file mode 100644 index 000000000..27872f854 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/helpers/list/list_header.tpl @@ -0,0 +1,36 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +{extends file="helpers/list/list_header.tpl"} + +{block name=leadin} + {if isset($category_tree)} +
+
+ {$category_tree} +
+
+ {/if} +{/block} diff --git a/admin/themes/default/template/controllers/normal_products/helpers/tree/index.php b/admin/themes/default/template/controllers/normal_products/helpers/tree/index.php new file mode 100644 index 000000000..2cba03ab6 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/helpers/tree/index.php @@ -0,0 +1,35 @@ + +* @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 +*/ + +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../../../../../../../../'); +exit; diff --git a/admin/themes/default/template/controllers/normal_products/helpers/tree/subtree_associated_categories.tpl b/admin/themes/default/template/controllers/normal_products/helpers/tree/subtree_associated_categories.tpl new file mode 100644 index 000000000..6933af4bb --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/helpers/tree/subtree_associated_categories.tpl @@ -0,0 +1,55 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} +{if isset($nodes)} + {$nodes} +{/if} + + \ No newline at end of file diff --git a/admin/themes/default/template/controllers/normal_products/helpers/tree/tree_associated_categories.tpl b/admin/themes/default/template/controllers/normal_products/helpers/tree/tree_associated_categories.tpl new file mode 100644 index 000000000..d6ae6db17 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/helpers/tree/tree_associated_categories.tpl @@ -0,0 +1,161 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} +
+ {if isset($header)}{$header}{/if} + {if isset($nodes)} +
    + {$nodes} +
+ {/if} +
+ diff --git a/admin/themes/default/template/controllers/normal_products/helpers/tree/tree_associated_header.tpl b/admin/themes/default/template/controllers/normal_products/helpers/tree/tree_associated_header.tpl new file mode 100644 index 000000000..34b00d3b9 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/helpers/tree/tree_associated_header.tpl @@ -0,0 +1,25 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} +
{if isset($toolbar)}{$toolbar}{/if}
diff --git a/admin/themes/default/template/controllers/normal_products/helpers/tree/tree_associated_hotels.tpl b/admin/themes/default/template/controllers/normal_products/helpers/tree/tree_associated_hotels.tpl new file mode 100644 index 000000000..079538e41 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/helpers/tree/tree_associated_hotels.tpl @@ -0,0 +1,210 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} +
+ {if isset($header)}{$header}{/if} + {if isset($nodes)} +
    + {$nodes} +
+ {/if} +
+ diff --git a/admin/themes/default/template/controllers/normal_products/helpers/tree/tree_categories.tpl b/admin/themes/default/template/controllers/normal_products/helpers/tree/tree_categories.tpl new file mode 100644 index 000000000..a1698ea57 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/helpers/tree/tree_categories.tpl @@ -0,0 +1,127 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} +
+ {if isset($header)}{$header}{/if} + +
+ diff --git a/admin/themes/default/template/controllers/normal_products/helpers/tree/tree_header.tpl b/admin/themes/default/template/controllers/normal_products/helpers/tree/tree_header.tpl new file mode 100644 index 000000000..322536595 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/helpers/tree/tree_header.tpl @@ -0,0 +1,50 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + + + +
+
+ {if isset($toolbar)}{$toolbar}{/if} +
+ +
diff --git a/admin/themes/default/template/controllers/normal_products/helpers/tree/tree_toolbar.tpl b/admin/themes/default/template/controllers/normal_products/helpers/tree/tree_toolbar.tpl new file mode 100644 index 000000000..0a817f113 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/helpers/tree/tree_toolbar.tpl @@ -0,0 +1,31 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} +
+ {if isset($actions)} + {foreach from=$actions item=action} + {$action->render()} + {/foreach} + {/if} +
\ No newline at end of file diff --git a/admin/themes/default/template/controllers/normal_products/helpers/uploader/ajax.tpl b/admin/themes/default/template/controllers/normal_products/helpers/uploader/ajax.tpl new file mode 100644 index 000000000..240e46188 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/helpers/uploader/ajax.tpl @@ -0,0 +1,193 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} +
+
+ + +
+
+ + + + diff --git a/admin/themes/default/template/controllers/normal_products/helpers/uploader/attachment_ajax.tpl b/admin/themes/default/template/controllers/normal_products/helpers/uploader/attachment_ajax.tpl new file mode 100644 index 000000000..7bbdc7094 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/helpers/uploader/attachment_ajax.tpl @@ -0,0 +1,119 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} +
+ + + +
+ + diff --git a/admin/themes/default/template/controllers/normal_products/helpers/uploader/index.php b/admin/themes/default/template/controllers/normal_products/helpers/uploader/index.php new file mode 100644 index 000000000..2cba03ab6 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/helpers/uploader/index.php @@ -0,0 +1,35 @@ + +* @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 +*/ + +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../../../../../../../../'); +exit; diff --git a/admin/themes/default/template/controllers/normal_products/helpers/uploader/virtual_product.tpl b/admin/themes/default/template/controllers/normal_products/helpers/uploader/virtual_product.tpl new file mode 100644 index 000000000..a9f7fe601 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/helpers/uploader/virtual_product.tpl @@ -0,0 +1,142 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} +{if isset($files) && $files|count > 0} + {assign var='show_thumbnail' value=false} + {foreach $files as $file} + {if isset($file.image) && $file.type == 'image'} + {assign var='show_thumbnail' value=true} + {/if} + {/foreach} +{if $show_thumbnail} +
+
+ {foreach $files as $file} + {if isset($file.image) && $file.type == 'image'} +
+

{$file.image}

+ {if isset($file.size)}

{l s='File size'} {$file.size}kb

{/if} + {if isset($file.delete_url)} +

+ + {l s='Delete'} + +

+ {/if} +
+ {/if} + {/foreach} +
+
+{/if} +{/if} +{if isset($max_files) && $files|count >= $max_files} +
+
{l s='You have reached the limit (%s) of files to upload, please remove files to continue uploading' sprintf=$max_files}
+
+{else} +
+
+ +
+ + + + + {if (!isset($multiple) || !$multiple) && isset($files) && $files|count == 1 && isset($files[0].download_url)} + + + {if isset($size)}{l s='Download current file (%skb)' sprintf=$size}{else}{l s='Download current file'}{/if} + + {/if} + +
+
+
+ +{/if} \ No newline at end of file diff --git a/admin/themes/default/template/controllers/normal_products/images.tpl b/admin/themes/default/template/controllers/normal_products/images.tpl new file mode 100644 index 000000000..29e0f97e6 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/images.tpl @@ -0,0 +1,356 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +{if isset($id_product) && isset($product)} +
+ +
+ {l s='Images'} + {$countImages} +
+
+
+ +
+ {$image_uploader} +
+
+
{l s='Please upload a square image (Recommended resolution 800 x 800px)'} +
+
+
+
+ +
+ {foreach from=$languages item=language} + {if $languages|count > 1} +
+
+ {/if} + id} disabled="disabled"{/if}/> + {if $languages|count > 1} +
+
+ +
    + {foreach from=$languages item=language} +
  • + {$language.name} +
    • + {/foreach} +
+
+
+ {/if} + {/foreach} +
+
+ +
+
+ +
+
+
+ + + + + + + {if $shops} + {foreach from=$shops item=shop} + + {/foreach} + {/if} + + + + + + +
{l s='Image'}{l s='Caption'}{l s='Position'}{$shop.name}{l s='Cover'}
+ + + + + + {if $shops} + {foreach from=$shops item=shop} + + {/foreach} + {/if} + + + + +
+ {l s='Cancel'} + + +
+ +
+{/if} diff --git a/admin/themes/default/template/controllers/normal_products/index.php b/admin/themes/default/template/controllers/normal_products/index.php new file mode 100644 index 000000000..6174dac6d --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/index.php @@ -0,0 +1,35 @@ + +* @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 +*/ + +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../../../../../../'); +exit; diff --git a/admin/themes/default/template/controllers/normal_products/informations.tpl b/admin/themes/default/template/controllers/normal_products/informations.tpl new file mode 100644 index 000000000..f95d974eb --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/informations.tpl @@ -0,0 +1,590 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} +{if $check_product_association_ajax} + {assign var=class_input_ajax value='check_product_name '} +{else} + {assign var=class_input_ajax value=''} +{/if} + +
+ +

{l s='Information'}

+ + + {if isset($display_common_field) && $display_common_field} +
{l s='Warning, if you change the value of fields with an orange bullet %s, the value will be changed for all other shops for this product' sprintf=$bullet_common_field}
+ {/if} + + {include file="controllers/products/multishop/check_fields.tpl" product_tab="Informations"} + +
+ + {*
*} +
+
{include file="controllers/products/multishop/checkbox.tpl" field="name" type="default" multilang="true"}
+ +
+ {include file="controllers/products/input_text_lang.tpl" + languages=$languages + input_class="{$class_input_ajax}{if !$product->id || Configuration::get('PS_FORCE_FRIENDLY_PRODUCT')}copy2friendlyUrl{/if} updateCurrentText" + input_value=$product->name + input_name="name" + required=true + } +
+
+ + + + + + + + + + {* status informations *} +
+
{include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""}
+ +
+ + active || !$product->isAssociatedToShop()}checked="checked" {/if} /> + + active && $product->isAssociatedToShop()}checked="checked"{/if} /> + + + +
+
+ + + + + +
service_product_type == Product::SERVICE_PRODUCT_WITHOUT_ROOMTYPE}style="display:none;"{/if}> +
{include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"}
+ +
+
+ {$hotel_tree} +
+
+
+
+ +
+ + auto_add_to_cart}checked="checked"{/if}/> + + auto_add_to_cart || !$product->isAssociatedToShop()}checked="checked"{/if}/> + + + +
+
+ +
auto_add_to_cart || !$product->isAssociatedToShop()}style="display:none;"{/if}> +
+ +
+ +
+
+
+
+
+ {l s='Select how this service price will be added in booking.'} +
    +
  • + {l s='Add price in room price'} : {l s='Service price will be added in room base price.'}
    {l s='(e.g., Room price : 500, service price: 50, final room price : 550)'} +
    • +
  • {l s='Add price as convenience fee'} : {l s='Service price will be dispalyed in order summary as "Convenience Fees"'}
    • +
+
+
+
+
+ + {*
+ +
+ +
+
*} + {*
service_product_type != Product::SERVICE_PRODUCT_WITHOUT_ROOMTYPE}style="display:none"{/if}> +
+
+ {l s='Independent products can only be bought from backoffice.'} +
+
+
*} +
auto_add_to_cart}style="display:none;"{/if}> + +
+ + show_at_front || !$product->isAssociatedToShop()}checked="checked"{/if}/> + + show_at_front && $product->isAssociatedToShop()}checked="checked"{/if}/> + + + +
+
+
show_at_front && $product->isAssociatedToShop()) || $product->auto_add_to_cart}style="display:none;"{/if}> + +
+ + available_for_order || !$product->isAssociatedToShop()}checked="checked"{/if}/> + + available_for_order && $product->isAssociatedToShop()}checked="checked"{/if}/> + + + +
+
+
available_for_order || (!$product->show_at_front && $product->isAssociatedToShop()) || !$product->isAssociatedToShop() || $product->auto_add_to_cart}style="display:none;"{/if}> + +
+ + show_price || !$product->isAssociatedToShop()}checked="checked"{/if}/> + + show_price && $product->isAssociatedToShop()}checked="checked"{/if}/> + + + +
+
+ + + +
available_for_order && $product->isAssociatedToShop()) || $product->auto_add_to_cart}style="display:none;"{/if}> +
+ +
+ + allow_multiple_quantity}checked="checked"{/if} value="1"/> + + allow_multiple_quantity}checked="checked"{/if} value="0"/> + + + +
+
+
+
+
+ {l s='By default all products have infinte quantity, Using this setting you can restrict customer to purchase only one product per room.'} +
+
+
+
+ + +
+ +
+
{include file="controllers/products/multishop/checkbox.tpl" field="description_short" type="tinymce" multilang="true"}
+ +
+ {include + file="controllers/products/textarea_lang.tpl" + languages=$languages + input_name='description_short' + class="autoload_rte" + input_value=$product->description_short + max=$PS_PRODUCT_SHORT_DESC_LIMIT} +
+
+ {*
+
{include file="controllers/products/multishop/checkbox.tpl" field="description" type="tinymce" multilang="true"}
+ +
+ {include + file="controllers/products/textarea_lang.tpl" + languages=$languages input_name='description' + class="autoload_rte" + input_value=$product->description} +
+
+ {if $images} +
+
+
+ {capture}{l s='Click here'}{/capture} + {l s='Would you like to add an image in your description? %s and paste the given tag in the description.' sprintf=$smarty.capture.default} +
+
+
+ + {/if}*} + + {*
+ +
+ {if $languages|count > 1} +
+ {/if} + {foreach from=$languages item=language} + {literal} + + {/literal} + {if $languages|count > 1} +
+
+ {/if} + + {if $languages|count > 1} +
+
+ +
    + {foreach from=$languages item=language} +
  • + {$language.name} +
    • + {/foreach} +
+
+
+ {/if} + {/foreach} + {if $languages|count > 1} +
+ {/if} +
+
+
{l s='Each tag has to be followed by a comma. The following characters are forbidden: %s' sprintf='!<;>;?=+#"°{}_$%.'} +
+
+
*} +
+ {l s='Cancel'} + + +
+
+ diff --git a/admin/themes/default/template/controllers/normal_products/input_text_lang.tpl b/admin/themes/default/template/controllers/normal_products/input_text_lang.tpl new file mode 100644 index 000000000..7c280d602 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/input_text_lang.tpl @@ -0,0 +1,77 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +{foreach from=$languages item=language} + {if $languages|count > 1} +
+
+ {/if} + {if isset($maxchar)} +
+ + {$maxchar} + + {/if} + + {if isset($maxchar)} +
+ {/if} + {if $languages|count > 1} +
+
+ +
    + {foreach from=$languages item=language} +
  • + {$language.name} +
    • + {/foreach} +
+
+
+ {/if} +{/foreach} +{if isset($maxchar)} + +{/if} diff --git a/admin/themes/default/template/controllers/normal_products/multishop/check_fields.tpl b/admin/themes/default/template/controllers/normal_products/multishop/check_fields.tpl new file mode 100644 index 000000000..4419aa59a --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/multishop/check_fields.tpl @@ -0,0 +1,56 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +{if isset($display_multishop_checkboxes) && $display_multishop_checkboxes} +
+ +
+
+
+ + + + + + + +
+
+
+
+

+ {l s='Check / Uncheck all'} {l s='(If you are editing this page for several shops, some fields may be disabled. If you need to edit them, you will need to check the box for each field)'} +

+
+
+
+
+{/if} diff --git a/admin/themes/default/template/controllers/normal_products/multishop/checkbox.tpl b/admin/themes/default/template/controllers/normal_products/multishop/checkbox.tpl new file mode 100644 index 000000000..a2e47e580 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/multishop/checkbox.tpl @@ -0,0 +1,41 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +{if isset($display_multishop_checkboxes) && $display_multishop_checkboxes} + {if isset($multilang) && $multilang} + {if isset($only_checkbox)} + {foreach from=$languages item=language} + + {/foreach} + {else} + {foreach from=$languages item=language} + + {/foreach} + {/if} + {else} + + {/if} +{/if} \ No newline at end of file diff --git a/admin/themes/default/template/controllers/normal_products/multishop/index.php b/admin/themes/default/template/controllers/normal_products/multishop/index.php new file mode 100644 index 000000000..c4c862b0d --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/multishop/index.php @@ -0,0 +1,35 @@ + +* @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 +*/ + +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../../../../../../../'); +exit; diff --git a/admin/themes/default/template/controllers/normal_products/prices.tpl b/admin/themes/default/template/controllers/normal_products/prices.tpl new file mode 100644 index 000000000..5c6e4550b --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/prices.tpl @@ -0,0 +1,636 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + + +{capture assign=priceDisplayPrecisionFormat}{'%.'|cat:$smarty.const._PS_PRICE_DISPLAY_PRECISION_|cat:'f'}{/capture} +
+ +

{l s='product price'}

+
+ {l s='You must enter either the pre-tax retail price, or the retail price with tax. The input field will be automatically calculated.'} +
+ {include file="controllers/products/multishop/check_fields.tpl" product_tab="Prices"} +
+
{include file="controllers/products/multishop/checkbox.tpl" field="wholesale_price" type="default"}
+ +
+
+ {$currency->prefix}{$currency->suffix} + +
+ {if isset($pack) && $pack->isPack($product->id)}

{l s='The sum of wholesale prices of the product in the pack is %s%s%s' sprintf=[$currency->prefix,{toolsConvertPrice price=$pack->noPackWholesalePrice($product->id)|string_format:$priceDisplayPrecisionFormat},$currency->suffix]}

{/if} +
+
+
+
{include file="controllers/products/multishop/checkbox.tpl" field="price" type="price"}
+ +
+
+ {$currency->prefix}{$currency->suffix} + + +
+
+
+
+
{include file="controllers/products/multishop/checkbox.tpl" field="id_tax_rules_group" type="default"}
+ +
+ +
+
+ +
+
+ + {l s='Create new tax'} + +
+
+
+
+ {if $tax_exclude_taxe_option} +
+
+
+ {l s='Taxes are currently disabled:'} + {l s='Click here to open the Taxes configuration page.'} + +
+
+
+ {/if} + +
+ +
+ {$currency->prefix}{$currency->suffix} + + +
+ {if isset($pack) && $pack->isPack($product->id)}

{l s='The sum of prices of the products in the pack is %s%s%s' sprintf=[$currency->prefix,{toolsConvertPrice price=$pack->noPackPrice($product->id)|string_format:$priceDisplayPrecisionFormat},$currency->suffix]}

{/if} +
+ {* As no use in QloApps currently so commented *} + {*
+
{include file="controllers/products/multishop/checkbox.tpl" field="unit_price" type="unit_price"}
+ +
+
+ {$currency->prefix}{$currency->suffix} + + {l s='per'} + +
+
+
*} + {if isset($product->unity) && $product->unity} +
+
+
+ {l s='or'} + {$currency->prefix}0.00{$currency->suffix} + {l s='per'} {$product->unity}{if $ps_tax && $country_display_tax_label} {l s='(tax incl.)'}{/if} + +
+
+
+ {/if} + {*
+
{include file="controllers/products/multishop/checkbox.tpl" field="on_sale" type="default"}
+ +
+
+ +
+
+
*} +
+
+
+ {l s='Final retail price:'} + + {$currency->prefix} + 0.00 + {$currency->suffix} + ({l s='tax incl.'}) + + + {if $country_display_tax_label} + / + {/if} + {$currency->prefix} + + {$currency->suffix} + {if $country_display_tax_label}({l s='tax excl.'}){/if} + +
+
+
+ +
+ {l s='Cancel'} + + +
+
+ +{*
+

{l s='Feature Price Plans'}

+
+ {l s='You can set feature price plans by visiting '} + {l s='create feature price plans'} +
+
+ + + + + + + + + + + + + + + {if isset($productFeaturePrices) && $productFeaturePrices} + {foreach $productFeaturePrices as $featurePlan} + + + + + + + + + + + {/foreach} + {else} + + + + {/if} + +
#{l s='Id'}{l s='Plan Name'}{l s='Impact way'}{l s='Impact Type'}{l s='Impact Value'}{l s='Date From'}{l s='Date To'}{l s='Status'}
+ {$featurePlan['id_feature_price']} + + {$featurePlan['feature_price_name']} + + {if $featurePlan['impact_type'] == 1} + {l s='Percentage'} + {else} + {l s='Fixed Amount'} + {/if} + + {if $featurePlan['impact_way'] == 1} + {l s='Decrease'} + {else} + {l s='Increase'} + {/if} + + {if $featurePlan['impact_type'] == 1} + {$featurePlan['impact_value']|round:2}% + {else} + {displayPrice price=$featurePlan['impact_value']} + {/if} + + {dateFormat date=$featurePlan['date_from'] full=0} + + {if $featurePlan['date_selection_type'] == 1} + {dateFormat date=$featurePlan['date_to'] full=0} + {else} + {l s='Specific date'} + {/if} + + {if $featurePlan['active'] == 1} + + {else} + + {/if} +
+ {l s='No feature price plans.'} +
+
+
*} + +{if isset($specificPriceModificationForm)} +
+

{l s='Specific prices'}

+
+ {l s='You can set specific prices for clients belonging to different groups, different countries, etc.'} +
+
+
+ + {l s='Add a new specific price'} + + +
+
+ + + +
+ + + + + {* *} + {if $multi_shop}{/if} + + + + + {if $country_display_tax_label} + + {else} + + {/if} + + + + + + + {$specificPriceModificationForm} + + {/if} diff --git a/admin/themes/default/template/controllers/normal_products/seo.tpl b/admin/themes/default/template/controllers/normal_products/seo.tpl new file mode 100644 index 000000000..0a0d3d38e --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/seo.tpl @@ -0,0 +1,116 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} +
+ +

{l s='SEO'}

+ {include file="controllers/products/multishop/check_fields.tpl" product_tab="Seo"} +
+
{include file="controllers/products/multishop/checkbox.tpl" field="meta_title" type="default" multilang="true"}
+ +
+ {include file="controllers/products/input_text_lang.tpl" + languages=$languages + input_name='meta_title' + input_value=$product->meta_title + maxchar=70 + } +
+
+
+
{include file="controllers/products/multishop/checkbox.tpl" field="meta_description" type="default" multilang="true"}
+ +
+ {include file="controllers/products/textarea_lang.tpl" + languages=$languages + input_name='meta_description' + input_value=$product->meta_description + maxchar=160 + } +
+
+ {* Removed for simplicity *} +
+
{include file="controllers/products/multishop/checkbox.tpl" field="meta_keywords" type="default" multilang="true"}
+ +
+ {include file="controllers/products/input_text_lang.tpl" languages=$languages + input_value=$product->meta_keywords + input_name='meta_keywords'} +
+
+
+
{include file="controllers/products/multishop/checkbox.tpl" field="link_rewrite" type="seo_friendly_url" multilang="true"}
+ +
+ {include file="controllers/products/input_text_lang.tpl" + languages=$languages + input_value=$product->link_rewrite + input_name='link_rewrite'} +
+
+ +
+
+
+
+ {foreach from=$languages item=language} +
+ {l s='The product link will look like this:'}
+ {if isset($rewritten_links[$language.id_lang][0])}{$rewritten_links[$language.id_lang][0]|escape:'html':'UTF-8'}{/if}{$product->link_rewrite[$language.id_lang]|escape:'html':'UTF-8'}{if isset($rewritten_links[$language.id_lang][1])}{$rewritten_links[$language.id_lang][1]|escape:'html':'UTF-8'}{/if} +
+ {/foreach} +
+
+
+ {l s='Cancel'} + + +
+
+ diff --git a/admin/themes/default/template/controllers/normal_products/specific_prices_shop_update.tpl b/admin/themes/default/template/controllers/normal_products/specific_prices_shop_update.tpl new file mode 100644 index 000000000..52fc2eab2 --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/specific_prices_shop_update.tpl @@ -0,0 +1,27 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} +{foreach from=$option_list item='row'} + +{/foreach} \ No newline at end of file diff --git a/admin/themes/default/template/controllers/normal_products/textarea_lang.tpl b/admin/themes/default/template/controllers/normal_products/textarea_lang.tpl new file mode 100644 index 000000000..a48a61aed --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/textarea_lang.tpl @@ -0,0 +1,69 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +{foreach from=$languages item=language} + {if $languages|count > 1} +
+
+ {/if} + {if isset($maxchar) && $maxchar} +
+ + {$maxchar|intval} + + {/if} + + + {if isset($maxchar) && $maxchar} +
+ {/if} + {if $languages|count > 1} +
+
+ + +
+
+ {/if} +{/foreach} + + + diff --git a/admin/themes/default/template/controllers/orders/_cart_booking_demands.tpl b/admin/themes/default/template/controllers/orders/_cart_booking_demands.tpl index ca7df51e9..240b54e55 100644 --- a/admin/themes/default/template/controllers/orders/_cart_booking_demands.tpl +++ b/admin/themes/default/template/controllers/orders/_cart_booking_demands.tpl @@ -17,55 +17,151 @@ * @license https://store.webkul.com/license.html *} -{if isset($selectedRoomDemands) && $selectedRoomDemands} - {assign var=roomCount value=1} - {foreach $selectedRoomDemands as $key => $roomDemand} -
-
- - - {if isset($roomDemand['room_num']) && $roomDemand['room_num']} - {l s='Room'} {$roomDemand['room_num']|escape:'html':'UTF-8'} - {else} - {l s='Room'} {$roomCount|escape:'html':'UTF-8'} +
{l s='Rule'}{l s='Combination'}{l s='Shop'}{l s='Currency'}{l s='Country'}{l s='Group'}{l s='Customer'}{l s='Fixed price (tax excl.)'}{l s='Fixed price'}{l s='Impact'}{l s='Period'}{l s='Action'}
- - - - - - - {if $occupancy_required_for_booking} + {if isset($cart_detail_data) && $cart_detail_data} + + + + + + + {if $occupancy_required_for_booking} {/if} - - - - - - - - {if isset($cart_detail_data) && $cart_detail_data} - {assign var=curr_id value=$cart->id_currency|intval} - {foreach from=$cart_detail_data item=data} - - - - - - {if $occupancy_required_for_booking} + + {* *} + + + + + + {assign var=curr_id value=$cart->id_currency|intval} + {foreach from=$cart_detail_data item=data} + + + + + {if $occupancy_required_for_booking} + + {/if} + - {/if} - - - - - - - {/foreach} - {else} - - - + + {* *} + + + + {/foreach} + + {/if} + {if isset($cart_normal_data) && $cart_normal_data} + + + + + + + + + + + + + {foreach $cart_normal_data as $product} + + + + + + + + + + {/foreach} + {/if} -
{l s='Room No.'}{l s='Room Image'}{l s='Room Type'}{l s='Duration'}
{l s='Room No.'}{l s='Room Image'}{l s='Room Type'}{l s='Duration'}{l s='Occupancy'}{l s='Unit Price (tax excl)'}{l s='Additinal Facilities (tax excl)'}{l s='Total Rooms Price (tax excl)'}{l s='Total Price (tax excl)'}
{$data.room_num|escape:'html':'UTF-8'} -

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

- {if isset($data.selected_demands) && $data.selected_demands} -
    - {foreach $data.selected_demands as $selDemand} -
  • - {$selDemand.name|escape:'html':'UTF-8'} -
    • - {/foreach} -
- {/if} - 		{dateFormat date=$data.date_from} - {dateFormat date=$data.date_to}{l s='Extra Services / Fees (tax excl)'}{l s='Total Rooms Price (tax excl)'}{l s='Total Price (tax excl)'}
{$data.room_num|escape:'html':'UTF-8'} -
- -
-
- - - -
-
{l s='Room - 1'}
-
-
-
- - +

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

+ {if isset($data.selected_demands) && $data.selected_demands} +
    + {foreach $data.selected_demands as $selDemand} +
  • + {$selDemand.name|escape:'html':'UTF-8'} +
    • + {/foreach} +
+ {/if} +
{dateFormat date=$data.date_from} - {dateFormat date=$data.date_to} +
+ +
+
+ + + +
+
{l s='Room - 1'}
+
+
+
+ + +
+
+
+
+ + + ({l s='Below'} {$max_child_age|escape:'htmlall':'UTF-8'} {l s='years'}) +
-
+
- - - ({l s='Below'} {$max_child_age|escape:'htmlall':'UTF-8'} {l s='years'}) -
-
-
-
-
- -
-
- {if isset($data['child_ages']) && $data['child_ages']} - {foreach $data['child_ages'] as $childAge} -

- -

- {/foreach} - {/if} + +
+
+ {if isset($data['child_ages']) && $data['child_ages']} + {foreach $data['child_ages'] as $childAge} +

+ +

+ {/foreach} + {/if} +
@@ -116,78 +117,89 @@
+
+ {if $data.feature_price_diff != 0} + {assign var=shown_room_type_price value=$data.feature_price_tax_excl} + {else} + {assign var=shown_room_type_price value=$data.product_price_tax_excl} + {/if} +
+ + {$currency->prefix}{$currency->suffix}
- {if $data.feature_price_diff != 0} - {assign var=shown_room_type_price value=$data.feature_price_tax_excl} - {else} - {assign var=shown_room_type_price value=$data.product_price_tax_excl} - {/if} - - - {if isset($data.extra_demands) && $data.extra_demands} - {displayPrice price=$data.demand_price|escape:'html':'UTF-8'} - {else} - {displayPrice price=0} - {/if} - {displayPrice price=$data.amt_with_qty} - {if isset($data.extra_demands) && $data.extra_demands} - {displayPrice price=$data.amt_with_qty|escape:'html':'UTF-8'+$data.demand_price|escape:'html':'UTF-8'} - {else} - {displayPrice price=$data.amt_with_qty|escape:'html':'UTF-8'} - {/if} - - - {if isset($data.extra_demands) && $data.extra_demands} -
- -  {l s='Facilities'} - - {/if} -
{l s='No Room Found in the cart.'}
+ {if (isset($data.extra_demands) && $data.extra_demands) || (isset($data.additional_service) && $data.additional_service)} + {displayPrice price=($data.demand_price + $data.additional_service_price + $data.additional_services_auto_add_price)|escape:'html':'UTF-8'} + {else} + {displayPrice price=0} + {/if} + + {displayPrice price=$data.amt_with_qty} + {if (isset($data.extra_demands) && $data.extra_demands) || (isset($data.additional_service) && $data.additional_service)} + {displayPrice price=($data.feature_price_tax_excl + $data.additional_services_auto_add_price + $data.demand_price + $data.additional_service_price)|escape:'html':'UTF-8'} + {else} + {displayPrice price=$data.feature_price_tax_excl|escape:'html':'UTF-8'} + {/if} + + + {if (isset($data.extra_demands) && $data.extra_demands) || isset($data.additional_service) && $data.additional_service} +
+ +  {l s='Services'} + + {/if} +
{l s='Image'}{l s='Name'}{l s='Hotel Name'}{l s='Unit Price (tax excl)'}{l s='Quantity'}{l s='Total Price (Tax incl.)'}

{$product['name']|escape:'html':'UTF-8'}

{$product['hotel_name']}{displayPrice price=$product['unit_price_tax_incl']}{$product['quantity']|escape:'htmlall':'UTF-8'}{displayPrice price=$product['total_price_tax_incl']} + +
{* Modal for extra demands *} - +{* *} {strip} {addJsDefL name=txtExtraDemandSucc}{l s='Updated Successfully' js=1}{/addJsDefL} @@ -205,6 +217,8 @@ color:#979797; font-size:12px;} /*Extra demands CSS*/ + #rooms_type_extra_demands .modal-header { + padding-bottom: 0px} #rooms_extra_demands { font-size: 16px;} #rooms_extra_demands .room_demands_container { @@ -212,7 +226,7 @@ #rooms_extra_demands .demand_header { padding: 10px; color: #333; - border-bottom: 1px solid #ddd;} + border-bottom: 1px solid #ddd;} #rooms_extra_demands .rooms_extra_demands_head { margin-bottom: 18px;} #rooms_extra_demands .room_demand_block { diff --git a/admin/themes/default/template/controllers/orders/_new_product.tpl b/admin/themes/default/template/controllers/orders/_new_product.tpl index 141e9e68b..ec848a117 100644 --- a/admin/themes/default/template/controllers/orders/_new_product.tpl +++ b/admin/themes/default/template/controllers/orders/_new_product.tpl @@ -23,7 +23,7 @@ * International Registered Trademark & Property of PrestaShop SA *} - +
@@ -50,7 +50,7 @@
{l s='Check In'}
- +
@@ -58,33 +58,13 @@
{l s='Check Out'}
- +
- -
-
-
- {if $currency->format % 2}
{$currency->sign} {l s='tax excl.'}
{/if} - - {if !($currency->format % 2)}
{$currency->sign} {l s='tax excl.'}
{/if} -
-
-
-
-
- {if $currency->format % 2}
{$currency->sign} {l s='tax incl.'}
{/if} - - {if !($currency->format % 2)}
{$currency->sign} {l s='tax incl.'}
{/if} -
-
-
- - - + {if $order->with_occupancy}
@@ -137,6 +117,27 @@ {/if} + +
+
+
+ {if $currency->format % 2}
{$currency->sign} {l s='tax excl.'}
{/if} + + {if !($currency->format % 2)}
{$currency->sign} {l s='tax excl.'}
{/if} +
+
+
+
+
+ {if $currency->format % 2}
{$currency->sign} {l s='tax incl.'}
{/if} + + {if !($currency->format % 2)}
{$currency->sign} {l s='tax incl.'}
{/if} +
+
+
+ + + {*{if ($order->hasBeenPaid())}{/if} {if $display_warehouse}{/if} {if ($order->hasBeenDelivered())}{/if} diff --git a/admin/themes/default/template/controllers/orders/_new_service_product.tpl b/admin/themes/default/template/controllers/orders/_new_service_product.tpl new file mode 100644 index 000000000..d11b5f358 --- /dev/null +++ b/admin/themes/default/template/controllers/orders/_new_service_product.tpl @@ -0,0 +1,128 @@ +{* +* 2007-2017 PrestaShop +* +* 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.txt. +* It is also available through the world-wide-web at this URL: +* http://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. +* +* 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 +* @copyright 2007-2017 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + + + + +
+ +
+ +
+ +
+
+
+ + {* + + *} + + {if ($order->getTaxCalculationMethod() != $smarty.const.PS_TAX_EXC)} + + {/if} + +
+
+ {if $currency->format % 2}
{$currency->sign} {l s='tax excl.'}
{/if} + + {if !($currency->format % 2)}
{$currency->sign} {l s='tax excl.'}
{/if} +
+
+
+
+
+ {if $currency->format % 2}
{$currency->sign} {l s='tax incl.'}
{/if} + + {if !($currency->format % 2)}
{$currency->sign} {l s='tax incl.'}
{/if} +
+
+ + + + + + {if ($order->hasBeenPaid())}{/if} + {if $display_warehouse}{/if} + {if ($order->hasBeenDelivered())}{/if} + 0 + {displayPrice price=0 currency=$currency->id} + + {if sizeof($invoices_collection)} + + {/if} + + + + + + + +{* + +

{l s='New invoice information'}

+
+
+ +
+

{$carrier->name}

+
+
+
+ +
+
+ +

{l s='If you don\'t select "Free shipping," the normal shipping cost will be applied.'}

+
+
+
+
+ + *} \ No newline at end of file diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl index e63882646..5f0af8220 100644 --- a/admin/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin/themes/default/template/controllers/orders/_product_line.tpl @@ -23,7 +23,7 @@ * International Registered Trademark & Property of PrestaShop SA *} - + {if $refund_allowed} @@ -37,16 +37,16 @@

{$data.room_type}

-

- - {l s='Additional Features'} + {*

+ + {l s='Extra Services'} -

- {if isset($data['extra_demands']) && $data['extra_demands']} +

*} + {* {if (isset($data['extra_demands']) && $data['extra_demands']) || (isset($data['additional_services']) && $data['additional_services'])}

- {convertPriceWithCurrency price=$data['extra_demands_price_ti'] currency=$currency->id} + {convertPriceWithCurrency price=($data['extra_demands_price_ti'] + $data['additional_services_price_ti']) currency=$currency->id}

- {/if} + {/if} *} @@ -162,21 +162,41 @@ - {if $data.feature_price_diff != 0} + {* {if $data['feature_price_diff'] != 0} - {convertPriceWithCurrency price=$data.unit_price_without_reduction_tax_excl currency=$currency->id} + {convertPriceWithCurrency price=$data['unit_price_without_reduction_tax_excl'] currency=$currency->id}   - {/if} - - {convertPriceWithCurrency price=$data.paid_unit_price_tax_excl currency=$currency->id} - + {/if} *} +

+ + {convertPriceWithCurrency price=$data['total_price_tax_excl'] currency=$currency->id} + +

+

{l s='Per day price:'} {convertPriceWithCurrency price=$data['paid_unit_price_tax_excl'] currency=$currency->id}

 - {convertPriceWithCurrency price=$data.amt_with_qty_tax_incl currency=$currency->id} + + {convertPriceWithCurrency price=($data['extra_demands_price_te'] + $data['additional_services_price_te'] + $data['convenience_fee_te'] + $data['additional_services_price_auto_add_te']) currency=$currency->id} + + + + + + + + {convertPriceWithCurrency price=($data['total_room_tax']) currency=$currency->id} + + + {convertPriceWithCurrency price=($data['total_room_price_ti']) currency=$currency->id} {if $can_edit}