From 7148ebe05668ac4e74f48f61ab420ac0d45fc1d0 Mon Sep 17 00:00:00 2001
From: "johnny@pittpc.com" <admin@app.pittpc.com>
Date: Mon, 8 Feb 2021 14:34:00 -0500
Subject: [PATCH] Combined Client Add/Edit Events and other cleanup

---
 add_calendar_event_modal.php                  |  8 ++
 add_invoice_recurring_modal.php               | 37 ---------
 client_add_calendar_event_modal.php           | 80 -------------------
 client_edit_calendar_event_modal.php          | 80 -------------------
 client_events.php                             |  4 +-
 edit_calendar_event_modal.php                 |  8 ++
 ...r_domains.php => test_calendar_domains.php |  0
 ...php => test_client_payments_by_invoice.php |  0
 ..._nav.php => test_client_print_side_nav.php |  0
 contacts.php => test_contacts.php             |  0
 ...modal.php => test_delete_confirm_modal.php |  0
 ...ample.php => test_export_excel_example.php |  0
 ...fit_loss.php => test_print_profit_loss.php |  0
 ..._2.php => test_report_income_summary_2.php |  0
 starter_new.php => test_starter_new.php       |  0
 transactions.php => test_transactions.php     |  0
 16 files changed, 18 insertions(+), 199 deletions(-)
 delete mode 100644 add_invoice_recurring_modal.php
 delete mode 100644 client_add_calendar_event_modal.php
 delete mode 100644 client_edit_calendar_event_modal.php
 rename calendar_domains.php => test_calendar_domains.php (100%)
 rename client_payments_by_invoice.php => test_client_payments_by_invoice.php (100%)
 rename client_print_side_nav.php => test_client_print_side_nav.php (100%)
 rename contacts.php => test_contacts.php (100%)
 rename delete_confirm_modal.php => test_delete_confirm_modal.php (100%)
 rename export_excel_example.php => test_export_excel_example.php (100%)
 rename print_profit_loss.php => test_print_profit_loss.php (100%)
 rename report_income_summary_2.php => test_report_income_summary_2.php (100%)
 rename starter_new.php => test_starter_new.php (100%)
 rename transactions.php => test_transactions.php (100%)

diff --git a/add_calendar_event_modal.php b/add_calendar_event_modal.php
index 989b5819..ceb58097 100644
--- a/add_calendar_event_modal.php
+++ b/add_calendar_event_modal.php
@@ -68,6 +68,12 @@
             </div>
           </div>
 
+          <?php if(isset($client_id)){ ?>
+
+          <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+
+          <?php }else{ ?>
+
           <div class="form-group">
             <label>Client</label>
             <div class="input-group">
@@ -92,6 +98,8 @@
               </select>
             </div>
           </div>
+            
+          <?php } ?>
 
           <div class="custom-control custom-checkbox">
             <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_event" value="1" >
diff --git a/add_invoice_recurring_modal.php b/add_invoice_recurring_modal.php
deleted file mode 100644
index 08b6003a..00000000
--- a/add_invoice_recurring_modal.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<div class="modal" id="addInvoiceRecurringModal<?php echo $invoice_id; ?>" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-copy mr-2"></i>Make <?php echo $invoice_number; ?> Recurring</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>"> 
-        <div class="modal-body bg-white">
-          
-          <div class="form-group">
-            <label>Frequency <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
-              </div>
-              <select class="form-control select2" name="frequency" required>
-                <option value="">- Frequency -</option>
-                <option value="week">Weekly</option>
-                <option value="month">Monthly</option>
-                <option value="year">Yearly</option>
-              </select>
-            </div>
-          </div>
-        
-        </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_invoice_recurring" class="btn btn-primary">Save</button>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/client_add_calendar_event_modal.php b/client_add_calendar_event_modal.php
deleted file mode 100644
index 7950ced8..00000000
--- a/client_add_calendar_event_modal.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<div class="modal" id="addCalendarEventModal" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-calendar-plus mr-2"></i>New Event</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-        <div class="modal-body bg-white">
-          <div class="form-group">
-            <label>Title <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-              </div>
-              <input type="text" class="form-control" name="title" placeholder="Title of the event" required autofocus>
-            </div>
-          </div>
-          <div class="form-group">
-            <label>Calendar <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-              </div>
-              <select class="form-control select2" name="calendar" required>
-                <option value="">- Calendar -</option>
-                <?php 
-                
-                $sql = mysqli_query($mysqli,"SELECT * FROM calendars WHERE company_id = $session_company_id"); 
-                while($row = mysqli_fetch_array($sql)){
-                  $calendar_id = $row['calendar_id'];
-                  $calendar_name = $row['calendar_name'];
-                  $calendar_color = $row['calendar_color'];
-                ?>
-                  <option <?php if($config_default_calendar == $calendar_id){ echo "selected"; } ?> data-content="<i class='fa fa-circle mr-2' style='color:<?php echo $calendar_color; ?>;'></i> <?php echo $calendar_name; ?>" value="<?php echo $calendar_id; ?>"><?php echo $calendar_name; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Starts <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
-              </div>
-              <input type="datetime-local" class="form-control" name="start" required>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Ends <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-stopwatch"></i></span>
-              </div>
-              <input type="datetime-local" class="form-control" name="end" required>
-            </div>
-          </div>
-
-          <div class="custom-control custom-checkbox">
-            <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_event" value="1" >
-            <label class="custom-control-label" for="customControlAutosizing">Email Event</label>
-          </div>
-
-        </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_event" class="btn btn-primary">Save</button>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/client_edit_calendar_event_modal.php b/client_edit_calendar_event_modal.php
deleted file mode 100644
index a1d8b983..00000000
--- a/client_edit_calendar_event_modal.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<div class="modal" id="editEventModal<?php echo $event_id; ?>" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-calendar mr-2"></i><?php echo $event_title; ?></h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <input type="hidden" name="event_id" value="<?php echo $event_id; ?>">
-        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-        <div class="modal-body bg-white">
-          <p></p>
-          <div class="form-group">
-            <label>Title <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-              </div>
-              <input type="text" class="form-control" name="title" value="<?php echo $event_title; ?>" placeholder="Title of the event" required>
-            </div>
-          </div>
-          <div class="form-group">
-            <label>Calendar <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-calendar"></i></span>
-              </div>
-              <select class="form-control select2" name="calendar" required>
-                <?php 
-                
-                $sql_calendars_select = mysqli_query($mysqli,"SELECT * FROM calendars WHERE company_id = $session_company_id"); 
-                while($row = mysqli_fetch_array($sql_calendars_select)){
-                  $calendar_id_select = $row['calendar_id'];
-                  $calendar_name_select = $row['calendar_name'];
-                  $calendar_color_select = $row['calendar_color'];
-                ?>
-                  <option data-content="<i class='fa fa-circle mr-2' style='color:<?php echo $calendar_color_select; ?>;'></i> <?php echo $calendar_name_select; ?>"<?php if($calendar_id == $calendar_id_select){ echo "selected"; } ?> value="<?php echo $calendar_id_select; ?>"><?php echo $calendar_name_select; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-          <div class="form-group">
-            <label>Starts <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
-              </div>
-              <input type="datetime-local" class="form-control" name="start" value="<?php echo date('Y-m-d\TH:i:s', strtotime($event_start)); ?>" required>
-            </div>
-          </div>
-          <div class="form-group">
-            <label>Ends <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-stopwatch"></i></span>
-              </div>
-              <input type="datetime-local" class="form-control" name="end" value="<?php echo date('Y-m-d\TH:i:s', strtotime($event_end)); ?>" required>
-            </div>
-          </div>
-
-          <div class="custom-control custom-checkbox">
-            <input type="checkbox" class="custom-control-input" id="customControlAutosizing<?php echo $event_id; ?>" name="email_event" value="1" >
-            <label class="custom-control-label" for="customControlAutosizing<?php echo $event_id; ?>">Email Event</label>
-          </div>
-
-        </div>
-        <div class="modal-footer bg-white">
-          <a href="post.php?delete_event=<?php echo $event_id; ?>" class="btn btn-outline-danger mr-auto">Delete</a>
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_event" class="btn btn-primary">Save</button>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/client_events.php b/client_events.php
index 125741b4..9b83e8c9 100644
--- a/client_events.php
+++ b/client_events.php
@@ -10,7 +10,7 @@ if(isset($_GET['calendar_id'])){
   <div id='calendar'></div>
 </div>
 
-<?php include("client_add_calendar_event_modal.php"); ?>
+<?php include("add_calendar_event_modal.php"); ?>
 <?php include("add_calendar_modal.php"); ?>
 
 <?php
@@ -25,7 +25,7 @@ while($row = mysqli_fetch_array($sql)){
   $calendar_name = $row['calendar_name'];
   $calendar_color = $row['calendar_color'];
 
-  include("client_edit_calendar_event_modal.php");
+  include("edit_calendar_event_modal.php");
 
 }
 
diff --git a/edit_calendar_event_modal.php b/edit_calendar_event_modal.php
index 1c6f3c59..80224e4e 100644
--- a/edit_calendar_event_modal.php
+++ b/edit_calendar_event_modal.php
@@ -67,6 +67,12 @@
             </div>
           </div>
 
+          <?php if(isset($client_id)){ ?>
+
+          <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+
+          <?php }else{ ?>
+
           <div class="form-group">
             <label>Client</label>
             <div class="input-group">
@@ -91,6 +97,8 @@
             </div>
           </div>
 
+          <?php } ?>
+
           <div class="custom-control custom-checkbox">
             <input type="checkbox" class="custom-control-input" id="customControlAutosizing<?php echo $event_id; ?>" name="email_event" value="1" >
             <label class="custom-control-label" for="customControlAutosizing<?php echo $event_id; ?>">Email Event</label>
diff --git a/calendar_domains.php b/test_calendar_domains.php
similarity index 100%
rename from calendar_domains.php
rename to test_calendar_domains.php
diff --git a/client_payments_by_invoice.php b/test_client_payments_by_invoice.php
similarity index 100%
rename from client_payments_by_invoice.php
rename to test_client_payments_by_invoice.php
diff --git a/client_print_side_nav.php b/test_client_print_side_nav.php
similarity index 100%
rename from client_print_side_nav.php
rename to test_client_print_side_nav.php
diff --git a/contacts.php b/test_contacts.php
similarity index 100%
rename from contacts.php
rename to test_contacts.php
diff --git a/delete_confirm_modal.php b/test_delete_confirm_modal.php
similarity index 100%
rename from delete_confirm_modal.php
rename to test_delete_confirm_modal.php
diff --git a/export_excel_example.php b/test_export_excel_example.php
similarity index 100%
rename from export_excel_example.php
rename to test_export_excel_example.php
diff --git a/print_profit_loss.php b/test_print_profit_loss.php
similarity index 100%
rename from print_profit_loss.php
rename to test_print_profit_loss.php
diff --git a/report_income_summary_2.php b/test_report_income_summary_2.php
similarity index 100%
rename from report_income_summary_2.php
rename to test_report_income_summary_2.php
diff --git a/starter_new.php b/test_starter_new.php
similarity index 100%
rename from starter_new.php
rename to test_starter_new.php
diff --git a/transactions.php b/test_transactions.php
similarity index 100%
rename from transactions.php
rename to test_transactions.php