Skip to content

Commit b117d01

Browse files
HashJProgrammingHashJProgramming
committed
get-data.php major bug fix
1 parent 4c05428 commit b117d01

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

‎functions/data/get-data.php

+11-11
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ function get_sales($period = 'monthly') {
9090
FROM transactions t
9191
JOIN rentals r ON t.id = r.transact_id
9292
JOIN cottages co ON r.cottage_id = co.id
93-
WHERE t.status = 'Pending'";
93+
WHERE t.status = 'Proceed'";
9494

9595
if ($period === 'monthly') {
9696
$sql .= " AND DATE_FORMAT(t.created_at, '%Y-%m') = DATE_FORMAT(CURRENT_DATE, '%Y-%m')";
@@ -111,7 +111,7 @@ function get_total_customer(){
111111
$statement = $db->prepare($sql);
112112
$statement->execute();
113113
$result = $statement->fetch();
114-
return $result['total'];
114+
return $result['total'] ?? 0;
115115
}
116116

117117
function new_customer(){
@@ -120,7 +120,7 @@ function new_customer(){
120120
$statement = $db->prepare($sql);
121121
$statement->execute();
122122
$result = $statement->fetch();
123-
return $result['fullname'];
123+
return $result['fullname'] ?? 'None';
124124
}
125125

126126
function get_total_cottage(){
@@ -129,7 +129,7 @@ function get_total_cottage(){
129129
$statement = $db->prepare($sql);
130130
$statement->execute();
131131
$result = $statement->fetch();
132-
return $result['total'];
132+
return $result['total'] ?? 0;
133133
}
134134

135135
function new_cottage(){
@@ -138,7 +138,7 @@ function new_cottage(){
138138
$statement = $db->prepare($sql);
139139
$statement->execute();
140140
$result = $statement->fetch();
141-
return $result['name'];
141+
return $result['name'] ?? 'None';
142142
}
143143

144144
function get_total_users(){
@@ -147,7 +147,7 @@ function get_total_users(){
147147
$statement = $db->prepare($sql);
148148
$statement->execute();
149149
$result = $statement->fetch();
150-
return $result['total'];
150+
return $result['total'] ?? 0;
151151
}
152152

153153
function new_user(){
@@ -156,21 +156,21 @@ function new_user(){
156156
$statement = $db->prepare($sql);
157157
$statement->execute();
158158
$result = $statement->fetch();
159-
return $result['username'];
159+
return $result['username'] ?? 'None';
160160
}
161161

162162
function get_top_customer(){
163163
global $db;
164164
$sql = "SELECT c.fullname, COUNT(*) AS total FROM transactions t
165165
JOIN customers c ON t.customer_id = c.id
166-
WHERE t.status = 'Pending'
166+
WHERE t.status = 'Proceed'
167167
GROUP BY c.fullname
168168
ORDER BY total DESC
169169
LIMIT 1";
170170
$statement = $db->prepare($sql);
171171
$statement->execute();
172172
$result = $statement->fetch();
173-
return $result['fullname'];
173+
return $result['fullname'] ?? 'None';
174174
}
175175

176176
function get_top_cottage(){
@@ -183,7 +183,7 @@ function get_top_cottage(){
183183
$statement = $db->prepare($sql);
184184
$statement->execute();
185185
$result = $statement->fetch();
186-
return $result['name'];
186+
return $result['name'] ?? 'None';
187187
}
188188

189189
function get_current_sales(){
@@ -196,7 +196,7 @@ function get_current_sales(){
196196
FROM transactions t
197197
JOIN rentals r ON t.id = r.transact_id
198198
JOIN cottages co ON r.cottage_id = co.id
199-
WHERE t.status = 'Pending'
199+
WHERE t.status = 'Proceed'
200200
AND DATE_FORMAT(t.created_at, '%Y-%m-%d') = DATE_FORMAT(CURRENT_DATE, '%Y-%m-%d')";
201201
$statement = $db->prepare($sql);
202202
$statement->execute();

‎index.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -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>Earnings (monthly)</span></div>
50-
<div class="text-dark fw-bold h5 mb-0"><span>$<?php echo get_sales() ?? 0 ?></span></div>
50+
<div class="text-dark fw-bold h5 mb-0"><span>$<?php echo get_sales()?></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-success fw-bold text-xs mb-1"><span>Earnings (annual)</span></div>
63-
<div class="text-dark fw-bold h5 mb-0"><span>$<?php echo get_sales('annual') ?? 0 ?></span></div>
63+
<div class="text-dark fw-bold h5 mb-0"><span>$<?php echo get_sales('annual')?></span></div>
6464
</div>
6565
<div class="col-auto"><i class="fas fa-ruble-sign 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>TOTAL CUSTOMER</span></div>
76-
<div class="text-dark fw-bold h5 mb-0"><span><?php echo get_total_customer() ?? 0 ?></span></div>
76+
<div class="text-dark fw-bold h5 mb-0"><span><?php echo get_total_customer()?></span></div>
7777
</div>
7878
<div class="col-auto"><i class="fas fa-user-circle fa-2x text-gray-300"></i></div>
7979
</div>
@@ -86,7 +86,7 @@
8686
<div class="row align-items-center no-gutters">
8787
<div class="col me-2">
8888
<div class="text-uppercase text-warning fw-bold text-xs mb-1"><span>NEW CUSTOMER</span></div>
89-
<div class="text-dark fw-bold h5 mb-0"><span><?php echo new_customer() ?? 'None' ?></span></div>
89+
<div class="text-dark fw-bold h5 mb-0"><span><?php echo new_customer()?></span></div>
9090
</div>
9191
<div class="col-auto"><i class="fas fa-user-friends fa-2x text-gray-300"></i></div>
9292
</div>

0 commit comments

Comments
 (0)