repair GooglePay

OXID-eSales · Jan 7, 2025 · f2a82f4 · f2a82f4
1 parent 72d1209
commit f2a82f4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 298 deletions.
diff --git a/out/src/js/paypal-frontend.min.js b/out/src/js/paypal-frontend.min.js
diff --git a/resources/build/js/paypal-frontend-googlepay.js b/resources/build/js/paypal-frontend-googlepay.js
@@ -146,7 +146,7 @@ window.OxidPayPalGooglePay = {
 
     processPayment: async function (paymentData) {
         try {
-            const createOrderUrl = this.selfLink + '&cl=oscpaypalproxy&fnc=createGooglepayOrder&paymentid=oscpaypal_googlepay&context=continue&stoken=' + this.token;
+            const createOrderUrl = this.selfLink + '&cl=oscpaypalproxy&fnc=createGooglePayOrder&paymentid=oscpaypal_googlepay&context=continue&stoken=' + this.token;
 
             const {id: orderId, status, links} = await fetch(createOrderUrl, {
                 method: "POST",
@@ -200,12 +200,12 @@ window.OxidPayPalGooglePay = {
             .initiatePayerAction({ orderId: orderId })
             .then(async () => {
                 console.log("===== Payer Action Completed =====");
+                await this.executeOxidOrder(orderId);
                 await this.captureOrder(orderId);
-                await this.createOxidOrder(orderId);
             });
     },
-    createOxidOrder: async function (orderId) {
-        const url = this.selfLink + '&cl=order&fnc=createGooglePayOrder&context=continue&stoken=' + this.token + '&sDeliveryAddressMD5=' + this.deliveryAddressMD5;
+    executeOxidOrder: async function (orderId) {
+        const url = this.selfLink + '&cl=order&fnc=executeGooglePayOrder&context=continue&stoken=' + this.token + '&sDeliveryAddressMD5=' + this.deliveryAddressMD5;
         createData = new FormData();
         createData.append('orderID', orderId);
         fetch(url, {
@@ -214,6 +214,8 @@ window.OxidPayPalGooglePay = {
         }).then(function (res) {
             return res.json();
         }).then(function (data) {
+            console.log("==== Create OXID Order Completed ====");
+
             if (data.status === "ERROR") {
                 location.reload();
             }
@@ -230,8 +232,8 @@ window.OxidPayPalGooglePay = {
         }).then(function (data) {
             console.log("==== Capture Order Completed ====");
             var goNext = Array.isArray(data.location) && data.location[0];
+            window.location.href = this.selfLink + goNext + '&stoken=' + this.token;
 
-            window.location.href = this.selfLink + goNext;
             if (data.status === "ERROR") {
                 location.reload();
             }

diff --git a/src/Controller/OrderController.php b/src/Controller/OrderController.php
@@ -230,12 +230,10 @@ public function createAcdcOrder(): void
     /**
      * @throws Exception
      */
-    public function createGooglePayOrder(): void
+    public function executeGooglePayOrder(): void
     {
         try {
             $paymentService = $this->getServiceFromContainer(PaymentService::class);
-            $paymentService->removeTemporaryOrder();
-            Registry::getSession()->setVariable('sess_challenge', $this->getUtilsObjectInstance()->generateUID());
 
             /** @var Logger $logger */
             $logger = $this->getServiceFromContainer(Logger::class);
@@ -287,7 +285,7 @@ public function captureGooglePayOrder(): void
         }
         $result = [
             'location' => [
-                'cl=order&fnc=finalizeGooglePay'
+                'cl=order&fnc=finalizeGooglePay&token=' . $orderId
             ]
         ];
 
@@ -563,10 +561,8 @@ public function finalizeGooglePay(): string
         $paypalOrderId = (string) Registry::getRequest()->getRequestParameter('token');
         $forceFetchDetails = (bool) Registry::getRequest()->getRequestParameter('fallbackfinalize');
 
-        $this->createGooglePayOrder();
-        $this->captureGooglePayOrder();
-
         $oxidOrderId = Registry::getSession()->getBasket()->getOrderId();
+        $oxidOrderId = $oxidOrderId ?: Registry::getSession()->getVariable('sess_challenge');
 
         /** @var GooglePayPayPalService $googlePayPayPalService */
         $googlePayPayPalService = $this->getServiceFromContainer(GooglePayPayPalService::class);

diff --git a/src/Controller/ProxyController.php b/src/Controller/ProxyController.php
@@ -157,7 +157,7 @@ public function getGooglepayBasket()
     /**
      * @throws JsonException
      */
-    public function createGooglepayOrder()
+    public function createGooglePayOrder()
     {
         $data = json_decode(file_get_contents('php://input'), true, 512, JSON_THROW_ON_ERROR);