AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-02-28 02:44:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added Additonal Export Options to Expenses Including Account, Vendor and Category, removed CSV Warning on Export Model

Browse Source
This commit is contained in:
johnnyq
2024-09-13 12:32:16 -04:00
parent e0ca3f15a8
commit 208e56e784
2 changed files with 103 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
post/expense.php
View File

@@ -218,6 +218,10 @@ if (isset($_POST['bulk_edit_expense_client'])) {
if (isset($_POST['export_expenses_csv'])) {
$date_from = sanitizeInput($_POST['date_from']);
$date_to = sanitizeInput($_POST['date_to']);
$account = intval($_POST['account']);
$vendor = intval($_POST['vendor']);
$category = intval($_POST['category']);
if (!empty($date_from) && !empty($date_to)) {
$date_query = "AND DATE(expense_date) BETWEEN '$date_from' AND '$date_to'";
$file_name_date = "$date_from-to-$date_to";
@@ -226,6 +230,29 @@ if (isset($_POST['export_expenses_csv'])) {
$file_name_date = date('Y-m-d');
}
// Vendor Filter
if ($account) {
$account_query = "AND expense_account_id = $account";
} else {
$account_query = '';
}
// Vendor Filter
if ($vendor) {
$vendor_query = "AND expense_vendor_id = $vendor";
} else {
// Default - any
$vendor_query = '';
}
// Category Filter
if ($category) {
$category_query = "AND expense_category_id = $category";
} else {
// Default - any
$category_query = '';
}
//get records from database
$sql = mysqli_query($mysqli,"SELECT * FROM expenses
LEFT JOIN categories ON expense_category_id = category_id
@@ -233,6 +260,9 @@ if (isset($_POST['export_expenses_csv'])) {
LEFT JOIN accounts ON expense_account_id = account_id
WHERE expense_vendor_id > 0
$date_query
$account_query
$vendor_query
$category_query
ORDER BY expense_date DESC
");