From 72e3bf03676414873383a256d78b5e2fee7bfe46 Mon Sep 17 00:00:00 2001
From: root <root@pittpc-crm.localDomain>
Date: Sun, 31 Mar 2019 14:09:47 -0400
Subject: [PATCH] used PHP number_format() function to make amounts more
 readable

---
 accounts.php  |  8 +++-----
 dashboard.php | 16 ++++++++--------
 expenses.php  | 10 +++++-----
 invoices.php  |  2 +-
 transfers.php |  2 +-
 5 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/accounts.php b/accounts.php
index 573ac1ce..d178cb7c 100644
--- a/accounts.php
+++ b/accounts.php
@@ -28,7 +28,7 @@
 
           ?>
           <tr>
-            <td><?php echo "$account_name"; ?></a></td>
+            <td><?php echo $account_name; ?></a></td>
             <?php
             $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);
@@ -37,12 +37,10 @@
             $row3 = mysqli_fetch_array($sql3);
             
             $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>
               <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">
diff --git a/dashboard.php b/dashboard.php
index e0eaba60..1b24117a 100644
--- a/dashboard.php
+++ b/dashboard.php
@@ -42,9 +42,9 @@ $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, ca
         <div class="card-body-icon">
           <i class="fas fa-fw fa-money-check"></i>
         </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>
-        Recievables: $<?php echo $recievables; ?>
+        Recievables: $<?php echo number_format($recievables,2); ?>
       </div>
     </div>
   </div>
@@ -54,7 +54,7 @@ $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, ca
         <div class="card-body-icon">
           <i class="fas fa-fw fa-shopping-cart"></i>
         </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>
@@ -64,7 +64,7 @@ $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, ca
         <div class="card-body-icon">
           <i class="fas fa-fw fa-heart"></i>
         </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> 
@@ -97,7 +97,7 @@ $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, ca
 
 			          ?>
                 <tr>
-			            <td><?php echo "$account_name"; ?></a></td>
+			            <td><?php echo $account_name; ?></a></td>
 			            <?php
 			            $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);
@@ -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>
 			          <?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 $client_name; ?></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>
               <?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 $vendor_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>
              	<?php
 			        }
diff --git a/expenses.php b/expenses.php
index 92d08576..c87a6693 100644
--- a/expenses.php
+++ b/expenses.php
@@ -45,11 +45,11 @@
           ?>
 
           <tr>
-            <td><?php echo "$expense_date"; ?></td>
-            <td class="text-right text-monospace">$<?php echo "$expense_amount"; ?></td>
-            <td><?php echo "$vendor_name"; ?></td>
-            <td><?php echo "$category_name"; ?></td>
-            <td><?php echo "$account_name"; ?></td>
+            <td><?php echo $expense_date; ?></td>
+            <td class="text-right text-monospace">$<?php echo number_format($expense_amount,2); ?></td>
+            <td><?php echo $vendor_name; ?></td>
+            <td><?php echo $category_name; ?></td>
+            <td><?php echo $account_name; ?></td>
             <td>
               <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">
diff --git a/invoices.php b/invoices.php
index 36b348bc..7b869707 100644
--- a/invoices.php
+++ b/invoices.php
@@ -64,7 +64,7 @@
           <tr>
             <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 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><div class="<?php echo $overdue_color; ?>"><?php echo "$invoice_due"; ?></div></td>
             <td>
diff --git a/transfers.php b/transfers.php
index dd935711..8a34da4b 100644
--- a/transfers.php
+++ b/transfers.php
@@ -47,7 +47,7 @@ $sql = mysqli_query($mysqli,"SELECT * FROM transfers ORDER BY transfers.transfer
             <td><?php echo $transfer_date; ?></td>
             <td><?php echo $account_name_from; ?></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>
               <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">