From f95a22814122147a6b94b6881ced7621ed69b2f9 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 18 Feb 2022 15:26:16 -0500 Subject: [PATCH] Updated DB Structure, Added Seperate From Name and From Email to Invoices / Quotes and Tickets, seperated Quote and Invoice to their own settings pane --- cron.php | 6 +- db.sql | 8 ++- footer.php | 12 +++- get_settings.php | 20 ++++-- header.php | 4 ++ post.php | 71 +++++++++++++++---- ...invoice-quotes.php => settings-invoice.php | 49 ++++++------- settings-nav.php | 14 +++- settings-quote.php | 67 +++++++++++++++++ settings-ticket.php | 20 ++++++ 10 files changed, 219 insertions(+), 52 deletions(-) rename settings-invoice-quotes.php => settings-invoice.php (77%) create mode 100644 settings-quote.php diff --git a/cron.php b/cron.php index 28597ba9..805a1d00 100644 --- a/cron.php +++ b/cron.php @@ -24,6 +24,8 @@ while($row = mysqli_fetch_array($sql_companies)){ $config_enable_cron = $row['config_enable_cron']; $config_invoice_overdue_reminders = $row['config_invoice_overdue_reminders']; $config_invoice_prefix = $row['config_invoice_prefix']; + $config_invoice_from_email = $row['config_invoice_from_email']; + $config_invoice_from_name = $row['config_invoice_from_name']; $config_smtp_host = $row['config_smtp_host']; $config_smtp_username = $row['config_smtp_username']; $config_smtp_password = $row['config_smtp_password']; @@ -211,7 +213,7 @@ while($row = mysqli_fetch_array($sql_companies)){ $mail->Port = $config_smtp_port; // TCP port to connect to //Recipients - $mail->setFrom($config_mail_from_email, $config_mail_from_name); + $mail->setFrom($config_invoice_from_email, $config_invoice_from_name); $mail->addAddress("$contact_email", "$contact_name"); // Add a recipient // Content @@ -335,7 +337,7 @@ while($row = mysqli_fetch_array($sql_companies)){ $mail->Port = $config_smtp_port; // TCP port to connect to //Recipients - $mail->setFrom($config_mail_from_email, $config_mail_from_name); + $mail->setFrom($config_invoice_from_email, $config_invoice_from_name); $mail->addAddress("$contact_email", "$contact_name"); // Add a recipient // Content diff --git a/db.sql b/db.sql index 45f5bc60..eb1fe036 100644 --- a/db.sql +++ b/db.sql @@ -1094,13 +1094,19 @@ CREATE TABLE `settings` ( `config_invoice_prefix` varchar(200) DEFAULT NULL, `config_invoice_next_number` int(11) DEFAULT NULL, `config_invoice_footer` text DEFAULT NULL, + `config_invoice_from_name` varchar(200) DEFAULT NULL, + `config_invoice_from_email` varchar(200) DEFAULT NULL, `config_recurring_prefix` varchar(200) DEFAULT NULL, `config_recurring_next_number` int(11) NOT NULL, `config_quote_prefix` varchar(200) DEFAULT NULL, `config_quote_next_number` int(11) DEFAULT NULL, `config_quote_footer` text DEFAULT NULL, + `config_quote_from_name` varchar(200) DEFAULT NULL, + `config_quote_from_email` varchar(200) DEFAULT NULL, `config_ticket_prefix` varchar(200) DEFAULT NULL, `config_ticket_next_number` int(11) DEFAULT NULL, + `config_ticket_from_name` varchar(200) DEFAULT NULL, + `config_ticket_from_email` varchar(200) DEFAULT NULL, `config_enable_cron` tinyint(1) DEFAULT NULL, `config_recurring_auto_send_invoice` tinyint(1) DEFAULT NULL, `config_enable_alert_domain_expire` tinyint(1) DEFAULT NULL, @@ -1421,4 +1427,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2022-02-18 11:13:32 +-- Dump completed on 2022-02-18 15:24:49 diff --git a/footer.php b/footer.php index d0e647b3..a9a48d59 100644 --- a/footer.php +++ b/footer.php @@ -29,4 +29,14 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/get_settings.php b/get_settings.php index aaa515ef..95587a9c 100644 --- a/get_settings.php +++ b/get_settings.php @@ -1,13 +1,13 @@ Port = $config_smtp_port; // TCP port to connect to //Recipients - $mail->setFrom($config_mail_from_email, $config_mail_from_name); + $mail->setFrom($config_quote_from_email, $config_quote_from_name); $mail->addAddress("$contact_email", "$contact_name"); // Add a recipient // Attachments @@ -3578,7 +3625,7 @@ if(isset($_POST['add_payment'])){ $mail->Port = $config_smtp_port; // TCP port to connect to //Recipients - $mail->setFrom($config_mail_from_email, $config_mail_from_name); + $mail->setFrom($config_invoice_from_email, $config_invoice_from_name); $mail->addAddress("$contact_email", "$contact_name"); // Add a recipient // Content @@ -3614,7 +3661,7 @@ if(isset($_POST['add_payment'])){ $mail->Port = $config_smtp_port; // TCP port to connect to //Recipients - $mail->setFrom($config_mail_from_email, $config_mail_from_name); + $mail->setFrom($config_invoice_from_email, $config_invoice_from_name); $mail->addAddress("$contact_email", "$contact_name"); // Add a recipient // Content @@ -3761,7 +3808,7 @@ if(isset($_GET['email_invoice'])){ $mail->Port = $config_smtp_port; // TCP port to connect to //Recipients - $mail->setFrom($config_mail_from_email, $config_mail_from_name); + $mail->setFrom($config_invoice_from_email, $config_invoice_from_name); $mail->addAddress("$contact_email", "$contact_name"); // Add a recipient // Content @@ -5450,7 +5497,7 @@ if(isset($_POST['add_ticket_reply'])){ $mail->Port = $config_smtp_port; // TCP port to connect to //Recipients - $mail->setFrom($config_mail_from_email, $config_mail_from_name); + $mail->setFrom($config_ticket_from_email, $config_ticket_from_name); $mail->addAddress("$contact_email", "$contact_name"); // Add a recipient // Content @@ -6151,7 +6198,7 @@ if(isset($_GET['force_recurring'])){ $mail->Port = $config_smtp_port; // TCP port to connect to //Recipients - $mail->setFrom($config_mail_from_email, $config_mail_from_name); + $mail->setFrom($config_invoice_from_email, $config_invoice_from_name); $mail->addAddress("$contact_email", "$contact_name"); // Add a recipient // Content diff --git a/settings-invoice-quotes.php b/settings-invoice.php similarity index 77% rename from settings-invoice-quotes.php rename to settings-invoice.php index a5b3c596..83bf587b 100644 --- a/settings-invoice-quotes.php +++ b/settings-invoice.php @@ -36,6 +36,26 @@ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ Recurring Invoice
@@ -58,36 +78,11 @@
- Quote - -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- - -
+
- + diff --git a/settings-nav.php b/settings-nav.php index 91adbae0..d184bb92 100644 --- a/settings-nav.php +++ b/settings-nav.php @@ -25,10 +25,18 @@
  • - " - href="settings-invoice-quotes.php"> + " + href="settings-invoice.php">
    - Invoice / Quote + Invoice +     +
    • + +
  • + " + href="settings-quote.php"> +
    + Quote
    • diff --git a/settings-quote.php b/settings-quote.php new file mode 100644 index 00000000..b92f82aa --- /dev/null +++ b/settings-quote.php @@ -0,0 +1,67 @@ + + + + +
    +
    +

    Invoice/Quote Settings

    +
    +
    +
    + + Quote + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + + + +
    +
    +
    + +" required> + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +