@feedmepos/mf-order-setting 0.0.72-test.1 → 0.0.73-dev

package/dist/package/entity/restaurant/restaurant.dto.d.ts

@@ -475,6 +475,7 @@ export declare const RestaurantCustomerV2Dto: z.ZodObject<{
         regNo: string;
     }>;
     posHeartbeat: z.ZodNullable<z.ZodOptional<z.ZodString>>;
+    posVersion: z.ZodNullable<z.ZodOptional<z.ZodString>>;
     paxDialog: z.ZodBoolean;
     acceptDineIn: z.ZodBoolean;
     acceptDelivery: z.ZodBoolean;
@@ -1636,6 +1637,7 @@ export declare const RestaurantCustomerV2Dto: z.ZodObject<{
         catalogId?: string | null | undefined;
     } | null | undefined;
     posHeartbeat?: string | null | undefined;
+    posVersion?: string | null | undefined;
     acceptQueue?: boolean | null | undefined;
     inHouseDelivery?: {
         taxes?: Record<string, {
@@ -1924,6 +1926,7 @@ export declare const RestaurantCustomerV2Dto: z.ZodObject<{
         catalogId?: string | null | undefined;
     } | null | undefined;
     posHeartbeat?: string | null | undefined;
+    posVersion?: string | null | undefined;
     acceptQueue?: boolean | null | undefined;
     inHouseDelivery?: {
         taxes?: Record<string, {
@@ -3209,8 +3212,10 @@ export declare const KioskPricingContextDto: z.ZodObject<{
                     };
                 }>, "many">;
                 beforeDiscount: z.ZodNullable<z.ZodOptional<z.ZodBoolean>>;
+                discretionary: z.ZodNullable<z.ZodOptional<z.ZodBoolean>>;
             }, "strip", z.ZodTypeAny, {
                 beforeDiscount?: boolean | null | undefined;
+                discretionary?: boolean | null | undefined;
                 active: boolean;
                 inclusive: boolean;
                 rate: {
@@ -3231,6 +3236,7 @@ export declare const KioskPricingContextDto: z.ZodObject<{
                 }[];
             }, {
                 beforeDiscount?: boolean | null | undefined;
+                discretionary?: boolean | null | undefined;
                 active: boolean;
                 inclusive: boolean;
                 rate: {
@@ -3253,6 +3259,7 @@ export declare const KioskPricingContextDto: z.ZodObject<{
         }, "strip", z.ZodTypeAny, {
             serviceChargeSetting?: {
                 beforeDiscount?: boolean | null | undefined;
+                discretionary?: boolean | null | undefined;
                 active: boolean;
                 inclusive: boolean;
                 rate: {
@@ -3276,6 +3283,7 @@ export declare const KioskPricingContextDto: z.ZodObject<{
         }, {
             serviceChargeSetting?: {
                 beforeDiscount?: boolean | null | undefined;
+                discretionary?: boolean | null | undefined;
                 active: boolean;
                 inclusive: boolean;
                 rate: {
@@ -3301,6 +3309,7 @@ export declare const KioskPricingContextDto: z.ZodObject<{
         v4Setting?: {
             serviceChargeSetting?: {
                 beforeDiscount?: boolean | null | undefined;
+                discretionary?: boolean | null | undefined;
                 active: boolean;
                 inclusive: boolean;
                 rate: {
@@ -3345,6 +3354,7 @@ export declare const KioskPricingContextDto: z.ZodObject<{
         v4Setting?: {
             serviceChargeSetting?: {
                 beforeDiscount?: boolean | null | undefined;
+                discretionary?: boolean | null | undefined;
                 active: boolean;
                 inclusive: boolean;
                 rate: {
@@ -3409,6 +3419,7 @@ export declare const KioskPricingContextDto: z.ZodObject<{
         v4Setting?: {
             serviceChargeSetting?: {
                 beforeDiscount?: boolean | null | undefined;
+                discretionary?: boolean | null | undefined;
                 active: boolean;
                 inclusive: boolean;
                 rate: {
@@ -3463,6 +3474,7 @@ export declare const KioskPricingContextDto: z.ZodObject<{
         v4Setting?: {
             serviceChargeSetting?: {
                 beforeDiscount?: boolean | null | undefined;
+                discretionary?: boolean | null | undefined;
                 active: boolean;
                 inclusive: boolean;
                 rate: {
@@ -4343,13 +4355,13 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
                 enablePaxDialog: boolean | null;
             } | null | undefined;
         } | null | undefined;
-        canTakeaway?: boolean | null | undefined;
         takeaway?: {
             submitOrderInstruction?: {
                 payAtCounter?: Record<string, string> | null | undefined;
                 paid?: Record<string, string> | null | undefined;
             } | null | undefined;
         } | null | undefined;
+        canTakeaway?: boolean | null | undefined;
         paymentSetting?: {
             paymentTypes?: ("cash" | "ePayment" | "ePaymentNonPayout" | "credit" | "ePaymentSandbox")[] | null | undefined;
             offlinePaymentTypes?: {
@@ -4402,13 +4414,13 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
                 padDigit: number;
             } | null | undefined;
         } | null | undefined;
-        canTakeaway?: boolean | null | undefined;
         takeaway?: {
             submitOrderInstruction?: {
                 payAtCounter?: Record<string, string> | null | undefined;
                 paid?: Record<string, string> | null | undefined;
             } | null | undefined;
         } | null | undefined;
+        canTakeaway?: boolean | null | undefined;
         paymentSetting?: {
             paymentTypes?: ("cash" | "ePayment" | "ePaymentNonPayout" | "credit" | "ePaymentSandbox")[] | null | undefined;
             offlinePaymentTypes?: {
@@ -5042,8 +5054,10 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
                         };
                     }>, "many">;
                     beforeDiscount: z.ZodNullable<z.ZodOptional<z.ZodBoolean>>;
+                    discretionary: z.ZodNullable<z.ZodOptional<z.ZodBoolean>>;
                 }, "strip", z.ZodTypeAny, {
                     beforeDiscount?: boolean | null | undefined;
+                    discretionary?: boolean | null | undefined;
                     active: boolean;
                     inclusive: boolean;
                     rate: {
@@ -5064,6 +5078,7 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
                     }[];
                 }, {
                     beforeDiscount?: boolean | null | undefined;
+                    discretionary?: boolean | null | undefined;
                     active: boolean;
                     inclusive: boolean;
                     rate: {
@@ -5086,6 +5101,7 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
             }, "strip", z.ZodTypeAny, {
                 serviceChargeSetting?: {
                     beforeDiscount?: boolean | null | undefined;
+                    discretionary?: boolean | null | undefined;
                     active: boolean;
                     inclusive: boolean;
                     rate: {
@@ -5109,6 +5125,7 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
             }, {
                 serviceChargeSetting?: {
                     beforeDiscount?: boolean | null | undefined;
+                    discretionary?: boolean | null | undefined;
                     active: boolean;
                     inclusive: boolean;
                     rate: {
@@ -5134,6 +5151,7 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
             v4Setting?: {
                 serviceChargeSetting?: {
                     beforeDiscount?: boolean | null | undefined;
+                    discretionary?: boolean | null | undefined;
                     active: boolean;
                     inclusive: boolean;
                     rate: {
@@ -5178,6 +5196,7 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
             v4Setting?: {
                 serviceChargeSetting?: {
                     beforeDiscount?: boolean | null | undefined;
+                    discretionary?: boolean | null | undefined;
                     active: boolean;
                     inclusive: boolean;
                     rate: {
@@ -5242,6 +5261,7 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
             v4Setting?: {
                 serviceChargeSetting?: {
                     beforeDiscount?: boolean | null | undefined;
+                    discretionary?: boolean | null | undefined;
                     active: boolean;
                     inclusive: boolean;
                     rate: {
@@ -5296,6 +5316,7 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
             v4Setting?: {
                 serviceChargeSetting?: {
                     beforeDiscount?: boolean | null | undefined;
+                    discretionary?: boolean | null | undefined;
                     active: boolean;
                     inclusive: boolean;
                     rate: {
@@ -5387,13 +5408,13 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
                 enablePaxDialog: boolean | null;
             } | null | undefined;
         } | null | undefined;
-        canTakeaway?: boolean | null | undefined;
         takeaway?: {
             submitOrderInstruction?: {
                 payAtCounter?: Record<string, string> | null | undefined;
                 paid?: Record<string, string> | null | undefined;
             } | null | undefined;
         } | null | undefined;
+        canTakeaway?: boolean | null | undefined;
         paymentSetting?: {
             paymentTypes?: ("cash" | "ePayment" | "ePaymentNonPayout" | "credit" | "ePaymentSandbox")[] | null | undefined;
             offlinePaymentTypes?: {
@@ -5455,6 +5476,7 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
             v4Setting?: {
                 serviceChargeSetting?: {
                     beforeDiscount?: boolean | null | undefined;
+                    discretionary?: boolean | null | undefined;
                     active: boolean;
                     inclusive: boolean;
                     rate: {
@@ -5720,13 +5742,13 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
                 padDigit: number;
             } | null | undefined;
         } | null | undefined;
-        canTakeaway?: boolean | null | undefined;
         takeaway?: {
             submitOrderInstruction?: {
                 payAtCounter?: Record<string, string> | null | undefined;
                 paid?: Record<string, string> | null | undefined;
             } | null | undefined;
         } | null | undefined;
+        canTakeaway?: boolean | null | undefined;
         paymentSetting?: {
             paymentTypes?: ("cash" | "ePayment" | "ePaymentNonPayout" | "credit" | "ePaymentSandbox")[] | null | undefined;
             offlinePaymentTypes?: {
@@ -5788,6 +5810,7 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
             v4Setting?: {
                 serviceChargeSetting?: {
                     beforeDiscount?: boolean | null | undefined;
+                    discretionary?: boolean | null | undefined;
                     active: boolean;
                     inclusive: boolean;
                     rate: {

package/dist/package/entity/websocket/websocket.dto.d.ts

@@ -517,13 +517,13 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
                 enablePaxDialog: boolean | null;
             } | null | undefined;
         } | null | undefined;
-        canTakeaway?: boolean | null | undefined;
         takeaway?: {
             submitOrderInstruction?: {
                 payAtCounter?: Record<string, string> | null | undefined;
                 paid?: Record<string, string> | null | undefined;
             } | null | undefined;
         } | null | undefined;
+        canTakeaway?: boolean | null | undefined;
         paymentSetting?: {
             paymentTypes?: ("cash" | "ePayment" | "ePaymentNonPayout" | "credit" | "ePaymentSandbox")[] | null | undefined;
             offlinePaymentTypes?: {
@@ -576,13 +576,13 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
                 padDigit: number;
             } | null | undefined;
         } | null | undefined;
-        canTakeaway?: boolean | null | undefined;
         takeaway?: {
             submitOrderInstruction?: {
                 payAtCounter?: Record<string, string> | null | undefined;
                 paid?: Record<string, string> | null | undefined;
             } | null | undefined;
         } | null | undefined;
+        canTakeaway?: boolean | null | undefined;
         paymentSetting?: {
             paymentTypes?: ("cash" | "ePayment" | "ePaymentNonPayout" | "credit" | "ePaymentSandbox")[] | null | undefined;
             offlinePaymentTypes?: {
@@ -637,13 +637,13 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
                 enablePaxDialog: boolean | null;
             } | null | undefined;
         } | null | undefined;
-        canTakeaway?: boolean | null | undefined;
         takeaway?: {
             submitOrderInstruction?: {
                 payAtCounter?: Record<string, string> | null | undefined;
                 paid?: Record<string, string> | null | undefined;
             } | null | undefined;
         } | null | undefined;
+        canTakeaway?: boolean | null | undefined;
         paymentSetting?: {
             paymentTypes?: ("cash" | "ePayment" | "ePaymentNonPayout" | "credit" | "ePaymentSandbox")[] | null | undefined;
             offlinePaymentTypes?: {
@@ -699,13 +699,13 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
                 padDigit: number;
             } | null | undefined;
         } | null | undefined;
-        canTakeaway?: boolean | null | undefined;
         takeaway?: {
             submitOrderInstruction?: {
                 payAtCounter?: Record<string, string> | null | undefined;
                 paid?: Record<string, string> | null | undefined;
             } | null | undefined;
         } | null | undefined;
+        canTakeaway?: boolean | null | undefined;
         paymentSetting?: {
             paymentTypes?: ("cash" | "ePayment" | "ePaymentNonPayout" | "credit" | "ePaymentSandbox")[] | null | undefined;
             offlinePaymentTypes?: {
@@ -1218,13 +1218,13 @@ export declare const WebSocketReqDto: z.ZodObject<{
                     enablePaxDialog: boolean | null;
                 } | null | undefined;
             } | null | undefined;
-            canTakeaway?: boolean | null | undefined;
             takeaway?: {
                 submitOrderInstruction?: {
                     payAtCounter?: Record<string, string> | null | undefined;
                     paid?: Record<string, string> | null | undefined;
                 } | null | undefined;
             } | null | undefined;
+            canTakeaway?: boolean | null | undefined;
             paymentSetting?: {
                 paymentTypes?: ("cash" | "ePayment" | "ePaymentNonPayout" | "credit" | "ePaymentSandbox")[] | null | undefined;
                 offlinePaymentTypes?: {
@@ -1277,13 +1277,13 @@ export declare const WebSocketReqDto: z.ZodObject<{
                     padDigit: number;
                 } | null | undefined;
             } | null | undefined;
-            canTakeaway?: boolean | null | undefined;
             takeaway?: {
                 submitOrderInstruction?: {
                     payAtCounter?: Record<string, string> | null | undefined;
                     paid?: Record<string, string> | null | undefined;
                 } | null | undefined;
             } | null | undefined;
+            canTakeaway?: boolean | null | undefined;
             paymentSetting?: {
                 paymentTypes?: ("cash" | "ePayment" | "ePaymentNonPayout" | "credit" | "ePaymentSandbox")[] | null | undefined;
                 offlinePaymentTypes?: {
@@ -1338,13 +1338,13 @@ export declare const WebSocketReqDto: z.ZodObject<{
                     enablePaxDialog: boolean | null;
                 } | null | undefined;
             } | null | undefined;
-            canTakeaway?: boolean | null | undefined;
             takeaway?: {
                 submitOrderInstruction?: {
                     payAtCounter?: Record<string, string> | null | undefined;
                     paid?: Record<string, string> | null | undefined;
                 } | null | undefined;
             } | null | undefined;
+            canTakeaway?: boolean | null | undefined;
             paymentSetting?: {
                 paymentTypes?: ("cash" | "ePayment" | "ePaymentNonPayout" | "credit" | "ePaymentSandbox")[] | null | undefined;
                 offlinePaymentTypes?: {
@@ -1400,13 +1400,13 @@ export declare const WebSocketReqDto: z.ZodObject<{
                     padDigit: number;
                 } | null | undefined;
             } | null | undefined;
-            canTakeaway?: boolean | null | undefined;
             takeaway?: {
                 submitOrderInstruction?: {
                     payAtCounter?: Record<string, string> | null | undefined;
                     paid?: Record<string, string> | null | undefined;
                 } | null | undefined;
             } | null | undefined;
+            canTakeaway?: boolean | null | undefined;
             paymentSetting?: {
                 paymentTypes?: ("cash" | "ePayment" | "ePaymentNonPayout" | "credit" | "ePaymentSandbox")[] | null | undefined;
                 offlinePaymentTypes?: {
@@ -1510,13 +1510,13 @@ export declare const WebSocketReqDto: z.ZodObject<{
                     enablePaxDialog: boolean | null;
                 } | null | undefined;
             } | null | undefined;
-            canTakeaway?: boolean | null | undefined;
             takeaway?: {
                 submitOrderInstruction?: {
                     payAtCounter?: Record<string, string> | null | undefined;
                     paid?: Record<string, string> | null | undefined;
                 } | null | undefined;
             } | null | undefined;
+            canTakeaway?: boolean | null | undefined;
             paymentSetting?: {
                 paymentTypes?: ("cash" | "ePayment" | "ePaymentNonPayout" | "credit" | "ePaymentSandbox")[] | null | undefined;
                 offlinePaymentTypes?: {
@@ -1621,13 +1621,13 @@ export declare const WebSocketReqDto: z.ZodObject<{
                     padDigit: number;
                 } | null | undefined;
             } | null | undefined;
-            canTakeaway?: boolean | null | undefined;
             takeaway?: {
                 submitOrderInstruction?: {
                     payAtCounter?: Record<string, string> | null | undefined;
                     paid?: Record<string, string> | null | undefined;
                 } | null | undefined;
             } | null | undefined;
+            canTakeaway?: boolean | null | undefined;
             paymentSetting?: {
                 paymentTypes?: ("cash" | "ePayment" | "ePaymentNonPayout" | "credit" | "ePaymentSandbox")[] | null | undefined;
                 offlinePaymentTypes?: {

package/dist/style.css

@@ -0,0 +1 @@
+.tng-setting-sheet[data-v-9b3f97fa] .text-fm-color-neutral-gray-400.fm-typo-cn-body-md-400.mb-5.mt-5{margin-top:0;margin-bottom:0}

package/golar.config.ts

@@ -0,0 +1,20 @@
+import { defineConfig } from 'golar/unstable'
+import '@golar/vue'
+
+export default defineConfig({
+	typecheck: {
+		include: [
+			'./env.d.ts',
+			'./src/**/*.{ts,tsx,vue,d.ts}',
+			'./vite.config.*',
+			'./vitest.config.*',
+			'./cypress.config.*',
+			'./playwright.config.*',
+		],
+		exclude: [
+			'./dist/**',
+			'./coverage/**',
+			'./node_modules/**',
+		],
+	},
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feedmepos/mf-order-setting",
-  "version": "0.0.72-test.1",
+  "version": "0.0.73-dev",
   "type": "module",
   "module": "./dist/app.js",
   "license": "UNLICENSED",
@@ -10,8 +10,10 @@
     }
   },
   "dependencies": {
-    "@feedmepos/core": "^2.15.21",
-    "@feedmepos/menu": "^1.9.6",
+    "@feedmepos/core": "^2.15.31",
+    "@feedmepos/entity": "^0.0.11",
+    "@feedmepos/feature-flag": "^0.0.15",
+    "@feedmepos/menu": "^2.0.3",
     "@feedmepos/mf-common": "1.20.0-beta.2",
     "@feedmepos/ordering": "^0.0.3",
     "@feedmepos/ui-library": "1.5.2-beta.1",
@@ -34,6 +36,8 @@
   },
   "devDependencies": {
     "@babel/types": "^7.24.7",
+    "@golar/vue": "^0.1.5",
+    "golar": "^0.1.5",
     "@rushstack/eslint-patch": "^1.3.3",
     "@tsconfig/node18": "^18.2.2",
     "@types/google.maps": "^3.55.12",
@@ -71,6 +75,8 @@
     "build:prod": "vite build --mode prod",
     "type-check": "set NODE_OPTIONS=--max-old-space-size=16384 && vue-tsc --noEmit -p tsconfig.app.json --composite false",
     "type-check:mac": "export NODE_OPTIONS=--max-old-space-size=16384 && vue-tsc --noEmit -p tsconfig.app.json --composite false",
+    "golar:typecheck": "golar typecheck",
+    "golar:tsc": "golar tsc --noEmit",
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
     "format": "prettier --write src/"
   }

package/src/Entry.vue

@@ -1,24 +1,16 @@
 <script setup lang="ts">
 import { FmNavBar } from '@feedmepos/mf-common'
-import { computed, onMounted } from 'vue'
+import { computed } from 'vue'
 import { useRoute } from 'vue-router'
-import { useIframeStore } from '@/stores/iframe'
 import App from './App.vue'
 
 const route = useRoute()
 const showHeader = computed(() => route.query.showHeader !== 'false')
-const IFrameStore = useIframeStore()
-
-onMounted(async () => {
-  if (IFrameStore.state.isIframe) {
-    parent.postMessage({ event: 'ready' }, '*')
-  }
-})
 </script>
 
 <template>
   <div style="height: 100dvh; width: 100dvw" class="flex flex-col overflow-hidden">
-    <div v-if="!IFrameStore.state.isIframe" style="height: 64px">
+    <div v-if="showHeader" style="height: 64px">
       <FmNavBar />
     </div>
     <App />

package/src/api/menu/index.ts

@@ -1,5 +1,5 @@
 import { getData, menuClientInstance } from '..';
-import { FdoMenuV4 } from '@feedmepos/menu/entity';
+import { FdoMenuV4 } from '@feedmepos/entity';
 
 
 interface MenuV4Doc extends FdoMenuV4{