@@ -1721,6 +1739,8 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
items: [],
discount: null,
customerPoints: 0,
+ selectedPaymentMethod: 'cash',
+ payments: [],
add(product) {
const existing = this.items.find(item => item.id === product.id);
if (existing) {
@@ -1922,23 +1942,170 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
async checkout() {
if (this.items.length === 0) return;
- const btn = document.getElementById('checkoutBtn');
+ const subtotal = this.items.reduce((sum, item) => sum + (item.price * item.qty), 0);
+ let discountAmount = 0;
+ if (this.discount) {
+ discountAmount = this.discount.type === 'percentage' ? subtotal * (parseFloat(this.discount.value) / 100) : parseFloat(this.discount.value);
+ }
+ const redeemSwitch = document.getElementById('redeemLoyalty');
+ let loyaltyRedeemed = (redeemSwitch && redeemSwitch.checked) ? Math.min(subtotal - discountAmount, this.customerPoints) : 0;
+ const total = subtotal - discountAmount - loyaltyRedeemed;
+
+ this.payments = [];
+ this.renderPayments();
+ document.getElementById('paymentAmountDue').innerText = 'OMR ' + total.toFixed(3);
+ document.getElementById('partialAmount').value = total.toFixed(3);
+ this.updateRemaining();
+
+ const modal = new bootstrap.Modal(document.getElementById('posPaymentModal'));
+ modal.show();
+ },
+ selectMethod(method, btn) {
+ this.selectedPaymentMethod = method;
+ document.querySelectorAll('.payment-method-btn').forEach(b => b.classList.remove('active'));
+ btn.classList.add('active');
+ this.updateRemaining();
+ },
+ fillPartial(amount) {
+ const input = document.getElementById('partialAmount');
+ input.value = parseFloat(amount).toFixed(3);
+ this.updateRemaining();
+ },
+ addPaymentLine() {
+ const amount = parseFloat(document.getElementById('partialAmount').value) || 0;
+ if (amount <= 0) return;
+
+ this.payments.push({
+ method: this.selectedPaymentMethod,
+ amount: amount
+ });
+ this.renderPayments();
+ this.updateRemaining();
+
+ // Auto-fill remaining for next line if any
+ const remaining = this.getRemaining();
+ document.getElementById('partialAmount').value = remaining > 0 ? remaining.toFixed(3) : '0.000';
+ },
+ removePaymentLine(index) {
+ this.payments.splice(index, 1);
+ this.renderPayments();
+ this.updateRemaining();
+ },
+ getGrandTotal() {
+ const subtotal = this.items.reduce((sum, item) => sum + (item.price * item.qty), 0);
+ let discountAmount = 0;
+ if (this.discount) {
+ discountAmount = this.discount.type === 'percentage' ? subtotal * (parseFloat(this.discount.value) / 100) : parseFloat(this.discount.value);
+ }
+ const redeemSwitch = document.getElementById('redeemLoyalty');
+ let loyaltyRedeemed = (redeemSwitch && redeemSwitch.checked) ? Math.min(subtotal - discountAmount, this.customerPoints) : 0;
+ return subtotal - discountAmount - loyaltyRedeemed;
+ },
+ getRemaining() {
+ const total = this.getGrandTotal();
+ const paid = this.payments.reduce((sum, p) => sum + p.amount, 0);
+ return total - paid;
+ },
+ renderPayments() {
+ const container = document.getElementById('paymentList');
+ container.innerHTML = this.payments.map((p, i) => `
+
+
+ ${p.method}
+ OMR ${p.amount.toFixed(3)}
+
+
+
+ `).join('');
+ },
+ updateRemaining() {
+ const remaining = this.getRemaining();
+ const currentInput = parseFloat(document.getElementById('partialAmount').value) || 0;
+ const display = document.getElementById('paymentRemaining');
+ display.innerText = 'OMR ' + Math.max(0, remaining).toFixed(3);
+
+ // Calculate potential change if the user types an amount > remaining
+ const totalPaid = this.payments.reduce((sum, p) => sum + p.amount, 0);
+ const grandTotal = this.getGrandTotal();
+ const actualChange = Math.max(0, totalPaid - grandTotal);
+ const potentialChange = Math.max(0, currentInput - remaining);
+ const displayChange = Math.max(actualChange, potentialChange);
+
+ const changeDisplay = document.getElementById('changeDue');
+ if (changeDisplay) {
+ changeDisplay.innerText = 'OMR ' + displayChange.toFixed(3);
+ const cashSection = document.getElementById('cashPaymentSection');
+ if (displayChange > 0 || this.selectedPaymentMethod === 'cash' || this.payments.some(p => p.method === 'cash')) {
+ cashSection.style.display = 'block';
+ } else {
+ cashSection.style.display = 'none';
+ }
+ }
+
+ if (remaining <= 0.0001 || currentInput >= remaining - 0.0001) {
+ display.classList.remove('text-danger');
+ display.classList.add('text-success');
+ document.getElementById('confirmPaymentBtn').disabled = false;
+ } else {
+ display.classList.remove('text-success');
+ display.classList.add('text-danger');
+ document.getElementById('confirmPaymentBtn').disabled = true;
+ }
+ },
+ async completeOrder() {
+ if (this.items.length === 0) {
+ Swal.fire('Error', 'Cart is empty', 'error');
+ return;
+ }
+
+ // If there's an amount in the input and payments are not enough, add it
+ const remainingBefore = this.getRemaining();
+ const currentInput = parseFloat(document.getElementById('partialAmount').value) || 0;
+
+ if (remainingBefore > 0.0001 && currentInput >= remainingBefore - 0.0001) {
+ this.payments.push({
+ method: this.selectedPaymentMethod,
+ amount: currentInput
+ });
+ } else if (this.payments.length === 0) {
+ const total = this.getGrandTotal();
+ this.payments.push({
+ method: this.selectedPaymentMethod,
+ amount: total
+ });
+ }
+
+ const remaining = this.getRemaining();
+ if (remaining > 0.001) {
+ Swal.fire('Error', 'Payment is incomplete', 'error');
+ return;
+ }
+
+ const customerId = document.getElementById('posCustomer').value;
+ if (this.payments.some(p => p.method === 'credit') && !customerId) {
+ Swal.fire('Error', 'Credit payment is only allowed for registered customers', 'error');
+ return;
+ }
+
+ const btn = document.getElementById('confirmPaymentBtn');
const originalText = btn.innerText;
btn.disabled = true;
btn.innerText = 'PROCESSING...';
- const subtotal = this.items.reduce((sum, item) => sum + (item.price * item.qty), 0);
+ const subtotal = this.items.reduce((sum, item) => sum + (parseFloat(item.price) * item.qty), 0);
let discountAmount = 0;
if (this.discount) {
- discountAmount = this.discount.type === 'percentage' ? subtotal * (this.discount.value / 100) : this.discount.value;
+ discountAmount = this.discount.type === 'percentage' ? subtotal * (parseFloat(this.discount.value) / 100) : parseFloat(this.discount.value);
}
const redeemSwitch = document.getElementById('redeemLoyalty');
let loyaltyRedeemed = (redeemSwitch && redeemSwitch.checked) ? Math.min(subtotal - discountAmount, this.customerPoints) : 0;
const formData = new FormData();
formData.append('action', 'save_pos_transaction');
- formData.append('customer_id', document.getElementById('posCustomer').value);
- formData.append('payment_method', document.getElementById('posPaymentMethod').value);
+ formData.append('customer_id', customerId);
+ formData.append('payments', JSON.stringify(this.payments));
formData.append('total_amount', subtotal);
formData.append('discount_code_id', this.discount ? this.discount.id : '');
formData.append('discount_amount', discountAmount);
@@ -1947,8 +2114,18 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
try {
const resp = await fetch('index.php', { method: 'POST', body: formData });
- const result = await resp.json();
+ const text = await resp.text();
+ let result;
+ try {
+ result = JSON.parse(text);
+ } catch (e) {
+ console.error('Invalid JSON response:', text);
+ throw new Error('Server returned an invalid response');
+ }
+
if (result.success) {
+ const payModal = bootstrap.Modal.getInstance(document.getElementById('posPaymentModal'));
+ if (payModal) payModal.hide();
this.showReceipt(result.invoice_id, discountAmount, loyaltyRedeemed, result.transaction_no);
} else {
Swal.fire('Error', result.error, 'error');
@@ -1957,7 +2134,7 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
}
} catch (err) {
console.error(err);
- Swal.fire('Error', 'Something went wrong', 'error');
+ Swal.fire('Error', err.message || 'Something went wrong', 'error');
btn.disabled = false;
btn.innerText = originalText;
}
@@ -1965,7 +2142,12 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
showReceipt(invId, discountAmount, loyaltyRedeemed, transactionNo) {
const container = document.getElementById('posReceiptContent');
const customerName = document.getElementById('posCustomer').options[document.getElementById('posCustomer').selectedIndex].text;
- const paymentMethod = document.getElementById('posPaymentMethod').value.toUpperCase();
+ const paymentsHtml = this.payments.map(p => `
+
+ ${p.method}
+ OMR ${p.amount.toFixed(3)}
+
+ `).join('');
const date = new Date().toLocaleString();
let itemsHtml = this.items.map(item => `
@@ -1994,8 +2176,11 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';