Merge pull request #67 from iftar/fix-timezone-issues

Fix timezone issues

Author: DilwoarH

app/Http/Controllers/API/User/OrderController.php

@@ -28,7 +28,7 @@ public function index(AuthenticatedRequest $request, OrderService $orderService)
     public function today(AuthenticatedRequest $request, OrderService $orderService)
     {
         $filters = [
-            'required_date' => today()
+            'required_date' => today('Europe/London')
         ];
 
         return response()->json([

app/Models/CollectionPoint.php

@@ -71,7 +71,7 @@ public function batches()
 
     public function getAvailableCapacityAttribute()
     {
-        return $this->max_daily_capacity - $this->orders()->whereDate('created_at', Carbon::today())->sum('quantity');
+        return $this->max_daily_capacity - $this->orders()->whereDate('created_at', today('Europe/London'))->sum('quantity');
     }
 
     public function getAcceptingOrdersAttribute()

app/Models/CollectionPointTimeSlot.php

@@ -49,7 +49,7 @@ public function orders()
 
     public function getAvailableCapacityAttribute()
     {
-        return $this->max_capacity - $this->orders()->whereDate('created_at', Carbon::today())->sum('quantity');
+        return $this->max_capacity - $this->orders()->whereDate('created_at', today('Europe/London'))->sum('quantity');
     }
 
     public function getAcceptingOrdersAttribute()

app/Notifications/Charity/OrdersToday.php

@@ -86,7 +86,7 @@ public function toArray($notifiable)
 
     protected function getCsvFileName()
     {
-        return now()->format('Y-m-d') . "_charity_" . $this->batch->charity->id . "_batch_" . $this->batch->id . ".csv";
+        return now('Europe/London')->format('Y-m-d') . "_charity_" . $this->batch->charity->id . "_batch_" . $this->batch->id . ".csv";
     }
 
     protected function getTotalMeals()

app/Notifications/CollectionPoint/OrdersToday.php

@@ -81,7 +81,7 @@ public function toArray($notifiable)
 
     protected function getCsvFileName()
     {
-        return now()->format('Y-m-d') . "_collection-point_" . $this->batch->collectionPoint->id . "_batch_" . $this->batch->id . ".csv";
+        return now('Europe/London')->format('Y-m-d') . "_collection-point_" . $this->batch->collectionPoint->id . "_batch_" . $this->batch->id . ".csv";
     }
 
     protected function getTotalMeals()

app/Services/Admin/OrderService.php

@@ -8,7 +8,7 @@ class OrderService
 {
     public function getOrdersToday()
     {
-        return Order::where('required_date', today())
+        return Order::where('required_date', today('Europe/London'))
             ->with(['collectionPoint','collectionPointTimeSlot']) 
             ->get();
     }

app/Services/Charity/OrderService.php

@@ -18,7 +18,7 @@ public function get()
                                  $query->where('type', 'charity_pickup');
                              },
                              'collectionPoints.collectionPointTimeSlots.orders' => function ($query) {
-                                 $query->whereDate('required_date', today()->format('Y-m-d'));
+                                 $query->whereDate('required_date', today('Europe/London')->format('Y-m-d'));
                              },
                          ])
                          ->whereIn('id', $user->charities->pluck('id'))

app/Services/CollectionPoint/OrderService.php

@@ -20,7 +20,7 @@ public function get()
         $collectionTimeSlots = CollectionPointTimeSlot::where('collection_point_id', $userCollectionPoint->id)
                                                       ->with([
                                                           'orders' => function ($query) {
-                                                              $query->whereDate('required_date', today()->format('Y-m-d'));
+                                                              $query->whereDate('required_date', today('Europe/London')->format('Y-m-d'));
                                                           }
                                                       ])
                                                       ->orderBy('start_time')
@@ -38,7 +38,7 @@ public function getOrdersToday(CollectionPoint $collectionPoint)
         return CollectionPointTimeSlot::where('collection_point_id', $collectionPoint->id)
                                       ->with([
                                           'orders' => function ($query) {
-                                              $query->whereDate('required_date', today()->format('Y-m-d'))
+                                              $query->whereDate('required_date', today('Europe/London')->format('Y-m-d'))
                                                     ->whereStatus('accepted');
                                           }
                                       ])

app/Services/User/OrderService.php

@@ -32,7 +32,7 @@ public function create($data)
     {
         $user = auth()->user();
 
-        $data['required_date'] = now();
+        $data['required_date'] = now('Europe/London');
 
         $order = $user->orders()->create($data);
 
@@ -91,13 +91,13 @@ public function canOrder()
 
         // check if user has already ordered today
         $todaysOrderCount = $user->orders()
-                                 ->whereDate('created_at', Carbon::today())
+                                 ->whereDate('created_at', Carbon::today('Europe/London'))
                                  ->count();
 
         if ( $todaysOrderCount == 0 ) $result['user_has_ordered_today'] = false;
         else $result['messages'][] = "User has already ordered today.";
 
-        // check if between 12am and 2pm
+        // check if between 12am and 3pm
         $now   = Carbon::now('Europe/London');
         $start = Carbon::createFromTimeString('00:00', 'Europe/London');
         $end   = Carbon::createFromTimeString('15:00', 'Europe/London');

database/factories/BatchFactory.php

@@ -7,6 +7,6 @@
 
 $factory->define(Batch::class, function (Faker $faker) {
     return [
-        'created_at' => now()->startOfDay()->hour(14)
+        'created_at' => now('Europe/London')->startOfDay()->hour(14)
     ];
 });