fixed #484

akaunting · Sep 12, 2018 · 7eba729 · 7eba729
1 parent e3dd0b0
commit 7eba729
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 32 deletions.
diff --git a/app/Http/Middleware/DateFormat.php b/app/Http/Middleware/DateFormat.php
@@ -16,42 +16,19 @@ class DateFormat
      */
     public function handle($request, Closure $next)
     {
-        if ($request->method() == 'POST' || $request->method() == 'PATCH') {
-            $paid_at = $request->get('paid_at');
-            $due_at = $request->get('due_at');
-            $billed_at = $request->get('billed_at');
-            $invoiced_at = $request->get('invoiced_at');
+        if (($request->method() == 'POST') || ($request->method() == 'PATCH')) {
+            $fields = ['paid_at', 'due_at', 'billed_at', 'invoiced_at'];
 
-            if (!empty($paid_at)) {
-                $paid_at = Date::parse($paid_at)->format('Y-m-d');
+            foreach ($fields as $field) {
+                $date = $request->get($field);
 
-                $date_time = $paid_at . ' ' . Date::now()->format('H:i:s');
+                if (empty($date)) {
+                    continue;
+                }
 
-                $request->request->set('paid_at', $date_time);
-            }
-
-            if (!empty($due_at)) {
-                $due_at = Date::parse($due_at)->format('Y-m-d');
-
-                $date_time = $due_at . ' ' . Date::now()->format('H:i:s');
-
-                $request->request->set('due_at', $date_time);
-            }
-
-            if (!empty($billed_at)) {
-                $billed_at = Date::parse($billed_at)->format('Y-m-d');
-
-                $date_time = $billed_at . ' ' . Date::now()->format('H:i:s');
-
-                $request->request->set('billed_at', $date_time);
-            }
-
-            if (!empty($invoiced_at)) {
-                $invoiced_at = Date::parse($invoiced_at)->format('Y-m-d');
-
-                $date_time = $invoiced_at . ' ' . Date::now()->format('H:i:s');
+                $new_date = Date::parse($date)->format('Y-m-d')  . ' ' . Date::now()->format('H:i:s');
 
-                $request->request->set('invoiced_at', $date_time);
+                $request->request->set($field, $new_date);
             }
         }
 

diff --git a/app/Utilities/Import.php b/app/Utilities/Import.php
@@ -2,6 +2,7 @@
 
 namespace App\Utilities;
 
+use Date;
 use Illuminate\Validation\ValidationException;
 
 class Import
@@ -44,6 +45,18 @@ public static function createFromSheet($sheet, $slug)
         $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;
+            }
+
             // Set the line values so that request class could validate
             request()->merge($data);