From 69337ad52f40ac34b1f85e0633a06472d15f4554 Mon Sep 17 00:00:00 2001
From: "johnny@pittpc.com" <admin@webdev.localDomain>
Date: Sat, 3 Aug 2019 20:11:57 -0400
Subject: [PATCH] Added Defaults for common tasks fex Default Calendar, default
 expense account

---
 add_calendar_event_modal.php |  2 +-
 add_expense_modal.php        |  2 +-
 add_payment_modal.php        |  2 +-
 add_transfer_modal.php       |  4 ++--
 get_settings.php             |  7 +++++++
 post.php                     | 15 +++++++++++++++
 settings-defaults.php        | 22 +++++++++++-----------
 settings-nav.php             |  4 ++--
 8 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/add_calendar_event_modal.php b/add_calendar_event_modal.php
index 1af5330c..1402dc4d 100644
--- a/add_calendar_event_modal.php
+++ b/add_calendar_event_modal.php
@@ -34,7 +34,7 @@
                   $calendar_name = $row['calendar_name'];
                   $calendar_color = $row['calendar_color'];
                 ?>
-                  <option 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>
+                  <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
                 }
diff --git a/add_expense_modal.php b/add_expense_modal.php
index b4218910..67083d41 100644
--- a/add_expense_modal.php
+++ b/add_expense_modal.php
@@ -60,7 +60,7 @@
                     $balance = $opening_balance + $total_payments - $total_expenses;
 
                   ?>
-                    <option value="<?php echo $account_id; ?>"><div class="float-left"><?php echo $account_name; ?></div><div class="float-right"> [$<?php echo number_format($balance,2); ?>]</div></option>
+                    <option <?php if($config_default_expense_account == $account_id){ echo "selected"; } ?> value="<?php echo $account_id; ?>"><div class="float-left"><?php echo $account_name; ?></div><div class="float-right"> [$<?php echo number_format($balance,2); ?>]</div></option>
                   
                   <?php
                   }
diff --git a/add_payment_modal.php b/add_payment_modal.php
index 998214c6..03513a11 100644
--- a/add_payment_modal.php
+++ b/add_payment_modal.php
@@ -59,7 +59,7 @@
                   $balance = $opening_balance + $total_payments - $total_expenses;
                   
                 ?>
-                  <option value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
+                  <option <?php if($config_default_payment_account == $account_id){ echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
                 
                 <?php
                 }
diff --git a/add_transfer_modal.php b/add_transfer_modal.php
index 3bbd56d3..76ea3be5 100644
--- a/add_transfer_modal.php
+++ b/add_transfer_modal.php
@@ -57,7 +57,7 @@
                   $balance = $opening_balance + $total_payments - $total_expenses;
                 
                 ?>
-                  <option value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
+                  <option <?php if($config_default_transfer_from_account == $account_id){ echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
                 
                 <?php
                 }
@@ -91,7 +91,7 @@
                   $balance = $opening_balance + $total_payments - $total_expenses;
 
                 ?>
-                  <option value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
+                  <option <?php if($config_default_transfer_to_account == $account_id){ echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
                 
                 <?php
                 }
diff --git a/get_settings.php b/get_settings.php
index 797eae91..1a29d4d9 100644
--- a/get_settings.php
+++ b/get_settings.php
@@ -31,6 +31,13 @@ $config_send_invoice_reminders = $row['config_send_invoice_reminders'];
 $config_invoice_overdue_reminders = $row['config_invoice_overdue_reminders'];
 $config_invoice_prefix = $row['config_invoice_prefix'];
 
+//Defaults
+$config_default_expense_account = $row['config_default_expense_account'];
+$config_default_payment_account = $row['config_default_payment_account'];
+$config_default_transfer_from_account = $row['config_default_transfer_from_account'];
+$config_default_transfer_to_account = $row['config_default_transfer_to_account'];
+$config_default_calendar = $row['config_default_calendar'];
+
 $config_quote_email_subject = $row['config_quote_email_subject'];
 
 $config_recurring_email_auto_send = $row['config_recurring_email_auto_send'];
diff --git a/post.php b/post.php
index bb2c5db0..eb0bb367 100644
--- a/post.php
+++ b/post.php
@@ -115,6 +115,21 @@ if(isset($_POST['edit_invoice_settings'])){
 
 }
 
+if(isset($_POST['edit_default_settings'])){
+
+    $config_default_expense_account = intval($_POST['config_default_expense_account']);
+    $config_default_payment_account = intval($_POST['config_default_payment_account']);
+    $config_default_transfer_from_account = intval($_POST['config_default_transfer_from_account']);
+    $config_default_transfer_to_account = intval($_POST['config_default_transfer_to_account']);
+    $config_default_calendar = intval($_POST['config_default_calendar']);
+
+    mysqli_query($mysqli,"UPDATE settings SET config_default_expense_account = $config_default_expense_account, config_default_payment_account = $config_default_payment_account, config_default_transfer_from_account = $config_default_transfer_from_account, config_default_transfer_to_account = $config_default_transfer_to_account, config_default_calendar = $config_default_calendar");
+
+    $_SESSION['alert_message'] = "Default Settings updated";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+}
+
 if(isset($_POST['enable_2fa'])){
 
     $token = mysqli_real_escape_string($mysqli,$_POST['token']);
diff --git a/settings-defaults.php b/settings-defaults.php
index b892d832..fc2206a4 100644
--- a/settings-defaults.php
+++ b/settings-defaults.php
@@ -15,7 +15,7 @@
             <span class="input-group-text"><i class="fa fa-exchange-alt"></i></span>
           </div>
           <select class="form-control selectpicker show-tick" name="config_default_transfer_from_account">
-            <option value="">- Account -</option>
+            <option value="0">- None -</option>
             <?php 
             
             $sql = mysqli_query($mysqli,"SELECT * FROM accounts"); 
@@ -24,7 +24,7 @@
               $account_name = $row['account_name'];
 
             ?>
-              <option value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
+              <option <?php if($config_default_transfer_from_account == $account_id){ echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
             
             <?php
             }
@@ -40,7 +40,7 @@
             <span class="input-group-text"><i class="fa fa-exchange-alt"></i></span>
           </div>
           <select class="form-control selectpicker show-tick" name="config_default_transfer_to_account">
-            <option value="">- Account -</option>
+            <option value="0">- None -</option>
             <?php 
             
             $sql = mysqli_query($mysqli,"SELECT * FROM accounts"); 
@@ -49,7 +49,7 @@
               $account_name = $row['account_name'];
 
             ?>
-              <option value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
+              <option <?php if($config_default_transfer_to_account == $account_id){ echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
             
             <?php
             }
@@ -65,7 +65,7 @@
             <span class="input-group-text"><i class="fa fa-credit-card"></i></span>
           </div>
           <select class="form-control selectpicker show-tick" name="config_default_payment_account">
-            <option value="">- Account -</option>
+            <option value="0">- None -</option>
             <?php 
             
             $sql = mysqli_query($mysqli,"SELECT * FROM accounts"); 
@@ -74,7 +74,7 @@
               $account_name = $row['account_name'];
 
             ?>
-              <option value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
+              <option <?php if($config_default_payment_account == $account_id){ echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
             
             <?php
             }
@@ -90,7 +90,7 @@
             <span class="input-group-text"><i class="fa fa-shopping-cart"></i></span>
           </div>
           <select class="form-control selectpicker show-tick" name="config_default_expense_account">
-            <option value="">- Account -</option>
+            <option value="0">- None -</option>
             <?php 
             
             $sql = mysqli_query($mysqli,"SELECT * FROM accounts"); 
@@ -99,7 +99,7 @@
               $account_name = $row['account_name'];
 
             ?>
-              <option value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
+              <option <?php if($config_default_expense_account == $account_id){ echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
             
             <?php
             }
@@ -115,7 +115,7 @@
             <span class="input-group-text"><i class="fa fa-calendar"></i></span>
           </div>
           <select class="form-control selectpicker show-tick" name="config_default_calendar">
-            <option value="">- Calendar -</option>
+            <option value="0">- None -</option>
             <?php 
             
             $sql = mysqli_query($mysqli,"SELECT * FROM calendars"); 
@@ -124,7 +124,7 @@
               $calendar_name = $row['calendar_name'];
 
             ?>
-              <option value="<?php echo $cakendar_id; ?>"><?php echo $calendar_name; ?></option>
+              <option <?php if($config_default_calendar == $calendar_id){ echo "selected"; } ?> value="<?php echo $calendar_id; ?>"><?php echo $calendar_name; ?></option>
             
             <?php
             }
@@ -134,7 +134,7 @@
       </div>
 
       <hr>
-      <button type="submit" name="add_client_contact" class="btn btn-primary">Save</button>
+      <button type="submit" name="edit_default_settings" class="btn btn-primary">Save</button>
         
     </form>
   </div>
diff --git a/settings-nav.php b/settings-nav.php
index bf43bdad..ab38b0ff 100644
--- a/settings-nav.php
+++ b/settings-nav.php
@@ -33,8 +33,8 @@
   </li>
 
   <li class="nav-item">
-    <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-default.php") { echo "active"; } ?>" 
-      href="settings-default.php">
+    <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-defaults.php") { echo "active"; } ?>" 
+      href="settings-defaults.php">
       <i class="fa fa-fw fa-2x fa-cog"></i><br>
       Defaults
     </a>