From d2c99e86b4caecea926b35d0dd2a9e6dd502cb39 Mon Sep 17 00:00:00 2001 From: twotalesanimation <80506065+twotalesanimation@users.noreply.github.com> Date: Mon, 15 Dec 2025 10:18:25 +0200 Subject: [PATCH] mostly complete payment system --- assets/images/logos/ikhokha.png | Bin 0 -> 5465 bytes src/api/ikhokha_webhook.php | 2 +- src/config/functions.php | 85 +++++++++++++- src/pages/bookings/bookings.php | 5 +- src/pages/bookings/driver_training.php | 5 +- src/pages/bookings/trip-details.php | 115 ++++++++++--------- src/pages/memberships/membership_payment.php | 63 +++++----- src/pages/memberships/renew_membership.php | 17 ++- src/pages/other/bush_mechanics.php | 5 +- src/pages/other/indemnity.php | 4 +- src/pages/other/rescue_recovery.php | 6 +- src/processors/process_application.php | 8 +- src/processors/process_course_booking.php | 4 +- src/processors/process_signature.php | 6 +- src/processors/process_trip_booking.php | 6 +- 15 files changed, 223 insertions(+), 108 deletions(-) create mode 100644 assets/images/logos/ikhokha.png diff --git a/assets/images/logos/ikhokha.png b/assets/images/logos/ikhokha.png new file mode 100644 index 0000000000000000000000000000000000000000..32f6fc3fbc7179aa4d377337cdb63663f061473c GIT binary patch literal 5465 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's', $localPaymentId); $upd->execute(); $upd->close(); - sendAdminNotification('4WDCSA.co.za - New Membership Application - '.getFullName($user_id) , 'A new member has signed up, '.getFullName($user_id)); + sendAdminNotification('4WDCSA.co.za - Membership Payment Received - '.getFullName($user_id) , 'A Membership Payment has been received from '.getFullName($user_id)); } } diff --git a/src/config/functions.php b/src/config/functions.php index e51f42bb..ab95e405 100644 --- a/src/config/functions.php +++ b/src/config/functions.php @@ -1456,7 +1456,7 @@ function getInitialSurname($user_id) if ($stmt->fetch()) { $initial = strtoupper(substr($first_name, 0, 1)); - return $initial . ". " . $last_name; + return $initial . "." . $last_name; } else { return null; } @@ -1467,6 +1467,89 @@ function getInitialSurname($user_id) } } +function generatePaymentRef(string $type, ?int $course_trip_id, int $user_id): string +{ + $conn = openDatabaseConnection(); + + // 1. Normalize type + $type = strtoupper($type); + + // 2. Build prefix + switch ($type) { + case 'SUBS': + $year = (int)date('Y'); + $month = (int)date('n'); + + // If December, subscriptions are for next year + if ($month === 12) { + $year++; + } + + $prefix = "SUBS_" . $year; + break; + + case 'COURSE': + if (!$course_trip_id) { + throw new Exception("course_trip_id is required for COURSE payments"); + } + + $stmt = $conn->prepare( + "SELECT code FROM courses WHERE course_id = ?" + ); + $stmt->bind_param("i", $course_trip_id); + $stmt->execute(); + $stmt->bind_result($code); + + if (!$stmt->fetch()) { + throw new Exception("Invalid course_id: {$course_trip_id}"); + } + + $stmt->close(); + $prefix = "COURSE_" . strtoupper($code); + break; + + case 'TRIP': + if (!$course_trip_id) { + throw new Exception("course_trip_id is required for TRIP payments"); + } + + $stmt = $conn->prepare( + "SELECT trip_code FROM trips WHERE trip_id = ?" + ); + $stmt->bind_param("i", $course_trip_id); + $stmt->execute(); + $stmt->bind_result($trip_code); + + if (!$stmt->fetch()) { + throw new Exception("Invalid trip_id: {$course_trip_id}"); + } + + $stmt->close(); + $prefix = "TRIP_" . strtoupper($trip_code); + break; + + default: + throw new Exception("Unknown payment type: {$type}"); + } + + // 3. Get user initials + surname + $namePart = strtoupper(getInitialSurname($user_id)); + + if (!$namePart) { + throw new Exception("User not found for user_id: {$user_id}"); + } + + // 4. Add short entropy (trimmed for aesthetics) + $entropy = substr(shortEntropy(), -3); + + return "{$prefix}_{$namePart}_{$entropy}"; +} + +function shortEntropy(): string { + return strtoupper(base_convert((string)(microtime(true) * 1000), 10, 36)); +} + + function getLastName($user_id) { $conn = openDatabaseConnection(); diff --git a/src/pages/bookings/bookings.php b/src/pages/bookings/bookings.php index 9e215473..02406bb9 100644 --- a/src/pages/bookings/bookings.php +++ b/src/pages/bookings/bookings.php @@ -114,6 +114,7 @@ $user_id = $_SESSION['user_id']; // Loop through each row while ($row = $result->fetch_assoc()) { $booking_id = $row['booking_id']; + $payment_id = $row['payment_id']; $booking_type = $row['booking_type']; $from_date = $row['from_date']; $to_date = $row['to_date']; @@ -267,8 +268,8 @@ $user_id = $_SESSION['user_id'];
Booking Total: R ' . number_format($amount, 2) . ''; if ($status == "AWAITING PAYMENT") { - echo ' - ' . $status . ' + echo ' + ' . $status . ' '; } else { echo ' diff --git a/src/pages/bookings/driver_training.php b/src/pages/bookings/driver_training.php index eb546560..81067f87 100644 --- a/src/pages/bookings/driver_training.php +++ b/src/pages/bookings/driver_training.php @@ -177,7 +177,7 @@ $page_id = 'driver_training';
num_rows == 0) { $button_text = "No booking dates available"; @@ -189,8 +189,9 @@ $page_id = 'driver_training';
- Need some help? + You will be redirected to iKhokha's Secure payment gateway.
+ Secure Payment Badges diff --git a/src/pages/bookings/trip-details.php b/src/pages/bookings/trip-details.php index 54071272..3e4e39d5 100644 --- a/src/pages/bookings/trip-details.php +++ b/src/pages/bookings/trip-details.php @@ -205,30 +205,30 @@ include_once(dirname(dirname(dirname(__DIR__))) . '/header.php'); - - - - - - -
- -
- + + + + + + +
+ +
+ @@ -296,8 +296,8 @@ include_once(dirname(dirname(dirname(__DIR__))) . '/header.php'); - - + +
-
- New Membership Payment: - Membership Start Date: ' . $membership_start_date . '
Membership Renewal Date: ' . $membership_end_date . ''; ?> +
+ New Membership Payment: + Membership Start Date: ' . $membership_start_date . '
Membership Renewal Date: ' . $membership_end_date . ''; ?> +
+ + +
Payment Details:
+

Amount: R

+

Reference:

+ + Pay Now with iKhokha + + +
+

You will be redirected to iKhokha's Secure payment gateway.

- - -
Payment Details:
-

Amount: R

-

Reference:

- - Pay Now with iKhokha - - -

You will be redirected to iKhokha's Secure Payment Gateway.

- -

Please upload your proof of payment below.

-
Payment Details:
-

The Four Wheel Drive Club of Southern Africa
FNB
Account Number: 58810022334
Branch code: 250655
Reference:
Amount: R

- - Submit Proof of Payment - - - + Secure Payment Badges + +

Please upload your proof of payment below.

+
Payment Details:
+

The Four Wheel Drive Club of Southern Africa
FNB
Account Number: 58810022334
Branch code: 250655
Reference:
Amount: R

+ + Submit Proof of Payment + + +
@@ -132,4 +143,4 @@ if ($payment_id) {
- + \ No newline at end of file diff --git a/src/pages/memberships/renew_membership.php b/src/pages/memberships/renew_membership.php index 80dd9a68..8a01d5de 100644 --- a/src/pages/memberships/renew_membership.php +++ b/src/pages/memberships/renew_membership.php @@ -11,8 +11,20 @@ if (isset($_SESSION['user_id'])) { exit(); // Stop further script execution } +//if membership_fees payment_status is PENDING RENEWAL, redirect to membership_details.php +$stmt = $conn->prepare("SELECT payment_status FROM membership_fees WHERE user_id = ? LIMIT 1"); +$stmt->bind_param("i", $user_id); +$stmt->execute(); +$stmt->bind_result($payment_status); +$stmt->fetch(); +$stmt->close(); -$payment_id = uniqid(); +if ($payment_status === 'PENDING RENEWAL') { + header("Location: membership_details.php"); + exit(); +} + +$payment_id = generatePaymentRef('SUBS', null, $user_id); $payment_amount = getPriceByDescription('membership_fees'); $payment_date = date('Y-m-d'); $renewal_period_end = getMembershipEndDate($user_id); @@ -65,8 +77,9 @@ if ($stmt->execute()) { $publicRef = $publicRef ?? bin2hex(random_bytes(16)); $resp = createIkhokhaPayment($payment_id, $payment_amount, $description, $publicRef); $paylink = $resp['paylinkUrl'] ?? $resp['paylinkURL'] ?? $resp['paylink_url'] ?? null; + $token = encryptData($payment_id, $_ENV['SALT']); if ($paylink) { - header('Location: membership_payment?payment_id=' . $payment_id); + header('Location: membership_payment?token=' . $token); exit(); } else { header("Location: membership_details"); diff --git a/src/pages/other/bush_mechanics.php b/src/pages/other/bush_mechanics.php index 431dfb86..19e47008 100644 --- a/src/pages/other/bush_mechanics.php +++ b/src/pages/other/bush_mechanics.php @@ -156,7 +156,7 @@ $page_id = 'bush_mechanics'; num_rows == 0) { $button_text = "No booking dates available"; @@ -168,8 +168,9 @@ $page_id = 'bush_mechanics';
- Need some help? + You will be redirected to iKhokha's Secure payment gateway.
+ Secure Payment Badges diff --git a/src/pages/other/indemnity.php b/src/pages/other/indemnity.php index 3fc42185..ba49c32f 100644 --- a/src/pages/other/indemnity.php +++ b/src/pages/other/indemnity.php @@ -107,14 +107,14 @@ if (isset($_SESSION['user_id'])) { if (response.status === 'success') { // If provider returned a direct paylink, go there immediately if (response.paylinkUrl) { - window.location.href = 'membership_payment.php?payment_id=' + encodeURIComponent(response.payment_id); + window.location.href = 'membership_payment?token=' + encodeURIComponent(response.token); return; } // If we have a payment_id, redirect to membership_payment with it // if (response.payment_id) { // setTimeout(function() { - // window.location.href = 'membership_payment.php?payment_id=' + encodeURIComponent(response.payment_id); + // window.location.href = 'membership_payment.php?payment_id=' + encodeURIComponent(response.token); // }, 800); // return; // } diff --git a/src/pages/other/rescue_recovery.php b/src/pages/other/rescue_recovery.php index 85c12514..3fd83f12 100644 --- a/src/pages/other/rescue_recovery.php +++ b/src/pages/other/rescue_recovery.php @@ -154,7 +154,7 @@ $page_id = 'rescue_recovery'; num_rows == 0) { $button_text = "No booking dates available"; @@ -165,9 +165,11 @@ $page_id = 'rescue_recovery'; +
- Need some help? + You will be redirected to iKhokha's Secure payment gateway.
+ Secure Payment Badges diff --git a/src/processors/process_application.php b/src/processors/process_application.php index d4045c4b..e8d65c6d 100644 --- a/src/processors/process_application.php +++ b/src/processors/process_application.php @@ -6,7 +6,7 @@ require_once($rootPath . "/src/config/connection.php"); require_once($rootPath . "/src/config/functions.php"); $user_id = isset($_SESSION['user_id']) ? $_SESSION['user_id'] : null; -$payment_id = uniqid(); +$payment_id = generatePaymentRef('SUBS', null, $user_id); $status = 'AWAITING PAYMENT'; // If current month is December, attribute the membership year to the next year $currentYear = intval(date('Y')); @@ -210,9 +210,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { ->format('Y-m-d'); } - $stmt = $conn->prepare("INSERT INTO membership_fees (user_id, payment_amount, payment_date, membership_start_date, membership_end_date, payment_status, payment_id) - VALUES (?, ?, ?, ?, ?, 'AWAITING PAYMENT', ?)"); - $stmt->bind_param("idssss", $user_id, $payment_amount, $payment_date, $membership_start_date, $membership_end_date, $payment_id); + $stmt = $conn->prepare("INSERT INTO membership_fees (user_id, payment_amount, payment_date, membership_start_date, membership_end_date, renewal_period_end, payment_status, payment_id) + VALUES (?, ?, ?, ?, ?, ?, 'AWAITING PAYMENT', ?)"); + $stmt->bind_param("idsssss", $user_id, $payment_amount, $payment_date, $membership_start_date, $membership_end_date, $membership_end_date, $payment_id); if ($stmt->execute()) { // Commit the transaction diff --git a/src/processors/process_course_booking.php b/src/processors/process_course_booking.php index 7d2af6f0..27d20a86 100644 --- a/src/processors/process_course_booking.php +++ b/src/processors/process_course_booking.php @@ -93,11 +93,11 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { $status = "AWAITING PAYMENT"; $type = 'course'; - $payment_id = uniqid(); + $payment_id = generatePaymentRef('COURSE', $course_id, $user_id); $publicRef = bin2hex(random_bytes(16)); $num_vehicles = 1; $discountAmount = 0; - $eft_id = strtoupper("COURSE ".date("m-d", strtotime($date))." ".getInitialSurname($user_id)); + $eft_id = $payment_id; $notes = ""; if ($pending_member){ $notes = "Membership Payment pending at time of booking. Please confirm payment has been received."; diff --git a/src/processors/process_signature.php b/src/processors/process_signature.php index 7f1eaef9..cc02df88 100644 --- a/src/processors/process_signature.php +++ b/src/processors/process_signature.php @@ -77,7 +77,7 @@ if (isset($_POST['signature'])) { if ($mf && isset($mf['payment_amount'])) { $amount = floatval($mf['payment_amount']); // Use existing payment_id or generate one - $payment_id = $mf['payment_id'] ?? uniqid('mem_', true); + $payment_id = $mf['payment_id'] ?? generatePaymentRef('SUBS', null, $user_id);; if (empty($mf['payment_id'])) { // Persist generated payment_id back to membership_fees @@ -128,6 +128,7 @@ if (isset($_POST['signature'])) { $paylink = $resp['paylinkUrl'] ?? $resp['paylinkURL'] ?? $resp['paylink_url'] ?? null; // After creating paylink, update paymentStatus to AWAITING PAYMENT $paymentStatus = $paylink ? 'AWAITING PAYMENT' : $paymentStatus; + $token = encryptData($payment_id, $_ENV['SALT']); } catch (Exception $e) { // Log but do not fail signature save error_log('iKhokha create error: ' . $e->getMessage()); @@ -140,7 +141,8 @@ if (isset($_POST['signature'])) { $response = [ 'status' => 'success', 'message' => 'Signature saved successfully!', - 'paymentStatus' => $paymentStatus + 'paymentStatus' => $paymentStatus, + 'token' => $token ?? null ]; if (!empty($paylink)) { $response['paylinkUrl'] = $paylink; diff --git a/src/processors/process_trip_booking.php b/src/processors/process_trip_booking.php index 5391d7e5..83b97929 100644 --- a/src/processors/process_trip_booking.php +++ b/src/processors/process_trip_booking.php @@ -105,10 +105,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { $status = "AWAITING PAYMENT"; $description = $trip_name; $type = 'trip'; - $payment_id = uniqid(); + $payment_id = generatePaymentRef('TRIP', $trip_id, $user_id); $publicRef = bin2hex(random_bytes(16)); // $eft_id = strtoupper(base_convert(time(), 10, 36)); // Convert timestamp to base36 - $eft_id = strtoupper($trip_code." ".getInitialSurname($user_id)); + // $eft_id = strtoupper($trip_code." ".getInitialSurname($user_id)); // Insert booking into the database @@ -147,7 +147,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { // Send invoice and admin notification // sendInvoice(getEmail($user_id), getFullName($user_id), $eft_id, formatCurrency($payment_amount), $description); - sendAdminNotification('New Trip Booking - '.getFullName($user_id), getFullName($user_id).' has booked for '.$description); + // sendAdminNotification('New Trip Booking - '.getFullName($user_id), getFullName($user_id).' has booked for '.$description); // Redirect to payment link if available $paylink = $resp['paylinkUrl'] ?? $resp['paylinkURL'] ?? $resp['paylink_url'] ?? null;