fix(ux): disable Pay, Submit buttons on conditions

frappe · Dec 4, 2023 · a769537 · a769537
1 parent 97f9fbb
commit a769537
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/schemas/app/inventory/Point of Sale/POSSettings.json b/schemas/app/inventory/Point of Sale/POSSettings.json
@@ -18,6 +18,7 @@
       "label": "Counter Cash Account",
       "fieldtype": "Link",
       "target": "Account",
+      "default": "Cash In Hand",
       "required": true,
       "create": true,
       "section": "Default"

diff --git a/src/pages/POS/POS.vue b/src/pages/POS/POS.vue
@@ -142,7 +142,7 @@
 
                 <Button
                   class="mt-4 w-full bg-green-500 py-6"
-                  :disabled="!sinvDoc.items?.length"
+                  :disabled="disablePayButton"
                   @click="toggleModal('Payment', true)"
                 >
                   <slot>
@@ -273,6 +273,16 @@ export default defineComponent({
       }
       return true;
     },
+    disablePayButton(): boolean {
+      if (!this.sinvDoc.items?.length) {
+        return true;
+      }
+
+      if (!this.sinvDoc.party) {
+        return true;
+      }
+      return false;
+    },
   },
   watch: {
     sinvDoc: {

diff --git a/src/pages/POS/PaymentModal.vue b/src/pages/POS/PaymentModal.vue
@@ -300,6 +300,13 @@ export default defineComponent({
       ) {
         return true;
       }
+
+      if (
+        this.cashAmount.isZero() &&
+        (!this.transferRefNo || !this.transferClearanceDate)
+      ) {
+        return true;
+      }
       return false;
     },
   },

diff --git a/src/utils/pos.ts b/src/utils/pos.ts
@@ -211,6 +211,14 @@ export async function transferPOSCashAndWriteOff(
   fyo: Fyo,
   posShiftDoc: POSShift
 ) {
+  const differenceAmount = posShiftDoc?.closingAmounts?.find(
+    (row) => row.paymentMethod === 'Cash'
+  )?.differenceAmount as Money;
+
+  if (differenceAmount.isZero()) {
+    return;
+  }
+
   const closingCashAmount = posShiftDoc.closingAmounts?.find(
     (row) => row.paymentMethod === 'Cash'
   )?.closingAmount as Money;
@@ -229,10 +237,6 @@ export async function transferPOSCashAndWriteOff(
     credit: closingCashAmount,
   });
 
-  const differenceAmount = posShiftDoc?.closingAmounts?.find(
-    (row) => row.paymentMethod === 'Cash'
-  )?.differenceAmount as Money;
-
   if (differenceAmount.isNegative()) {
     await jvDoc.append('accounts', {
       account: AccountTypeEnum.Cash,