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/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/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/quantities.tpl b/admin-dev/themes/default/template/controllers/products/quantities.tpl index 4a668495b..5bbf73afe 100644 --- a/admin-dev/themes/default/template/controllers/products/quantities.tpl +++ b/admin-dev/themes/default/template/controllers/products/quantities.tpl @@ -24,215 +24,218 @@ *} {if isset($product->id)} - -

{l s='Available quantities for sale'}

- {if !$ps_stock_management} -
{l s='The stock management is disabled'}
- {else} - {include file="controllers/products/multishop/check_fields.tpl" product_tab="Quantities"} -
- {l s='This interface allows you to manage available quantities for sale for products. It also allows you to manage product combinations in the current shop.'}
- {l s='You can choose whether or not to use the advanced stock management system for this product.'}
- {l s='You can manually specify the quantities for the product/each product combination, or you can choose to automatically determine these quantities based on your stock (if advanced stock management is activated).'}
- {l s='In this case, quantities correspond to the real-stock quantities in the warehouses connected with the current shop, or current group of shops.'}
- {l s='For packs: If it has products that use advanced stock management, you have to specify a common warehouse for these products in the pack.'}
- {l s='Also, please note that when a product has combinations, its default combination will be used in stock movements.'} -
- - {if $show_quantities == true} - - - - - - -
is_virtual || $product->cache_is_pack}style="display:none;"{/if} class="row stockForVirtualProduct"> -
-

- -

-
-
- -
is_virtual || $product->cache_is_pack}style="display:none;"{/if} class="row stockForVirtualProduct"> - -
-

- -

-

- -

-
-
- - {if isset($pack_quantity)} -
-

{l s='When a product has combinations, quantities will be based on the default combination.'}

-

{l s='Given the quantities of the products in this pack, the maximum quantity should be:'} {$pack_quantity}

-
- {/if} - - - - - - - - - - - - - {foreach from=$attributes item=attribute} - - - - - {/foreach} -
{l s='Quantity'}{l s='Designation'}
- {$available_quantity[$attribute['id_product_attribute']]} - - {$product_designation[$attribute['id_product_attribute']]}
- -
- -
-

- -

-

- -

-

- -

-
-
- +
+ +

{l s='Available quantities for sale'}

+ {if !$ps_stock_management} +
{l s='The stock management is disabled'}
{else} -
-

{l s='It is not possible to manage quantities when:'}

- + {include file="controllers/products/multishop/check_fields.tpl" product_tab="Quantities"} +
+ {l s='This interface allows you to manage available quantities for sale for products. It also allows you to manage product combinations in the current shop.'}
+ {l s='You can choose whether or not to use the advanced stock management system for this product.'}
+ {l s='You can manually specify the quantities for the product/each product combination, or you can choose to automatically determine these quantities based on your stock (if advanced stock management is activated).'}
+ {l s='In this case, quantities correspond to the real-stock quantities in the warehouses connected with the current shop, or current group of shops.'}
+ {l s='For packs: If it has products that use advanced stock management, you have to specify a common warehouse for these products in the pack.'}
+ {l s='Also, please note that when a product has combinations, its default combination will be used in stock movements.'}
- {/if} - {/if} -

{l s='Availability settings'}

+ {if $show_quantities == true} + + + - {if !$has_attribute} -
- -
- -
-

{l s='The minimum quantity to buy this product (set to 1 to disable this feature)'}

-
- {/if} - - {if $ps_stock_management} - {include file="controllers/products/multishop/checkbox.tpl" field="available_now" type="default" multilang="true"} -
- -
-
- {include file="controllers/products/input_text_lang.tpl" - languages=$languages - input_value=$product->available_now - input_name='available_now'} -
-
-
-
- {include file="controllers/products/multishop/checkbox.tpl" field="available_later" type="default" multilang="true"} - -
-
- {include file="controllers/products/input_text_lang.tpl" - languages=$languages - input_value=$product->available_later - input_name='available_later'} + +
is_virtual || $product->cache_is_pack}style="display:none;"{/if} class="row stockForVirtualProduct"> +
+

+ +

+
+
+ +
is_virtual || $product->cache_is_pack}style="display:none;"{/if} class="row stockForVirtualProduct"> + +
+

+ +

+

+ +

+
+
+ + {if isset($pack_quantity)} +
+

{l s='When a product has combinations, quantities will be based on the default combination.'}

+

{l s='Given the quantities of the products in this pack, the maximum quantity should be:'} {$pack_quantity}

+
+ {/if} + + + + + + + + + + + + + {foreach from=$attributes item=attribute} + + + + + {/foreach} +
{l s='Quantity'}{l s='Designation'}
+ {$available_quantity[$attribute['id_product_attribute']]} + + {$product_designation[$attribute['id_product_attribute']]}
+ +
+ +
+

+ +

+

+ +

+

+ +

+
+
+ + {else} +
+

{l s='It is not possible to manage quantities when:'}

+
    +
  • {l s='You are currently managing all of your shops.'}
    • +
  • {l s='You are currently managing a group of shops where quantities are not shared between every shop in this group.'}
    • +
  • {l s='You are currently managing a shop that is in a group where quantities are shared between every shop in this group.'}
    • +
+
+ {/if} + {/if} +
+
+

{l s='Availability settings'}

+ + {if !$has_attribute} +
+ +
+ +
+

{l s='The minimum quantity to buy this product (set to 1 to disable this feature)'}

+
+ {/if} + + {if $ps_stock_management} + {include file="controllers/products/multishop/checkbox.tpl" field="available_now" type="default" multilang="true"} +
+ +
+
+ {include file="controllers/products/input_text_lang.tpl" + languages=$languages + input_value=$product->available_now + input_name='available_now'} +
- - - {if !$countAttributes} - - -

{l s='The available date when this product is out of stock.'}

+
+ {include file="controllers/products/multishop/checkbox.tpl" field="available_later" type="default" multilang="true"} + +
+
+ {include file="controllers/products/input_text_lang.tpl" + languages=$languages + input_value=$product->available_later + input_name='available_later'} +
+
+
+ + {if !$countAttributes} + + +

{l s='The available date when this product is out of stock.'}

+ {/if} {/if} - {/if} - + +
{/if} {*$default_language*} \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/products/suppliers.tpl b/admin-dev/themes/default/template/controllers/products/suppliers.tpl index 76c0016fa..a9d9a5dec 100644 --- a/admin-dev/themes/default/template/controllers/products/suppliers.tpl +++ b/admin-dev/themes/default/template/controllers/products/suppliers.tpl @@ -25,6 +25,7 @@ {if isset($product->id)} +

{l s='Suppliers of the current product'}

@@ -60,7 +61,8 @@ {l s='Create a new supplier'} - +
+

{l s='Product reference(s)'}

@@ -130,4 +132,5 @@
{/foreach} +
{/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/js/admin-products.js b/js/admin-products.js index 09918548b..fe948e824 100644 --- a/js/admin-products.js +++ b/js/admin-products.js @@ -1323,17 +1323,20 @@ product_tabs['Suppliers'] = new function(){ // @TODO: a better way to fix the accordion wrong size bug when the selected page is this page setTimeout(function() { - $('#suppliers_accordion').accordion(); - // If one second was not enough to display page, another resize is needed - setTimeout(function() { - $('#suppliers_accordion').accordion({ heightStyle: "fill" }); - }, 3000); + $('#suppliers_accordion').accordion({ + collapsible: true, + autoHeight: true, + heightStyle: "content"}); }, 1000); // Resize the accordion once the page is visible because of the bug with accordions initialized // inside a display:none block not having the correct size. $('#suppliers_accordion').parents('.product-tab-content').bind('displayed', function(){ - $('#suppliers_accordion').accordion({ heightStyle: "fill" }); + $('#suppliers_accordion').accordion({ + collapsible: true, + autoHeight: true, + heightStyle: "content" + }); }); }; } @@ -1435,13 +1438,21 @@ product_tabs['Warehouses'] = new function(){ // @TODO: a better way to fix the accordion wrong size bug when the selected page is this page setTimeout(function() { - $('#warehouse_accordion').accordion(); - }, 500); + $('#warehouse_accordion').accordion({ + collapsible: true, + autoHeight: true, + heightStyle: "content" + }); + }, 1000); // Resize the accordion once the page is visible because of the bug with accordions initialized // inside a display:none block not having the correct size. $('#warehouse_accordion').parents('.product-tab-content').bind('displayed', function(){ - $('#warehouse_accordion').accordion("refresh"); + $('#warehouse_accordion').accordion({ + collapsible: true, + autoHeight: true, + heightStyle: "content" + }); }); }; }