fix city is not filled in Apple Pay

airwallex · Dec 19, 2024 · 34032b1 · 34032b1
1 parent 6cc10e1
commit 34032b1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/Controller/Adminhtml/Configuration/SetUpdateSettingsMessage.php b/Controller/Adminhtml/Configuration/SetUpdateSettingsMessage.php
@@ -68,6 +68,10 @@ public function getOriginFromUrl($url): string
     public function execute(): Json
     {
         $resultJson = $this->resultJsonFactory->create();
+        if (empty($this->request->getParam('code'))) {
+            header('Location: ' . base64_decode($this->request->getParam('target_url')));
+            return $resultJson;
+        }
         $environment = 'demo';
         if ($this->request->getParam('env') !== 'demo') {
             $environment = 'www';

diff --git a/Controller/Webhooks/Index.php b/Controller/Webhooks/Index.php
@@ -97,7 +97,8 @@ public function execute(): ResponseHttp
             }
         } catch (Exception $e) {
             $id = $data->sourceId ?? '';
-            $this->requestLog->setMessage($data->name . " $id webhook: " . $e->getMessage(), $e->getTraceAsString())->send();
+            $name = $data->name ?? '';
+            $this->requestLog->setMessage("$name $id webhook: " . $e->getMessage(), $e->getTraceAsString())->send();
             $this->logger->error($e->getMessage());
             throw $e;
         }

diff --git a/view/frontend/web/js/view/payment/method-renderer/address/address-handler.js b/view/frontend/web/js/view/payment/method-renderer/address/address-handler.js
@@ -121,10 +121,13 @@ define([
         },
 
         city(addr, type) {
-            if (type === 'google') {
-                return addr.locality || addr.administrativeArea || addr.countryCode;
+            if (addr.locality) return addr.locality;
+            if (['sg', 'singapore'].indexOf(addr.countryCode.toLowerCase()) !== -1) {
+                return 'Singapore';
             }
-            return addr.locality;
+            if (addr.administrativeArea) return addr.administrativeArea;
+            if (addr.country) return addr.country;
+            return addr.countryCode;
         },
 
         postcode(addr, type) {