chore: refactor code

frappe · Oct 30, 2024 · 0320d8c · 0320d8c
1 parent 88c03ee
commit 0320d8c
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 30 deletions.
diff --git a/models/helpers.ts b/models/helpers.ts
@@ -1,37 +1,38 @@
-import { Fyo, t } from 'fyo';
-import { Doc } from 'fyo/model/doc';
+import {
+  AccountRootType,
+  AccountRootTypeEnum,
+} from './baseModels/Account/types';
 import {
   Action,
   ColumnConfig,
   DocStatus,
   LeadStatus,
   RenderData,
 } from 'fyo/model/types';
+import { Fyo, t } from 'fyo';
+import { InvoiceStatus, ModelNameEnum } from './types';
+
+import { ApplicablePricingRules } from './baseModels/Invoice/types';
+import { AppliedCouponCodes } from './baseModels/AppliedCouponCodes/AppliedCouponCodes';
+import { CollectionRulesItems } from './baseModels/CollectionRulesItems/CollectionRulesItems';
+import { CouponCode } from './baseModels/CouponCode/CouponCode';
 import { DateTime } from 'luxon';
-import { Money } from 'pesa';
-import { safeParseFloat } from 'utils/index';
-import { Router } from 'vue-router';
-import {
-  AccountRootType,
-  AccountRootTypeEnum,
-} from './baseModels/Account/types';
-import { numberSeriesDefaultsMap } from './baseModels/Defaults/Defaults';
+import { Doc } from 'fyo/model/doc';
 import { Invoice } from './baseModels/Invoice/Invoice';
-import { SalesQuote } from './baseModels/SalesQuote/SalesQuote';
-import { StockMovement } from './inventory/StockMovement';
-import { StockTransfer } from './inventory/StockTransfer';
-import { InvoiceStatus, ModelNameEnum } from './types';
 import { Lead } from './baseModels/Lead/Lead';
-import { PricingRule } from './baseModels/PricingRule/PricingRule';
-import { ApplicablePricingRules } from './baseModels/Invoice/types';
 import { LoyaltyProgram } from './baseModels/LoyaltyProgram/LoyaltyProgram';
-import { CollectionRulesItems } from './baseModels/CollectionRulesItems/CollectionRulesItems';
-import { isPesa } from 'fyo/utils';
+import { Money } from 'pesa';
 import { Party } from './baseModels/Party/Party';
-import { CouponCode } from './baseModels/CouponCode/CouponCode';
+import { PricingRule } from './baseModels/PricingRule/PricingRule';
+import { Router } from 'vue-router';
 import { SalesInvoice } from './baseModels/SalesInvoice/SalesInvoice';
-import { AppliedCouponCodes } from './baseModels/AppliedCouponCodes/AppliedCouponCodes';
+import { SalesQuote } from './baseModels/SalesQuote/SalesQuote';
+import { StockMovement } from './inventory/StockMovement';
+import { StockTransfer } from './inventory/StockTransfer';
 import { ValidationError } from 'fyo/utils/errors';
+import { isPesa } from 'fyo/utils';
+import { numberSeriesDefaultsMap } from './baseModels/Defaults/Defaults';
+import { safeParseFloat } from 'utils/index';
 
 export function getQuoteActions(
   fyo: Fyo,
@@ -1201,7 +1202,7 @@ export async function updatePricingRule(sinvDoc: SalesInvoice) {
   ).length;
 
   setTimeout(() => {
-    (async () => {
+    void (async () => {
       if (appliedPricingRuleCount !== applicablePricingRuleNames?.length) {
         await sinvDoc.appendPricingRuleDetail(applicablePricingRuleNames);
         await sinvDoc.applyProductDiscount();

diff --git a/schemas/app/inventory/Point of Sale/POSSettings.json b/schemas/app/inventory/Point of Sale/POSSettings.json
@@ -39,14 +39,14 @@
       "options": [
         {
           "value": "Classic",
-          "label": "POS1"
+          "label": "Classic"
         },
         {
           "value": "Modern",
-          "label": "POS2"
+          "label": "Modern"
         }
       ],
-      "default": "POS1",
+      "default": "Classic",
       "required": true,
       "section": "Default"
     }

diff --git a/src/components/POS/types.ts b/src/components/POS/types.ts
@@ -17,7 +17,18 @@ export type ModalName =
   | 'RouteToInvoiceList'
   | 'CouponCode';
 
+export type ModernPosModalName =
+  | 'Keyboard'
+  | 'ShiftOpen'
+  | 'ShiftClose'
+  | 'Payment'
+  | 'LoyaltyProgram'
+  | 'SavedInvoice'
+  | 'RouteToInvoiceList'
+  | 'CouponCode';
+
 export interface POSItem {
+  id?: number;
   image?: string;
   name: string;
   rate: Money;

diff --git a/src/pages/POS/AlertModal.vue b/src/pages/POS/AlertModal.vue
@@ -49,7 +49,7 @@ export default defineComponent({
     Modal,
     Button,
   },
-  emits: ['toggleModal', 'selectedInvoiceName'],
+  emits: ['toggleModal'],
   methods: {
     routeTo,
   },

diff --git a/src/utils/sidebarConfig.ts b/src/utils/sidebarConfig.ts
@@ -102,16 +102,12 @@ function getInventorySidebar(): SidebarRoot[] {
 }
 
 function getPOSSidebar() {
-  const isPOSEnabled = !!fyo.singles.InventorySettings?.enablePointOfSale;
-  if (!isPOSEnabled) {
-    return [];
-  }
-
   return {
     label: t`POS`,
     name: 'pos',
     route: '/pos',
     icon: 'pos',
+    hidden: () => !fyo.singles.InventorySettings?.enablePointOfSale,
   };
 }