From 5e56ee0afbe5b792e38b6afd3c9822c642407b00 Mon Sep 17 00:00:00 2001
From: L3RAZ <laurynas.sedys@invertus.eu>
Date: Wed, 11 Sep 2024 17:46:21 +0300
Subject: [PATCH] Fixed merge error

---
 controllers/front/applepay.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/controllers/front/applepay.php b/controllers/front/applepay.php
index 214c4db19..97bb44650 100644
--- a/controllers/front/applepay.php
+++ b/controllers/front/applepay.php
@@ -65,7 +65,7 @@ public function postProcess()
 
             switch ($action) {
                 case 'getPaymentRequest':
-                    $this->getPaymentRequest($bodyValues);
+                    $this->getPaymentRequest();
                     break;
                 case 'getDomainAssociation':
                     /**
@@ -84,18 +84,13 @@ public function postProcess()
                         }
                         echo file_get_contents($associationFile);
                         exit;
+                    } else {
+                        $this->exitWithExceptionMessage(new Exception('File not found', 404));
                     }
-                    $this->exitWithExceptionMessage(new Exception('Invalid request', 400));
                     break;
                 default:
                     $this->exitWithExceptionMessage(new Exception('Invalid request', 400));
             }
-            if ($action === 'getPaymentRequest') {
-                $this->getPaymentRequest();
-            } else {
-                $exception = new Exception('Invalid request', 400);
-                $this->exitWithExceptionMessage($exception);
-            }
         } catch (Exception $exception) {
             $this->exitWithExceptionMessage($exception);
         }