Removes container from all Thelia actions, but Modules (#198)
This commit is contained in:
committed by
Manuel Raynaud
parent
779c33ac79
commit
3fd8f5adbb
@@ -32,6 +32,7 @@ use Thelia\Core\Event\Module\ModuleDeleteEvent;
|
|||||||
use Thelia\Core\Event\Module\ModuleEvent;
|
use Thelia\Core\Event\Module\ModuleEvent;
|
||||||
use Thelia\Core\Event\Module\ModuleToggleActivationEvent;
|
use Thelia\Core\Event\Module\ModuleToggleActivationEvent;
|
||||||
use Thelia\Core\Event\Order\OrderPaymentEvent;
|
use Thelia\Core\Event\Order\OrderPaymentEvent;
|
||||||
|
|
||||||
use Thelia\Core\Event\TheliaEvents;
|
use Thelia\Core\Event\TheliaEvents;
|
||||||
use Thelia\Core\Event\UpdatePositionEvent;
|
use Thelia\Core\Event\UpdatePositionEvent;
|
||||||
use Thelia\Core\Translation\Translator;
|
use Thelia\Core\Translation\Translator;
|
||||||
|
|||||||
@@ -151,7 +151,6 @@ class Order extends BaseAction implements EventSubscriberInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected function createOrder(EventDispatcherInterface $dispatcher, ModelOrder $sessionOrder, Currency $currency, Lang $lang, CartModel $cart, CustomerModel $customer)
|
protected function createOrder(EventDispatcherInterface $dispatcher, 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
|
||||||
@@ -342,7 +341,6 @@ class Order extends BaseAction implements EventSubscriberInterface
|
|||||||
$event->getDispatcher()->dispatch(TheliaEvents::ORDER_BEFORE_PAYMENT, new OrderEvent($placedOrder));
|
$event->getDispatcher()->dispatch(TheliaEvents::ORDER_BEFORE_PAYMENT, new OrderEvent($placedOrder));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* clear session */
|
/* clear session */
|
||||||
$session
|
$session
|
||||||
->setProcessedOrder($placedOrder)
|
->setProcessedOrder($placedOrder)
|
||||||
@@ -400,6 +398,7 @@ class Order extends BaseAction implements EventSubscriberInterface
|
|||||||
// Build subject and body
|
// Build subject and body
|
||||||
$message->buildMessage($this->parser, $instance);
|
$message->buildMessage($this->parser, $instance);
|
||||||
|
|
||||||
|
|
||||||
$this->getMailer()->send($instance);
|
$this->getMailer()->send($instance);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -399,10 +399,13 @@ class CheckPermission extends BaseInstall
|
|||||||
// The 'G' modifier is available since PHP 5.1.0
|
// The 'G' modifier is available since PHP 5.1.0
|
||||||
case 'g':
|
case 'g':
|
||||||
$val *= 1024;
|
$val *= 1024;
|
||||||
|
break;
|
||||||
case 'm':
|
case 'm':
|
||||||
$val *= 1024;
|
$val *= 1024;
|
||||||
|
break;
|
||||||
case 'k':
|
case 'k':
|
||||||
$val *= 1024;
|
$val *= 1024;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $val;
|
return $val;
|
||||||
|
|||||||
Reference in New Issue
Block a user