shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Validation issues for import fixed

Browse Source
This commit is contained in:
EnesSacid-Buker
2023-03-07 15:18:14 +03:00
parent f2b73d83d8
commit d2e96fbe23
27 changed files with 174 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Imports/Purchases/Sheets/BillHistories.php
View File

@@ -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']);

6
app/Imports/Purchases/Sheets/BillItemTaxes.php
View File

@@ -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']);

6
app/Imports/Purchases/Sheets/BillItems.php
View File

@@ -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']);

6
app/Imports/Purchases/Sheets/BillTotals.php
View File

@@ -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']);

6
app/Imports/Purchases/Sheets/BillTransactions.php
View File

@@ -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;

8
app/Imports/Purchases/Sheets/Bills.php
View File

@@ -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;
}
}