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

Added the missing October to Cashflow on the Dashboard, added more calendar events etc

Browse Source
This commit is contained in:
johnny@pittpc.com
2019-09-21 16:23:35 -04:00
parent cb439f2f47
commit a9e3d0fa7e
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
calendar_domains.php
View File

@@ -20,6 +20,17 @@
}, },
events: [ events: [
<?php <?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"); $sql = mysqli_query($mysqli,"SELECT * FROM domains WHERE company_id = $session_company_id");
while($row = mysqli_fetch_array($sql)){ while($row = mysqli_fetch_array($sql)){
$domain_id = $row['domain_id']; $domain_id = $row['domain_id'];
@@ -29,6 +40,18 @@
echo "{ id: '$domain_id', title: '$domain', start: '$domain_expire', color: 'blue'},"; 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'},";
}
?> ?>
], ],
}); });

2
dashboard.php
View File

@@ -323,7 +323,7 @@ var ctx = document.getElementById("cashFlow");
var myLineChart = new Chart(ctx, { var myLineChart = new Chart(ctx, {
type: 'line', type: 'line',
data: { 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: [{ datasets: [{
label: "Income", label: "Income",
lineTension: 0.3, lineTension: 0.3,