|
|
@@ -33,7 +33,7 @@
|
|
|
var gameTitle = isBigSmall ? Lang.millions_big_small : Lang.millions_odd_even;
|
|
|
var prizeAmount = isBigSmall ? "100.000" : "200.000";
|
|
|
|
|
|
- <!-- ==================== CARD SELECTION GAME UI (BIG/SMALL or ODD/EVEN) ==================== -->
|
|
|
+ <!-- ====== CARD SELECTION GAME UI (BIG/SMALL or ODD/EVEN) ====== -->
|
|
|
<div class="millions-buy-ticket-page main-container animate__animated animate__fadeIn overflow-hidden">
|
|
|
<!-- Header -->
|
|
|
<div class="header">
|
|
|
@@ -218,7 +218,7 @@
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
-<!-- ==================== Basic Pick 10 / Odd-Even GAME UI ==================== -->
|
|
|
+<!-- ====== Basic Pick 10 / Odd-Even GAME UI ====== -->
|
|
|
<div class="millions-buy-ticket-page main-container animate__animated animate__fadeIn overflow-hidden">
|
|
|
<!-- Header -->
|
|
|
<div class="header">
|
|
|
@@ -1036,9 +1036,9 @@ else
|
|
|
|
|
|
// --- Order Summary Modal Logic ---
|
|
|
// --- Payment Preparation & Order Summary Logic ---
|
|
|
-<<<<<<< HEAD
|
|
|
+
|
|
|
let pendingPaymentRequest = null;
|
|
|
-=======
|
|
|
+
|
|
|
let pendingTickets = [];
|
|
|
let currentChannelPayment = '@Constants.BASIC_WALLET_TICKET';
|
|
|
let isPreparingCheckout = false;
|
|
|
@@ -1055,7 +1055,7 @@ else
|
|
|
paymentClickArmedAt = Date.now();
|
|
|
}
|
|
|
}
|
|
|
->>>>>>> websiteNoNatCash
|
|
|
+
|
|
|
|
|
|
function preparePayment(event) {
|
|
|
// Never prepare or confirm a ticket during page initialization.
|
|
|
@@ -1107,14 +1107,14 @@ else
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
+
|
|
|
pendingPaymentRequest = {
|
|
|
gameId: "@Model.termType",
|
|
|
ticket: tickets
|
|
|
};
|
|
|
|
|
|
showOrderSummary(null, tickets);
|
|
|
-=======
|
|
|
+
|
|
|
pendingTickets = tickets;
|
|
|
if (hasFreeTicketPromotion) {
|
|
|
selectPaymentChannel('@Constants.BASIC_WALLET_TICKET');
|
|
|
@@ -1162,7 +1162,7 @@ else
|
|
|
isPreparingCheckout = false;
|
|
|
}
|
|
|
});
|
|
|
->>>>>>> websiteNoNatCash
|
|
|
+
|
|
|
}
|
|
|
|
|
|
let currentTransId = null;
|
|
|
@@ -1221,15 +1221,15 @@ else
|
|
|
});
|
|
|
|
|
|
$("#summaryTotalCount").text(displayTickets.length);
|
|
|
-<<<<<<< HEAD
|
|
|
+
|
|
|
const totalMoney = apiData
|
|
|
? (apiData.totalMoneyPayment || apiData.totalMoney || "0")
|
|
|
: displayTickets.reduce((sum, ticket) => sum + (parseInt(ticket.money, 10) || 0), 0);
|
|
|
-=======
|
|
|
+
|
|
|
const totalMoney = hasFreeTicketPromotion
|
|
|
? "0"
|
|
|
: (apiData.totalMoneyPayment || apiData.totalMoney || "0");
|
|
|
->>>>>>> websiteNoNatCash
|
|
|
+
|
|
|
$("#summaryTotalAmount").text(formatMoneyV2(totalMoney));
|
|
|
|
|
|
summaryModal.removeClass("hidden").addClass("flex");
|
|
|
@@ -1240,12 +1240,12 @@ else
|
|
|
}
|
|
|
|
|
|
function confirmCheckout(btn) {
|
|
|
-<<<<<<< HEAD
|
|
|
+
|
|
|
if (!pendingPaymentRequest) {
|
|
|
showNotification("@Lang.millions_ticket_not_valid", "warning");
|
|
|
return;
|
|
|
}
|
|
|
-=======
|
|
|
+
|
|
|
if (isSendingOtp) return;
|
|
|
|
|
|
if (currentChannelPayment === '@Constants.NATCASH_WALLET_TICKET') {
|
|
|
@@ -1256,7 +1256,7 @@ else
|
|
|
isSendingOtp = true;
|
|
|
const originalText = $(btn).html();
|
|
|
$(btn).prop('disabled', true).html('<i class="fa-solid fa-spinner fa-spin mr-2"></i>Processing...');
|
|
|
->>>>>>> websiteNoNatCash
|
|
|
+
|
|
|
|
|
|
$("#paymentSourceModal").removeClass("hidden").addClass("flex");
|
|
|
}
|
|
|
@@ -1314,12 +1314,12 @@ else
|
|
|
type: 'POST',
|
|
|
success: function(data) {
|
|
|
if (data.responseCode === "0") {
|
|
|
-<<<<<<< HEAD
|
|
|
+
|
|
|
hidePaymentSourceModal();
|
|
|
showOtpModal();
|
|
|
-=======
|
|
|
+
|
|
|
showOtpModal(false);
|
|
|
->>>>>>> websiteNoNatCash
|
|
|
+
|
|
|
} else {
|
|
|
showNotification(data.responseMessage || "Failed to send OTP", data.responseCode);
|
|
|
}
|
|
|
@@ -1647,7 +1647,7 @@ else
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- // ==================== CARD SELECTION GAME LOGIC (BIG/SMALL / ODD/EVEN) ====================
|
|
|
+ // ====== CARD SELECTION GAME LOGIC (BIG/SMALL / ODD/EVEN) ======
|
|
|
var bsChoice = null; // 'big' or 'small' (reused as 'odd' or 'even')
|
|
|
const isBigSmall = @(Model.termType == Constants.PIC10_BIGSMALL_CODE ? "true" : "false");
|
|
|
const themeColor = isBigSmall ? "#0A9800" : "#AA3DC8";
|
student