From a9e3d0fa7e371c36ebf0c0ff7325315532296ac6 Mon Sep 17 00:00:00 2001
From: "johnny@pittpc.com" <admin@app.pittpc.com>
Date: Sat, 21 Sep 2019 16:23:35 -0400
Subject: [PATCH] Added the missing October to Cashflow on the Dashboard, added
 more calendar events etc

---
 calendar_domains.php | 23 +++++++++++++++++++++++
 dashboard.php        |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/calendar_domains.php b/calendar_domains.php
index 10ee586d..c1ab47a5 100644
--- a/calendar_domains.php
+++ b/calendar_domains.php
@@ -20,6 +20,17 @@
         },
         events: [
           <?php
+          $sql = mysqli_query($mysqli,"SELECT * FROM invoices, clients WHERE invoices.client_id = clients.client_id AND invoices.company_id = $session_company_id");
+          while($row = mysqli_fetch_array($sql)){
+            $invoice_id = $row['invoice_id'];
+            $invoice_number = $row['invoice_number'];
+            $invoice_due = $row['invoice_due'];
+            $invoice_amount = $row['invoice_amount'];
+            $client_name = addslashes($row['client_name']);
+            
+            echo "{ id: '$invoice_id', title: '$invoice_number - $client_name', start: '$invoice_due', color: 'red'},";
+          }
+
           $sql = mysqli_query($mysqli,"SELECT * FROM domains WHERE company_id = $session_company_id");
           while($row = mysqli_fetch_array($sql)){
             $domain_id = $row['domain_id'];
@@ -29,6 +40,18 @@
             
             echo "{ id: '$domain_id', title: '$domain', start: '$domain_expire', color: 'blue'},";
           }
+
+          $sql = mysqli_query($mysqli,"SELECT * FROM recurring, clients, categories WHERE recurring.client_id = clients.client_id AND recurring.category_id = categories.category_id AND recurring.company_id = $session_company_id");
+          while($row = mysqli_fetch_array($sql)){
+            $recurring_id = $row['recurring_id'];
+            $recurring_next_date = $row['recurring_next_date'];
+            $recurring_amount = $row['recurring_amount'];
+            $category_name = $row['category_name'];
+            $client_name = addslashes($row['client_name']);
+            
+            echo "{ id: '$recurring_id', title: '$category_name - $$recurring_amount', start: '$recurring_next_date', color: 'green'},";
+          }
+          
           ?>
         ],
       });
diff --git a/dashboard.php b/dashboard.php
index 84573e9b..e75d8adb 100644
--- a/dashboard.php
+++ b/dashboard.php
@@ -323,7 +323,7 @@ var ctx = document.getElementById("cashFlow");
 var myLineChart = new Chart(ctx, {
   type: 'line',
   data: {
-    labels: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Nov", "Dec"],
+    labels: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
     datasets: [{
       label: "Income",
       lineTension: 0.3,