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

Fix countries for documents #1p66u4u

Browse Source
This commit is contained in:
Cüneyt Şentürk
2021-11-08 02:40:40 +03:00
parent 4f1146dc33
commit d9d0e09e3a
15 changed files with 112 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,11 +22,14 @@ class Bills extends Import
$row = parent::map($row);
$country = array_search($row['contact_country'], trans('countries'));
$row['document_number'] = $row['bill_number'];
$row['issued_at'] = $row['billed_at'];
$row['category_id'] = $this->getCategoryId($row, 'expense');
$row['contact_id'] = $this->getContactId($row, 'vendor');
$row['type'] = Model::BILL_TYPE;
$row['contact_country'] = !empty($country) ? $country : null;
return $row;
}

3
app/Imports/Purchases/Vendors.php
View File

@ -17,7 +17,10 @@ class Vendors extends Import
{
$row = parent::map($row);
$country = array_search($row['country'], trans('countries'));
$row['type'] = 'vendor';
$row['country'] = !empty($country) ? $country : null;
return $row;
}

3
app/Imports/Sales/Customers.php
View File

@ -17,7 +17,10 @@ class Customers extends Import
{
$row = parent::map($row);
$country = array_search($row['country'], trans('countries'));
$row['type'] = 'customer';
$row['country'] = !empty($country) ? $country : null;
return $row;
}

3
app/Imports/Sales/Sheets/Invoices.php
View File

@ -22,11 +22,14 @@ class Invoices extends Import
$row = parent::map($row);
$country = array_search($row['contact_country'], trans('countries'));
$row['document_number'] = $row['invoice_number'];
$row['issued_at'] = $row['invoiced_at'];
$row['category_id'] = $this->getCategoryId($row, 'income');
$row['contact_id'] = $this->getContactId($row, 'customer');
$row['type'] = Model::INVOICE_TYPE;
$row['contact_country'] = !empty($country) ? $country : null;
return $row;
}