Version 2.2 Reciept & Fullcalendar bug fixed

Author: HashJProgramming

functions/data/get-calendar.php

@@ -3,10 +3,11 @@
 $calendarData = array();
 
 $sql = 'SELECT r.*, co.fullname, c.name AS cottage_name
-        FROM rentals AS r
-        JOIN cottages AS c ON r.cottage_id = c.id
-        JOIN transactions AS t ON r.transact_id = t.id
-        JOIN customers AS co ON t.customer_id = co.id';
+    FROM rentals AS r
+    JOIN cottages AS c ON r.cottage_id = c.id
+    JOIN transactions AS t ON r.transact_id = t.id
+    JOIN customers AS co ON t.customer_id = co.id
+    WHERE YEAR(r.created_at) = YEAR(CURDATE())';
 $stmt = $db->prepare($sql);
 $stmt->execute();
 $results = $stmt->fetchAll();
@@ -20,7 +21,6 @@
     array_push($calendarData, $event);
 }
 
-// Return the calendar data as JSON
 header('Content-Type: application/json');
 echo json_encode($calendarData);
 ?>

reciept.php

@@ -45,10 +45,10 @@ function getItems(){
         $days = $interval->days;
         ?>
             <tr class="font-monospace" style="font-size: 10px;">
-                <td class="font-monospace" style="font-size: 10px;">ITEM:&nbsp;<strong><?php echo $row['cottage_name'] ?></strong></td>
+                <td class="font-monospace" style="font-size: 10px;">Cottage:&nbsp;<strong><?php echo $row['cottage_name'] ?></strong></td>
                 <td class="font-monospace text-end" style="font-size: 10px;"></td>
                 <td class="font-monospace text-center" style="font-size: 10px;"><strong>[<?php echo $row['start_datetime'] ?>] - [<?php echo $row['end_datetime'] ?>] |</strong>&nbsp;<?php echo $days ?> DAYS</td>
-                <td class="font-monospace text-end" style="font-size: 10px;"><strong>₱<?php echo $row['price'] ?></strong></td>
+                <td class="font-monospace text-end" style="font-size: 10px;"><strong>₱<?php echo number_format($row['price'], 2) ?></strong></td>
             </tr>
         <?php
     }
@@ -124,7 +124,7 @@ function getItems(){
         <table class="table">
             <thead class="font-monospace">
                 <tr class="font-monospace">
-                    <th class="font-monospace text-end"><strong>TOTAL</strong>&nbsp;<strong>₱<?php echo $total; ?></strong></th>
+                    <th class="font-monospace text-end"><strong>TOTAL</strong>&nbsp;<strong>₱<?php echo number_format($total, 2); ?></strong></th>
                 </tr>
             </thead>
             <tbody>