[PAYSHIP-3046] Order capture retry

controllers/front/payment.php

@@ -100,8 +100,10 @@ public function postProcess()
                 $this->redirectToOrderPage();
             }
 
+            $payPalOrderQuery = new GetPayPalOrderForCheckoutCompletedQuery($orderId);
+
             /** @var GetPayPalOrderForCheckoutCompletedQueryResult $payPalOrderQueryResult */
-            $payPalOrderQueryResult = $commandBus->handle(new GetPayPalOrderForCheckoutCompletedQuery($this->paypalOrderId->getValue()));
+            $payPalOrderQueryResult = $commandBus->handle($payPalOrderQuery);
             $payPalOrderFromCache = $payPalOrderQueryResult->getPayPalOrder();
 
             if ($payPalOrderFromCache['status'] === 'COMPLETED') {
@@ -120,8 +122,8 @@ public function postProcess()
                         $this->redirectTo3DSVerification($payPalOrderFromCache);
                         break;
                     case Card3DSecure::PROCEED:
-                        $commandBus->handle(new CapturePayPalOrderCommand($this->paypalOrderId->getValue(), array_keys($payPalOrderFromCache['payment_source'])[0]));
-                        $payPalOrderFromCache = $payPalOrderCache->get($this->paypalOrderId->getValue());
+                        $commandBus->handle(new CapturePayPalOrderCommand($orderId, array_keys($payPalOrderFromCache['payment_source'])[0]));
+                        $payPalOrderFromCache = $payPalOrderCache->get($orderId);
                         $this->createOrder($payPalOrderFromCache, $payPalOrder);
                         break;
                     case Card3DSecure::NO_DECISION:
@@ -131,8 +133,8 @@ public function postProcess()
             }
 
             if ($payPalOrderFromCache['status'] === 'APPROVED') {
-                $commandBus->handle(new CapturePayPalOrderCommand($this->paypalOrderId->getValue(), array_keys($payPalOrderFromCache['payment_source'])[0]));
-                $payPalOrderFromCache = $payPalOrderCache->get($this->paypalOrderId->getValue());
+                $commandBus->handle(new CapturePayPalOrderCommand($orderId, array_keys($payPalOrderFromCache['payment_source'])[0]));
+                $payPalOrderFromCache = $payPalOrderCache->get($orderId);
                 $this->createOrder($payPalOrderFromCache, $payPalOrder);
             }
         } catch (Exception $exception) {

controllers/front/validate.php

@@ -148,7 +148,7 @@ private function generateResponse()
             }
 
             $response = [
-                'status' => $psCheckoutCart->paypal_status, // Need to change this to get the status from PayPal Order instead?
+                'status' => $psCheckoutCart->paypal_status,
                 'paypalOrderId' => $psCheckoutCart->paypal_order,
                 'transactionIdentifier' => $paypalOrder && isset($paypalOrder->getOrderPayPal()['purchase_units'][0]['payments']['captures'][0]) ? $paypalOrder->getOrderPayPal()['purchase_units'][0]['payments']['captures'][0]['id'] : null,
             ];

src/Checkout/EventSubscriber/CheckoutEventSubscriber.php

@@ -122,9 +122,11 @@ public function updatePaymentMethodSelected(CheckoutCompletedEvent $event)
      */
     public function proceedToPayment(CheckoutCompletedEvent $event)
     {
+        $payPalOrderId = $event->getPayPalOrderId()->getValue();
+
         /** @var GetPayPalOrderForCheckoutCompletedQueryResult $getPayPalOrderForCheckoutCompletedQueryResult */
         $getPayPalOrderForCheckoutCompletedQueryResult = $this->commandBus->handle(new GetPayPalOrderForCheckoutCompletedQuery(
-            $event->getPayPalOrderId()->getValue()
+            $payPalOrderId
         ));
 
         $payPalOrder = $getPayPalOrderForCheckoutCompletedQueryResult->getPayPalOrder();
@@ -134,7 +136,7 @@ public function proceedToPayment(CheckoutCompletedEvent $event)
         } catch (PsCheckoutException $exception) {
             if ($exception->getCode() === PsCheckoutException::PAYPAL_ORDER_ALREADY_CAPTURED) {
                 $capture = isset($payPalOrder['purchase_units'][0]['payments']['captures'][0]) ? $payPalOrder['purchase_units'][0]['payments']['captures'][0] : null;
-                $this->commandBus->handle(new CreateOrderCommand($event->getPayPalOrderId()->getValue(), $capture));
+                $this->commandBus->handle(new CreateOrderCommand($payPalOrderId, $capture));
 
                 return;
             } else {
@@ -145,17 +147,17 @@ public function proceedToPayment(CheckoutCompletedEvent $event)
         try {
             $this->commandBus->handle(
                 new CapturePayPalOrderCommand(
-                    $event->getPayPalOrderId()->getValue(),
+                    $payPalOrderId,
                     $event->getFundingSource()
                 )
             );
         } catch (PayPalException $exception) {
             if ($exception->getCode() === PayPalException::ORDER_NOT_APPROVED) {
-                $this->commandBus->handle(new CreateOrderCommand($event->getPayPalOrderId()->getValue()));
+                $this->commandBus->handle(new CreateOrderCommand($payPalOrderId));
 
                 return;
             } elseif ($exception->getCode() === PayPalException::RESOURCE_NOT_FOUND) {
-                $psCheckoutCart = $this->psCheckoutCartRepository->findOneByPayPalOrderId($event->getPayPalOrderId()->getValue());
+                $psCheckoutCart = $this->psCheckoutCartRepository->findOneByPayPalOrderId($payPalOrderId);
 
                 if (Validate::isLoadedObject($psCheckoutCart)) {
                     $psCheckoutCart->paypal_status = PsCheckoutCart::STATUS_CANCELED;
@@ -167,14 +169,14 @@ public function proceedToPayment(CheckoutCompletedEvent $event)
                 if (isset($payPalOrder['purchase_units'][0]['payments']['captures'][0])) {
                     $capture = $payPalOrder['purchase_units'][0]['payments']['captures'][0];
                 } else {
+                    $payPalOrderQuery = new GetPayPalOrderForCheckoutCompletedQuery($payPalOrderId);
+
                     /** @var GetPayPalOrderForCheckoutCompletedQueryResult $getPayPalOrderForCheckoutCompletedQueryResult */
-                    $getPayPalOrderForCheckoutCompletedQueryResult = $this->commandBus->handle(new GetPayPalOrderForCheckoutCompletedQuery(
-                        $event->getPayPalOrderId()->getValue()
-                    ));
+                    $getPayPalOrderForCheckoutCompletedQueryResult = $this->commandBus->handle($payPalOrderQuery);
                     $payPalOrder = $getPayPalOrderForCheckoutCompletedQueryResult->getPayPalOrder();
                     $capture = isset($payPalOrder['purchase_units'][0]['payments']['captures'][0]) ? $payPalOrder['purchase_units'][0]['payments']['captures'][0] : null;
                 }
-                $this->commandBus->handle(new CreateOrderCommand($event->getPayPalOrderId()->getValue(), $capture));
+                $this->commandBus->handle(new CreateOrderCommand($payPalOrderId, $capture));
 
                 return;
             } else {

src/PayPal/Order/Cache/PayPalOrderCache.php

@@ -22,6 +22,7 @@
 namespace PrestaShop\Module\PrestashopCheckout\PayPal\Order\Cache;
 
 use PsCheckoutCart;
+use Psr\SimpleCache\InvalidArgumentException;
 use Symfony\Component\Cache\Simple\ChainCache;
 
 class PayPalOrderCache extends ChainCache
@@ -36,7 +37,16 @@
         PsCheckoutCart::STATUS_COMPLETED => 3600,
     ];
 
+    /**
+     * @param string $key
+     * @param $value
+     * @param int $ttl Time To Live in seconds. Defines how long the value will be stored in the cache.
+     *
+     * @return bool
+     *
+     * @throws InvalidArgumentException
+     */
     public function set($key, $value, $ttl = null)
     {
         if (!$ttl && isset($value['status']) && isset(self::CACHE_TTL[$value['status']])) {
             $ttl = self::CACHE_TTL[$value['status']];

src/PayPal/Order/PaypalOrderDataProvider.php

@@ -158,10 +158,12 @@ public function isTokenSaved()
 
     public function getPaymentTokenIdentifier()
     {
-        if ($this->payPalOrder && isset($this->payPalOrder->getPaymentSource()[$this->payPalOrder->getFundingSource()])) {
-            $paymentSource = $this->payPalOrder->getPaymentSource()[$this->payPalOrder->getFundingSource()];
+        $fundingSource = $this->payPalOrder->getFundingSource();
+
+        if ($this->payPalOrder && isset($this->payPalOrder->getPaymentSource()[$fundingSource])) {
+            $paymentSource = $this->payPalOrder->getPaymentSource()[$fundingSource];
 
-            if ($this->payPalOrder->getFundingSource() === 'card') {
+            if ($fundingSource === 'card') {
                 return (isset($paymentSource['brand']) ? $paymentSource['brand'] : '') . (isset($paymentSource['last_digits']) ? ' *' . $paymentSource['last_digits'] : '');
             } else {
                 return isset($paymentSource['email_address']) ? $paymentSource['email_address'] : '';

src/PayPal/Order/QueryHandler/GetPayPalOrderForCheckoutCompletedQueryHandler.php

@@ -46,25 +46,27 @@ public function __construct(CacheInterface $orderPayPalCache)
 
     public function handle(GetPayPalOrderForCheckoutCompletedQuery $getPayPalOrderQuery)
     {
+        $payPalOrderId = $getPayPalOrderQuery->getOrderPayPalId()->getValue();
+
         /** @var array{id: string, status: string} $order */
-        $order = $this->orderPayPalCache->get($getPayPalOrderQuery->getOrderPayPalId()->getValue());
+        $order = $this->orderPayPalCache->get($payPalOrderId);
 
         if (!empty($order) && in_array($order['status'], ['COMPLETED', 'CANCELED'])) {
             return new GetPayPalOrderForCheckoutCompletedQueryResult($order);
         }
 
         try {
-            $orderPayPal = new PaypalOrder($getPayPalOrderQuery->getOrderPayPalId()->getValue());
+            $orderPayPal = new PaypalOrder($payPalOrderId);
             $orderToStoreInCache = !empty($order) ? array_replace_recursive($order, $orderPayPal->getOrder()) : $orderPayPal->getOrder();
-            $this->orderPayPalCache->set($getPayPalOrderQuery->getOrderPayPalId()->getValue(), $orderToStoreInCache);
+            $this->orderPayPalCache->set($payPalOrderId, $orderToStoreInCache);
         } catch (HttpTimeoutException $exception) {
             throw $exception;
         } catch (Exception $exception) {
-            throw new PayPalOrderException(sprintf('Unable to retrieve PayPal Order %s', $getPayPalOrderQuery->getOrderPayPalId()->getValue()), PayPalOrderException::CANNOT_RETRIEVE_ORDER, $exception);
+            throw new PayPalOrderException(sprintf('Unable to retrieve PayPal Order %s', $payPalOrderId), PayPalOrderException::CANNOT_RETRIEVE_ORDER, $exception);
         }
 
         if (!$orderPayPal->isLoaded()) {
-            throw new PayPalOrderException(sprintf('No data for PayPal Order %s', $getPayPalOrderQuery->getOrderPayPalId()->getValue()), PayPalOrderException::EMPTY_ORDER_DATA);
+            throw new PayPalOrderException(sprintf('No data for PayPal Order %s', $payPalOrderId), PayPalOrderException::EMPTY_ORDER_DATA);
         }
 
         return new GetPayPalOrderForCheckoutCompletedQueryResult($orderPayPal->getOrder());