From 2f5ea0927a110928090990eb79c51ff3819db1ff Mon Sep 17 00:00:00 2001 From: Franck Allimant Date: Thu, 24 Apr 2014 16:23:59 +0200 Subject: [PATCH 1/4] Was missing due to .gitignore misconfiguration --- .../Colissimo/I18n/AdminIncludes/fr_FR.php | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 local/modules/Colissimo/I18n/AdminIncludes/fr_FR.php diff --git a/local/modules/Colissimo/I18n/AdminIncludes/fr_FR.php b/local/modules/Colissimo/I18n/AdminIncludes/fr_FR.php new file mode 100644 index 000000000..4bd2a4bdc --- /dev/null +++ b/local/modules/Colissimo/I18n/AdminIncludes/fr_FR.php @@ -0,0 +1,33 @@ + '* Si vous choisissez cette option, les commandes exportées ne seront plus affichée sur cette page.', + 'Actions' => 'Actions', + 'An error occured' => 'Une erreur est survenue', + 'Area : ' => 'Zone de livraison : ', + 'Cancel' => 'Annuler', + 'Change orders status after export' => 'Modification du statut des commande après l\'export', + 'Colissimo Module allows to send your products all around the world with La Poste.' => 'Colissimo vous permet d’expédier vos colis dans le monde entier avec La Poste', + 'Create' => 'Créer', + 'Create a new price slice' => 'Créer une nouvelle tranche de prix', + 'Create a price slice' => 'Créer une tranche de prix', + 'Date' => 'Date', + 'Delete' => 'Supprimer', + 'Delete a price slice' => 'Supprimer une tranche de prix', + 'Delete this price slice' => 'Supprimer cette tranche de prix', + 'Do not change' => 'Ne pas modifier', + 'Do you really want to delete this slice ?' => 'Confirmez-vous la suppression de cette tranche de prix', + 'Edit' => 'Modifier', + 'Edit a price slice' => 'Modifier une tranche de prix', + 'Edit this price slice' => 'Modifier cette tranche de prix', + 'Export' => 'Export', + 'Export expeditor inet file' => 'Exporter le fichier Expeditor INET', + 'Please change the access rights' => 'Merci de modifier les droits d\'accès', + 'Price (€)' => 'Price (€)', + 'Price slices' => 'Prix et poids', + 'Processing' => 'Traitement', + 'REF' => 'REF', + 'Sent' => 'Envoyé', + 'Total taxed amount' => 'Total TTC', + 'Weight up to ... (kg)' => 'Jusqu\'au poids (Kg)', +); From 6e5c461c79af020e05254986ef100c19af3e044d Mon Sep 17 00:00:00 2001 From: Franck Allimant Date: Thu, 24 Apr 2014 16:24:20 +0200 Subject: [PATCH 2/4] Replaces the CacheController --- .../Admin/AdvancedConfigurationController.php | 60 +++++++++++++++++++ .../default/advanced-configuration.html | 47 +++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 core/lib/Thelia/Controller/Admin/AdvancedConfigurationController.php create mode 100644 templates/backOffice/default/advanced-configuration.html diff --git a/core/lib/Thelia/Controller/Admin/AdvancedConfigurationController.php b/core/lib/Thelia/Controller/Admin/AdvancedConfigurationController.php new file mode 100644 index 000000000..394931f2b --- /dev/null +++ b/core/lib/Thelia/Controller/Admin/AdvancedConfigurationController.php @@ -0,0 +1,60 @@ + + */ +class AdvancedConfigurationController extends BaseAdminController +{ + + public function defaultAction() + { + if (null !== $result = $this->checkAuth(AdminResources::ADVANCED_CONFIGURATION, [], AccessManager::VIEW)) { + return $result; + } + + return $this->render('advanced-configuration'); + } + + public function flushCacheAction() + { + if (null !== $result = $this->checkAuth(AdminResources::ADVANCED_CONFIGURATION, [], AccessManager::UPDATE)) { + return $result; + } + + $form = new CacheFlushForm($this->getRequest()); + try { + $this->validateForm($form); + + $event = new CacheEvent($this->container->getParameter("kernel.cache_dir")); + $this->dispatch(TheliaEvents::CACHE_CLEAR, $event); + + $event = new CacheEvent(THELIA_WEB_DIR . "assets"); + $this->dispatch(TheliaEvents::CACHE_CLEAR, $event); + + $this->redirectToRoute('admin.configuration.advanced'); + } catch (FormValidationException $e) { + + } + } +} diff --git a/templates/backOffice/default/advanced-configuration.html b/templates/backOffice/default/advanced-configuration.html new file mode 100644 index 000000000..cc79c3352 --- /dev/null +++ b/templates/backOffice/default/advanced-configuration.html @@ -0,0 +1,47 @@ +{extends file="admin-layout.tpl"} + +{block name="page-title"}{intl l='Cache'}{/block} + +{block name="check-resource"}admin.cache{/block} +{block name="check-access"}view{/block} + +{block name="main-content"} +
+ +
+ + + +
+
+
+ +
+ {intl l='Advanced configuration'} +
+ +
+
+ + {form name="thelia.cache.flush"} +
+ {form_hidden_fields form=$form} + +
+ + +
+
+ {/form} +
+
+
+
+
+
+
+{/block} From 33fe269b2592836a7780b84f070729faa78128b6 Mon Sep 17 00:00:00 2001 From: Franck Allimant Date: Thu, 24 Apr 2014 16:28:21 +0200 Subject: [PATCH 3/4] Fixed module title --- local/modules/Colissimo/Config/module.xml | 36 +++++++++++------------ local/modules/Tinymce/Config/module.xml | 4 +-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/local/modules/Colissimo/Config/module.xml b/local/modules/Colissimo/Config/module.xml index 1f47ad9c9..b05f70d7f 100755 --- a/local/modules/Colissimo/Config/module.xml +++ b/local/modules/Colissimo/Config/module.xml @@ -1,18 +1,18 @@ - - - Colissimo\Colissimo - - colisimo - - - colisimo - - 1.0 - - Manuel Raynaud - mraynaud@openstudio.fr - - delivery - 2.0.0 - alpha - + + + Colissimo\Colissimo + + Colissimo delivery + + + Livraison par Colissimo + + 1.0 + + Manuel Raynaud + mraynaud@openstudio.fr + + delivery + 2.0.0 + alpha + diff --git a/local/modules/Tinymce/Config/module.xml b/local/modules/Tinymce/Config/module.xml index 175017bd9..c27913441 100644 --- a/local/modules/Tinymce/Config/module.xml +++ b/local/modules/Tinymce/Config/module.xml @@ -2,10 +2,10 @@ Tinymce\Tinymce - Tinymce wysiwyg editor + TinyMCE WYSIWYG editor - éditeur wysiwyg Tinymce + Editeur visuel TinyMCE 0.1 From 0101a47431b3664549eb66478de6616d63c429a9 Mon Sep 17 00:00:00 2001 From: Franck Allimant Date: Thu, 24 Apr 2014 16:29:56 +0200 Subject: [PATCH 4/4] Added Colissimo to the list of standard modules --- .gitignore | 87 +++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index bb3b4d299..3017e8d48 100755 --- a/.gitignore +++ b/.gitignore @@ -1,43 +1,44 @@ -local/config/build.properties -local/config/config_db.php -local/config/build -local/config/database.yml -local/config/database.yml.sample.save -core/vendor -local/config/runtime-conf.xml -cache/* -log/* -bin/* -local/session/* -coverage -.idea -.buildpath -.project -.settings/ -local/media/documents/* -local/media/images/* -web/assets/* -web/cache/* -web/tinymce -web/media -phpdoc*.log -xhprof/ -phpunit.phar -.DS_Store -phpmyadmin -composer.phar -web/.htaccess - -# Ignore everything in the "modules" directory, except the "default modules" -local/modules/* -!local/modules/Cheque/ -!local/modules/Front/ -!local/modules/TheliaDebugBar/ -!local/modules/Tinymce/ - -# Ignore everything in the "templates" directory, except the "default template" -templates/* -!templates/backOffice/ -!templates/email/ -!templates/frontOffice/ -!templates/pdf/ +local/config/build.properties +local/config/config_db.php +local/config/build +local/config/database.yml +local/config/database.yml.sample.save +core/vendor +local/config/runtime-conf.xml +cache/* +log/* +bin/* +local/session/* +coverage +.idea +.buildpath +.project +.settings/ +local/media/documents/* +local/media/images/* +web/assets/* +web/cache/* +web/tinymce +web/media +phpdoc*.log +xhprof/ +phpunit.phar +.DS_Store +phpmyadmin +composer.phar +web/.htaccess + +# Ignore everything in the "modules" directory, except the "default modules" +local/modules/* +!local/modules/Cheque/ +!local/modules/Front/ +!local/modules/TheliaDebugBar/ +!local/modules/Tinymce/ +!local/modules/Colissimo/ + +# Ignore everything in the "templates" directory, except the "default template" +templates/* +!templates/backOffice/ +!templates/email/ +!templates/frontOffice/ +!templates/pdf/