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

improved import mapping

Browse Source
This commit is contained in:
denisdulici
2020-01-20 11:12:14 +03:00
parent d7cf148958
commit f58a15034a
9 changed files with 22 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Imports/Purchases/Payments.php
View File

@@ -5,7 +5,6 @@ namespace App\Imports\Purchases;
use App\Abstracts\Import;
use App\Models\Banking\Transaction as Model;
use App\Http\Requests\Banking\Transaction as Request;
use Jenssegers\Date\Date;
class Payments extends Import
{
@@ -16,14 +15,9 @@ class Payments extends Import
public function map($row): array
{
$row['company_id'] = session('company_id');
$row['type'] = 'expense';
$row['paid_at'] = Date::parse($row['paid_at'])->format('Y-m-d H:i:s');
$row = parent::map($row);
// Make reconciled field integer
if (isset($row['reconciled'])) {
$row['reconciled'] = (int) $row['reconciled'];
}
$row['type'] = 'expense';
return $row;
}

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

@@ -5,7 +5,6 @@ namespace App\Imports\Purchases\Sheets;
use App\Abstracts\Import;
use App\Models\Banking\Transaction as Model;
use App\Http\Requests\Banking\Transaction as Request;
use Jenssegers\Date\Date;
class BillTransactions extends Import
{
@@ -16,14 +15,9 @@ class BillTransactions extends Import
public function map($row): array
{
$row['company_id'] = session('company_id');
$row['type'] = 'expense';
$row['paid_at'] = Date::parse($row['paid_at'])->format('Y-m-d H:i:s');
$row = parent::map($row);
// Make reconciled field integer
if (isset($row['reconciled'])) {
$row['reconciled'] = (int) $row['reconciled'];
}
$row['type'] = 'expense';
return $row;
}

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

@@ -5,7 +5,6 @@ namespace App\Imports\Purchases\Sheets;
use App\Abstracts\Import;
use App\Models\Purchase\Bill as Model;
use App\Http\Requests\Purchase\Bill as Request;
use Jenssegers\Date\Date;
class Bills extends Import
{
@@ -14,15 +13,6 @@ class Bills extends Import
return new Model($row);
}
public function map($row): array
{
$row['company_id'] = session('company_id');
$row['billed_at'] = Date::parse($row['billed_at'])->format('Y-m-d H:i:s');
$row['due_at'] = Date::parse($row['due_at'])->format('Y-m-d H:i:s');
return $row;
}
public function rules(): array
{
return (new Request())->rules();

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

@@ -15,13 +15,9 @@ class Vendors extends Import
public function map($row): array
{
$row['company_id'] = session('company_id');
$row['type'] = 'vendor';
$row = parent::map($row);
// Make enabled field integer
if (isset($row['enabled'])) {
$row['enabled'] = (int) $row['enabled'];
}
$row['type'] = 'vendor';
return $row;
}