@feedmepos/mf-order-setting 0.0.37 → 0.0.43

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: {

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

@@ -262,7 +262,6 @@ function convertStatusI18n(status: string) {
               v-if="modelValue.auto.status === 'FAILED' && modelValue.auto.menuSyncError !== null"
               :content="modelValue.auto.menuSyncError"
               :zIndex="1000"
-              :disabled="!canEdit"
             >
               <FmIcon name="info" size="sm" />
             </FmTooltip>