Merge pull request #1195 from PrestaShopCorp/release/v6.3.6.0

Release/v6.3.6.0
PrestaShopCorp · Mar 6, 2024 · 73f8d15 · 73f8d15
2 parents 55f4d8a + 7e41c66
commit 73f8d15
Show file tree

Hide file tree

Showing 146 changed files with 16,534 additions and 18,675 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -6,6 +6,7 @@ $config
     ->setUsingCache(true)
     ->getFinder()
     ->in(__DIR__)
+    ->exclude('_dev')
     ->exclude('vendor');
 
 return $config;
diff --git a/_dev/js/front/package-lock.json b/_dev/js/front/package-lock.json
diff --git a/_dev/js/front/package.json b/_dev/js/front/package.json
@@ -33,6 +33,7 @@
     "webpack-merge": "^5.3.0"
   },
   "dependencies": {
+    "@paypal/paypal-js": "^8.0.0",
     "@ungap/event-target": "^0.2.2",
     "classlist-polyfill": "^1.2.0",
     "promise-polyfill": "8.1.3",

diff --git a/_dev/js/front/src/api/ps-checkout.api.js b/_dev/js/front/src/api/ps-checkout.api.js
@@ -20,7 +20,8 @@ import { BaseClass } from '../core/dependency-injection/base.class';
 
 export class PsCheckoutApi extends BaseClass {
   static Inject = {
-    config: 'PsCheckoutConfig'
+    config: 'PsCheckoutConfig',
+    $: '$'
   };
 
   postCancelOrder(data) {
@@ -42,11 +43,11 @@ export class PsCheckoutApi extends BaseClass {
           return response.json().then((response) => {
             throw response.body && response.body.error
               ? response.body.error
-              : { message: 'Unknown error' };
+              : { message: this.$('checkout.form.error.label') };
           });
         }
 
-        throw new Error('Invalid response');
+        throw new Error(this.$('checkout.form.error.label'));
       }
     });
   }
@@ -72,14 +73,14 @@ export class PsCheckoutApi extends BaseClass {
                 return response.json().then((response) => {
                   throw response.body && response.body.error
                     ? response.body.error
-                    : { message: 'Unknown error' };
+                    : { message: this.$('checkout.form.error.label') };
                 });
               }
 
               return response.json();
             }
 
-            throw new Error('Invalid response');
+            throw new Error(this.$('checkout.form.error.label'));
           })
           .then((data) => {
             if (!data) {
@@ -111,60 +112,22 @@ export class PsCheckoutApi extends BaseClass {
           contentType && contentType.indexOf('application/json') !== -1;
 
         if (isJsonResponse) {
-          if (false === response.ok) {
+          if (false === response.ok || response.status >= 400) {
             return response.json().then((response) => {
               throw response.body && response.body.error
                 ? response.body.error
-                : { message: 'Unknown error' };
+                : { message: this.$('checkout.form.error.label') };
             });
           }
 
           return response.json();
         }
 
-        throw new Error('Invalid response');
+        throw new Error(this.$('checkout.form.error.label'));
       })
       .then(({ body: { orderID } }) => orderID);
   }
 
-  getGetToken() {
-    return (
-      fetch(this.config.getTokenUrl, {
-        method: 'get',
-        credentials: 'same-origin',
-        headers: {
-          'Content-Type': 'application/json',
-          Accept: 'application/json'
-        }
-      })
-        .then((response) => {
-          const contentType = response.headers.get('content-type');
-          const isJsonResponse =
-            contentType && contentType.indexOf('application/json') !== -1;
-
-          if (isJsonResponse) {
-            if (false === response.ok) {
-              return response.json().then((response) => {
-                throw response.body && response.body.error
-                  ? response.body.error
-                  : { message: 'Unknown error' };
-              });
-            }
-
-            return response.json();
-          }
-
-          throw new Error('Invalid response');
-        })
-        .then(({ body: { token } }) => {
-          window.ps_checkoutPayPalClientToken = token;
-          return token;
-        })
-        // TODO: Handle error
-        .catch(() => {})
-    );
-  }
-
   postValidateOrder(data, actions) {
     return fetch(this.config.validateOrderUrl, {
       method: 'post',
@@ -181,18 +144,22 @@ export class PsCheckoutApi extends BaseClass {
           contentType && contentType.indexOf('application/json') !== -1;
 
         if (isJsonResponse) {
-          if (false === response.ok) {
+          if (false === response.ok || response.status >= 400) {
             return response.json().then((response) => {
+              if (actions?.restart && response.body && 85 === response.body.error.code) {
+                return actions.restart();
+              }
+
               throw response.body && response.body.error
                 ? response.body.error
-                : { message: 'Unknown error' };
+                : { message: this.$('checkout.form.error.label') };
             });
           }
 
           return response.json();
         }
 
-        throw new Error('Invalid response');
+        throw new Error(this.$('checkout.form.error.label'));
       })
       .then((response) => {
         if (response.body && response.body.id_order) {
@@ -218,10 +185,6 @@ export class PsCheckoutApi extends BaseClass {
 
           window.location.href = confirmationUrl.toString();
         }
-
-        if (response.error && 'INSTRUMENT_DECLINED' === response.error) {
-          return actions.restart();
-        }
       });
   }
 
@@ -247,11 +210,11 @@ export class PsCheckoutApi extends BaseClass {
           contentType && contentType.indexOf('application/json') !== -1;
 
         if (isJsonResponse) {
-          if (false === response.ok) {
+          if (false === response.ok || response.status >= 400) {
             return response.json().then((response) => {
               throw response.body && response.body.error
                 ? response.body.error
-                : { message: 'Unknown error' };
+                : { message: this.$('checkout.form.error.label') };
             });
           }
 
@@ -260,7 +223,7 @@ export class PsCheckoutApi extends BaseClass {
           ).toString();
         }
 
-        throw new Error('Invalid response');
+        throw new Error(this.$('checkout.form.error.label'));
       })
     );
   }

diff --git a/_dev/js/front/src/components/1_6/express-button-cart.component.js b/_dev/js/front/src/components/1_6/express-button-cart.component.js
@@ -28,7 +28,8 @@ export class ExpressButtonCartComponent extends BaseComponent {
   };
 
   created() {
-    this.buttonReferenceContainer = this.querySelectorService.getExpressCheckoutButtonContainerCart();
+    this.buttonReferenceContainer =
+      this.querySelectorService.getExpressCheckoutButtonContainerCart();
   }
 
   renderComponent() {
@@ -50,14 +51,7 @@ export class ExpressButtonCartComponent extends BaseComponent {
       this.app,
       {
         fundingSource: 'paypal',
-        // TODO: Move this to constant when ExpressCheckoutButton component is created
-        querySelector: '#ps_checkout-express-button-cart',
-        createOrder: (data) =>
-          this.psCheckoutApi.postCreateOrder({
-            ...data,
-            fundingSource: 'paypal',
-            isExpressCheckout: true
-          })
+        querySelector: '#ps_checkout-express-button-cart'
       }
     ).render();
   }
@@ -67,9 +61,9 @@ export class ExpressButtonCartComponent extends BaseComponent {
 
     this.renderComponent();
     this.prestashopService.onUpdatedShoppingCartExtra(() => {
-        if (null === document.querySelector('#ps_checkout-express-button-cart')) {
-          this.renderComponent();
-        }
+      if (null === document.querySelector('#ps_checkout-express-button-cart')) {
+        this.renderComponent();
+      }
     });
 
     return this;

diff --git a/_dev/js/front/src/components/1_6/express-button-checkout.component.js b/_dev/js/front/src/components/1_6/express-button-checkout.component.js
@@ -28,7 +28,8 @@ export class ExpressButtonCheckoutComponent extends BaseComponent {
   };
 
   created() {
-    this.buttonReferenceContainer = this.querySelectorService.getExpressCheckoutButtonContainerCheckout();
+    this.buttonReferenceContainer =
+      this.querySelectorService.getExpressCheckoutButtonContainerCheckout();
   }
 
   renderTitle() {
@@ -53,13 +54,7 @@ export class ExpressButtonCheckoutComponent extends BaseComponent {
       this.app,
       {
         fundingSource: 'paypal',
-        querySelector: '#ps_checkout-express-button-checkout',
-        createOrder: (data) =>
-          this.psCheckoutApi.postCreateOrder({
-            ...data,
-            fundingSource: 'paypal',
-            isExpressCheckout: true
-          })
+        querySelector: '#ps_checkout-express-button-checkout'
       }
     ).render();
 

diff --git a/_dev/js/front/src/components/1_6/express-button-product.component.js b/_dev/js/front/src/components/1_6/express-button-product.component.js
@@ -27,7 +27,8 @@ export class ExpressButtonProductComponent extends BaseComponent {
   };
 
   created() {
-    this.buttonReferenceContainer = this.querySelectorService.getExpressCheckoutButtonContainerProduct();
+    this.buttonReferenceContainer =
+      this.querySelectorService.getExpressCheckoutButtonContainerProduct();
   }
 
   render() {
@@ -42,28 +43,23 @@ export class ExpressButtonProductComponent extends BaseComponent {
 
     buttonContainer.append(this.checkoutExpressButton);
 
+    const {
+      id_product,
+      id_product_attribute,
+      id_customization,
+      quantity_wanted
+    } = this.prestashopService.getProductDetails();
+
     this.children.expressCheckoutButton = new ExpressCheckoutButtonComponent(
       this.app,
       {
         fundingSource: 'paypal',
-        // TODO: Move this to constant when ExpressCheckoutButton component is created
         querySelector: '#ps-checkout-express-button',
-        createOrder: () => {
-          const {
-            id_product,
-            id_product_attribute,
-            id_customization,
-            quantity_wanted
-          } = this.prestashopService.getProductDetails();
-
-          return this.psCheckoutApi.postCreateOrder({
-            id_product,
-            id_product_attribute,
-            id_customization,
-            quantity_wanted,
-            fundingSource: 'paypal',
-            isExpressCheckout: true
-          });
+        data: {
+          id_product,
+          id_product_attribute,
+          id_customization,
+          quantity_wanted
         }
       }
     ).render();

diff --git a/_dev/js/front/src/components/1_6/pay-later-button-cart.component.js b/_dev/js/front/src/components/1_6/pay-later-button-cart.component.js
@@ -24,11 +24,14 @@ export class PayLaterButtonCartComponent extends BaseComponent {
     querySelectorService: 'QuerySelectorService',
     prestashopService: 'PrestashopService',
     psCheckoutApi: 'PsCheckoutApi',
+    payPalService: 'PayPalService',
     $: '$'
   };
 
   created() {
-    this.buttonReferenceContainer = this.querySelectorService.getExpressCheckoutButtonContainerCart();
+    this.buttonReferenceContainer =
+      this.querySelectorService.getExpressCheckoutButtonContainerCart();
+    this.data.orderId = this.payPalService.getOrderId();
   }
 
   renderComponent() {
@@ -52,14 +55,7 @@ export class PayLaterButtonCartComponent extends BaseComponent {
       this.app,
       {
         fundingSource: 'paylater',
-        // TODO: Move this to constant when ExpressCheckoutButton component is created
-        querySelector: '#ps_checkout-express-button-cart',
-        createOrder: (data) =>
-          this.psCheckoutApi.postCreateOrder({
-            ...data,
-            fundingSource: 'paylater',
-            isExpressCheckout: true
-          })
+        querySelector: '#ps_checkout-express-button-cart'
       }
     ).render();
   }

diff --git a/_dev/js/front/src/components/1_6/pay-later-button-checkout.component.js b/_dev/js/front/src/components/1_6/pay-later-button-checkout.component.js
@@ -24,11 +24,14 @@ export class PayLaterButtonCheckoutComponent extends BaseComponent {
     querySelectorService: 'QuerySelectorService',
     prestashopService: 'PrestashopService',
     psCheckoutApi: 'PsCheckoutApi',
+    payPalService: 'PayPalService',
     $: '$'
   };
 
   created() {
-    this.buttonReferenceContainer = this.querySelectorService.getExpressCheckoutButtonContainerCheckout();
+    this.buttonReferenceContainer =
+      this.querySelectorService.getExpressCheckoutButtonContainerCheckout();
+    this.data.orderId = this.payPalService.getOrderId();
   }
 
   renderTitle() {
@@ -55,19 +58,13 @@ export class PayLaterButtonCheckoutComponent extends BaseComponent {
       this.app,
       {
         fundingSource: 'paylater',
-        querySelector: '#ps_checkout-express-button-checkout',
-        createOrder: (data) =>
-          this.psCheckoutApi.postCreateOrder({
-            ...data,
-            fundingSource: 'paylater',
-            isExpressCheckout: true
-          })
+        querySelector: '#ps_checkout-express-button-checkout'
       }
     ).render();
 
     if (
-      this.prestashopService.isNativeOnePageCheckoutPage()
-      && !document.getElementById('ps_checkout-express-button-checkout')
+      this.prestashopService.isNativeOnePageCheckoutPage() &&
+      !document.getElementById('ps_checkout-express-button-checkout')
     ) {
       const separatorText = document.createElement('div');
       separatorText.classList.add('ps_checkout-express-separator');