Merge pull request #2989 from boracakirel/added-dates-formating-event

Added dates formating event.
akaunting · Jun 23, 2023 · 21777a8 · 21777a8
2 parents c5260c7 + d3c266e
commit 21777a8
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 5 deletions.
diff --git a/app/Events/Common/DatesFormating.php b/app/Events/Common/DatesFormating.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Events\Common;
+
+use App\Abstracts\Event;
+
+class DatesFormating extends Event
+{
+    public $request;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param $request
+     */
+    public function __construct($request)
+    {
+        $this->request = $request;
+    }
+}
diff --git a/app/Http/Middleware/DateFormat.php b/app/Http/Middleware/DateFormat.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use App\Events\Common\DatesFormating;
 use Closure;
 use Date;
 
@@ -10,15 +11,26 @@ class DateFormat
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
      * @return mixed
      */
     public function handle($request, Closure $next)
     {
         if (($request->method() == 'POST') || ($request->method() == 'PATCH')) {
-            // todo fire event
-            $fields = ['paid_at', 'due_at', 'issued_at', 'started_at', 'ended_at', 'expire_at', 'recurring_started_at', 'recurring_limit_date'];
+            event(new DatesFormating($request));
+
+            $fields = [
+                'paid_at',
+                'due_at',
+                'issued_at',
+                'started_at',
+                'ended_at',
+                'expire_at',
+                'recurring_started_at',
+                'recurring_limit_date',
+            ];
 
             foreach ($fields as $field) {
                 $date = $request->get($field);
@@ -28,7 +40,7 @@ public function handle($request, Closure $next)
                 }
 
                 if (Date::parse($date)->format('H:i:s') == '00:00:00') {
-                    $new_date = Date::parse($date)->format('Y-m-d')  . ' ' . Date::now()->format('H:i:s');
+                    $new_date = Date::parse($date)->format('Y-m-d') . ' ' . Date::now()->format('H:i:s');
                 } else {
                     $new_date = Date::parse($date)->toDateTimeString();
                 }