TheCoreDev/boutique-fanny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correction du bogue sur le module Paypal, qui ne récupérait pas le bon module de livraison

Browse Source
This commit is contained in:
Laurent LE CORRE
2019-12-11 11:49:40 +01:00
parent aaaf58c150
commit ac690bc2c7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -275,7 +275,7 @@ class Module extends BaseModule
$instance = $this->getModuleInstance($container); $instance = $this->getModuleInstance($container);
if (! $instance instanceof DeliveryModuleInterface) { if (! $instance instanceof DeliveryModuleInterface) {
throw new \InvalidArgumentException(sprintf('Module "%s" is not a payment module', $this->getCode())); throw new \InvalidArgumentException(sprintf('Module "%s" is not a delivery module', $this->getCode()));
} }
return $instance; return $instance;

7
local/modules/PayPal/Controller/PayPalResponseController.php
View File

@@ -384,7 +384,12 @@ class PayPalResponseController extends OrderController
$deliveryAddress = $cart->getCustomer()->getDefaultAddress(); $deliveryAddress = $cart->getCustomer()->getDefaultAddress();
/** @var \Thelia\Model\Module $deliveryModule */ /** @var \Thelia\Model\Module $deliveryModule */
$deliveryModule = ModuleQuery::create()->filterByActivate(1)->findOne(); /*$deliveryModule = ModuleQuery::create()->filterByActivate(1)->findOne();*/
$order = $this->getSession()->getOrder();
if (null !== $order) {
$deliveryModule = $order->getModuleRelatedByDeliveryModuleId();
}
/** @var \Thelia\Model\Module $paymentModule */ /** @var \Thelia\Model\Module $paymentModule */
$paymentModule = ModuleQuery::create()->findPk(PayPal::getModuleId()); $paymentModule = ModuleQuery::create()->findPk(PayPal::getModuleId());