From 208e56e784344e28b07e2153ed89d1c5d6fb78f1 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Fri, 13 Sep 2024 12:32:16 -0400
Subject: [PATCH] Added Additonal Export Options to Expenses Including Account,
 Vendor and Category, removed CSV Warning on Export Model

---
 expense_export_modal.php | 76 ++++++++++++++++++++++++++++++++++++++--
 post/expense.php         | 30 ++++++++++++++++
 2 files changed, 103 insertions(+), 3 deletions(-)

diff --git a/expense_export_modal.php b/expense_export_modal.php
index ce84b56d..acc4befc 100644
--- a/expense_export_modal.php
+++ b/expense_export_modal.php
@@ -2,16 +2,86 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-download mr-2"></i>Export Expenses to CSV</h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-download mr-2"></i>Exporting Expenses to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
+
                 <div class="modal-body bg-white">
 
-                    <?php require_once "inc_export_warning.php";
- ?>
+                    <div class="form-group">
+                        <label>Account</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
+                            </div>
+                            <select class="form-control select2" name="account">
+                                <option value="" <?php if ($account == "") { echo "selected"; } ?>>- All Accounts -</option>
+
+                                <?php
+                                $sql_accounts_filter = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
+                                while ($row = mysqli_fetch_array($sql_accounts_filter)) {
+                                    $account_id = intval($row['account_id']);
+                                    $account_name = nullable_htmlentities($row['account_name']);
+                                ?>
+                                    <option <?php if ($account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
+                                <?php
+                                }
+                                ?>
+
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Vendor</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
+                            </div>
+                            <select class="form-control select2" name="vendor">
+                                <option value="" <?php if ($vendor == "") { echo "selected"; } ?>>- All Vendors -</option>
+
+                                <?php
+                                $sql_vendors_filter = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = 0 AND vendor_template = 0 ORDER BY vendor_name ASC");
+                                while ($row = mysqli_fetch_array($sql_vendors_filter)) {
+                                    $vendor_id = intval($row['vendor_id']);
+                                    $vendor_name = nullable_htmlentities($row['vendor_name']);
+                                ?>
+                                    <option <?php if ($vendor == $vendor_id) { echo "selected"; } ?> value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
+                                <?php
+                                }
+                                ?>
+
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Category</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+                            </div>
+                            <select class="form-control select2" name="category">
+                                <option value="" <?php if ($category == "") { echo "selected"; } ?>>- All Categories -</option>
+
+                                <?php
+                                $sql_categories_filter = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Expense' ORDER BY category_name ASC");
+                                while ($row = mysqli_fetch_array($sql_categories_filter)) {
+                                    $category_id = intval($row['category_id']);
+                                    $category_name = nullable_htmlentities($row['category_name']);
+                                ?>
+                                    <option <?php if ($category == $category_id) { echo "selected"; } ?> value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+                                <?php
+                                }
+                                ?>
+
+                            </select>
+                        </div>
+                    </div>
 
                     <div class="form-group">
                         <label>Date From</label>
diff --git a/post/expense.php b/post/expense.php
index 0ff648a2..62746c59 100644
--- a/post/expense.php
+++ b/post/expense.php
@@ -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
     ");