fixed timezone issues

app/Helpers/helpers.php

@@ -44,12 +44,12 @@ if(!function_exists('friendly_date_time_short')) {
 
 if(!function_exists('friendly_date_time_short_with_tz')) {
     function friendly_date_time_short_with_tz($value, $includeTime = true, $tz='UTC', $default = '-') {
+
         if(!$value || empty($value)) return $default;
         try {
 
             $realTimezone = resolve_timezone($tz);
-            $date = new DateTime($value, new DateTimeZone('UTC'));
-            
+            $date = new DateTime($value);
             $date->setTimezone(new DateTimeZone($realTimezone));
             
             return $date->format("m/d/y" . ($includeTime ? ", h:iA" : ""));
@@ -96,7 +96,7 @@ if(!function_exists('military_time')) {
         if(!$value || empty($value)) return $default;
         try {
             $realTimezone = resolve_timezone($tz);
-            $date = new DateTime($value, new DateTimeZone('UTC'));  
+            $date = new DateTime($value);  
             $date->setTimezone(new DateTimeZone($realTimezone));          
             return $date->format("H:i");
         }

app/Http/Controllers/PracticeManagementController.php

@@ -9,6 +9,7 @@ use App\Models\McpRequest;
 use App\Models\Note;
 use App\Models\ProGeneralAvailability;
 use App\Models\ProRate;
+use App\Models\ProSpecificAvailability;
 use App\Models\ProSpecificUnavailability;
 use App\Models\ProTextShortcut;
 use App\Models\ProTransaction;
@@ -167,7 +168,7 @@ class PracticeManagementController extends Controller
             }
         }
         
-        $specificAvailabilities = ProSpecificUnavailability::where('pro_id', $pro->id)->where('is_cancelled', false)->orderBy('start_time')->get();
+        $specificAvailabilities = ProSpecificAvailability::where('pro_id', $pro->id)->where('is_cancelled', false)->orderBy('start_time')->get();
         $specificUnavailabilities = ProSpecificUnavailability::where('pro_id', $pro->id)->where('is_cancelled', false)->orderBy('start_time', 'asc')->get();
 
         return view('app.practice-management.my-availability', compact('generalAvailabilities', 'specificAvailabilities', 'specificUnavailabilities'));

resources/views/app/practice-management/my-availability.blade.php

@@ -229,8 +229,8 @@
                     <tbody>
                         @foreach($specificUnavailabilities as $su)
                         <tr>
-                            <td>{{friendly_date_time_short_with_tz($su->start_time, $su->timezone)}}</td>
-                            <td>{{friendly_date_time_short_with_tz($su->end_time, $su->timezone)}}</td>
+                            <td>{{friendly_date_time_short_with_tz($su->start_time, true, $su->timezone)}}</td>
+                            <td>{{friendly_date_time_short_with_tz($su->end_time, true, $su->timezone)}}</td>
                             <td>{{$su->title}}</td>
                             <td>
                                 <div moe wide class="mr-2">
@@ -281,7 +281,7 @@
                     </strong>
                 </div>
                 <div class="card-body p-0">
-                    <div id="pro-availability-calendar" class="mx-2"></div>
+                    <div id="pro-availability-calendar" class="mx-2 my-2"></div>
                 </div>
             </div>
         </div>