Merge pull request #1406 from PrestaShopCorp/fix/PAYSHIP-3684

[PAYSHIP-3684] Fix payment method name on save order

Author: Matt75

core/src/Order/Action/CreateOrderPaymentAction.php

@@ -121,7 +121,7 @@ public function execute(PayPalOrderResponse $payPalOrderResponse)
 
         $paymentAdded = $order->addOrderPayment(
             $capture['amount']['value'],
-            $this->fundingSourceTranslationProvider->getFundingSourceName($payPalOrderResponse->getFundingSource()),
+            $this->fundingSourceTranslationProvider->getFundingSourceName($payPalOrder->getFundingSource()),
             $capture['id'],
             $currency,
             $date->format('Y-m-d H:i:s'),

core/src/Order/Action/CreateValidateOrderDataAction.php

@@ -27,6 +27,7 @@
 use PsCheckout\Core\OrderState\Configuration\OrderStateConfiguration;
 use PsCheckout\Core\OrderState\OrderStateException;
 use PsCheckout\Core\OrderState\Service\OrderStateMapperInterface;
+use PsCheckout\Core\PayPal\Order\Repository\PayPalOrderRepositoryInterface;
 use PsCheckout\Infrastructure\Adapter\ContextInterface;
 use PsCheckout\Infrastructure\Repository\CurrencyRepositoryInterface;
 
@@ -52,24 +53,32 @@ class CreateValidateOrderDataAction implements CreateValidateOrderDataActionInte
      */
     private $orderAmountValidator;
 
+    /**
+     * @var PayPalOrderRepositoryInterface
+     */
+    private $payPalOrderRepository;
+
     public function __construct(
         ContextInterface $context,
         OrderStateMapperInterface $orderStateMapper,
         CurrencyRepositoryInterface $currencyRepository,
-        OrderAmountValidatorInterface $orderAmountValidator
+        OrderAmountValidatorInterface $orderAmountValidator,
+        PayPalOrderRepositoryInterface $payPalOrderRepository
     ) {
         $this->context = $context;
         $this->orderStateMapper = $orderStateMapper;
         $this->currencyRepository = $currencyRepository;
         $this->orderAmountValidator = $orderAmountValidator;
+        $this->payPalOrderRepository = $payPalOrderRepository;
     }
 
     /**
      * {@inheritDoc}
      */
-    public function execute(PayPalOrderResponse $paypalOrder): ValidateOrderData
+    public function execute(PayPalOrderResponse $payPalOrderResponse): ValidateOrderData
     {
-        $fundingSource = $paypalOrder->getFundingSource();
+        $payPalOrder = $this->payPalOrderRepository->getOneBy(['id' => $payPalOrderResponse->getId()]);
+        $fundingSource = $payPalOrder->getFundingSource();
         $cart = $this->context->getCart();
 
         $paidAmount = '';
@@ -78,7 +87,7 @@ public function execute(PayPalOrderResponse $paypalOrder): ValidateOrderData
 
         $currencyId = (int) $this->context->getCart()->id_currency;
 
-        $capture = $paypalOrder->getCapture();
+        $capture = $payPalOrderResponse->getCapture();
 
         if ($capture) {
             $transactionId = $capture['id'];

core/src/Order/Action/CreateValidateOrderDataActionInterface.php

@@ -26,9 +26,9 @@
 interface CreateValidateOrderDataActionInterface
 {
     /**
-     * @param PayPalOrderResponse $paypalOrder
+     * @param PayPalOrderResponse $payPalOrderResponse
      *
      * @return ValidateOrderData
      */
-    public function execute(PayPalOrderResponse $paypalOrder): ValidateOrderData;
+    public function execute(PayPalOrderResponse $payPalOrderResponse): ValidateOrderData;
 }

ps17/config/front/process.yml

@@ -40,6 +40,7 @@ services:
       - '@PsCheckout\Core\OrderState\Service\OrderStateMapper'
       - '@PsCheckout\Infrastructure\Repository\CurrencyRepository'
       - '@PsCheckout\Core\Order\Validator\OrderAmountValidator'
+      - '@PsCheckout\Infrastructure\Repository\PayPalOrderRepository'
 
   PsCheckout\Core\Order\Action\ValidateOrderAction:
     class: PsCheckout\Core\Order\Action\ValidateOrderAction

ps8/config/front/process.yml

@@ -40,6 +40,7 @@ services:
       - '@PsCheckout\Core\OrderState\Service\OrderStateMapper'
       - '@PsCheckout\Infrastructure\Repository\CurrencyRepository'
       - '@PsCheckout\Core\Order\Validator\OrderAmountValidator'
+      - '@PsCheckout\Infrastructure\Repository\PayPalOrderRepository'
 
   PsCheckout\Core\Order\Action\ValidateOrderAction:
     class: PsCheckout\Core\Order\Action\ValidateOrderAction

ps9/config/front/process.yml

@@ -40,6 +40,7 @@ services:
       - '@PsCheckout\Core\OrderState\Service\OrderStateMapper'
       - '@PsCheckout\Infrastructure\Repository\CurrencyRepository'
       - '@PsCheckout\Core\Order\Validator\OrderAmountValidator'
+      - '@PsCheckout\Infrastructure\Repository\PayPalOrderRepository'
 
   PsCheckout\Core\Order\Action\ValidateOrderAction:
     class: PsCheckout\Core\Order\Action\ValidateOrderAction