fix ajax

buckaroo-it · Oct 13, 2023 · 9528566 · 9528566
1 parent 8f5cff6
commit 9528566
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 152 deletions.
diff --git a/Api/Data/PaypalExpress/OrderDataItemInterface.php b/Api/Data/PaypalExpress/OrderDataItemInterface.php
diff --git a/Api/PaypalExpressQuoteCreateInterface.php b/Api/PaypalExpressQuoteCreateInterface.php
@@ -30,12 +30,12 @@ interface PaypalExpressQuoteCreateInterface
    *
    * @param \Buckaroo\Magento2\Api\Data\PaypalExpress\ShippingAddressRequestInterface $shipping_address
    * @param string $page
-   * @param \Buckaroo\Magento2\Api\Data\PaypalExpress\OrderDataItemInterface[]|null $order_data
+   * @param string|null $order_data
    * @return \Buckaroo\Magento2\Api\Data\PaypalExpress\QuoteCreateResponseInterface
    */
   public function execute(
     ShippingAddressRequestInterface $shipping_address,
     string $page,
-    $order_data = null
+    string $order_data = null
   );
 }
diff --git a/Model/PaypalExpress/QuoteBuilder.php b/Model/PaypalExpress/QuoteBuilder.php
@@ -77,7 +77,8 @@ public function __construct(
         $this->customer = $customer;
     }
 
-    public function setFormData(array $formData)
+    /** @inheritDoc */
+    public function setFormData(string $formData)
     {
         $this->formData = $this->formatFormData($formData);
     }
@@ -135,20 +136,17 @@ protected function addProduct()
             throw new PaypalExpressException($exceptionMessage, 1);
         }
     }
-    /**
+/**
      * Format form data
      *
-     * @param array $form_data
+     * @param string $form_data
      *
      * @return \Magento\Framework\DataObject
      */
-    protected function formatFormData(array $form_data)
+    protected function formatFormData(string $form_data)
     {
         $data = [];
-
-        foreach ($form_data as $orderKeyValue) {
-            $data[$orderKeyValue->getName()] = $orderKeyValue->getValue();
-        }
+        parse_str($form_data, $data);
         $dataObject = $this->dataObjectFactory->create();
 
         return $dataObject->setData($data);

diff --git a/Model/PaypalExpress/QuoteBuilderInterface.php b/Model/PaypalExpress/QuoteBuilderInterface.php
@@ -27,11 +27,11 @@ interface QuoteBuilderInterface
     /**
      * Set form data
      *
-     * @param array $formData
+     * @param string $formData
      *
      * @return void
      */
-    public function setFormData(array $formData);
+    public function setFormData(string $formData);
 
     /**
      * Build quote from form data and session

diff --git a/Model/PaypalExpress/QuoteCreate.php b/Model/PaypalExpress/QuoteCreate.php
@@ -106,11 +106,9 @@ public function __construct(
     public function execute(
         ShippingAddressRequestInterface $shipping_address,
         string $page,
-        $form_data = null
+        string $form_data = null
     ) {
-
-        if ($page === 'product') {
-            $this->validateData($form_data);
+        if ($page === 'product' && is_string($form_data)) {
             $this->quote = $this->createQuote($form_data);
         } else {
             $this->quote = $this->checkoutSession->getQuote();
@@ -267,12 +265,12 @@ protected function setPaymentMethod()
     /**
      * Create quote if in product page
      *
-     * @param array $form_data
+     * @param string $form_data
      * @param ShippingAddressRequestInterface $shipping_address
      *
      * @return Quote
      */
-    protected function createQuote(array $form_data)
+    protected function createQuote(string $form_data)
     {
         try {
             $quoteBuilder = $this->quoteBuilderInterfaceFactory->create();
@@ -283,10 +281,4 @@ protected function createQuote(array $form_data)
             throw new PaypalExpressException(__("Failed to create quote"), 1, $th);
         }
     }
-    protected function validateData($form_data)
-    {
-        if (!is_array($form_data)) {
-            throw new PaypalExpressException(__("Invalid order data"), 1);
-        }
-    }
 }
diff --git a/Model/PaypalExpress/Request/OrderDataItem.php b/Model/PaypalExpress/Request/OrderDataItem.php
diff --git a/view/frontend/web/js/view/checkout/paypal-express/pay.js b/view/frontend/web/js/view/checkout/paypal-express/pay.js
@@ -172,7 +172,7 @@ define([
     getOrderData() {
       let form = $("#product_addtocart_form");
       if (this.page === 'product') {
-        return form.serializeArray();
+                return form.serialize();
       }
     },
     /**