TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:thelia/thelia

Browse Source
This commit is contained in:
Etienne Roudeix
2013-11-18 11:32:36 +01:00
parent b03bac18d6 8d956f0c2c
commit 0cc48ecdb7
14 changed files with 125 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/lib/Thelia/Config/Resources/form.xml
View File

@@ -16,9 +16,6 @@
<form name="thelia.front.contact" class="Thelia\Form\ContactForm"/> <form name="thelia.front.contact" class="Thelia\Form\ContactForm"/>
<form name="thelia.front.newsletter" class="Thelia\Form\NewsletterForm"/> <form name="thelia.front.newsletter" class="Thelia\Form\NewsletterForm"/>
<!-- Forms for Admin -->
<form name="thelia.install.step3" class="Thelia\Form\InstallStep3Form"/>
<form name="thelia.admin.login" class="Thelia\Form\AdminLogin"/> <form name="thelia.admin.login" class="Thelia\Form\AdminLogin"/>
<form name="thelia.admin.customer.create" class="Thelia\Form\CustomerCreateForm"/> <form name="thelia.admin.customer.create" class="Thelia\Form\CustomerCreateForm"/>

10
core/lib/Thelia/Config/Resources/routing.xml
View File

@@ -56,16 +56,6 @@
<tag name="router.register" priority="0"/> <tag name="router.register" priority="0"/>
</service> </service>
<service id="router.front" class="%router.class%">
<argument type="service" id="router.xmlLoader"/>
<argument>front.xml</argument>
<argument type="collection">
<argument key="cache_dir">%kernel.cache_dir%</argument>
<argument key="debug">%kernel.debug%</argument>
</argument>
<argument type="service" id="request.context"/>
<tag name="router.register" priority="128"/>
</service>
<service id="router.rewrite" class="Thelia\Core\Routing\RewritingRouter"> <service id="router.rewrite" class="Thelia\Core\Routing\RewritingRouter">
<tag name="router.register" priority="255"/> <tag name="router.register" priority="255"/>

9
install/insert.sql
View File

@@ -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 INSERT INTO `module` (`id`, `code`, `type`, `activate`, `position`, `full_namespace`, `created_at`, `updated_at`) VALUES
(1, 'TheliaDebugBar', 1, 1, 1, 'TheliaDebugBar\\TheliaDebugBar', NOW(), NOW()), (1, 'TheliaDebugBar', 1, 1, 1, 'TheliaDebugBar\\TheliaDebugBar', NOW(), NOW()),
(2, 'Colissimo', 2, 0, 1, 'Colissimo\\Colissimo', 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 INSERT INTO `module_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES
('1', 'en_US', 'Debug bar', NULL, NULL, NULL), ('1', 'en_US', 'Debug bar', NULL, NULL, NULL),
('1', 'fr_FR', 'Debug bar', NULL, NULL, NULL), ('1', 'fr_FR', 'Debug bar', NULL, NULL, NULL),
('2', 'en_US', '72h delivery', 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 INSERT INTO `customer_title`(`id`, `by_default`, `position`, `created_at`, `updated_at`) VALUES
@@ -66,7 +69,7 @@ INSERT INTO `customer_title_i18n` (`id`, `locale`, `short`, `long`) VALUES
(1, 'en_US', 'M', 'Mister'), (1, 'en_US', 'M', 'Mister'),
(2, 'fr_FR', 'Mme', 'Madame'), (2, 'fr_FR', 'Mme', 'Madame'),
(2, 'en_US', 'Mrs', 'Misses'), (2, 'en_US', 'Mrs', 'Misses'),
(3, 'fr_FR', 'Mlle', 'Madamemoiselle'), (3, 'fr_FR', 'Mlle', 'Mademoiselle'),
(3, 'en_US', 'Miss', 'Miss'); (3, 'en_US', 'Miss', 'Miss');
INSERT INTO `currency` (`id`, `code`, `symbol`, `rate`, `position`, `by_default`, `created_at`, `updated_at`) INSERT INTO `currency` (`id`, `code`, `symbol`, `rate`, `position`, `by_default`, `created_at`, `updated_at`)

26
local/modules/Front/Config/config.xml Normal file
View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" ?>
<config xmlns="http://thelia.net/schema/dic/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://thelia.net/schema/dic/config http://thelia.net/schema/dic/config/thelia-1.0.xsd">
<forms>
<!--
<form name="MyFormName" class="MyModule\Form\MySuperForm" />
-->
</forms>
<services>
<service id="router.front" class="%router.class%">
<argument type="service" id="router.module.xmlLoader"/>
<argument>Front/Config/front.xml</argument>
<argument type="collection">
<argument key="cache_dir">%kernel.cache_dir%</argument>
<argument key="debug">%kernel.debug%</argument>
</argument>
<argument type="service" id="request.context"/>
<tag name="router.register" priority="128"/>
</service>
</services>
</config>

49
core/lib/Thelia/Config/Resources/routing/front.xml → local/modules/Front/Config/front.xml
View File

@@ -16,51 +16,51 @@
<!-- Register --> <!-- Register -->
<route id="customer.create.process" path="/register" methods="post"> <route id="customer.create.process" path="/register" methods="post">
<default key="_controller">Thelia\Controller\Front\CustomerController::createAction</default> <default key="_controller">Front\Controller\CustomerController::createAction</default>
<default key="_view">register</default> <default key="_view">register</default>
</route> </route>
<!-- Login --> <!-- Login -->
<route id="customer.login.process" path="/login" methods="post"> <route id="customer.login.process" path="/login" methods="post">
<default key="_controller">Thelia\Controller\Front\CustomerController::loginAction</default> <default key="_controller">Front\Controller\CustomerController::loginAction</default>
<default key="_view">login</default> <default key="_view">login</default>
</route> </route>
<!-- Forgot Password --> <!-- Forgot Password -->
<route id="customer.password.retrieve.process" path="/password" methods="post"> <route id="customer.password.retrieve.process" path="/password" methods="post">
<default key="_controller">Thelia\Controller\Front\CustomerController::newPasswordAction</default> <default key="_controller">Front\Controller\CustomerController::newPasswordAction</default>
<default key="_view">password</default> <default key="_view">password</default>
</route> </route>
<!-- Logout --> <!-- Logout -->
<route id="customer.logout.process" path="/logout"> <route id="customer.logout.process" path="/logout">
<default key="_controller">Thelia\Controller\Front\CustomerController::logoutAction</default> <default key="_controller">Front\Controller\CustomerController::logoutAction</default>
</route> </route>
<!-- Account --> <!-- Account -->
<route id="customer.update.view" path="/account/update" methods="get"> <route id="customer.update.view" path="/account/update" methods="get">
<default key="_controller">Thelia\Controller\Front\CustomerController::viewAction</default> <default key="_controller">Front\Controller\CustomerController::viewAction</default>
<default key="_view">account-update</default> <default key="_view">account-update</default>
</route> </route>
<route id="customer.update.process" path="/account/update" methods="post"> <route id="customer.update.process" path="/account/update" methods="post">
<default key="_controller">Thelia\Controller\Front\CustomerController::updateAction</default> <default key="_controller">Front\Controller\CustomerController::updateAction</default>
<default key="_view">account-update</default> <default key="_view">account-update</default>
</route> </route>
<route id="customer.password.change.process" path="/account/password" methods="post"> <route id="customer.password.change.process" path="/account/password" methods="post">
<default key="_controller">Thelia\Controller\Front\CustomerController::updatePasswordAction</default> <default key="_controller">Front\Controller\CustomerController::updatePasswordAction</default>
<default key="_view">account-password</default> <default key="_view">account-password</default>
</route> </route>
<route id="customer.password.change.view" path="/account/password" methods="get"> <route id="customer.password.change.view" path="/account/password" methods="get">
<default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default> <default key="_controller">Front\Controller\DefaultController::noAction</default>
<default key="_view">account-password</default> <default key="_view">account-password</default>
</route> </route>
<route id="customer.order.pdf.delivery" path="/account/order/pdf/delivery/{order_id}"> <route id="customer.order.pdf.delivery" path="/account/order/pdf/delivery/{order_id}">
<default key="_controller">Thelia\Controller\Front\OrderController::generateDeliveryPdf</default> <default key="_controller">Front\Controller\OrderController::generateDeliveryPdf</default>
<requirement key="order_id">\d+</requirement> <requirement key="order_id">\d+</requirement>
</route> </route>
<!-- end customer routes --> <!-- end customer routes -->
@@ -72,27 +72,27 @@
</route> </route>
<route id="address.create" path="/address/create" methods="post" > <route id="address.create" path="/address/create" methods="post" >
<default key="_controller">Thelia\Controller\Front\AddressController::createAction</default> <default key="_controller">Front\Controller\AddressController::createAction</default>
<default key="_view">address</default> <default key="_view">address</default>
</route> </route>
<route id="address.edit" path="/address/update/{address_id}" methods="get"> <route id="address.edit" path="/address/update/{address_id}" methods="get">
<default key="_controller">Thelia\Controller\Front\AddressController::updateViewAction</default> <default key="_controller">Front\Controller\AddressController::updateViewAction</default>
<default key="_view">address-update</default> <default key="_view">address-update</default>
</route> </route>
<route id="address.update" path="/address/update/{address_id}" methods="post" > <route id="address.update" path="/address/update/{address_id}" methods="post" >
<default key="_controller">Thelia\Controller\Front\AddressController::processUpdateAction</default> <default key="_controller">Front\Controller\AddressController::processUpdateAction</default>
<default key="_view">address-update</default> <default key="_view">address-update</default>
</route> </route>
<route id="address.delete" path="/address/delete/{address_id}"> <route id="address.delete" path="/address/delete/{address_id}">
<default key="_controller">Thelia\Controller\Front\AddressController::deleteAction</default> <default key="_controller">Front\Controller\AddressController::deleteAction</default>
<default key="_view">account</default> <default key="_view">account</default>
</route> </route>
<route id="address.generateModal" path="/address/modal/{address_id}" methods="get"> <route id="address.generateModal" path="/address/modal/{address_id}" methods="get">
<default key="_controller">Thelia\Controller\Front\AddressController::generateModalAction</default> <default key="_controller">Front\Controller\AddressController::generateModalAction</default>
<default key="_view">modal-address</default> <default key="_view">modal-address</default>
<requirement key="address_id">\d+</requirement> <requirement key="address_id">\d+</requirement>
</route> </route>
@@ -106,24 +106,23 @@
</route> </route>
<route id="cart.add.process" path="/cart/add"> <route id="cart.add.process" path="/cart/add">
<default key="_controller">Thelia\Controller\Front\CartController::addItem</default> <default key="_controller">Front\Controller\CartController::addItem</default>
</route> </route>
<route id="cart.delete.process" path="/cart/delete/{cart_item}"> <route id="cart.delete.process" path="/cart/delete/{cart_item}">
<default key="_controller">Thelia\Controller\Front\CartController::deleteItem</default> <default key="_controller">Front\Controller\CartController::deleteItem</default>
<default key="_view">cart</default> <default key="_view">cart</default>
</route> </route>
<route id="cart.update.quantity" path="/cart/update"> <route id="cart.update.quantity" path="/cart/update">
<default key="_controller">Thelia\Controller\Front\CartController::changeItem</default> <default key="_controller">Front\Controller\CartController::changeItem</default>
<default key="_controller">Thelia\Controller\Front\CartController::changeItem</default>
<default key="_view">cart</default> <default key="_view">cart</default>
</route> </route>
<!-- end cart routes --> <!-- end cart routes -->
<!-- order management process --> <!-- order management process -->
<route id="order.delivery.process" path="/order/delivery" methods="post"> <route id="order.delivery.process" path="/order/delivery" methods="post">
<default key="_controller">Thelia\Controller\Front\OrderController::deliver</default> <default key="_controller">Front\Controller\OrderController::deliver</default>
<default key="_view">order-delivery</default> <default key="_view">order-delivery</default>
</route> </route>
@@ -133,7 +132,7 @@
</route> </route>
<route id="order.invoice.process" path="/order/invoice" methods="post"> <route id="order.invoice.process" path="/order/invoice" methods="post">
<default key="_controller">Thelia\Controller\Front\OrderController::invoice</default> <default key="_controller">Front\Controller\OrderController::invoice</default>
<default key="_view">order-invoice</default> <default key="_view">order-invoice</default>
</route> </route>
@@ -143,23 +142,23 @@
</route> </route>
<route id="order.coupon.process" path="/order/coupon" methods="post"> <route id="order.coupon.process" path="/order/coupon" methods="post">
<default key="_controller">Thelia\Controller\Front\CouponController::consumeAction</default> <default key="_controller">Front\Controller\CouponController::consumeAction</default>
<default key="_view">order-invoice</default> <default key="_view">order-invoice</default>
</route> </route>
<route id="order.payment.process" path="/order/pay"> <route id="order.payment.process" path="/order/pay">
<default key="_controller">Thelia\Controller\Front\OrderController::pay</default> <default key="_controller">Front\Controller\OrderController::pay</default>
</route> </route>
<route id="order.placed" path="/order/placed/{order_id}"> <route id="order.placed" path="/order/placed/{order_id}">
<default key="_controller">Thelia\Controller\Front\OrderController::orderPlaced</default> <default key="_controller">Front\Controller\OrderController::orderPlaced</default>
<default key="_view">order-placed</default> <default key="_view">order-placed</default>
</route> </route>
<!-- end order management process --> <!-- end order management process -->
<!-- contact management --> <!-- contact management -->
<route id="contact.send" path="/contact" methods="post"> <route id="contact.send" path="/contact" methods="post">
<default key="_controller">Thelia\Controller\Front\ContactController::sendAction</default> <default key="_controller">Front\Controller\ContactController::sendAction</default>
<default key="_view">contact</default> <default key="_view">contact</default>
</route> </route>
@@ -171,7 +170,7 @@
<!-- newsletter management --> <!-- newsletter management -->
<route id="newsletter.process" path="/newsletter" methods="post"> <route id="newsletter.process" path="/newsletter" methods="post">
<default key="_controller">Thelia\Controller\Front\NewsletterController::subscribeAction</default> <default key="_controller">Front\Controller\NewsletterController::subscribeAction</default>
<default key="_view">newsletter</default> <default key="_view">newsletter</default>
</route> </route>
<!-- end newsletter management --> <!-- end newsletter management -->

20
local/modules/Front/Config/module.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module>
<fullnamespace>Front\Front</fullnamespace>
<descriptive locale="en_US">
<title>front integration</title>
<description></description>
</descriptive>
<descriptive locale="fr_FR">
<title>front office module</title>
<description></description>
</descriptive>
<version>0.1</version>
<author>
<name>Thelia team</name>
<email>info@thelia.net</email>
</author>
<type>classic</type>
<thelia>2.0.0</thelia>
<stability>alpha</stability>
</module>

3
core/lib/Thelia/Controller/Front/AddressController.php → local/modules/Front/Controller/AddressController.php
View File

@@ -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\AddressCreateOrUpdateEvent;
use Thelia\Core\Event\Address\AddressEvent; use Thelia\Core\Event\Address\AddressEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;

3
core/lib/Thelia/Controller/Front/CartController.php → local/modules/Front/Controller/CartController.php
View File

@@ -20,9 +20,10 @@
/* along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* */ /* */
/*************************************************************************************/ /*************************************************************************************/
namespace Thelia\Controller\Front; namespace Front\Controller;
use Propel\Runtime\Exception\PropelException; use Propel\Runtime\Exception\PropelException;
use Thelia\Controller\Front\BaseFrontController;
use Thelia\Form\Exception\FormValidationException; use Thelia\Form\Exception\FormValidationException;
use Thelia\Core\Event\Cart\CartEvent; use Thelia\Core\Event\Cart\CartEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;

3
core/lib/Thelia/Controller/Front/ContactController.php → local/modules/Front/Controller/ContactController.php
View File

@@ -21,7 +21,8 @@
/* */ /* */
/*************************************************************************************/ /*************************************************************************************/
namespace Thelia\Controller\Front; namespace Front\Controller;
use Thelia\Controller\Front\BaseFrontController;
use Thelia\Form\ContactForm; use Thelia\Form\ContactForm;
use Thelia\Form\Exception\FormValidationException; use Thelia\Form\Exception\FormValidationException;
use Thelia\Model\ConfigQuery; use Thelia\Model\ConfigQuery;

3
core/lib/Thelia/Controller/Front/CouponController.php → local/modules/Front/Controller/CouponController.php
View File

@@ -20,9 +20,10 @@
/* along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* */ /* */
/*************************************************************************************/ /*************************************************************************************/
namespace Thelia\Controller\Front; namespace Front\Controller;
use Propel\Runtime\Exception\PropelException; use Propel\Runtime\Exception\PropelException;
use Thelia\Controller\Front\BaseFrontController;
use Thelia\Core\Event\Coupon\CouponConsumeEvent; use Thelia\Core\Event\Coupon\CouponConsumeEvent;
use Thelia\Form\CouponCode; use Thelia\Form\CouponCode;
use Thelia\Form\Exception\FormValidationException; use Thelia\Form\Exception\FormValidationException;

3
core/lib/Thelia/Controller/Front/CustomerController.php → local/modules/Front/Controller/CustomerController.php
View File

@@ -20,8 +20,9 @@
/* along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* */ /* */
/*************************************************************************************/ /*************************************************************************************/
namespace Thelia\Controller\Front; namespace Front\Controller;
use Thelia\Controller\Front\BaseFrontController;
use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent; use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent;
use Thelia\Core\Event\Customer\CustomerLoginEvent; use Thelia\Core\Event\Customer\CustomerLoginEvent;
use Thelia\Core\Event\LostPasswordEvent; use Thelia\Core\Event\LostPasswordEvent;

3
core/lib/Thelia/Controller/Front/NewsletterController.php → local/modules/Front/Controller/NewsletterController.php
View File

@@ -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\Newsletter\NewsletterEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
use Thelia\Form\NewsletterForm; use Thelia\Form\NewsletterForm;

3
core/lib/Thelia/Controller/Front/OrderController.php → local/modules/Front/Controller/OrderController.php
View File

@@ -20,9 +20,10 @@
/* along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* */ /* */
/*************************************************************************************/ /*************************************************************************************/
namespace Thelia\Controller\Front; namespace Front\Controller;
use Propel\Runtime\Exception\PropelException; use Propel\Runtime\Exception\PropelException;
use Thelia\Controller\Front\BaseFrontController;
use Thelia\Core\Event\PdfEvent; use Thelia\Core\Event\PdfEvent;
use Thelia\Core\HttpFoundation\Response; use Thelia\Core\HttpFoundation\Response;
use Thelia\Core\Template\TemplateHelper; use Thelia\Core\Template\TemplateHelper;

35
local/modules/Front/Front.php Normal file
View File

@@ -0,0 +1,35 @@
<?php
/*************************************************************************************/
/* */
/* Thelia */
/* */
/* Copyright (c) OpenStudio */
/* email : info@thelia.net */
/* web : http://www.thelia.net */
/* */
/* This program is free software; you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
/* the Free Software Foundation; either version 3 of the License */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* */
/*************************************************************************************/
namespace Front;
use Thelia\Module\BaseModule;
class Front extends BaseModule
{
/**
* YOU HAVE TO IMPLEMENT HERE ABSTRACT METHODD FROM BaseModule Class
* Like install and destroy
*/
}