diff --git a/admin_settings_online_payment.php b/admin_settings_online_payment.php index 81af8f86..b8aa5a4e 100644 --- a/admin_settings_online_payment.php +++ b/admin_settings_online_payment.php @@ -12,9 +12,6 @@ require_once "includes/inc_all_admin.php";
-
Currently, we only integrate with Stripe. Please see this forum post.
-
-
value="1" id="enableStripeSwitch"> @@ -140,6 +137,8 @@ require_once "includes/inc_all_admin.php";
+
Currently, we only integrate with Stripe. Please see this forum post.
+
diff --git a/admin_settings_online_payment_clients.php b/admin_settings_online_payment_clients.php index 4a6bc8c9..f95b35ed 100644 --- a/admin_settings_online_payment_clients.php +++ b/admin_settings_online_payment_clients.php @@ -18,6 +18,7 @@ $stripe_clients_sql = mysqli_query($mysqli, "SELECT * FROM client_stripe LEFT JO Client Stripe Customer ID Stripe Payment ID + Action @@ -35,6 +36,25 @@ $stripe_clients_sql = mysqli_query($mysqli, "SELECT * FROM client_stripe LEFT JO + +
+ +
+ + + Delete payment method + + + + Reset Stripe + + +
+
+ + diff --git a/client/autopay.php b/client/autopay.php index 44280785..02cb5b16 100644 --- a/client/autopay.php +++ b/client/autopay.php @@ -88,7 +88,7 @@ if (!$config_stripe_enable || !$config_stripe_publishable || !$config_stripe_sec // Manage the saved card else { ?> - Manage saved card details + Manage saved payment methods Actions
- - Remove saved card + - Remove saved payment method diff --git a/client/login_microsoft.php b/client/login_microsoft.php index 54306c85..80e77a23 100644 --- a/client/login_microsoft.php +++ b/client/login_microsoft.php @@ -29,7 +29,7 @@ $settings = mysqli_fetch_array($sql_settings); $client_id = $settings['config_azure_client_id']; $client_secret = $settings['config_azure_client_secret']; -$redirect_uri = "https://$config_base_url/portal/login_microsoft.php"; +$redirect_uri = "https://$config_base_url/client/login_microsoft.php"; # https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-auth-code-flow $auth_code_url = "https://login.microsoftonline.com/organizations/oauth2/v2.0/authorize"; diff --git a/client/post.php b/client/post.php index 7118407c..3410d98b 100644 --- a/client/post.php +++ b/client/post.php @@ -633,15 +633,15 @@ if (isset($_GET['stripe_save_card'])) { } // Logging - logAction("Stripe", "Update", "$session_contact_name added saved card ($card_info) for future automatic payments (PM: $payment_method)", $session_client_id, $session_client_id); + logAction("Stripe", "Update", "$session_contact_name saved payment method ($card_info) for future automatic payments (PM: $payment_method)", $session_client_id, $session_client_id); // Redirect - $_SESSION['alert_message'] = "Card saved - thank you"; + $_SESSION['alert_message'] = "Payment method saved - thank you"; header('Location: autopay.php'); } -if (isset($_GET['stripe_remove_card'])) { +if (isset($_GET['stripe_remove_pm'])) { if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) { header("Location: post.php?logout"); @@ -678,8 +678,8 @@ if (isset($_GET['stripe_remove_card'])) { mysqli_query($mysqli, "UPDATE client_stripe SET stripe_pm = NULL WHERE client_id = $session_client_id LIMIT 1"); // Logging & Redirect - logAction("Stripe", "Update", "$session_contact_name deleted saved card (PM: $payment_method)", $session_client_id, $session_client_id); + logAction("Stripe", "Update", "$session_contact_name deleted saved Stripe payment method (PM: $payment_method)", $session_client_id, $session_client_id); - $_SESSION['alert_message'] = "Card removed"; + $_SESSION['alert_message'] = "Payment method removed"; header('Location: autopay.php'); } \ No newline at end of file diff --git a/guest/index.php b/guest/index.php index 09eaa7a1..f403a675 100644 --- a/guest/index.php +++ b/guest/index.php @@ -1,3 +1,3 @@ -
  • +

  • SETTINGS @@ -214,6 +214,12 @@

    Online Payment
    • +
  • + + +

    Payment/Stripe Clients

    +     +
  • diff --git a/js/autopay_setup_stripe.js b/js/autopay_setup_stripe.js index 8b67a849..0119616c 100644 --- a/js/autopay_setup_stripe.js +++ b/js/autopay_setup_stripe.js @@ -6,7 +6,7 @@ initialize(); // Fetch Checkout Session and retrieve the client secret async function initialize() { const fetchClientSecret = async () => { - const response = await fetch("/portal/portal_post.php?create_stripe_checkout", { + const response = await fetch("/client/post.php?create_stripe_checkout", { method: "POST", }); const { clientSecret } = await response.json(); diff --git a/post/admin/admin_settings_online_payment_clients.php b/post/admin/admin_settings_online_payment_clients.php new file mode 100644 index 00000000..de3dd530 --- /dev/null +++ b/post/admin/admin_settings_online_payment_clients.php @@ -0,0 +1,54 @@ +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"); + + // 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"); + + // 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 diff --git a/post/user/ticket.php b/post/user/ticket.php index 5f66f9c6..6580bf4f 100644 --- a/post/user/ticket.php +++ b/post/user/ticket.php @@ -1757,7 +1757,6 @@ if (isset($_GET['close_ticket'])) { // EMAIL $subject = "Ticket closed - [$ticket_prefix$ticket_number] - $ticket_subject | (do not reply)"; - //$body = "Hello $contact_name,

    Your ticket regarding \"$ticket_subject\" has been closed.

    We hope the request/issue was resolved to your satisfaction. If you need further assistance, please raise a new ticket using the below details. Please do not reply to this email.

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Portal: https://$config_base_url/portal/ticket.php?id=$ticket_id

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; $body = "Hello $contact_name,

    Your ticket regarding \"$ticket_subject\" has been closed.

    We hope the request/issue was resolved to your satisfaction, please provide your feedback     here.
    If you need further assistance, please raise a new ticket using the below details. Please do not reply to this email.

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Portal: https://$config_base_url/client/ticket.php?id=$ticket_id

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; // Check email valid