capture strategies (direct, manual, upon delivery) support

Author: sosenx

out/src/js/paypal-dev.js

@@ -17,7 +17,6 @@
         }
 
         this.setCreatePayPalOrderResponse = function (response) {
-            debugger
             if (null !== this.currentOrder.paypal) {
                 //some order is currently ...
                 //@TODO check if this part is needed. Its the case that pay button is clicked twice (maybe its impossible)
@@ -171,6 +170,17 @@
             window.location = PayPalPayment.getConfigValue('shopThankYouPageUrl');
         }
 
+        this.handlePaymentAuthorization = async function (details) {
+            PayPalPayment.setCreatePayPalOrderResponse(details);
+            const {paypalOrderDetails} = await PayPalPayment.patchOrder(details);
+
+            if (paypalOrderDetails?.payment_source) {
+                await PayPalPayment.vaultPayment(paypalOrderDetails);
+            }
+
+            window.location = PayPalPayment.getConfigValue('shopThankYouPageUrl');
+        }
+
         this.captureOrder = async function (data, actions) {
             PayPalPayment.setCreatePayPalOrderResponse(data);
             return actions.order.capture().then(await PayPalPayment.afterCaptureOrder);
@@ -189,10 +199,6 @@
             window.location = PayPalPayment.getConfigValue('shopOrderErrorUrl');
         }
 
-        this.handlePaymentAuthorization = function (details) {
-            debugger
-        }
-
         this.renderButton = function () {
             let button = paypal.Buttons(PayPalPayment.getPayButtonSettings());
 
@@ -210,15 +216,15 @@
                 onError: PayPalPayment.handleError
             };
 
-            if (PayPalPayment.config.captureStrategy === 'directly'){
+            if (PayPalPayment.config.captureStrategy === 'CAPTURE'){
                 buttonSettings.onApprove = PayPalPayment.captureOrder;
             }
 
             return buttonSettings;
         }
 
-        this.backendRequest = async function (url, headers, body) {
-            let response = await fetch(PayPalPayment.getConfigValue(url), {
+        this.backendRequest = async function (urlSlug, headers, body) {
+            let response = await fetch(PayPalPayment.getConfigValue(urlSlug), {
                 method: 'post',
                 headers: Object.assign({
                     'content-type': 'application/json',

src/Controller/AjaxPaymentController.php

@@ -13,6 +13,7 @@
 use OxidEsales\EshopCommunity\Application\Model\User;
 use OxidEsales\EshopCommunity\Core\Field;
 use OxidSolutionCatalysts\PayPal\Model\PayPalOrder;
+use OxidSolutionCatalysts\PayPal\Service\ModuleSettings;
 use OxidSolutionCatalysts\PayPal\Service\Payment as PaymentService;
 use OxidSolutionCatalysts\PayPal\Traits\JsonTrait;
 use OxidSolutionCatalysts\PayPal\Traits\ServiceContainer;
@@ -69,6 +70,7 @@ public function patchShopOrder(): void
         $cancelSession = !$sessionShopOrderId || $shopOrderId !== $sessionShopOrderId;
 
         $paymentService = $this->getServiceFromContainer(PaymentService::class);
+        $moduleSettings = $this->getServiceFromContainer(ModuleSettings::class);
 
         /** @var \OxidEsales\EshopCommunity\Application\Model\User $oUser */
         $oUser = oxNew(User::class);
@@ -87,18 +89,36 @@ public function patchShopOrder(): void
         $paymentsId = (string) $oOrder->getFieldData('oxpaymenttype');
         /** @var PayPalApiOrder $payPalOrder */
         $payPalOrder = $paymentService->fetchOrderFields($payPalOrderId, '');
-        if ($oOrder->isPayPalOrderCompleted($payPalOrder)) {
-            $oOrder->markOrderPaid();
-            $transactionId = (string)$payPalOrder->purchase_units[0]->payments->captures[0]->id;
-            $oOrder->setTransId($transactionId);
-            $paymentService->trackPayPalOrder(
-                $shopOrderId,
-                $payPalOrderId,
-                $paymentsId,
-                PayPalApiOrder::STATUS_COMPLETED,
-                $transactionId
-            );
-        } else {
+        $captureStrategy = $moduleSettings->getPayPalStandardCaptureStrategy();
+
+        try {
+            if ($captureStrategy === 'directly'){
+                if ($oOrder->isPayPalOrderCompleted($payPalOrder)) {
+                    $oOrder->markOrderPaid();
+                    $transactionId = (string)$payPalOrder->purchase_units[0]->payments->captures[0]->id;
+                    $oOrder->setTransId($transactionId);
+                    $paymentService->trackPayPalOrder(
+                        $shopOrderId,
+                        $payPalOrderId,
+                        $paymentsId,
+                        PayPalApiOrder::STATUS_COMPLETED,
+                        $transactionId
+                    );
+                }
+            }
+
+            //capture after shipment or manual
+            if ($captureStrategy !== 'directly'){
+                $oOrder->setOrderStatus('NOT_FINISHED');
+                //prepare capture tracking
+                $paymentService->trackPayPalOrder(
+                    $oOrder->getId(),
+                    $payPalOrderId,
+                    $paymentsId,
+                    PayPalApiOrder::STATUS_APPROVED
+                );
+            }
+        } catch (\Exception $e){
             $this->outputJson([
                 'status' => 'error',
                 'message' => 'Order completion error.', //@TODO improve errors messages

src/Model/Order.php

@@ -564,6 +564,11 @@ public function setOrderNumber(): void
         }
     }
 
+    public function setOrderStatus($sStatus): void
+    {
+        $this->_setOrderStatus($sStatus);
+    }
+
     public function isOrderFinished(): bool
     {
         return 'OK' === $this->getFieldData('oxtransstatus');