From e2b97afa20a09042eb932cc1a0509d631eeaf892 Mon Sep 17 00:00:00 2001 From: "johnny@pittpc.com" Date: Tue, 17 Sep 2019 13:54:46 -0400 Subject: [PATCH] Added Linking client to calendar events, added email event to add event, and many other small small fixes --- add_calendar_event_modal.php | 65 ++++++++++++++----- calendar_events.php | 1 + edit_calendar_event_modal.php | 63 ++++++++++++++----- expenses.php | 2 +- invoice.php | 24 ++++---- post.php | 113 ++++++++++++++++++++++++++++++---- quote.php | 25 ++++---- 7 files changed, 220 insertions(+), 73 deletions(-) diff --git a/add_calendar_event_modal.php b/add_calendar_event_modal.php index d34d641c..b5068a59 100644 --- a/add_calendar_event_modal.php +++ b/add_calendar_event_modal.php @@ -42,26 +42,57 @@ -
-
- -
-
- -
- -
-
-
- -
-
- -
- + +
+ +
+
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ + +
+
diff --git a/calendar_events.php b/calendar_events.php index 3eae7865..ae45a910 100644 --- a/calendar_events.php +++ b/calendar_events.php @@ -24,6 +24,7 @@ while($row = mysqli_fetch_array($sql)){ $calendar_id = $row['calendar_id']; $calendar_name = $row['calendar_name']; $calendar_color = $row['calendar_color']; + $client_id = $row['client_id']; include("edit_calendar_event_modal.php"); diff --git a/edit_calendar_event_modal.php b/edit_calendar_event_modal.php index 1036463e..c2306bfd 100644 --- a/edit_calendar_event_modal.php +++ b/edit_calendar_event_modal.php @@ -43,26 +43,55 @@
-
-
- -
-
- -
- -
-
-
- -
-
- -
- +
+ +
+
+
+
+
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ + +
+
Delete diff --git a/expenses.php b/expenses.php index f1f076ca..e523d78a 100644 --- a/expenses.php +++ b/expenses.php @@ -44,7 +44,7 @@ AND expenses.vendor_id = vendors.vendor_id AND expenses.account_id = accounts.account_id AND expenses.company_id = $session_company_id - AND (vendor_name LIKE '%$q%' OR category_name LIKE '%$q%' OR account_name LIKE '%$q%') + AND (vendor_name LIKE '%$q%' OR category_name LIKE '%$q%' OR account_name LIKE '%$q%' OR expense_description LIKE '%$q%') ORDER BY $sb $o LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); diff --git a/invoice.php b/invoice.php index 817cb58b..546d6a28 100644 --- a/invoice.php +++ b/invoice.php @@ -221,18 +221,18 @@ if(isset($_GET['invoice_id'])){ - - - - - - - - - + + + + + + + + + diff --git a/post.php b/post.php index 5272c713..36cd763c 100644 --- a/post.php +++ b/post.php @@ -13,8 +13,6 @@ require_once $mpdf_path . '/vendor/autoload.php'; use PHPMailer\PHPMailer\PHPMailer; use PHPMailer\PHPMailer\Exception; -$todays_date = date('Y-m-d'); - if(isset($_POST['add_user'])){ $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); @@ -555,8 +553,53 @@ if(isset($_POST['add_event'])){ $title = strip_tags(mysqli_real_escape_string($mysqli,$_POST['title'])); $start = strip_tags(mysqli_real_escape_string($mysqli,$_POST['start'])); $end = strip_tags(mysqli_real_escape_string($mysqli,$_POST['end'])); + $client = intval($_POST['client']); + $email_event = intval($_POST['email_event']); - mysqli_query($mysqli,"INSERT INTO events SET event_title = '$title', event_start = '$start', event_end = '$end', event_created_at = NOW(), calendar_id = $calendar_id, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO events SET event_title = '$title', event_start = '$start', event_end = '$end', event_created_at = NOW(), calendar_id = $calendar_id, client_id = $client, company_id = $session_company_id"); + + //If email is checked + if($email_event == 1){ + + $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE client_id = $client AND company_id = $session_company_id"); + $row = mysqli_fetch_array($sql); + $client_name = $row['client_name']; + $client_email = $row['client_email']; + + $mail = new PHPMailer(true); + + try { + + //Mail Server Settings + + //$mail->SMTPDebug = 2; // Enable verbose debug output + $mail->isSMTP(); // Set mailer to use SMTP + $mail->Host = $config_smtp_host; // Specify main and backup SMTP servers + $mail->SMTPAuth = true; // Enable SMTP authentication + $mail->Username = $config_smtp_username; // SMTP username + $mail->Password = $config_smtp_password; // SMTP password + $mail->SMTPSecure = 'tls'; // Enable TLS encryption, `ssl` also accepted + $mail->Port = $config_smtp_port; // TCP port to connect to + + //Recipients + $mail->setFrom($config_mail_from_email, $config_mail_from_name); + $mail->addAddress("$client_email", "$client_name"); // Add a recipient + + // Content + $mail->isHTML(true); // Set email format to HTML + $mail->Subject = "New Calendar Event"; + $mail->Body = "Hello $client_name,

A calendar event has been scheduled: $title at $start


~
$config_company_name
$config_company_phone"; + + $mail->send(); + echo 'Message has been sent'; + + } catch (Exception $e) { + echo "Message could not be sent. Mailer Error: {$mail->ErrorInfo}"; + } + + //Logging of email sent + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Calendar Event', log_action = 'Emailed', log_description = 'Emailed $client_name to email $client_email - $title', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); + } //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Calendar Event', log_action = 'Created', log_description = '$title', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); @@ -574,8 +617,53 @@ if(isset($_POST['edit_event'])){ $title = strip_tags(mysqli_real_escape_string($mysqli,$_POST['title'])); $start = strip_tags(mysqli_real_escape_string($mysqli,$_POST['start'])); $end = strip_tags(mysqli_real_escape_string($mysqli,$_POST['end'])); + $client = intval($_POST['client']); + $email_event = intval($_POST['email_event']); - mysqli_query($mysqli,"UPDATE events SET event_title = '$title', event_start = '$start', event_end = '$end', event_updated_at = NOW(), calendar_id = $calendar_id WHERE event_id = $event_id AND company_id = $session_company_id"); + mysqli_query($mysqli,"UPDATE events SET event_title = '$title', event_start = '$start', event_end = '$end', event_updated_at = NOW(), calendar_id = $calendar_id, client_id = $client WHERE event_id = $event_id AND company_id = $session_company_id"); + + //If email is checked + if($email_event == 1){ + + $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE client_id = $client AND company_id = $session_company_id"); + $row = mysqli_fetch_array($sql); + $client_name = $row['client_name']; + $client_email = $row['client_email']; + + $mail = new PHPMailer(true); + + try { + + //Mail Server Settings + + //$mail->SMTPDebug = 2; // Enable verbose debug output + $mail->isSMTP(); // Set mailer to use SMTP + $mail->Host = $config_smtp_host; // Specify main and backup SMTP servers + $mail->SMTPAuth = true; // Enable SMTP authentication + $mail->Username = $config_smtp_username; // SMTP username + $mail->Password = $config_smtp_password; // SMTP password + $mail->SMTPSecure = 'tls'; // Enable TLS encryption, `ssl` also accepted + $mail->Port = $config_smtp_port; // TCP port to connect to + + //Recipients + $mail->setFrom($config_mail_from_email, $config_mail_from_name); + $mail->addAddress("$client_email", "$client_name"); // Add a recipient + + // Content + $mail->isHTML(true); // Set email format to HTML + $mail->Subject = "Calendar Event Rescheduled"; + $mail->Body = "Hello $client_name,

A calendar event has been rescheduled: $title at $start


~
$config_company_name
$config_company_phone"; + + $mail->send(); + echo 'Message has been sent'; + + } catch (Exception $e) { + echo "Message could not be sent. Mailer Error: {$mail->ErrorInfo}"; + } + + //Logging of email sent + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Calendar Event', log_action = 'Emailed', log_description = 'Emailed $client_name to email $client_email - $title', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); + } //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Calendar', log_action = 'Modified', log_description = '$title', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id"); @@ -1389,7 +1477,7 @@ if(isset($_POST['add_quote_to_invoice'])){ //Generate a unique URL key for clients to access $url_key = keygen(); - mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = '$invoice_number', invoice_date = '$date', invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), category_id = $category_id, invoice_status = 'Draft', invoice_amount = '$quote_amount', invoice_note = '$quote_note', invoice_created_at = NOW(), client_id = $client_id, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = '$invoice_number', invoice_date = '$date', invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), category_id = $category_id, invoice_status = 'Draft', invoice_amount = '$quote_amount', invoice_note = '$quote_note', invoice_url_key = '$url_key', invoice_created_at = NOW(), client_id = $client_id, company_id = $session_company_id"); $new_invoice_id = mysqli_insert_id($mysqli); @@ -1422,7 +1510,7 @@ if(isset($_POST['save_quote'])){ $quote_id = intval($_POST['quote_id']); - if(isset($_POST['name'])){ + if(!empty($_POST['name'])){ $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); $description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description'])); $qty = floatval($_POST['qty']); @@ -2055,12 +2143,12 @@ if(isset($_POST['save_invoice'])){ $invoice_id = intval($_POST['invoice_id']); - if(isset($_POST['name'])){ + if(!empty($_POST['name'])){ $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); $description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description'])); - $qty = $_POST['qty']; - $price = $_POST['price']; - $tax = $_POST['tax']; + $qty = floatval($_POST['qty']); + $price = floatval($_POST['price']); + $tax = floatval($_POST['tax']); $subtotal = $price * $qty; $tax = $subtotal * $tax; @@ -2081,7 +2169,6 @@ if(isset($_POST['save_invoice'])){ } - if(isset($_POST['invoice_note'])){ $invoice_note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['invoice_note'])); @@ -2190,7 +2277,7 @@ if(isset($_POST['add_payment'])){ // Content $mail->isHTML(true); // Set email format to HTML $mail->Subject = "Payment Recieved - Invoice $invoice_number"; - $mail->Body = "Hello $client_name,

We have recieved your payment in the amount of $$formatted_amount for invoice $invoice_number. Please keep this email as a receipt for your records.

Amount: $$formatted_amount
Balance: $formatted_invoice_balance

Thank you for your business!


~
$config_company_name
$config_company_phone"; + $mail->Body = "Hello $client_name,

We have recieved your payment in the amount of $$formatted_amount for invoice $invoice_number. Please keep this email as a receipt for your records.

Amount: $$formatted_amount
Balance: $$formatted_invoice_balance

Thank you for your business!


~
$config_company_name
$config_company_phone"; $mail->send(); echo 'Message has been sent'; @@ -2226,7 +2313,7 @@ if(isset($_POST['add_payment'])){ // Content $mail->isHTML(true); // Set email format to HTML $mail->Subject = "Partial Payment Recieved - Invoice $invoice_number"; - $mail->Body = "Hello $client_name,

We have recieved partial payment in the amount of $$formatted_amount and it has been applied to invoice $invoice_number. Please keep this email as a receipt for your records.

Amount: $$formatted_amount
Balance: $formatted_invoice_balance

Thank you for your business!


~
$config_company_name
$config_company_phone"; + $mail->Body = "Hello $client_name,

We have recieved partial payment in the amount of $$formatted_amount and it has been applied to invoice $invoice_number. Please keep this email as a receipt for your records.

Amount: $$formatted_amount
Balance: $$formatted_invoice_balance

Thank you for your business!


~
$config_company_name
$config_company_phone"; $mail->send(); echo 'Message has been sent'; diff --git a/quote.php b/quote.php index e37795dd..e84b1197 100644 --- a/quote.php +++ b/quote.php @@ -188,19 +188,18 @@ if(isset($_GET['quote_id'])){ ?> - - - - - - - - - - + + + + + + + + +