ThaMunsta/itflow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eworked year selector on the dashboard

Browse Source
This commit is contained in:
johnnyq
2023-01-02 16:03:52 -05:00
parent d9fdcb8702
commit 637712aa71
1 changed files with 74 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
dashboard_financial.php
View File

@@ -18,14 +18,19 @@ function roundUpToNearestMultiple($n, $increment = 1000)
return (int) ($increment * ceil($n / $increment)); return (int) ($increment * ceil($n / $increment));
} }
if(isset($_GET['year'])){ if (isset($_GET['year'])) {
$year = intval($_GET['year']); $year = intval($_GET['year']);
}else{ } else {
$year = date('Y'); $year = date('Y');
} }
//GET unique years from expenses, payments and revenues //GET unique years from expenses, payments invoices and revenues
$sql_payment_years = mysqli_query($mysqli,"SELECT YEAR(expense_date) AS all_years FROM expenses WHERE company_id = $session_company_id UNION DISTINCT SELECT YEAR(payment_date) FROM payments WHERE company_id = $session_company_id UNION DISTINCT SELECT YEAR(revenue_date) FROM revenues WHERE company_id = $session_company_id ORDER BY all_years DESC"); $sql_years_select = mysqli_query($mysqli,"SELECT YEAR(expense_date) AS all_years FROM expenses WHERE company_id = $session_company_id
UNION DISTINCT SELECT YEAR(payment_date) FROM payments WHERE company_id = $session_company_id
UNION DISTINCT SELECT YEAR(revenue_date) FROM revenues WHERE company_id = $session_company_id
UNION DISTINCT SELECT YEAR(invoice_date) FROM invoices WHERE company_id = $session_company_id
ORDER BY all_years DESC
");
//Define var so it doesnt throw errors in logs //Define var so it doesnt throw errors in logs
$largest_income_month = 0; $largest_income_month = 0;
@@ -67,17 +72,17 @@ $profit = $total_income - $total_expenses;
$sql_accounts = mysqli_query($mysqli,"SELECT * FROM accounts WHERE company_id = $session_company_id"); $sql_accounts = mysqli_query($mysqli,"SELECT * FROM accounts WHERE company_id = $session_company_id");
$sql_latest_invoice_payments = mysqli_query($mysqli,"SELECT * FROM payments, invoices, clients $sql_latest_invoice_payments = mysqli_query($mysqli,"SELECT * FROM payments, invoices, clients
WHERE payment_invoice_id = invoice_id WHERE payment_invoice_id = invoice_id
AND invoice_client_id = client_id AND invoice_client_id = client_id
AND clients.company_id = $session_company_id AND clients.company_id = $session_company_id
ORDER BY payment_id DESC LIMIT 5" ORDER BY payment_id DESC LIMIT 5"
); );
$sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, categories $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, categories
WHERE expense_vendor_id = vendor_id WHERE expense_vendor_id = vendor_id
AND expense_category_id = category_id AND expense_category_id = category_id
AND expenses.company_id = $session_company_id AND expenses.company_id = $session_company_id
ORDER BY expense_id DESC LIMIT 5" ORDER BY expense_id DESC LIMIT 5"
); );
//Get Monthly Recurring Total //Get Monthly Recurring Total
@@ -109,13 +114,13 @@ $vendors_added = $row['vendors_added'];
<select onchange="this.form.submit()" class="form-control" name="year"> <select onchange="this.form.submit()" class="form-control" name="year">
<?php <?php
while($row = mysqli_fetch_array($sql_payment_years)){ while($row = mysqli_fetch_array($sql_years_select)){
$payment_year = $row['all_years']; $year_select = $row['all_years'];
if(empty($payment_year)){ if(empty($year_select)){
$payment_year = date('Y'); $year_select = date('Y');
} }
?> ?>
<option <?php if($year == $payment_year){ echo "selected"; } ?> > <?php echo $payment_year; ?></option> <option <?php if($year == $year_select){ echo "selected"; } ?> > <?php echo $year_select; ?></option>
<?php <?php
} }
@@ -339,39 +344,39 @@ $vendors_added = $row['vendors_added'];
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-borderless"> <table class="table table-borderless">
<tbody> <tbody>
<?php <?php
while($row = mysqli_fetch_array($sql_accounts)){ while($row = mysqli_fetch_array($sql_accounts)){
$account_id = $row['account_id']; $account_id = $row['account_id'];
$account_name = htmlentities($row['account_name']); $account_name = htmlentities($row['account_name']);
$opening_balance = $row['opening_balance']; $opening_balance = $row['opening_balance'];
?> ?>
<tr> <tr>
<td><?php echo $account_name; ?></a></td> <td><?php echo $account_name; ?></a></td>
<?php <?php
$sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id"); $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
$row = mysqli_fetch_array($sql_payments); $row = mysqli_fetch_array($sql_payments);
$total_payments = $row['total_payments']; $total_payments = $row['total_payments'];
$sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id"); $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
$row = mysqli_fetch_array($sql_revenues); $row = mysqli_fetch_array($sql_revenues);
$total_revenues = $row['total_revenues']; $total_revenues = $row['total_revenues'];
$sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id"); $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
$row = mysqli_fetch_array($sql_expenses); $row = mysqli_fetch_array($sql_expenses);
$total_expenses = $row['total_expenses']; $total_expenses = $row['total_expenses'];
$balance = $opening_balance + $total_payments + $total_revenues - $total_expenses; $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
if($balance == ''){ if($balance == ''){
$balance = '0.00'; $balance = '0.00';
} }
?> ?>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $balance, "$session_company_currency"); ?></td> <td class="text-right"><?php echo numfmt_format_currency($currency_format, $balance, "$session_company_currency"); ?></td>
</tr> </tr>
<?php <?php
} }
?> ?>
</tbody> </tbody>
</table> </table>
@@ -400,13 +405,13 @@ $vendors_added = $row['vendors_added'];
</thead> </thead>
<tbody> <tbody>
<?php <?php
while($row = mysqli_fetch_array($sql_latest_invoice_payments)){ while($row = mysqli_fetch_array($sql_latest_invoice_payments)){
$payment_date = $row['payment_date']; $payment_date = $row['payment_date'];
$payment_amount = floatval($row['payment_amount']); $payment_amount = floatval($row['payment_amount']);
$invoice_prefix = htmlentities($row['invoice_prefix']); $invoice_prefix = htmlentities($row['invoice_prefix']);
$invoice_number = htmlentities($row['invoice_number']); $invoice_number = htmlentities($row['invoice_number']);
$client_name = htmlentities($row['client_name']); $client_name = htmlentities($row['client_name']);
?> ?>
<tr> <tr>
<td><?php echo $payment_date; ?></td> <td><?php echo $payment_date; ?></td>
<td><?php echo $client_name; ?></td> <td><?php echo $client_name; ?></td>
@@ -414,8 +419,8 @@ $vendors_added = $row['vendors_added'];
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $payment_amount, "$session_company_currency"); ?></td> <td class="text-right"><?php echo numfmt_format_currency($currency_format, $payment_amount, "$session_company_currency"); ?></td>
</tr> </tr>
<?php <?php
} }
?> ?>
</tbody> </tbody>
</table> </table>
</div> </div>
@@ -436,29 +441,29 @@ $vendors_added = $row['vendors_added'];
<thead> <thead>
<tr> <tr>
<th>Date</th> <th>Date</th>
<th>Vendor</th> <th>Vendor</th>
<th>Category</th> <th>Category</th>
<th class="text-right">Amount</th> <th class="text-right">Amount</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php <?php
while($row = mysqli_fetch_array($sql_latest_expenses)){ while($row = mysqli_fetch_array($sql_latest_expenses)){
$expense_date = $row['expense_date']; $expense_date = $row['expense_date'];
$expense_amount = floatval($row['expense_amount']); $expense_amount = floatval($row['expense_amount']);
$vendor_name = htmlentities($row['vendor_name']); $vendor_name = htmlentities($row['vendor_name']);
$category_name = htmlentities($row['category_name']); $category_name = htmlentities($row['category_name']);
?> ?>
<tr> <tr>
<td><?php echo $expense_date; ?></td> <td><?php echo $expense_date; ?></td>
<td><?php echo $vendor_name; ?></td> <td><?php echo $vendor_name; ?></td>
<td><?php echo $category_name; ?></td> <td><?php echo $category_name; ?></td>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $expense_amount, "$session_company_currency"); ?></td> <td class="text-right"><?php echo numfmt_format_currency($currency_format, $expense_amount, "$session_company_currency"); ?></td>
</tr> </tr>
<?php <?php
} }
?> ?>
</tbody> </tbody>
</table> </table>
</div> </div>
@@ -786,10 +791,10 @@ var myPieChart = new Chart(ctx, {
}], }],
}, },
options: { options: {
legend: { legend: {
display: true, display: true,
position: 'right' position: 'right'
} }
} }
}); });
@@ -843,10 +848,10 @@ var myPieChart = new Chart(ctx, {
}], }],
}, },
options: { options: {
legend: { legend: {
display: true, display: true,
position: 'right' position: 'right'
} }
} }
}); });
@@ -896,10 +901,10 @@ var myPieChart = new Chart(ctx, {
}], }],
}, },
options: { options: {
legend: { legend: {
display: true, display: true,
position: 'right' position: 'right'
} }
} }
}); });