From 0b0ccddd8991b8176ad687126dbe562c8b27e7f2 Mon Sep 17 00:00:00 2001
From: "johnny@pittpc.com" <admin@app.pittpc.com>
Date: Sun, 7 Feb 2021 14:12:43 -0500
Subject: [PATCH] continue last commit into add payment and edit items in
 invoice quotes and recurring

---
 add_payment_modal.php         | 4 ++--
 edit_invoice_item_modal.php   | 2 +-
 edit_quote_item_modal.php     | 2 +-
 edit_recurring_item_modal.php | 2 +-
 invoice.php                   | 1 +
 quote.php                     | 1 +
 recurring_invoice.php         | 3 ++-
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/add_payment_modal.php b/add_payment_modal.php
index f460106b..8ff8178e 100644
--- a/add_payment_modal.php
+++ b/add_payment_modal.php
@@ -53,7 +53,7 @@
                 <option value="">- Account -</option>
                 <?php 
                 
-                $sql = mysqli_query($mysqli,"SELECT * FROM accounts WHERE company_id = $session_company_id ORDER BY account_name ASC"); 
+                $sql = mysqli_query($mysqli,"SELECT * FROM accounts WHERE account_archived_at IS NULL AND company_id = $session_company_id ORDER BY account_name ASC"); 
                 while($row = mysqli_fetch_array($sql)){
                   $account_id = $row['account_id'];
                   $account_name = $row['account_name'];
@@ -93,7 +93,7 @@
                 <option value="">- Method of Payment -</option>
                 <?php 
                 
-                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Payment Method' AND company_id = $session_company_id ORDER BY category_name ASC"); 
+                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Payment Method' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC"); 
                 while($row = mysqli_fetch_array($sql)){
                   $category_name = $row['category_name'];
                 ?>
diff --git a/edit_invoice_item_modal.php b/edit_invoice_item_modal.php
index fed83a8b..29b7488a 100644
--- a/edit_invoice_item_modal.php
+++ b/edit_invoice_item_modal.php
@@ -70,7 +70,7 @@
                 <option value="0">None</option>
                 <?php 
                 
-                $taxes_sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session_company_id ORDER BY tax_name ASC"); 
+                $taxes_sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE (tax_archived_at > '$item_created_at' OR tax_archived_at IS NULL) AND company_id = $session_company_id ORDER BY tax_name ASC"); 
                 while($row = mysqli_fetch_array($taxes_sql)){
                   $tax_id_select = $row['tax_id'];
                   $tax_name = $row['tax_name'];
diff --git a/edit_quote_item_modal.php b/edit_quote_item_modal.php
index 1e1a9a0e..30c80704 100644
--- a/edit_quote_item_modal.php
+++ b/edit_quote_item_modal.php
@@ -71,7 +71,7 @@
                 <option value="0">None</option>
                 <?php 
                 
-                $taxes_sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session_company_id ORDER BY tax_name ASC"); 
+                $taxes_sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE (tax_archived_at > '$item_created_at' OR tax_archived_at IS NULL) AND company_id = $session_company_id ORDER BY tax_name ASC"); 
                 while($row = mysqli_fetch_array($taxes_sql)){
                   $tax_id_select = $row['tax_id'];
                   $tax_name = $row['tax_name'];
diff --git a/edit_recurring_item_modal.php b/edit_recurring_item_modal.php
index 26ba1d50..6a36ceec 100644
--- a/edit_recurring_item_modal.php
+++ b/edit_recurring_item_modal.php
@@ -71,7 +71,7 @@
                 <option value="0.00">None</option>
                 <?php 
                 
-                $taxes_sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session_company_id ORDER BY tax_name ASC"); 
+                $taxes_sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE (tax_archived_at > '$item_created_at' OR tax_archived_at IS NULL) AND company_id = $session_company_id ORDER BY tax_name ASC"); 
                 while($row = mysqli_fetch_array($taxes_sql)){
                   $tax_id_select = $row['tax_id'];
                   $tax_name = $row['tax_name'];
diff --git a/invoice.php b/invoice.php
index 96e824ed..b7231ea5 100644
--- a/invoice.php
+++ b/invoice.php
@@ -251,6 +251,7 @@ if(isset($_GET['invoice_id'])){
                 $item_subtotal = $row['item_price'];
                 $item_tax = $row['item_tax'];
                 $item_total = $row['item_total'];
+                $item_created_at = $row['item_created_at'];
                 $tax_id = $row['tax_id'];
                 $total_tax = $item_tax + $total_tax;
                 $sub_total = $item_price * $item_quantity + $sub_total;
diff --git a/quote.php b/quote.php
index cdeb70b1..05bb9d4d 100644
--- a/quote.php
+++ b/quote.php
@@ -215,6 +215,7 @@ if(isset($_GET['quote_id'])){
                 $item_subtotal = $row['item_price'];
                 $item_tax = $row['item_tax'];
                 $item_total = $row['item_total'];
+                $item_created_at = $row['item_created_at'];
                 $tax_id = $row['tax_id'];
                 $total_tax = $item_tax + $total_tax;
                 $sub_total = $item_price * $item_quantity + $sub_total;
diff --git a/recurring_invoice.php b/recurring_invoice.php
index 7f159d23..366d47d7 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -98,7 +98,7 @@ if(isset($_GET['recurring_id'])){
           <button class="btn btn-primary btn-sm float-right" type="button" data-toggle="dropdown">
             <i class="fas fa-ellipsis-h"></i>
           </button>
-          <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+          <div class="dropdown-menu">
             <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editRecurringModal<?php echo $recurring_id; ?>">Edit</a>
             <div class="dropdown-divider"></div>
             <a class="dropdown-item" href="post.php?force_recurring=<?php echo $recurring_id; ?>">Force Send</a>
@@ -195,6 +195,7 @@ if(isset($_GET['recurring_id'])){
                 $item_subtotal = $row['item_price'];
                 $item_tax = $row['item_tax'];
                 $item_total = $row['item_total'];
+                $item_created_at = $row['item_created_at'];
                 $tax_id = $row['tax_id'];
                 $total_tax = $item_tax + $total_tax;
                 $sub_total = $item_price * $item_quantity + $sub_total;