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

Merge pull request #2884 from CihanSenturk/import-validation-issue

Browse Source 
Import validation issue
This commit is contained in:
Cüneyt Şentürk 2023-02-13 18:38:01 +03:00 committed by GitHub
commit 0c810bae9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Imports/Banking/Transactions.php
View File

@ -17,10 +17,10 @@ class Transactions extends Import
{ {
$row = parent::map($row); $row = parent::map($row);
$row['currency_code'] = $this->getCurrencyCode($row);
$row['account_id'] = $this->getAccountId($row); $row['account_id'] = $this->getAccountId($row);
$row['category_id'] = $this->getCategoryId($row); $row['category_id'] = $this->getCategoryId($row);
$row['contact_id'] = $this->getContactId($row); $row['contact_id'] = $this->getContactId($row);
$row['currency_code'] = $this->getCurrencyCode($row);
$row['document_id'] = $this->getDocumentId($row); $row['document_id'] = $this->getDocumentId($row);
return $row; return $row;

11
app/Imports/Common/Sheets/ItemTaxes.php
View File

@ -4,7 +4,6 @@ namespace App\Imports\Common\Sheets;
use App\Abstracts\Import; use App\Abstracts\Import;
use App\Http\Requests\Common\ItemTax as Request; use App\Http\Requests\Common\ItemTax as Request;
use App\Models\Common\Item;
use App\Models\Common\ItemTax as Model; use App\Models\Common\ItemTax as Model;
class ItemTaxes extends Import class ItemTaxes extends Import
@ -16,14 +15,14 @@ class ItemTaxes extends Import
public function map($row): array public function map($row): array
{ {
$row = parent::map($row); if ($this->isEmpty($row, 'item_name')) {
$row['item_id'] = (int) Item::where('name', $row['item_name'])->value('id');
if ($this->isEmpty($row, 'item_id')) {
return []; return [];
} }
$row = parent::map($row);
$row['item_id'] = $this->getItemId($row);
$row['tax_id'] = $this->getTaxId($row); $row['tax_id'] = $this->getTaxId($row);
return $row; return $row;

20
app/Traits/Import.php
View File

@ -102,7 +102,7 @@ trait Import
'created_by' => $row['created_by'], 'created_by' => $row['created_by'],
]; ];
Validator::validate($data, [(new CurrencyRequest)->rules()]); Validator::validate($data, (new CurrencyRequest)->rules());
$currency = $this->dispatch(new CreateCurrency($data)); $currency = $this->dispatch(new CreateCurrency($data));
@ -181,7 +181,7 @@ trait Import
'created_by' => $row['created_by'], 'created_by' => $row['created_by'],
]; ];
Validator::validate($data, [(new AccountRequest)->rules()]); Validator::validate($data, (new AccountRequest)->rules());
$account = $this->dispatch(new CreateAccount($data)); $account = $this->dispatch(new CreateAccount($data));
@ -207,7 +207,7 @@ trait Import
'created_by' => $row['created_by'], 'created_by' => $row['created_by'],
]; ];
Validator::validate($data, [(new AccountRequest)->rules()]); Validator::validate($data, (new AccountRequest)->rules());
$account = $this->dispatch(new CreateAccount($data)); $account = $this->dispatch(new CreateAccount($data));
@ -233,7 +233,7 @@ trait Import
'created_by' => $row['created_by'], 'created_by' => $row['created_by'],
]; ];
Validator::validate($data, [(new AccountRequest)->rules()]); Validator::validate($data, (new AccountRequest)->rules());
$account = $this->dispatch(new CreateAccount($data)); $account = $this->dispatch(new CreateAccount($data));
@ -258,7 +258,7 @@ trait Import
'created_by' => $row['created_by'], 'created_by' => $row['created_by'],
]; ];
Validator::validate($data, [(new CategoryRequest)->rules()]); Validator::validate($data, (new CategoryRequest)->rules());
$category = $this->dispatch(new CreateCategory($data)); $category = $this->dispatch(new CreateCategory($data));
@ -284,7 +284,7 @@ trait Import
'created_by' => $row['created_by'], 'created_by' => $row['created_by'],
]; ];
Validator::validate($data, [(new ContactRequest)->rules()]); Validator::validate($data, (new ContactRequest)->rules());
$contact = $this->dispatch(new CreateContact($data)); $contact = $this->dispatch(new CreateContact($data));
@ -310,7 +310,7 @@ trait Import
'created_by' => $row['created_by'], 'created_by' => $row['created_by'],
]; ];
Validator::validate($data, [(new ContactRequest)->rules()]); Validator::validate($data, (new ContactRequest)->rules());
$contact = $this->dispatch(new CreateContact($data)); $contact = $this->dispatch(new CreateContact($data));
@ -335,7 +335,7 @@ trait Import
'created_by' => $row['created_by'], 'created_by' => $row['created_by'],
]; ];
Validator::validate($data, [(new ItemRequest())->rules()]); Validator::validate($data, (new ItemRequest())->rules());
$item = $this->dispatch(new CreateItem($data)); $item = $this->dispatch(new CreateItem($data));
@ -354,13 +354,13 @@ trait Import
'company_id' => company_id(), 'company_id' => company_id(),
'rate' => $row['tax_rate'], 'rate' => $row['tax_rate'],
'type' => $type, 'type' => $type,
'name' => !empty($row['tax_name']) ? $row['tax_name'] : $row['tax_rate'], 'name' => !empty($row['tax_name']) ? $row['tax_name'] : (string) $row['tax_rate'],
'enabled' => 1, 'enabled' => 1,
'created_from' => $row['created_from'], 'created_from' => $row['created_from'],
'created_by' => $row['created_by'], 'created_by' => $row['created_by'],
]; ];
Validator::validate($data, [(new TaxRequest())->rules()]); Validator::validate($data, (new TaxRequest())->rules());
$tax = $this->dispatch(new CreateTax($data)); $tax = $this->dispatch(new CreateTax($data));