From 9dd57665be8f9013f85e63a146e36536f6a09766 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 15 Nov 2013 12:06:34 +0100 Subject: [PATCH 01/11] start Front module --- core/lib/Thelia/Config/Resources/routing.xml | 2 ++ local/modules/Front/Config/config.xml | 18 ++++++++++ local/modules/Front/Config/module.xml | 20 +++++++++++ .../modules/Front/Config/routing.xml | 0 local/modules/Front/Front.php | 35 +++++++++++++++++++ 5 files changed, 75 insertions(+) create mode 100644 local/modules/Front/Config/config.xml create mode 100644 local/modules/Front/Config/module.xml rename core/lib/Thelia/Config/Resources/routing/front.xml => local/modules/Front/Config/routing.xml (100%) create mode 100644 local/modules/Front/Front.php diff --git a/core/lib/Thelia/Config/Resources/routing.xml b/core/lib/Thelia/Config/Resources/routing.xml index 54159734c..c213039ae 100755 --- a/core/lib/Thelia/Config/Resources/routing.xml +++ b/core/lib/Thelia/Config/Resources/routing.xml @@ -56,6 +56,7 @@ + diff --git a/local/modules/Front/Config/config.xml b/local/modules/Front/Config/config.xml new file mode 100644 index 000000000..029e5880a --- /dev/null +++ b/local/modules/Front/Config/config.xml @@ -0,0 +1,18 @@ + + + + + + + + + + diff --git a/local/modules/Front/Config/module.xml b/local/modules/Front/Config/module.xml new file mode 100644 index 000000000..de351133d --- /dev/null +++ b/local/modules/Front/Config/module.xml @@ -0,0 +1,20 @@ + + + Front\Front + + front integration + + + + front office module + + + 0.1 + + Thelia team + info@thelia.net + + classic + 2.0.0 + dev + diff --git a/core/lib/Thelia/Config/Resources/routing/front.xml b/local/modules/Front/Config/routing.xml similarity index 100% rename from core/lib/Thelia/Config/Resources/routing/front.xml rename to local/modules/Front/Config/routing.xml diff --git a/local/modules/Front/Front.php b/local/modules/Front/Front.php new file mode 100644 index 000000000..67498ba24 --- /dev/null +++ b/local/modules/Front/Front.php @@ -0,0 +1,35 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Front; + +use Thelia\Module\BaseModule; + +class Front extends BaseModule +{ + /** + * YOU HAVE TO IMPLEMENT HERE ABSTRACT METHODD FROM BaseModule Class + * Like install and destroy + */ + +} From 9325defda725841539ca3dce9c5b1bd40dc360f6 Mon Sep 17 00:00:00 2001 From: OpenStudio Date: Fri, 15 Nov 2013 16:43:58 +0100 Subject: [PATCH 02/11] move front controller classes to Front module --- .../modules/Front/Controller}/AddressController.php | 3 ++- .../modules/Front/Controller}/CartController.php | 3 ++- .../modules/Front/Controller}/ContactController.php | 3 ++- .../modules/Front/Controller}/CouponController.php | 3 ++- .../modules/Front/Controller}/CustomerController.php | 3 ++- .../modules/Front/Controller}/NewsletterController.php | 3 ++- .../modules/Front/Controller}/OrderController.php | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) rename {core/lib/Thelia/Controller/Front => local/modules/Front/Controller}/AddressController.php (99%) rename {core/lib/Thelia/Controller/Front => local/modules/Front/Controller}/CartController.php (98%) rename {core/lib/Thelia/Controller/Front => local/modules/Front/Controller}/ContactController.php (97%) rename {core/lib/Thelia/Controller/Front => local/modules/Front/Controller}/CouponController.php (98%) rename {core/lib/Thelia/Controller/Front => local/modules/Front/Controller}/CustomerController.php (99%) rename {core/lib/Thelia/Controller/Front => local/modules/Front/Controller}/NewsletterController.php (98%) rename {core/lib/Thelia/Controller/Front => local/modules/Front/Controller}/OrderController.php (99%) diff --git a/core/lib/Thelia/Controller/Front/AddressController.php b/local/modules/Front/Controller/AddressController.php similarity index 99% rename from core/lib/Thelia/Controller/Front/AddressController.php rename to local/modules/Front/Controller/AddressController.php index 77af4991e..dac75a195 100644 --- a/core/lib/Thelia/Controller/Front/AddressController.php +++ b/local/modules/Front/Controller/AddressController.php @@ -21,7 +21,8 @@ /* */ /*************************************************************************************/ -namespace Thelia\Controller\Front; +namespace Front\Controller; +use Thelia\Controller\Front\BaseFrontController; use Thelia\Core\Event\Address\AddressCreateOrUpdateEvent; use Thelia\Core\Event\Address\AddressEvent; use Thelia\Core\Event\TheliaEvents; diff --git a/core/lib/Thelia/Controller/Front/CartController.php b/local/modules/Front/Controller/CartController.php similarity index 98% rename from core/lib/Thelia/Controller/Front/CartController.php rename to local/modules/Front/Controller/CartController.php index a2b92508c..d3d24c3bd 100755 --- a/core/lib/Thelia/Controller/Front/CartController.php +++ b/local/modules/Front/Controller/CartController.php @@ -20,9 +20,10 @@ /* along with this program. If not, see . */ /* */ /*************************************************************************************/ -namespace Thelia\Controller\Front; +namespace Front\Controller; use Propel\Runtime\Exception\PropelException; +use Thelia\Controller\Front\BaseFrontController; use Thelia\Form\Exception\FormValidationException; use Thelia\Core\Event\Cart\CartEvent; use Thelia\Core\Event\TheliaEvents; diff --git a/core/lib/Thelia/Controller/Front/ContactController.php b/local/modules/Front/Controller/ContactController.php similarity index 97% rename from core/lib/Thelia/Controller/Front/ContactController.php rename to local/modules/Front/Controller/ContactController.php index 7fa965921..567528836 100644 --- a/core/lib/Thelia/Controller/Front/ContactController.php +++ b/local/modules/Front/Controller/ContactController.php @@ -21,7 +21,8 @@ /* */ /*************************************************************************************/ -namespace Thelia\Controller\Front; +namespace Front\Controller; +use Thelia\Controller\Front\BaseFrontController; use Thelia\Form\ContactForm; use Thelia\Form\Exception\FormValidationException; use Thelia\Model\ConfigQuery; diff --git a/core/lib/Thelia/Controller/Front/CouponController.php b/local/modules/Front/Controller/CouponController.php similarity index 98% rename from core/lib/Thelia/Controller/Front/CouponController.php rename to local/modules/Front/Controller/CouponController.php index e74c14f31..90adba504 100755 --- a/core/lib/Thelia/Controller/Front/CouponController.php +++ b/local/modules/Front/Controller/CouponController.php @@ -20,9 +20,10 @@ /* along with this program. If not, see . */ /* */ /*************************************************************************************/ -namespace Thelia\Controller\Front; +namespace Front\Controller; use Propel\Runtime\Exception\PropelException; +use Thelia\Controller\Front\BaseFrontController; use Thelia\Core\Event\Coupon\CouponConsumeEvent; use Thelia\Form\CouponCode; use Thelia\Form\Exception\FormValidationException; diff --git a/core/lib/Thelia/Controller/Front/CustomerController.php b/local/modules/Front/Controller/CustomerController.php similarity index 99% rename from core/lib/Thelia/Controller/Front/CustomerController.php rename to local/modules/Front/Controller/CustomerController.php index 7f956287e..2ae1c181e 100755 --- a/core/lib/Thelia/Controller/Front/CustomerController.php +++ b/local/modules/Front/Controller/CustomerController.php @@ -20,8 +20,9 @@ /* along with this program. If not, see . */ /* */ /*************************************************************************************/ -namespace Thelia\Controller\Front; +namespace Front\Controller; +use Thelia\Controller\Front\BaseFrontController; use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent; use Thelia\Core\Event\Customer\CustomerLoginEvent; use Thelia\Core\Event\LostPasswordEvent; diff --git a/core/lib/Thelia/Controller/Front/NewsletterController.php b/local/modules/Front/Controller/NewsletterController.php similarity index 98% rename from core/lib/Thelia/Controller/Front/NewsletterController.php rename to local/modules/Front/Controller/NewsletterController.php index 72c3b0878..6938a44d9 100644 --- a/core/lib/Thelia/Controller/Front/NewsletterController.php +++ b/local/modules/Front/Controller/NewsletterController.php @@ -21,8 +21,9 @@ /* */ /*************************************************************************************/ -namespace Thelia\Controller\Front; +namespace Front\Controller; +use Thelia\Controller\Front\BaseFrontController; use Thelia\Core\Event\Newsletter\NewsletterEvent; use Thelia\Core\Event\TheliaEvents; use Thelia\Form\NewsletterForm; diff --git a/core/lib/Thelia/Controller/Front/OrderController.php b/local/modules/Front/Controller/OrderController.php similarity index 99% rename from core/lib/Thelia/Controller/Front/OrderController.php rename to local/modules/Front/Controller/OrderController.php index 4c20b784e..5f496209e 100755 --- a/core/lib/Thelia/Controller/Front/OrderController.php +++ b/local/modules/Front/Controller/OrderController.php @@ -20,9 +20,10 @@ /* along with this program. If not, see . */ /* */ /*************************************************************************************/ -namespace Thelia\Controller\Front; +namespace Front\Controller; use Propel\Runtime\Exception\PropelException; +use Thelia\Controller\Front\BaseFrontController; use Thelia\Core\Event\PdfEvent; use Thelia\Core\HttpFoundation\Response; use Thelia\Core\Template\TemplateHelper; From 38ec9864ca861d4d4d204198e40b8dc49e1a6cc7 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 15 Nov 2013 17:08:54 +0100 Subject: [PATCH 03/11] load custom router from Front module --- local/modules/Front/Config/config.xml | 14 ++++-- .../Front/Config/{routing.xml => front.xml} | 49 +++++++++---------- local/modules/Front/Config/module.xml | 2 +- 3 files changed, 36 insertions(+), 29 deletions(-) rename local/modules/Front/Config/{routing.xml => front.xml} (69%) diff --git a/local/modules/Front/Config/config.xml b/local/modules/Front/Config/config.xml index 029e5880a..dc19adf18 100644 --- a/local/modules/Front/Config/config.xml +++ b/local/modules/Front/Config/config.xml @@ -10,9 +10,17 @@ --> - diff --git a/local/modules/Front/Config/routing.xml b/local/modules/Front/Config/front.xml similarity index 69% rename from local/modules/Front/Config/routing.xml rename to local/modules/Front/Config/front.xml index 702c050ed..94234aa20 100755 --- a/local/modules/Front/Config/routing.xml +++ b/local/modules/Front/Config/front.xml @@ -16,51 +16,51 @@ - Thelia\Controller\Front\CustomerController::createAction + Front\Controller\CustomerController::createAction register - Thelia\Controller\Front\CustomerController::loginAction + Front\Controller\CustomerController::loginAction login - Thelia\Controller\Front\CustomerController::newPasswordAction + Front\Controller\CustomerController::newPasswordAction password - Thelia\Controller\Front\CustomerController::logoutAction + Front\Controller\CustomerController::logoutAction - Thelia\Controller\Front\CustomerController::viewAction + Front\Controller\CustomerController::viewAction account-update - Thelia\Controller\Front\CustomerController::updateAction + Front\Controller\CustomerController::updateAction account-update - Thelia\Controller\Front\CustomerController::updatePasswordAction + Front\Controller\CustomerController::updatePasswordAction account-password - Thelia\Controller\Front\DefaultController::noAction + Front\Controller\DefaultController::noAction account-password - Thelia\Controller\Front\OrderController::generateDeliveryPdf + Front\Controller\OrderController::generateDeliveryPdf \d+ @@ -72,27 +72,27 @@ - Thelia\Controller\Front\AddressController::createAction + Front\Controller\AddressController::createAction address - Thelia\Controller\Front\AddressController::updateViewAction + Front\Controller\AddressController::updateViewAction address-update - Thelia\Controller\Front\AddressController::processUpdateAction + Front\Controller\AddressController::processUpdateAction address-update - Thelia\Controller\Front\AddressController::deleteAction + Front\Controller\AddressController::deleteAction account - Thelia\Controller\Front\AddressController::generateModalAction + Front\Controller\AddressController::generateModalAction modal-address \d+ @@ -106,24 +106,23 @@ - Thelia\Controller\Front\CartController::addItem + Front\Controller\CartController::addItem - Thelia\Controller\Front\CartController::deleteItem + Front\Controller\CartController::deleteItem cart - Thelia\Controller\Front\CartController::changeItem - Thelia\Controller\Front\CartController::changeItem + Front\Controller\CartController::changeItem cart - Thelia\Controller\Front\OrderController::deliver + Front\Controller\OrderController::deliver order-delivery @@ -133,7 +132,7 @@ - Thelia\Controller\Front\OrderController::invoice + Front\Controller\OrderController::invoice order-invoice @@ -143,23 +142,23 @@ - Thelia\Controller\Front\CouponController::consumeAction + Front\Controller\CouponController::consumeAction order-invoice - Thelia\Controller\Front\OrderController::pay + Front\Controller\OrderController::pay - Thelia\Controller\Front\OrderController::orderPlaced + Front\Controller\OrderController::orderPlaced order-placed - Thelia\Controller\Front\ContactController::sendAction + Front\Controller\ContactController::sendAction contact @@ -171,7 +170,7 @@ - Thelia\Controller\Front\NewsletterController::subscribeAction + Front\Controller\NewsletterController::subscribeAction newsletter diff --git a/local/modules/Front/Config/module.xml b/local/modules/Front/Config/module.xml index de351133d..f2ff94b20 100644 --- a/local/modules/Front/Config/module.xml +++ b/local/modules/Front/Config/module.xml @@ -16,5 +16,5 @@ classic 2.0.0 - dev + alpha From 277d8bb09163c2b02ed4c4ccd6d2de7d6caaf880 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 15 Nov 2013 17:19:56 +0100 Subject: [PATCH 04/11] remove unused form --- core/lib/Thelia/Config/Resources/form.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/lib/Thelia/Config/Resources/form.xml b/core/lib/Thelia/Config/Resources/form.xml index dd21a9232..3548a8016 100644 --- a/core/lib/Thelia/Config/Resources/form.xml +++ b/core/lib/Thelia/Config/Resources/form.xml @@ -16,9 +16,6 @@
- - - From dadf17e4ed6dce619eae4ce03c16d39aec5162bb Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 15 Nov 2013 17:37:07 +0100 Subject: [PATCH 05/11] remove unused config --- core/lib/Thelia/Config/Resources/routing.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/core/lib/Thelia/Config/Resources/routing.xml b/core/lib/Thelia/Config/Resources/routing.xml index c213039ae..b0bf2abd5 100755 --- a/core/lib/Thelia/Config/Resources/routing.xml +++ b/core/lib/Thelia/Config/Resources/routing.xml @@ -56,18 +56,6 @@ - From 597da572521be4ca5de42ed3e9c254c99edee8e5 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 15 Nov 2013 12:06:34 +0100 Subject: [PATCH 06/11] start Front module --- core/lib/Thelia/Config/Resources/routing.xml | 2 ++ local/modules/Front/Config/config.xml | 18 ++++++++++ local/modules/Front/Config/module.xml | 20 +++++++++++ .../modules/Front/Config/routing.xml | 0 local/modules/Front/Front.php | 35 +++++++++++++++++++ 5 files changed, 75 insertions(+) create mode 100644 local/modules/Front/Config/config.xml create mode 100644 local/modules/Front/Config/module.xml rename core/lib/Thelia/Config/Resources/routing/front.xml => local/modules/Front/Config/routing.xml (100%) create mode 100644 local/modules/Front/Front.php diff --git a/core/lib/Thelia/Config/Resources/routing.xml b/core/lib/Thelia/Config/Resources/routing.xml index 54159734c..c213039ae 100755 --- a/core/lib/Thelia/Config/Resources/routing.xml +++ b/core/lib/Thelia/Config/Resources/routing.xml @@ -56,6 +56,7 @@ + diff --git a/local/modules/Front/Config/config.xml b/local/modules/Front/Config/config.xml new file mode 100644 index 000000000..029e5880a --- /dev/null +++ b/local/modules/Front/Config/config.xml @@ -0,0 +1,18 @@ + + + + + + + + + + diff --git a/local/modules/Front/Config/module.xml b/local/modules/Front/Config/module.xml new file mode 100644 index 000000000..de351133d --- /dev/null +++ b/local/modules/Front/Config/module.xml @@ -0,0 +1,20 @@ + + + Front\Front + + front integration + + + + front office module + + + 0.1 + + Thelia team + info@thelia.net + + classic + 2.0.0 + dev + diff --git a/core/lib/Thelia/Config/Resources/routing/front.xml b/local/modules/Front/Config/routing.xml similarity index 100% rename from core/lib/Thelia/Config/Resources/routing/front.xml rename to local/modules/Front/Config/routing.xml diff --git a/local/modules/Front/Front.php b/local/modules/Front/Front.php new file mode 100644 index 000000000..67498ba24 --- /dev/null +++ b/local/modules/Front/Front.php @@ -0,0 +1,35 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Front; + +use Thelia\Module\BaseModule; + +class Front extends BaseModule +{ + /** + * YOU HAVE TO IMPLEMENT HERE ABSTRACT METHODD FROM BaseModule Class + * Like install and destroy + */ + +} From 89e0bf8867335b39f9465651bddf06d2298810b7 Mon Sep 17 00:00:00 2001 From: OpenStudio Date: Fri, 15 Nov 2013 16:43:58 +0100 Subject: [PATCH 07/11] move front controller classes to Front module --- .../modules/Front/Controller}/AddressController.php | 3 ++- .../modules/Front/Controller}/CartController.php | 3 ++- .../modules/Front/Controller}/ContactController.php | 3 ++- .../modules/Front/Controller}/CouponController.php | 3 ++- .../modules/Front/Controller}/CustomerController.php | 3 ++- .../modules/Front/Controller}/NewsletterController.php | 3 ++- .../modules/Front/Controller}/OrderController.php | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) rename {core/lib/Thelia/Controller/Front => local/modules/Front/Controller}/AddressController.php (99%) rename {core/lib/Thelia/Controller/Front => local/modules/Front/Controller}/CartController.php (98%) rename {core/lib/Thelia/Controller/Front => local/modules/Front/Controller}/ContactController.php (97%) rename {core/lib/Thelia/Controller/Front => local/modules/Front/Controller}/CouponController.php (98%) rename {core/lib/Thelia/Controller/Front => local/modules/Front/Controller}/CustomerController.php (99%) rename {core/lib/Thelia/Controller/Front => local/modules/Front/Controller}/NewsletterController.php (98%) rename {core/lib/Thelia/Controller/Front => local/modules/Front/Controller}/OrderController.php (99%) diff --git a/core/lib/Thelia/Controller/Front/AddressController.php b/local/modules/Front/Controller/AddressController.php similarity index 99% rename from core/lib/Thelia/Controller/Front/AddressController.php rename to local/modules/Front/Controller/AddressController.php index 77af4991e..dac75a195 100644 --- a/core/lib/Thelia/Controller/Front/AddressController.php +++ b/local/modules/Front/Controller/AddressController.php @@ -21,7 +21,8 @@ /* */ /*************************************************************************************/ -namespace Thelia\Controller\Front; +namespace Front\Controller; +use Thelia\Controller\Front\BaseFrontController; use Thelia\Core\Event\Address\AddressCreateOrUpdateEvent; use Thelia\Core\Event\Address\AddressEvent; use Thelia\Core\Event\TheliaEvents; diff --git a/core/lib/Thelia/Controller/Front/CartController.php b/local/modules/Front/Controller/CartController.php similarity index 98% rename from core/lib/Thelia/Controller/Front/CartController.php rename to local/modules/Front/Controller/CartController.php index a2b92508c..d3d24c3bd 100755 --- a/core/lib/Thelia/Controller/Front/CartController.php +++ b/local/modules/Front/Controller/CartController.php @@ -20,9 +20,10 @@ /* along with this program. If not, see . */ /* */ /*************************************************************************************/ -namespace Thelia\Controller\Front; +namespace Front\Controller; use Propel\Runtime\Exception\PropelException; +use Thelia\Controller\Front\BaseFrontController; use Thelia\Form\Exception\FormValidationException; use Thelia\Core\Event\Cart\CartEvent; use Thelia\Core\Event\TheliaEvents; diff --git a/core/lib/Thelia/Controller/Front/ContactController.php b/local/modules/Front/Controller/ContactController.php similarity index 97% rename from core/lib/Thelia/Controller/Front/ContactController.php rename to local/modules/Front/Controller/ContactController.php index 7fa965921..567528836 100644 --- a/core/lib/Thelia/Controller/Front/ContactController.php +++ b/local/modules/Front/Controller/ContactController.php @@ -21,7 +21,8 @@ /* */ /*************************************************************************************/ -namespace Thelia\Controller\Front; +namespace Front\Controller; +use Thelia\Controller\Front\BaseFrontController; use Thelia\Form\ContactForm; use Thelia\Form\Exception\FormValidationException; use Thelia\Model\ConfigQuery; diff --git a/core/lib/Thelia/Controller/Front/CouponController.php b/local/modules/Front/Controller/CouponController.php similarity index 98% rename from core/lib/Thelia/Controller/Front/CouponController.php rename to local/modules/Front/Controller/CouponController.php index e74c14f31..90adba504 100755 --- a/core/lib/Thelia/Controller/Front/CouponController.php +++ b/local/modules/Front/Controller/CouponController.php @@ -20,9 +20,10 @@ /* along with this program. If not, see . */ /* */ /*************************************************************************************/ -namespace Thelia\Controller\Front; +namespace Front\Controller; use Propel\Runtime\Exception\PropelException; +use Thelia\Controller\Front\BaseFrontController; use Thelia\Core\Event\Coupon\CouponConsumeEvent; use Thelia\Form\CouponCode; use Thelia\Form\Exception\FormValidationException; diff --git a/core/lib/Thelia/Controller/Front/CustomerController.php b/local/modules/Front/Controller/CustomerController.php similarity index 99% rename from core/lib/Thelia/Controller/Front/CustomerController.php rename to local/modules/Front/Controller/CustomerController.php index 7f956287e..2ae1c181e 100755 --- a/core/lib/Thelia/Controller/Front/CustomerController.php +++ b/local/modules/Front/Controller/CustomerController.php @@ -20,8 +20,9 @@ /* along with this program. If not, see . */ /* */ /*************************************************************************************/ -namespace Thelia\Controller\Front; +namespace Front\Controller; +use Thelia\Controller\Front\BaseFrontController; use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent; use Thelia\Core\Event\Customer\CustomerLoginEvent; use Thelia\Core\Event\LostPasswordEvent; diff --git a/core/lib/Thelia/Controller/Front/NewsletterController.php b/local/modules/Front/Controller/NewsletterController.php similarity index 98% rename from core/lib/Thelia/Controller/Front/NewsletterController.php rename to local/modules/Front/Controller/NewsletterController.php index 72c3b0878..6938a44d9 100644 --- a/core/lib/Thelia/Controller/Front/NewsletterController.php +++ b/local/modules/Front/Controller/NewsletterController.php @@ -21,8 +21,9 @@ /* */ /*************************************************************************************/ -namespace Thelia\Controller\Front; +namespace Front\Controller; +use Thelia\Controller\Front\BaseFrontController; use Thelia\Core\Event\Newsletter\NewsletterEvent; use Thelia\Core\Event\TheliaEvents; use Thelia\Form\NewsletterForm; diff --git a/core/lib/Thelia/Controller/Front/OrderController.php b/local/modules/Front/Controller/OrderController.php similarity index 99% rename from core/lib/Thelia/Controller/Front/OrderController.php rename to local/modules/Front/Controller/OrderController.php index 4c20b784e..5f496209e 100755 --- a/core/lib/Thelia/Controller/Front/OrderController.php +++ b/local/modules/Front/Controller/OrderController.php @@ -20,9 +20,10 @@ /* along with this program. If not, see . */ /* */ /*************************************************************************************/ -namespace Thelia\Controller\Front; +namespace Front\Controller; use Propel\Runtime\Exception\PropelException; +use Thelia\Controller\Front\BaseFrontController; use Thelia\Core\Event\PdfEvent; use Thelia\Core\HttpFoundation\Response; use Thelia\Core\Template\TemplateHelper; From 9446b33ee75f1cae74873cc89e314cc7d4f76742 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 15 Nov 2013 17:08:54 +0100 Subject: [PATCH 08/11] load custom router from Front module --- local/modules/Front/Config/config.xml | 14 ++++-- .../Front/Config/{routing.xml => front.xml} | 49 +++++++++---------- local/modules/Front/Config/module.xml | 2 +- 3 files changed, 36 insertions(+), 29 deletions(-) rename local/modules/Front/Config/{routing.xml => front.xml} (69%) diff --git a/local/modules/Front/Config/config.xml b/local/modules/Front/Config/config.xml index 029e5880a..dc19adf18 100644 --- a/local/modules/Front/Config/config.xml +++ b/local/modules/Front/Config/config.xml @@ -10,9 +10,17 @@ --> - diff --git a/local/modules/Front/Config/routing.xml b/local/modules/Front/Config/front.xml similarity index 69% rename from local/modules/Front/Config/routing.xml rename to local/modules/Front/Config/front.xml index 702c050ed..94234aa20 100755 --- a/local/modules/Front/Config/routing.xml +++ b/local/modules/Front/Config/front.xml @@ -16,51 +16,51 @@ - Thelia\Controller\Front\CustomerController::createAction + Front\Controller\CustomerController::createAction register - Thelia\Controller\Front\CustomerController::loginAction + Front\Controller\CustomerController::loginAction login - Thelia\Controller\Front\CustomerController::newPasswordAction + Front\Controller\CustomerController::newPasswordAction password - Thelia\Controller\Front\CustomerController::logoutAction + Front\Controller\CustomerController::logoutAction - Thelia\Controller\Front\CustomerController::viewAction + Front\Controller\CustomerController::viewAction account-update - Thelia\Controller\Front\CustomerController::updateAction + Front\Controller\CustomerController::updateAction account-update - Thelia\Controller\Front\CustomerController::updatePasswordAction + Front\Controller\CustomerController::updatePasswordAction account-password - Thelia\Controller\Front\DefaultController::noAction + Front\Controller\DefaultController::noAction account-password - Thelia\Controller\Front\OrderController::generateDeliveryPdf + Front\Controller\OrderController::generateDeliveryPdf \d+ @@ -72,27 +72,27 @@ - Thelia\Controller\Front\AddressController::createAction + Front\Controller\AddressController::createAction address - Thelia\Controller\Front\AddressController::updateViewAction + Front\Controller\AddressController::updateViewAction address-update - Thelia\Controller\Front\AddressController::processUpdateAction + Front\Controller\AddressController::processUpdateAction address-update - Thelia\Controller\Front\AddressController::deleteAction + Front\Controller\AddressController::deleteAction account - Thelia\Controller\Front\AddressController::generateModalAction + Front\Controller\AddressController::generateModalAction modal-address \d+ @@ -106,24 +106,23 @@ - Thelia\Controller\Front\CartController::addItem + Front\Controller\CartController::addItem - Thelia\Controller\Front\CartController::deleteItem + Front\Controller\CartController::deleteItem cart - Thelia\Controller\Front\CartController::changeItem - Thelia\Controller\Front\CartController::changeItem + Front\Controller\CartController::changeItem cart - Thelia\Controller\Front\OrderController::deliver + Front\Controller\OrderController::deliver order-delivery @@ -133,7 +132,7 @@ - Thelia\Controller\Front\OrderController::invoice + Front\Controller\OrderController::invoice order-invoice @@ -143,23 +142,23 @@ - Thelia\Controller\Front\CouponController::consumeAction + Front\Controller\CouponController::consumeAction order-invoice - Thelia\Controller\Front\OrderController::pay + Front\Controller\OrderController::pay - Thelia\Controller\Front\OrderController::orderPlaced + Front\Controller\OrderController::orderPlaced order-placed - Thelia\Controller\Front\ContactController::sendAction + Front\Controller\ContactController::sendAction contact @@ -171,7 +170,7 @@ - Thelia\Controller\Front\NewsletterController::subscribeAction + Front\Controller\NewsletterController::subscribeAction newsletter diff --git a/local/modules/Front/Config/module.xml b/local/modules/Front/Config/module.xml index de351133d..f2ff94b20 100644 --- a/local/modules/Front/Config/module.xml +++ b/local/modules/Front/Config/module.xml @@ -16,5 +16,5 @@ classic 2.0.0 - dev + alpha From 12ac005674512eed9671ab3edb8de30a5e7b444b Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 15 Nov 2013 17:19:56 +0100 Subject: [PATCH 09/11] remove unused form --- core/lib/Thelia/Config/Resources/form.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/lib/Thelia/Config/Resources/form.xml b/core/lib/Thelia/Config/Resources/form.xml index dd21a9232..3548a8016 100644 --- a/core/lib/Thelia/Config/Resources/form.xml +++ b/core/lib/Thelia/Config/Resources/form.xml @@ -16,9 +16,6 @@ - - - From 8b8e4f7b147c85c5eccb5461f1f3b733252a6308 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 15 Nov 2013 17:37:07 +0100 Subject: [PATCH 10/11] remove unused config --- core/lib/Thelia/Config/Resources/routing.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/core/lib/Thelia/Config/Resources/routing.xml b/core/lib/Thelia/Config/Resources/routing.xml index c213039ae..b0bf2abd5 100755 --- a/core/lib/Thelia/Config/Resources/routing.xml +++ b/core/lib/Thelia/Config/Resources/routing.xml @@ -56,18 +56,6 @@ - From b39f0fd936b838137fa33ceed51c6ab13eea4f91 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 18 Nov 2013 09:54:43 +0100 Subject: [PATCH 11/11] Front module is activated by default --- install/insert.sql | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/install/insert.sql b/install/insert.sql index 41da3ee69..83218aa68 100755 --- a/install/insert.sql +++ b/install/insert.sql @@ -47,13 +47,16 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat INSERT INTO `module` (`id`, `code`, `type`, `activate`, `position`, `full_namespace`, `created_at`, `updated_at`) VALUES (1, 'TheliaDebugBar', 1, 1, 1, 'TheliaDebugBar\\TheliaDebugBar', NOW(), NOW()), (2, 'Colissimo', 2, 0, 1, 'Colissimo\\Colissimo', NOW(), NOW()), -(3, 'Cheque', 3, 0, 1, 'Cheque\\Cheque', NOW(), NOW()); +(3, 'Cheque', 3, 0, 1, 'Cheque\\Cheque', NOW(), NOW()), +(4, 'Front', 1, 1, 2, 'Front\\Front', NOW(), NOW()); INSERT INTO `module_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES ('1', 'en_US', 'Debug bar', NULL, NULL, NULL), ('1', 'fr_FR', 'Debug bar', NULL, NULL, NULL), ('2', 'en_US', '72h delivery', NULL, NULL, NULL), -('2', 'fr_FR', 'Livraison par colissimo en 72h', NULL, NULL, NULL); +('2', 'fr_FR', 'Livraison par colissimo en 72h', NULL, NULL, NULL), +('4', 'en_US', 'Front office integration', NULL, NULL, NULL), +('4', 'fr_FR', 'Module Front office', NULL, NULL, NULL); INSERT INTO `customer_title`(`id`, `by_default`, `position`, `created_at`, `updated_at`) VALUES