From c76da10747d9dbacbc49a8b190b6c07b96c1d7a8 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 7 Jul 2025 16:37:51 -0400 Subject: [PATCH] Add Payment Method to UI and switch Add Payment modals to use the new table --- admin_payment_method.php | 112 ++++++++++++++++++++ admin_payment_provider.php | 4 +- ajax/ajax_invoice_pay.php | 8 +- ajax/ajax_payment_method_edit.php | 73 +++++++++++++ ajax/ajax_payment_provider_edit.php | 108 +++++++++++++++++++ ajax/ajax_transfer_edit.php | 6 +- database_updates.php | 2 +- db.sql | 20 ++-- includes/admin_side_nav.php | 8 +- invoice.php | 2 +- modals/admin_payment_method_add_modal.php | 58 ++++++++++ modals/admin_payment_provider_add_modal.php | 13 ++- modals/invoice_payment_add_bulk_modal.php | 9 +- modals/transfer_add_modal.php | 6 +- post/admin/admin_payment_method.php | 66 ++++++++++++ post/admin/admin_payment_provider.php | 3 +- scripts/setup_cli.php | 9 +- setup.php | 8 +- 18 files changed, 474 insertions(+), 41 deletions(-) create mode 100644 admin_payment_method.php create mode 100644 ajax/ajax_payment_method_edit.php create mode 100644 ajax/ajax_payment_provider_edit.php create mode 100644 modals/admin_payment_method_add_modal.php create mode 100644 post/admin/admin_payment_method.php diff --git a/admin_payment_method.php b/admin_payment_method.php new file mode 100644 index 00000000..781e5a16 --- /dev/null +++ b/admin_payment_method.php @@ -0,0 +1,112 @@ + + +
+
+

Payment Methods

+
+ +
+
+
+
+ + "> + + + + + + + + + + + + + + + + + No Records Here"; + } + + ?> + + +
+ + Method + + + + Description + + + + Provider + + Action
+ + + + +
+ +
+ + Edit + +
+ + Delete + +
+
+
+ +
+
+
+ + diff --git a/ajax/ajax_invoice_pay.php b/ajax/ajax_invoice_pay.php index cbf6eb1c..e4e4563b 100644 --- a/ajax/ajax_invoice_pay.php +++ b/ajax/ajax_invoice_pay.php @@ -132,13 +132,11 @@ ob_start(); - + +
+
Editing:
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+
+ + +
+
+ + +
+
Editing:
+ +
+
+ + + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ Will not show as an option at Checkout if above this number +
+ +
+ +
+
+ value="1" id="enableEditExpenseSwitch"> + +
+ (Category: Payment Processing -- Vendor: +
+ +
+ +
+
+ +
+ +
+ See here for the latest Stripe Fees. +
+ +
+ +
+
+ +
+ +
+ See here for the latest Stripe Fees. +
+ +
+
+ + +
+
+ +- Method of Transfer - - + CURRENT_DATABASE_VERSION) { `payment_method_id` INT(11) NOT NULL AUTO_INCREMENT, `payment_method_name` VARCHAR(200) NOT NULL, `payment_method_description` VARCHAR(250) DEFAULT NULL, - `payment_method_provider_id` INT(1) DEFAULT 0, + `payment_method_provider_id` INT(11) DEFAULT 0, `payment_method_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, `payment_method_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`payment_method_id`) diff --git a/db.sql b/db.sql index a226a229..9985423c 100644 --- a/db.sql +++ b/db.sql @@ -39,21 +39,21 @@ CREATE TABLE `accounts` ( /*!40101 SET character_set_client = @saved_cs_client */; -- --- Table structure for table `ai_provider_models` +-- Table structure for table `ai_models` -- -DROP TABLE IF EXISTS `ai_provider_models`; +DROP TABLE IF EXISTS `ai_models`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8mb4 */; -CREATE TABLE `ai_provider_models` ( - `ai_model_provider_id` int(11) NOT NULL AUTO_INCREMENT, - `ai_model_provider_name` varchar(200) NOT NULL, +CREATE TABLE `ai_models` ( + `ai_model_id` int(11) NOT NULL AUTO_INCREMENT, + `ai_model_name` varchar(200) NOT NULL, `ai_model_prompt` text DEFAULT NULL, `ai_model_use_case` varchar(200) DEFAULT NULL, `ai_model_created_at` datetime NOT NULL DEFAULT current_timestamp(), `ai_model_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `ai_model_ai_provider_id` int(11) NOT NULL, - PRIMARY KEY (`ai_model_provider_id`) + PRIMARY KEY (`ai_model_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -69,8 +69,8 @@ CREATE TABLE `ai_providers` ( `ai_provider_name` varchar(200) NOT NULL, `ai_provider_api_url` varchar(200) NOT NULL, `ai_provider_api_key` varchar(200) DEFAULT NULL, - `ai_created_at` datetime NOT NULL DEFAULT current_timestamp(), - `ai_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `ai_provider_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `ai_provider_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), PRIMARY KEY (`ai_provider_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -1331,7 +1331,7 @@ CREATE TABLE `payment_methods` ( `payment_method_id` int(11) NOT NULL AUTO_INCREMENT, `payment_method_name` varchar(200) NOT NULL, `payment_method_description` varchar(250) DEFAULT NULL, - `payment_method_provider_id` int(1) DEFAULT 0, + `payment_method_provider_id` int(11) DEFAULT 0, `payment_method_created_at` datetime NOT NULL DEFAULT current_timestamp(), `payment_method_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), PRIMARY KEY (`payment_method_id`) @@ -2692,4 +2692,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-07-04 16:50:41 +-- Dump completed on 2025-07-07 16:36:58 diff --git a/includes/admin_side_nav.php b/includes/admin_side_nav.php index 83c028f3..44056eed 100644 --- a/includes/admin_side_nav.php +++ b/includes/admin_side_nav.php @@ -54,7 +54,13 @@

Taxes

-
  • +
  • + + +

    Payment Methods

    +     +
    • +

  • Payment Providers

    diff --git a/invoice.php b/invoice.php index ddf07578..7c83c3af 100644 --- a/invoice.php +++ b/invoice.php @@ -234,7 +234,7 @@ if (isset($_GET['invoice_id'])) {     - Pay via saved card + Pay via Payment Provider diff --git a/modals/admin_payment_method_add_modal.php b/modals/admin_payment_method_add_modal.php new file mode 100644 index 00000000..9703b0f9 --- /dev/null +++ b/modals/admin_payment_method_add_modal.php @@ -0,0 +1,58 @@ + diff --git a/modals/admin_payment_provider_add_modal.php b/modals/admin_payment_provider_add_modal.php index d1680353..b72a8131 100644 --- a/modals/admin_payment_provider_add_modal.php +++ b/modals/admin_payment_provider_add_modal.php @@ -49,6 +49,17 @@ +
    + +
    +
    + +
    + +
    + Will not show as an option at Checkout if above this number +
    +
    @@ -75,7 +86,7 @@
    - +
    See here for the latest Stripe Fees. diff --git a/modals/invoice_payment_add_bulk_modal.php b/modals/invoice_payment_add_bulk_modal.php index 6e4c030c..4bffe1db 100644 --- a/modals/invoice_payment_add_bulk_modal.php +++ b/modals/invoice_payment_add_bulk_modal.php @@ -102,13 +102,12 @@ - + - Method of Transfer - - + $name created"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_POST['edit_payment_method'])) { + + validateCSRFToken($_POST['csrf_token']); + + $payment_method_id = intval($_POST['payment_method_id']); + $name = sanitizeInput($_POST['name']); + $description = sanitizeInput($_POST['description']); + $provider = intval($_POST['provider']); + + mysqli_query($mysqli,"UPDATE payment_methods SET payment_method_name = '$name', payment_method_description = '$description', payment_method_provider_id = $provider_id WHERE payment_method_id = $payment_method_id"); + + // Logging + logAction("Payment Method", "Edit", "$session_name edited Payment Method $name"); + + $_SESSION['alert_message'] = "Payment Method $name edited"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_GET['delete_payment_method'])) { + + $payment_method_id = intval($_GET['delete_payment_method']); + + $sql = mysqli_query($mysqli,"SELECT payment_method_name FROM payment_methods WHERE payment_method_id = $payment_method_id"); + $row = mysqli_fetch_array($sql); + $payment_method_name = sanitizeInput($row['payment_method_name']); + + mysqli_query($mysqli,"DELETE FROM payment_methods WHERE payment_method_id = $payment_method_id"); + + // Logging + logAction("Payment Method", "Delete", "$session_name deleted Payment Method $payment_method_name"); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "Payment Method $payment_method_name deleted"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} diff --git a/post/admin/admin_payment_provider.php b/post/admin/admin_payment_provider.php index b96989b3..0f13af2f 100644 --- a/post/admin/admin_payment_provider.php +++ b/post/admin/admin_payment_provider.php @@ -66,7 +66,6 @@ if (isset($_POST['edit_payment_provider'])) { validateCSRFToken($_POST['csrf_token']); $provider_id = intval($_POST['provider_id']); - $provider = sanitizeInput($_POST['provider']); $description = sanitizeInput($_POST['description']); $public_key = sanitizeInput($_POST['public_key']); $private_key = sanitizeInput($_POST['private_key']); @@ -75,7 +74,7 @@ if (isset($_POST['edit_payment_provider'])) { $percentage_fee = floatval($_POST['percentage_fee']) / 100; $flat_fee = floatval($_POST['flat_fee']); - mysqli_query($mysqli,"UPDATE payment_providers SET payment_provider_name = '$name', payment_provider_url = '$url', payment_provider_api_key = '$api_key', payment_provider_percentage_fee = $percentage_fee, payment_provider_flat_fee = $flat_fee WHERE payment_provider_id = $provider_id"); + mysqli_query($mysqli,"UPDATE payment_providers SET payment_provider_public_key = '$public_key', payment_provider_private_key = '$private_key', payment_provider_expense_percentage_fee = $percentage_fee, payment_provider_expense_flat_fee = $flat_fee WHERE payment_provider_id = $provider_id"); // Logging logAction("Payment Provider", "Edit", "$session_name edited Payment Provider $provider"); diff --git a/scripts/setup_cli.php b/scripts/setup_cli.php index 7e174076..15bbdd71 100644 --- a/scripts/setup_cli.php +++ b/scripts/setup_cli.php @@ -285,9 +285,12 @@ mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Advertising', mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Service', category_type = 'Income', category_color = 'blue'"); mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Friend', category_type = 'Referral', category_color = 'blue'"); mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Search Engine', category_type = 'Referral', category_color = 'red'"); -mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Cash', category_type = 'Payment Method', category_color = 'blue'"); -mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Check', category_type = 'Payment Method', category_color = 'red'"); -mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Bank Transfer', category_type = 'Payment Method', category_color = 'green'"); + +// Payment Methods +mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'Cash'"); +mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'Check'"); +mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'ACH'"); +mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'Credit Card'"); // Calendar mysqli_query($mysqli,"INSERT INTO calendars SET calendar_name = 'Default', calendar_color = 'blue'"); diff --git a/setup.php b/setup.php index 71a09a94..ba0e1f50 100644 --- a/setup.php +++ b/setup.php @@ -438,10 +438,10 @@ if (isset($_POST['add_company_settings'])) { mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Client', category_type = 'Referral', category_color = 'lightblue'"); // Payment Methods - mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Cash', category_type = 'Payment Method', category_color = 'blue'"); - mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Check', category_type = 'Payment Method', category_color = 'red'"); - mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Bank Transfer', category_type = 'Payment Method', category_color = 'green'"); - mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Credit Card', category_type = 'Payment Method', category_color = 'purple'"); + mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'Cash'"); + mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'Check'"); + mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'ACH'"); + mysqli_query($mysqli,"INSERT INTO payment_methods SET category_name = 'Credit Card'"); // Default Calendar mysqli_query($mysqli,"INSERT INTO calendars SET calendar_name = 'Default', calendar_color = 'blue'");