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

fixed #485

Browse Source
This commit is contained in:
denisdulici 2018-09-12 15:56:08 +03:00
parent 7eba729e21
commit 7d643ca58e
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/Utilities/Import.php
View File

@ -43,19 +43,7 @@ class Import
// Loop through all rows
$sheet->each(function ($row, $index) use ($sheet, &$success, $model, $request) {
$data = $row->toArray();
// Fix the date fields
$date_fields = ['paid_at', 'due_at', 'billed_at', 'invoiced_at'];
foreach ($date_fields as $date_field) {
if (empty($data[$date_field])) {
continue;
}
$new_date = Date::parse($data[$date_field])->format('Y-m-d') . ' ' . Date::now()->format('H:i:s');
$data[$date_field] = $new_date;
}
$data = static::fixRow($row->toArray());
// Set the line values so that request class could validate
request()->merge($data);
@ -104,4 +92,26 @@ class Import
return true;
}
protected static function fixRow($data)
{
// Fix the date fields
$date_fields = ['paid_at', 'due_at', 'billed_at', 'invoiced_at'];
foreach ($date_fields as $date_field) {
if (empty($data[$date_field])) {
continue;
}
$new_date = Date::parse($data[$date_field])->format('Y-m-d') . ' ' . Date::now()->format('H:i:s');
$data[$date_field] = $new_date;
}
// Make enabled field integer
if (isset($data['enabled'])) {
$data['enabled'] = (int) $data['enabled'];
}
return $data;
}
}