From 87a86803ee7410fd48eca0c7e821cc163d935b3f Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sat, 21 Dec 2024 18:49:42 -0500 Subject: [PATCH] Added Recurring Payment Creation and Deletion and display in the recurring Invoice sections, still not operational need to add to cron --- client_recurring_invoices.php | 32 ++++++++++++-- post/user/invoice.php | 58 +++++++++++++++++++++++++ recurring_invoices.php | 25 ++++++++++- recurring_payment_add_modal.php | 77 +++++++++++++++++++++++++++++++++ 4 files changed, 187 insertions(+), 5 deletions(-) create mode 100644 recurring_payment_add_modal.php diff --git a/client_recurring_invoices.php b/client_recurring_invoices.php index 9395cb3d..bd0593bd 100644 --- a/client_recurring_invoices.php +++ b/client_recurring_invoices.php @@ -16,6 +16,7 @@ $sql = mysqli_query( $mysqli, "SELECT * FROM recurring LEFT JOIN categories ON recurring_category_id = category_id + LEFT JOIN recurring_payments ON recurring_payment_recurring_invoice_id = recurring_id WHERE recurring_client_id = $client_id AND (CONCAT(recurring_prefix,recurring_number) LIKE '%$q%' OR recurring_frequency LIKE '%$q%' OR recurring_scope LIKE '%$q%' OR category_name LIKE '%$q%') ORDER BY $sort $order LIMIT $record_from, $record_to"); @@ -104,6 +105,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Category + + + Auto Pay + + Status @@ -140,6 +146,22 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $status = "Inactive"; $status_badge_color = "secondary"; } + $recurring_payment_recurring_invoice_id = intval($row['recurring_payment_recurring_invoice_id']); + if ($recurring_payment_recurring_invoice_id) { + $auto_pay_display = " + Yes + + + + "; + } else { + $auto_pay_display = " + + Create + + "; + require "recurring_payment_add_modal.php"; + } ?> @@ -151,10 +173,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + - - - + + +
@@ -177,7 +200,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $recurring_prefix$recurring_number"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + +if (isset($_GET['delete_recurring_payment'])) { + $recurring_payment_id = intval($_GET['delete_recurring_payment']); + + $sql = mysqli_query($mysqli,"SELECT * FROM recurring_payments WHERE recurring_payment_id = $recurring_payment_id"); + $row = mysqli_fetch_array($sql); + $recurring_invoice_id = intval($row['recurring_payment_recurring_invoice_id']); + + // Get the invoice total and details + $sql = mysqli_query($mysqli,"SELECT * FROM recurring WHERE recurring_id = $recurring_invoice_id"); + $row = mysqli_fetch_array($sql); + $recurring_prefix = sanitizeInput($row['recurring_prefix']); + $recurring_number = intval($row['recurring_number']); + $client_id = intval($row['recurring_client_id']); + + mysqli_query($mysqli,"DELETE FROM recurring_payments WHERE recurring_payment_id = $recurring_payment_id"); + + // Logging + logAction("Recurring Invoice", "Auto Payment", "$session_name removed auto Pay from Recurring Invoice $recurring_prefix$recurring_number", $client_id, $recurring_invoice_id); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "Auto Payment Removed for Recurring Invoice $recurring_prefix$recurring_number"; + if ($config_stripe_enable) { + $_SESSION['alert_message'] = "Auto Payment Removed - Stripe Auto payments must be manually removed in Stripe"; + } + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + if (isset($_GET['force_recurring'])) { $recurring_id = intval($_GET['force_recurring']); diff --git a/recurring_invoices.php b/recurring_invoices.php index 11af4e44..98ec7caa 100644 --- a/recurring_invoices.php +++ b/recurring_invoices.php @@ -17,6 +17,7 @@ $sql = mysqli_query( "SELECT SQL_CALC_FOUND_ROWS * FROM recurring LEFT JOIN clients ON recurring_client_id = client_id LEFT JOIN categories ON recurring_category_id = category_id + LEFT JOIN recurring_payments ON recurring_payment_recurring_invoice_id = recurring_id WHERE (CONCAT(recurring_prefix,recurring_number) LIKE '%$q%' OR recurring_frequency LIKE '%$q%' OR recurring_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR category_name LIKE '%$q%') AND DATE(recurring_created_at) BETWEEN '$dtf' AND '$dtt' ORDER BY $sort $order LIMIT $record_from, $record_to"); @@ -123,12 +124,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Last Sent - Category + + + Auto Pay + + Status @@ -168,6 +173,23 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $status = "Inactive"; $status_badge_color = "secondary"; } + $recurring_payment_id = intval($row['recurring_payment_id']); + $recurring_payment_recurring_invoice_id = intval($row['recurring_payment_recurring_invoice_id']); + if ($recurring_payment_recurring_invoice_id) { + $auto_pay_display = " + Yes + + + + "; + } else { + $auto_pay_display = " + + Create + + "; + require "recurring_payment_add_modal.php"; + } ?> @@ -182,6 +204,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ly + diff --git a/recurring_payment_add_modal.php b/recurring_payment_add_modal.php new file mode 100644 index 00000000..d1a33915 --- /dev/null +++ b/recurring_payment_add_modal.php @@ -0,0 +1,77 @@ + \ No newline at end of file