diff --git a/app/Views/UserList.php b/app/Views/UserList.php
index a991670d..adf1a29d 100755
--- a/app/Views/UserList.php
+++ b/app/Views/UserList.php
@@ -440,7 +440,7 @@ table.dataTable tbody td {
                                     <td class="text-left">
                                     <?php if (!empty($row['created_at'])):
                                         $cd =  date("j F Y", strtotime($row['created_at']));
-                                        $ct =  date("h:i a", strtotime($row['created_at']));
+                                        $ct =  date("h:i A", strtotime($row['created_at']));
                                         echo $cd . "<br><span class='time'> " . $ct . "</span>"; 
                                         endif;
                                     ?>
@@ -448,7 +448,7 @@ table.dataTable tbody td {
                                     <td class="text-left">
                                     <?php if (!empty($row['updated_at'])):
                                         $ud =  date("j F Y", strtotime($row['updated_at']));
-                                        $ut =  date("h:i a", strtotime($row['updated_at']));
+                                        $ut =  date("h:i A", strtotime($row['updated_at']));
                                         echo $ud . "<br><span class='time'> " . $ut . "</span>"; 
                                         endif;
                                     ?>
diff --git a/app/Views/claim_dump_file_list.php b/app/Views/claim_dump_file_list.php
index a2f27a80..45fea592 100644
--- a/app/Views/claim_dump_file_list.php
+++ b/app/Views/claim_dump_file_list.php
@@ -90,7 +90,7 @@
                                 <td style="overflow: hidden;" class="reload truncate" data-toggle="tooltip" data-placement="top" title="<?php echo $file['file_name'] ?>">
                                     <?php echo $file['file_name'] ?>
                                 </td>
-                                <td><?php echo change_date_format($file['created_at'], 'Y-m-d H:i:s', 'd M Y h:i a') . ' by <strong>' . $file['user_name'] . '</strong>' ?> </td>
+                                <td><?php echo change_date_format($file['created_at'], 'Y-m-d H:i:s', 'd M Y h:i A') . ' by <strong>' . $file['user_name'] . '</strong>' ?> </td>
                                 <td>
                                     <?php if ($file['status'] == "failed") { ?>
                                         <span style="color : #BD0707 ;"> <?= $file['status'] ?> </span> 
diff --git a/app/Views/commission_file_upload.php b/app/Views/commission_file_upload.php
index 4bec2202..a9b81c3b 100644
--- a/app/Views/commission_file_upload.php
+++ b/app/Views/commission_file_upload.php
@@ -179,7 +179,7 @@
                                             <td><?php echo ucfirst($row['department']) ?> </td>
                                             <td><?php echo $row['rules_count'] ?></td>
                                             <td><?php echo ucfirst($row['file_status']) ?> </td>
-                                            <td><?php echo change_date_format($row['created_at'],'Y-m-d H:i:s', 'd M Y h:i a') . ' by <strong>' . $row['created_user_name'] . '</strong>' ?>
+                                            <td><?php echo change_date_format($row['created_at'],'Y-m-d H:i:s', 'd M Y h:i A') . ' by <strong>' . $row['created_user_name'] . '</strong>' ?>
                                             <td>
                                                 <div class="btn-group dropdown">
                                                     <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
diff --git a/app/Views/hr_file_upload.php b/app/Views/hr_file_upload.php
index 4fe317a2..76031977 100644
--- a/app/Views/hr_file_upload.php
+++ b/app/Views/hr_file_upload.php
@@ -143,7 +143,7 @@
                         <td><?php echo $file['branch_name'] ?></td>
                         <td><?php echo $file['policy_no'] ?></td>
                         <td><?php echo $file['file_action'] ?></td>
-                        <td><?php echo change_date_format($file['created_at'],'Y-m-d H:i:s', 'd M Y h:i a') . ' by <strong>' . $file['first_name'] . '</strong>' ?></td>
+                        <td><?php echo change_date_format($file['created_at'],'Y-m-d H:i:s', 'd M Y h:i A') . ' by <strong>' . $file['first_name'] . '</strong>' ?></td>
                         <td><?php echo $file['status']; ?> </td>
                         <td> </td>
                     </tr>
diff --git a/app/Views/insurer_statement_list.php b/app/Views/insurer_statement_list.php
index b0c05935..3728bfff 100644
--- a/app/Views/insurer_statement_list.php
+++ b/app/Views/insurer_statement_list.php
@@ -279,7 +279,7 @@
                                             </span>
 
                                         </td>
-                                        <td><?php echo change_date_format($row['created_at'], 'Y-m-d H:i:s', 'd M Y h:i a') . ' <br> by ' . $row['first_name'] ?></td>
+                                        <td><?php echo change_date_format($row['created_at'], 'Y-m-d H:i:s', 'd M Y h:i A') . ' <br> by ' . $row['first_name'] ?></td>
                                         <td>
                                             <?php if ($row['file_status'] != 'failed') { ?>
                                                 <div class="btn-group dropdown">
diff --git a/app/Views/mail_test.php b/app/Views/mail_test.php
index 776909d3..e7d19666 100755
--- a/app/Views/mail_test.php
+++ b/app/Views/mail_test.php
@@ -8,7 +8,7 @@
             </div>
             <div class="form-group">
                 <label for="subject">Subject:</label>
-                <input type="text" class="form-control" id="subject" name="subject" value="Gmail API Test - . <?php echo date('Y-m-d h:i:s');?>" required>
+                <input type="text" class="form-control" id="subject" name="subject" value="Gmail API Test - . <?php echo date('Y-m-d h:i:s A');?>" required>
             </div>
             <div class="form-group">
                 <label for="content">Content:</label>
diff --git a/app/Views/retail_endorsement_list.php b/app/Views/retail_endorsement_list.php
index 046dbb37..83049822 100755
--- a/app/Views/retail_endorsement_list.php
+++ b/app/Views/retail_endorsement_list.php
@@ -140,7 +140,7 @@
                                         <td class="text-center"><?php echo $employee['manager_name'] ?? 'N/A' ?></td>
                                         <td class="text-center"><?php if (!empty($employee['created_at'])):
                                                                     $cd =  date("j F Y", strtotime($employee['created_at']));
-                                                                    $ct =  date("h:i a", strtotime($employee['created_at']));
+                                                                    $ct =  date("h:i A", strtotime($employee['created_at']));
                                                                     echo $cd . "<br><span class='time'> " . $ct . "</span>";
                                                                 endif; ?></td>
                                         <td class="text-center"><?php if ($employee['status'] == 'open') {
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index d1af303b..b00788b1 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -86,7 +86,7 @@ table.dataTable tbody td {
                                     <td class="text-left">
                                     <?php if (!empty($row['created_at'])):
                                         $cd =  date("j M Y", strtotime($row['created_at']));
-                                        $ct =  date("h:i a", strtotime($row['created_at']));
+                                        $ct =  date("h:i A", strtotime($row['created_at']));
                                         echo $cd . "<br><span class='time'> " . $ct . "</span>"; 
                                         endif;
                                     ?>
@@ -94,7 +94,7 @@ table.dataTable tbody td {
                                     <td class="text-left">
                                     <?php if (!empty($row['updated_at'])):
                                         $ud =  date("j M Y", strtotime($row['updated_at']));
-                                        $ut =  date("h:i a", strtotime($row['updated_at']));
+                                        $ut =  date("h:i A", strtotime($row['updated_at']));
                                         echo $ud . "<br><span class='time'> " . $ut . "</span>"; 
                                         endif;
                                     ?>
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index b3d26b07..959a1633 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -274,7 +274,7 @@ hr{
                                         <!-- Bottom Row: Name + Date -->
                                         <div class="d-flex justify-content-between small text-muted" style="padding-top: 5px;">
                                             <span class="" style="font-weight: 400 !important;"><i class="mdi mdi-account"></i> <?= $conv['name'] ?></span>
-                                            <span style="font-size:9px; font-weight: 400 !important;" class=""><?= date("j F Y h:i a", strtotime($conv['created_at'])) ?></span>
+                                            <span style="font-size:9px; font-weight: 400 !important;" class=""><?= date("j F Y h:i A", strtotime($conv['created_at'])) ?></span>
                                         </div>
 
                                         <!-- <?php echo $i < count($notes)-1 ? '<hr/>' : ''; ?> -->
@@ -410,7 +410,7 @@ data-backdrop="static"
                                 <small classs="" style="font-size:7px;">
                                     <?php if (!empty($rt['created_at'])):
                                         $cd =  date("j F Y", strtotime($rt['created_at']));
-                                        $ct =  date("h:i a", strtotime($rt['created_at']));
+                                        $ct =  date("h:i A", strtotime($rt['created_at']));
                                         echo $cd . "  " . $ct; 
                                         endif;
                                     ?>
diff --git a/app/Views/ticket_conversation.php b/app/Views/ticket_conversation.php
index 6f4ddcdb..57d8370f 100644
--- a/app/Views/ticket_conversation.php
+++ b/app/Views/ticket_conversation.php
@@ -23,7 +23,7 @@
             </div>
             <div class="col">
                 <div class="mb-3">
-                    <div class="text-muted"><i class="mdi mdi-calendar-blank"></i> <?php echo (new DateTime($message['created_at']))->format('j F Y h:i a');?></div>
+                    <div class="text-muted"><i class="mdi mdi-calendar-blank"></i> <?php echo (new DateTime($message['created_at']))->format('j F Y h:i A');?></div>
                 </div>
                 <div id="msg_388" class="form-group">
                     <p><?= $message['mail_content'] ?></p> 
@@ -69,7 +69,7 @@
             </div>
             <div class="col">
                 <div class="mb-3">
-                    <div class="text-muted"><i class="mdi mdi-calendar-blank"></i> <?php echo (new DateTime($message['created_at']))->format('j F Y h:i a');?></div>
+                    <div class="text-muted"><i class="mdi mdi-calendar-blank"></i> <?php echo (new DateTime($message['created_at']))->format('j F Y h:i A');?></div>
                 </div>
                 <div id="msg_394" class="form-group">
                     <p><?= $message['mail_content'] ?></p>
diff --git a/app/Views/ticket_history.php b/app/Views/ticket_history.php
index 6fa33c90..3a695250 100644
--- a/app/Views/ticket_history.php
+++ b/app/Views/ticket_history.php
@@ -22,7 +22,7 @@
                             <!-- <td><?php //echo $row['new_value']; ?></td> -->
                             <td><?php echo !empty($row['modified_by'])? $row['modified_by'] : "Created by employee"; ?></td>
                             <!-- <td><?php //echo $row['created_at']; ?></td> -->
-                            <td><?php echo date("d-m-Y H:i:s a", strtotime($row['created_at'])) ?? " - "; ?></td>
+                            <td><?php echo date("d-m-Y h:i:s A", strtotime($row['created_at'])) ?? " - "; ?></td>
                         </tr>
                         <?php } ?>
                         <?php } ?>
diff --git a/app/Views/vehicle_type_list.php b/app/Views/vehicle_type_list.php
index 132a5abd..0c8614e3 100644
--- a/app/Views/vehicle_type_list.php
+++ b/app/Views/vehicle_type_list.php
@@ -395,7 +395,7 @@
                                     <td class="text-left">
                                     <?php if (!empty($row['created_at'])):
                                         $cd =  date("j F Y", strtotime($row['created_at']));
-                                        $ct =  date("h:i a", strtotime($row['created_at']));
+                                        $ct =  date("h:i A", strtotime($row['created_at']));
                                         echo $cd . "<br><span class='time'> " . $ct . "</span>"; 
                                         endif;
                                     ?>
@@ -403,7 +403,7 @@
                                     <td class="text-left">
                                     <?php if (!empty($row['updated_at'])):
                                         $ud =  date("j F Y", strtotime($row['updated_at']));
-                                        $ut =  date("h:i a", strtotime($row['updated_at']));
+                                        $ut =  date("h:i A", strtotime($row['updated_at']));
                                         echo $ud . "<br><span class='time'> " . $ut . "</span>"; 
                                         endif;
                                     ?>