@feedmepos/mf-order-setting 0.0.25 → 0.0.27

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

@@ -49,11 +49,11 @@ const modelValue = computed<IntegratedDeliverySettingData>(() => {
       catalogId: auto?.catalogId ?? null,
       commissionRate: auto.reportConfig?.commissionRate ?? 0,
       lastSynchronize: auto.lastSynchronize ?? '',
-      autoAccept: auto.autoAccept ?? false,
+      autoAccept: true,
       ignoreDiscount: auto.ignoreDiscount ?? false,
       status: auto.status,
       updatedAt: auto.updatedAt,
-      sstInclusive: auto.sstInclusive,
+      sstInclusive: auto.sstInclusive ?? false,
       menuSyncError: auto.menuSyncError
     }
   }
@@ -232,37 +232,5 @@ async function cancelTestOrder() {
     @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 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
-              >
-              <br />
-              {{ formatCampaignDate(campaign.date) }}
-            </div>
-            <div>
-              <div class="flex flex-row">
-                <FmButton append-icon="edit" variant="tertiary" @click="updateCampaign(index)" />
-                <FmButton append-icon="delete" variant="tertiary" @click="deleteCampaign(index)" />
-              </div>
-            </div>
-          </FmCard>
-        </div>
-      </div>
-    </template>
   </IntegratedDelivery>
 </template>

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

@@ -53,10 +53,9 @@ const emits = defineEmits<{
 }>()
 
 const menuStore = useMenuStore()
-// const userStore = useUserStore();
-const { sessionUser } = useCoreStore()
+const CoreStore = useCoreStore()
 
-const canEdit = computed(() => sessionUser.value?.role.isAdmin ?? false)
+const canEdit = computed(() => CoreStore.sessionUser.value?.role.isAdmin ?? false)
 
 function updateManual(manual: FdoLinkedDelivery | null) {
   emits('update:model-value', {
@@ -120,7 +119,6 @@ type OrderSettingKey = 'autoAcceptOrder' | 'autoCloseBill' | 'ignoreDiscount' |
 const orderSettingValue = computed(() => {
   const { autoAccept, autoCloseBill, ignoreDiscount, sstInclusive } = props.modelValue.auto
   const value: OrderSettingKey[] = []
-  if (autoAccept) value.push('autoAcceptOrder')
   if (autoCloseBill) value.push('autoCloseBill')
   if (ignoreDiscount) value.push('ignoreDiscount')
   if (sstInclusive) value.push('sstInclusive')
@@ -141,12 +139,6 @@ const orderSettingOptions = computed<
       value: 'autoCloseBill'
     }
   ]
-  if (props.modelValue.auto.autoAccept !== undefined) {
-    options.unshift({
-      label: t('order.allowedAutoAcceptOrder'),
-      value: 'autoAcceptOrder'
-    })
-  }
   if (props.modelValue.auto.autoAccept !== undefined) {
     options.push({
       label: t('order.ignoreDiscount'),
@@ -193,6 +185,7 @@ function convertStatusI18n(status: string) {
   />
   <div v-if="canUseAutoDeliveryIntegration === true" class="mt-10">
     <FmSwitch
+      :disabled="!canEdit"
       :model-value="modelValue.auto.enable"
       :label="t('order.activateIntegration', { integrationType: t('order.auto') })"
       label-placement="right"
@@ -202,6 +195,7 @@ function convertStatusI18n(status: string) {
     <div v-if="modelValue.auto.enable">
       <FmCard variant="outlined" class="mt-10 p-5">
         <FmTextField
+          :disabled="!canEdit"
           :model-value="modelValue.auto.integrationId"
           :label="t('order.remoteId')"
           @update:model-value="updateIntegrateId"
@@ -217,6 +211,7 @@ function convertStatusI18n(status: string) {
               :label="item.label"
               :value="item.value"
               @update:model-value="updateOrderSettings"
+              :disabled="!canEdit"
             />
           </div>
         </div>
@@ -226,6 +221,7 @@ function convertStatusI18n(status: string) {
             :model-value="modelValue.auto.commissionRate"
             :label="t('order.commission')"
             @update:model-value="updateCommission"
+            :disabled="!canEdit"
           >
             <template #append>%</template>
           </FmTextField>
@@ -238,6 +234,7 @@ function convertStatusI18n(status: string) {
             :label="t('order.catalog')"
             :items="menuStore.catalogOptions"
             @update:model-value="updateMenuCatalog"
+            :disabled="!canEdit"
           />
         </div>
 
@@ -250,6 +247,7 @@ 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>
@@ -261,7 +259,12 @@ function convertStatusI18n(status: string) {
           </div>
         </div>
         <div class="flex flex-row">
-          <FmButton variant="primary" :label="t('order.syncMenu')" @click="emits('syncMenu')" />
+          <FmButton
+            variant="primary"
+            :label="t('order.syncMenu')"
+            @click="emits('syncMenu')"
+            :disabled="!canEdit"
+          />
 
           <div
             v-if="modelValue.auto.lastSynchronize"
@@ -272,7 +275,7 @@ function convertStatusI18n(status: string) {
           </div>
         </div>
 
-        <slot :editable="canEdit" />
+        <slot :editable="!canEdit" />
       </FmCard>
     </div>
   </div>

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

@@ -68,11 +68,9 @@ import PaymentSidesheet from './PaymentSidesheet.vue'
 import { utils } from '@feedmepos/core'
 import { useI18n } from '@feedmepos/mf-common'
 import { useRestaurantStore } from '@/stores/restaurant'
-import { useCoreStore } from '@feedmepos/mf-common'
 
 const { t } = useI18n()
 const restaurantStore = useRestaurantStore()
-const { currentRestaurant } = useCoreStore()
 
 const emits = defineEmits<{
   (event: 'update-pickup', v: FdoRestaurantPickup): void

package/src/views/order-settings/servicecharge/ServiceChargeSetting.vue

@@ -29,7 +29,10 @@
             :label="t('order.chargeWhen')"
             @update:model-value="updateChargeWhen"
           >
-            <FmRadio value="beforeDiscount" :label="t('order.beforeBillDiscount')" :disabled="disableBeforeDiscount"
+            <FmRadio
+              value="beforeDiscount"
+              :label="t('order.beforeBillDiscount')"
+              :disabled="disableBeforeDiscount"
             />
             <FmRadio value="afterDiscount" :label="t('order.afterBillDiscount')" />
           </FmRadioGroup>
@@ -244,7 +247,7 @@ const isLoadingTables = ref(false)
 const tableSettingStore = useTableSettingStore()
 
 onMounted(async () => {
-  const res = restaurantStore.currentRestaurant
+  const res = currentRestaurant.value
   if (res) {
     const restaurantSetting = await restaurantStore.readRestaurantSetting(res._id)
     initialize(restaurantSetting)

package/dist/KioskDevicesView.vue_vue_type_script_setup_true_lang-CLpClo-r.js

@@ -1,207 +0,0 @@
-import { defineComponent as g, ref as D, resolveComponent as f, openBlock as i, createElementBlock as c, createElementVNode as a, toDisplayString as d, unref as m, createVNode as v, computed as B, withCtx as F, Fragment as y, renderList as h, createCommentVNode as C, createBlock as M } from "vue";
-import { useDialog as O, useSnackbar as q } from "@feedmepos/ui-library";
-import { useI18n as I } from "@feedmepos/mf-common";
-import { defineStore as N } from "pinia";
-import { r as w, g as K, D as T } from "./dayjs.min-CA-XbgTY.js";
-import "./queue.do-DcOVgeUq.js";
-const U = /* @__PURE__ */ g({
-  __name: "KioskUnbindConfirm",
-  props: {
-    machineId: {}
-  },
-  emits: ["update:modelValue"],
-  setup(e, { emit: t }) {
-    const { t: n } = I(), l = t, o = D("");
-    function s(r) {
-      l("update:modelValue", r);
-    }
-    return (r, x) => {
-      const _ = f("FmTextField");
-      return i(), c("div", null, [
-        a("span", null, d(m(n)("order.unbindKioskDeviceWarning", { machineId: r.machineId })), 1),
-        v(_, {
-          "model-value": o.value,
-          "onUpdate:modelValue": s,
-          placeholder: r.machineId
-        }, null, 8, ["model-value", "placeholder"])
-      ]);
-    };
-  }
-});
-async function Y() {
-  const e = await w().get("/kiosk/otp");
-  return K(e);
-}
-async function j() {
-  const e = await w().get("/kiosk/devices");
-  return K(e);
-}
-async function L(e) {
-  await w().delete(`/kiosk/unbind/${e}`);
-}
-const k = {
-  requestOtp: Y,
-  getDevices: j,
-  unbind: L
-}, W = (e) => ({
-  name: e.name ?? "N/A",
-  machineId: e.machineId,
-  config: {
-    scannerInfo: e.scannerInfo ?? void 0,
-    printerInfo: e.printerInfo ?? void 0,
-    terminalInfo: e.terminalInfo ?? void 0
-  },
-  activatedAt: H(e.token)
-});
-function H(e) {
-  const t = e.substring(0, 8), n = parseInt(t, 16);
-  return new Date(n * 1e3);
-}
-const P = {
-  toMfKioskDevice: W
-}, z = N("kiosk", () => {
-  const e = D({
-    otp: "",
-    devices: []
-  });
-  async function t() {
-    const o = await k.requestOtp();
-    e.value.otp = o.otp;
-  }
-  async function n() {
-    const o = await k.getDevices();
-    e.value.devices = o.map((s) => P.toMfKioskDevice(s));
-  }
-  async function l(o) {
-    await k.unbind(o), await n();
-  }
-  return {
-    state: e.value,
-    requestOtp: t,
-    getDevices: n,
-    unbind: l
-  };
-}), E = { class: "border fm-corner-radius-lg flex justify-between pr-[1rem] w-11/12" }, G = { class: "py-[1rem] flex flex-col gap-6" }, J = { class: "fm-typo-en-title-sm-600" }, Q = { class: "w-full border p-[1.5rem] fm-corner-radius-lg flex flex-col gap-2" }, R = {
-  key: 0,
-  class: "fm-typo-en-title-sm-600"
-}, X = { class: "flex flex-col gap-1" }, Z = { class: "fm-typo-en-body-lg-400 text-fm-color-typo-secondary" }, ee = { class: "fm-typo-en-body-lg-600 block" }, te = /* @__PURE__ */ g({
-  __name: "KioskDeviceCard",
-  props: {
-    device: {}
-  },
-  setup(e) {
-    const { t } = I(), n = O(), l = q(), o = z(), s = e, r = D(""), x = B(() => Object.entries(s.device.config));
-    function _() {
-      r.value = "", n.open({
-        title: t("order.unbindKioskDevice"),
-        contentComponent: U,
-        contentComponentProps: {
-          machineId: s.device.machineId,
-          "onUpdate:modelValue": (p) => {
-            r.value = p;
-          }
-        },
-        dismissAway: !1,
-        primaryActions: {
-          text: t("order.unbind"),
-          variant: "destructive",
-          close: !1
-        },
-        secondaryActions: {
-          text: t("order.cancel"),
-          variant: "tertiary",
-          close: !0
-        }
-      }).onPrimary(async () => {
-        r.value == s.device.machineId ? (await V(), l.open({
-          type: "success",
-          message: t("order.unbindSuccess"),
-          position: "bottom"
-        }), n.close()) : l.open({
-          type: "warning",
-          message: t("order.unbindWarning"),
-          position: "bottom"
-        });
-      });
-    }
-    async function V() {
-      await o.unbind(s.device.machineId);
-    }
-    return (p, ce) => {
-      const S = f("FmListItem"), $ = f("FmSideSheet"), A = f("FmButton");
-      return i(), c("div", E, [
-        v($, {
-          header: m(t)("order.deviceDetails"),
-          "dismiss-away": "",
-          class: "w-full",
-          maxWidth: 700
-        }, {
-          "side-sheet-button": F(() => [
-            v(S, {
-              class: "flex-1",
-              label: p.device.name,
-              sublabel: `${m(t)("order.activatedDate")}: ${m(T)(p.device.activatedAt).format("DD MMM YYYY HH:mm")}`
-            }, null, 8, ["label", "sublabel"])
-          ]),
-          default: F(() => [
-            a("div", G, [
-              a("span", J, d(p.device.name), 1),
-              (i(!0), c(y, null, h(x.value.filter((u) => u[1]), (u) => (i(), c("div", Q, [
-                u[1] ? (i(), c("span", R, d(u[0]), 1)) : C("", !0),
-                u[1] ? (i(!0), c(y, { key: 1 }, h(Object.entries(u[1]), (b) => (i(), c("div", X, [
-                  a("span", Z, d(b[0]), 1),
-                  a("span", ee, d(b[1] == "" ? "-" : b[1]), 1)
-                ]))), 256)) : C("", !0)
-              ]))), 256))
-            ])
-          ]),
-          _: 1
-        }, 8, ["header"]),
-        v(A, {
-          variant: "plain",
-          "append-icon": "link_off",
-          class: "text-fm-color-system-error-300 align-middle my-auto",
-          onClick: _
-        })
-      ]);
-    };
-  }
-}), ne = { class: "flex flex-col gap-2" }, oe = { class: "flex flex-col gap-2" }, se = { class: "fm-typo-en-title-sm-600 block" }, ie = { class: "fm-typo-en-body-md-400 block" }, ae = { class: "flex flex-col gap-6" }, fe = /* @__PURE__ */ g({
-  __name: "KioskDevicesView",
-  props: {
-    devices: {},
-    requestOtp: { type: Function }
-  },
-  setup(e) {
-    const { t } = I();
-    return (n, l) => {
-      const o = f("FmButton");
-      return i(), c("div", null, [
-        a("div", ne, [
-          a("div", oe, [
-            a("span", se, d(m(t)("order.kioskDisplay")), 1),
-            a("span", ie, d(m(t)("order.kioskDisplayDescription")), 1)
-          ]),
-          a("div", ae, [
-            (i(!0), c(y, null, h(n.devices, (s) => (i(), M(te, {
-              key: s.machineId,
-              device: s
-            }, null, 8, ["device"]))), 128)),
-            v(o, {
-              variant: "plain",
-              class: "w-[10rem] border border-fm-color-primary fm-corner-radius-lg",
-              label: m(t)("order.bindDevice"),
-              size: "md",
-              "prepend-icon": "link",
-              onClick: n.requestOtp
-            }, null, 8, ["label", "onClick"])
-          ])
-        ])
-      ]);
-    };
-  }
-});
-export {
-  fe as _,
-  z as u
-};