From 6186cc1420a1420bffee19b5f6b4a896c13cb678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 19 Aug 2021 11:05:06 +0200
Subject: [PATCH] Fixes for authorize page

---
 resources/js/clients/payments/square-credit-card.js    | 10 +++++++---
 .../gateways/square/credit_card/authorize.blade.php    |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/resources/js/clients/payments/square-credit-card.js b/resources/js/clients/payments/square-credit-card.js
index a8eabd2161e5..a72e701b93a6 100644
--- a/resources/js/clients/payments/square-credit-card.js
+++ b/resources/js/clients/payments/square-credit-card.js
@@ -78,13 +78,17 @@ class SquareCreditCard {
     }
 
     async handle() {
+        if (document.querySelector('meta[name=square-authorize]')) {
+            await this.init();
+        }
+
         document
             .getElementById('authorize-card')
             ?.addEventListener('click', (e) =>
                 this.completePaymentWithoutToken(e)
             );
 
-        document.getElementById('pay-now').addEventListener('click', (e) => {
+        document.getElementById('pay-now')?.addEventListener('click', (e) => {
             let tokenInput = document.querySelector('input[name=token]');
 
             if (tokenInput.value) {
@@ -110,7 +114,7 @@ class SquareCreditCard {
 
         document
             .getElementById('toggle-payment-with-credit-card')
-            .addEventListener('click', async (element) => {
+            ?.addEventListener('click', async (element) => {
                 document
                     .getElementById('card-container')
                     .classList.remove('hidden');
@@ -128,7 +132,7 @@ class SquareCreditCard {
         );
 
         if (!toggleWithToken) {
-            document.getElementById('toggle-payment-with-credit-card').click();
+            document.getElementById('toggle-payment-with-credit-card')?.click();
         }
     }
 }
diff --git a/resources/views/portal/ninja2020/gateways/square/credit_card/authorize.blade.php b/resources/views/portal/ninja2020/gateways/square/credit_card/authorize.blade.php
index 3af1b4b17066..5278f6c32e44 100644
--- a/resources/views/portal/ninja2020/gateways/square/credit_card/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/square/credit_card/authorize.blade.php
@@ -4,6 +4,7 @@
 @section('gateway_head')
     <meta name="square-appId" content="{{ $gateway->company_gateway->getConfigField('applicationId') }}">
     <meta name="square-locationId" content="{{ $gateway->company_gateway->getConfigField('locationId') }}">
+    <meta name="square-authorize" content="true">
 @endsection
 
 @section('gateway_content')