Skip to content

Commit 4c05428

Browse files
Version 2.5 Report (Current, Montly, Annual)
1 parent 4e85e43 commit 4c05428

File tree

2 files changed

+27
-11
lines changed

2 files changed

+27
-11
lines changed

functions/data/get-data.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,22 @@ function get_top_cottage(){
184184
$statement->execute();
185185
$result = $statement->fetch();
186186
return $result['name'];
187+
}
188+
189+
function get_current_sales(){
190+
global $db;
191+
$sql = "SELECT SUM(CASE
192+
WHEN r.type = 'day' THEN co.priceDay
193+
WHEN r.type = 'night' THEN co.priceNight
194+
ELSE 0
195+
END) AS total
196+
FROM transactions t
197+
JOIN rentals r ON t.id = r.transact_id
198+
JOIN cottages co ON r.cottage_id = co.id
199+
WHERE t.status = 'Pending'
200+
AND DATE_FORMAT(t.created_at, '%Y-%m-%d') = DATE_FORMAT(CURRENT_DATE, '%Y-%m-%d')";
201+
$statement = $db->prepare($sql);
202+
$statement->execute();
203+
$result = $statement->fetch();
204+
return number_format($result['total'], 2);
187205
}

report.php

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
include_once 'functions/menu/offcanva-menu.php';
33
include_once 'functions/authentication.php';
4-
4+
include_once 'functions/tables/datatables.php';
55
?>
66
<!DOCTYPE html>
77
<html data-bs-theme="light" lang="en">
@@ -47,7 +47,7 @@
4747
<div class="row align-items-center no-gutters">
4848
<div class="col me-2">
4949
<div class="text-uppercase text-primary fw-bold text-xs mb-1"><span>CURRENT SALES</span></div>
50-
<div class="text-dark fw-bold h5 mb-0"><span>&lt;customer&gt;</span></div>
50+
<div class="text-dark fw-bold h5 mb-0"><span><?php echo get_current_sales() ?? 0?></span></div>
5151
</div>
5252
<div class="col-auto"><i class="fas fa-calendar fa-2x text-gray-300"></i></div>
5353
</div>
@@ -60,7 +60,7 @@
6060
<div class="row align-items-center no-gutters">
6161
<div class="col me-2">
6262
<div class="text-uppercase text-warning fw-bold text-xs mb-1"><span>MONTLY SALES</span></div>
63-
<div class="text-dark fw-bold h5 mb-0"><span>0</span></div>
63+
<div class="text-dark fw-bold h5 mb-0"><span><?php echo get_sales() ?? 0 ?></span></div>
6464
</div>
6565
<div class="col-auto"><i class="fas fa-calendar fa-2x text-gray-300"></i></div>
6666
</div>
@@ -73,7 +73,7 @@
7373
<div class="row align-items-center no-gutters">
7474
<div class="col me-2">
7575
<div class="text-uppercase text-warning fw-bold text-xs mb-1"><span>ANNUAL SALES</span></div>
76-
<div class="text-dark fw-bold h5 mb-0"><span>0</span></div>
76+
<div class="text-dark fw-bold h5 mb-0"><span><?php echo get_sales('annual') ?? 0 ?></span></div>
7777
</div>
7878
<div class="col-auto"><i class="fas fa-calendar fa-2x text-gray-300"></i></div>
7979
</div>
@@ -83,27 +83,25 @@
8383
</div>
8484
<div class="card shadow">
8585
<div class="card-header py-3">
86-
<p class="text-primary m-0 fw-bold">Customer List</p>
86+
<p class="text-primary m-0 fw-bold">Transaction List</p>
8787
</div>
8888
<div class="card-body">
8989
<div class="table-responsive table mt-2" id="dataTable-1" role="grid" aria-describedby="dataTable_info">
9090
<table class="table my-0 table-display" id="dataTable">
9191
<thead>
9292
<tr>
93-
<th>Fullname</th>
94-
<th>Address</th>
95-
<th>Phone</th>
93+
<th>Cottage</th>
94+
<th>Price</th>
95+
<th>Type</th>
9696
<th>Created At</th>
97-
<th>Total Sales</th>
9897
</tr>
9998
</thead>
10099
<tbody>
101100
<tr>
102-
<td><img class="rounded-circle me-2" width="30" height="30" src="assets/img/logo.png">Airi Satou</td>
101+
<td><img class="rounded-circle me-2" width="30" height="30" src="assets/img/icon.png">Airi Satou</td>
103102
<td>&lt;address&gt;</td>
104103
<td>&lt;phone&gt;</td>
105104
<td>&lt;created_at&gt;</td>
106-
<td>&lt;sales&gt;</td>
107105
</tr>
108106
</tbody>
109107
<tfoot>

0 commit comments

Comments
 (0)