Updated to support Statamic v3.3

lucky-media · Mar 17, 2022 · fc496ae · fc496ae
1 parent 4d109bf
commit fc496ae
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -15,5 +15,9 @@
                 "LuckyMedia\\BusinessHours\\ServiceProvider"
             ]
         }
+    },
+    "require": {
+        "php": "^7.4 || ^8.0 || ^8.1",
+        "statamic/cms": "3.3.*"
     }
 }
diff --git a/src/Tags/BusinessHoursTags.php b/src/Tags/BusinessHoursTags.php
@@ -21,17 +21,17 @@ public function __construct()
 
     public function index(): array
     {
-        $days = collect($this->defaults['hours']->value())
+        $days = collect($this->defaults['hours'])
             ->map(function ($day, $key) {
                 return [
                     'is_open' => $this->isOpen($day, $key),
                     'is_past' => $this->isPast($day, $key),
-                    'enabled' => $day['enabled']->value(),
-                    'weekday' => $day['weekday']->value(),
-                    'start_time' => $this->formatDate($day['start_time']->value()),
-                    'end_time' => $this->formatDate($day['end_time']->value()),
-                    '24_hours' => $day['24_hours']->value(),
-                    'closed' => $day['closed']->value(),
+                    'enabled' => $day['enabled'],
+                    'weekday' => $day['weekday'],
+                    'start_time' => $this->formatDate($day['start_time']),
+                    'end_time' => $this->formatDate($day['end_time']),
+                    '24_hours' => $day['24_hours'],
+                    'closed' => $day['closed'],
                 ];
             })
             ->filter(function($day) {
@@ -43,11 +43,11 @@ public function index(): array
 
     public function exception()
     {
-        $days = collect($this->defaults['exceptions']->value())
+        $days = collect($this->defaults['exceptions'])
             ->first(function ($day) {
-                $is_enabled = $day['enable_date']->value();
-                $start_date = Carbon::create($day['start_date']->value());
-                $end_date = Carbon::create($day['end_date']->value());
+                $is_enabled = $day['enable_date'];
+                $start_date = Carbon::create($day['start_date']);
+                $end_date = Carbon::create($day['end_date']);
 
                 if (! $is_enabled) return false;
 
@@ -69,7 +69,7 @@ public function exception()
 
     public function exceptions(): array
     {
-        return $this->defaults['exceptions']->value();
+        return $this->defaults['exceptions'];
     }
 
     protected function isPast($day, $key): bool
@@ -125,7 +125,7 @@ protected function isToday($key): bool
     }
 
     protected function formatToTime($day) {
-        [$hour, $minute] = explode(':', $day->value());
+        [$hour, $minute] = explode(':', $day);
 
         return Carbon::createFromTime($hour, $minute);
     }