Merge commit from fork

Release 3.18.1

Author: clotairer

202/build.xml

@@ -32,7 +32,7 @@
     <property name="src-dir" value="${basedir}" />
     <property name="TARGETNAME" value="paypal" />
     <property name="TARGETBRANCH" value="${env.GIT_BRANCH}" />
-    <property name="TARGETVERSION" value="3.18.0" />
+    <property name="TARGETVERSION" value="3.18.1" />
     <property name="PHPVERSION" value="5.6" />
 
     <target name="build" depends="build-common,package-zip,psvalidator" />

controllers/front/validateBnpl.php

@@ -61,13 +61,37 @@ public function initContent()
             return;
         }
 
-        $transaction = $this->getTransactionFromRequest();
+        $input = Tools::getValue('paymentData', '');
+
+        if (is_string($input)) {
+            $input = json_decode($input, true);
+        }
+
         $cart = $this->context->cart;
 
+        if (empty($input['orderID']) || !$this->validateOrderID($input['orderID'])) {
+            return $this->redirectToErrorPage(new Exception('Payment data is not valid.'));
+        }
+        if (false === Validate::isLoadedObject($cart)) {
+            return $this->redirectToErrorPage(new Exception('Cart is not valid.'));
+        }
+
+        $response = $this->client->execute(new OrdersCaptureRequest($input['orderID']));
+
+        if ($response->getCode() > 299 || $response->getCode() < 200) {
+            return $this->redirectToErrorPage(new Exception('Capture is failed.'));
+        }
+
+        if ($response instanceof HttpJsonResponse) {
+            $transaction = $this->preapreTransaction($response->toArray());
+        } else {
+            $transaction = $this->preapreTransaction([]);
+        }
+
         try {
             $this->module->validateOrder(
                 $cart->id,
-                $this->getIdOrderState(),
+                $this->getIdOrderState($transaction->getPaymentStatus()),
                 $transaction->getTotalPaid(),
                 $this->module->displayName,
                 $this->module->l('Payment accepted.'),
@@ -91,16 +115,14 @@ public function initContent()
         Tools::redirect('index.php?' . http_build_query($queryParams));
     }
 
-    protected function getTransactionFromRequest()
+    protected function preapreTransaction($paymentData)
     {
         $transaction = new Transaction();
 
-        if (empty(Tools::getValue('paymentData'))) {
+        if (empty($paymentData)) {
             return $transaction;
         }
 
-        $paymentData = json_decode(Tools::getValue('paymentData'), true);
-
         if (false === empty($paymentData['purchase_units'][0]['payments']['captures'][0]['id'])) {
             $transaction->setIdTransaction($paymentData['purchase_units'][0]['payments']['captures'][0]['id']);
         }
@@ -128,9 +150,13 @@ protected function getTransactionFromRequest()
         return $transaction;
     }
 
-    protected function getIdOrderState()
+    protected function getIdOrderState($paymentStatus = PayPal::CAPTURE_STATUS_COMPLETED)
     {
-        return (int) Configuration::get('PS_OS_PAYMENT');
+        if ($paymentStatus === PayPal::CAPTURE_STATUS_COMPLETED) {
+            return (int) Configuration::get('PS_OS_PAYMENT');
+        }
+
+        return (int) Configuration::get('PS_OS_PAYPAL');
     }
 
     protected function redirectToErrorPage($e)
@@ -172,39 +198,13 @@ public function displayAjaxCreateOrder()
         die(json_encode($return));
     }
 
-    public function displayAjaxCaptureOrder()
+    protected function validateOrderID($orderID)
     {
-        $order = json_decode(Tools::getValue('order'), true);
-        $return = [
-            'success' => false,
-        ];
-
-        if ($this->validateOrderID($order)) {
-            $response = $this->client->execute(new OrdersCaptureRequest($order['orderID']));
-
-            if ($response->getCode() < 300 && $response->getCode() > 199) {
-                $return['success'] = true;
-
-                if ($response instanceof HttpJsonResponse) {
-                    $return = array_merge($return, $response->toArray());
-                }
-            }
-        }
-
-        die(json_encode($return));
-    }
-
-    protected function validateOrderID($order)
-    {
-        if (empty($order['orderID'])) {
-            return false;
-        }
-
-        if (Validate::isCleanHtml($order['orderID']) === false) {
+        if (Validate::isCleanHtml($orderID) === false) {
             return false;
         }
 
-        if (mb_strlen($order['orderID']) > 36) {
+        if (mb_strlen($orderID) > 36) {
             return false;
         }
 

paypal.php

@@ -82,6 +82,7 @@
 
 class PayPal extends PaymentModule
 {
+    const CAPTURE_STATUS_COMPLETED = 'COMPLETED';
     protected $_html = '';
     public $_errors = [];
     public $context;

views/js/bnpl.js

@@ -49,12 +49,7 @@ BNPL.prototype.render = function (container, order, onIsNotEligible) {
         }.bind(this),
 
         onApprove: function(data, actions) {
-            return this.captureOrder(data)
-                .then(function(detail) {
-                    if (detail.success) {
-                        this.validateOrder(detail);
-                    }
-                }.bind(this))
+            return this.validateOrder(data)
         }.bind(this)
     });
 
@@ -89,23 +84,6 @@ BNPL.prototype.getIdOrder = function() {
         });
 }
 
-BNPL.prototype.captureOrder = function(data) {
-    if (this.validationController === null) {
-        return;
-    }
-
-    var url = new URL(this.validationController);
-    var form = new FormData();
-    url.searchParams.append('ajax', '1');
-    url.searchParams.append('action', 'CaptureOrder');
-    form.append('order', JSON.stringify(data));
-
-    return fetch(url, {method: 'POST', body: form})
-        .then(function(response) {
-            return response.json();
-        });
-}
-
 BNPL.prototype.validateOrder = function(detail) {
     if (this.validationController === null) {
         return;