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

Added Model\Module::getModuleInstance() method

Browse Source
This commit is contained in:
Franck Allimant
2014-05-15 16:50:34 +02:00
parent 9c0cc178b4
commit 683664cb07
8 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Action/Module.php
View File

@@ -161,7 +161,7 @@ class Module extends BaseAction implements EventSubscriberInterface
);
}
$paymentModuleInstance = $this->container->get(sprintf('module.%s', $paymentModule->getCode()));
$paymentModuleInstance = $paymentModule->getModuleInstance($this->container);
$response = $paymentModuleInstance->pay($order);

2
core/lib/Thelia/Core/Template/Loop/Delivery.php
View File

@@ -64,7 +64,7 @@ class Delivery extends BaseSpecificModule
$loopResultRow = new LoopResultRow($deliveryModule);
/** @var DeliveryModuleInterface $moduleInstance */
$moduleInstance = $this->container->get(sprintf('module.%s', $deliveryModule->getCode()));
$moduleInstance = $deliveryModule->getModuleInstance($this->container);
if (false === $moduleInstance instanceof DeliveryModuleInterface) {
throw new \RuntimeException(sprintf("delivery module %s is not a Thelia\Module\DeliveryModuleInterface", $deliveryModule->getCode()));

2
core/lib/Thelia/Core/Template/Loop/Payment.php
View File

@@ -37,7 +37,7 @@ class Payment extends BaseSpecificModule implements PropelSearchLoopInterface
foreach ($loopResult->getResultDataCollection() as $paymentModule) {
$loopResultRow = new LoopResultRow($paymentModule);
$moduleInstance = $this->container->get(sprintf('module.%s', $paymentModule->getCode()));
$moduleInstance = $paymentModule->getModuleInstance($this->container);
if (false === $moduleInstance instanceof PaymentModuleInterface) {
throw new \RuntimeException(sprintf("payment module %s is not a Thelia\Module\PaymentModuleInterface", $paymentModule->getCode()));

2
core/lib/Thelia/Core/Template/Smarty/Plugins/CartPostage.php
View File

@@ -169,7 +169,7 @@ class CartPostage extends AbstractSmartyPlugin
foreach ($deliveryModules as $deliveryModule) {
/** @var DeliveryModuleInterface $moduleInstance */
$moduleInstance = $this->container->get(sprintf('module.%s', $deliveryModule->getCode()));
$moduleInstance = $deliveryModule->getModuleInstance($this->container);
if (false === $moduleInstance instanceof DeliveryModuleInterface) {
throw new \RuntimeException(sprintf("delivery module %s is not a Thelia\Module\DeliveryModuleInterface", $deliveryModule->getCode()));

17
core/lib/Thelia/Model/Module.php
View File

@@ -3,10 +3,12 @@
namespace Thelia\Model;
use Propel\Runtime\Connection\ConnectionInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Thelia\Core\Template\TemplateDefinition;
use Thelia\Model\Base\Module as BaseModule;
use Thelia\Model\Tools\ModelEventDispatcherTrait;
use Thelia\Model\Tools\PositionManagementTrait;
use Thelia\Module\BaseModuleInterface;
class Module extends BaseModule
{
@@ -182,6 +184,21 @@ class Module extends BaseModule
return $moduleReflection->implementsInterface("Thelia\Module\PaymentModuleInterface");
}
/**
* @param ContainerInterface $container the Thelia container
* @return BaseModuleInterface a module instance
* @throws \InvalidArgumentException if the module could not be found in the container/
*/
public function getModuleInstance(ContainerInterface $container) {
$instance = $this->container->get(sprintf('module.%s', $this->getCode()));
if ($instance == null) {
throw new \InvalidArgumentException(sprintf('Undefined module in container: "%s"', $this->getCode()));
}
return $instance;
}
/**
* @return BaseModule a new module instance.
*/

2
local/modules/Front/Controller/CartController.php
View File

@@ -177,7 +177,7 @@ class CartController extends BaseFrontController
$deliveryAddress = AddressQuery::create()->findPk($order->chosenDeliveryAddress);
if (null !== $deliveryModule && null !== $deliveryAddress) {
$moduleInstance = $this->container->get(sprintf('module.%s', $deliveryModule->getCode()));
$moduleInstance = $deliveryModule->getModuleInstance($this->container);
$orderEvent = new OrderEvent($order);

4
local/modules/Front/Controller/CouponController.php
View File

@@ -69,12 +69,14 @@ class CouponController extends BaseFrontController
/* recalculate postage amount */
$order = $this->getSession()->getOrder();
if (null !== $order) {
$deliveryModule = $order->getModuleRelatedByDeliveryModuleId();
$deliveryAddress = AddressQuery::create()->findPk($order->chosenDeliveryAddress);
if (null !== $deliveryModule && null !== $deliveryAddress) {
$moduleInstance = $this->container->get(sprintf('module.%s', $deliveryModule->getCode()));
$moduleInstance = $deliveryModule->getModuleInstance($this->container);
$orderEvent = new OrderEvent($order);

3
local/modules/Front/Controller/OrderController.php
View File

@@ -88,7 +88,8 @@ class OrderController extends BaseFrontController
}
/* get postage amount */
$moduleInstance = $this->container->get(sprintf('module.%s', $deliveryModule->getCode()));
$moduleInstance = $deliveryModule->getModuleInstance($this->container);
$postage = $moduleInstance->getPostage($deliveryAddress->getCountry());
$orderEvent = $this->getOrderEvent();