From 0686406e07a69205344d5eab9f4bcc1b3cd6e0d9 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 12 Jun 2019 12:56:51 -0400 Subject: [PATCH] Moved invoice logo to general settings, fixed invoice and quote not displaying invoice logo, added a switch to enable disable invoice reminders --- edit_contact_modal.php | 1 + get_settings.php | 1 + post.php | 45 ++++++++++++++++--------------- settings-general.php | 11 ++++++-- settings-invoice.php | 12 +++++++-- settings-logo.php | 26 ------------------ settings-nav.php | 8 ------ setup.php | 61 ++++++++++++++++++++++++++---------------- 8 files changed, 82 insertions(+), 83 deletions(-) delete mode 100644 settings-logo.php diff --git a/edit_contact_modal.php b/edit_contact_modal.php index e1fb742d..cb5c9fa2 100644 --- a/edit_contact_modal.php +++ b/edit_contact_modal.php @@ -9,6 +9,7 @@
+
diff --git a/get_settings.php b/get_settings.php index 1cc989f6..b4795826 100644 --- a/get_settings.php +++ b/get_settings.php @@ -27,6 +27,7 @@ $config_smtp_port = $row['config_smtp_port']; $config_mail_from_email = $row['config_mail_from_email']; $config_mail_from_name = $row['config_mail_from_name']; $config_account_balance_threshold = $row['config_account_balance_threshold']; +$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']; diff --git a/post.php b/post.php index d0c46146..ec9173ad 100644 --- a/post.php +++ b/post.php @@ -21,7 +21,19 @@ if(isset($_POST['edit_general_settings'])){ $config_account_balance_threshold = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_account_balance_threshold'])); $config_api_key = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_api_key'])); - mysqli_query($mysqli,"UPDATE settings SET config_start_page = '$config_start_page', config_account_balance_threshold = '$config_account_balance_threshold', config_api_key = '$config_api_key'"); + $path = "$config_invoice_logo"; + + if($_FILES['file']['tmp_name']!='') { + //delete old avatar file + unlink($path); + //Update with new path + $path = "uploads/settings/"; + $path = $path . basename( $_FILES['file']['name']); + $file_name = basename($path); + move_uploaded_file($_FILES['file']['tmp_name'], $path); + } + + mysqli_query($mysqli,"UPDATE settings SET config_start_page = '$config_start_page', config_account_balance_threshold = '$config_account_balance_threshold', config_invoice_logo = '$path', config_api_key = '$config_api_key'"); header("Location: " . $_SERVER["HTTP_REFERER"]); @@ -66,27 +78,15 @@ if(isset($_POST['edit_invoice_settings'])){ $config_mail_from_name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_mail_from_name'])); $config_invoice_footer = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_invoice_footer'])); $config_quote_footer = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_quote_footer'])); + $config_send_invoice_reminders = $_POST['config_send_invoice_reminders']; + if($config_send_invoice_reminders == 1){ + $config_send_invoice_reminders = 1; + }else{ + $config_send_invoice_reminders = 0; + } $config_invoice_overdue_reminders = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_invoice_overdue_reminders'])); - mysqli_query($mysqli,"UPDATE settings SET config_invoice_prefix = '$config_invoice_prefix', config_next_invoice_number = $config_next_invoice_number, config_mail_from_email = '$config_mail_from_email', config_mail_from_name = '$config_mail_from_name', config_invoice_footer = '$config_invoice_footer', config_invoice_overdue_reminders = '$config_invoice_overdue_reminders', config_quote_footer = '$config_quote_footer'"); - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - -if(isset($_POST['edit_logo_settings'])){ - - if($_FILES['file']['tmp_name']!='') { - $path = "uploads/settings"; - $path = $path . basename( $_FILES['file']['name']); - $file_name = basename($path); - move_uploaded_file($_FILES['file']['tmp_name'], $path); - $ext = pathinfo($path); - $ext = $ext['extension']; - - mysqli_query($mysqli,"UPDATE settings SET config_invoice_logo = '$path'"); - - } + mysqli_query($mysqli,"UPDATE settings SET config_invoice_prefix = '$config_invoice_prefix', config_next_invoice_number = $config_next_invoice_number, config_mail_from_email = '$config_mail_from_email', config_mail_from_name = '$config_mail_from_name', config_invoice_footer = '$config_invoice_footer', config_send_invoice_reminders = $config_send_invoice_reminders, config_invoice_overdue_reminders = '$config_invoice_overdue_reminders', config_quote_footer = '$config_quote_footer'"); header("Location: " . $_SERVER["HTTP_REFERER"]); @@ -1238,7 +1238,7 @@ if(isset($_GET['pdf_quote'])){