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

Fixed Customer namespace problem

Browse Source
This commit is contained in:
Franck Allimant
2014-01-24 15:18:50 +01:00
parent 014b1670be
commit edbc63bb53
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/lib/Thelia/Action/Order.php
View File

@@ -23,33 +23,30 @@
namespace Thelia\Action; namespace Thelia\Action;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Thelia\Cart\CartTrait; use Thelia\Cart\CartTrait;
use Thelia\Core\Event\Cart\CartEvent; use Thelia\Core\Event\Cart\CartEvent;
use Thelia\Core\Event\Order\OrderAddressEvent; use Thelia\Core\Event\Order\OrderAddressEvent;
use Thelia\Core\Event\Order\OrderEvent; use Thelia\Core\Event\Order\OrderEvent;
use Thelia\Core\Event\Order\OrderManualEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
use Thelia\Exception\TheliaProcessException; use Thelia\Exception\TheliaProcessException;
use Thelia\Model\AddressQuery; use Thelia\Model\AddressQuery;
use Thelia\Model\Cart as CartModel;
use Thelia\Model\ConfigQuery; use Thelia\Model\ConfigQuery;
use Thelia\Model\MessageQuery; use Thelia\Model\Currency;
use Thelia\Model\OrderProductAttributeCombination; use Thelia\Model\Customer as CustomerModel;
use Thelia\Model\ModuleQuery; use Thelia\Model\Lang;
use Thelia\Model\OrderProduct;
use Thelia\Model\OrderStatus;
use Thelia\Model\Map\OrderTableMap; use Thelia\Model\Map\OrderTableMap;
use Thelia\Model\MessageQuery;
use Thelia\Model\ModuleQuery;
use Thelia\Model\Order as ModelOrder;
use Thelia\Model\OrderAddress; use Thelia\Model\OrderAddress;
use Thelia\Model\OrderProduct;
use Thelia\Model\OrderProductAttributeCombination;
use Thelia\Model\OrderStatus;
use Thelia\Model\OrderStatusQuery; use Thelia\Model\OrderStatusQuery;
use Thelia\Tools\I18n; use Thelia\Tools\I18n;
use Thelia\Model\Currency;
use Thelia\Model\Lang;
use Thelia\Model\Country;
use Thelia\Model\Customer;
use Thelia\Core\Event\Order\OrderManualEvent;
use Thelia\Model\Cart as CartModel;
use Thelia\Model\Order as ModelOrder;
/** /**
* *
@@ -121,7 +118,7 @@ class Order extends BaseAction implements EventSubscriberInterface
$event->setOrder($order); $event->setOrder($order);
} }
protected function createOrder(ModelOrder $sessionOrder, Currency $currency, Lang $lang, CartModel $cart, Customer $customer) protected function createOrder(ModelOrder $sessionOrder, Currency $currency, Lang $lang, CartModel $cart, CustomerModel $customer)
{ {
$con = \Propel\Runtime\Propel::getConnection( $con = \Propel\Runtime\Propel::getConnection(
OrderTableMap::DATABASE_NAME OrderTableMap::DATABASE_NAME
@@ -129,7 +126,7 @@ class Order extends BaseAction implements EventSubscriberInterface
$con->beginTransaction(); $con->beginTransaction();
/* use a copy to avoid errored reccord in session */ /* use a copy to avoid errored record in session */
$placedOrder = $sessionOrder->copy(); $placedOrder = $sessionOrder->copy();
$placedOrder->setDispatcher($this->getDispatcher()); $placedOrder->setDispatcher($this->getDispatcher());
@@ -319,7 +316,7 @@ class Order extends BaseAction implements EventSubscriberInterface
/* but memorize placed order */ /* but memorize placed order */
$event->setOrder(new \Thelia\Model\Order()); $event->setOrder(new \Thelia\Model\Order());
$event->setPlacedOrder($placedOrder); $event->setPlacedOrder($placedOrder);
var_dump($placedOrder);
/* empty cart */ /* empty cart */
$this->getDispatcher()->dispatch(TheliaEvents::CART_CLEAR, new CartEvent($this->getCart($this->getRequest()))); $this->getDispatcher()->dispatch(TheliaEvents::CART_CLEAR, new CartEvent($this->getCart($this->getRequest())));