applePay browser support

tpay-com · Jun 21, 2024 · 0ce1715 · 0ce1715
1 parent c6416d0
commit 0ce1715
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 3 deletions.
diff --git a/Model/ConstraintValidator.php b/Model/ConstraintValidator.php
@@ -16,7 +16,7 @@ public function __construct(Session $session)
         $this->checkoutSession = $session;
     }
 
-    public function validate(array $constraints): bool
+    public function validate(array $constraints, string $browser): bool
     {
         foreach ($constraints as $constraint) {
             switch ($constraint['type']) {
@@ -31,6 +31,12 @@ public function validate(array $constraints): bool
                         return false;
                     }
 
+                    break;
+                case 'supported':
+                    if (!$this->validateBrowser($constraint['field'], $browser)) {
+                        return false;
+                    }
+
                     break;
                 default:
                     break;
@@ -54,4 +60,13 @@ private function validateMaximalTotal(float $maximal): bool
     {
         return $this->checkoutSession->getQuote()->getBaseGrandTotal() <= $maximal;
     }
+
+    private function validateBrowser(string $browserSupport, string $browser): bool
+    {
+        if ($browserSupport == 'ApplePaySession' && $browser != 'Safari') {
+            return false;
+        }
+
+        return true;
+    }
 }
diff --git a/Model/MethodListPlugin.php b/Model/MethodListPlugin.php
@@ -2,6 +2,7 @@
 
 namespace Tpay\Magento2\Model;
 
+use Laminas\Http\PhpEnvironment\Request;
 use Magento\Checkout\Model\Session;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Payment\Helper\Data;
@@ -44,6 +45,9 @@ class MethodListPlugin
     /** @var ConstraintValidator */
     private $constraintValidator;
 
+    /** @var Request */
+    protected $request;
+
     public function __construct(
         Data $data,
         ScopeConfigInterface $scopeConfig,
@@ -53,7 +57,8 @@ public function __construct(
         Session $checkoutSession,
         TransactionApiFacade $transactions,
         ConstraintValidator $constraintValidator,
-        TpayInterface $paymentMethod
+        TpayInterface $paymentMethod,
+        Request $request
     ) {
         $this->data = $data;
         $this->scopeConfig = $scopeConfig;
@@ -64,6 +69,7 @@ public function __construct(
         $this->transactions = $transactions;
         $this->constraintValidator = $constraintValidator;
         $this->paymentMethod = $paymentMethod;
+        $this->request = $request;
     }
 
     public function afterGetAvailableMethods(MethodList $compiled, $result)
@@ -90,10 +96,12 @@ public function afterGetAvailableMethods(MethodList $compiled, $result)
             return $result;
         }
 
+        $browser = $this->getBrowser();
+
         foreach ($channelList as $onsiteChannel) {
             $channel = $channels[$onsiteChannel];
 
-            if (!empty($channel->constraints) && !$this->constraintValidator->validate($channel->constraints)) {
+            if (!empty($channel->constraints) && !$this->constraintValidator->validate($channel->constraints, $browser)) {
                 continue;
             }
 
@@ -158,4 +166,17 @@ private function getChannels(): array
 
         return [$channelList, $channels];
     }
+
+    private function getBrowser(): string
+    {
+        $userAgent = $this->request->getHeader('User-Agent')->getFieldValue();
+
+        if (strpos($userAgent, 'Chrome')) {
+            return 'Chrome';
+        } elseif (strpos($userAgent, 'Safari')) {
+            return 'Safari';
+        }
+
+        return 'Other';
+    }
 }
diff --git a/view/base/web/js/open_render_channels.js b/view/base/web/js/open_render_channels.js
@@ -45,6 +45,14 @@ require(['jquery', 'mage/translate'], function ($, $t) {
             return true;
         }
 
+        function isBrowserSupport(channelId) {
+            if (channelId === 170) { //ApplePay
+                return /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
+            }
+
+            return true;
+        }
+
         function ShowChannelsCombo() {
             var str = '',
                 i,
@@ -71,6 +79,10 @@ require(['jquery', 'mage/translate'], function ($, $t) {
                     continue;
                 }
 
+                if (!isBrowserSupport(parseInt(id))) {
+                    continue;
+                }
+
                 tile = getBankTile(id, groupName, logoSrc);
 
                 if (inArray(id, others) === false) {