WIP PAYSHIP-3135

PrestaShopCorp · Jan 24, 2025 · d4dc959 · d4dc959
1 parent 4c60aca
commit d4dc959
Show file tree

Hide file tree

Showing 5 changed files with 2,342 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -36,15 +36,16 @@
         "webmozart/assert": "^1.0"
     },
     "require-dev": {
+        "guzzlehttp/guzzle": "~5.0",
+        "monolog/monolog": "1.25.3",
         "phpunit/phpunit": "~5.7",
         "prestashop/php-dev-tools": "~3.0",
+        "psr/simple-cache": "^1.0",
         "symfony/cache": "^3.4",
         "symfony/config": "^3.4",
         "symfony/dependency-injection": "^3.4",
         "symfony/finder": "^3.4",
-        "symfony/options-resolver": "^3.4",
-        "guzzlehttp/guzzle": "~5.0",
-        "monolog/monolog": "1.25.3"
+        "symfony/options-resolver": "^3.4"
     },
     "autoload": {
         "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/config/command-handlers.yml b/config/command-handlers.yml
@@ -61,6 +61,7 @@ services:
       - '@PrestaShop\Module\PrestashopCheckout\Context\PrestaShopContext'
       - '@PrestaShop\Module\PrestashopCheckout\Repository\PayPalCustomerRepository'
       - '@PrestaShop\Module\PrestashopCheckout\Repository\PayPalOrderRepository'
+      - '@PrestaShop\Module\PrestashopCheckout\PayPal\PayPalConfiguration'
 
   PrestaShop\Module\PrestashopCheckout\Checkout\CommandHandler\SaveCheckoutCommandHandler:
     class: 'PrestaShop\Module\PrestashopCheckout\Checkout\CommandHandler\SaveCheckoutCommandHandler'

diff --git a/src/PayPal/Order/CommandHandler/CapturePayPalOrderCommandHandler.php b/src/PayPal/Order/CommandHandler/CapturePayPalOrderCommandHandler.php
@@ -21,7 +21,6 @@
 
 namespace PrestaShop\Module\PrestashopCheckout\PayPal\Order\CommandHandler;
 
-use Configuration;
 use PrestaShop\Module\PrestashopCheckout\Context\PrestaShopContext;
 use PrestaShop\Module\PrestashopCheckout\Customer\ValueObject\CustomerId;
 use PrestaShop\Module\PrestashopCheckout\Event\EventDispatcherInterface;
@@ -37,6 +36,7 @@
 use PrestaShop\Module\PrestashopCheckout\PayPal\Payment\Capture\Event\PayPalCapturePendingEvent;
 use PrestaShop\Module\PrestashopCheckout\PayPal\Payment\Capture\PayPalCaptureStatus;
 use PrestaShop\Module\PrestashopCheckout\PayPal\PaymentToken\Event\PaymentTokenCreatedEvent;
+use PrestaShop\Module\PrestashopCheckout\PayPal\PayPalConfiguration;
 use PrestaShop\Module\PrestashopCheckout\PayPalProcessorResponse;
 use PrestaShop\Module\PrestashopCheckout\Repository\PayPalCustomerRepository;
 use PrestaShop\Module\PrestashopCheckout\Repository\PayPalOrderRepository;
@@ -70,38 +70,32 @@ class CapturePayPalOrderCommandHandler
      * @var PayPalOrderRepository
      */
     private $payPalOrderRepository;
+    /**
+     * @var PayPalConfiguration
+     */
+    private $payPalConfiguration;
 
     public function __construct(
         MaaslandHttpClient $maaslandHttpClient,
         EventDispatcherInterface $eventDispatcher,
         CacheInterface $orderPayPalCache,
         PrestaShopContext $prestaShopContext,
         PayPalCustomerRepository $payPalCustomerRepository,
-        PayPalOrderRepository $payPalOrderRepository
+        PayPalOrderRepository $payPalOrderRepository,
+        PayPalConfiguration $payPalConfiguration
     ) {
         $this->maaslandHttpClient = $maaslandHttpClient;
         $this->eventDispatcher = $eventDispatcher;
         $this->orderPayPalCache = $orderPayPalCache;
         $this->prestaShopContext = $prestaShopContext;
         $this->payPalCustomerRepository = $payPalCustomerRepository;
         $this->payPalOrderRepository = $payPalOrderRepository;
+        $this->payPalConfiguration = $payPalConfiguration;
     }
 
     public function handle(CapturePayPalOrderCommand $capturePayPalOrderCommand)
     {
-        $merchantId = Configuration::get('PS_CHECKOUT_PAYPAL_ID_MERCHANT', null, null, $this->prestaShopContext->getShopId());
-
-        $payload = [
-            'mode' => $capturePayPalOrderCommand->getFundingSource(),
-            'orderId' => $capturePayPalOrderCommand->getOrderId()->getValue(),
-            'payee' => ['merchant_id' => $merchantId],
-        ];
-
-        $order = $this->payPalOrderRepository->getPayPalOrderById($capturePayPalOrderCommand->getOrderId());
-
-        if ($order->checkCustomerIntent(PayPalOrder::CUSTOMER_INTENT_USES_VAULTING)) {
-            $payload['vault'] = true;
-        }
+        $payload = $this->createCapturePayload($capturePayPalOrderCommand);
 
         $response = $this->maaslandHttpClient->captureOrder($payload);
 
@@ -136,7 +130,7 @@ public function handle(CapturePayPalOrderCommand $capturePayPalOrderCommand)
 
                 $this->eventDispatcher->dispatch(new PaymentTokenCreatedEvent(
                     $resource,
-                    $merchantId
+                    $this->payPalConfiguration->getMerchantId()
                 ));
             }
         }
@@ -175,4 +169,26 @@ public function handle(CapturePayPalOrderCommand $capturePayPalOrderCommand)
             throw new PsCheckoutException('PayPal declined the capture', PsCheckoutException::PAYPAL_PAYMENT_CAPTURE_DECLINED);
         }
     }
+
+    /**
+     * @param CapturePayPalOrderCommand $capturePayPalOrderCommand
+     *
+     * @return array
+     */
+    private function createCapturePayload(CapturePayPalOrderCommand $capturePayPalOrderCommand)
+    {
+        $payload = [
+            'mode' => $capturePayPalOrderCommand->getFundingSource(),
+            'orderId' => $capturePayPalOrderCommand->getOrderId()->getValue(),
+            'payee' => ['merchant_id' => $this->payPalConfiguration->getMerchantId()],
+        ];
+
+        $order = $this->payPalOrderRepository->getPayPalOrderById($capturePayPalOrderCommand->getOrderId());
+
+        if ($order->checkCustomerIntent(PayPalOrder::CUSTOMER_INTENT_USES_VAULTING)) {
+            $payload['vault'] = true;
+        }
+
+        return $payload;
+    }
 }