Suite à MAJ 2.3.4, il manquait des choses dans des templates

templates/backOffice/default/I18n/en_US.php

@@ -43,6 +43,7 @@ return array(
     'Add a new mailing template' => 'Add a new mailing template',
     'Add a new module in a hook' => 'Add a new module in a hook',
     'Add a new module to this hook' => 'Add a new module to this hook',
+    'Add a new order status' => 'Add a new order status',
     'Add a new product' => 'Add a new product',
     'Add a new product attribute' => 'Add a new product attribute',
     'Add a new product feature' => 'Add a new product feature',
@@ -51,6 +52,7 @@ return array(
     'Add a new shipping zone' => 'Add a new shipping zone',
     'Add a new state' => 'Add a new state',
     'Add a new variable' => 'Add a new variable',
+    'Add a variable' => 'Add a variable',
     'Add document to your product.' => 'Add document to your product.',
     'Add selected countries' => 'Add selected countries',
     'Add tax to this group' => 'Add tax to this group',
@@ -105,6 +107,7 @@ return array(
     'Auth Mode' => 'Auth Mode',
     'Auth Mode :' => 'Auth Mode :',
     'Author' => 'Author',
+    'Authors' => 'Authors',
     'Available product categories' => 'Available product categories',
     'Available taxes' => 'Available taxes',
     'Back' => 'Back',
@@ -236,6 +239,7 @@ return array(
     'Create a new folder' => 'Create a new folder',
     'Create a new language' => 'Create a new language',
     'Create a new mailing template' => 'Create a new mailing template',
+    'Create a new order status' => 'Create a new order status',
     'Create a new product' => 'Create a new product',
     'Create a new product template' => 'Create a new product template',
     'Create a new profile' => 'Create a new profile',
@@ -259,9 +263,10 @@ return array(
     'Create this feature' => 'Create this feature',
     'Create this folder' => 'Create this folder',
     'Create this hook' => 'Create this hook',
-    'Create this hooks' => 'Create this hooks',
+    'Create this hooks' => 'Create these hooks',
     'Create this language' => 'Create this language',
     'Create this mailing template' => 'Create this mailing template',
+    'Create this order status' => 'Create this order status',
     'Create this product' => 'Create this product',
     'Create this product template' => 'Create this product template',
     'Create this sale' => 'Create this sale',
@@ -287,7 +292,7 @@ return array(
     'Days before expiration' => 'Days before expiration',
     'Deactivate %title module' => 'Deactivate %title module',
     'Deactivate hook' => 'Deactivate hook',
-    'Deactivate this hooks' => 'Deactivate this hooks',
+    'Deactivate this hooks' => 'Deactivate these hooks',
     'Decimal places' => 'Decimal places',
     'Default' => 'Default',
     'Default address' => 'Default address',
@@ -300,6 +305,7 @@ return array(
     'Delete administrator' => 'Delete administrator',
     'Delete also module data' => 'Delete also module data',
     'Delete an order' => 'Delete an order',
+    'Delete an order status' => 'Delete an order status',
     'Delete api access' => 'Delete API access',
     'Delete attribute' => 'Delete attribute',
     'Delete attribute value' => 'Delete attribute value',
@@ -346,6 +352,7 @@ return array(
     'Delete this language' => 'Delete this language',
     'Delete this mailing template' => 'Delete this mailing template',
     'Delete this module' => 'Delete this module',
+    'Delete this order status' => 'Delete this order status',
     'Delete this product' => 'Delete this product',
     'Delete this product attribute' => 'Delete this product attribute',
     'Delete this product feature' => 'Delete this product feature',
@@ -371,6 +378,7 @@ return array(
     'Discount amount' => 'Discount amount',
     'Discount percentage' => 'Discount percentage',
     'Discover all our modules on <a href=\'http://thelia.net/modules\' target=\'_blank\'>Thelia Modules</a> !' => 'Discover all our modules on <a href=\'http://thelia.net/modules\' target=\'_blank\'>Thelia Modules</a> !',
+    'Display protected modules ?' => 'Display protected modules ?',
     'Do not use a product template' => 'Do not use a product template',
     'Do this export' => 'Do this export',
     'Do this import' => 'Do this import',
@@ -401,6 +409,7 @@ return array(
     'Do you really want to delete this language ?' => 'Do you really want to delete this language ?',
     'Do you really want to delete this mailing template ?' => 'Do you really want to delete this mailing template ?',
     'Do you really want to delete this module ?' => 'Do you really want to delete this module ?',
+    'Do you really want to delete this order status ?' => 'Do you really want to delete this order status ?',
     'Do you really want to delete this product and all it\'s components (images, documents)?<br>This can\'t be canceled.' => 'Do you really want to delete this product and all it\'s components (images, documents)?<br>This can\'t be canceled.',
     'Do you really want to delete this profile ?' => 'Do you really want to delete this profile ?',
     'Do you really want to delete this sale ? All related products will no longer be on sale' => 'Do you really want to delete this sale ? All related products will no longer be on sale',
@@ -414,10 +423,10 @@ return array(
     'Do you really want to remove the product from this category ?' => 'Do you really want to remove the product from this category ?',
     'Do you really want to remove this accessory from the product ?' => 'Do you really want to remove this accessory from the product ?',
     'Do you really want to remove this attribute from all product templates ? You\'ll loose all product related data for this attribute.' => 'Do you really want to remove this attribute from all product templates ? You\'ll loose all product related data for this attribute.',
-    'Do you really want to remove this attribute from the template ?' => 'Do you really want to remove this attribute from the template ?',
+    'Do you really want to remove this attribute from the template ? The attributes combinations that uses this attributes <strong>will be deleted</strong> for the products that uses this template.' => 'Do you really want to remove this attribute from the template ? The attributes combinations that uses this attributes <strong>will be deleted</strong> for the products that uses this template.',
     'Do you really want to remove this country from this shipping zone ?' => 'Do you really want to remove this country from this shipping zone ?',
     'Do you really want to remove this feature from all product templates ? You\'ll loose all product related data for this feature.' => 'Do you really want to remove this feature from all product templates ? You\'ll loose all product related data for this feature.',
-    'Do you really want to remove this feature from the template ?' => 'Do you really want to remove this feature from the template ?',
+    'Do you really want to remove this feature from the template ? It will also be removed from the products that uses this template.' => 'Do you really want to remove this feature from the template ? It will also be removed from the products that uses this template.',
     'Do you really want to remove this module from this hook ?' => 'Do you really want to remove this module from this hook ?',
     'Do you really want to remove this related content ?' => 'Do you really want to remove this related content ?',
     'Do you really want to remove this related content from the product ?' => 'Do you really want to remove this related content from the product ?',
@@ -431,6 +440,7 @@ return array(
     'Drop files to upload' => 'Drop files to upload',
     'Drop tax here to create a tax group' => 'Drop tax here to create a tax group',
     'Drop tax here to delete from group' => 'Drop tax here to delete from group',
+    'Duplicate this product template' => 'Duplicate this product template',
     'E-mail' => 'E-mail',
     'E-mail template you want to translate' => 'E-mail template you want to translate',
     'E-mail templates' => 'E-mail templates',
@@ -491,6 +501,8 @@ return array(
     'Edit next order' => 'Edit next order',
     'Edit next product' => 'Edit next product',
     'Edit order address' => 'Edit order address',
+    'Edit order status' => 'Edit order status',
+    'Edit order status %title' => 'Edit order status %title',
     'Edit previous brand' => 'Edit previous brand',
     'Edit previous category' => 'Edit previous category',
     'Edit previous content' => 'Edit previous content',
@@ -512,6 +524,7 @@ return array(
     'Edit this folder' => 'Edit this folder',
     'Edit this module' => 'Edit this module',
     'Edit this order' => 'Edit this order',
+    'Edit this order status' => 'Edit this order status',
     'Edit this product' => 'Edit this product',
     'Edit variable %name' => 'Edit variable %name',
     'Editing %cat' => 'Editing %cat',
@@ -529,6 +542,7 @@ return array(
     'Editing image "%name"' => 'Editing image "%name"',
     'Editing mailing template "%name"' => 'Editing mailing template "%name"',
     'Editing module' => 'Editing module',
+    'Editing order status "%title"' => 'Editing order status "%title"',
     'Editing profile' => 'Editing profile',
     'Editing profile \'%name\'' => 'Editing profile \'%name\'',
     'Editing shipping configuration for module "%name"' => 'Editing shipping configuration for module "%name"',
@@ -582,6 +596,7 @@ return array(
     'Enter new import position' => 'Enter new import position',
     'Enter new module hook position' => 'Enter new module hook position',
     'Enter new module position' => 'Enter new module position',
+    'Enter new order status position' => 'Enter new order status position',
     'Enter new product position' => 'Enter new product position',
     'Enter new value position' => 'Enter new value position',
     'Enter one or more IP V4 addresses separated by ";". Leave empty to display logs for all IP addresses' => 'Enter one or more IP V4 addresses separated by ";". Leave empty to display logs for all IP addresses',
@@ -664,7 +679,7 @@ return array(
     'ISO Code' => 'ISO Code',
     'If a translation is missing or incomplete :' => 'If a translation is missing or incomplete :',
     'If yes, redirections through Redirect::exec() will be displayed as links' => 'If yes, redirections through Redirect::exec() will be displayed as links',
-    'If you change the template, all the prices will be reset and you have to configure them again.' => 'If you change the template, all the prices will be reset and you have to configure them again.',
+    'If you change the product template, some of the product attribute combinations may be deleted, and you may have to reconfigure some of product prices.' => 'If you change the product template, some of the product attribute combinations may be deleted, and you may have to reconfigure some of product prices.',
     'If you want to translate core components of Thelia : core, install, default modules or templates.' => 'If you want to translate core components of Thelia : core, install, default modules or templates.',
     'If your aim is just to translate text for your website, please use the user mode.<br>' => 'If your aim is just to translate text for your website, please use the user mode.<br>',
     'Il seems that this string contains a Smarty variable (&#36;). If \'s the case, it cannot be transleted properly.' => 'Il seems that this string contains a Smarty variable (&#36;). If \'s the case, it cannot be translated properly.',
@@ -692,6 +707,7 @@ return array(
     'Invoice date' => 'Invoice date',
     'Invoice informations' => 'Invoice information',
     'Invoice reference' => 'Invoice reference',
+    'Is the default template for categories (%num)' => 'Is the default template for categories (%num)',
     'It\'s strongly recommended to use our translation platform' => 'It\'s strongly recommended to use our translation platform',
     'Items to translate' => 'Items to translate',
     'Keep attention that in translating you can override the resource translations.<br>' => 'Keep attention that in translating you can override the resource translations.<br>',
@@ -762,6 +778,7 @@ return array(
     'No available value for this attribute' => 'No available value for this attribute',
     'No brand' => 'No brand',
     'No brand has been created yet. Click the + button to create one.' => 'No brand has been created yet. Click the + button to create one.',
+    'No categories are using this template as the default.' => 'No categories are using this template as the default.',
     'No categories found' => 'No categories found',
     'No category found for "%term"' => 'No category found for "%term"',
     'No config.' => 'No config.',
@@ -803,9 +820,13 @@ return array(
     'Order %ref - ID %id' => 'Order %ref - ID %id',
     'Order details' => 'Order details',
     'Order n°' => 'Order n°',
+    'Order path configuration' => 'Order path configuration',
+    'Order status' => 'Order status',
+    'Order status created on %date_create. Last modification: %date_change' => 'Order status created on %date_create. Last modification: %date_change',
     'Order status:' => 'Order status:',
     'Ordered products' => 'Ordered products',
     'Orders' => 'Orders',
+    'Orders status' => 'Orders status',
     'Originating file line number ' => 'Originating file line number ',
     'Originating file name' => 'Originating file name',
     'Originating function name ' => 'Originating function name ',
@@ -889,6 +910,7 @@ return array(
     'Products are :' => 'Products are :',
     'Products in %cat' => 'Products in %cat',
     'Products selection' => 'Products selection',
+    'Products using this template (%num)' => 'Products using this template (%num)',
     'Profil' => 'Profile',
     'Profile' => 'Profile',
     'Profile code' => 'Profile code',
@@ -1005,6 +1027,8 @@ return array(
     'Short description' => 'Short description',
     'Short description :' => 'Short description :',
     'Show logs' => 'Show logs',
+    'Showing %loaded categories. Click here to load the %remaining  other categories' => 'Showing %loaded categories. Click here to load the %remaining  other categories',
+    'Showing %loaded products. Click here to load the %remaining  other products' => 'Showing %loaded products. Click here to load the %remaining  other products',
     'So, each configuration is a list of taxes applied to a list of countries/states.' => 'So, each configuration is a list of taxes applied to a list of countries/states.',
     'Some of your translations are not saved. Continue anyway ?' => 'Some of your translations are not saved. Continue anyway ?',
     'Something goes wrong, please try again' => 'Une erreur est survenue, merci de ré-essayer',
@@ -1044,7 +1068,7 @@ return array(
     'System Logs configuration' => 'System Logs configuration',
     'System logs' => 'System logs',
     'System parameters' => 'System parameters',
-    'System variables' => 'System variables',
+    'System variables' => 'Configuration parameters',
     'Tags' => 'Tags',
     'Tax' => 'Tax',
     'Tax created on %date_create. Last modification: %date_change' => 'Tax created on %date_create. Last modification: %date_change',
@@ -1060,6 +1084,7 @@ return array(
     'Template title' => 'Template title',
     'Template type' => 'Template type',
     'Templates' => 'Templates',
+    'Test email result' => 'Test email result',
     'Test your configuration' => 'Test your configuration',
     'Text version of this message' => 'Text version of this message',
     'That way, Thelia community will benefit of your translations' => 'That way, Thelia community will benefit of your translations',
@@ -1090,7 +1115,7 @@ return array(
     'Thelia Product Templates' => 'Thelia Product Templates',
     'Thelia Shipping configuration' => 'Thelia Shipping configuration',
     'Thelia Shipping zones' => 'Thelia Shipping zones',
-    'Thelia System Variables' => 'Thelia System Variables',
+    'Thelia System Variables' => 'Thelia configuration parameters',
     'Thelia caches flushing' => 'Thelia caches flushing',
     'Thelia contributions' => 'Thelia contributions',
     'Thelia core' => 'Thelia core',
@@ -1099,7 +1124,7 @@ return array(
     'Thelia product features' => 'Thelia product features',
     'Thelia product templates' => 'Thelia product templates',
     'Thelia support forum' => 'Thelia support forum',
-    'Thelia system variables' => 'Thelia system variables',
+    'Thelia system variables' => 'Thelia configuration parameters',
     'There are no shipping zones attached to this module.' => 'There are no shipping zones attached to this module.',
     'There is 2 kind of translations :' => 'There is 2 kind of translations :',
     'There is currently no active module here.' => 'There is currently no active module here.',
@@ -1136,6 +1161,7 @@ return array(
     'This shipping zone does not contains any country.' => 'This shipping zone does not contains any country.',
     'This template contains no attributes' => 'This template contains no attributes',
     'This template contains no features' => 'This template contains no features',
+    'This template is not used by any product.' => 'This template is not used by any product.',
     'This variable could not be changed.' => 'This variable could not be changed.',
     'This will reset the sale status of all products, and disable all active sales. Dou you really want to continue ?' => 'This will reset the sale status of all products, and disable all active sales. Do you really want to continue ?',
     'Timeout' => 'Timeout',
@@ -1248,7 +1274,7 @@ return array(
     'Your module should be packaged in a zip file.' => 'Your module should be packaged in a zip file.',
     'Your search is too short' => 'Your search is too short',
     'Your template define new hooks' => 'Your template define new hooks',
-    'Your template does not support this hooks' => 'Your template does not support this hooks',
+    'Your template does not support this hooks' => 'Your template does not support these hooks',
     'Your template is clean. No missing hooks and no new hooks.' => 'Your template is clean. No missing hooks and no new hooks.',
     'Zip code' => 'Zip code',
     'Zone name' => 'Zone name',
@@ -1286,7 +1312,6 @@ return array(
     'last order' => 'last order',
     'long description' => 'long description',
     'none' => 'none',
-    'ok' => 'ok',
     'on' => 'on',
     'or' => 'or',
     'order amount' => 'order amount',

templates/backOffice/default/I18n/es_ES.php

@@ -108,7 +108,7 @@ return [
     'Available taxes' => 'Impuestos disponibles',
     'Back' => 'Volver',
     'Back Office' => 'Panel de administración',
-    'Back-office home' => 'Página de inicio del panel de adñinistración',
+    'Back-office home' => 'Página de inicio del panel de administración',
     'Back-office template you want to translate' => 'Plantilla de back office que deseas traducir',
     'Back-office templates' => 'Plantillad de Back office',
     'Back-office users' => 'Usuarios del back office',

templates/backOffice/default/I18n/fr_FR.php

@@ -1,6 +1,6 @@
 <?php
 
-return [
+return array(
     ' (default)' => '(défaut)',
     '%count more...' => '%count de plus...',
     '%count shipping zone(s) are attached to this module: %zones. Click here to change' => '%count zone(s) de livraison sont couvertes par ce module: %zones. Cliquez ici pour modifier',
@@ -51,6 +51,7 @@ return [
     'Add a new shipping zone' => 'Ajouter une nouvelle zone de livraison',
     'Add a new state' => 'Ajouter un nouvel état',
     'Add a new variable' => 'Ajouter une nouvelle variable',
+    'Add a variable' => 'Ajouter une variable',
     'Add document to your product.' => 'Ajouter des documents à votre produit.',
     'Add selected countries' => 'Ajouter les pays sélectionnés',
     'Add tax to this group' => 'Ajouter une taxe à ce groupe',
@@ -371,6 +372,7 @@ return [
     'Discount amount' => 'Montant de réduction',
     'Discount percentage' => 'Pourcentage de remise',
     'Discover all our modules on <a href=\'http://thelia.net/modules\' target=\'_blank\'>Thelia Modules</a> !' => 'Découvrez tous nos modules sur <a href=\'http://thelia.net/modules\'>Thelia Modules</a> !',
+    'Display protected modules ?' => 'Afficher les modules protégés ?',
     'Do not use a product template' => 'Ne pas utiliser de gabarit',
     'Do this export' => 'Exporter',
     'Do this import' => 'Importer',
@@ -414,10 +416,10 @@ return [
     'Do you really want to remove the product from this category ?' => 'êtes-vous sur de vouloir enlever le produit de cette rubrique',
     'Do you really want to remove this accessory from the product ?' => 'êtes-vous sur de vouloir supprimer cet accessoire ?',
     'Do you really want to remove this attribute from all product templates ? You\'ll loose all product related data for this attribute.' => 'Voulez-vous vraiment supprimer cette déclinaison de tous les gabarits de produits ? Vous allez perdre toutes les informations produit liées à cette déclinaison.',
-    'Do you really want to remove this attribute from the template ?' => 'Etes-vous sur de vouloir retirer cette déclinaison de ce gabarit ?',
+    'Do you really want to remove this attribute from the template ? The attributes combinations that uses this attributes <strong>will be deleted</strong> for the products that uses this template.' => 'Voulez-vous vraiment retirer cette déclinaison du gabarit ? Les combinaisons de déclinaisons qui utilisent cette déclinaison <strong>seront supprimées</strong> des produits qui utilisent ce gabarit',
     'Do you really want to remove this country from this shipping zone ?' => 'Voulez-vous retirer ce pays de la zone de livraison ?',
     'Do you really want to remove this feature from all product templates ? You\'ll loose all product related data for this feature.' => 'Voulez-vous vraiment enlever cette caractéristique de tous les gabarits de produit ? Vous allez perdre toutes les informations des produits liées à cette caractéristique.',
-    'Do you really want to remove this feature from the template ?' => 'Voulez-vous vraiment supprimer cette caractéristique de ce gabarit ?',
+    'Do you really want to remove this feature from the template ? It will also be removed from the products that uses this template.' => 'Voulez-vous vraiment retirer cette caractéristique du gabarit ? Elle sera aussi retirée des produits qui utilisent ce gabarit',
     'Do you really want to remove this module from this hook ?' => 'Confirmez-vous la suppression de ce module du point d\'accroche ? ',
     'Do you really want to remove this related content ?' => 'Voulez-vous vraiment supprimer ce contenu lié ?',
     'Do you really want to remove this related content from the product ?' => 'êtes-vous sur de vouloir supprimer ce contenu associé ?',
@@ -431,6 +433,7 @@ return [
     'Drop files to upload' => 'Déposez des fichiers à envoyer',
     'Drop tax here to create a tax group' => 'Déposer une taxe ici afin de créer un groupe de taxe',
     'Drop tax here to delete from group' => 'Déposer une taxe ici afin de la supprimer du groupe',
+    'Duplicate this product template' => 'Créer une copie de ce gabarit',
     'E-mail' => 'E-mail',
     'E-mail template you want to translate' => 'Template e-mail à traduire',
     'E-mail templates' => 'Templates E-mail',
@@ -664,7 +667,7 @@ return [
     'ISO Code' => 'Code ISO',
     'If a translation is missing or incomplete :' => 'Si une traduction est manquante ou incomplète :',
     'If yes, redirections through Redirect::exec() will be displayed as links' => 'Si oui, les redirections générés pas Redirect::exec seront affichés par des liens',
-    'If you change the template, all the prices will be reset and you have to configure them again.' => 'En changeant de template, les prix vont être réinitialiser et vous devrez les reconfigurer',
+    'If you change the product template, some of the product attribute combinations may be deleted, and you may have to reconfigure some of product prices.' => 'Si vous modifiez le gabarit du produit, tout ou partie des combinaisons de déclinaisons pourrait être supprimées, et vous aurez peut-être à reconfigurer les prix du produit.',
     'If you want to translate core components of Thelia : core, install, default modules or templates.' => 'Si vous voulez traduire les composants essentiels de Thelia : son noyau, l\'installation, les modules ou les modèles par défaut.',
     'If your aim is just to translate text for your website, please use the user mode.<br>' => 'Si votre but est simplement de traduire votre site, veuillez utiliser le mode utilisateur.<br>',
     'Il seems that this string contains a Smarty variable (&#36;). If \'s the case, it cannot be transleted properly.' => 'La chaîne semble contient une variable smarty (&#36;). Si c\'est le cas elle ne peut pas être traduite correctement',
@@ -692,6 +695,7 @@ return [
     'Invoice date' => 'Date de facturation',
     'Invoice informations' => 'Informations de facturation',
     'Invoice reference' => 'Facture ref',
+    'Is the default template for categories (%num)' => 'Gabarit par défaut pour %num categories',
     'It\'s strongly recommended to use our translation platform' => 'Il est vivement recommandé d\'utiliser notre plateforme de traduction',
     'Items to translate' => 'Elément à traduire',
     'Keep attention that in translating you can override the resource translations.<br>' => 'Attention ! en faisant la traduction vous pouvez écraser les traductions de ces ressources.<br>',
@@ -726,6 +730,7 @@ return [
     'Manage taxes' => 'Gérer les taxes',
     'Manage the tax rule taxes appliance order' => 'Gérer les règles de taxe et leur ordre d\'application',
     'Maximum usage count :' => 'Nombre maximum d\'utilisations',
+    'Media' => 'Média',
     'Message created on %date_create. Last modification: %date_change' => 'Message créé le %date_create. Dernière modification le %date_change',
     'Message data' => 'Données du message',
     'Message level' => 'Niveau de message',
@@ -761,6 +766,7 @@ return [
     'No available value for this attribute' => 'Aucune valeur disponible pour cette déclinaison',
     'No brand' => 'Aucune marque',
     'No brand has been created yet. Click the + button to create one.' => 'Aucune marque n\'a encore été créée. Cliquez le bouton + pour en ajouter une.',
+    'No categories are using this template as the default.' => 'Ce gabarit n\'est utilisé par aucune catégorie',
     'No categories found' => 'Aucune rubrique trouvée',
     'No category found for "%term"' => 'Aucune catégorie trouvée pour "%term"',
     'No config.' => 'Aucune config.',
@@ -887,6 +893,7 @@ return [
     'Products are :' => 'Les produits sont :',
     'Products in %cat' => 'Produits dans %cat',
     'Products selection' => 'Choix des produits',
+    'Products using this template (%num)' => 'Produits utilisant ce gabarit (%num)',
     'Profil' => 'Profil',
     'Profile' => 'Profil',
     'Profile code' => 'Code du profil',
@@ -1003,6 +1010,8 @@ return [
     'Short description' => 'Description courte',
     'Short description :' => 'Description courte : ',
     'Show logs' => 'Voir les logs',
+    'Showing %loaded categories. Click here to load the %remaining  other categories' => '%loaded catégories affichées. Cliquer ici pour voir les %remaining autres catégories',
+    'Showing %loaded products. Click here to load the %remaining  other products' => '%loaded produits affichés. Cliquer ici pour voir les %remaining autres produits',
     'So, each configuration is a list of taxes applied to a list of countries/states.' => 'Chaque configuration est donc une liste des taxes appliquées à une liste de pays/États.',
     'Some of your translations are not saved. Continue anyway ?' => 'Certaines des traductions ne sont pas sauvegardées. Souhaitez-vous continuer ?',
     'Something goes wrong, please try again' => 'Une erreur s\'est produite, merci de ré-essayer.',
@@ -1042,14 +1051,14 @@ return [
     'System Logs configuration' => 'Configuration des logs',
     'System logs' => 'Journal des logs',
     'System parameters' => 'Paramètres système ',
-    'System variables' => 'Gestion des variables',
+    'System variables' => 'Paramètres de configuration',
     'Tags' => 'Catégories',
     'Tax' => 'Taxe',
     'Tax created on %date_create. Last modification: %date_change' => 'Taxe créée le %date_create. Dernière modification: %date_change',
     'Tax rule created on %date_create. Last modification: %date_change' => 'Règle de taxe créée le %date_create. Dernière modification le %date_change',
     'Tax rules' => 'Règles de taxes',
     'Tax rules are combination of different taxes.' => 'Les règles de taxe sont une combinaison de différentes taxes.',
-    'Taxed total' => 'Montant total des taxes',
+    'Taxed total' => 'Prix TTC',
     'Taxes' => 'Taxes',
     'Taxes configuration' => 'Configuration des taxes',
     'Taxes define the amount of money which is added to a bought product.' => 'Les taxes correspondent au montant ajouté au prix HT d\'un produit acheté',
@@ -1058,6 +1067,7 @@ return [
     'Template title' => 'Titre du gabarit',
     'Template type' => 'Type de template',
     'Templates' => 'Gabarits de produit',
+    'Test email result' => 'Résultat de l\'envoi du mail de test',
     'Test your configuration' => 'Tester la configuration',
     'Text version of this message' => 'Version texte du message',
     'That way, Thelia community will benefit of your translations' => 'De cette façon, la communauté de Thelia bénéficiera de vos traductions',
@@ -1088,7 +1098,7 @@ return [
     'Thelia Product Templates' => 'Gabarits produit Thelia',
     'Thelia Shipping configuration' => 'Configuration des livraisons Thelia',
     'Thelia Shipping zones' => 'Zone de livraison de Thelia',
-    'Thelia System Variables' => 'Variables Thelia',
+    'Thelia System Variables' => 'Paramètres de configuration',
     'Thelia caches flushing' => 'Vidage des caches Thelia',
     'Thelia contributions' => 'Contributions de Thelia',
     'Thelia core' => 'Coeur de Thelia',
@@ -1097,7 +1107,7 @@ return [
     'Thelia product features' => 'Caractéristiques produit de Thelia',
     'Thelia product templates' => 'Gabarits de produit Thelia',
     'Thelia support forum' => 'Forum de Thelia',
-    'Thelia system variables' => 'Variables Thelia',
+    'Thelia system variables' => 'Paramètres de configuration',
     'There are no shipping zones attached to this module.' => 'Ce module de transport n\'est associé à aucune zone de livraison',
     'There is 2 kind of translations :' => 'Il existe 2 sortes de traductions :',
     'There is currently no active module here.' => 'Il n\'y a aucun module actif ici',
@@ -1134,7 +1144,8 @@ return [
     'This shipping zone does not contains any country.' => 'Cette zone de livraison ne comporte aucun pays',
     'This template contains no attributes' => 'Ce gabarit n\'a pas de déclinaison',
     'This template contains no features' => 'Ce gabarit ne contient aucune caractéristique',
-    'This variable could not be changed.' => 'Cette variable ne peut pas être modifié',
+    'This template is not used by any product.' => 'Ce gabarit n\'est utilisé par aucun produit',
+    'This variable could not be changed.' => 'Cette variable ne peut pas être modifiée',
     'This will reset the sale status of all products, and disable all active sales. Dou you really want to continue ?' => 'Plus aucun de vos produits ne sera en promotion, et toutes vos promotions vont être désactivées. Voulez-vous continuer ?',
     'Timeout' => 'Délai d\'attente expiré',
     'Timeout :' => 'Délai d\'attente expiré : ',
@@ -1283,7 +1294,6 @@ return [
     'last order' => 'Dernière commande',
     'long description' => 'description longue',
     'none' => 'aucun',
-    'ok' => 'ok',
     'on' => 'sur',
     'or' => 'ou',
     'order amount' => 'Montant de la commande',
@@ -1301,4 +1311,4 @@ return [
     'version' => 'Version',
     'warning' => 'Attention',
     'you can combine taxes in tax rules and chose if they are applied one after the other or at the same time : it allows to apply taxes on an already taxed price or not.' => 'vous pouvez combiner des taxes en règles de taxe et choisir si elle sont appliquées l\'une après l\'autre ou en même temps: cela permet d\'appliquer des taxes sur un produit déjà taxé ou non.',
-];
+);

templates/backOffice/default/admin-layout.tpl

@@ -102,7 +102,7 @@
                     <li class="dropdown">
                         {loop type="lang" name="ui-lang" id={lang attr='id'} backend_context="1"}
                         <button class="dropdown-toggle" data-toggle="dropdown">
-                            <imconfiguration/administrators/viewg src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" /> {$CODE|ucfirst}
+                            <img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" /> {$CODE|ucfirst}
                             <span class="caret"></span>
                         </button>
                         {/loop}

templates/backOffice/default/ajax/module-information.html

@@ -103,6 +103,29 @@
             </tr>
         {/if}
 
+        {if $moduleData.authors.author}
+            <tr>
+                <th colspan="2">{intl l="Authors"}</th>
+            </tr>
+            
+            {foreach $moduleData.authors.author as $author}
+                <tr>
+                    <th>
+                        <span class="glyphicon glyphicon-user"></span> {if $author.name}{$author.name}{else}{intl l='Unspecified'}{/if}{if $author.company}, {$author.company}{/if}
+                    </th>
+                    <td>
+                        {if $author.email}
+                            <i class="glyphicon glyphicon-envelope"></i> {mailto address=$author.email encode='hex'}
+                        {/if}
+                        &nbsp;&nbsp;&nbsp;
+                        {if $author.website}
+                            <i class="glyphicon glyphicon-globe"></i> <a href="{$author.website}">{$author.website}</a>
+                        {/if}
+                        
+                    </td>
+                </tr>
+            {/foreach}
+        {else}
             <tr>
                 <th>{intl l="Author"}</th>
                 <td>
@@ -123,6 +146,7 @@
                     <td><a href="{$moduleData.author.website}">{$moduleData.author.website}</a></td>
                 </tr>
             {/if}
+        {/if}
     </table>
 {/loop}
 {* fro debugging only <pre>{$moduleData|print_r}</pre> *}

templates/backOffice/default/ajax/product-related-tab.html

@@ -32,7 +32,7 @@
 		                    <select name="folder_id" id="folder_id" class="form-control">
 		                        <option value="">{intl l='Select a folder...'}</option>
 		                        {loop name="folders" type="folder-tree" folder="0" backend_context="1" visible="*" lang="$edit_language_id" return_url=false}
-		                            <option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px">{$TITLE}</option>
+		                            <option value="{$ID}">{option_offset l=$LEVEL label={$TITLE}}</option>
 		                        {/loop}
 		                    </select>
 
@@ -150,7 +150,7 @@
 		                    <select name="accessory_category_id" id="accessory_category_id" class="form-control">
 		                        <option value="">{intl l='Select a category...'}</option>
 		                        {loop name="categories" type="category-tree" category="0" backend_context="1" visible="*" lang="$edit_language_id" return_url=false}
-		                            <option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px">{$TITLE}</option>
+		                            <option value="{$ID}">{option_offset l=$LEVEL label={$TITLE}}</option>
 		                        {/loop}
 		                    </select>
 
@@ -282,8 +282,8 @@
 	                        <select name="additional_category_id" id="accessory_category_id" class="form-control">
 	                            <option value="">{intl l='Select a category...'}</option>
 	                            {loop name="categories" type="category-tree" category="0" exclude=$exclude_from_tree visible="*" backend_context="1" lang="$edit_language_id" return_url=false}
-	                                <option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px" {if $DEFAULT_CATEGORY==$ID}disabled="disabled"{/if}>
-	                                    {$TITLE} {if $DEFAULT_CATEGORY==$ID}{intl l=' (default)'}{/if}
+	                                <option value="{$ID}" {if $DEFAULT_CATEGORY==$ID}disabled="disabled"{/if}>
+										{option_offset l=$LEVEL label={$TITLE}}{if $DEFAULT_CATEGORY==$ID}{intl l=' (default)'}{/if}
 	                                </option>
 	                            {/loop}
 	                        </select>

templates/backOffice/default/ajax/template-attribute-list.html

@@ -49,7 +49,7 @@
         <tr>
             <td>{$ID}</td>
 
-            <td>{$TITLE}</td>
+            <td><a href="{url path="admin/configuration/attributes/update" attribute_id=$ID}">{$TITLE}</a></td>
 
             <td class="text-center">
             {admin_position_block
@@ -99,7 +99,7 @@
 
     dialog_id       = "delete_attribute_dialog"
     dialog_title    = {intl l="Remove attribute"}
-    dialog_message  = {intl l="Do you really want to remove this attribute from the template ?"}
+    dialog_message  = {intl l="Do you really want to remove this attribute from the template ? The attributes combinations that uses this attributes <strong>will be deleted</strong> for the products that uses this template."}
 
     form_action     = {token_url path='/admin/configuration/templates/attributes/delete'}
     form_content    = {$smarty.capture.delete_attribute_dialog nofilter}

templates/backOffice/default/ajax/template-feature-list.html

@@ -50,7 +50,7 @@
             <td>{$ID}</td>
 
             <td>
-                {$TITLE}
+                <a href="{url path="admin/configuration/features/update" feature_id=$ID}">{$TITLE}</a>
             </td>
 
             <td class="text-center">
@@ -102,7 +102,7 @@
 
     dialog_id       = "delete_feature_dialog"
     dialog_title    = {intl l="Remove feature"}
-    dialog_message  = {intl l="Do you really want to remove this feature from the template ?"}
+    dialog_message  = {intl l="Do you really want to remove this feature from the template ? It will also be removed from the products that uses this template."}
 
     form_action     = {token_url path='/admin/configuration/templates/features/delete'}
     form_content    = {$smarty.capture.delete_feature_dialog nofilter}

templates/backOffice/default/assets/less/bootstrap/variables.less

@@ -11,6 +11,7 @@
 @gray-dark:              lighten(#000, 20%);   // #333
 @gray:                   lighten(#000, 33.5%); // #555
 @gray-light:             lighten(#000, 46.7%); // #777
+@gray-lighten:           lighten(#000, 73.3%); // #bbb
 @gray-lighter:           lighten(#000, 93.5%); // #eee
 
 @brand-primary:         #428bca;
@@ -187,7 +188,7 @@
 @input-border-focus:             #66afe9;
 
 //** Placeholder text color
-@input-color-placeholder:        @gray-light;
+@input-color-placeholder:        @gray-lighten;
 
 //** Default `.form-control` height
 @input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);

templates/backOffice/default/assets/less/thelia/labels.less

@@ -8,10 +8,3 @@
 .label-md {
   font-size: 100%;
 }
-
-// Label colors
-// --------------------------------------------------
-
-.label-order-refunded-color {
-  .label-variant(@label-order-refunded-color);
-}

templates/backOffice/default/assets/less/thelia/tables.less

@@ -111,6 +111,10 @@ tfoot{
         &.text-right {
             text-align: right;
         }
+        
+        &.actions {
+            text-align: center;
+        }
     }
 
     select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input {

templates/backOffice/default/assets/less/thelia/variables.less

@@ -76,9 +76,6 @@
 @assoc-image-size-x: 100px;
 @assoc-image-size-y: 75px;
 
-// Order status
-@label-order-refunded-color: #986dff;
-
 @navbar-default-color:             #fff;
 @navbar-default-bg:                #333;
 @navbar-default-border:            darken(@navbar-default-bg, 6.5%);

templates/backOffice/default/brand-edit.html

@@ -165,7 +165,7 @@
                                 <div class="tab-pane fade" id="seo">
                                     {include file = "includes/seo-tab.html"
                                         formAction  = {url path='/admin/brand/seo/save'}
-                                        pageUrl     = "{url path='/admin/brand/update'}/$brand_id"
+                                        pageUrl     = {url path='/admin/brand/update/%id' id=$brand_id}
                                         closeUrl    = {url path='/admin/brand'}
                                         success_url = {url path='/admin/brand'}
                                         current_id  = $brand_id
@@ -195,7 +195,7 @@
                                         }
                                     </div>
                                     {* bad fix : {hook name="brand.tab-content"} *}
-                                    {include file="includes/module-tab-content.html" hook="brand.tab-content" location="brand-edit" id="{$brand_id}" view="brand"}
+                                    {include file="includes/module-tab-content.html" hook="brand.tab-content" location="brand-edit" id={$brand_id} view="brand"}
                                 </div>
                             </div>
                         </div>

templates/backOffice/default/categories.html

@@ -366,7 +366,7 @@
 
                                  loop_ref       = "product_list"
                                  max_page_count = 10
-                                 page_url       = "{url path="/admin/catalog" category_id=$category_id product_order=$product_order}"
+                                 page_url       = {url path="/admin/catalog" category_id=$category_id product_order=$product_order}
                                  }
 
                              </td>
@@ -417,7 +417,7 @@
             {loop type="lang" name="default-lang" default_only="1"}
                 <div class="input-group">
                     <input type="text" {form_field_attributes field="title"}>
-                    <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" /></span>
+                    <span class="input-group-addon"><img src="{image file="assets/img/flags/$CODE.png"}" alt="{$TITLE}" /></span>
                 </div>
 
                 {* Switch edition to the current locale *}
@@ -540,10 +540,14 @@
                     {* If current category has no template, get a parent's one *}
                     {if !$product_template}
                         {while $parent_category != 0 && !$product_template}
-                            {loop type="category" name="parent_category" visible="*" id=$parent_category}
-                                {assign var="parent_category" value=$PARENT}
-                                {assign var="product_template" value=$TEMPLATE}
+                            {loop type="category" name="parent_category" backend_context=1 visible="*" id=$parent_category}
+                                {$parent_category = $PARENT}
+                                {$product_template = $TEMPLATE}
                             {/loop}
+                            {* Be sure to prevent infinite loops *}
+                            {elseloop rel="parent_category"}
+                                {$parent_category = 0}
+                            {/elseloop}
                         {/while}
                     {/if}
 

templates/backOffice/default/category-edit.html

@@ -125,7 +125,7 @@
                                                               {/loop}
                                                               {$myparent=$PARENT}
                                                               {loop name="cat-parent" type="category-tree" visible="*" category="0" exclude={','|implode:$excludeCategories}}
-                                                                   <option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px" {if $myparent == $ID}selected="selected"{/if} {if $category_id == $ID}disabled="disabled"{/if}>{$TITLE}</option>
+                                                                   <option value="{$ID}" {if $myparent == $ID}selected="selected"{/if} {if $category_id == $ID}disabled="disabled"{/if}>{option_offset l=$LEVEL+1 label=$TITLE}</option>
                                                               {/loop}
                                                         </select>
                                                     {/custom_render_form_field}
@@ -193,7 +193,7 @@
                                                             <select name="folder_id" id="folder_id" class="form-control">
                                                                 <option value="">{intl l='Select a folder...'}</option>
                                                                 {loop name="folders" type="folder-tree" folder="0" backend_context="1" lang="$edit_language_id"}
-                                                                    <option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px">{$TITLE}</option>
+                                                                    <option value="{$ID}">{option_offset l=$LEVEL label={$TITLE}}</option>
                                                                 {/loop}
                                                             </select>
                                                         </div>

templates/backOffice/default/config-store.html

@@ -33,7 +33,7 @@
                     <div class="row">
                         <div class="col-md-12">
                             {form name='thelia.configuration.store'}
-	 						<form method="POST" action="{url path='/admin/configuration/store/save'}">
+	 						<form method="POST" action="{url path='/admin/configuration/store/save'}" {form_enctype}>
                                 {form_hidden_fields}
 
                                 {form_field field='success_url'}
@@ -63,6 +63,42 @@
 
                                             {render_form_field field='store_email'}
                                             {render_form_field field='store_notification_emails'}
+
+                                            <p class="title title-without-tabs">{intl l='Media'}</p>
+
+                                            <div class="row">
+                                                <div class="col-md-10">
+                                                    {render_form_field field='favicon_file'}
+                                                </div>
+                                                <div class="col-md-2">
+                                                    {local_media type="favicon" width=64 height=64}
+                                                    <img id="preview_favicon" src="{$MEDIA_URL}" width="64" height="64"/>
+                                                    {/local_media}
+                                                </div>
+                                            </div>
+
+                                            <div class="row">
+                                                <div class="col-md-10">
+                                                    {render_form_field field='logo_file'}
+                                                </div>
+                                                <div class="col-md-2">
+                                                    {local_media type="logo"}
+                                                    <img id="preview_logo" src="{$MEDIA_URL}" style="max-width: 100%"/>
+                                                    {/local_media}
+                                                </div>
+                                            </div>
+
+                                            <div class="row">
+                                                <div class="col-md-8">
+                                                    {render_form_field field='banner_file'}
+                                                </div>
+                                                <div class="col-md-4">
+                                                    {local_media type="banner"}
+                                                    <img id="preview_banner" src="{$MEDIA_URL}" style="max-width: 100%"/>
+                                                    {/local_media}
+                                                </div>
+                                            </div>
+
                                         </fieldset>
                                     </div>
 
@@ -127,5 +163,30 @@
 {/block}
 
 {block name="javascript-last-call"}
+    <script>
+        function readURL(input, preview_id) {
+            if (input.files && input.files[0]) {
+                var reader = new FileReader();
+
+                reader.onload = function (e) {
+                    $(preview_id).attr('src', e.target.result);
+                };
+
+                reader.readAsDataURL(input.files[0]);
+            }
+        }
+
+        $("#favicon_file").change(function(){
+            readURL(this, '#preview_favicon');
+        });
+
+        $("#logo_file").change(function(){
+            readURL(this, '#preview_logo');
+        });
+
+        $("#banner_file").change(function(){
+            readURL(this, '#preview_banner');
+        });
+    </script>
     {hook name="config-store.js" location="config-store-js" }
 {/block}

templates/backOffice/default/configs/variables.conf

@@ -1,13 +1,3 @@
 # Maximum select size in the attributes tab of product edit page
 # --------------------------------------------------------------
 maximum_product_attribute_select_size = 10
-
-# order status - used in admin-layout.tpl to build the order menu items
-# ---------------------------------------------------------------------
-
-order_not_paid = 'warning'
-order_paid = 'success'
-order_processing = 'primary'
-order_sent = 'info'
-order_canceled = 'danger'
-order_refunded = 'order-refunded-color'

templates/backOffice/default/configuration.html

@@ -122,6 +122,26 @@
                             </table>
                         </div>
                     </div>
+
+                    <div class="menu-list-table general-block-decorator">
+                        <div class="table-responsive">
+                            <table class="table table-striped table-condensed">
+                                <caption>{intl l='Order path configuration'}</caption>
+
+                                {hook name="configuration.order-path.top"}
+
+                                {loop type="auth" name="pcc1" role="ADMIN" resource="admin.configuration.order-status" access="VIEW"}
+                                    <tr>
+                                        <td><a href="{url path='/admin/configuration/order-status'}">{intl l='Order status'}</a></td>
+                                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/order-status'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+                                    </tr>
+                                {/loop}
+
+                                {hook name="configuration.order-path.bottom"}
+
+                            </table>
+                        </div>
+                    </div>
                 </div>
 
                 <div class="col-md-4">

templates/backOffice/default/content-edit.html

@@ -135,7 +135,7 @@
 
                                                                         {$myparent=$DEFAULT_FOLDER}
                                                                         {loop name="fold-parent" type="folder-tree" visible="*" folder="0"}
-                                                                            <option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px" {if $myparent == $ID}selected="selected"{/if}>{$TITLE}</option>
+                                                                            <option value="{$ID}" {if $myparent == $ID}selected="selected"{/if}>{option_offset l=$LEVEL+1 label={$TITLE}}</option>
                                                                         {/loop}
 
                                                                     </select>

templates/backOffice/default/coupon-list.html

@@ -10,6 +10,8 @@
 {block name="page-title"}{intl l='Coupons'}{/block}
 
 {block name="main-content"}
+    {$coupon_page = {$smarty.get.page|default:1}}
+
     <div class="coupons">
 
     <div id="wrapper" class="container">
@@ -120,7 +122,7 @@
                                 </tr>
                             </thead>
                             <tbody>
-                                {loop type="coupon" name="list_coupon" order={$coupon_order|default:'code'} backend_context="true"}
+                                {loop type="coupon" name="list_coupon" page={$coupon_page} limit={config key="number_default_results_per_page.coupon_list" default=20} order={$coupon_order|default:'code'} backend_context="true"}
                                     <tr>
                                         <td>
                                             {loop type="auth" name="can_change" role="ADMIN" resource="admin.coupon" access="UPDATE"}
@@ -190,7 +192,7 @@
                                 {/loop}
                                 {elseloop rel="list_coupon"}
                                     <tr>
-                                        <td colspan="7">
+                                        <td colspan="100">
                                             <div class="alert alert-info text-center">
                                                 <p>{intl l="No coupon is currently defined. Please use the (+) button above to create your first coupon."}</p>
                                             </div>
@@ -198,6 +200,21 @@
                                     </tr>
                                 {/elseloop}
                             </tbody>
+                            {ifloop rel="list_coupon"}
+                                <tfoot>
+                                <tr>
+                                    <td colspan="100">
+                                        {include
+                                        file = "includes/pagination.html"
+
+                                        loop_ref       = "list_coupon"
+                                        max_page_count = 10
+                                        page_url       = {url path="/admin/coupon" orders_order=$coupon_order}
+                                        }
+                                    </td>
+                                </tr>
+                                </tfoot>
+                            {/ifloop}
                         </table>
                     </div>
                 </div>

templates/backOffice/default/coupon-update.html

@@ -18,12 +18,12 @@
                 <li><a href="{url path='admin/home'}">{intl l='Home'}</a></li>
                 <li><a href="{url path='admin/tools'}">{intl l='Tools'}</a></li>
                 <li><a href="{url path='admin/coupon'}">{intl l='Coupon'}</a></li>
-                <li>{intl l='Editing coupon "%title"' title="{$couponCode}"}</li>
+                <li>{intl l='Editing coupon "%title"' title={$couponCode}}</li>
             </ul>
         </nav>
 
         {form name="thelia.admin.coupon.creation"}
-            {include file='coupon/form.html' formAction={url path={$formAction}} noConditions=false title={intl l='Editing coupon "%title"' title={$couponCode}}}
+            {include file='coupon/form.html' formAction={url path={$formAction}} noConditions=false title={intl l='Editing coupon "%title"' title=$couponCode}}
         {/form}
     </div> <!-- #wrapper -->
 </div>

templates/backOffice/default/coupon/condition-fragments/cart-contains-categories-condition.html

@@ -7,8 +7,8 @@
 <div class="form-group">
     <label for="{$categories_field_name}-value">{intl l="The selected categories :"}</label>
     <select required multiple size="5" class="form-control" id="{$categories_field_name}-value" name="{$categories_field_name}[value][]">
-        {loop type="category-tree" category=0 name="list-of-categories" backend_context=1}
-            <option style="padding-left: {$LEVEL * 20}px" value="{$ID}" {if in_array($ID, $values)}selected="selected"{/if}>{$TITLE}</option>
+        {loop type="category-tree" category=0 name="list-of-categories" backend_context=1 visible="*"}
+            <option value="{$ID}" {if in_array($ID, $values)}selected="selected"{/if}>{option_offset l=$LEVEL label={$TITLE}}</option>
         {/loop}
     </select>
     <span class="label-help-block">{intl l='Use Ctrl+click to select (or deselect) more that one category'}</span>

templates/backOffice/default/coupon/condition-fragments/countries-condition.html

@@ -8,7 +8,7 @@
     <label for="{$countries_field_name}-value">{intl l="The selected countries :"}</label>
     <select required multiple size="5" class="form-control" id="{$countries_field_name}-value" name="{$countries_field_name}[value][]">
         {loop type="country" name="list-of-countries" order="alpha" backend_context=1 visible="*"}
-            <option style="padding-left: {$LEVEL * 20}px" value="{$ID}" {if in_array($ID, $values)}selected="selected"{/if}>{$TITLE}</option>
+            <option value="{$ID}" {if in_array($ID, $values)}selected="selected"{/if}>{option_offset l=$LEVEL label={$TITLE}}</option>
         {/loop}
     </select>
     <span class="label-help-block">{intl l='Use Ctrl+click to select (or deselect) more that one country'}</span>

templates/backOffice/default/coupon/type-fragments/ajax-products-list.html

@@ -1,3 +1,3 @@
 {loop type="product" category={$smarty.post.category_id} name="list-of-products" backend_context="1" return_url=false}
-    <option style="padding-left: {$LEVEL * 10}px" value="{$ID}">{$TITLE}</option>
+    <option value="{$ID}">{option_offset l=$LEVEL label={$TITLE}}</option>
 {/loop}

templates/backOffice/default/coupon/type-fragments/base-remove-on-categories.html

@@ -7,8 +7,8 @@
     <label for="coupon-categories-id">{intl l="Applies to products in categories :"}</label>
 
     <select required multiple size="10" class="form-control" id="coupon-categories-id" name="{$categories_field_name}[]">
-        {loop type="category-tree" category=0 name="list-of-categories" backend_context="1"}
-            <option style="padding-left: {$LEVEL * 10}px" value="{$ID}" {if in_array($ID, $categories_values)}selected="selected"{/if}>{$TITLE}</option>
+        {loop type="category-tree" category=0 name="list-of-categories" backend_context="1" visible="*"}
+            <option value="{$ID}" {if in_array($ID, $categories_values)}selected="selected"{/if}>{option_offset l=$LEVEL label={$TITLE}}</option>
         {/loop}
     </select>
 

templates/backOffice/default/coupon/type-fragments/base-remove-on-products.html

@@ -8,8 +8,8 @@
 
     <select required class="form-control" id="coupon-category-id" name="{$category_id_field_name}">
         <option value="0">{intl l="Please select..."}</option>
-        {loop type="category-tree" category=0 name="list-of-category" backend_context="1"}
-            <option style="padding-left: {$LEVEL * 10}px" value="{$ID}" {if $ID == $category_id_value}selected="selected"{/if}>{$TITLE}</option>
+        {loop type="category-tree" category=0 name="list-of-category" backend_context="1" visible="*"}
+            <option value="{$ID}" {if $ID == $category_id_value}selected="selected"{/if}>{option_offset l=$LEVEL label={$TITLE}}</option>
         {/loop}
     </select>
 </div>

templates/backOffice/default/coupon/type-fragments/free-product.html

@@ -7,8 +7,8 @@
 
         <select required class="form-control" id="free-product-category-id" name="{$offered_category_field_name}">
             <option value="0">{intl l="Please select..."}</option>
-            {loop type="category-tree" category=0 name="list-of-category" backend_context="1"}
-                <option style="padding-left: {$LEVEL * 10}px" value="{$ID}" {if $ID == $offered_category_value}selected="selected"{/if}>{$TITLE}</option>
+            {loop type="category-tree" category=0 name="list-of-category" backend_context="1" visible="*"}
+                <option value="{$ID}" {if $ID == $offered_category_value}selected="selected"{/if}>{option_offset l=$LEVEL label={$TITLE}}</option>
             {/loop}
         </select>
     </div>

templates/backOffice/default/coupon/type-fragments/remove-percentage-on-attributes.html

@@ -6,7 +6,7 @@
         <label for="coupon-percentage" class="control-label">{intl l="Discount percentage"}</label>
 
         <div class="input-group">
-            <input id="coupon-percentage" type="number" class="form-control" name="{$percentage_field_name}" value="{$percentage_value}" placeholder="5">
+            <input id="coupon-percentage" type="number" step="any" min="0" class="form-control" name="{$percentage_field_name}" value="{$percentage_value}" placeholder="5">
 
             <div class="input-group-addon">%</div>
         </div>

templates/backOffice/default/coupon/type-fragments/remove-percentage-on-categories.html

@@ -6,7 +6,7 @@
         <label for="coupon-percentage" class="control-label">{intl l="Discount percentage"}</label>
 
         <div class="input-group">
-            <input id="coupon-percentage" type="number" class="form-control" name="{$percentage_field_name}" value="{$percentage_value}" placeholder="5">
+            <input id="coupon-percentage" type="number" step="any" min="0" class="form-control" name="{$percentage_field_name}" value="{$percentage_value}" placeholder="5">
 
             <div class="input-group-addon">%</div>
         </div>