@apptimate/ui 6.3.0 → 6.5.0

package/src/common-components/transaction/ProductTransactionScreen.tsx

@@ -172,7 +172,7 @@ export function ProductTransactionScreen({
     (
       item: TransactionItem,
       variant?: any,
-      extra?: { quantity?: number; batches?: any[]; serial_numbers?: string[] }
+      extra?: { quantity?: number; batches?: any[]; serial_numbers?: string[]; serial_number_objects?: {id: number, serial_number: string}[] }
     ) => {
       setLineItems((prevLineItems) => {
         const actualVariant = variant || (item.variants && item.variants.length > 0 ? item.variants[0] : null);
@@ -222,6 +222,7 @@ export function ProductTransactionScreen({
           variant_id: resolvedVariantId,
           batches: extra?.batches || [],
           serial_numbers: extra?.serial_numbers || [],
+          serial_number_objects: extra?.serial_number_objects || [],
           quantity: qty,
           unit_price: unitPrice,
           discount_percent: discountPercent,
@@ -337,12 +338,34 @@ export function ProductTransactionScreen({
   const handleSubmit = useCallback(async () => {
     if (lineItems.length === 0) return;
 
+    let finalPayments = payments;
+    let actualAmountTendered = payments.reduce((sum, p) => sum + (Number(p.amount) || 0), 0);
+
     if (config.requireFullPayment) {
-      const totalPayments = payments.reduce((sum, p) => sum + (Number(p.amount) || 0), 0);
-      if (Math.abs(totalPayments - grandTotal) > 0.01) {
-        toast.error('Total payments must equal the Grand Total (Use Credit mode to pay later).');
+      if (actualAmountTendered < grandTotal - 0.01) {
+        toast.error('Total payments must equal or exceed the Grand Total (Use Credit mode to pay later).');
         return;
       }
+
+      const excess = actualAmountTendered - grandTotal;
+      if (excess > 0.01) {
+        const hasNonCash = payments.some(p => p.mode_code !== 'cash' && Number(p.amount) > 0);
+        if (hasNonCash) {
+          toast.error('Overpayment (Change Due) is not supported when using multiple payment methods or non-cash modes.');
+          return;
+        }
+
+        let remainingExcess = excess;
+        finalPayments = payments.map(p => {
+          if (p.mode_code === 'cash' && remainingExcess > 0) {
+            const amt = Number(p.amount) || 0;
+            const reduction = Math.min(amt, remainingExcess);
+            remainingExcess -= reduction;
+            return { ...p, amount: amt - reduction };
+          }
+          return p;
+        });
+      }
     }
 
     if (config.showWarehouse && !warehouseId) {
@@ -350,6 +373,17 @@ export function ProductTransactionScreen({
       return;
     }
 
+    if (config.type === 'pos') {
+      const isCredit = (p: any) => p.mode_code === "credit";
+      const totalPaid = payments.reduce((sum, p) => sum + (isCredit(p) ? 0 : (Number(p.amount) || 0)), 0);
+      const balance = grandTotal - totalPaid;
+      
+      if (balance > 0.01 && !partyId) {
+        toast.error('Customer must be selected for outstanding balances or credit payments.');
+        return;
+      }
+    }
+
     for (const line of lineItems) {
       if (line.item.tracking_type === 'batch') {
         const requiresBatch = !config.disableTrackingSelection || ['sales', 'quotation'].includes(config.type);
@@ -429,7 +463,8 @@ export function ProductTransactionScreen({
           line_total: l.line_total,
         }];
       }),
-      payments: config.showPayment ? payments : undefined,
+      payments: config.showPayment ? finalPayments : undefined,
+      amount_tendered: config.showPayment ? actualAmountTendered : undefined,
       subtotal,
       discount_total: discountTotal,
       grand_total: grandTotal,
@@ -456,7 +491,15 @@ export function ProductTransactionScreen({
   }, [lineItems, config, partyId, warehouseId, transactionDate, expectedDeliveryDate, notes, payments, subtotal, discountTotal, grandTotal, onSubmit, defaultWarehouseId, initialData]);
 
   return (
-    <div className="flex flex-col h-full">
+    <form 
+      onSubmit={(e) => { e.preventDefault(); handleSubmit(); }} 
+      onKeyDown={(e) => {
+        if (e.key === 'Enter' && (e.target as HTMLElement).tagName !== 'TEXTAREA' && (e.target as HTMLElement).tagName !== 'BUTTON') {
+          e.preventDefault();
+        }
+      }}
+      className="flex flex-col h-full"
+    >
       {/* ── Two-Panel Layout ── */}
       <div className="flex-1 flex gap-5 min-h-0">
         {/* Left: Product Selection (75%) */}
@@ -627,6 +670,6 @@ export function ProductTransactionScreen({
           </ModalFooter>
         </Modal>
       )}
-    </div>
+    </form>
   );
 }

package/src/common-components/transaction/types.ts

@@ -262,6 +262,7 @@ export const TRANSACTION_PRESETS: Record<TransactionType, TransactionScreenConfi
     allowCreateBatchAndSerial: false,
     allowEditPrice: true,
     showStock: true,
+    requireFullPayment: true,
   },
   opening_stock: {
     type: 'opening_stock',
@@ -350,6 +351,7 @@ export interface TransactionPayload {
     line_total: number;
   }>;
   payments?: PaymentEntry[];
+  amount_tendered?: number;
   subtotal: number;
   discount_total: number;
   grand_total: number;