AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-03-03 04:14:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

used PHP number_format() function to make amounts more readable

Browse Source
This commit is contained in:
root
2019-03-31 14:09:47 -04:00
parent 6fe2aba79a
commit 72e3bf0367
5 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
accounts.php
View File

@@ -28,7 +28,7 @@
?> ?>
<tr> <tr>
<td><?php echo "$account_name"; ?></a></td> <td><?php echo $account_name; ?></a></td>
<?php <?php
$sql2 = mysqli_query($mysqli,"SELECT SUM(invoice_payment_amount) AS total_payments FROM invoice_payments WHERE account_id = $account_id"); $sql2 = mysqli_query($mysqli,"SELECT SUM(invoice_payment_amount) AS total_payments FROM invoice_payments WHERE account_id = $account_id");
$row2 = mysqli_fetch_array($sql2); $row2 = mysqli_fetch_array($sql2);
@@ -37,12 +37,10 @@
$row3 = mysqli_fetch_array($sql3); $row3 = mysqli_fetch_array($sql3);
$balance = $opening_balance + $row2['total_payments'] - $row3['total_expenses']; $balance = $opening_balance + $row2['total_payments'] - $row3['total_expenses'];
if($balance == ''){
$balance = '0.00';
}
?> ?>
<td class="text-right text-monospace">$<?php echo $balance; ?></td> <td class="text-right text-monospace">$<?php echo number_format($balance,2); ?></td>
<td> <td>
<div class="dropdown dropleft text-center"> <div class="dropdown dropleft text-center">
<button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">

16
dashboard.php
View File

@@ -42,9 +42,9 @@ $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, ca
<div class="card-body-icon"> <div class="card-body-icon">
<i class="fas fa-fw fa-money-check"></i> <i class="fas fa-fw fa-money-check"></i>
</div> </div>
<div class="mr-5">Total Incomes <h1>$<?php echo $total_income; ?></h1></div> <div class="mr-5">Total Incomes <h1>$<?php echo number_format($total_income,2); ?></h1></div>
<hr> <hr>
Recievables: $<?php echo $recievables; ?> Recievables: $<?php echo number_format($recievables,2); ?>
</div> </div>
</div> </div>
</div> </div>
@@ -54,7 +54,7 @@ $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, ca
<div class="card-body-icon"> <div class="card-body-icon">
<i class="fas fa-fw fa-shopping-cart"></i> <i class="fas fa-fw fa-shopping-cart"></i>
</div> </div>
<div class="mr-5">Total Expenses <h1>$<?php echo $total_expenses; ?></h1></div> <div class="mr-5">Total Expenses <h1>$<?php echo number_format($total_expenses,2); ?></h1></div>
</div> </div>
</div> </div>
</div> </div>
@@ -64,7 +64,7 @@ $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, ca
<div class="card-body-icon"> <div class="card-body-icon">
<i class="fas fa-fw fa-heart"></i> <i class="fas fa-fw fa-heart"></i>
</div> </div>
<div class="mr-5">Total Profit <h1>$<?php echo $profit; ?></h1></div> <div class="mr-5">Total Profit <h1>$<?php echo number_format($profit,2); ?></h1></div>
</div> </div>
</div> </div>
</div> </div>
@@ -97,7 +97,7 @@ $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, ca
?> ?>
<tr> <tr>
<td><?php echo "$account_name"; ?></a></td> <td><?php echo $account_name; ?></a></td>
<?php <?php
$sql2 = mysqli_query($mysqli,"SELECT SUM(invoice_payment_amount) AS total_payments FROM invoice_payments WHERE account_id = $account_id"); $sql2 = mysqli_query($mysqli,"SELECT SUM(invoice_payment_amount) AS total_payments FROM invoice_payments WHERE account_id = $account_id");
$row2 = mysqli_fetch_array($sql2); $row2 = mysqli_fetch_array($sql2);
@@ -111,7 +111,7 @@ $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, ca
} }
?> ?>
<td class="text-right text-monospace">$<?php echo $balance; ?></td> <td class="text-right text-monospace">$<?php echo number_format($balance,2); ?></td>
</tr> </tr>
<?php <?php
} }
@@ -149,7 +149,7 @@ $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, ca
<td><?php echo $invoice_payment_date; ?></td> <td><?php echo $invoice_payment_date; ?></td>
<td><?php echo $client_name; ?></td> <td><?php echo $client_name; ?></td>
<td><?php echo $invoice_number; ?></td> <td><?php echo $invoice_number; ?></td>
<td class="text-right text-monospace">$<?php echo $invoice_payment_amount; ?></td> <td class="text-right text-monospace">$<?php echo number_format($invoice_payment_amount,2); ?></td>
</tr> </tr>
<?php <?php
} }
@@ -187,7 +187,7 @@ $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, ca
<td><?php echo $expense_date; ?></td> <td><?php echo $expense_date; ?></td>
<td><?php echo $vendor_name; ?></td> <td><?php echo $vendor_name; ?></td>
<td><?php echo $category_name; ?></td> <td><?php echo $category_name; ?></td>
<td class="text-right text-monospace">$<?php echo $expense_amount; ?></td> <td class="text-right text-monospace">$<?php echo number_format($expense_amount,2); ?></td>
</tr> </tr>
<?php <?php
} }

10
expenses.php
View File

@@ -45,11 +45,11 @@
?> ?>
<tr> <tr>
<td><?php echo "$expense_date"; ?></td> <td><?php echo $expense_date; ?></td>
<td class="text-right text-monospace">$<?php echo "$expense_amount"; ?></td> <td class="text-right text-monospace">$<?php echo number_format($expense_amount,2); ?></td>
<td><?php echo "$vendor_name"; ?></td> <td><?php echo $vendor_name; ?></td>
<td><?php echo "$category_name"; ?></td> <td><?php echo $category_name; ?></td>
<td><?php echo "$account_name"; ?></td> <td><?php echo $account_name; ?></td>
<td> <td>
<div class="dropdown dropleft text-center"> <div class="dropdown dropleft text-center">
<button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">

2
invoices.php
View File

@@ -64,7 +64,7 @@
<tr> <tr>
<td><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>">INV-<?php echo "$invoice_number"; ?></a></td> <td><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>">INV-<?php echo "$invoice_number"; ?></a></td>
<td><a href="client.php?client_id=<?php echo $client_id; ?>"><?php echo "$client_name"; ?></a></td> <td><a href="client.php?client_id=<?php echo $client_id; ?>"><?php echo "$client_name"; ?></a></td>
<td class="text-right text-monospace">$<?php echo "$invoice_balance"; ?></td> <td class="text-right text-monospace">$<?php echo number_format($invoice_balance,2); ?></td>
<td><?php echo "$invoice_date"; ?></td> <td><?php echo "$invoice_date"; ?></td>
<td><div class="<?php echo $overdue_color; ?>"><?php echo "$invoice_due"; ?></div></td> <td><div class="<?php echo $overdue_color; ?>"><?php echo "$invoice_due"; ?></div></td>
<td> <td>

2
transfers.php
View File

@@ -47,7 +47,7 @@ $sql = mysqli_query($mysqli,"SELECT * FROM transfers ORDER BY transfers.transfer
<td><?php echo $transfer_date; ?></td> <td><?php echo $transfer_date; ?></td>
<td><?php echo $account_name_from; ?></td> <td><?php echo $account_name_from; ?></td>
<td><?php echo $account_name_to; ?></td> <td><?php echo $account_name_to; ?></td>
<td class="text-right text-monospace">$<?php echo $transfer_amount; ?></td> <td class="text-right text-monospace">$<?php echo number_format($transfer_amount,2); ?></td>
<td> <td>
<div class="dropdown dropleft text-center"> <div class="dropdown dropleft text-center">
<button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">