diff --git a/app/Http/Requests/Account/CreateAccountRequest.php b/app/Http/Requests/Account/CreateAccountRequest.php
index a33f5e529c76..ca8fb883ec1f 100644
--- a/app/Http/Requests/Account/CreateAccountRequest.php
+++ b/app/Http/Requests/Account/CreateAccountRequest.php
@@ -52,7 +52,7 @@ class CreateAccountRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Account/UpdateAccountRequest.php b/app/Http/Requests/Account/UpdateAccountRequest.php
index ffe0788046e7..f39af8be11f5 100644
--- a/app/Http/Requests/Account/UpdateAccountRequest.php
+++ b/app/Http/Requests/Account/UpdateAccountRequest.php
@@ -42,7 +42,7 @@ class UpdateAccountRequest extends Request
     }
 
     /* Only allow single field to update account table */
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Chart/ShowChartRequest.php b/app/Http/Requests/Chart/ShowChartRequest.php
index f4fc0e751035..6e268dd68813 100644
--- a/app/Http/Requests/Chart/ShowChartRequest.php
+++ b/app/Http/Requests/Chart/ShowChartRequest.php
@@ -34,7 +34,7 @@ class ShowChartRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Client/AdjustClientLedgerRequest.php b/app/Http/Requests/Client/AdjustClientLedgerRequest.php
index e76ed68acb8f..0e3ef26c508c 100644
--- a/app/Http/Requests/Client/AdjustClientLedgerRequest.php
+++ b/app/Http/Requests/Client/AdjustClientLedgerRequest.php
@@ -44,7 +44,7 @@ class AdjustClientLedgerRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Client/StoreClientRequest.php b/app/Http/Requests/Client/StoreClientRequest.php
index 5cc9da162037..463cc7b4a355 100644
--- a/app/Http/Requests/Client/StoreClientRequest.php
+++ b/app/Http/Requests/Client/StoreClientRequest.php
@@ -89,7 +89,7 @@ class StoreClientRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
@@ -99,7 +99,9 @@ class StoreClientRequest extends Request
         /* Stub settings if they don't exist */
         if(!array_key_exists('settings', $input))
             $input['settings'] = [];
-                
+        elseif(is_object($input['settings']))
+            $input['settings'] = (array)$input['settings'];
+        
         /* Merge default into base settings */
         $input['settings'] = array_merge($input['settings'], $settings);
 
diff --git a/app/Http/Requests/Client/UpdateClientRequest.php b/app/Http/Requests/Client/UpdateClientRequest.php
index d99e8ff01545..d263d11318b3 100644
--- a/app/Http/Requests/Client/UpdateClientRequest.php
+++ b/app/Http/Requests/Client/UpdateClientRequest.php
@@ -93,7 +93,7 @@ class UpdateClientRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/ClientGatewayToken/StoreClientGatewayTokenRequest.php b/app/Http/Requests/ClientGatewayToken/StoreClientGatewayTokenRequest.php
index 05d5971d2486..30521b042a34 100644
--- a/app/Http/Requests/ClientGatewayToken/StoreClientGatewayTokenRequest.php
+++ b/app/Http/Requests/ClientGatewayToken/StoreClientGatewayTokenRequest.php
@@ -48,7 +48,7 @@ class StoreClientGatewayTokenRequest extends Request
         return $this->globalRules($rules);
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/ClientGatewayToken/UpdateClientGatewayTokenRequest.php b/app/Http/Requests/ClientGatewayToken/UpdateClientGatewayTokenRequest.php
index a3437549b9ed..73224e715353 100644
--- a/app/Http/Requests/ClientGatewayToken/UpdateClientGatewayTokenRequest.php
+++ b/app/Http/Requests/ClientGatewayToken/UpdateClientGatewayTokenRequest.php
@@ -46,7 +46,7 @@ class UpdateClientGatewayTokenRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/ClientPortal/Statements/ShowStatementRequest.php b/app/Http/Requests/ClientPortal/Statements/ShowStatementRequest.php
index aa571296526a..c263248e83bb 100644
--- a/app/Http/Requests/ClientPortal/Statements/ShowStatementRequest.php
+++ b/app/Http/Requests/ClientPortal/Statements/ShowStatementRequest.php
@@ -34,7 +34,7 @@ class ShowStatementRequest extends FormRequest
      *
      * @return void
      */
-    protected function prepareForValidation(): void
+    public function prepareForValidation(): void
     {
         $this->merge([
             'show_payments_table' => $this->has('show_payments_table') ? \boolval($this->show_payments_table) : false,
diff --git a/app/Http/Requests/Company/EditCompanyRequest.php b/app/Http/Requests/Company/EditCompanyRequest.php
index d2bf40a98234..c045ab79246d 100644
--- a/app/Http/Requests/Company/EditCompanyRequest.php
+++ b/app/Http/Requests/Company/EditCompanyRequest.php
@@ -32,7 +32,7 @@ class EditCompanyRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Company/StoreCompanyRequest.php b/app/Http/Requests/Company/StoreCompanyRequest.php
index bc3bff26c46e..33937d1e86cd 100644
--- a/app/Http/Requests/Company/StoreCompanyRequest.php
+++ b/app/Http/Requests/Company/StoreCompanyRequest.php
@@ -57,7 +57,7 @@ class StoreCompanyRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Company/UpdateCompanyRequest.php b/app/Http/Requests/Company/UpdateCompanyRequest.php
index 9cb445aa49ca..37cf05e5400e 100644
--- a/app/Http/Requests/Company/UpdateCompanyRequest.php
+++ b/app/Http/Requests/Company/UpdateCompanyRequest.php
@@ -59,7 +59,7 @@ class UpdateCompanyRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
     
         $input = $this->all();
diff --git a/app/Http/Requests/CompanyGateway/DestroyCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/DestroyCompanyGatewayRequest.php
index f17cbc62b8f4..59fc1636c44a 100644
--- a/app/Http/Requests/CompanyGateway/DestroyCompanyGatewayRequest.php
+++ b/app/Http/Requests/CompanyGateway/DestroyCompanyGatewayRequest.php
@@ -32,7 +32,7 @@ class DestroyCompanyGatewayRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/CompanyGateway/EditCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/EditCompanyGatewayRequest.php
index dc609f5c0f85..dc7b89656e1d 100644
--- a/app/Http/Requests/CompanyGateway/EditCompanyGatewayRequest.php
+++ b/app/Http/Requests/CompanyGateway/EditCompanyGatewayRequest.php
@@ -32,7 +32,7 @@ class EditCompanyGatewayRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/CompanyGateway/ShowCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/ShowCompanyGatewayRequest.php
index 6a07f72022f1..76cff6888344 100644
--- a/app/Http/Requests/CompanyGateway/ShowCompanyGatewayRequest.php
+++ b/app/Http/Requests/CompanyGateway/ShowCompanyGatewayRequest.php
@@ -32,7 +32,7 @@ class ShowCompanyGatewayRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/CompanyGateway/StoreCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/StoreCompanyGatewayRequest.php
index 3ce13ab97eec..cd013302c085 100644
--- a/app/Http/Requests/CompanyGateway/StoreCompanyGatewayRequest.php
+++ b/app/Http/Requests/CompanyGateway/StoreCompanyGatewayRequest.php
@@ -40,7 +40,7 @@ class StoreCompanyGatewayRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php
index 945e19fa9dd9..4267f3726515 100644
--- a/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php
+++ b/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php
@@ -39,7 +39,7 @@ class UpdateCompanyGatewayRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Credit/StoreCreditRequest.php b/app/Http/Requests/Credit/StoreCreditRequest.php
index c6ed56f53cd4..6258893af516 100644
--- a/app/Http/Requests/Credit/StoreCreditRequest.php
+++ b/app/Http/Requests/Credit/StoreCreditRequest.php
@@ -69,7 +69,7 @@ class StoreCreditRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Credit/UpdateCreditRequest.php b/app/Http/Requests/Credit/UpdateCreditRequest.php
index 398ccdf30439..ae10af3b75e5 100644
--- a/app/Http/Requests/Credit/UpdateCreditRequest.php
+++ b/app/Http/Requests/Credit/UpdateCreditRequest.php
@@ -63,7 +63,7 @@ class UpdateCreditRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Design/DefaultDesignRequest.php b/app/Http/Requests/Design/DefaultDesignRequest.php
index 38f803da9087..33ba3e06a954 100644
--- a/app/Http/Requests/Design/DefaultDesignRequest.php
+++ b/app/Http/Requests/Design/DefaultDesignRequest.php
@@ -33,7 +33,7 @@ class DefaultDesignRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Design/StoreDesignRequest.php b/app/Http/Requests/Design/StoreDesignRequest.php
index 2ce77790ffda..9d23cf40144a 100644
--- a/app/Http/Requests/Design/StoreDesignRequest.php
+++ b/app/Http/Requests/Design/StoreDesignRequest.php
@@ -34,7 +34,7 @@ class StoreDesignRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Design/UpdateDesignRequest.php b/app/Http/Requests/Design/UpdateDesignRequest.php
index 3d565b99fb0d..33eaf62397ee 100644
--- a/app/Http/Requests/Design/UpdateDesignRequest.php
+++ b/app/Http/Requests/Design/UpdateDesignRequest.php
@@ -33,7 +33,7 @@ class UpdateDesignRequest extends Request
         return [];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Document/StoreDocumentRequest.php b/app/Http/Requests/Document/StoreDocumentRequest.php
index 0f80d3868ac5..2a002f2dd23a 100644
--- a/app/Http/Requests/Document/StoreDocumentRequest.php
+++ b/app/Http/Requests/Document/StoreDocumentRequest.php
@@ -32,7 +32,7 @@ class StoreDocumentRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Document/UpdateDocumentRequest.php b/app/Http/Requests/Document/UpdateDocumentRequest.php
index a071665552b9..c075a3ca6703 100644
--- a/app/Http/Requests/Document/UpdateDocumentRequest.php
+++ b/app/Http/Requests/Document/UpdateDocumentRequest.php
@@ -33,7 +33,7 @@ class UpdateDocumentRequest extends Request
         return [];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Email/SendEmailRequest.php b/app/Http/Requests/Email/SendEmailRequest.php
index 6fe53953881f..a9741e83ae01 100644
--- a/app/Http/Requests/Email/SendEmailRequest.php
+++ b/app/Http/Requests/Email/SendEmailRequest.php
@@ -42,7 +42,7 @@ class SendEmailRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Expense/StoreExpenseRequest.php b/app/Http/Requests/Expense/StoreExpenseRequest.php
index ab6c5246fba8..bcfd486a1c20 100644
--- a/app/Http/Requests/Expense/StoreExpenseRequest.php
+++ b/app/Http/Requests/Expense/StoreExpenseRequest.php
@@ -46,7 +46,7 @@ class StoreExpenseRequest extends Request
         return $this->globalRules($rules);
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Expense/UpdateExpenseRequest.php b/app/Http/Requests/Expense/UpdateExpenseRequest.php
index d9e003877da4..e1e0ad094470 100644
--- a/app/Http/Requests/Expense/UpdateExpenseRequest.php
+++ b/app/Http/Requests/Expense/UpdateExpenseRequest.php
@@ -56,7 +56,7 @@ class UpdateExpenseRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/ExpenseCategory/StoreExpenseCategoryRequest.php b/app/Http/Requests/ExpenseCategory/StoreExpenseCategoryRequest.php
index 4dbcc6a19858..441eda1dd10d 100644
--- a/app/Http/Requests/ExpenseCategory/StoreExpenseCategoryRequest.php
+++ b/app/Http/Requests/ExpenseCategory/StoreExpenseCategoryRequest.php
@@ -35,7 +35,7 @@ class StoreExpenseCategoryRequest extends Request
         return $this->globalRules($rules);
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/ExpenseCategory/UpdateExpenseCategoryRequest.php b/app/Http/Requests/ExpenseCategory/UpdateExpenseCategoryRequest.php
index 55ef6c282aeb..a70ba54b20a5 100644
--- a/app/Http/Requests/ExpenseCategory/UpdateExpenseCategoryRequest.php
+++ b/app/Http/Requests/ExpenseCategory/UpdateExpenseCategoryRequest.php
@@ -41,7 +41,7 @@ class UpdateExpenseCategoryRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php b/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php
index 166bf2504164..5249aec571e5 100644
--- a/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php
+++ b/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php
@@ -37,7 +37,7 @@ class StoreGroupSettingRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php b/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php
index 887b963700da..6dd355849093 100644
--- a/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php
+++ b/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php
@@ -36,7 +36,7 @@ class UpdateGroupSettingRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Invoice/ActionInvoiceRequest.php b/app/Http/Requests/Invoice/ActionInvoiceRequest.php
index 912142c5fc9e..ff19f7e547c7 100644
--- a/app/Http/Requests/Invoice/ActionInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/ActionInvoiceRequest.php
@@ -42,7 +42,7 @@ class ActionInvoiceRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Invoice/StoreInvoiceRequest.php b/app/Http/Requests/Invoice/StoreInvoiceRequest.php
index 10924c622119..2cb1535c5bee 100644
--- a/app/Http/Requests/Invoice/StoreInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/StoreInvoiceRequest.php
@@ -73,7 +73,7 @@ class StoreInvoiceRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
index 0c5a78f36b2c..a7708853f796 100644
--- a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
@@ -69,7 +69,7 @@ class UpdateInvoiceRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Login/LoginRequest.php b/app/Http/Requests/Login/LoginRequest.php
index 6fa595ae5645..f02169180c7d 100644
--- a/app/Http/Requests/Login/LoginRequest.php
+++ b/app/Http/Requests/Login/LoginRequest.php
@@ -47,7 +47,7 @@ class LoginRequest extends Request
         ];
     }
 
-    // protected function prepareForValidation()
+    // public function prepareForValidation()
     // {
     //     $input = $this->all();
 
diff --git a/app/Http/Requests/OneTimeToken/OneTimeRouterRequest.php b/app/Http/Requests/OneTimeToken/OneTimeRouterRequest.php
index fd36c1171fe3..9cdfc1893ffa 100644
--- a/app/Http/Requests/OneTimeToken/OneTimeRouterRequest.php
+++ b/app/Http/Requests/OneTimeToken/OneTimeRouterRequest.php
@@ -37,7 +37,7 @@ class OneTimeRouterRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         // $input = $this->all();
         // $this->replace($input);
diff --git a/app/Http/Requests/OneTimeToken/OneTimeTokenRequest.php b/app/Http/Requests/OneTimeToken/OneTimeTokenRequest.php
index 4abdaf1854c2..7c8a47ed9fd6 100644
--- a/app/Http/Requests/OneTimeToken/OneTimeTokenRequest.php
+++ b/app/Http/Requests/OneTimeToken/OneTimeTokenRequest.php
@@ -37,7 +37,7 @@ class OneTimeTokenRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         // $input = $this->all();
         // $this->replace($input);
diff --git a/app/Http/Requests/Payment/EditPaymentRequest.php b/app/Http/Requests/Payment/EditPaymentRequest.php
index 6cfc821c64fe..79dae31beff7 100644
--- a/app/Http/Requests/Payment/EditPaymentRequest.php
+++ b/app/Http/Requests/Payment/EditPaymentRequest.php
@@ -32,7 +32,7 @@ class EditPaymentRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Payment/RefundPaymentRequest.php b/app/Http/Requests/Payment/RefundPaymentRequest.php
index d7eeb04e004e..a0223fd02f69 100644
--- a/app/Http/Requests/Payment/RefundPaymentRequest.php
+++ b/app/Http/Requests/Payment/RefundPaymentRequest.php
@@ -31,7 +31,7 @@ class RefundPaymentRequest extends Request
         return auth()->user()->isAdmin();
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Payment/StorePaymentRequest.php b/app/Http/Requests/Payment/StorePaymentRequest.php
index 216a90fba150..3341ddf67833 100644
--- a/app/Http/Requests/Payment/StorePaymentRequest.php
+++ b/app/Http/Requests/Payment/StorePaymentRequest.php
@@ -36,7 +36,7 @@ class StorePaymentRequest extends Request
         return auth()->user()->can('create', Payment::class);
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Payment/UpdatePaymentRequest.php b/app/Http/Requests/Payment/UpdatePaymentRequest.php
index a14d2b3b46c9..0071c2ec691e 100644
--- a/app/Http/Requests/Payment/UpdatePaymentRequest.php
+++ b/app/Http/Requests/Payment/UpdatePaymentRequest.php
@@ -58,7 +58,7 @@ class UpdatePaymentRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/PaymentTerm/EditPaymentTermRequest.php b/app/Http/Requests/PaymentTerm/EditPaymentTermRequest.php
index dcc265e267b5..e8d9cdbad2fa 100644
--- a/app/Http/Requests/PaymentTerm/EditPaymentTermRequest.php
+++ b/app/Http/Requests/PaymentTerm/EditPaymentTermRequest.php
@@ -32,7 +32,7 @@ class EditPaymentTermRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/PaymentTerm/StorePaymentTermRequest.php b/app/Http/Requests/PaymentTerm/StorePaymentTermRequest.php
index c63b11c24202..4bca6fda88b1 100644
--- a/app/Http/Requests/PaymentTerm/StorePaymentTermRequest.php
+++ b/app/Http/Requests/PaymentTerm/StorePaymentTermRequest.php
@@ -28,7 +28,7 @@ class StorePaymentTermRequest extends Request
         return auth()->user()->isAdmin();
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/PaymentTerm/UpdatePaymentTermRequest.php b/app/Http/Requests/PaymentTerm/UpdatePaymentTermRequest.php
index a6d20e818540..5dd166edadf2 100644
--- a/app/Http/Requests/PaymentTerm/UpdatePaymentTermRequest.php
+++ b/app/Http/Requests/PaymentTerm/UpdatePaymentTermRequest.php
@@ -35,7 +35,7 @@ class UpdatePaymentTermRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Preview/PreviewInvoiceRequest.php b/app/Http/Requests/Preview/PreviewInvoiceRequest.php
index 6a40fd1e3fa7..9215703d34c5 100644
--- a/app/Http/Requests/Preview/PreviewInvoiceRequest.php
+++ b/app/Http/Requests/Preview/PreviewInvoiceRequest.php
@@ -45,7 +45,7 @@ class PreviewInvoiceRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Product/StoreProductRequest.php b/app/Http/Requests/Product/StoreProductRequest.php
index 5a72d838f402..793917e880cc 100644
--- a/app/Http/Requests/Product/StoreProductRequest.php
+++ b/app/Http/Requests/Product/StoreProductRequest.php
@@ -48,7 +48,7 @@ class StoreProductRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Product/UpdateProductRequest.php b/app/Http/Requests/Product/UpdateProductRequest.php
index 33b1a43ab947..ce0fed8764d1 100644
--- a/app/Http/Requests/Product/UpdateProductRequest.php
+++ b/app/Http/Requests/Product/UpdateProductRequest.php
@@ -51,7 +51,7 @@ class UpdateProductRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Project/StoreProjectRequest.php b/app/Http/Requests/Project/StoreProjectRequest.php
index f4aee94583ff..2ab6b183f284 100644
--- a/app/Http/Requests/Project/StoreProjectRequest.php
+++ b/app/Http/Requests/Project/StoreProjectRequest.php
@@ -45,7 +45,7 @@ class StoreProjectRequest extends Request
         return $this->globalRules($rules);
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->decodePrimaryKeys($this->all());
 
diff --git a/app/Http/Requests/Project/UpdateProjectRequest.php b/app/Http/Requests/Project/UpdateProjectRequest.php
index ab847877baea..02949bd243ae 100644
--- a/app/Http/Requests/Project/UpdateProjectRequest.php
+++ b/app/Http/Requests/Project/UpdateProjectRequest.php
@@ -40,7 +40,7 @@ class UpdateProjectRequest extends Request
         return $this->globalRules($rules);
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->decodePrimaryKeys($this->all());
 
diff --git a/app/Http/Requests/PurchaseOrder/ActionPurchaseOrderRequest.php b/app/Http/Requests/PurchaseOrder/ActionPurchaseOrderRequest.php
index 334dffcf198c..ea63c89bef74 100644
--- a/app/Http/Requests/PurchaseOrder/ActionPurchaseOrderRequest.php
+++ b/app/Http/Requests/PurchaseOrder/ActionPurchaseOrderRequest.php
@@ -40,7 +40,7 @@ class ActionPurchaseOrderRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php b/app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php
index 1a417c7cc2eb..0e7fef3a86b2 100644
--- a/app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php
+++ b/app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php
@@ -50,7 +50,7 @@ class StorePurchaseOrderRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/PurchaseOrder/UpdatePurchaseOrderRequest.php b/app/Http/Requests/PurchaseOrder/UpdatePurchaseOrderRequest.php
index 767d95e8e41c..5d34d4293214 100644
--- a/app/Http/Requests/PurchaseOrder/UpdatePurchaseOrderRequest.php
+++ b/app/Http/Requests/PurchaseOrder/UpdatePurchaseOrderRequest.php
@@ -51,7 +51,7 @@ class UpdatePurchaseOrderRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Quote/StoreQuoteRequest.php b/app/Http/Requests/Quote/StoreQuoteRequest.php
index 388fe718aca2..bdcee570c8e5 100644
--- a/app/Http/Requests/Quote/StoreQuoteRequest.php
+++ b/app/Http/Requests/Quote/StoreQuoteRequest.php
@@ -60,7 +60,7 @@ class StoreQuoteRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Quote/UpdateQuoteRequest.php b/app/Http/Requests/Quote/UpdateQuoteRequest.php
index 5f8a1aee26e1..7b32663f59b4 100644
--- a/app/Http/Requests/Quote/UpdateQuoteRequest.php
+++ b/app/Http/Requests/Quote/UpdateQuoteRequest.php
@@ -58,7 +58,7 @@ class UpdateQuoteRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/RecurringExpense/StoreRecurringExpenseRequest.php b/app/Http/Requests/RecurringExpense/StoreRecurringExpenseRequest.php
index 4b48adca6447..ef256795c05f 100644
--- a/app/Http/Requests/RecurringExpense/StoreRecurringExpenseRequest.php
+++ b/app/Http/Requests/RecurringExpense/StoreRecurringExpenseRequest.php
@@ -51,7 +51,7 @@ class StoreRecurringExpenseRequest extends Request
         return $this->globalRules($rules);
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/RecurringExpense/UpdateRecurringExpenseRequest.php b/app/Http/Requests/RecurringExpense/UpdateRecurringExpenseRequest.php
index ee53797be57e..0909c775c880 100644
--- a/app/Http/Requests/RecurringExpense/UpdateRecurringExpenseRequest.php
+++ b/app/Http/Requests/RecurringExpense/UpdateRecurringExpenseRequest.php
@@ -60,7 +60,7 @@ class UpdateRecurringExpenseRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/RecurringInvoice/EditRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/EditRecurringInvoiceRequest.php
index c97e8d541008..82d564e792d6 100644
--- a/app/Http/Requests/RecurringInvoice/EditRecurringInvoiceRequest.php
+++ b/app/Http/Requests/RecurringInvoice/EditRecurringInvoiceRequest.php
@@ -32,7 +32,7 @@ class EditRecurringInvoiceRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
index 8a2d1fbd7b9b..c220fca528fd 100644
--- a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
+++ b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
@@ -62,7 +62,7 @@ class StoreRecurringInvoiceRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
index e5e11186d8bb..b13dc0efc0c7 100644
--- a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
+++ b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
@@ -58,7 +58,7 @@ class UpdateRecurringInvoiceRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/RecurringQuote/EditRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/EditRecurringQuoteRequest.php
index 8bfe061ae495..a2de0210282a 100644
--- a/app/Http/Requests/RecurringQuote/EditRecurringQuoteRequest.php
+++ b/app/Http/Requests/RecurringQuote/EditRecurringQuoteRequest.php
@@ -32,7 +32,7 @@ class EditRecurringQuoteRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php
index dbe39e057f2f..8b602bc0b1b6 100644
--- a/app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php
+++ b/app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php
@@ -59,7 +59,7 @@ class StoreRecurringQuoteRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
         $input = $this->decodePrimaryKeys($input);
diff --git a/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php
index 41d42d8af2d1..c0bb695ca4ce 100644
--- a/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php
+++ b/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php
@@ -55,7 +55,7 @@ class UpdateRecurringQuoteRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
         $input = $this->decodePrimaryKeys($input);
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
index b565f754902c..e31f427b6f30 100644
--- a/app/Http/Requests/Request.php
+++ b/app/Http/Requests/Request.php
@@ -179,7 +179,7 @@ class Request extends FormRequest
         return $input;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
     }
 }
diff --git a/app/Http/Requests/Setup/StoreSetupRequest.php b/app/Http/Requests/Setup/StoreSetupRequest.php
index 031bb17fd3d8..5432ea689e69 100644
--- a/app/Http/Requests/Setup/StoreSetupRequest.php
+++ b/app/Http/Requests/Setup/StoreSetupRequest.php
@@ -60,7 +60,7 @@ class StoreSetupRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Shop/StoreShopClientRequest.php b/app/Http/Requests/Shop/StoreShopClientRequest.php
index 51c7b94edcd0..95932ea24985 100644
--- a/app/Http/Requests/Shop/StoreShopClientRequest.php
+++ b/app/Http/Requests/Shop/StoreShopClientRequest.php
@@ -72,7 +72,7 @@ class StoreShopClientRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $this->company = Company::where('company_key', request()->header('X-API-COMPANY-KEY'))->firstOrFail();
 
diff --git a/app/Http/Requests/Shop/StoreShopInvoiceRequest.php b/app/Http/Requests/Shop/StoreShopInvoiceRequest.php
index 8b9802166eb8..d5a70993e57e 100644
--- a/app/Http/Requests/Shop/StoreShopInvoiceRequest.php
+++ b/app/Http/Requests/Shop/StoreShopInvoiceRequest.php
@@ -57,7 +57,7 @@ class StoreShopInvoiceRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $this->company = Company::where('company_key', request()->header('X-API-COMPANY-KEY'))->firstOrFail();
 
diff --git a/app/Http/Requests/Statements/CreateStatementRequest.php b/app/Http/Requests/Statements/CreateStatementRequest.php
index 9e20775429d6..2d2adac6e757 100644
--- a/app/Http/Requests/Statements/CreateStatementRequest.php
+++ b/app/Http/Requests/Statements/CreateStatementRequest.php
@@ -39,7 +39,7 @@ class CreateStatementRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Subscription/StoreSubscriptionRequest.php b/app/Http/Requests/Subscription/StoreSubscriptionRequest.php
index e3a5e0814699..441cdd755d18 100644
--- a/app/Http/Requests/Subscription/StoreSubscriptionRequest.php
+++ b/app/Http/Requests/Subscription/StoreSubscriptionRequest.php
@@ -60,7 +60,7 @@ class StoreSubscriptionRequest extends Request
         return $this->globalRules($rules);
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Subscription/UpdateSubscriptionRequest.php b/app/Http/Requests/Subscription/UpdateSubscriptionRequest.php
index 1e083dab6993..2b34f4fd61de 100644
--- a/app/Http/Requests/Subscription/UpdateSubscriptionRequest.php
+++ b/app/Http/Requests/Subscription/UpdateSubscriptionRequest.php
@@ -62,7 +62,7 @@ class UpdateSubscriptionRequest extends Request
         return $this->globalRules($rules);
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Task/StoreTaskRequest.php b/app/Http/Requests/Task/StoreTaskRequest.php
index 1c7bdfc22ffe..a1de7bec3f75 100644
--- a/app/Http/Requests/Task/StoreTaskRequest.php
+++ b/app/Http/Requests/Task/StoreTaskRequest.php
@@ -41,7 +41,7 @@ class StoreTaskRequest extends Request
         return $this->globalRules($rules);
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Task/UpdateTaskRequest.php b/app/Http/Requests/Task/UpdateTaskRequest.php
index 7d68f722022d..1389f5ce4124 100644
--- a/app/Http/Requests/Task/UpdateTaskRequest.php
+++ b/app/Http/Requests/Task/UpdateTaskRequest.php
@@ -42,7 +42,7 @@ class UpdateTaskRequest extends Request
         return $this->globalRules($rules);
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->decodePrimaryKeys($this->all());
 
diff --git a/app/Http/Requests/TaskStatus/EditTaskStatusRequest.php b/app/Http/Requests/TaskStatus/EditTaskStatusRequest.php
index 834af8d2f2e2..7b9ced466626 100644
--- a/app/Http/Requests/TaskStatus/EditTaskStatusRequest.php
+++ b/app/Http/Requests/TaskStatus/EditTaskStatusRequest.php
@@ -32,7 +32,7 @@ class EditTaskStatusRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php b/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php
index 0bd02b0d063f..201ebe22b8e6 100644
--- a/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php
+++ b/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php
@@ -28,7 +28,7 @@ class StoreTaskStatusRequest extends Request
         return auth()->user()->isAdmin();
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php b/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php
index f6e5a47b626c..ce3a19f4c238 100644
--- a/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php
+++ b/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php
@@ -41,7 +41,7 @@ class UpdateTaskStatusRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Template/ShowTemplateRequest.php b/app/Http/Requests/Template/ShowTemplateRequest.php
index c686857a07c4..922299c59ac7 100644
--- a/app/Http/Requests/Template/ShowTemplateRequest.php
+++ b/app/Http/Requests/Template/ShowTemplateRequest.php
@@ -37,7 +37,7 @@ class ShowTemplateRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/User/AttachCompanyUserRequest.php b/app/Http/Requests/User/AttachCompanyUserRequest.php
index 4cba2f792003..b89c6641e9c7 100644
--- a/app/Http/Requests/User/AttachCompanyUserRequest.php
+++ b/app/Http/Requests/User/AttachCompanyUserRequest.php
@@ -30,7 +30,7 @@ class AttachCompanyUserRequest extends Request
         return auth()->user()->isAdmin();
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $is_admin = request()->has('is_admin') ? request()->input('is_admin') : false;
         $permissions = request()->has('permissions') ? request()->input('permissions') : '';
diff --git a/app/Http/Requests/User/BulkUserRequest.php b/app/Http/Requests/User/BulkUserRequest.php
index 916546b7b95a..0b47131c4d0f 100644
--- a/app/Http/Requests/User/BulkUserRequest.php
+++ b/app/Http/Requests/User/BulkUserRequest.php
@@ -39,7 +39,7 @@ class BulkUserRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/User/StoreUserRequest.php b/app/Http/Requests/User/StoreUserRequest.php
index 734f390fc11a..dfd752d1e09c 100644
--- a/app/Http/Requests/User/StoreUserRequest.php
+++ b/app/Http/Requests/User/StoreUserRequest.php
@@ -54,7 +54,7 @@ class StoreUserRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/User/UpdateUserRequest.php b/app/Http/Requests/User/UpdateUserRequest.php
index f6e0eb7db485..42fa3f66e82e 100644
--- a/app/Http/Requests/User/UpdateUserRequest.php
+++ b/app/Http/Requests/User/UpdateUserRequest.php
@@ -41,7 +41,7 @@ class UpdateUserRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Vendor/StoreVendorRequest.php b/app/Http/Requests/Vendor/StoreVendorRequest.php
index 2ca3815dccfb..02bc2bcf37cc 100644
--- a/app/Http/Requests/Vendor/StoreVendorRequest.php
+++ b/app/Http/Requests/Vendor/StoreVendorRequest.php
@@ -52,7 +52,7 @@ class StoreVendorRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Vendor/UpdateVendorRequest.php b/app/Http/Requests/Vendor/UpdateVendorRequest.php
index 18a3680444de..27a06a20bd35 100644
--- a/app/Http/Requests/Vendor/UpdateVendorRequest.php
+++ b/app/Http/Requests/Vendor/UpdateVendorRequest.php
@@ -59,7 +59,7 @@ class UpdateVendorRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Webhook/StoreWebhookRequest.php b/app/Http/Requests/Webhook/StoreWebhookRequest.php
index e1db86ac73a2..22978933693b 100644
--- a/app/Http/Requests/Webhook/StoreWebhookRequest.php
+++ b/app/Http/Requests/Webhook/StoreWebhookRequest.php
@@ -33,7 +33,7 @@ class StoreWebhookRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Webhook/UpdateWebhookRequest.php b/app/Http/Requests/Webhook/UpdateWebhookRequest.php
index 5b946c548563..bc255153f889 100644
--- a/app/Http/Requests/Webhook/UpdateWebhookRequest.php
+++ b/app/Http/Requests/Webhook/UpdateWebhookRequest.php
@@ -37,7 +37,7 @@ class UpdateWebhookRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Import/Providers/BaseImport.php b/app/Import/Providers/BaseImport.php
index fe84585ac674..7badec42d03c 100644
--- a/app/Import/Providers/BaseImport.php
+++ b/app/Import/Providers/BaseImport.php
@@ -150,6 +150,22 @@ class BaseImport
         return $this->error_array;
     }
 
+
+    private function runValidation($data)
+    {        
+        $_syn_request_class = new $this->request_name;
+        $_syn_request_class->setContainer(app());
+        $_syn_request_class->initialize($data);
+        $_syn_request_class->prepareForValidation();
+
+        $validator = Validator::make($_syn_request_class->all(), $_syn_request_class->rules());
+
+        $_syn_request_class->setValidator($validator);
+
+        return $validator;
+
+    }
+
     public function ingest($data, $entity_type)
     {
         $count = 0;
@@ -157,7 +173,8 @@ class BaseImport
         foreach ($data as $key => $record) {
             try {
                 $entity = $this->transformer->transform($record);
-                $validator = $this->request_name::runFormRequest($entity);
+                // $validator = $this->request_name::runFormRequest($entity);
+                $validator = $this->runValidation($entity);
 
                 if ($validator->fails()) {
                     $this->error_array[$entity_type][] = [
@@ -172,7 +189,6 @@ class BaseImport
                             $this->getUserIDForRecord($entity)
                         )
                     );
-
                     $entity->saveQuietly();
                     $count++;
                 }
@@ -192,6 +208,8 @@ class BaseImport
                     $entity_type => $record,
                     'error' => $message,
                 ];
+             
+             nlog($ex->getMessage());   
             }
         }
 
diff --git a/app/Import/Providers/Csv.php b/app/Import/Providers/Csv.php
index b22f3c6579c1..dd1ee1f00299 100644
--- a/app/Import/Providers/Csv.php
+++ b/app/Import/Providers/Csv.php
@@ -166,6 +166,7 @@ class Csv extends BaseImport implements ImportInterface
 
             return;
         }
+nlog($data);
 
         $this->request_name = StorePaymentRequest::class;
         $this->repository_name = PaymentRepository::class;
@@ -178,6 +179,8 @@ class Csv extends BaseImport implements ImportInterface
 
         $payment_count = $this->ingest($data, $entity_type);
 
+nlog($payment_count);
+
         $this->entity_count['payments'] = $payment_count;
     }
 
diff --git a/composer.lock b/composer.lock
index 7c80aaca2f3e..9b43abaf3a57 100644
--- a/composer.lock
+++ b/composer.lock
@@ -378,16 +378,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.228.1",
+            "version": "3.228.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "53b7f43945b19bb0700c75d4c5f130055096e817"
+                "reference": "e7c4d70aef99e71f9114a302ec576dc2689df283"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/53b7f43945b19bb0700c75d4c5f130055096e817",
-                "reference": "53b7f43945b19bb0700c75d4c5f130055096e817",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e7c4d70aef99e71f9114a302ec576dc2689df283",
+                "reference": "e7c4d70aef99e71f9114a302ec576dc2689df283",
                 "shasum": ""
             },
             "require": {
@@ -395,7 +395,7 @@
                 "ext-json": "*",
                 "ext-pcre": "*",
                 "ext-simplexml": "*",
-                "guzzlehttp/guzzle": "^6.5.7 || ^7.4.4",
+                "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
                 "guzzlehttp/promises": "^1.4.0",
                 "guzzlehttp/psr7": "^1.8.5 || ^2.3",
                 "mtdowling/jmespath.php": "^2.6",
@@ -463,9 +463,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.228.1"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.228.2"
             },
-            "time": "2022-06-22T18:16:48+00:00"
+            "time": "2022-06-23T18:17:44+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -14641,5 +14641,5 @@
     "platform-dev": {
         "php": "^7.4|^8.0"
     },
-    "plugin-api-version": "2.0.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/config/app.php b/config/app.php
index 13222c030f18..445a57e65d66 100644
--- a/config/app.php
+++ b/config/app.php
@@ -169,7 +169,7 @@ return [
         Illuminate\Filesystem\FilesystemServiceProvider::class,
         Illuminate\Foundation\Providers\FoundationServiceProvider::class,
         Illuminate\Hashing\HashServiceProvider::class,
-        App\Providers\MailServiceProvider::class,
+        Illuminate\Mail\MailServiceProvider::class,
         Illuminate\Notifications\NotificationServiceProvider::class,
         Illuminate\Pagination\PaginationServiceProvider::class,
         Illuminate\Pipeline\PipelineServiceProvider::class,
diff --git a/tests/Feature/CompanySettingsTest.php b/tests/Feature/CompanySettingsTest.php
index 6a1faf3f90f5..803cbe15da0e 100644
--- a/tests/Feature/CompanySettingsTest.php
+++ b/tests/Feature/CompanySettingsTest.php
@@ -39,7 +39,7 @@ class CompanySettingsTest extends TestCase
         Session::start();
 
         $this->faker = \Faker\Factory::create();
-        $this->withoutExceptionHandling();
+        // $this->withoutExceptionHandling();
         Model::reguard();
     }
 
@@ -53,14 +53,11 @@ class CompanySettingsTest extends TestCase
 
         $response = false;
 
-nlog($this->company->toJson());
-
-
         try {
             $response = $this->withHeaders([
                 'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-Token' => $this->token,
-            ])->put('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
+                'X-API-TOKEN' => $this->token,
+            ])->putJson('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
         }
@@ -86,7 +83,7 @@ nlog($this->company->toJson());
             $response = $this->withHeaders([
                 'X-API-SECRET' => config('ninja.api_secret'),
                 'X-API-Token' => $this->token,
-            ])->put('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
+            ])->putJson('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
@@ -113,7 +110,7 @@ nlog($this->company->toJson());
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-Token' => $this->token,
-        ])->put('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
+        ])->putJson('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
 
         $response->assertStatus(200);
 
@@ -139,7 +136,7 @@ nlog($this->company->toJson());
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-Token' => $this->token,
-        ])->put('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
+        ])->putJson('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
 
         $response->assertStatus(200);
 
@@ -166,7 +163,7 @@ nlog($this->company->toJson());
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-Token' => $this->token,
-        ])->put('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
+        ])->putJson('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
 
         $response->assertStatus(200);
 
@@ -189,7 +186,7 @@ nlog($this->company->toJson());
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-Token' => $this->token,
-        ])->post('/api/v1/companies?include=company', $this->company->toArray());
+        ])->postJson('/api/v1/companies?include=company', $this->company->toArray());
 
         $arr = $response->json();
         $response->assertStatus(200);
@@ -207,7 +204,7 @@ nlog($this->company->toJson());
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-Token' => $this->token,
-        ])->post('/api/v1/companies?include=company', $this->company->toArray());
+        ])->postJson('/api/v1/companies?include=company', $this->company->toArray());
 
         $arr = $response->json();
         $response->assertStatus(200);
@@ -225,7 +222,7 @@ nlog($this->company->toJson());
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-Token' => $this->token,
-        ])->post('/api/v1/companies?include=company', $this->company->toArray());
+        ])->postJson('/api/v1/companies?include=company', $this->company->toArray());
 
         $arr = $response->json();
         $response->assertStatus(200);
@@ -243,7 +240,7 @@ nlog($this->company->toJson());
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-Token' => $this->token,
-        ])->post('/api/v1/companies?include=company', $this->company->toArray());
+        ])->postJson('/api/v1/companies?include=company', $this->company->toArray());
 
         $arr = $response->json();
         $response->assertStatus(200);
diff --git a/tests/Feature/CompanyTest.php b/tests/Feature/CompanyTest.php
index 68bde286ddf3..255d51bdff76 100644
--- a/tests/Feature/CompanyTest.php
+++ b/tests/Feature/CompanyTest.php
@@ -99,7 +99,7 @@ class CompanyTest extends TestCase
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->put('/api/v1/companies/'.$this->encodePrimaryKey($company->id), $company_update)
+        ])->putJson('/api/v1/companies/'.$this->encodePrimaryKey($company->id), $company_update)
             ->assertStatus(200);
 
         $settings = CompanySettings::defaults();
@@ -112,7 +112,7 @@ class CompanyTest extends TestCase
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->put('/api/v1/companies/'.$this->encodePrimaryKey($company->id), $company->toArray())
+        ])->putJson('/api/v1/companies/'.$this->encodePrimaryKey($company->id), $company->toArray())
         ->assertStatus(200)->decodeResponseJson();
 
         $response = $this->withHeaders([
diff --git a/tests/Feature/GroupSettingTest.php b/tests/Feature/GroupSettingTest.php
index a82b54df0f0f..d200289be514 100644
--- a/tests/Feature/GroupSettingTest.php
+++ b/tests/Feature/GroupSettingTest.php
@@ -51,7 +51,7 @@ class GroupSettingTest extends TestCase
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/group_settings', $data);
+        ])->postJson('/api/v1/group_settings', $data);
 
         $response->assertStatus(200);
 
@@ -74,7 +74,7 @@ class GroupSettingTest extends TestCase
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/group_settings', $data);
+        ])->postJson('/api/v1/group_settings', $data);
 
         $response->assertStatus(200);
 
@@ -88,7 +88,7 @@ class GroupSettingTest extends TestCase
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/group_settings/bulk', $data);
+        ])->postJson('/api/v1/group_settings/bulk', $data);
 
         $response->assertStatus(200);
 
diff --git a/tests/Feature/Import/CSV/CsvImportTest.php b/tests/Feature/Import/CSV/CsvImportTest.php
index c68cfd1c85e8..36197053d47b 100644
--- a/tests/Feature/Import/CSV/CsvImportTest.php
+++ b/tests/Feature/Import/CSV/CsvImportTest.php
@@ -149,7 +149,6 @@ class CsvImportTest extends TestCase
         $base_transformer = new BaseTransformer($this->company);
 
         $this->assertTrue($base_transformer->hasProduct('officiis'));
-        // $this->assertTrue($base_transformer->hasProduct('maxime'));
     }
 
     public function testClientImport()
@@ -280,7 +279,7 @@ class CsvImportTest extends TestCase
 
         $csv_importer->import('invoice');
 
-        $this->assertTrue($base_transformer->hasInvoice('801'));
+        $this->assertTrue($base_transformer->hasInvoice('780'));
 
         /* Lets piggy back payments tests here to save rebuilding the test multiple times*/
 
@@ -309,15 +308,15 @@ class CsvImportTest extends TestCase
 
         $csv_importer->import('payment');
 
-        $this->assertTrue($base_transformer->hasInvoice('801'));
+        $this->assertTrue($base_transformer->hasInvoice('780'));
 
-        $invoice_id = $base_transformer->getInvoiceId('801');
+        $invoice_id = $base_transformer->getInvoiceId('780');
 
-        $invoice = Invoice::find($invoice_id);
+        $invoice = Invoice::with('payments')->find($invoice_id);
 
         $this->assertTrue($invoice->payments()->exists());
-        $this->assertEquals(3, $invoice->payments()->count());
-        $this->assertEquals(1200, $invoice->payments()->sum('payments.amount'));
+        $this->assertEquals(1, $invoice->payments()->count());
+        $this->assertEquals(51.03, round($invoice->payments()->sum('payments.amount'),2));
     }
 }
 
diff --git a/tests/Feature/Import/invoice.csv b/tests/Feature/Import/invoice.csv
index f5a1f20affb4..629bdd93a083 100644
--- a/tests/Feature/Import/invoice.csv
+++ b/tests/Feature/Import/invoice.csv
@@ -403,5 +403,3 @@ Ms. Alena Cassin,golden.green@example.org,777,$17.94,$12.76,,Partial,2019-12-05,
 Ms. Alena Cassin,golden.green@example.org,778,$14.88,$7.97,,Partial,2020-02-27,2019-11-29,,$0.00,,,,sed,In nulla eos ipsam molestias. Perferendis sunt et consequuntur qui ex nesciunt et. Amet animi aut dicta qui facilis voluptatem.,4.96,3
 Ms. Alena Cassin,golden.green@example.org,779,$49.00,$28.77,,Partial,2019-10-25,2020-01-10,,$0.00,,,,facere,Reiciendis voluptas unde et ut. Omnis dolorum modi facere exercitationem fuga. Eum recusandae ut ea qui autem.,4.9,10
 Ms. Alena Cassin,golden.green@example.org,780,$51.03,$51.03,,Paid,2019-12-01,2020-01-14,,$0.00,,,,voluptas,Saepe eius placeat sit mollitia magni. Porro ipsam praesentium tempora iste. Suscipit dolorem omnis eligendi corrupti est nobis.,7.29,7
-Ludwig Krajcik DVM,brook59@example.org,801,$-400.00,$0.00,,Sent,2020-01-22,2020-01-29,,$0.00,,,,1,10,1,-200
-Ludwig Krajcik DVM,brook59@example.org,801,$-400.00,$0.00,,Sent,2020-01-22,2020-01-29,,$0.00,,,,2,5,1,-200