@feedmepos/mf-order-setting 0.0.21-beta.2 → 0.0.22

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

@@ -198,6 +198,7 @@ async function syncMenu() {
       lastSynchronize: res?.lastSynchronize || modelValue.value.auto.lastSynchronize
     }
     updateData({ auto: temp, manual: data.manual })
+    showSuccess(t('order.syncMenuSuccess'))
   })
 }
 
@@ -222,18 +223,34 @@ async function cancelTestOrder() {
 }
 </script>
 <template>
-  <IntegratedDelivery :model-value="modelValue" :company="company"
-    :can-use-auto-delivery-integration="canUseAutoDeliveryIntegration" @update:model-value="updateDataPass"
-    @sync-menu="syncMenu" @flow-test-order="flowTestOrder" @cancel-test-order="cancelTestOrder">
+  <IntegratedDelivery
+    :model-value="modelValue"
+    :company="company"
+    :can-use-auto-delivery-integration="canUseAutoDeliveryIntegration"
+    @update:model-value="updateDataPass"
+    @sync-menu="syncMenu"
+    @flow-test-order="flowTestOrder"
+    @cancel-test-order="cancelTestOrder"
+  >
     <template #default="{ editable }">
-      <div class="flex-grow fm-typo-en-title-sm-600 mb-3 mt-10">{{ t('order.discountCampaign')}}</div>
-      <FmButton :label="t('order.addNewCampaign')" icon="add" variant="plain" @click="addCampaign" class="mb-3" />
+      <div class="flex-grow fm-typo-en-title-sm-600 mb-3 mt-10">
+        {{ t('order.discountCampaign') }}
+      </div>
+      <FmButton
+        :label="t('order.addNewCampaign')"
+        icon="add"
+        variant="plain"
+        @click="addCampaign"
+        class="mb-3"
+      />
 
       <div v-if="campaigns.length > 0">
         <div v-for="(campaign, index) in campaigns" :key="index">
           <FmCard variant="outlined" class="p-5 flex justify-between items-center mb-5">
             <div>
-              <span class="font-bold">{{ campaign.name }} ({{ campaign.vendorBearPercentage }}%)</span>
+              <span class="font-bold"
+                >{{ campaign.name }} ({{ campaign.vendorBearPercentage }}%)</span
+              >
               <br />
               {{ formatCampaignDate(campaign.date) }}
             </div>

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

@@ -9,12 +9,13 @@ import { useLoading } from '@/composables/loading'
 import { remoteOrderApi } from '@/api/remoteOrder'
 import IntegratedDelivery from './IntegratedDelivery.vue'
 import { clone } from '@/helpers/object'
-import { useCoreStore } from '@feedmepos/mf-common'
+import { useI18n, useCoreStore } from '@feedmepos/mf-common'
 
 export interface GrabfoodDeliveryData {
   manual: FdoLinkedDelivery | null
   integrated: FdoGrabfoodSettings
 }
+const { t } = useI18n()
 
 const props = defineProps({
   initialValue: {
@@ -31,7 +32,7 @@ const props = defineProps({
   }
 })
 
-const data = reactive(clone(props.initialValue));
+const data = reactive(clone(props.initialValue))
 const modelValue = computed<IntegratedDeliverySettingData>(() => {
   const auto = data.integrated
   return {
@@ -45,35 +46,32 @@ const modelValue = computed<IntegratedDeliverySettingData>(() => {
       lastSynchronize: auto.lastSynchronize,
       status: auto.status,
       updatedAt: auto.updatedAt,
-      menuSyncError: auto.menuSyncError,
+      menuSyncError: auto.menuSyncError
     }
   }
 })
 
 const { currentRestaurant } = useCoreStore()
 
-
 function updateData({ manual, auto }: IntegratedDeliverySettingData) {
   data.manual = manual
   data.integrated = {
     ...auto,
     merchantID: auto.integrationId,
-    commissionRate: auto.commissionRate,
+    commissionRate: auto.commissionRate
   }
-  return { manual: data.manual, integrated: data.integrated };
+  return { manual: data.manual, integrated: data.integrated }
 }
 
 const emits = defineEmits<{
-  (e: 'update:model-value', payload: { manual: any; auto: any }): void;
-}>();
-
+  (e: 'update:model-value', payload: { manual: any; auto: any }): void
+}>()
 
 function updateDataPass({ manual, auto }: IntegratedDeliverySettingData) {
-  const updatedData = updateData({ manual, auto });
-  emits('update:model-value', { manual: updatedData.manual, auto: updatedData.integrated });
+  const updatedData = updateData({ manual, auto })
+  emits('update:model-value', { manual: updatedData.manual, auto: updatedData.integrated })
 }
 
-
 const { startAsyncCallWithErr } = useLoading()
 async function syncMenu() {
   await startAsyncCallWithErr(async () => {
@@ -85,11 +83,12 @@ async function syncMenu() {
       lastSynchronize: res?.lastSynchronize || modelValue.value.auto.lastSynchronize
     }
     updateData({ auto: temp, manual: data.manual })
+    showSuccess(t('order.syncMenuSuccess'))
   })
 }
 
 import { useSnackbarFunctions } from '@/components/snackbar'
-const { showSuccess } = useSnackbarFunctions();
+const { showSuccess } = useSnackbarFunctions()
 
 async function flowTestOrder() {
   await startAsyncCallWithErr(async () => {
@@ -112,7 +111,13 @@ async function cancelTestOrder() {
 </script>
 
 <template>
-  <IntegratedDelivery :model-value="modelValue" :company="company"
-    :can-use-auto-delivery-integration="canUseAutoDeliveryIntegration" @update:model-value="updateDataPass"
-    @sync-menu="syncMenu" @flow-test-order="flowTestOrder" @cancel-test-order="cancelTestOrder" />
+  <IntegratedDelivery
+    :model-value="modelValue"
+    :company="company"
+    :can-use-auto-delivery-integration="canUseAutoDeliveryIntegration"
+    @update:model-value="updateDataPass"
+    @sync-menu="syncMenu"
+    @flow-test-order="flowTestOrder"
+    @cancel-test-order="cancelTestOrder"
+  />
 </template>

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

@@ -1,40 +1,41 @@
 <script setup lang="ts">
-import { FdoLinkedDelivery } from "@feedmepos/core/entity";
+import { FdoLinkedDelivery } from '@feedmepos/core/entity'
 import { FdoShopeeFoodSettings } from '@entity'
-import { computed, type PropType, reactive } from "vue";
-import type { DeliveryCompany } from "../delivery";
-import type { IntegratedDeliverySettingData } from "./IntegratedDelivery.vue";
-import { useLoading } from "@/composables/loading";
-import { remoteOrderApi } from "@/api/remoteOrder";
-import IntegratedDelivery from "./IntegratedDelivery.vue";
-import { clone } from "@/helpers/object";
-import { useCoreStore } from "@feedmepos/mf-common";
-
+import { computed, type PropType, reactive } from 'vue'
+import type { DeliveryCompany } from '../delivery'
+import type { IntegratedDeliverySettingData } from './IntegratedDelivery.vue'
+import { useLoading } from '@/composables/loading'
+import { remoteOrderApi } from '@/api/remoteOrder'
+import IntegratedDelivery from './IntegratedDelivery.vue'
+import { clone } from '@/helpers/object'
+import { useI18n, useCoreStore } from '@feedmepos/mf-common'
 
 export interface ShopeefoodDeliveryData {
-  manual: FdoLinkedDelivery | null;
-  integrated: FdoShopeeFoodSettings;
+  manual: FdoLinkedDelivery | null
+  integrated: FdoShopeeFoodSettings
 }
 
+const { t } = useI18n()
+
 const props = defineProps({
   initialValue: {
     type: Object as PropType<ShopeefoodDeliveryData>,
-    required: true,
+    required: true
   },
   company: {
     type: Object as PropType<DeliveryCompany>,
-    required: true,
+    required: true
   },
   canUseAutoDeliveryIntegration: {
     type: [String, Boolean],
-    required: true,
-  },
-});
+    required: true
+  }
+})
 
-const data = reactive(clone(props.initialValue));
+const data = reactive(clone(props.initialValue))
 
 const modelValue = computed<IntegratedDeliverySettingData>(() => {
-  const auto = data.integrated;
+  const auto = data.integrated
   return {
     manual: data.manual,
     auto: {
@@ -46,64 +47,58 @@ const modelValue = computed<IntegratedDeliverySettingData>(() => {
       lastSynchronize: auto.lastSynchronize,
       status: auto.status,
       updatedAt: auto.updatedAt,
-      menuSyncError: auto.menuSyncError,
-    },
-  };
-});
+      menuSyncError: auto.menuSyncError
+    }
+  }
+})
 
 function updateData({ manual, auto }: IntegratedDeliverySettingData) {
-  data.manual = manual;
+  data.manual = manual
   data.integrated = {
     ...auto,
     storeID: auto.integrationId,
     reportConfig: {
       discountCampaigns: [],
-      commissionRate: auto.commissionRate,
-    },
-  };
-  return { manual: data.manual, integrated: data.integrated };
+      commissionRate: auto.commissionRate
+    }
+  }
+  return { manual: data.manual, integrated: data.integrated }
 }
 
 const emits = defineEmits<{
-  (e: 'update:model-value', payload: { manual: any; auto: any }): void;
-}>();
-
+  (e: 'update:model-value', payload: { manual: any; auto: any }): void
+}>()
 
 function updateDataPass({ manual, auto }: IntegratedDeliverySettingData) {
-  const updatedData = updateData({ manual, auto });
-  emits('update:model-value', { manual: updatedData.manual, auto: updatedData.integrated });
+  const updatedData = updateData({ manual, auto })
+  emits('update:model-value', { manual: updatedData.manual, auto: updatedData.integrated })
 }
 
-const { startAsyncCallWithErr } = useLoading();
+const { startAsyncCallWithErr } = useLoading()
 async function syncMenu() {
-  await startAsyncCallWithErr(
-    async () => {
-      const res = await remoteOrderApi.integratedDelivery.syncShopeefoodMenu(
-        data.integrated.storeID
-      );
-      const temp = {
-        ...modelValue.value.auto,
-        lastSynchronize:
-          res?.lastSynchronize || modelValue.value.auto.lastSynchronize,
-      };
-      updateData({ auto: temp, manual: data.manual });
-    },
-
-  );
+  await startAsyncCallWithErr(async () => {
+    const res = await remoteOrderApi.integratedDelivery.syncShopeefoodMenu(data.integrated.storeID)
+    const temp = {
+      ...modelValue.value.auto,
+      lastSynchronize: res?.lastSynchronize || modelValue.value.auto.lastSynchronize
+    }
+    updateData({ auto: temp, manual: data.manual })
+    showSuccess(t('order.syncMenuSuccess'))
+  })
 }
 
 const { currentRestaurant } = useCoreStore()
 
 import { useSnackbarFunctions } from '@/components/snackbar'
-const { showSuccess } = useSnackbarFunctions();
+const { showSuccess } = useSnackbarFunctions()
 
 async function flowTestOrder() {
   await startAsyncCallWithErr(async () => {
     await remoteOrderApi.integratedDelivery.flowTestOrder(
       currentRestaurant.value?._id ?? '',
       'shopeefood'
-    );
-  });
+    )
+  })
   showSuccess('Completed. ')
 }
 async function cancelTestOrder() {
@@ -111,16 +106,20 @@ async function cancelTestOrder() {
     await remoteOrderApi.integratedDelivery.cancelTestOrder(
       currentRestaurant.value?._id ?? '',
       'shopeefood'
-    );
-  });
+    )
+  })
   showSuccess('Completed. ')
 }
-
-
 </script>
 
 <template>
-  <IntegratedDelivery :model-value="modelValue" :company="company"
-    :can-use-auto-delivery-integration="canUseAutoDeliveryIntegration" @update:model-value="updateDataPass"
-    @sync-menu="syncMenu" @flow-test-order="flowTestOrder" @cancel-test-order="cancelTestOrder" />
-</template>
+  <IntegratedDelivery
+    :model-value="modelValue"
+    :company="company"
+    :can-use-auto-delivery-integration="canUseAutoDeliveryIntegration"
+    @update:model-value="updateDataPass"
+    @sync-menu="syncMenu"
+    @flow-test-order="flowTestOrder"
+    @cancel-test-order="cancelTestOrder"
+  />
+</template>

package/src/views/order-settings/pickup/PickUpSetting.vue

@@ -100,7 +100,7 @@ async function toggleSideSheet(rowData: any) {
 
   const restaurant = currentRestaurants.value.find((r: FmpRestaurant) => r._id === v)
   if (restaurant) {
-    await changeRestaurant(restaurant)
+    await changeRestaurant(restaurant as any)
   }
   sideSheet.value = true
 }