NTR: PISHPW-214: Fix ajax response

mollie · Mar 26, 2024 · c21e103 · c21e103
1 parent f214c90
commit c21e103
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/Controllers/Frontend/Mollie.php b/Controllers/Frontend/Mollie.php
@@ -398,8 +398,7 @@ public function notifyAction()
                 'success' => true,
                 'message' => 'The payment status for the order has been processed.'
             ];
-
-            echo json_encode($data, JSON_PRETTY_PRINT);
+            $this->View()->assign($data);
         } catch (\Exception $e) {
             $this->logger->error(
                 'Error in Mollie Notification',
@@ -413,11 +412,10 @@ public function notifyAction()
                 'message' => 'There was a problem. Please see the logs for more.'
             ];
 
-            http_response_code(500);
-            echo json_encode($data);
-        }
 
-        ob_end_flush();
+            $this->Response()->setHttpResponseCode(500);
+            $this->View()->assign($data);
+        }
     }
 
     /**

diff --git a/Controllers/Frontend/MollieApplePayDirect.php b/Controllers/Frontend/MollieApplePayDirect.php
@@ -272,9 +272,7 @@ public function getShippingsAction()
                 'cart' => $formattedCart,
                 'shippingmethods' => $shippingMethods,
             ];
-
-            echo json_encode($data);
-            ob_end_flush();
+            $this->View()->assign($data);
         } catch (\Exception $ex) {
             $this->logger->error(
                 'Error loading shippings for Mollie Apple Pay Direct',
@@ -287,8 +285,7 @@ public function getShippingsAction()
                 'success' => false,
             ];
 
-            echo json_encode($data);
-            ob_end_flush();
+            $this->View()->assign($data);
         }
     }
 

diff --git a/Traits/Controllers/BackendControllerTrait.php b/Traits/Controllers/BackendControllerTrait.php
@@ -43,12 +43,8 @@ protected function returnError($message)
     protected function returnJson($data, $httpCode = 200)
     {
         if ($httpCode !== 200) {
-            http_response_code(intval($httpCode));
+            $this->Response()->setHttpResponseCode((int)$httpCode);
         }
-
-        header('Content-Type: application/json');
-        echo json_encode($data);
-
-        ob_end_flush();
+        $this->View()->assign($data);
     }
 }