Skip to content

Commit 1a59943

Browse files
HashJProgrammingHashJProgramming
committed
Version 8.5 - Major Bug fix & Improvements
1 parent 332cc9d commit 1a59943

File tree

5 files changed

+69
-18
lines changed

5 files changed

+69
-18
lines changed

‎functions/transaction.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
header('location: ../transaction.php?type=error&message=You have an existing transaction!');
1616
exit();
1717
}
18+
if (empty($id)){
19+
header('location: ../transaction.php?type=error&message=Please select a customer!');
20+
exit();
21+
}
22+
1823

1924
$sql = "INSERT INTO transactions (user_id, customer_id, status) VALUES (:user_id, :customer_id, 0)";
2025
$stmt = $db->prepare($sql);

‎functions/views/dashboard-count.php‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@ function get_monthly(){
1010
AND YEAR(created_at) = YEAR(CURRENT_TIMESTAMP)";
1111
$stmt = $db->prepare($sql);
1212
$stmt->execute();
13-
1413
$results = $stmt->fetchAll();
1514
foreach ($results as $row) {
16-
echo $row['total_earnings'];
15+
if ($row['total_earnings'] == null){
16+
echo "0";
17+
}
18+
else{
19+
echo $row['total_earnings'];
20+
}
1721
}
1822
}
1923

@@ -27,8 +31,12 @@ function get_yearly(){
2731
$stmt = $db->prepare($sql);
2832
$stmt->execute();
2933
$results = $stmt->fetchAll();
34+
if ($results){
3035
foreach ($results as $row) {
3136
echo $row['total_earnings'];
37+
}}
38+
else{
39+
echo "0";
3240
}
3341
}
3442

@@ -54,8 +62,12 @@ function get_processing(){
5462
$stmt = $db->prepare($sql);
5563
$stmt->execute();
5664
$results = $stmt->fetchAll();
65+
if($results){
5766
foreach ($results as $row) {
5867
echo $row['total_processing'];
68+
}}
69+
else{
70+
echo "0";
5971
}
6072
}
6173

@@ -67,8 +79,12 @@ function get_folding(){
6779
$stmt = $db->prepare($sql);
6880
$stmt->execute();
6981
$results = $stmt->fetchAll();
82+
if($results){
7083
foreach ($results as $row) {
7184
echo $row['total_folding'];
85+
}}
86+
else{
87+
echo "0";
7288
}
7389
}
7490

@@ -80,8 +96,12 @@ function get_ready(){
8096
$stmt = $db->prepare($sql);
8197
$stmt->execute();
8298
$results = $stmt->fetchAll();
99+
if($results){
83100
foreach ($results as $row) {
84101
echo $row['total_ready'];
102+
}}
103+
else{
104+
echo "0";
85105
}
86106
}
87107

@@ -93,8 +113,12 @@ function get_claimed(){
93113
$stmt = $db->prepare($sql);
94114
$stmt->execute();
95115
$results = $stmt->fetchAll();
116+
if ($results){
96117
foreach ($results as $row) {
97118
echo $row['total_claimed'];
119+
}}
120+
else{
121+
echo "0";
98122
}
99123
}
100124

@@ -105,7 +129,11 @@ function get_customers(){
105129
$stmt = $db->prepare($sql);
106130
$stmt->execute();
107131
$results = $stmt->fetchAll();
132+
if ($results){
108133
foreach ($results as $row) {
109134
echo $row['total_customers'];
135+
}}
136+
else{
137+
echo "0";
110138
}
111139
}

‎functions/views/navbar.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
if ($_SESSION['level'] == '0') {
44
?>
55
<li class="nav-item"><a class="nav-link <?= ($currentPage == 'index.php') ? 'active' : ''; ?>" href="index.php"><i class="fas fa-tachometer-alt"></i><span>Dashboard</span></a></li>
6-
<li class="nav-item"><a class="nav-link" data-bs-target="#transaction" data-bs-toggle="modal" href="#"><i class="far fa-credit-card"></i><span>New Transaction</span></a><a class="nav-link <?= ($currentPage == 'transaction.php') ? 'active' : ''; ?>" href="transaction.php"><i class="far fa-credit-card"></i><span>Transaction</span></a></li>
6+
<li class="nav-item"><a class="nav-link <?= ($currentPage == 'transaction.php') ? 'active' : ''; ?>" href="transaction.php"><i class="far fa-credit-card"></i><span>Transaction</span></a></li>
77
<li class="nav-item"><a class="nav-link <?= ($currentPage == 'customer.php') ? 'active' : ''; ?>" href="customer.php"><i class="fas fa-user"></i><span>Customers</span></a></li>
88
<li class="nav-item"><a class="nav-link <?= ($currentPage == 'staff.php') ? 'active' : ''; ?>" href="staff.php"><i class="fas fa-user"></i><span>Staff</span></a></li>
99
<li class="nav-item"><a class="nav-link <?= ($currentPage == 'expedinture.php') ? 'active' : ''; ?>" href="expedinture.php"><i class="far fa-share-square" style="font-size: 14px;"></i><span>Expenditure</span></a><a class="nav-link <?= ($currentPage == 'supply.php') ? 'active' : ''; ?>" href="supply.php"><i class="fas fa-shopping-cart" style="font-size: 14px;"></i><span>Supply</span></a></li>
@@ -13,7 +13,7 @@
1313
} else {
1414
?>
1515
<li class="nav-item"><a class="nav-link <?= ($currentPage == 'index.php') ? 'active' : ''; ?>" href="index.php"><i class="fas fa-tachometer-alt"></i><span>Dashboard</span></a></li>
16-
<li class="nav-item"><a class="nav-link" data-bs-target="#transaction" data-bs-toggle="modal" href="#"><i class="far fa-credit-card"></i><span>New Transaction</span></a><a class="nav-link <?= ($currentPage == 'transaction.php') ? 'active' : ''; ?>" href="transaction.php"><i class="far fa-credit-card"></i><span>Transaction</span></a></li>
16+
<a class="nav-link <?= ($currentPage == 'transaction.php') ? 'active' : ''; ?>" href="transaction.php"><i class="far fa-credit-card"></i><span>Transaction</span></a></li>
1717
<li class="nav-item"><a class="nav-link <?= ($currentPage == 'customer.php') ? 'active' : ''; ?>" href="customer.php"><i class="fas fa-user"></i><span>Customers</span></a></li>
1818
<li class="nav-item"><a class="nav-link <?= ($currentPage == 'queue.php') ? 'active' : ''; ?>" href="queue.php"><i class="fas fa-table"></i><span>Queuing</span></a></li>
1919
<?php

‎profile.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
</nav>
6363
<div class="container-fluid">
6464
<div class="d-sm-flex justify-content-between align-items-center mb-4">
65-
<h3 class="text-dark mb-0">Settings</h3><button class="btn btn-primary btn-sm d-none d-sm-inline-block" type="button" data-bs-target="#add" data-bs-toggle="modal"><i class="fas fa-user-check fa-sm text-white-50"></i>&nbsp;Add Price</button>
65+
<h3 class="text-dark mb-0">Settings</h3>
6666
</div>
6767
<div class="row mb-3">
6868
<div class="col-lg-4">
@@ -102,9 +102,12 @@
102102
</div>
103103
</div>
104104
<div class="card shadow mb-5"></div>
105+
<div class="d-sm-flex justify-content-between align-items-center mb-4">
106+
<h3 class="text-dark mb-0">Pricing Settings</h3><button class="btn btn-primary btn-sm d-none d-sm-inline-block" type="button" data-bs-target="#add" data-bs-toggle="modal"><i class="fas fa-user-check fa-sm text-white-50"></i>&nbsp;Add Price</button>
107+
</div>
105108
<div class="card shadow mb-3">
106109
<div class="card-header py-3">
107-
<p class="text-primary m-0 fw-bold">Pricing Settings</p>
110+
<p class="text-primary m-0 fw-bold">Pricing List</p>
108111
</div>
109112
<div class="card-body">
110113
<div class="table-responsive table mt-2" role="grid" aria-describedby="dataTable_info">

‎transaction.php‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,17 @@
99
$name = explode(' ', $fullname);
1010
$firstname = $name[0];
1111
$lastname = $name[1];
12-
1312
$address = $row['address'];
1413
$contact = $row['contact'];
1514
}
1615

1716
if(get_transaction($_SESSION['id']) == null){
1817
$id = '';
19-
$fullname = '';
20-
$firstname = '';
21-
$lastname = '';
22-
$address = '';
23-
$contact = '';
18+
$fullname = 'NONE';
19+
$firstname = 'NONE';
20+
$lastname = 'NONE';
21+
$address = 'NONE';
22+
$contact = 'NONE';
2423
}
2524
?>
2625

@@ -81,7 +80,11 @@
8180
</nav>
8281
<div class="container-fluid">
8382
<div class="d-sm-flex justify-content-between align-items-center mb-4">
84-
<h3 class="text-dark mb-0">Transaction</h3><button class="btn btn-primary btn-sm d-none d-sm-inline-block" type="button" data-bs-target="#add" data-bs-toggle="modal"><i class="fas fa-truck-loading fa-sm text-white-50"></i>&nbsp;Add Item</button>
83+
<h3 class="text-dark mb-0">Transaction</h3>
84+
</div>
85+
<div class="d-sm-flex justify-content-between align-items-center mb-4">
86+
<button class="btn btn-primary btn-sm d-none d-sm-inline-block" type="button" data-bs-target="#transaction" data-bs-toggle="modal"><i class="fas fa-truck-loading fa-sm text-white-50"></i>&nbsp;New Transaction</button>
87+
<button class="btn btn-primary btn-sm d-none d-sm-inline-block" type="button" data-bs-target="#add" data-bs-toggle="modal"><i class="fas fa-truck-loading fa-sm text-white-50"></i>&nbsp;Add Item</button>
8588
</div>
8689
<div class="card shadow mb-3">
8790
<div class="card-header py-3">
@@ -94,16 +97,28 @@
9497
</div>
9598
<div class="card-body">
9699
<form>
97-
<div class="row">
100+
<div class="row">
98101
<div class="col">
99-
<div class="mb-3"><label class="form-label" for="first_name"><strong>First Name</strong></label><input class="form-control" type="text" id="first_name" placeholder="John" name="first_name" readonly="" value="<?php echo $firstname ?>"></div>
102+
<div class="mb-3">
103+
<label class="form-label" for="first_name"><strong>First Name:</strong></label>
104+
<label class="form-label" id="first_name"><?php echo $firstname ?></label>
105+
</div>
100106
</div>
101107
<div class="col">
102-
<div class="mb-3"><label class="form-label" for="last_name"><strong>Last Name</strong></label><input class="form-control" type="text" id="last_name" placeholder="Doe" name="last_name" readonly="" value="<?php echo $lastname ?>"></div>
108+
<div class="mb-3">
109+
<label class="form-label" for="last_name"><strong>Last Name:</strong></label>
110+
<label class="form-label" id="last_name"><?php echo $lastname ?></label>
111+
</div>
103112
</div>
104113
</div>
105-
<div class="mb-3"><label class="form-label" for="last_name"><strong>Address</strong></label><input class="form-control" type="text" placeholder="Address" name="address" readonly="" value="<?php echo $address ?>"></div>
106-
<div class="mb-3"><label class="form-label" for="last_name"><strong>Contact</strong></label><input class="form-control" type="text" placeholder="Contact" name="address" readonly="" value="<?php echo $contact ?>"></div>
114+
<div class="mb-3">
115+
<label class="form-label" for="address"><strong>Address:</strong></label>
116+
<label class="form-label" id="address"><?php echo $address ?></label>
117+
</div>
118+
<div class="mb-3">
119+
<label class="form-label" for="contact"><strong>Contact:</strong></label>
120+
<label class="form-label" id="contact"><?php echo $contact ?></label>
121+
</div>
107122
<div class="row">
108123
<div class="col">
109124
<div class="mb-3"><label class="form-label" for="first_name"><strong>Kg/Kilo</strong></label><input class="form-control" type="number" value="1" id="first_name-1" placeholder="Kg/Kilogram" name="kilo"></div>

0 commit comments

Comments
 (0)