From 01bc31728f6ac980fa2e621d36d25111a4a7f67a Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Tue, 6 Dec 2022 21:31:44 -0500
Subject: [PATCH] Cleanup Margins in Client and Vendor Reports as well as add
 currency

---
 report_expense_by_vendor.php | 10 +++++-----
 report_income_by_client.php  | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/report_expense_by_vendor.php b/report_expense_by_vendor.php
index f20ecd10..ef26c98c 100644
--- a/report_expense_by_vendor.php
+++ b/report_expense_by_vendor.php
@@ -26,8 +26,8 @@ $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE company_id = $s
       <button type="button" class="btn btn-primary d-print-none" onclick="window.print();"><i class="fas fa-fw fa-print"></i> Print</button>
     </div>
   </div>
-  <div class="card-body p-0">
-    <form class="p-3">
+  <div class="card-body">
+    <form class="mb-3">
       <select onchange="this.form.submit()" class="form-control" name="year">
         <?php 
                 
@@ -48,7 +48,7 @@ $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE company_id = $s
         <thead>
           <tr>
             <th>Vendor</th>
-            <th>Paid</th>
+            <th class="text-right">Paid</th>
           </tr>
         </thead>
         <tbody>
@@ -60,7 +60,7 @@ $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE company_id = $s
             $sql_amount_paid = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS amount_paid FROM expenses WHERE YEAR(expense_date) = $year AND expense_vendor_id = $vendor_id");
             $row = mysqli_fetch_array($sql_amount_paid);
             
-            $amount_paid = $row['amount_paid'];
+            $amount_paid = floatval($row['amount_paid']);
 
             if($amount_paid > 599){
 
@@ -68,7 +68,7 @@ $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE company_id = $s
 
               <tr>
                 <td><?php echo $vendor_name; ?></td>
-                <td><?php echo $amount_paid; ?></td>
+                <td class="text-right"><?php echo numfmt_format_currency($currency_format, $amount_paid, $session_company_currency); ?></td>
               </tr>
               <?php 
               } 
diff --git a/report_income_by_client.php b/report_income_by_client.php
index e14d3a31..2ce1a702 100644
--- a/report_income_by_client.php
+++ b/report_income_by_client.php
@@ -26,8 +26,8 @@ $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $s
       <button type="button" class="btn btn-primary d-print-none" onclick="window.print();"><i class="fas fa-fw fa-print"></i> Print</button>
     </div>
   </div>
-  <div class="card-body p-0">
-    <form class="p-3">
+  <div class="card-body">
+    <form class="mb-3">
       <select onchange="this.form.submit()" class="form-control" name="year">
         <?php 
                 
@@ -48,7 +48,7 @@ $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $s
         <thead>
           <tr>
             <th>Client</th>
-            <th>Paid</th>
+            <th class="text-right">Paid</th>
           </tr>
         </thead>
         <tbody>
@@ -60,7 +60,7 @@ $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $s
             $sql_amount_paid = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND YEAR(payment_date) = $year AND invoice_client_id = $client_id");
             $row = mysqli_fetch_array($sql_amount_paid);
             
-            $amount_paid = $row['amount_paid'];
+            $amount_paid = floatval($row['amount_paid']);
 
             if($amount_paid > 599){
 
@@ -68,7 +68,7 @@ $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $s
 
               <tr>
                 <td><?php echo $client_name; ?></td>
-                <td><?php echo $amount_paid; ?></td>
+                <td class="text-right"><?php echo numfmt_format_currency($currency_format, $amount_paid, $session_company_currency); ?></td>
               </tr>
               <?php 
               }