Updated PayPal order getters and removed PsCheckoutCart creation

PrestaShopCorp · Mar 7, 2024 · 1267349 · 1267349
1 parent 92dea79
commit 1267349
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/src/Entity/PayPalOrder.php b/src/Entity/PayPalOrder.php
@@ -215,7 +215,7 @@ public function setEnvironment($environment)
     /**
      * @return bool
      */
-    public function getIsCardFields()
+    public function isCardFields()
     {
         return $this->isCardFields;
     }
@@ -235,7 +235,7 @@ public function setIsCardFields($isCardFields)
     /**
      * @return bool
      */
-    public function getIsExpressCheckout()
+    public function isExpressCheckout()
     {
         return $this->isExpressCheckout;
     }

diff --git a/src/PayPal/Order/Event/PayPalOrderCreatedEvent.php b/src/PayPal/Order/Event/PayPalOrderCreatedEvent.php
@@ -34,13 +34,11 @@ class PayPalOrderCreatedEvent extends PayPalOrderEvent
     /**
      * @var bool
      */
-    private $isHostedFields;
-
+    private $isCardFields;
     /**
      * @var bool
      */
     private $isExpressCheckout;
-
     /**
      * @var string
      */
@@ -50,18 +48,18 @@ class PayPalOrderCreatedEvent extends PayPalOrderEvent
      * @param string $orderPayPalId
      * @param array $orderPayPal
      * @param int $cartId
-     * @param bool $isHostedFields
+     * @param bool $isCardFields
      * @param bool $isExpressCheckout
      * @param string $fundingSource
      *
      * @throws CartException
      * @throws PayPalOrderException
      */
-    public function __construct($orderPayPalId, $orderPayPal, $cartId, $isHostedFields, $isExpressCheckout, $fundingSource)
+    public function __construct($orderPayPalId, $orderPayPal, $cartId, $isCardFields, $isExpressCheckout, $fundingSource)
     {
         parent::__construct($orderPayPalId, $orderPayPal);
         $this->cartId = new CartId($cartId);
-        $this->isHostedFields = $isHostedFields;
+        $this->isCardFields = $isCardFields;
         $this->isExpressCheckout = $isExpressCheckout;
         $this->fundingSource = $fundingSource;
     }
@@ -77,9 +75,9 @@ public function getCartId()
     /**
      * @return bool
      */
-    public function isHostedFields()
+    public function isCardFields()
     {
-        return $this->isHostedFields;
+        return $this->isCardFields;
     }
 
     /**

diff --git a/src/PayPal/Order/EventSubscriber/PayPalOrderEventSubscriber.php b/src/PayPal/Order/EventSubscriber/PayPalOrderEventSubscriber.php
@@ -45,6 +45,7 @@
 use PrestaShop\Module\PrestashopCheckout\PayPal\PayPalConfiguration;
 use PrestaShop\Module\PrestashopCheckout\Repository\PayPalOrderRepository;
 use PrestaShop\Module\PrestashopCheckout\Repository\PsCheckoutCartRepository;
+use PrestaShop\PrestaShop\Core\Foundation\Database\EntityNotFoundException;
 use Ps_checkout;
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -149,13 +150,22 @@ public function saveCreatedPayPalOrder(PayPalOrderCreatedEvent $event)
     {
         $order = $event->getOrderPayPal();
 
+        try { // NOT SURE WHAT SHOULD HAPPEN IF ORDER WITH THAT ID ALREADY EXISTS
+            $payPalOrder = $this->payPalOrderRepository->getPayPalOrderById($event->getOrderPayPalId()->getValue());
+            $this->payPalOrderRepository->deletePayPalOrder($payPalOrder->getId());
+        } catch (EntityNotFoundException $e) {
+        }
+
         $payPalOrder = new PayPalOrder(
             $order['id'],
             $event->getCartId(),
             $order['intent'],
             array_keys($order['payment_source'])[0],
             $order['status'],
-            json_encode($order['payment_source'])
+            json_encode($order['payment_source']),
+            $this->payPalConfiguration->getPaymentMode(),
+            $event->isCardFields(),
+            $event->isExpressCheckout()
         );
 
         $this->payPalOrderRepository->createPayPalOrder($payPalOrder);
@@ -167,7 +177,7 @@ public function saveCreatedPayPalOrder(PayPalOrderCreatedEvent $event)
             $order['intent'],
             $event->getFundingSource(),
             $event->isExpressCheckout(),
-            $event->isHostedFields(),
+            $event->isCardFields(),
             $this->payPalConfiguration->getPaymentMode()
         ));
     }

diff --git a/src/Repository/PayPalOrderRepository.php b/src/Repository/PayPalOrderRepository.php
@@ -66,8 +66,8 @@ public function createPayPalOrder(PayPalOrder $payPalOrder)
                 'status' => pSQL($payPalOrder->getStatus()),
                 'payment_source' => pSQL($payPalOrder->getPaymentSource()),
                 'environment' => pSQL($payPalOrder->getEnvironment()),
-                'is_card_fields' => $payPalOrder->getIsCardFields(),
-                'is_express_checkout' => $payPalOrder->getIsExpressCheckout(),
+                'is_card_fields' => $payPalOrder->isCardFields(),
+                'is_express_checkout' => $payPalOrder->isExpressCheckout(),
             ]
         );
     }
@@ -127,8 +127,8 @@ public function updatePayPalOrder(PayPalOrder $payPalOrder)
                 'funding_source' => pSQL($payPalOrder->getFundingSource()),
                 'status' => pSQL($payPalOrder->getStatus()),
                 'payment_source' => pSQL($payPalOrder->getPaymentSource()),
-                'is_card_fields' => $payPalOrder->getIsCardFields(),
-                'is_express_checkout' => $payPalOrder->getIsExpressCheckout(),
+                'is_card_fields' => $payPalOrder->isCardFields(),
+                'is_express_checkout' => $payPalOrder->isExpressCheckout(),
             ],
             '`id` = ' . pSQL($payPalOrder->getId())
         );