fix: added closingAmounts in posShift

models/inventory/Point of Sale/ClosingAmounts.ts

@@ -3,10 +3,11 @@ import { FormulaMap } from 'fyo/model/types';
 import { Money } from 'pesa';
 
 export class ClosingAmounts extends Doc {
-  openingAmount?: Money;
   closingAmount?: Money;
-  expectedAmount?: Money;
   differenceAmount?: Money;
+  expectedAmount?: Money;
+  openingAmount?: Money;
+  paymentMethod?: string;
 
   formulas: FormulaMap = {
     differenceAmount: {

models/inventory/Point of Sale/POSShift.ts

@@ -5,13 +5,13 @@ import { OpeningAmounts } from './OpeningAmounts';
 import { OpeningCash } from './OpeningCash';
 
 export class POSShift extends Doc {
-  isShiftOpen?: boolean;
-  openingDate?: Date;
-  closingDate?: Date;
-  openingAmounts?: OpeningAmounts[];
   closingAmounts?: ClosingAmounts[];
-  openingCash?: OpeningCash[];
   closingCash?: ClosingCash[];
+  closingDate?: Date;
+  isShiftOpen?: boolean;
+  openingAmounts?: OpeningAmounts[];
+  openingCash?: OpeningCash[];
+  openingDate?: Date;
 
   get openingCashAmount() {
     if (!this.openingCash) {
@@ -30,6 +30,23 @@ export class POSShift extends Doc {
     return openingAmount;
   }
 
+  get closingCashAmount() {
+    if (!this.closingCash) {
+      return this.fyo.pesa(0);
+    }
+
+    let closingAmount = this.fyo.pesa(0);
+
+    this.closingCash.map((row: ClosingCash) => {
+      const denomination = row.denomination ?? this.fyo.pesa(0);
+      const count = row.count ?? 0;
+
+      const amount = denomination.mul(count);
+      closingAmount = closingAmount.add(amount);
+    });
+    return closingAmount;
+  }
+
   get openingTransferAmount() {
     if (!this.openingAmounts) {
       return this.fyo.pesa(0);

schemas/app/inventory/Point of Sale/POSShift.json

@@ -33,6 +33,11 @@
       "fieldname": "openingAmounts",
       "fieldtype": "Table",
       "target": "OpeningAmounts"
+    },
+    {
+      "fieldname": "closingAmounts",
+      "fieldtype": "Table",
+      "target": "ClosingAmounts"
     }
   ]
 }