Validation issues for import fixed

app/Imports/Banking/Transactions.php

@@ -8,6 +8,8 @@ use App\Models\Banking\Transaction as Model;
 
 class Transactions extends Import
 {
+    public $request_class = Request::class;
+
     public function model(array $row)
     {
         return new Model($row);
@@ -25,9 +27,4 @@ class Transactions extends Import
 
         return $row;
     }
-
-    public function rules(): array
-    {
-        return (new Request())->rules();
-    }
 }

app/Imports/Banking/Transfers.php

@@ -26,10 +26,10 @@ class Transfers extends Import
         $row = parent::map($row);
 
         $row['transferred_at'] = Date::parse($row['transferred_at'])->format('Y-m-d');
-        $row['from_account_id'] = $this->getFromAccountId($row);
-        $row['to_account_id'] = $this->getToAccountId($row);
         $row['from_currency_code'] = $this->getFromCurrencyCode($row);
         $row['to_currency_code'] = $this->getToCurrencyCode($row);
+        $row['from_account_id'] = $this->getFromAccountId($row);
+        $row['to_account_id'] = $this->getToAccountId($row);
         $row['expense_transaction_id'] = $this->getExpenseTransactionId($row);
         $row['income_transaction_id'] = $this->getIncomeTransactionId($row);
 

app/Imports/Common/Sheets/ItemTaxes.php

@@ -8,6 +8,8 @@ use App\Models\Common\ItemTax as Model;
 
 class ItemTaxes extends Import
 {
+    public $request_class = Request::class;
+
     public function model(array $row)
     {
         return new Model($row);
@@ -27,9 +29,4 @@ class ItemTaxes extends Import
 
         return $row;
     }
-
-    public function rules(): array
-    {
-        return (new Request())->rules();
-    }
 }

app/Imports/Common/Sheets/Items.php

@@ -8,6 +8,8 @@ use App\Models\Common\Item as Model;
 
 class Items extends Import
 {
+    public $request_class = Request::class;
+
     public function model(array $row)
     {
         return new Model($row);
@@ -25,9 +27,4 @@ class Items extends Import
 
         return $row;
     }
-
-    public function rules(): array
-    {
-        return (new Request())->rules();
-    }
 }

app/Imports/Purchases/Sheets/BillHistories.php

@@ -9,6 +9,8 @@ use App\Models\Document\DocumentHistory as Model;
 
 class BillHistories extends Import
 {
+    public $request_class = Request::class;
+
     public function model(array $row)
     {
         return new Model($row);
@@ -33,10 +35,8 @@ class BillHistories extends Import
         return $row;
     }
 
-    public function rules(): array
+    public function prepareRules(array $rules): array
     {
-        $rules = (new Request())->rules();
-
         $rules['bill_number'] = 'required|string';
 
         unset($rules['bill_id']);

app/Imports/Purchases/Sheets/BillItemTaxes.php

@@ -11,6 +11,8 @@ use App\Models\Document\DocumentItemTax as Model;
 
 class BillItemTaxes extends Import
 {
+    public $request_class = Request::class;
+
     public function model(array $row)
     {
         return new Model($row);
@@ -46,10 +48,8 @@ class BillItemTaxes extends Import
         return $row;
     }
 
-    public function rules(): array
+    public function prepareRules(array $rules): array
     {
-        $rules = (new Request())->rules();
-
         $rules['bill_number'] = 'required|string';
 
         unset($rules['bill_id']);

app/Imports/Purchases/Sheets/BillItems.php

@@ -9,6 +9,8 @@ use App\Models\Document\DocumentItem as Model;
 
 class BillItems extends Import
 {
+    public $request_class = Request::class;
+
     public function model(array $row)
     {
         return new Model($row);
@@ -39,10 +41,8 @@ class BillItems extends Import
         return $row;
     }
 
-    public function rules(): array
+    public function prepareRules(array $rules): array
     {
-        $rules = (new Request())->rules();
-
         $rules['bill_number'] = 'required|string';
 
         unset($rules['bill_id']);

app/Imports/Purchases/Sheets/BillTotals.php

@@ -9,6 +9,8 @@ use App\Models\Document\DocumentTotal as Model;
 
 class BillTotals extends Import
 {
+    public $request_class = Request::class;
+
     public function model(array $row)
     {
         return new Model($row);
@@ -30,10 +32,8 @@ class BillTotals extends Import
         return $row;
     }
 
-    public function rules(): array
+    public function prepareRules(array $rules): array
     {
-        $rules = (new Request())->rules();
-
         $rules['bill_number'] = 'required|string';
 
         unset($rules['bill_id']);

app/Imports/Purchases/Sheets/BillTransactions.php

@@ -8,6 +8,8 @@ use App\Models\Banking\Transaction as Model;
 
 class BillTransactions extends Import
 {
+    public $request_class = Request::class;
+
     public function model(array $row)
     {
         return new Model($row);
@@ -34,10 +36,8 @@ class BillTransactions extends Import
         return $row;
     }
 
-    public function rules(): array
+    public function prepareRules(array $rules): array
     {
-        $rules = (new Request())->rules();
-
         $rules['bill_number'] = 'required|string';
 
         return $rules;

app/Imports/Purchases/Sheets/Bills.php

@@ -9,6 +9,8 @@ use Illuminate\Support\Str;
 
 class Bills extends Import
 {
+    public $request_class = Request::class;
+
     public function model(array $row)
     {
         return new Model($row);
@@ -37,16 +39,14 @@ class Bills extends Import
         return $row;
     }
 
-    public function rules(): array
+    public function prepareRules(array $rules): array
     {
-        $rules = (new Request())->rules();
-
         $rules['bill_number'] = Str::replaceFirst('unique:documents,NULL', 'unique:documents,document_number', $rules['document_number']);
         $rules['billed_at'] = $rules['issued_at'];
         $rules['currency_rate'] = 'required';
 
         unset($rules['document_number'], $rules['issued_at'], $rules['type']);
 
-        return $this->replaceForBatchRules($rules);
+        return $rules;
     }
 }

app/Imports/Purchases/Vendors.php

@@ -8,6 +8,8 @@ use App\Models\Common\Contact as Model;
 
 class Vendors extends Import
 {
+    public $request_class = Request::class;
+
     public function model(array $row)
     {
         return new Model($row);
@@ -26,9 +28,4 @@ class Vendors extends Import
 
         return $row;
     }
-
-    public function rules(): array
-    {
-        return (new Request())->rules();
-    }
 }

app/Imports/Sales/Customers.php

@@ -8,6 +8,8 @@ use App\Models\Common\Contact as Model;
 
 class Customers extends Import
 {
+    public $request_class = Request::class;
+
     public function model(array $row)
     {
         return new Model($row);
@@ -26,9 +28,4 @@ class Customers extends Import
 
         return $row;
     }
-
-    public function rules(): array
-    {
-        return (new Request())->rules();
-    }
 }

app/Imports/Sales/Sheets/InvoiceHistories.php

@@ -9,6 +9,8 @@ use App\Models\Document\DocumentHistory as Model;
 
 class InvoiceHistories extends Import
 {
+    public $request_class = Request::class;
+
     public function model(array $row)
     {
         return new Model($row);
@@ -33,10 +35,8 @@ class InvoiceHistories extends Import
         return $row;
     }
 
-    public function rules(): array
+    public function prepareRules(array $rules): array
     {
-        $rules = (new Request())->rules();
-
         $rules['invoice_number'] = 'required|string';
 
         unset($rules['invoice_id']);

app/Imports/Sales/Sheets/InvoiceItemTaxes.php

@@ -11,6 +11,8 @@ use App\Models\Document\DocumentItemTax as Model;
 
 class InvoiceItemTaxes extends Import
 {
+    public $request_class = Request::class;
+
     public function model(array $row)
     {
         return new Model($row);
@@ -46,10 +48,8 @@ class InvoiceItemTaxes extends Import
         return $row;
     }
 
-    public function rules(): array
+    public function prepareRules(array $rules): array
     {
-        $rules = (new Request())->rules();
-
         $rules['invoice_number'] = 'required|string';
 
         unset($rules['invoice_id']);

app/Imports/Sales/Sheets/InvoiceItems.php

@@ -9,6 +9,8 @@ use App\Models\Document\DocumentItem as Model;
 
 class InvoiceItems extends Import
 {
+    public $request_class = Request::class;
+
     public function model(array $row)
     {
         return new Model($row);
@@ -39,10 +41,8 @@ class InvoiceItems extends Import
         return $row;
     }
 
-    public function rules(): array
+    public function prepareRules(array $rules): array
     {
-        $rules = (new Request())->rules();
-
         $rules['invoice_number'] = 'required|string';
 
         unset($rules['invoice_id']);

app/Imports/Sales/Sheets/InvoiceTotals.php

@@ -9,6 +9,8 @@ use App\Models\Document\DocumentTotal as Model;
 
 class InvoiceTotals extends Import
 {
+    public $request_class = Request::class;
+
     public function model(array $row)
     {
         return new Model($row);
@@ -30,10 +32,8 @@ class InvoiceTotals extends Import
         return $row;
     }
 
-    public function rules(): array
+    public function prepareRules(array $rules): array
     {
-        $rules = (new Request())->rules();
-
         $rules['invoice_number'] = 'required|string';
 
         unset($rules['invoice_id']);

app/Imports/Sales/Sheets/InvoiceTransactions.php

@@ -8,6 +8,8 @@ use App\Models\Banking\Transaction as Model;
 
 class InvoiceTransactions extends Import
 {
+    public $request_class = Request::class;
+
     public function model(array $row)
     {
         return new Model($row);
@@ -24,20 +26,18 @@ class InvoiceTransactions extends Import
         $row = parent::map($row);
 
         $row['type'] = 'income';
+        $row['currency_code'] = $this->getCurrencyCode($row);
         $row['account_id'] = $this->getAccountId($row);
         $row['category_id'] = $this->getCategoryId($row, 'income');
         $row['contact_id'] = $this->getContactId($row, 'customer');
-        $row['currency_code'] = $this->getCurrencyCode($row);
         $row['document_id'] = $this->getDocumentId($row);
         $row['number'] = $row['transaction_number'];
 
         return $row;
     }
 
-    public function rules(): array
+    public function prepareRules(array $rules): array
     {
-        $rules = (new Request())->rules();
-
         $rules['invoice_number'] = 'required|string';
 
         return $rules;

app/Imports/Sales/Sheets/Invoices.php

@@ -9,6 +9,8 @@ use Illuminate\Support\Str;
 
 class Invoices extends Import
 {
+    public $request_class = Request::class;
+
     public function model(array $row)
     {
         return new Model($row);
@@ -37,16 +39,14 @@ class Invoices extends Import
         return $row;
     }
 
-    public function rules(): array
+    public function prepareRules(array $rules): array
     {
-        $rules = (new Request())->rules();
-
         $rules['invoice_number'] = Str::replaceFirst('unique:documents,NULL', 'unique:documents,document_number', $rules['document_number']);
         $rules['invoiced_at'] = $rules['issued_at'];
         $rules['currency_rate'] = 'required';
 
         unset($rules['document_number'], $rules['issued_at'], $rules['type']);
 
-        return $this->replaceForBatchRules($rules);
+        return $rules;
     }
 }

app/Imports/Settings/Categories.php

@@ -8,6 +8,8 @@ use App\Models\Setting\Category as Model;
 
 class Categories extends Import
 {
+    public $request_class = Request::class;
+
     public function model(array $row)
     {
         return new Model($row);
@@ -21,9 +23,4 @@ class Categories extends Import
 
         return $row;
     }
-
-    public function rules(): array
-    {
-        return (new Request())->rules();
-    }
 }

app/Imports/Settings/Taxes.php

@@ -8,13 +8,10 @@ use App\Models\Setting\Tax as Model;
 
 class Taxes extends Import
 {
+    public $request_class = Request::class;
+
     public function model(array $row)
     {
         return new Model($row);
     }
-
-    public function rules(): array
-    {
-        return (new Request())->rules();
-    }
 }