From a5a9c43afffa1d2b99e458126f591d68ed72658f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 28 Jul 2024 16:15:15 +1000
Subject: [PATCH] Updates

---
 public/build/manifest.json                               | 2 +-
 resources/js/clients/invoices/payment.js                 | 8 +++++++-
 resources/views/portal/ninja2020/invoices/show.blade.php | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/public/build/manifest.json b/public/build/manifest.json
index 4ae4f8058d..d8290f9bda 100644
--- a/public/build/manifest.json
+++ b/public/build/manifest.json
@@ -23,7 +23,7 @@
     "src": "resources/js/clients/invoices/action-selectors.js"
   },
   "resources/js/clients/invoices/payment.js": {
-    "file": "assets/payment-36249364.js",
+    "file": "assets/payment-292ee4d0.js",
     "isEntry": true,
     "src": "resources/js/clients/invoices/payment.js"
   },
diff --git a/resources/js/clients/invoices/payment.js b/resources/js/clients/invoices/payment.js
index 2efdea6782..1026dadeb5 100644
--- a/resources/js/clients/invoices/payment.js
+++ b/resources/js/clients/invoices/payment.js
@@ -80,7 +80,13 @@ class Payment {
         document.getElementById("payment_method_id").value =
             element.dataset.gatewayTypeId;
               
-        if (element.dataset.isPaypal != '1') {
+        const filledRff = document.querySelector('input[name="contact_first_name"').value.length >=1 &&
+            document.querySelector('input[name="contact_last_name"').value.length >= 1 &&
+            document.querySelector('input[name="contact_email"').value.length >= 1 &&
+            document.querySelector('input[name="client_city"').value.length >= 1 &&
+            document.querySelector('input[name="client_postal_code"').value.length >= 1;
+
+        if (element.dataset.isPaypal != '1' || filledRff) {
             this.steps.delete("rff");
         }
 
diff --git a/resources/views/portal/ninja2020/invoices/show.blade.php b/resources/views/portal/ninja2020/invoices/show.blade.php
index 48bb516d2a..f2a4e99b5a 100644
--- a/resources/views/portal/ninja2020/invoices/show.blade.php
+++ b/resources/views/portal/ninja2020/invoices/show.blade.php
@@ -46,6 +46,8 @@
             <input type="hidden" name="contact_first_name" value="{{ auth()->guard('contact')->user()->first_name }}">
             <input type="hidden" name="contact_last_name" value="{{ auth()->guard('contact')->user()->last_name }}">
             <input type="hidden" name="contact_email" value="{{ auth()->guard('contact')->user()->email }}">
+            <input type="hidden" name="client_city" value="{{ auth()->guard('contact')->user()->client->city }}">
+            <input type="hidden" name="client_postal_code" value="{{ auth()->guard('contact')->user()->client->postal_code }}">
 
             <div class="bg-white shadow sm:rounded-lg mb-4" translate>
                 <div class="px-4 py-5 sm:p-6">