@feedmepos/mf-order-setting 0.0.38 → 0.0.44

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

@@ -142,7 +142,7 @@
         :model-value="localDoc"
         :company="selectedLocalRow.doc"
         :catalog-options="menuStore.catalogOptions"
-        @update:model-value="(v: FdoLinkedDelivery | null) => (localDocUpdate = v)"
+        @update:model-value="handleLocalDocUpdate"
       />
       <template #side-sheet-footer>
         <div class="flex gap-8 items-center justify-start">
@@ -174,13 +174,7 @@ import type {
   FdoRestaurantFeedmeDelivery,
   FdoRestaurantInHouseDelivery
 } from '@feedmepos/core/entity'
-import {
-  F_COUNTRY,
-  F_DELIVERY_TYPE,
-  F_FEATURE,
-  F_ORDER_PLATFORM,
-  F_RESTAURANT_FEATURE
-} from '@feedmepos/core/entity'
+import { F_DELIVERY_TYPE, F_ORDER_PLATFORM, F_RESTAURANT_FEATURE } from '@feedmepos/core/entity'
 import { FdoGrabfoodSettings, FdoShopeeFoodSettings } from '@entity'
 import deliveryData from './delivery.data'
 import { useDelivery, type DeliveryCompany, type LinkedDeliveryDoc } from './delivery'
@@ -203,7 +197,6 @@ import { useSnackbarFunctions } from '@/components/snackbar'
 import useSearch from '@/composables/search'
 import DeliveryList from './DeliveryList.vue'
 import DeliverooSetting from './integrated-delivery/DeliverooSetting.vue'
-import { Pos } from '@feedmepos/core'
 import { useI18n, useCoreStore } from '@feedmepos/mf-common'
 
 const { t } = useI18n()
@@ -247,14 +240,13 @@ const sideSheet = ref<boolean>(false)
 const loading = computed(() => {
   return !currentRestaurant.value || loadingDpi.value
 })
-let localDoc: FdoLinkedDelivery | null
-let localDocUpdate: FdoLinkedDelivery | null
 const selectedIntegratedRow = ref<any>(null)
 const sideSheetIntegrated = ref<boolean>(false)
 const selectedLocalRow = ref<any>(null)
 async function toggleLocalSidesheet(rowData: any) {
   selectedLocalRow.value = rowData.original ?? rowData
-  localDoc = getLinkedDeliveryDoc(linkedCompanies.value, selectedLocalRow.value.key) ?? null
+  localDoc.value = getLinkedDeliveryDoc(linkedCompanies.value, selectedLocalRow.value.key) ?? null
+  localDocUpdate.value = localDoc.value
   sideSheet.value = true
 }
 
@@ -465,6 +457,8 @@ const getClassForStatus = (enabled: StatusType): string => {
 }
 
 const model = ref()
+const localDoc = ref<FdoLinkedDelivery | null>(null)
+const localDocUpdate = ref<FdoLinkedDelivery | null>(null)
 
 const capitalizeFirstLetter = (str: string) => str.charAt(0).toUpperCase() + str.slice(1)
 
@@ -530,7 +524,7 @@ const localDeliveryCompanies = computed<DeliveryRow[]>(() => {
       key,
       name,
       paymentType: getPaymentType(payment),
-      status: !!doc ? [`${t('order.active')}`] : [`${t('order.inactive')}`],
+      status: doc ? [`${t('order.active')}`] : [`${t('order.inactive')}`],
       doc: company,
       catalog: getCatalog(doc?.catalogId || null)
     }
@@ -774,7 +768,7 @@ async function updateLocalDeliveryCompany() {
   await updateManualDelivery({
     doc: linkedDoc,
     company: selectedLocalRow.value.doc,
-    data: localDocUpdate
+    data: localDocUpdate.value
   })
   showSuccess(t('order.DeliverySettingUpdated'))
 }
@@ -788,11 +782,11 @@ async function updateManualDelivery({
   company: DeliveryCompany
   data: FdoLinkedDelivery | null
 }) {
-  if (!!data) {
+  if (data) {
     const resp = await createOrUpdateManualDeliveryDoc({ doc, company, data })
 
     if (resp) updateCached(resp)
-  } else if (!!doc) {
+  } else if (doc) {
     await remoteOrderApi.deleteDeliveryCompany(doc)
     deleteCached(doc)
   }
@@ -807,7 +801,7 @@ async function createOrUpdateManualDeliveryDoc({
   company: DeliveryCompany
   data: FdoLinkedDelivery
 }): Promise<LinkedDeliveryDoc | undefined> {
-  const { paymentTypeKey, catalogId, rounding, useCustomOrderNumber } = data
+  const { paymentTypeKey, catalogId, rounding, useCustomOrderNumber, requiredRemark } = data
   let newDoc: LinkedDeliveryDoc
 
   if (doc) {
@@ -816,7 +810,8 @@ async function createOrUpdateManualDeliveryDoc({
       paymentTypeKey,
       catalogId,
       rounding,
-      useCustomOrderNumber
+      useCustomOrderNumber,
+      requiredRemark
     })
   } else {
     newDoc = await remoteOrderApi.createDeliveryCompany({
@@ -824,7 +819,8 @@ async function createOrUpdateManualDeliveryDoc({
       paymentTypeKey,
       catalogId,
       rounding,
-      useCustomOrderNumber
+      useCustomOrderNumber,
+      requiredRemark
     })
   }
 
@@ -839,6 +835,10 @@ function deleteCached(doc: LinkedDeliveryDoc) {
   linkedCompanies.value = remove(linkedCompanies.value, doc, 'key')
 }
 
+function handleLocalDocUpdate(v: FdoLinkedDelivery | null) {
+  localDocUpdate.value = v
+}
+
 function closeLocalDeliverySideSheet() {
   sideSheet.value = false
 }
@@ -875,7 +875,7 @@ async function updateFeedmeExpressSetting() {
       currentRestaurant.value?._id ?? '',
       feedMeDoc.value
     )
-    if (!!currentRestaurant.value?.feedmeDelivery) {
+    if (currentRestaurant.value?.feedmeDelivery) {
       currentRestaurant.value.feedmeDelivery = restaurant.feedmeDelivery
     }
   })
@@ -886,7 +886,7 @@ async function updateInHouseSetting() {
   sideSheetIntegrated.value = false
   await restaurantStore.updateInhouseDelivery(currentRestaurant.value?._id ?? '', inHouseDoc.value)
   const res = (await readRestaurants())?.find((res) => res._id === currentRestaurant.value?._id)
-  if (!!res) {
+  if (res) {
     await changeRestaurant(res)
   }
   showSuccess(t('order.DeliverySettingUpdated'))
@@ -899,7 +899,7 @@ async function updateExternalDeliverySetting() {
     externalDoc.value
   )
   const res = (await readRestaurants())?.find((res) => res._id === currentRestaurant.value?._id)
-  if (!!res) {
+  if (res) {
     await changeRestaurant(res)
   }
   showSuccess(t('order.DeliverySettingUpdated'))

package/src/views/order-settings/delivery/components/ManualIntegratedDeliverySetting.vue

@@ -33,16 +33,18 @@ const emits = defineEmits<{
 const data = ref<LocalDeliverySettingData>(
   props.modelValue
     ? {
+        ...props.modelValue,
         active: !!props.modelValue,
-        catalogId: null,
+        catalogId: props.modelValue.catalogId ?? null,
         rounding: props.modelValue.rounding ?? true,
-        ...props.modelValue
+        requiredRemark: props.modelValue.requiredRemark ?? false
       }
     : {
         ...props.company,
         catalogId: null,
         active: false,
-        rounding: true
+        rounding: true,
+        requiredRemark: false
       }
 )
 
@@ -50,18 +52,21 @@ watch(
   () => props.modelValue,
   (newVal) => {
     if (newVal) {
+      // Create a clean copy to prevent reference sharing
       data.value = {
+        ...newVal,
         active: !!newVal,
-        catalogId: null,
+        catalogId: newVal.catalogId ?? null,
         rounding: newVal.rounding ?? true,
-        ...newVal
+        requiredRemark: newVal.requiredRemark ?? false
       }
     } else {
       data.value = {
         ...props.company,
         catalogId: null,
         active: false,
-        rounding: true
+        rounding: true,
+        requiredRemark: false
       }
     }
   }
@@ -83,7 +88,8 @@ const paymentTypeOptions = computed(() => {
 function emitChange(fn: (oldV: LocalDeliverySettingData) => LocalDeliverySettingData) {
   const newV = fn({ ...data.value })
   data.value = newV
-  emits('update:model-value', newV.active ? newV : null)
+  // Emit a clean copy to prevent reference sharing between component instances
+  emits('update:model-value', newV.active ? { ...newV } : null)
 }
 
 function updateActive(active: boolean) {
@@ -120,6 +126,13 @@ function updateCatalog(catalogId: string | null) {
     catalogId
   }))
 }
+
+function updateRequiredRemark(requiredRemark: boolean) {
+  emitChange((oldV) => ({
+    ...oldV,
+    requiredRemark
+  }))
+}
 </script>
 
 <template>
@@ -170,6 +183,14 @@ function updateCatalog(catalogId: string | null) {
           @update:model-value="updateCustomOrderNumber"
         />
       </div>
+      <div>
+        <FmCheckbox
+          :model-value="data.requiredRemark ?? false"
+          value=""
+          :label="t('order.requiredRemark')"
+          @update:model-value="updateRequiredRemark"
+        />
+      </div>
     </FmCard>
   </div>
 </template>

package/src/views/order-settings/delivery/delivery.ts

@@ -1,4 +1,4 @@
-import { F_PAYMENT_NAME, FdoLinkedDelivery, F_COUNTRY} from "@feedmepos/core/entity";
+import { F_PAYMENT_NAME, FdoLinkedDelivery, F_COUNTRY } from "@feedmepos/core/entity";
 
 export type LinkedDeliveryDoc = FdoLinkedDelivery & { _rev: string };
 
@@ -42,10 +42,11 @@ export function useDelivery() {
   function isIntegratedPlatformSupported(platform: AUTO_INTEGRATION_CLIENT, country?: F_COUNTRY | null): boolean {
     country = country || F_COUNTRY.enum.MY
     const mySupported = [AUTO_INTEGRATION_CLIENT.foodpanda, AUTO_INTEGRATION_CLIENT.grabfood, AUTO_INTEGRATION_CLIENT.shopeefood, AUTO_INTEGRATION_CLIENT.external];
-    const sgSupported = [AUTO_INTEGRATION_CLIENT.foodpanda, AUTO_INTEGRATION_CLIENT.grabfood,  AUTO_INTEGRATION_CLIENT.deliveroo];
-    const thSupported = [AUTO_INTEGRATION_CLIENT.grabfood, AUTO_INTEGRATION_CLIENT.external ];
+    const sgSupported = [AUTO_INTEGRATION_CLIENT.foodpanda, AUTO_INTEGRATION_CLIENT.grabfood, AUTO_INTEGRATION_CLIENT.deliveroo];
+    const thSupported = [AUTO_INTEGRATION_CLIENT.grabfood, AUTO_INTEGRATION_CLIENT.external];
+    const pkSupported = [AUTO_INTEGRATION_CLIENT.foodpanda, AUTO_INTEGRATION_CLIENT.external];
 
-    let supportedPlatforms:AUTO_INTEGRATION_CLIENT[] = [];
+    let supportedPlatforms: AUTO_INTEGRATION_CLIENT[] = [];
     switch (country) {
       case F_COUNTRY.enum.MY:
         supportedPlatforms = mySupported
@@ -55,7 +56,10 @@ export function useDelivery() {
         break;
       case F_COUNTRY.enum.TH:
         supportedPlatforms = thSupported
-        break;  
+        break;
+      case F_COUNTRY.enum.PK:
+        supportedPlatforms = pkSupported
+        break;
       default:
         break;
     }

package/src/views/order-settings/delivery/integrated-delivery/ExternalSetting.vue

@@ -5,7 +5,6 @@
       :label="t('order.activateIntegration', { integrationType: t('order.auto') })"
       label-placement="right"
       @update:model-value="updateEnable"
-      :disabled="!canEdit"
     />
     <div class="mt-6">
       <div>
@@ -13,7 +12,6 @@
           :model-value="data.config.autoCloseBill"
           :label="t('order.allowedAutoCloseBill')"
           @update:model-value="updateAutoCloseBill"
-          :disabled="!canEdit"
           value=""
         />
       </div>
@@ -23,7 +21,6 @@
           :label="t('order.printReceiptAfterClose')"
           @update:model-value="updatePrintReceiptAfterClose"
           value=""
-          :disabled="!canEdit"
         />
       </div>
     </div>
@@ -37,7 +34,6 @@
             :label="t('order.platform')"
             :items="platformOptions"
             @update:model-value="updatePlatform"
-            :disabled="!canEdit"
           />
 
           <FmSelect
@@ -47,7 +43,6 @@
             :label="t('order.deliveryCatalog')"
             :items="menuStore.catalogOptions"
             @update:model-value="updateDeliveryMenuCatalog"
-            :disabled="!canEdit"
           />
 
           <FmSelect
@@ -57,17 +52,11 @@
             :label="t('order.pickupCatalog')"
             :items="menuStore.catalogOptions"
             @update:model-value="updatePickupMenuCatalog"
-            :disabled="!canEdit"
           />
         </div>
 
         <div class="flex flex-row mt-5">
-          <FmButton
-            variant="primary"
-            :label="t('order.syncMenu')"
-            @click="syncMenu()"
-            :disabled="!canEdit"
-          />
+          <FmButton variant="primary" :label="t('order.syncMenu')" @click="syncMenu()" />
         </div>
       </FmCard>
     </div>
@@ -75,9 +64,9 @@
 </template>
 
 <script setup lang="ts">
-import { type PropType, computed, reactive, ref, watch } from 'vue'
+import { type PropType, reactive, ref } from 'vue'
 import { F_ORDER_PLATFORM, type FdoExternalSetting } from '@entity'
-import { useI18n, useCoreStore } from '@feedmepos/mf-common'
+import { useI18n } from '@feedmepos/mf-common'
 import { clone } from '@/helpers/object'
 import { useMenuStore } from '@/stores/menu/menu'
 import { useLoading } from '@/composables/loading'
@@ -87,9 +76,6 @@ import { useSnackbarFunctions } from '@/components/snackbar'
 const { showSuccess } = useSnackbarFunctions()
 const { t } = useI18n()
 const menuStore = useMenuStore()
-const CoreStore = useCoreStore()
-
-const canEdit = computed(() => CoreStore.sessionUser.value?.role.isAdmin ?? false)
 
 const props = defineProps({
   initialValue: {