Merge branch 'dev' of github.com:erxes/erxes-community into dev

erxes · Sep 29, 2023 · 0af8113 · 0af8113
2 parents cc5faad + 9e33c78
commit 0af8113
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/packages/plugin-payment-api/src/controllers.ts b/packages/plugin-payment-api/src/controllers.ts
@@ -120,6 +120,7 @@ router.post('/gateway/storepay', async (req, res) => {
 
 router.post('/gateway/updateInvoice', async (req, res) => {
   const { selectedPaymentId, paymentKind, invoiceData, phone } = req.body;
+
   const subdomain = getSubdomain(req);
   const models = await generateModels(subdomain);
 

diff --git a/packages/plugin-payment-api/src/public/js/script.js b/packages/plugin-payment-api/src/public/js/script.js
@@ -1,5 +1,3 @@
-const { doc } = require('prettier');
-
 async function onPaymentClick(payment, invoiceData, prefix) {
   const modalContent = document.querySelector('.modal-content');
   const image = document.getElementById('qr-code');
@@ -19,9 +17,16 @@ async function onPaymentClick(payment, invoiceData, prefix) {
 
   let isMobile = false;
 
-  if (/Mobi/.test(navigator.userAgent)) {
+  if (
+    /Mobi/.test(navigator.userAgent) ||
+    navigator.userAgent === 'Android' ||
+    navigator.userAgent === 'iPhone' ||
+    navigator.userAgent === 'Social Pay' || 
+    navigator.userAgent === 'socialpay'
+  ) {
     isMobile = true;
   }
+
   image.src = '';
 
   storepayBtn.style.display = 'none';
@@ -184,20 +189,21 @@ async function onPaymentClick(payment, invoiceData, prefix) {
         });
     });
   }
-  
+
   // hide bank buttons
   bankButtons.style.display = 'none';
 
   if (apiResponse.deeplink && isMobile) {
     deeplink.style.display = 'block';
     deeplink.href = apiResponse.deeplink;
-    deeplink.target = '_self';
+    deeplink.target = 'blank';
     deeplink.innerHTML = `Open in ${paymentObj.kind}`;
 
-    window.open(apiResponse.deeplink, '_self');
+    window.location.href = apiResponse.deeplink;
+    window.open(apiResponse.deeplink, 'blank');
   }
 
-  if (['qpay', 'qpayQuickqr'].includes(data.invoice.paymentKind) && isMobile){
+  if (['qpay', 'qpayQuickqr'].includes(data.invoice.paymentKind) && isMobile) {
     // hide qr image
     image.style.display = 'none';
     bankButtons.style.display = 'block';
@@ -214,7 +220,8 @@ async function onPaymentClick(payment, invoiceData, prefix) {
       bankButton.classList.add('bank');
       bankButton.innerHTML = `<img src="${bankUrl.logo}" class="urlLogo">`;
       bankButton.addEventListener('click', function() {
-        window.open(bankUrl.link, '_self');
+        window.open(bankUrl.link, 'blank');
+        window.location.href = bankUrl.link;
       });
       document.getElementById('bank-buttons').appendChild(bankButton);
     });