refactor: pos shift opening and closing

fyo/model/types.ts

@@ -11,7 +11,8 @@ import type { PrintSettings } from 'models/baseModels/PrintSettings/PrintSetting
 import type { InventorySettings } from 'models/inventory/InventorySettings';
 import type { Misc } from 'models/baseModels/Misc';
 import type { POSSettings } from 'models/inventory/Point of Sale/POSSettings';
-import type { POSShift } from 'models/inventory/Point of Sale/POSShift';
+import type { POSOpeningShift } from 'models/inventory/Point of Sale/POSOpeningShift';
+import type { POSClosingShift } from 'models/inventory/Point of Sale/POSClosingShift';
 
 /**
  * The functions below are used for dynamic evaluation
@@ -57,7 +58,8 @@ export interface SinglesMap {
   AccountingSettings?: AccountingSettings;
   InventorySettings?: InventorySettings;
   POSSettings?: POSSettings;
-  POSShift?: POSShift;
+  POSOpeningShift?: POSOpeningShift;
+  POSClosingShift?: POSClosingShift;
   PrintSettings?: PrintSettings;
   Defaults?: Defaults;
   Misc?: Misc;

models/index.ts

@@ -48,7 +48,8 @@ import { ClosingCash } from './inventory/Point of Sale/ClosingCash';
 import { OpeningAmounts } from './inventory/Point of Sale/OpeningAmounts';
 import { OpeningCash } from './inventory/Point of Sale/OpeningCash';
 import { POSSettings } from './inventory/Point of Sale/POSSettings';
-import { POSShift } from './inventory/Point of Sale/POSShift';
+import { POSOpeningShift } from './inventory/Point of Sale/POSOpeningShift';
+import { POSClosingShift } from './inventory/Point of Sale/POSClosingShift';
 
 export const models = {
   Account,
@@ -102,7 +103,8 @@ export const models = {
   OpeningAmounts,
   OpeningCash,
   POSSettings,
-  POSShift,
+  POSOpeningShift,
+  POSClosingShift,
 } as ModelMap;
 
 export async function getRegionalModels(

models/inventory/InventorySettings.ts

@@ -46,7 +46,7 @@ export class InventorySettings extends Doc {
       return !!this.enableStockReturns;
     },
     enablePointOfSale: () => {
-      return !!this.fyo.singles.POSShift?.isShiftOpen;
+      return !!this.fyo.singles.POSSettings?.isShiftOpen;
     },
   };
 }

models/inventory/Point of Sale/POSClosingShift.ts

@@ -0,0 +1,33 @@
+import { ListViewSettings } from 'fyo/model/types';
+import { ClosingAmounts } from './ClosingAmounts';
+import { ClosingCash } from './ClosingCash';
+import { Doc } from 'fyo/model/doc';
+
+export class POSClosingShift extends Doc {
+  closingAmounts?: ClosingAmounts[];
+  closingCash?: ClosingCash[];
+  closingDate?: Date;
+
+  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;
+  }
+
+  static getListViewSettings(): ListViewSettings {
+    return {
+      columns: ['name', 'closingDate'],
+    };
+  }
+}

models/inventory/Point of Sale/POSShift.ts → models/inventory/Point of Sale/POSOpeningShift.ts

@@ -1,14 +1,9 @@
-import { ClosingAmounts } from './ClosingAmounts';
-import { ClosingCash } from './ClosingCash';
 import { Doc } from 'fyo/model/doc';
 import { OpeningAmounts } from './OpeningAmounts';
 import { OpeningCash } from './OpeningCash';
+import { ListViewSettings } from 'fyo/model/types';
 
-export class POSShift extends Doc {
-  closingAmounts?: ClosingAmounts[];
-  closingCash?: ClosingCash[];
-  closingDate?: Date;
-  isShiftOpen?: boolean;
+export class POSOpeningShift extends Doc {
   openingAmounts?: OpeningAmounts[];
   openingCash?: OpeningCash[];
   openingDate?: Date;
@@ -30,23 +25,6 @@ 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);
@@ -58,4 +36,10 @@ export class POSShift extends Doc {
 
     return transferAmountRow.amount ?? this.fyo.pesa(0);
   }
+
+  static getListViewSettings(): ListViewSettings {
+    return {
+      columns: ['name', 'openingDate'],
+    };
+  }
 }

models/inventory/Point of Sale/POSSettings.ts

@@ -6,6 +6,7 @@ import {
 } from 'models/baseModels/Account/types';
 
 export class POSSettings extends Doc {
+  isShiftOpen?: boolean;
   inventory?: string;
   cashAccount?: string;
   writeOffAccount?: string;

models/types.ts

@@ -59,7 +59,12 @@ export enum ModelNameEnum {
   CustomForm = 'CustomForm',
   CustomField = 'CustomField',
   POSSettings = 'POSSettings',
-  POSShift = 'POSShift'
+  POSOpeningShift = 'POSOpeningShift',
+  POSClosingShift = 'POSClosingShift',
+
+  ERPNextSyncSettings= 'ERPNextSyncSettings',
+  ERPNextSyncQueue = 'ERPNextSyncQueue',
+  FetchFromERPNextQueue = 'FetchFromERPNextQueue',
 }
 
 export type ModelName = keyof typeof ModelNameEnum;

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

@@ -0,0 +1,24 @@
+{
+  "name": "POSClosingShift",
+  "label": "POS Closing Shift",
+  "naming": "random",
+  "fields": [
+    {
+      "fieldname": "closingDate",
+      "label": "Closing Date",
+      "fieldtype": "Datetime"
+    },
+    {
+      "fieldname": "closingCash",
+      "fieldtype": "Table",
+      "label": "Closing Cash",
+      "target": "ClosingCash"
+    },
+    {
+      "fieldname": "closingAmounts",
+      "fieldtype": "Table",
+      "label": "Closing Amounts",
+      "target": "ClosingAmounts"
+    }
+  ]
+}

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

@@ -0,0 +1,24 @@
+{
+  "name": "POSOpeningShift",
+  "label": "POS Opening Shift",
+  "naming": "random",
+  "fields": [
+    {
+      "fieldname": "openingDate",
+      "label": "Opening Date",
+      "fieldtype": "Datetime"
+    },
+    {
+      "fieldname": "openingCash",
+      "fieldtype": "Table",
+      "label": "Opening Cash",
+      "target": "OpeningCash"
+    },
+    {
+      "fieldname": "openingAmounts",
+      "fieldtype": "Table",
+      "label": "Opening Amounts",
+      "target": "OpeningAmounts"
+    }
+  ]
+}

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

@@ -4,6 +4,13 @@
   "isSingle": true,
   "isChild": false,
   "fields": [
+    {
+      "fieldname": "isShiftOpen",
+      "label": "Is POS Shift Open",
+      "fieldtype": "Check",
+      "default": false,
+      "hidden": false
+    },
     {
       "fieldname": "inventory",
       "label": "Inventory",

schemas/schemas.ts

@@ -70,7 +70,8 @@ import DefaultCashDenominations from './app/inventory/Point of Sale/DefaultCashD
 import OpeningAmounts from './app/inventory/Point of Sale/OpeningAmounts.json';
 import OpeningCash from './app/inventory/Point of Sale/OpeningCash.json';
 import POSSettings from './app/inventory/Point of Sale/POSSettings.json';
-import POSShift from './app/inventory/Point of Sale/POSShift.json';
+import POSOpeningShift from './app/inventory/Point of Sale/POSOpeningShift.json';
+import POSClosingShift from './app/inventory/Point of Sale/POSClosingShift.json';
 import POSShiftAmounts from './app/inventory/Point of Sale/POSShiftAmounts.json';
 import { Schema, SchemaStub } from './types';
 
@@ -170,6 +171,7 @@ export const appSchemas: Schema[] | SchemaStub[] = [
   OpeningAmounts as Schema,
   OpeningCash as Schema,
   POSSettings as Schema,
-  POSShift as Schema,
+  POSOpeningShift as Schema,
+  POSClosingShift as Schema,
   POSShiftAmounts as Schema,
 ];