Fixed expense by Category Pie chart on dashboard

api.php

@@ -42,6 +42,28 @@ if($_GET['api_key'] == $config_api_key){
         }
 
     }
+
+    if(isset($_GET['account_balance'])){
+
+        $client_id = intval($_GET['account_balance']);
+
+        //Add up all the payments for the invoice and get the total amount paid to the invoice
+        $sql_invoice_amounts = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE client_id = $client_id AND invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Cancelled'");
+        $row = mysqli_fetch_array($sql_invoice_amounts);
+
+        $invoice_amounts = $row['invoice_amounts'];
+
+        $sql_amount_paid = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payments.invoice_id = invoices.invoice_id AND invoices.client_id = $client_id");
+        $row = mysqli_fetch_array($sql_amount_paid);
+
+        $amount_paid = $row['amount_paid'];
+
+        $balance = $invoice_amounts - $amount_paid;
+
+        echo $balance;
+
+    }
+
 }else{
     echo "<h1> Ma!! You've been BAAAAADDDDD!! </h1>";
 }

dashboard.php

@@ -397,7 +397,7 @@ var myPieChart = new Chart(ctx, {
   data: {
     labels: [
       <?php
-        $sql_categories = mysqli_query($mysqli,"SELECT DISTINCT category_name FROM categories, expenses WHERE expenses.category_id = categories.category_id AND YEAR(expense_date) = $year");
+        $sql_categories = mysqli_query($mysqli,"SELECT DISTINCT category_name, categories.category_id FROM categories, expenses WHERE expenses.category_id = categories.category_id AND YEAR(expense_date) = $year");
         while($row = mysqli_fetch_array($sql_categories)){
           $category_name = $row['category_name'];
           echo "\"$category_name\",";
@@ -409,7 +409,7 @@ var myPieChart = new Chart(ctx, {
     datasets: [{
       data: [
         <?php
-          $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense'");
+          $sql_categories = mysqli_query($mysqli,"SELECT DISTINCT category_name, categories.category_id FROM categories, expenses WHERE expenses.category_id = categories.category_id AND YEAR(expense_date) = $year");
           while($row = mysqli_fetch_array($sql_categories)){
             $category_id = $row['category_id'];