From 18801c98099822f1125a6ee3ef75545d9d4f74de Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 30 May 2025 11:01:08 +1000
Subject: [PATCH] Fixes for required fields when forcing custom values as
 required

---
 app/Libraries/MultiDB.php         | 5 ++---
 app/Livewire/Flow2/InvoicePay.php | 7 ++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Libraries/MultiDB.php b/app/Libraries/MultiDB.php
index b85ef0a465..e879b9120f 100644
--- a/app/Libraries/MultiDB.php
+++ b/app/Libraries/MultiDB.php
@@ -584,9 +584,8 @@ class MultiDB
         $current_db = config('database.default');
 
         foreach (self::$dbs as $db) {
-            if ($company = Company::on($db)->where("expense_mailbox", $expense_mailbox)->first()) {
-                self::setDb($db);
-
+            self::setDb($db);
+            if ($company = Company::where("expense_mailbox", $expense_mailbox)->first()) {
                 return $company;
             }
         }
diff --git a/app/Livewire/Flow2/InvoicePay.php b/app/Livewire/Flow2/InvoicePay.php
index 7a2a7a20a2..47309454b2 100644
--- a/app/Livewire/Flow2/InvoicePay.php
+++ b/app/Livewire/Flow2/InvoicePay.php
@@ -161,12 +161,13 @@ class InvoicePay extends Component
     private function checkRequiredFields(CompanyGateway $company_gateway)
     {
 
-        $fields = $company_gateway->driver()->getClientRequiredFields();
+        /** @var \App\Models\ClientContact $contact */
+        $contact = $this->getContext()['contact'];
+
+        $fields = $company_gateway->driver($contact->client)->getClientRequiredFields();
 
         $this->setContext('fields', $fields); // $this->context['fields'] = $fields;
 
-        /** @var \App\Models\ClientContact $contact */
-        $contact = $this->getContext()['contact'];
 
         foreach ($fields as $index => $field) {
             $_field = $this->mappings[$field['name']];