From bc0f81b55acec19835aa375322254a4120d64b13 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 15 Mar 2022 08:24:17 +1100
Subject: [PATCH] Improve ACH verification text

---
 app/Mail/Engine/PaymentEmailEngine.php                        | 2 ++
 app/Utils/HtmlEngine.php                                      | 1 -
 resources/lang/en/texts.php                                   | 2 +-
 .../portal/ninja2020/gateways/stripe/ach/verify.blade.php     | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php
index 76ed96493fd2..f349ed072908 100644
--- a/app/Mail/Engine/PaymentEmailEngine.php
+++ b/app/Mail/Engine/PaymentEmailEngine.php
@@ -231,12 +231,14 @@ class PaymentEmailEngine extends BaseEmailEngine
 
         $data['$view_link'] = ['value' => '<a class="button" href="'.$this->payment->getLink().'">'.ctrans('texts.view_payment').'</a>', 'label' => ctrans('texts.view_payment')];
         $data['$view_button'] = &$data['$view_link'];
+        $data['$viewLink'] = &$data['$view_link'];
         $data['$paymentLink'] = &$data['$view_link'];
         $data['$portalButton'] = ['value' => "<a href='{$this->payment->getPortalLink()}'>".ctrans('texts.login')."</a>", 'label' =>''];
         $data['$portal_url'] = &$data['$portalButton'];
 
         $data['$view_url'] = ['value' => $this->payment->getLink(), 'label' => ctrans('texts.view_payment')];
         $data['$signature'] = ['value' => $this->settings->email_signature ?: '&nbsp;', 'label' => ''];
+        $data['$emailSignature'] = &$data['$signature'];
 
         $data['$invoices'] = ['value' => $this->formatInvoices(), 'label' => ctrans('texts.invoices')];
         $data['$invoice_references'] = ['value' => $this->formatInvoiceReferences(), 'label' => ctrans('texts.invoices')];
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index b42579eafaf3..1aaff8552e8c 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -541,7 +541,6 @@ class HtmlEngine
             $data['$payments'] = ['value' => $payment_list, 'label' => ctrans('texts.payments')];
         }
 
-
         $arrKeysLength = array_map('strlen', array_keys($data));
         array_multisort($arrKeysLength, SORT_DESC, $data);
 
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 900e67e71223..dd23ac320e87 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -4279,7 +4279,7 @@ $LANG = array(
     'company_import_failure_subject' => 'Error importing :company',
     'company_import_failure_body' => 'There was an error importing the company data, the error message was:',
     'recurring_invoice_due_date' => 'Due Date',
-    'amount_cents' => 'Amount in pennies,pence or cents',
+    'amount_cents' => 'Amount in pennies,pence or cents. ie for $0.10 please enter 10',
     'default_payment_method_label' => 'Default Payment Method',
     'default_payment_method' => 'Make this your preferred way of paying.',
     'already_default_payment_method' => 'This is your preferred way of paying.',
diff --git a/resources/views/portal/ninja2020/gateways/stripe/ach/verify.blade.php b/resources/views/portal/ninja2020/gateways/stripe/ach/verify.blade.php
index fa4465b2e701..736b99a31a76 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/ach/verify.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/ach/verify.blade.php
@@ -11,7 +11,7 @@
         <input type="hidden" name="source" value="{{ $token->token }}">
 
         @component('portal.ninja2020.components.general.card-element', ['title' => '#1 ' . ctrans('texts.amount_cents')])
-            <input type="text" name="transactions[]" class="w-full input" required dusk="verification-1st" value="{{ old('transactions.0') }}">
+            <input type="number" pattern="[0-9]" min="1" step="1" name="transactions[]" class="w-full input" required dusk="verification-1st" value="{{ old('transactions.0') }}">
 
             @error('transactions.0')
                 <div class="validation validation-fail">
@@ -21,7 +21,7 @@
         @endcomponent
 
         @component('portal.ninja2020.components.general.card-element', ['title' => '#2 ' . ctrans('texts.amount_cents')])
-            <input type="text" name="transactions[]" class="w-full input" required dusk="verification-2nd" value="{{ old('transactions.1') }}">
+            <input type="number" pattern="[0-9]" min="1" step="1" name="transactions[]" class="w-full input" required dusk="verification-2nd" value="{{ old('transactions.1') }}">
 
             @error('transactions.1')
                 <div class="validation validation-fail">