diff --git a/admin-dev/themes/default/template/controllers/products/associations.tpl b/admin-dev/themes/default/template/controllers/products/associations.tpl index 8af8f433a..069065032 100644 --- a/admin-dev/themes/default/template/controllers/products/associations.tpl +++ b/admin-dev/themes/default/template/controllers/products/associations.tpl @@ -22,95 +22,96 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} +
+ +
- -
+

{l s='Associations'}

-

{l s='Associations'}

- - {include file="controllers/products/multishop/check_fields.tpl" product_tab="Associations"} -
- {l s='Please select a default category.'} -
- -
- {include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"} - -
-
- {$category_tree} -
- - {l s='Create new category'} - + {include file="controllers/products/multishop/check_fields.tpl" product_tab="Associations"} +
+ {l s='Please select a default category.'}
-
-
- {include file="controllers/products/multishop/checkbox.tpl" field="id_category_default" type="default"} - -
- -
-
- -
- -
- - - -
- -
- +
+ {include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"} + +
+
+ {$category_tree}
+ + {l s='Create new category'} +
-
- {* @todo : donot use 3 foreach, but assign var *} - {foreach from=$accessories item=accessory} - {$accessory.name|escape:'htmlall':'UTF-8'}{if !empty($accessory.reference)}{$accessory.reference}{/if} - - +
+ +
+ {include file="controllers/products/multishop/checkbox.tpl" field="id_category_default" type="default"} + +
+
-
-
- -
-
-
- +
+ +
+ + + +
+ +
+ +
-
- - {l s='Create new manufacturer'} - +
+ {* @todo : donot use 3 foreach, but assign var *} + {foreach from=$accessories item=accessory} + {$accessory.name|escape:'htmlall':'UTF-8'}{if !empty($accessory.reference)}{$accessory.reference}{/if} + + + + {/foreach} +
+
+
+ +
+ +
+
+
+ +
+
+ + {l s='Create new manufacturer'} + +
-
\ No newline at end of file +
\ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/products/attachments.tpl b/admin-dev/themes/default/template/controllers/products/attachments.tpl index fac88a718..87eeac09e 100644 --- a/admin-dev/themes/default/template/controllers/products/attachments.tpl +++ b/admin-dev/themes/default/template/controllers/products/attachments.tpl @@ -24,113 +24,115 @@ *} {if isset($obj->id)} - -

{l s='Attachment'}

+
+ +

{l s='Attachment'}

-
- -
-
- {include file="controllers/products/input_text_lang.tpl" +
+ +
+
+ {include file="controllers/products/input_text_lang.tpl" + languages=$languages + input_value=$attachment_name + input_name="attachment_name" + } +
+
+
+ +
+ +
+ {include + file="controllers/products/textarea_lang.tpl" languages=$languages - input_value=$attachment_name - input_name="attachment_name" + input_name="attachment_description" + input_value=$attachment_description }
-
- -
- -
- {include - file="controllers/products/textarea_lang.tpl" - languages=$languages - input_name="attachment_description" - input_value=$attachment_description - } -
-
-
- -
-
-
- -
- - - - - +
+ +
+
+
+ +
+ + + + + +
+
+
+
-
- +
+ +
+ +
+ +
+
+
+
+

{l s='Available attachments:'}

+ + {l s='Add'} +
+
+

{l s='Attachments for this product:'}

+ + {l s='Remove'} +
- -
- -
- -
-
-
-
-

{l s='Available attachments:'}

- - {l s='Add'} -
-
-

{l s='Attachments for this product:'}

- - {l s='Remove'} -
-
-
-
- - - - +
{/if} \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/products/combinations.tpl b/admin-dev/themes/default/template/controllers/products/combinations.tpl index ecfd118b3..ca3d7c8b8 100644 --- a/admin-dev/themes/default/template/controllers/products/combinations.tpl +++ b/admin-dev/themes/default/template/controllers/products/combinations.tpl @@ -22,364 +22,365 @@ * @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) && !$product->is_virtual} - +
-

{l s='Add or modify combinations for this product.'}

-
- {l s='Or use the'}  {l s='Product combinations generator'} {l s='in order to automatically create a set of combinations.'} -
- - {if $combination_exists} -
- {l s='Some combinations already exist. If you want to generate new combinations, the quantities for the existing combinations will be lost.'}
- {l s='You can add a combination by clicking the link "Add new combination" on the toolbar.'} -
- {/if} - {if isset($display_multishop_checkboxes) && $display_multishop_checkboxes} -
- {include file="controllers/products/multishop/check_fields.tpl" product_tab="Combinations"} - {/if} - - -
\ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/products/customization.tpl b/admin-dev/themes/default/template/controllers/products/customization.tpl index 1edf26ed8..5fce735e6 100644 --- a/admin-dev/themes/default/template/controllers/products/customization.tpl +++ b/admin-dev/themes/default/template/controllers/products/customization.tpl @@ -24,36 +24,37 @@ *} {if isset($obj->id)} +

{l s='Add or modify customizable properties.'}

{include file="controllers/products/multishop/check_fields.tpl" product_tab="Customization"} -
- {include file="controllers/products/multishop/checkbox.tpl" field="uploadable_files" type="default"} - -
- +
+ {include file="controllers/products/multishop/checkbox.tpl" field="uploadable_files" type="default"} + +
+ +
-
-
- {include file="controllers/products/multishop/checkbox.tpl" field="text_fields" type="default"} - -
- +
+ {include file="controllers/products/multishop/checkbox.tpl" field="text_fields" type="default"} + +
+ +
-
{if $has_file_labels} {l s='Define the label of the file fields:'} @@ -64,5 +65,5 @@ {l s='Define the label of the text fields:'} {$display_text_labels} {/if} - +
{/if} \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/products/features.tpl b/admin-dev/themes/default/template/controllers/products/features.tpl index 1be87561d..abe04ba72 100644 --- a/admin-dev/themes/default/template/controllers/products/features.tpl +++ b/admin-dev/themes/default/template/controllers/products/features.tpl @@ -24,6 +24,7 @@ *} {if isset($product->id)} +

{l s='Assign features to this product:'}

@@ -107,5 +108,5 @@ {l s='Add a new feature'} - +
{/if} \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl index 284acc386..7c39d30ee 100644 --- a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl @@ -251,11 +251,11 @@ {* all input are here *}
{foreach $product_tabs key=numStep item=tab} -
+
{if $tab.selected} {$custom_form} {/if} -
+
{/foreach} diff --git a/admin-dev/themes/default/template/controllers/products/images.tpl b/admin-dev/themes/default/template/controllers/products/images.tpl index 7ba647635..a21a42e48 100644 --- a/admin-dev/themes/default/template/controllers/products/images.tpl +++ b/admin-dev/themes/default/template/controllers/products/images.tpl @@ -24,6 +24,7 @@ *} {if isset($id_product) && isset($product)} +

@@ -328,4 +329,5 @@ }); {/literal} +

{/if} \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/products/informations.tpl b/admin-dev/themes/default/template/controllers/products/informations.tpl index ad0fa3004..1699d21d7 100644 --- a/admin-dev/themes/default/template/controllers/products/informations.tpl +++ b/admin-dev/themes/default/template/controllers/products/informations.tpl @@ -28,404 +28,406 @@ {assign var=class_input_ajax value=''} {/if} - -

{l s='Info.'}

-
{l s='Product global 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/input_text_lang.tpl" - languages=$languages - input_class="{$class_input_ajax}{if !$product->id}copy2friendlyUrl{/if} updateCurrentText" - input_value=$product->name - input_name="name" - } -
-
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -{* 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} /> - - - -
-
- - - - - - -
- {include file="controllers/products/multishop/checkbox.tpl" field="visibility" type="default"} - -
- -
-
- -
active}style="display:none"{/if} > -
- {if isset($display_multishop_checkboxes) && $display_multishop_checkboxes} -
- {include file="controllers/products/multishop/checkbox.tpl" only_checkbox="true" field="available_for_order" type="default"} - {include file="controllers/products/multishop/checkbox.tpl" only_checkbox="true" field="show_price" type="show_price"} - {include file="controllers/products/multishop/checkbox.tpl" only_checkbox="true" field="online_only" type="default"} -
+
+ +

{l s='Info.'}

+
{l s='Product global 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="condition" type="default"} - -
- +
+ +
+ +
+ +
+
+ {include file="controllers/products/input_text_lang.tpl" + languages=$languages + input_class="{$class_input_ajax}{if !$product->id}copy2friendlyUrl{/if} updateCurrentText" + input_value=$product->name + input_name="name" + } +
+
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ + {* 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} /> + + + +
+
+ + + -
-
+
\ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl b/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl index f87e8a818..1dc4b5790 100644 --- a/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl +++ b/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl @@ -30,7 +30,7 @@ {if isset($input_class)}class="{$input_class}"{/if} name="{$input_name}_{$language.id_lang}" value="{$input_value[$language.id_lang]|htmlentitiesUTF8|default:''}" - onkeyup="if (isArrowKey(event)) return ;updateFriendlyURL();"> + onkeyup="if (isArrowKey(event)) return ;updateFriendlyURL();" onblur="updateLinkRewrite();">
+ {/if} \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/products/warehouses.tpl b/admin-dev/themes/default/template/controllers/products/warehouses.tpl index 08f5c6fe5..511153e7b 100644 --- a/admin-dev/themes/default/template/controllers/products/warehouses.tpl +++ b/admin-dev/themes/default/template/controllers/products/warehouses.tpl @@ -25,8 +25,9 @@ {if isset($product->id)} +
-

{l s='Product location in warehouses'}

+

{l s='Product location in warehouses'}

{l s='This interface allows you to specify the warehouse in which the product is stocked.'}

@@ -38,51 +39,57 @@ {l s='Create a new warehouse'}{l s='Create a new warehouse'} -
+
{foreach from=$warehouses item=warehouse} -

{$warehouse['name']}

-
- - - - - - - {foreach $attributes AS $index => $attribute} - {assign var=location value=''} - {assign var=selected value=''} - {foreach from=$associated_warehouses item=aw} - {if $aw->id_product == $attribute['id_product'] && $aw->id_product_attribute == $attribute['id_product_attribute'] && $aw->id_warehouse == $warehouse['id_warehouse']} - {assign var=location value=$aw->location} - {assign var=selected value=true} +
+
+ {$warehouse['name']} +
+
+
+
{l s='Stored'}{l s='Product'}{l s='Location (optional)'}
+ + + + + + {foreach $attributes AS $index => $attribute} + {assign var=location value=''} + {assign var=selected value=''} + {foreach from=$associated_warehouses item=aw} + {if $aw->id_product == $attribute['id_product'] && $aw->id_product_attribute == $attribute['id_product_attribute'] && $aw->id_warehouse == $warehouse['id_warehouse']} + {assign var=location value=$aw->location} + {assign var=selected value=true} + {/if} + {/foreach} + + + + + + {/foreach} + + + + {if $attributes|@count gt 1} + + + + {/if} - {/foreach} - - - - - - {/foreach} - - - - {if $attributes|@count gt 1} - - - - - {/if} -
{l s='Stored'}{l s='Product'}{l s='Location (optional)'}
+ {$product_designation[$attribute['id_product_attribute']]} +
 
{l s='Mark all products as stored in this warehouse.'}
- {$product_designation[$attribute['id_product_attribute']]} -
 
{l s='Mark all products as stored in this warehouse.'}
+ +
+
{/foreach}
-

 

+
{/if} \ No newline at end of file diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl index 9590bed8f..aced831df 100644 --- a/admin-dev/themes/default/template/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/helpers/form/form.tpl @@ -48,7 +48,6 @@
{$field}
{elseif $key == 'input'} {foreach $field as $input} -
{if $input.type == 'hidden'} @@ -58,7 +57,7 @@ {/if} {block name="label"} {if isset($input.label)} - + {/if} {/block} {block name="field"} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_addstock.tpl b/admin-dev/themes/default/template/helpers/list/list_action_addstock.tpl index 5a593025f..59ab663cc 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_addstock.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_addstock.tpl @@ -22,6 +22,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - + {$action} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_default.tpl b/admin-dev/themes/default/template/helpers/list/list_action_default.tpl index f5b1473b8..8d760ab19 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_default.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_default.tpl @@ -22,6 +22,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - + {$action} \ No newline at end of file diff --git a/admin-dev/themes/default/template/helpers/list/list_action_delete.tpl b/admin-dev/themes/default/template/helpers/list/list_action_delete.tpl index bcb213af7..b0d4cc0e3 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_delete.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_delete.tpl @@ -22,6 +22,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - + {$action} \ No newline at end of file diff --git a/admin-dev/themes/default/template/helpers/list/list_action_details.tpl b/admin-dev/themes/default/template/helpers/list/list_action_details.tpl index 113ceed3e..e9dac3669 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_details.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_details.tpl @@ -23,6 +23,6 @@ * International Registered Trademark & Property of PrestaShop SA *} - + {$action} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_duplicate.tpl b/admin-dev/themes/default/template/helpers/list/list_action_duplicate.tpl index 0b575a2f7..3ad8780a4 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_duplicate.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_duplicate.tpl @@ -22,6 +22,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - + {$action} \ No newline at end of file diff --git a/admin-dev/themes/default/template/helpers/list/list_action_edit.tpl b/admin-dev/themes/default/template/helpers/list/list_action_edit.tpl index 53c0f76b1..cd015f481 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_edit.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_edit.tpl @@ -22,6 +22,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - + {$action} \ No newline at end of file diff --git a/admin-dev/themes/default/template/helpers/list/list_action_removestock.tpl b/admin-dev/themes/default/template/helpers/list/list_action_removestock.tpl index 151344629..93ad30413 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_removestock.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_removestock.tpl @@ -22,6 +22,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - + {$action} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_supplier_order_receipt.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supplier_order_receipt.tpl index 1797455a4..3bff90eb1 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_supplier_order_receipt.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_supplier_order_receipt.tpl @@ -22,6 +22,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - + {$action} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_change_state.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_change_state.tpl index afa90d014..3b5f02d2e 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_change_state.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_change_state.tpl @@ -22,6 +22,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - + {$action} \ No newline at end of file diff --git a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl index accaf1054..66e36e7ca 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl @@ -22,6 +22,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - + {$action} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_receipt.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_receipt.tpl index 8c7b0acb1..1e891d92f 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_receipt.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_receipt.tpl @@ -22,6 +22,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - + {$action} \ No newline at end of file diff --git a/admin-dev/themes/default/template/helpers/list/list_action_transferstock.tpl b/admin-dev/themes/default/template/helpers/list/list_action_transferstock.tpl index 427f06513..3a6699f17 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_transferstock.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_transferstock.tpl @@ -22,6 +22,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - + {$action} diff --git a/admin-dev/themes/default/template/helpers/list/list_content.tpl b/admin-dev/themes/default/template/helpers/list/list_content.tpl index 71640bfc4..b730d8ba4 100644 --- a/admin-dev/themes/default/template/helpers/list/list_content.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_content.tpl @@ -27,7 +27,7 @@ {foreach $list AS $index => $tr} @@ -147,7 +147,7 @@ {/foreach} {if $compiled_actions|count > 0}
- {$compiled_actions[0]|replace:'class=""':'class="btn btn-default btn-small"'} + {$compiled_actions[0]|regex_replace:'/class\s*=\s*"(\w*)"/':'class="$1 btn btn-default"'} {if $compiled_actions|count > 1}
'; $content .= '