Version 2.3 get-data & transaction-add bug fix

Author: HashJProgramming

functions/data/get-data.php

@@ -43,3 +43,64 @@ function customer_info($id){
     return $results[0] ?? '';
 }
 
+function total_price($id){
+    global $db;
+    $sql = "SELECT SUM(CASE
+        WHEN r.type = 'day' THEN co.priceDay
+        WHEN r.type = 'night' THEN co.priceNight
+        ELSE 0 
+        END) AS total,
+        c.fullname 
+        FROM transactions t
+        JOIN rentals r ON t.id = r.transact_id
+        JOIN customers c ON t.customer_id = c.id
+        JOIN cottages co ON r.cottage_id = co.id
+        WHERE t.user_id = :id AND t.status = 'Pending';";
+    $statement = $db->prepare($sql);
+    $statement->bindParam(':id', $id);
+    $statement->execute();
+    $result = $statement->fetch();
+    return number_format($result['total'], 2);
+}
+
+function total_cottage($id){
+    global $db;
+    $sql = "SELECT COUNT(r.id) AS total,
+        c.fullname 
+        FROM transactions t
+        JOIN rentals r ON t.id = r.transact_id
+        JOIN customers c ON t.customer_id = c.id
+        JOIN cottages co ON r.cottage_id = co.id
+        WHERE t.user_id = :id AND t.status = 'Pending';";
+    $statement = $db->prepare($sql);
+    $statement->bindParam(':id', $id);
+    $statement->execute();
+    $result = $statement->fetch();
+    return $result['total'];
+}
+
+function get_sales($period = 'monthly') {
+    global $db;
+    
+    $sql = "SELECT SUM(CASE
+        WHEN r.type = 'day' THEN co.priceDay
+        WHEN r.type = 'night' THEN co.priceNight
+        ELSE 0 
+        END) AS total
+        FROM transactions t
+        JOIN rentals r ON t.id = r.transact_id
+        JOIN cottages co ON r.cottage_id = co.id
+        WHERE t.status = 'Pending'";
+    
+    if ($period === 'monthly') {
+        $sql .= " AND DATE_FORMAT(t.created_at, '%Y-%m') = DATE_FORMAT(CURRENT_DATE, '%Y-%m')";
+    } elseif ($period === 'annual') {
+        $sql .= " AND DATE_FORMAT(t.created_at, '%Y') = DATE_FORMAT(CURRENT_DATE, '%Y')";
+    }
+    
+    $statement = $db->prepare($sql);
+    $statement->execute();
+    $result = $statement->fetch();
+    
+    return number_format($result['total'], 2);
+}

functions/transaction-add.php

@@ -19,7 +19,12 @@
     $stmt->bindParam(':user_id', $user_id);
     $stmt->execute();
     $transaction = $stmt->fetch(PDO::FETCH_ASSOC);
-    
+
+    if (!$transaction) {
+        header('Location: ../rent.php?type=error&message=Please create a transaction first');
+        exit();
+    }
+
     $transaction_id = $transaction['id'];
     $customer_id = $transaction['customer_id'];
 

rent.php

@@ -53,7 +53,7 @@
                                     <div class="row align-items-center no-gutters">
                                         <div class="col me-2">
                                             <div class="text-uppercase text-primary fw-bold text-xs mb-1"><span>TOTAL Price</span></div>
-                                            <div class="text-dark fw-bold h5 mb-0"><span>&lt;price&gt;</span></div>
+                                            <div class="text-dark fw-bold h5 mb-0"><span><?php echo total_price($_SESSION['id'])?? '0'; ?></span></div>
                                         </div>
                                         <div class="col-auto"><i class="fas fa-credit-card fa-2x text-gray-300"></i></div>
                                     </div>
@@ -66,7 +66,7 @@
                                     <div class="row align-items-center no-gutters">
                                         <div class="col me-2">
                                             <div class="text-uppercase text-primary fw-bold text-xs mb-1"><span>TOTAL COTTAGE</span></div>
-                                            <div class="text-dark fw-bold h5 mb-0"><span>&lt;total&gt;</span></div>
+                                            <div class="text-dark fw-bold h5 mb-0"><span><?php echo total_cottage($_SESSION['id'])?? '0'; ?></span></div>
                                         </div>
                                         <div class="col-auto"><i class="fas fa-warehouse fa-2x text-gray-300"></i></div>
                                     </div>