@feedmepos/mf-order-setting 0.0.60-prod → 0.0.63-prod

package/dist/package/entity/order-platform/shopeefood/shopeefood-order.dto.d.ts

@@ -1405,6 +1405,124 @@ export declare const SFStoreStatus: z.ZodObject<{
     code: number;
     msg: string;
 }>;
+export declare const SFQueryOrdersDto: z.ZodObject<{
+    store_id: z.ZodString;
+    from_date: z.ZodString;
+    end_date: z.ZodString;
+    order_submission_status: z.ZodOptional<z.ZodNumber>;
+    page_num: z.ZodOptional<z.ZodNumber>;
+}, "strip", z.ZodTypeAny, {
+    order_submission_status?: number | undefined;
+    page_num?: number | undefined;
+    store_id: string;
+    from_date: string;
+    end_date: string;
+}, {
+    order_submission_status?: number | undefined;
+    page_num?: number | undefined;
+    store_id: string;
+    from_date: string;
+    end_date: string;
+}>;
+export declare const SFQueryOrderSummary: z.ZodObject<{
+    vendor_id: z.ZodString;
+    store_id: z.ZodString;
+    order_id: z.ZodString;
+    order_status: z.ZodString;
+    order_submit_time: z.ZodString;
+    order_submission_sync_status: z.ZodNumber;
+}, "strip", z.ZodTypeAny, {
+    order_id: string;
+    store_id: string;
+    vendor_id: string;
+    order_status: string;
+    order_submit_time: string;
+    order_submission_sync_status: number;
+}, {
+    order_id: string;
+    store_id: string;
+    vendor_id: string;
+    order_status: string;
+    order_submit_time: string;
+    order_submission_sync_status: number;
+}>;
+export declare const SFQueryOrdersRes: z.ZodObject<{
+    code: z.ZodNumber;
+    msg: z.ZodString;
+    data: z.ZodObject<{
+        orders: z.ZodArray<z.ZodObject<{
+            vendor_id: z.ZodString;
+            store_id: z.ZodString;
+            order_id: z.ZodString;
+            order_status: z.ZodString;
+            order_submit_time: z.ZodString;
+            order_submission_sync_status: z.ZodNumber;
+        }, "strip", z.ZodTypeAny, {
+            order_id: string;
+            store_id: string;
+            vendor_id: string;
+            order_status: string;
+            order_submit_time: string;
+            order_submission_sync_status: number;
+        }, {
+            order_id: string;
+            store_id: string;
+            vendor_id: string;
+            order_status: string;
+            order_submit_time: string;
+            order_submission_sync_status: number;
+        }>, "many">;
+        has_more: z.ZodBoolean;
+    }, "strip", z.ZodTypeAny, {
+        orders: {
+            order_id: string;
+            store_id: string;
+            vendor_id: string;
+            order_status: string;
+            order_submit_time: string;
+            order_submission_sync_status: number;
+        }[];
+        has_more: boolean;
+    }, {
+        orders: {
+            order_id: string;
+            store_id: string;
+            vendor_id: string;
+            order_status: string;
+            order_submit_time: string;
+            order_submission_sync_status: number;
+        }[];
+        has_more: boolean;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    data: {
+        orders: {
+            order_id: string;
+            store_id: string;
+            vendor_id: string;
+            order_status: string;
+            order_submit_time: string;
+            order_submission_sync_status: number;
+        }[];
+        has_more: boolean;
+    };
+    code: number;
+    msg: string;
+}, {
+    data: {
+        orders: {
+            order_id: string;
+            store_id: string;
+            vendor_id: string;
+            order_status: string;
+            order_submit_time: string;
+            order_submission_sync_status: number;
+        }[];
+        has_more: boolean;
+    };
+    code: number;
+    msg: string;
+}>;
 export type SFRejectedOrderDto = z.infer<typeof SFRejectedOrderDto>;
 export type SFNotifyMenuRes = z.infer<typeof SFNotifyMenuRes>;
 export type SFGetOrderDto = z.infer<typeof SFGetOrderDto>;
@@ -1414,3 +1532,5 @@ export type SFLoginRes = z.infer<typeof SFLoginRes>;
 export type SFLoginReq = z.infer<typeof SFLoginReq>;
 export type SFGetOrderRes = z.infer<typeof SFGetOrderRes>;
 export type SFStoreStatus = z.infer<typeof SFStoreStatus>;
+export type SFQueryOrdersDto = z.infer<typeof SFQueryOrdersDto>;
+export type SFQueryOrdersRes = z.infer<typeof SFQueryOrdersRes>;

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

@@ -3867,7 +3867,6 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 target: "PAYMENT";
             };
             success: boolean;
-            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
             adjustment: {
                 inclusive?: boolean | null | undefined;
                 type: "BY_PERCENTAGE" | "BY_AMOUNT" | "TO_AMOUNT";
@@ -3877,6 +3876,7 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 };
             };
             referenceId: string;
+            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
         }, {
             reason?: string | null | undefined;
             priority?: number | null | undefined;
@@ -3958,7 +3958,6 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 target: "PAYMENT";
             };
             success: boolean;
-            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
             adjustment: {
                 inclusive?: boolean | null | undefined;
                 type: "BY_PERCENTAGE" | "BY_AMOUNT" | "TO_AMOUNT";
@@ -3968,6 +3967,7 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 };
             };
             referenceId: string;
+            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
         }>>, "many">>;
         option: z.ZodDiscriminatedUnion<"type", z.Primitive, z.ZodObject<z.extendShape<{
             type: z.ZodEnum<["DINE_IN", "PICKUP", "DELIVERY"]>;
@@ -6079,7 +6079,6 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 target: "PAYMENT";
             };
             success: boolean;
-            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
             adjustment: {
                 inclusive?: boolean | null | undefined;
                 type: "BY_PERCENTAGE" | "BY_AMOUNT" | "TO_AMOUNT";
@@ -6089,6 +6088,7 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 };
             };
             referenceId: string;
+            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
         })[];
         orderAt: string;
     }, {
@@ -6382,7 +6382,6 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 target: "PAYMENT";
             };
             success: boolean;
-            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
             adjustment: {
                 inclusive?: boolean | null | undefined;
                 type: "BY_PERCENTAGE" | "BY_AMOUNT" | "TO_AMOUNT";
@@ -6392,6 +6391,7 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 };
             };
             referenceId: string;
+            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
         })[] | undefined;
         option: {
             remark?: string | null | undefined;
@@ -7471,7 +7471,6 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 target: "PAYMENT";
             };
             success: boolean;
-            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
             adjustment: {
                 inclusive?: boolean | null | undefined;
                 type: "BY_PERCENTAGE" | "BY_AMOUNT" | "TO_AMOUNT";
@@ -7481,6 +7480,7 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 };
             };
             referenceId: string;
+            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
         })[];
         orderAt: string;
     } | null | undefined;
@@ -7910,7 +7910,6 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 target: "PAYMENT";
             };
             success: boolean;
-            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
             adjustment: {
                 inclusive?: boolean | null | undefined;
                 type: "BY_PERCENTAGE" | "BY_AMOUNT" | "TO_AMOUNT";
@@ -7920,6 +7919,7 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 };
             };
             referenceId: string;
+            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
         })[] | undefined;
         option: {
             remark?: string | null | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feedmepos/mf-order-setting",
-  "version": "0.0.60-prod",
+  "version": "0.0.63-prod",
   "type": "module",
   "module": "./dist/app.js",
   "license": "UNLICENSED",
@@ -28,7 +28,8 @@
     "format": "prettier --write src/"
   },
   "dependencies": {
-    "@feedmepos/core": "^2.14.60",
+    "@feedmepos/core": "^2.15.12",
+    "@feedmepos/zod-common": "^1.0.6",
     "@feedmepos/menu": "^1.7.32",
     "@feedmepos/mf-common": "1.20.0-beta.2",
     "@feedmepos/ordering": "^0.0.3",

package/src/views/order-settings/delivery/DeliverySetting.vue

@@ -444,7 +444,7 @@ async function updateExternalDelivery({ key, setting }: IntegratedDeliveryRow) {
   }
 }
 
-const { startAsyncCallWithErr, isLoading } = useLoading()
+const { startAsyncCallWithErr, isLoading, startLoading } = useLoading()
 const columns: ColumnDef<any>[] = [
   {
     accessorKey: 'name',
@@ -1076,6 +1076,7 @@ watch(
   () => currentRestaurant.value,
   async (newRestaurant) => {
     if (newRestaurant) {
+      startLoading()
       await readData()
       // Check if FeedMe Express deprecation notice should be shown
       checkAndShowDeprecationNotice()

package/src/views/order-settings/delivery/inhouse/CurrencyInput.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { type PropType, computed, ref } from 'vue'
-import { Dinero } from '@feedmepos/core'
-import { FdoDinero } from '@feedmepos/core/entity'
-import { useAppStore } from '@/stores/app'
+import { Country, Dinero } from '@feedmepos/core'
+import { F_COUNTRY, type FCurrency, type FdoCountry, FdoDinero } from '@feedmepos/core/entity'
+import { useCoreStore } from '@feedmepos/mf-common'
 
 
 const props = defineProps({
@@ -29,8 +29,9 @@ const value = computed<number | null>(() => {
 function input(v: any) {
   let value = parseFloat((v || '').toString())
   value = Number.isNaN(value) ? 0 : value
-  const currencyCode = useAppStore().country.currency.code
-  emits('update:model-value', { ...Dinero.fromNumber({ number: value }).toObject(), currency: currencyCode } as FdoDinero)
+  const countryCode = (useCoreStore().currentCountry.value || F_COUNTRY.enum.MY) as F_COUNTRY
+  const currencyCode = (Country.getCountry(countryCode) as FdoCountry).currency.code as FCurrency
+  emits('update:model-value', { ...Dinero.fromNumber({ number: value }).toObject(), currency: currencyCode })
 }
 </script>
 

package/src/views/order-settings/delivery/inhouse/ZoneDialog.vue

@@ -3,10 +3,10 @@ import GoogleMap from '@/components/GoogleMap.vue'
 import type { InputModel, MapCoordinate, MapPolygon } from '@/components/type'
 import { arrayToCoordinate, coordinates, coordinateToArray, generateAreaPaths, getDefaultCoordinates } from '@/helpers/map'
 import { clone } from '@/helpers/object'
-import { Dinero } from '@feedmepos/core'
-import type { FdoDeliveryArea, FdoDinero } from '@feedmepos/core/entity'
-import { useAppStore } from '@/stores/app'
+import { Country, Dinero } from '@feedmepos/core'
+import { F_COUNTRY, type FCurrency, type FdoCountry, type FdoDeliveryArea, type FdoDinero } from '@feedmepos/core/entity'
 import { ref, reactive, type PropType, computed, onMounted, watch } from 'vue'
+import { useCoreStore } from '@feedmepos/mf-common'
 import CurrencyInput from './CurrencyInput.vue'
 import { useI18n } from '@feedmepos/mf-common'
 
@@ -16,7 +16,11 @@ const emits = defineEmits<{
   (e: 'update:model-value', value: FdoDeliveryArea): void
 }>()
 
-const zeroDineroObject = computed(() => ({ ...Dinero.zero().toObject(), currency: useAppStore().country.currency.code }) as FdoDinero)
+const zeroDineroObject = computed(() => {
+  const countryCode = (useCoreStore().currentCountry.value || F_COUNTRY.enum.MY) as F_COUNTRY
+  const country = Country.getCountry(countryCode) as FdoCountry
+  return { ...Dinero.zero().toObject(), currency: country.currency.code as FCurrency }
+})
 
 const props = defineProps({
   initialValue: {

package/src/views/order-settings/dine-in/DineInSetting.vue

@@ -132,14 +132,12 @@ import { useSnackbarFunctions } from '@/components/snackbar'
 const { t } = useI18n()
 
 const { currentRestaurant } = useCoreStore()
+const restaurantStore = useRestaurantStore()
 const dineInSetting = ref<FdoRestaurantDineIn>(initDineInSetting())
 const orderSetting = ref<OrderSettingsDto | undefined>(undefined)
 const lastOrderBeforeCloseEnable = ref<boolean>(false)
 
-const allowEPayment = computed(() => {
-  const paymentTypes = dineInSetting.value.paymentTypes || []
-  return paymentTypes.includes(F_ORDER_PAYMENT_TYPE.enum.ePayment)
-})
+const allowEPayment = computed(() => restaurantStore.getRestaurantEPayment() === true)
 
 const lastOrderSettingRules = computed(() => {
   return [
@@ -233,8 +231,7 @@ async function orderSettingInit() {
 }
 
 const { showSuccess, showError } = useSnackbarFunctions()
-const restaurantStore = useRestaurantStore()
-const { startAsyncCallWithErr, isLoading } = useLoading()
+const { startAsyncCallWithErr, isLoading, startLoading } = useLoading()
 async function updateDineInSetting() {
   if (!isDineInsettingValid.value) {
     showError(errors.value)
@@ -268,6 +265,7 @@ async function readOrderSetting(): Promise<OrderSettingsDto> {
 watch(
   () => currentRestaurant.value,
   async (newRestaurant) => {
+    startLoading()
     if (newRestaurant?.dineIn) {
       dineInSetting.value = utils.clone(newRestaurant.dineIn)
     }

package/src/views/order-settings/dine-in/PaymentType.vue

@@ -54,10 +54,11 @@ const allowEPayment = computed(() => {
   return paymentTypes.includes(F_ORDER_PAYMENT_TYPE.enum.ePayment)
 })
 
-const allowCreditPayment = computed(() => {
-  const paymentTypes = props.paymentTypes || []
-  return paymentTypes.includes(F_ORDER_PAYMENT_TYPE.enum.credit)
-})
+// TODO: credit payment - not ready for production yet
+// const allowCreditPayment = computed(() => {
+//   const paymentTypes = props.paymentTypes || []
+//   return paymentTypes.includes(F_ORDER_PAYMENT_TYPE.enum.credit)
+// })
 
 const allowOfflinePayment = computed(() => {
   const paymentTypes = props.paymentTypes || []
@@ -72,8 +73,8 @@ const nestedVal = ref<string[]>([])
 const checkboxChildren = computed(() => {
   const options = [
     { label: t('order.offlinePayment'), value: 'offline' },
-    { 
-      label: t('order.ePayment'), 
+    {
+      label: t('order.ePayment'),
       value: 'e-payment',
       disable: !props.allowEPayment,
       suffix: !props.allowEPayment && props.showDisabledOptions
@@ -83,17 +84,18 @@ const checkboxChildren = computed(() => {
           }
         : undefined
     },
-    { 
-      label: t('order.credit'), 
-      value: 'credit',
-      disable: !props.allowCredit,
-      suffix: !props.allowCredit && props.showDisabledOptions
-        ? {
-            text: `(${props.disabledSuffixes['credit'] || t('order.notAllowed')})`,
-            class: 'text-negative t-system'
-          }
-        : undefined
-    }
+    // TODO: credit payment - not ready for production yet
+    // {
+    //   label: t('order.credit'),
+    //   value: 'credit',
+    //   disable: !props.allowCredit,
+    //   suffix: !props.allowCredit && props.showDisabledOptions
+    //     ? {
+    //         text: `(${props.disabledSuffixes['credit'] || t('order.notAllowed')})`,
+    //         class: 'text-negative t-system'
+    //       }
+    //     : undefined
+    // }
   ]
   return options
 })
@@ -102,7 +104,8 @@ const initializeCheckboxes = () => {
   const initialValues: string[] = []
   if (allowOfflinePayment.value) initialValues.push('offline')
   if (allowEPayment.value) initialValues.push('e-payment')
-  if (allowCreditPayment.value) initialValues.push('credit')
+  // TODO: credit payment - not ready for production yet
+  // if (allowCreditPayment.value) initialValues.push('credit')
   nestedVal.value = initialValues
 
   let availableOptionsCount = 0
@@ -254,12 +257,14 @@ onMounted(() => {
     <div v-if="nestedVal.includes('e-payment')" class="ml-7">
       <slot name="e-payment-content"></slot>
     </div>
-      
-    <FmCheckbox v-if="allowCredit || showDisabledOptions" v-model="nestedVal" :label="checkboxChildren[2].label" :value="checkboxChildren[2].value"
+
+    <!-- TODO: credit payment - not ready for production yet -->
+    <!-- <FmCheckbox v-if="allowCredit || showDisabledOptions" v-model="nestedVal" :label="checkboxChildren[2].label" :value="checkboxChildren[2].value"
       @update:model-value="handleChildUpdate" :disabled="checkboxChildren[2].disable" />
-      
+
     <div class="text-fm-color-secondary-salmon fm-typo-en-body-sm-600 ml-7" v-if="checkboxChildren[2].suffix">
         {{ checkboxChildren?.[2]?.suffix?.text }}
-    </div>
+    </div> -->
+
    </div>
 </template>

package/src/views/order-settings/general/GeneralSetting.vue

@@ -104,7 +104,7 @@ function getSequenceSettingRules(digit?: number | null) {
 
 const { showSuccess, showError } = useSnackbarFunctions()
 const { currentRestaurant } = useCoreStore()
-const { startAsyncCallWithErr, isLoading } = useLoading()
+const { startAsyncCallWithErr, isLoading, startLoading } = useLoading()
 
 const orderSetting = ref<OrderSettingsDto | undefined>(undefined)
 const v3Settings = ref<OrderV3Settings | undefined>(undefined)
@@ -241,6 +241,7 @@ onMounted(() => init())
 watch(
   () => currentRestaurant.value,
   () => {
+    startLoading()
     init()
   },
   { immediate: true }

package/src/views/order-settings/queue/QueueSetting.vue

@@ -19,7 +19,7 @@ import PresetRemarksSheet from './PresetRemarksSheet.vue'
 const { t } = useI18n()
 const { showSuccess } = useSnackbarFunctions()
 const { currentRestaurant } = useCoreStore()
-const { isLoading, startAsyncCallWithErr } = useLoading()
+const { isLoading, startAsyncCallWithErr, startLoading } = useLoading()
 
 const orderSettingDefault = ref<FdoOrderSettings | undefined>(undefined)
 const queueSettings = ref<FdoOrderQueueSettings>({ ...defaultQueueSetting })
@@ -35,6 +35,7 @@ onMounted(() => {
 watch(
   () => currentRestaurant.value,
   () => {
+    startLoading()
     init()
   },
   { immediate: true }

package/src/views/order-settings/sms/SmsSetting.vue

@@ -22,7 +22,7 @@ import { SMS } from '@common'
 
 const { showSuccess, showError } = useSnackbarFunctions()
 const { currentRestaurant } = useCoreStore()
-const { isLoading, startAsyncCallWithErr } = useLoading()
+const { isLoading, startAsyncCallWithErr, startLoading } = useLoading()
 
 const orderSettingDefault = ref<OrderSettingsDto | undefined>(undefined)
 
@@ -38,6 +38,7 @@ onMounted(() => {
 watch(
   () => currentRestaurant.value,
   () => {
+    startLoading()
     init()
   },
   { immediate: true }