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

improved document import

Browse Source
This commit is contained in:
Denis Duliçi 2021-02-15 23:11:10 +03:00
parent 96fd43384a
commit 7a10757c8d
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Exports/Banking/Transactions.php
View File

@ -11,7 +11,7 @@ class Transactions extends Export implements WithColumnFormatting
{ {
public function collection() public function collection()
{ {
$model = Model::with('account', 'bill', 'category', 'contact', 'invoice')->usingSearchString(request('search')); $model = Model::with('account', 'category', 'contact', 'document')->usingSearchString(request('search'));
if (!empty($this->ids)) { if (!empty($this->ids)) {
$model->whereIn('id', (array) $this->ids); $model->whereIn('id', (array) $this->ids);
@ -25,12 +25,7 @@ class Transactions extends Export implements WithColumnFormatting
$model->account_name = $model->account->name; $model->account_name = $model->account->name;
$model->contact_email = $model->contact->email; $model->contact_email = $model->contact->email;
$model->category_name = $model->category->name; $model->category_name = $model->category->name;
$model->invoice_bill_number = $model->document->document_number ?? 0;
if ($model->type == 'income') {
$model->invoice_bill_number = $model->invoice->document_number ?? 0;
} else {
$model->invoice_bill_number = $model->bill->document_number ?? 0;
}
return parent::map($model); return parent::map($model);
} }

4
app/Traits/Import.php
View File

@ -64,6 +64,10 @@ trait Import
{ {
$id = isset($row['document_id']) ? $row['document_id'] : null; $id = isset($row['document_id']) ? $row['document_id'] : null;
if (empty($id) && !empty($row['document_number'])) {
$id = Document::number($row['document_number'])->pluck('id')->first();
}
if (empty($id) && !empty($row['invoice_number'])) { if (empty($id) && !empty($row['invoice_number'])) {
$id = Document::invoice()->number($row['invoice_number'])->pluck('id')->first(); $id = Document::invoice()->number($row['invoice_number'])->pluck('id')->first();
} }