-
num_rows == 0) {
$button_text = "No booking dates available";
@@ -168,8 +168,9 @@ $page_id = 'bush_mechanics';
+
- New Membership Payment:
- Membership Start Date: ' . $membership_start_date . '
Membership Renewal Date: ' . $membership_end_date . ''; ?> +
+
+
Membership Renewal Date: ' . $membership_end_date . ''; ?> +
+ New Membership Payment:
+ Membership Start Date: ' . $membership_start_date . '
Membership Renewal Date: ' . $membership_end_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
+
+ 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
@@ -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';
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;