MAJ en Thelia 2.3.4

core/lib/Thelia/Config/I18n/en_US.php

@@ -5,6 +5,7 @@ return array(
     ' note: only non-visible documents can be associated.' => ' note: only non-visible documents can be associated.',
     '"%param" parameter cannot be empty in loop type: %type, name: %name' => '"%param" parameter cannot be empty in loop type: %type, name: %name',
     '"%param" parameter is missing in loop type: %type, name: %name' => '"%param" parameter is missing in loop type: %type, name: %name',
+    '#000000' => '#000000',
     '%module (version: %version)' => '%module (version: %version)',
     '%n for number, %c for the currency code, %s for the currency symbol' => '%n for number, %c for the currency code, %s for the currency symbol',
     '%obj SEO modification' => '%obj SEO modification',
@@ -52,6 +53,7 @@ return array(
     'All countries' => 'All countries',
     'All shipping methods' => 'All shipping methods',
     'Amount' => 'Amount',
+    'An administrator with thie email address already exists' => 'An administrator with this email address already exists',
     'An administrator with this email address already exists' => 'An administrator with this email address already exists',
     'An invalid token was provided, your password cannot be changed' => 'An invalid token was provided, your password cannot be changed',
     'Apply exchange rates on price in %sym' => 'Apply exchange rates on price in %sym',
@@ -81,6 +83,8 @@ return array(
     'By Module' => 'By Module',
     'CSS' => 'CSS',
     'CSS stylesheet' => 'CSS stylesheet',
+    'Can\'t deactivate a secure module' => 'Can\'t deactivate a secure module',
+    'Can\'t remove a core module' => 'Can\'t remove a core module',
     'Cannot disable the default language' => 'Cannot disable the default language',
     'Cannot find a default country. Please define one.' => 'Cannot find a default country. Please define one.',
     'Cannot find the shop country. Please select a shop country.' => 'Cannot find the shop country. Please select a shop country.',
@@ -106,6 +110,7 @@ return array(
     'Change password' => 'Change password',
     'Check country iso codes <a href="http://en.wikipedia.org/wiki/ISO_3166-1#Current_codes" target="_blank">here</a>.' => 'Check country iso codes <a href="http://en.wikipedia.org/wiki/ISO_3166-1#Current_codes" target="_blank">in Wikipedia</a>.',
     'Check the total Cart amount in the given currency' => 'Check the total Cart amount in the given currency',
+    'Choice a color for this order status code' => 'Choice a color for this order status code',
     'City' => 'City',
     'Code' => 'Code',
     'Combination builder' => 'Combination builder',
@@ -180,6 +185,8 @@ return array(
     'Enter here the brand name in the default language (%title%)' => 'Enter here the brand name in the default language (%title%)',
     'Enter here the category title in the default language (%title%)' => 'Enter here the category title in the default language (%title%)',
     'Enter here the mail template purpose in the default language (%title%)' => 'Enter here the mail template purpose in the default language (%title%)',
+    'Enter here the order status code' => 'Enter here the order status code',
+    'Enter here the order status name in the default language (%title%)' => 'Enter here the order status name in the default language (%title%)',
     'Enter here the sale name in the default language (%title%)' => 'Enter here the sale name in the default language (%title%)',
     'Enter the new password' => 'Enter the new password',
     'Enter the new password again' => 'Enter the new password again',
@@ -187,6 +194,8 @@ return array(
     'Error during %action process : %error. Exception was %exc' => 'Error during %action process : %error. Exception was %exc',
     'Error occured while processing order ref. %ref, ID %id: %err' => 'Error occurred while processing order ref. %ref, ID %id: %err',
     'Error occured.' => 'Error occurred.',
+    'Error occurred while cancelling order ref. %ref, ID %id: %err' => 'Error occurred while cancelling order ref. %ref, ID %id: %err',
+    'Error occurred while saving payment transaction %transaction_ref for order ID %id.' => 'Error occurred while saving payment transaction %transaction_ref for order ID %id.',
     'Error(s) in import&nbsp;:<br />%errors' => 'Error(s) in import&nbsp;:<br />%errors',
     'Errors' => 'Errors',
     'Export' => 'Export',
@@ -346,6 +355,9 @@ return array(
     'Order failed' => 'Order failed',
     'Order ref. %ref is now unpaid.' => 'Order ref. %ref is now unpaid.',
     'Order ref. %ref, ID %id has been successfully paid.' => 'Order ref. %ref, ID %id has been successfully paid.',
+    'Order status code' => 'Order status code',
+    'Order status color' => 'Order status color',
+    'Order status name' => 'Order status name',
     'Orders' => 'Orders',
     'Overall' => 'Overall',
     'Page 404' => 'Page 404',
@@ -357,6 +369,8 @@ return array(
     'Password confirmation' => 'Password confirmation',
     'Payment failed' => 'Payment failed',
     'Payment gateway' => 'Payment gateway',
+    'Payment module ID not found' => 'Payment module ID not found',
+    'Payment transaction %transaction_ref for order ref. %ref, ID %id has been successfully saved.' => 'Payment transaction %transaction_ref for order ref. %ref, ID %id has been successfully saved.',
     'Per customer' => 'Per customer',
     'Percent' => 'Percent',
     'Percentage' => 'Percentage',
@@ -421,6 +435,7 @@ return array(
     'Range date Start' => 'Range date Start',
     'Rate' => 'Rate',
     'Rate from %currencyCode' => 'Rate from %currencyCode',
+    'Recipient e-mail address' => 'Recipient e-mail address',
     'Redirecting ...' => 'Redirecting ...',
     'Redirecting to %url' => 'Redirecting to %url',
     'Reference' => 'Reference',
@@ -453,6 +468,7 @@ return array(
     'Select the product brand, or supplier.' => 'Select the product brand, or supplier.',
     'Select the products covered by this operation' => 'Select the products covered by this operation',
     'Select the virtual document' => 'Select the virtual document',
+    'Send test e-mail to:' => 'Send test e-mail to:',
     'Service ID' => 'Service ID',
     'Shipping configuration' => 'Shipping configuration',
     'Shipping zone name' => 'Shipping zone name',
@@ -460,6 +476,8 @@ return array(
     'Short description text' => 'Short description text',
     'Show redirections *' => 'Show redirections *',
     'Sitemap' => 'Sitemap',
+    'Some commands use this status.' => 'Some commands use this status.',
+    'Something goes wrong, the message was not sent to recipient. Error is : %err' => 'Something goes wrong, the message was not sent to recipient. Error is : %err',
     'Sorry, an error occured.' => 'Sorry, an error occurred.',
     'Sorry, an error occured: %msg' => 'Sorry, an error occurred: %msg',
     'Sorry, an error occured: %s' => 'Sorry, an error occurred: %s',
@@ -536,6 +554,7 @@ return array(
     'The lost admin password recovery feature is disabled.' => 'The lost admin password recovery feature is disabled.',
     'The mailing template in HTML format.' => 'The mailing template in HTML format.',
     'The mailing template in text-only format.' => 'The mailing template in text-only format.',
+    'The message has been successfully sent to %recipient.' => 'The message has been successfully sent to %recipient.',
     'The method %method% doesn\'t exist in classname %classname%' => 'The method %method% doesn\'t exist in classname %classname%',
     'The method name that will handle the hook event.' => 'The method name that will handle the hook event.',
     'The module "%name%" is currently in use by at least one order, and can\'t be deleted.' => 'The module "%name%" is currently in use by at least one order, and can\'t be deleted.',
@@ -545,6 +564,8 @@ return array(
     'The module has to be activated.' => 'The module has to be activated.',
     'The module is not valid : %message' => 'The module is not valid : %message',
     'The module zip file' => 'The module zip file',
+    'The order status code' => 'The order status code',
+    'The order status name or title' => 'The order status name or title',
     'The product document id %id doesn\'t exists' => 'The product document id %id doesn\'t exists',
     'The product image id %id doesn\'t exists' => 'The product image id %id doesn\'t exists',
     'The product sale element id %id doesn\'t exist' => 'The product sale element id %id doesn\'t exist',
@@ -574,6 +595,7 @@ return array(
     'This administrator login already exists' => 'This administrator login already exists',
     'This brand is online' => 'This brand is online',
     'This category is online' => 'This category is online',
+    'This code is already used.' => 'This code is already used.',
     'This condition is always true' => 'This condition is always true',
     'This content is online.' => 'This content is online.',
     'This country has states / provinces' => 'This country has states / provinces',
@@ -596,6 +618,8 @@ return array(
     'This image is online' => 'This image is online',
     'This is a comma separated list of email addresses where store notifications (such as order placed) are sent.' => 'This is a comma separated list of email addresses where store notifications (such as order placed) are sent.',
     'This is an identifier that will be used in the code to get this message' => 'This is an identifier that will be used in the code to get this message',
+    'This is not a hexadecimal color.' => 'This is not a hexadecimal color.',
+    'This is not a valid code.' => 'This is not a valid code.',
     'This is the contact email address, and the sender email of all e-mails sent by your store.' => 'This is the contact email address, and the sender email of all e-mails sent by your store.',
     'This is the message purpose, such as \'Order confirmation\'.' => 'This is the message purpose, such as \'Order confirmation\'.',
     'This is the name used on the login screen' => 'This is the name used on the login screen',
@@ -608,6 +632,7 @@ return array(
     'This product_sale_elements_id does not exists for this product : %d' => 'This product_sale_elements_id does not exists for this product : %d',
     'This state doesn\'t belong to this country.' => 'This state doesn\'t belong to this country.',
     'This state is online' => 'This state is online',
+    'This status is protected.' => 'This status is protected.',
     'This template is in use in some of your products, and cannot be deleted. Delete it from all your products and try again.' => 'This template is in use in some of your products, and cannot be deleted. Delete it from all your products and try again.',
     'This the unique name of this message. Do not change this value unless you understand what you do.' => 'This the unique name of this message. Do not change this value unless you understand what you do.',
     'This value should not be blank.' => 'This value should not be blank.',
@@ -654,6 +679,7 @@ return array(
     'Wrong form method, %s expected.' => 'Wrong form method, %s expected.',
     'Yes, I have a password :' => 'Yes, I have a password :',
     'You are already registered!' => 'You are already registered!',
+    'You can not delete it.' => 'You can not delete it.',
     'You don\'t need to use commas or other punctuations.' => 'You don\'t need to use commas or other punctuations.',
     'You have to configure your store email first !' => 'You have to configure your store email first !',
     'You must select at least one attribute.' => 'You must select at least one attribute.',

core/lib/Thelia/Config/I18n/fr_FR.php

@@ -1,6 +1,6 @@
 <?php
 
-return [
+return array(
     ' content create form' => 'Formulaire de création de contenu',
     ' note: only non-visible documents can be associated.' => 'remarque : seuls ces modules. les documents non visibles peuvent être associés.',
     '"%param" parameter cannot be empty in loop type: %type, name: %name' => 'Le paramètre "%param" ne peut être vide dans la boucle type: %type, nom: %name ',
@@ -70,6 +70,8 @@ return [
     'Available shipping zones' => 'Zones de livraison disponibles',
     'Back Office' => 'Back Office',
     'Bad tax list JSON' => 'Mauvais JSON de la liste des taxes',
+    'Banner' => 'Bannière',
+    'Banner of the website. Used in the e-mails send to the customers.' => 'Bannière du site utilisée dans le contenu des mails envoyés aux clients.',
     'Billing country' => 'Pays de facturation',
     'Billing country is' => 'Le pays de facturation est',
     'Brand' => 'Marque',
@@ -80,6 +82,8 @@ return [
     'By Module' => 'Par module',
     'CSS' => 'CSS',
     'CSS stylesheet' => 'Feuille de style CSS',
+    'Can\'t deactivate a secure module' => 'Impossible de désactiver un module sécurisé',
+    'Can\'t remove a core module' => 'Impossible de supprimer un module de base',
     'Cannot disable the default language' => 'Impossible de désactiver la langue par défaut',
     'Cannot find a default country. Please define one.' => 'Impossible de trouver un pays par défaut. Veuillez en définir un.',
     'Cannot find the shop country. Please select a shop country.' => 'Impossible de trouver le pays du magasin. Veuillez en sélectionner un.',
@@ -203,6 +207,7 @@ return [
     'Failed to open translation file %file. Please be sure that this file is writable by your Web server' => 'L\'ouverture du fichier %file a échoué. Merci de vérifier que ce fichier est accessible en écriture pour votre serveur Web.',
     'Failed to send message %code. Failed recipients: %failed_addresses' => 'Erreur lors de l\'envoi du message %code. Echec pour les destinataires %failed_addresses',
     'Failed to update language definition: %ex' => 'Erreur lors de la mise à jour de la définition de la langue : %ex',
+    'Favicon image' => 'Icône du site',
     'Fax' => 'Fax',
     'Feature' => 'Caractéristique',
     'Feature value does not match FLOAT format' => 'valeur de caractéristique n\'est pas un FLOAT',
@@ -240,6 +245,7 @@ return [
     'Hooks' => 'Points d\'accroche',
     'Host' => 'Nom de l\'hôte',
     'I would like to receive the newsletter or the latest news.' => 'Je souhaite recevoir la lettre d\'information ou les dernières actualités.',
+    'Icon of the website. Only PNG and ICO files are allowed.' => 'Icône du site. Seuls les fichiers au format PNG ou ICO sont autorisés.',
     'ISO 4217 code' => 'Code ISO 4217',
     'ISO 639-1 Code' => 'Code ISO 639-1',
     'ISO Alpha-2 code' => 'Code ISO Alpha-2',
@@ -355,6 +361,7 @@ return [
     'Password confirmation' => 'Confirmation du mot de passe.',
     'Payment failed' => 'Echec du paiement',
     'Payment gateway' => 'Passerelle de paiement',
+    'Payment module ID not found' => 'ID du module de paiement non trouvé',
     'Per customer' => 'Par client',
     'Percent' => 'Pourcent',
     'Percentage' => 'Pourcentage',
@@ -419,6 +426,7 @@ return [
     'Range date Start' => 'Date de début',
     'Rate' => 'Taux',
     'Rate from %currencyCode' => 'Taux pour %currencyCode',
+    'Recipient e-mail address' => 'Adresse e-mail du destinataire',
     'Redirecting ...' => 'Redirection ...',
     'Redirecting to %url' => 'Redirection vers %url',
     'Reference' => 'Référence',
@@ -451,6 +459,7 @@ return [
     'Select the product brand, or supplier.' => 'Choisissez la marque ou le fournisseur  du produit.',
     'Select the products covered by this operation' => 'Produits inclus dans cette promotion',
     'Select the virtual document' => 'Sélectionnez le document virtuel',
+    'Send test e-mail to:' => 'Envoyer un email de test à: ',
     'Service ID' => 'ID du service',
     'Shipping configuration' => 'Configuration du transport',
     'Shipping zone name' => 'Nom de la zone de livraison',
@@ -478,6 +487,7 @@ return [
     'Store configuration failed.' => 'Erreur de configuration du magasin.',
     'Store description' => 'Description du magasin',
     'Store email address' => 'Adresse mail du magasin',
+    'Store logo' => 'Logo de la boutique',
     'Store logs into text file' => 'Conserver les logs dans des fichiers texte',
     'Store logs into text file, up to a certian size, then a new file is created' => 'Sauvegarder les logs dans un fichier texte. A partir d\'une certaine taille un nouveau fichier est créé',
     'Store name' => 'Nom du magasin',
@@ -535,7 +545,7 @@ return [
     'The method %method% doesn\'t exist in classname %classname%' => 'La méthode %method% n\'existe pas dans la classe %classname%',
     'The method name that will handle the hook event.' => 'Le nom de la méthode qui va traiter l\'évènement du point d\'accroche.',
     'The module "%name%" is currently in use by at least one order, and can\'t be deleted.' => 'Le module "%name%" est utilisé par au moins une commande, et ne peut être supprimé.',
-    'The module %module has been installed successfully.' => 'Le module %module a été activé avec succès.',
+    'The module %module has been installed successfully.' => 'Le module %module a été installé avec succès.',
     'The module %name is already installed in the same or greater version.' => 'Le module %name est déja installé dans la même version, ou dans une version plus récente.',
     'The module %name requires Thelia %version or newer' => 'Le module %name nécessite Thelia %version ou plus récent',
     'The module has to be activated.' => 'Le module doit être activé.',
@@ -820,4 +830,4 @@ return [
     'update form' => 'Formulaire de modification',
     'value table header' => 'colonne tableau valeur',
     'value table row' => 'ligne tableau valeurs',
-];
+);

core/lib/Thelia/Config/Resources/action.xml

@@ -28,6 +28,10 @@
             <tag name="kernel.event_subscriber"/>
         </service>
 
+        <service id="thelia.action.order_status" class="Thelia\Action\OrderStatus">
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
         <service id="thelia.action.coupon" class="Thelia\Action\Coupon">
             <argument type="service" id="request_stack"/>
             <argument type="service" id="thelia.coupon.factory"/>
@@ -171,6 +175,7 @@
         </service>
 
         <service id="thelia.action.cache" class="Thelia\Action\Cache">
+            <argument type="service" id="thelia.cache"/>
             <tag name="kernel.event_subscriber"/>
         </service>
 

core/lib/Thelia/Config/Resources/config.xml

@@ -63,6 +63,7 @@
                 <parameter key="HOOK">admin.hook</parameter>
                 <parameter key="MODULE_HOOK">admin.module-hook</parameter>
                 <parameter key="ORDER">admin.order</parameter>
+                <parameter key="ORDER_STATUS">admin.configuration.order-status</parameter>
                 <parameter key="PRODUCT">admin.product</parameter>
                 <parameter key="PROFILE">admin.configuration.profile</parameter>
                 <parameter key="SHIPPING_ZONE">admin.configuration.shipping-zone</parameter>
@@ -90,6 +91,9 @@
 
         <!-- Thelia logger class -->
         <parameter key="thelia.logger.class">Thelia\Log\Tlog</parameter>
+
+        <!-- Thelia Cache Config -->
+        <parameter key="thelia.cache.namespace">thelia_cache</parameter>
     </parameters>
 
 
@@ -352,7 +356,6 @@
             <argument>%admin.resources%</argument>
         </service>
 
-
         <!-- Handlers -->
         <service id="thelia.export.handler" class="Thelia\Handler\ExportHandler">
             <argument type="service" id="event_dispatcher" />
@@ -365,5 +368,12 @@
             <argument type="service" id="thelia.archiver.manager" />
             <argument type="service" id="service_container" />
         </service>
+
+        <!-- Cache -->
+        <service id="thelia.cache" class="Symfony\Component\Cache\Adapter\FilesystemAdapter">
+            <argument>%thelia.cache.namespace%</argument>
+            <argument>600</argument>
+            <argument>%kernel.cache_dir%</argument>
+        </service>
     </services>
 </config>

core/lib/Thelia/Config/Resources/form.xml

@@ -74,6 +74,7 @@
 
         <form name="thelia.admin.message.creation" class="Thelia\Form\MessageCreationForm"/>
         <form name="thelia.admin.message.modification" class="Thelia\Form\MessageModificationForm"/>
+        <form name="thelia.admin.message.send-sample" class="Thelia\Form\MessageSendSampleForm"/>
 
         <form name="thelia.admin.currency.creation" class="Thelia\Form\CurrencyCreationForm"/>
         <form name="thelia.admin.currency.modification" class="Thelia\Form\CurrencyModificationForm"/>
@@ -162,6 +163,9 @@
         <form name="thelia_api_create" class="Thelia\Form\Api\ApiCreateForm"/>
         <form name="thelia_api_update" class="Thelia\Form\Api\ApiUpdateForm"/>
 
+        <form name="thelia.admin.order-status.creation" class="Thelia\Form\OrderStatus\OrderStatusCreationForm"/>
+        <form name="thelia.admin.order-status.modification" class="Thelia\Form\OrderStatus\OrderStatusModificationForm"/>
+
     </forms>
 
 </config>

core/lib/Thelia/Config/Resources/routing.xml

@@ -15,8 +15,9 @@
 
     <services>
         <service id="thelia.listener.view" class="Thelia\Core\EventListener\ViewListener">
-            <tag name="kernel.event_subscriber"/>
             <argument type="service" id="service_container"/>
+            <argument type="service" id="event_dispatcher"/>
+            <tag name="kernel.event_subscriber"/>
         </service>
 
         <service id="controller.default" class="Thelia\Controller\DefaultController"/>

core/lib/Thelia/Config/Resources/routing/admin.xml

@@ -173,7 +173,7 @@
 
     <route id="admin.customer.update.process" path="/admin/customer/save">
         <default key="_controller">Thelia\Controller\Admin\CustomerController::processUpdateAction</default>
-     </route>
+    </route>
 
     <route id="admin.customer.delete" path="/admin/customer/delete">
         <default key="_controller">Thelia\Controller\Admin\CustomerController::deleteAction</default>
@@ -252,6 +252,36 @@
 
     <!-- end order management -->
 
+    <!-- order status management -->
+
+    <route id="admin.order-status.default" path="/admin/configuration/order-status">
+        <default key="_controller">Thelia\Controller\Admin\OrderStatusController::defaultAction</default>
+    </route>
+
+    <route id="admin.order-status.create" path="/admin/configuration/order-status/create">
+        <default key="_controller">Thelia\Controller\Admin\OrderStatusController::createAction</default>
+    </route>
+
+    <route id="admin.order-status.update" path="/admin/configuration/order-status/update/{order_status_id}">
+        <default key="_controller">Thelia\Controller\Admin\OrderStatusController::updateAction</default>
+        <requirement key="order_status_id">\d+</requirement>
+    </route>
+
+    <route id="admin.order-status.save" path="/admin/configuration/order-status/save/{order_status_id}">
+        <default key="_controller">Thelia\Controller\Admin\OrderStatusController::processUpdateAction</default>
+        <requirement key="order_status_id">\d+</requirement>
+    </route>
+
+    <route id="admin.order-status.delete" path="/admin/configuration/order-status/delete">
+        <default key="_controller">Thelia\Controller\Admin\OrderStatusController::deleteAction</default>
+    </route>
+
+    <route id="admin.order-status.update-position" path="/admin/configuration/order-status/update-position">
+        <default key="_controller">Thelia\Controller\Admin\OrderStatusController::updatePositionAction</default>
+    </route>
+
+    <!-- end order status management -->
+
     <!-- Categories management -->
 
     <route id="admin.categories.default" path="/admin/categories">
@@ -725,6 +755,10 @@
         <default key="_controller">Thelia\Controller\Admin\TemplateController::deleteAction</default>
     </route>
 
+    <route id="admin.configuration.templates.duplicate" path="/admin/configuration/templates/duplicate">
+        <default key="_controller">Thelia\Controller\Admin\TemplateController::duplicateAction</default>
+    </route>
+
     <route id="admin.configuration.templates.features.list" path="/admin/configuration/templates/features/list">
         <default key="_controller">Thelia\Controller\Admin\TemplateController::getAjaxFeaturesAction</default>
     </route>
@@ -1544,6 +1578,11 @@
         <requirement key="messageId">\d+</requirement>
     </route>
 
+    <route id="admin.email.test_send" path="/admin/message/send/{messageId}" methods="post">
+        <default key="_controller">Thelia:Admin\Message:sendSampleByEmail</default>
+        <requirement key="messageId">\d+</requirement>
+    </route>
+
     <!-- The default route, to display a template -->
 
     <route id="admin.processTemplate" path="/admin/{template}">