From de883f9ff5b3bf49d4bfdac2382469e3363cb5d6 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 2 Jan 2022 13:39:25 -0500 Subject: [PATCH] Fixed Add Recurring and Edit Recurring Invoices going to a blank screen after submit this was due to a missing history_status var, Removed Activate and Deactivate from recurring list and the buttons from recurring details as this can be modified using edit recurring, Removed Redundant Force Send action on recurring list views, this can be accessed by going to the recurring details. --- client_recurring.php | 6 ------ post.php | 34 ++-------------------------------- recurring.php | 7 ------- recurring_invoice.php | 5 ----- ticket.php | 2 +- 5 files changed, 3 insertions(+), 51 deletions(-) diff --git a/client_recurring.php b/client_recurring.php index 7a34adbe..13fc69e4 100644 --- a/client_recurring.php +++ b/client_recurring.php @@ -146,12 +146,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
Edit
- - Deactivate - - Activate - -
Delete
diff --git a/post.php b/post.php index ad5f27fc..6418618c 100644 --- a/post.php +++ b/post.php @@ -2917,7 +2917,7 @@ if(isset($_POST['add_recurring'])){ $recurring_id = mysqli_insert_id($mysqli); - mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_description = 'Recurring Invoice created!', history_created_at = NOW(), history_recurring_id = $recurring_id, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Active', history_description = 'Recurring Invoice created!', history_created_at = NOW(), history_recurring_id = $recurring_id, company_id = $session_company_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Recurring', log_action = 'Created', log_description = '$start_date - $category', log_created_at = NOW(), company_id = $session_company_id, log_user_id = $session_user_id"); @@ -2938,7 +2938,7 @@ if(isset($_POST['edit_recurring'])){ mysqli_query($mysqli,"UPDATE recurring SET recurring_scope = '$scope', recurring_frequency = '$frequency', recurring_category_id = $category, recurring_status = $status, recurring_updated_at = NOW() WHERE recurring_id = $recurring_id AND company_id = $session_company_id"); - mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_description = 'Recurring modified', history_created_at = NOW(), history_recurring_id = $recurring_id, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = '$status', history_description = 'Recurring modified', history_created_at = NOW(), history_recurring_id = $recurring_id, company_id = $session_company_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Recurring', log_action = 'Modified', log_description = '$recurring_id', log_created_at = NOW(), company_id = $session_company_id, log_user_id = $session_user_id"); @@ -2977,36 +2977,6 @@ if(isset($_GET['delete_recurring'])){ } -if(isset($_GET['recurring_activate'])){ - - $recurring_id = intval($_GET['recurring_activate']); - - mysqli_query($mysqli,"UPDATE recurring SET recurring_status = 1 WHERE recurring_id = $recurring_id AND company_id = $session_company_id"); - - //Logging - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Recurring', log_action = 'Modified', log_description = 'Activated', log_created_at = NOW(), company_id = $session_company_id, log_user_id = $session_user_id"); - - $_SESSION['alert_message'] = "Recurring Invoice Activated"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - -if(isset($_GET['recurring_deactivate'])){ - - $recurring_id = intval($_GET['recurring_deactivate']); - - mysqli_query($mysqli,"UPDATE recurring SET recurring_status = 0 WHERE recurring_id = $recurring_id AND company_id = $session_company_id"); - - //Logging - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Recurring', log_action = 'Modified', log_description = 'Deactivated', log_created_at = NOW(), company_id = $session_company_id, log_user_id = $session_user_id"); - - $_SESSION['alert_message'] = "Recurring Invoice Deactivated"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - if(isset($_POST['add_recurring_item'])){ $recurring_id = intval($_POST['recurring_id']); diff --git a/recurring.php b/recurring.php index 8040e949..c4197c01 100644 --- a/recurring.php +++ b/recurring.php @@ -211,13 +211,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
Edit -
- Force - - Deactivate - - Activate -
Delete
diff --git a/recurring_invoice.php b/recurring_invoice.php index c7915ecf..cefaef84 100644 --- a/recurring_invoice.php +++ b/recurring_invoice.php @@ -85,11 +85,6 @@ if(isset($_GET['recurring_id'])){
- - Deactivate - - Activate -
diff --git a/ticket.php b/ticket.php index 08027f6e..2a8cbc50 100644 --- a/ticket.php +++ b/ticket.php @@ -207,7 +207,7 @@ if(isset($_GET['ticket_id'])){

- +