diff --git a/admin_category.php b/admin_category.php index 4370b5d4..177df25d 100644 --- a/admin_category.php +++ b/admin_category.php @@ -77,13 +77,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); } else { echo 'btn-default'; } ?>">Referral - Payment - Method Fee + + Saved Payment Methods + Action @@ -73,6 +76,9 @@ $num_rows = mysqli_num_rows($sql); $percent_fee = floatval($row['payment_provider_expense_percentage_fee']) * 100; $flat_fee = floatval($row['payment_provider_expense_flat_fee']); + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('saved_payment_id') AS saved_payment_count FROM client_saved_payment_methods WHERE saved_payment_provider_id = $provider_id")); + $saved_payment_count = intval($row['saved_payment_count']); + ?> @@ -90,6 +96,7 @@ $num_rows = mysqli_num_rows($sql); + +
+
+ + +
+
+ + +
+
+ + "> + + + + + + + + + + + + + + + + + + + + + + + No Records Here"; + } + + ?> + + +
+ + Client + + + + Provider + + + + Details + + + + Provider Client ID + + + + Provider Payment Method ID + + + + Created + + Action
() () + + Delete + +
+ +
+ + + + CURRENT_DATABASE_VERSION) { PRIMARY KEY (`payment_provider_id`) )"); - mysqli_query($mysqli, "CREATE TABLE `cient_saved_payment_methods` ( + mysqli_query($mysqli, "CREATE TABLE `client_saved_payment_methods` ( `saved_payment_id` INT(11) NOT NULL AUTO_INCREMENT, `saved_payment_provider_client` VARCHAR(200) NOT NULL, `saved_payment_provider_method` VARCHAR(200) NOT NULL, @@ -3749,10 +3749,38 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.3'"); } - // if (CURRENT_DATABASE_VERSION == '2.2.3') { - // // Insert queries here required to update to DB version 2.2.4 + if (CURRENT_DATABASE_VERSION == '2.2.3') { + + // Delete all Recurring Payments that are Stripe + mysqli_query($mysqli, "DELETE FROM recurring_payments WHERE recurring_payment_method = 'Stripe'"); + + // Delete Stripe Specific ITFlow Client Stripe Client Relationship Table + mysqli_query($mysqli, "DROP TABLE client_stripe"); + + // Delete Unused Stripe and AI Settings now in their own tables + mysqli_query($mysqli, "ALTER TABLE `settings` + DROP `config_stripe_enable`, + DROP `config_stripe_publishable`, + DROP `config_stripe_secret`, + DROP `config_stripe_account`, + DROP `config_stripe_expense_vendor`, + DROP `config_stripe_expense_category`, + DROP `config_stripe_percentage_fee`, + DROP `config_stripe_flat_fee`, + DROP `config_ai_enable`, + DROP `config_ai_provider`, + DROP `config_ai_model`, + DROP `config_ai_url`, + DROP `config_ai_api_key` + "); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.4'"); + } + + // if (CURRENT_DATABASE_VERSION == '2.2.4') { + // // Insert queries here required to update to DB version 2.2.5 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.4'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.5'"); // } } else { diff --git a/includes/admin_side_nav.php b/includes/admin_side_nav.php index 44056eed..1ba4c7e5 100644 --- a/includes/admin_side_nav.php +++ b/includes/admin_side_nav.php @@ -66,6 +66,12 @@

Payment Providers

+
  • + + +

    Saved Payments

    +     +
  • diff --git a/post/admin/admin_saved_payment_method.php b/post/admin/admin_saved_payment_method.php new file mode 100644 index 00000000..e697b1f2 --- /dev/null +++ b/post/admin/admin_saved_payment_method.php @@ -0,0 +1,70 @@ +paymentMethods->detach($payment_method, []); + + } catch (Exception $e) { + $error = $e->getMessage(); + error_log("Stripe payment error - encountered exception when removing payment method info for $payment_method: $error"); + logApp("Stripe", "error", "Exception removing payment method for $payment_method: $error"); + } + + // Remove payment method from ITFlow + mysqli_query($mysqli, "UPDATE client_stripe SET stripe_pm = NULL WHERE client_id = $client_id LIMIT 1"); + + // Remove Auto Pay on recurring invoices that are stripe + $sql_recurring_invoices = mysqli_query($mysqli, "SELECT recurring_invoice_id FROM recurring_invoices WHERE recurring_invoice_client_id = $client_id"); + + while ($row = mysqli_fetch_array($sql_recurring_invoices)) { + $recurring_invoice_id = intval($row['recurring_invoice_id']); + mysqli_query($mysqli, "DELETE FROM recurring_payments WHERE recurring_payment_method = 'Stripe' AND recurring_payment_recurring_invoice_id = $recurring_invoice_id"); + } + + // Logging & Redirect + logAction("Stripe", "Update", "$session_name deleted saved Stripe payment method (PM: $payment_method)", $client_id); + $_SESSION['alert_message'] = "Payment method removed"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_GET['stripe_reset_customer'])) { + validateCSRFToken($_GET['csrf_token']); + + $client_id = intval($_GET['client_id']); + + // Delete the customer id and payment method id stored in ITFlow, allowing the client to set these up again + mysqli_query($mysqli, "DELETE FROM client_stripe WHERE client_id = $client_id"); + + // Remove Auto Pay on recurring invoices that are stripe + $sql_recurring_invoices = mysqli_query($mysqli, "SELECT recurring_invoice_id FROM recurring_invoices WHERE recurring_invoice_client_id = $client_id"); + + while ($row = mysqli_fetch_array($sql_recurring_invoices)) { + $recurring_invoice_id = intval($row['recurring_invoice_id']); + mysqli_query($mysqli, "DELETE FROM recurring_payments WHERE recurring_payment_method = 'Stripe' AND recurring_payment_recurring_invoice_id = $recurring_invoice_id"); + } + + // Logging + logAction("Stripe", "Delete", "$session_name reset Stripe settings for client", $client_id); + + $_SESSION['alert_message'] = "Reset client Stripe settings"; + header("Location: " . $_SERVER["HTTP_REFERER"]); +} \ No newline at end of file