fix: added validations for return in POS

frappe · Jan 8, 2025 · b262a2d · b262a2d
1 parent 60d5756
commit b262a2d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/pages/POS/PaymentModal.vue b/src/pages/POS/PaymentModal.vue
@@ -318,7 +318,8 @@ export default defineComponent({
 
       if (
         (this.sinvDoc.grandTotal?.float as number) < 1 &&
-        this.fyo.pesa(this.paidAmount.float).isZero()
+        this.fyo.pesa(this.paidAmount.float).isZero() &&
+        !this.sinvDoc.returnAgainst
       ) {
         return true;
       }
@@ -334,7 +335,8 @@ export default defineComponent({
     disablePayButton(): boolean {
       if (
         (this.sinvDoc.grandTotal?.float as number) < 1 &&
-        this.fyo.pesa(this.paidAmount.float).isZero()
+        this.fyo.pesa(this.paidAmount.float).isZero() &&
+        !this.sinvDoc.returnAgainst
       ) {
         return true;
       }
@@ -345,6 +347,7 @@ export default defineComponent({
       ) {
         return true;
       }
+
       return false;
     },
   },

diff --git a/src/utils/pos.ts b/src/utils/pos.ts
@@ -81,15 +81,20 @@ export function validateSinv(sinvDoc: SalesInvoice, itemQtyMap: ItemQtyMap) {
     return;
   }
 
-  validateSinvItems(sinvDoc.items as SalesInvoiceItem[], itemQtyMap);
+  validateSinvItems(
+    sinvDoc.items as SalesInvoiceItem[],
+    itemQtyMap,
+    sinvDoc.returnAgainst as string
+  );
 }
 
 function validateSinvItems(
   sinvItems: SalesInvoiceItem[],
-  itemQtyMap: ItemQtyMap
+  itemQtyMap: ItemQtyMap,
+  isReturn?: string
 ) {
   for (const item of sinvItems) {
-    if (!item.quantity || item.quantity < 1) {
+    if (!item.quantity || (item.quantity < 1 && !isReturn)) {
       throw new ValidationError(
         t`Invalid Quantity for Item ${item.item as string}`
       );