@feedmepos/mf-order-setting 0.0.49 → 0.0.50

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

@@ -1704,6 +1704,7 @@ export declare const FdtoGrabfoodCreateOrUpdateSettings: z.ZodObject<{
     menuSyncError: z.ZodOptional<z.ZodNullable<z.ZodOptional<z.ZodString>>>;
     merchantID: z.ZodOptional<z.ZodString>;
     syncV2: z.ZodOptional<z.ZodNullable<z.ZodOptional<z.ZodBoolean>>>;
+    syncIGI: z.ZodOptional<z.ZodNullable<z.ZodOptional<z.ZodBoolean>>>;
     partnerMerchantID: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     status?: string | null | undefined;
@@ -1720,6 +1721,7 @@ export declare const FdtoGrabfoodCreateOrUpdateSettings: z.ZodObject<{
     partnerMerchantID?: string | undefined;
     merchantID?: string | undefined;
     syncV2?: boolean | null | undefined;
+    syncIGI?: boolean | null | undefined;
 }, {
     status?: string | null | undefined;
     _id?: string | undefined;
@@ -1735,6 +1737,7 @@ export declare const FdtoGrabfoodCreateOrUpdateSettings: z.ZodObject<{
     partnerMerchantID?: string | undefined;
     merchantID?: string | undefined;
     syncV2?: boolean | null | undefined;
+    syncIGI?: boolean | null | undefined;
 }>;
 export declare const FdtoGrabfoodUpdateMenuItem: z.ZodObject<{
     merchantId: z.ZodString;
@@ -2307,7 +2310,7 @@ export declare const GFListOrdersRes: z.ZodObject<{
             estimatedOrderReadyTime: string;
             maxOrderReadyTime: string;
         }>>>;
-        orderState: z.ZodNullable<z.ZodOptional<z.ZodEnum<["ACCEPTED", "DRIVER_ALLOCATED", "DRIVER_ARRIVED", "COLLECTED", "DELIVERED", "FAILED", "CANCELLED", "COMPLETED", "REFUNDED"]>>>;
+        orderState: z.ZodNullable<z.ZodOptional<z.ZodEnum<["ACCEPTED", "DRIVER_ALLOCATED", "DRIVER_ARRIVED", "COLLECTED", "DELIVERED", "FAILED", "CANCELLED", "COMPLETED", "REFUNDED", "BILL_PAID"]>>>;
     }, "strip", z.ZodTypeAny, {
         receiver?: {
             name?: string | null | undefined;
@@ -2356,7 +2359,7 @@ export declare const GFListOrdersRes: z.ZodObject<{
             estimatedOrderReadyTime: string;
             maxOrderReadyTime: string;
         } | null | undefined;
-        orderState?: "FAILED" | "COMPLETED" | "DELIVERED" | "CANCELLED" | "ACCEPTED" | "REFUNDED" | "COLLECTED" | "DRIVER_ALLOCATED" | "DRIVER_ARRIVED" | null | undefined;
+        orderState?: "FAILED" | "COMPLETED" | "DELIVERED" | "CANCELLED" | "ACCEPTED" | "REFUNDED" | "COLLECTED" | "DRIVER_ALLOCATED" | "DRIVER_ARRIVED" | "BILL_PAID" | null | undefined;
         price: {
             deliveryFee?: number | null | undefined;
             tax?: number | null | undefined;
@@ -2458,7 +2461,7 @@ export declare const GFListOrdersRes: z.ZodObject<{
             estimatedOrderReadyTime: string;
             maxOrderReadyTime: string;
         } | null | undefined;
-        orderState?: "FAILED" | "COMPLETED" | "DELIVERED" | "CANCELLED" | "ACCEPTED" | "REFUNDED" | "COLLECTED" | "DRIVER_ALLOCATED" | "DRIVER_ARRIVED" | null | undefined;
+        orderState?: "FAILED" | "COMPLETED" | "DELIVERED" | "CANCELLED" | "ACCEPTED" | "REFUNDED" | "COLLECTED" | "DRIVER_ALLOCATED" | "DRIVER_ARRIVED" | "BILL_PAID" | null | undefined;
         price: {
             deliveryFee?: number | null | undefined;
             tax?: number | null | undefined;
@@ -2562,7 +2565,7 @@ export declare const GFListOrdersRes: z.ZodObject<{
             estimatedOrderReadyTime: string;
             maxOrderReadyTime: string;
         } | null | undefined;
-        orderState?: "FAILED" | "COMPLETED" | "DELIVERED" | "CANCELLED" | "ACCEPTED" | "REFUNDED" | "COLLECTED" | "DRIVER_ALLOCATED" | "DRIVER_ARRIVED" | null | undefined;
+        orderState?: "FAILED" | "COMPLETED" | "DELIVERED" | "CANCELLED" | "ACCEPTED" | "REFUNDED" | "COLLECTED" | "DRIVER_ALLOCATED" | "DRIVER_ARRIVED" | "BILL_PAID" | null | undefined;
         price: {
             deliveryFee?: number | null | undefined;
             tax?: number | null | undefined;
@@ -2667,7 +2670,7 @@ export declare const GFListOrdersRes: z.ZodObject<{
             estimatedOrderReadyTime: string;
             maxOrderReadyTime: string;
         } | null | undefined;
-        orderState?: "FAILED" | "COMPLETED" | "DELIVERED" | "CANCELLED" | "ACCEPTED" | "REFUNDED" | "COLLECTED" | "DRIVER_ALLOCATED" | "DRIVER_ARRIVED" | null | undefined;
+        orderState?: "FAILED" | "COMPLETED" | "DELIVERED" | "CANCELLED" | "ACCEPTED" | "REFUNDED" | "COLLECTED" | "DRIVER_ALLOCATED" | "DRIVER_ARRIVED" | "BILL_PAID" | null | undefined;
         price: {
             deliveryFee?: number | null | undefined;
             tax?: number | null | undefined;

package/dist/package/entity/order-platform/grabfood/grabfood.enum.d.ts

@@ -8,7 +8,7 @@ export declare const GF_UPDATE_MENU_FIELD_TYPE: z.ZodEnum<["ITEM", "MODIFIER"]>;
 export declare const GF_CAMPAIGN_EATER_TYPE: z.ZodEnum<["all", "new"]>;
 export declare const GF_CAMPAIGN_DISCOUNT_TYPE: z.ZodEnum<["net", "percentage", "delivery", "freeItem"]>;
 export declare const GF_CAMPAIGN_SCOPE_TYPE: z.ZodEnum<["order", "items"]>;
-export declare const GF_PUSH_ORDER_STATE: z.ZodEnum<["ACCEPTED", "DRIVER_ALLOCATED", "DRIVER_ARRIVED", "COLLECTED", "DELIVERED", "FAILED", "CANCELLED", "COMPLETED", "REFUNDED"]>;
+export declare const GF_PUSH_ORDER_STATE: z.ZodEnum<["ACCEPTED", "DRIVER_ALLOCATED", "DRIVER_ARRIVED", "COLLECTED", "DELIVERED", "FAILED", "CANCELLED", "COMPLETED", "REFUNDED", "BILL_PAID"]>;
 export declare const GF_ORDER_STATUS: z.ZodEnum<["pending", "accepted", "rejected"]>;
 export declare const GF_PAYMENT_TYPE: z.ZodEnum<["CASH", "CASHLESS"]>;
 export declare const GF_QR_TYPE: z.ZodEnum<["Dynamic", "Static"]>;

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

@@ -56,26 +56,6 @@ export declare const FdtoUpdateOrderPlatformSettingReq: z.ZodObject<z.extendShap
     action: "SYNC_MENU" | "UPDATE_ORDER" | "GET_OR_UPDATE_SETTING";
     platform: string;
 }>;
-export declare const FdtoUpdateOrderPlatformItemReq: z.ZodObject<{
-    /**
-     * enable = null -> GET
-     * enable = true/false -> UPDATE
-     */
-    enable: z.ZodBoolean;
-    itemId: z.ZodString;
-    itemName: z.ZodString;
-    groupId: z.ZodNullable<z.ZodOptional<z.ZodString>>;
-}, "strip", z.ZodTypeAny, {
-    groupId?: string | null | undefined;
-    enable: boolean;
-    itemId: string;
-    itemName: string;
-}, {
-    groupId?: string | null | undefined;
-    enable: boolean;
-    itemId: string;
-    itemName: string;
-}>;
 export declare const FdtoGetOrderDateRange: z.ZodObject<{
     start: z.ZodNullable<z.ZodOptional<z.ZodString>>;
     end: z.ZodNullable<z.ZodOptional<z.ZodString>>;

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

@@ -8414,8 +8414,28 @@ export declare const RestaurantQueueUpdateStatusDto: z.ZodObject<{
 }, {
     status: "QUEUE" | "ARRIVED" | "EXPIRED" | "CALLED" | "CANCEL";
 }>;
+export declare const FdtoCreateQueueRequest: z.ZodObject<{
+    phoneNumber: z.ZodString;
+    name: z.ZodOptional<z.ZodString>;
+    pax: z.ZodOptional<z.ZodNumber>;
+    isSub: z.ZodOptional<z.ZodBoolean>;
+    remark: z.ZodNullable<z.ZodOptional<z.ZodString>>;
+}, "strip", z.ZodTypeAny, {
+    name?: string | undefined;
+    remark?: string | null | undefined;
+    pax?: number | undefined;
+    isSub?: boolean | undefined;
+    phoneNumber: string;
+}, {
+    name?: string | undefined;
+    remark?: string | null | undefined;
+    pax?: number | undefined;
+    isSub?: boolean | undefined;
+    phoneNumber: string;
+}>;
 export type RestaurantQueueStatusDto = z.infer<typeof RestaurantQueueStatusDto>;
 export type RestaurantQueueCartDto = z.infer<typeof RestaurantQueueCartDto>;
 export type RestaurantQueuePOSDto = z.infer<typeof RestaurantQueuePOSDto>;
 export type RestaurantQueueDto = z.infer<typeof RestaurantQueueDto>;
 export type RestaurantQueueUpdateStatusDto = z.infer<typeof RestaurantQueueUpdateStatusDto>;
+export type FdtoCreateQueueRequest = z.infer<typeof FdtoCreateQueueRequest>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feedmepos/mf-order-setting",
-  "version": "0.0.49",
+  "version": "0.0.50",
   "type": "module",
   "module": "./dist/app.js",
   "license": "UNLICENSED",

package/src/locales/en-US.json

@@ -298,6 +298,18 @@
         "unbindKioskDeviceWarning": "Are you sure want to unbind device? If yes, please enter {machineId} inside the textfield",
         "unbindSuccess": "Kiosk display successfully unbinded.",
         "unbindWarning": "Please enter the machine ID to confirm unbind.",
+        "searchDevices": "Search by slot, machine ID, or name...",
+        "allTypes": "All Types",
+        "tabletOnly": "Tablet Only",
+        "kioskOnly": "Kiosk Only",
+        "showingDevices": "Showing {count} of {total}",
+        "noDevicesMatch": "No devices match your search criteria.",
+        "noDevicesBound": "No devices bound yet. Click \"Bind device\" to add one.",
+        "clickToCopy": "Click to copy",
+        "machineIdCopied": "Machine ID copied to clipboard",
+        "copyFailed": "Failed to copy to clipboard",
+        "pinSet": "PIN Set",
+        "noPin": "No PIN",
         "unknown": "Unknown",
         "update": "Update",
         "updatedAt": "Updated at",

package/src/locales/ja-JP.json

@@ -293,6 +293,18 @@
         "unbindKioskDeviceWarning": "デバイスの紐付けを解除してもよろしいですか？解除する場合は、テキストフィールドに{machineId}を入力してください",
         "unbindSuccess": "キオスクディスプレイの紐付けが正常に解除されました。",
         "unbindWarning": "紐付け解除を確認するには、マシンIDを入力してください。",
+        "searchDevices": "スロット、マシンID、名前で検索...",
+        "allTypes": "すべてのタイプ",
+        "tabletOnly": "タブレットのみ",
+        "kioskOnly": "キオスクのみ",
+        "showingDevices": "{count} / {total} 件表示",
+        "noDevicesMatch": "検索条件に一致するデバイスはありません",
+        "noDevicesBound": "まだデバイスがバインドされていません。「デバイスをバインド」をクリックして追加してください。",
+        "clickToCopy": "クリックしてコピー",
+        "machineIdCopied": "マシンIDをクリップボードにコピーしました",
+        "copyFailed": "クリップボードへのコピーに失敗しました",
+        "pinSet": "PIN設定済み",
+        "noPin": "PINなし",
         "unknown": "不明",
         "update": "更新",
         "updatedAt": "更新日時",

package/src/locales/th-TH.json

@@ -293,6 +293,18 @@
         "unbindKioskDeviceWarning": "คุณแน่ใจว่าต้องการยกเลิกการเชื่อมโยงอุปกรณ์หรือไม่ หากใช่ โปรดป้อน {machineId} ในช่องข้อความ",
         "unbindSuccess": "ยกเลิกการเชื่อมโยงจอแสดงผล Kiosk สำเร็จแล้ว",
         "unbindWarning": "โปรดป้อน ID เครื่องเพื่อยืนยันการยกเลิกการเชื่อมโยง",
+        "searchDevices": "ค้นหาตามสล็อต, ID เครื่อง หรือชื่อ...",
+        "allTypes": "ทุกประเภท",
+        "tabletOnly": "แท็บเล็ตเท่านั้น",
+        "kioskOnly": "คีออสก์เท่านั้น",
+        "showingDevices": "แสดง {count} จาก {total}",
+        "noDevicesMatch": "ไม่มีอุปกรณ์ตรงกับเกณฑ์การค้นหาของคุณ",
+        "noDevicesBound": "ยังไม่มีอุปกรณ์ที่ผูกไว้ คลิก \"ผูกอุปกรณ์\" เพื่อเพิ่ม",
+        "clickToCopy": "คลิกเพื่อคัดลอก",
+        "machineIdCopied": "คัดลอก ID เครื่องไปยังคลิปบอร์ดแล้ว",
+        "copyFailed": "ไม่สามารถคัดลอกไปยังคลิปบอร์ด",
+        "pinSet": "ตั้ง PIN แล้ว",
+        "noPin": "ไม่มี PIN",
         "unknown": "ไม่ทราบ",
         "update": "อัปเดต",
         "updatedAt": "อัปเดตเมื่อ",

package/src/locales/zh-CN.json

@@ -300,6 +300,18 @@
         "unbindKioskDeviceWarning": "你确定要解除绑定设备吗？如果是，请在文本框中输入{machineId}",
         "unbindSuccess": "自助点餐设备成功解除绑定",
         "unbindWarning": "请输入设备ID以确认解除绑定",
+        "searchDevices": "按槽位、设备ID或名称搜索...",
+        "allTypes": "全部类型",
+        "tabletOnly": "仅平板",
+        "kioskOnly": "仅自助终端",
+        "showingDevices": "显示 {count} / {total}",
+        "noDevicesMatch": "没有设备符合您的搜索条件",
+        "noDevicesBound": "尚未绑定任何设备。点击\"绑定设备\"添加。",
+        "clickToCopy": "点击复制",
+        "machineIdCopied": "设备ID已复制到剪贴板",
+        "copyFailed": "复制到剪贴板失败",
+        "pinSet": "已设置PIN",
+        "noPin": "无PIN",
         "unknown": "未知",
         "update": "更新",
         "updatedAt": "更新于",

package/src/modules/kiosk/interface.ts

@@ -15,6 +15,7 @@ export interface MfKioskDevice {
     pinInfo?: string,
     deviceAppVersion?: string,
     deviceAppOTAVersion?: string,
+    lastStartup?: Date,
 }
 
 

package/src/stores/kiosk/mapper.ts

@@ -16,6 +16,7 @@ const toMfKioskDevice = (dto: KioskDeviceDto): MfKioskDevice => {
         pinInfo: dto.pinInfo ?? undefined,
         deviceAppVersion: dto.deviceAppVersion ?? undefined,
         deviceAppOTAVersion: dto.deviceAppOTAVersion ?? undefined,
+        lastStartup: dto.lastStartup ? new Date(dto.lastStartup) : undefined,
     };
 };
 

package/src/views/kiosk/KioskSummary.vue

@@ -2,44 +2,50 @@
   <div :class="dialogType ? '' : ['p-[1.5rem] border fm-corner-radius-lg flex flex-col gap-5 fixed ml-40 w-[320px]']">
     <span v-if="!dialogType" class="fm-typo-en-title-sm-600">{{ t('order.kioskSummary') }}</span>
     <hr v-if="!dialogType" class="my-[0.25rem]" />
-    <div class="flex flex-col gap-1">
-      <div class="flex flex-col gap-1">
+    <div class="flex flex-col gap-4">
+      <!-- Device Summary -->
+      <div class="flex flex-col gap-2">
         <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{ t('order.kioskDisplay') }}</span>
-
-        <div class="fm-typo-en-body-lg-600">
-          <div v-if="devices.length > 0">
-            <li class="block" v-for="device in devices" :key="device.machineId">{{ device.name }}</li>
+        <div v-if="devices.length > 0" class="flex flex-col gap-1">
+          <div
+            v-for="device in devices"
+            :key="device.machineId"
+            class="fm-typo-en-body-sm-400 flex items-center gap-2"
+          >
+            <span class="px-1.5 py-0.5 fm-corner-radius-sm bg-fm-color-neutral-gray-100 text-fm-color-typo-secondary fm-typo-en-body-xs-600 uppercase">
+              {{ device.deviceAppType === 'TABLET_APP' ? 'T' : 'K' }}
+            </span>
+            <span v-if="device.slotInfo" class="fm-typo-en-body-sm-600">{{ device.slotInfo }}</span>
+            <span class="text-fm-color-typo-secondary truncate flex-1" :title="device.name">{{ device.name }}</span>
           </div>
-          <div v-else>-</div>
         </div>
+        <div v-else class="fm-typo-en-body-lg-600">-</div>
+      </div>
 
-        <div v-if="dineInStatus === t('order.activated')">
-          <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{ t('order.dineIn') }}</span>
-          <div class="fm-typo-en-body-lg-600 block">
-            <div>{{ dineInStatus }}</div>
-          </div>
-        </div>
+      <!-- Dine In Status -->
+      <div v-if="dineInStatus === t('order.activated')" class="flex flex-col gap-1">
+        <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{ t('order.dineIn') }}</span>
+        <div class="fm-typo-en-body-lg-600">{{ dineInStatus }}</div>
+      </div>
 
-        <div v-if="dineInStatus === t('order.activated') && dineInType !== t('order.unknown')">
-          <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{ t('order.dineInType') }}</span>
-          <div class="fm-typo-en-body-lg-600 block">
-            <div>{{ dineInType }}</div>
-          </div>
-        </div>
+      <!-- Dine In Type -->
+      <div v-if="dineInStatus === t('order.activated') && dineInType !== t('order.unknown')" class="flex flex-col gap-1">
+        <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{ t('order.dineInType') }}</span>
+        <div class="fm-typo-en-body-lg-600">{{ dineInType }}</div>
+      </div>
 
-        <div v-if="takeAwayStatus === t('order.activated')">
-          <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{ t('order.takeaway') }}</span>
-          <div class="fm-typo-en-body-lg-600 block">
-            <div>{{ takeAwayStatus }}</div>
-          </div>
-        </div>
+      <!-- Takeaway Status -->
+      <div v-if="takeAwayStatus === t('order.activated')" class="flex flex-col gap-1">
+        <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{ t('order.takeaway') }}</span>
+        <div class="fm-typo-en-body-lg-600">{{ takeAwayStatus }}</div>
+      </div>
 
-        <div v-if="acceptedPaymentStatus || offlinePaymentStatus">
-          <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{t('order.acceptedPayment')}}</span>
-          <div class="fm-typo-en-body-lg-600 block">
-            <div v-if="offlinePaymentStatus">{{ t('order.offlinePayment') }}</div>
-            <div>{{ acceptedPaymentStatus }}</div>
-          </div>
+      <!-- Payment Status -->
+      <div v-if="acceptedPaymentStatus || offlinePaymentStatus" class="flex flex-col gap-1">
+        <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{ t('order.acceptedPayment') }}</span>
+        <div class="fm-typo-en-body-lg-600">
+          <div v-if="offlinePaymentStatus">{{ t('order.offlinePayment') }}</div>
+          <div>{{ acceptedPaymentStatus }}</div>
         </div>
       </div>
     </div>

package/src/views/kiosk/KioskView.vue

@@ -29,7 +29,7 @@
             <KioskDevicesView
               v-if="selectedMenuItem == 'device'"
               :devices="devices"
-              :request-otp="requestOtp"
+              @request-otp="requestOtp"
             />
             <KioskSettingView
               :key="`KioskSettingView-${currentRestaurantId}`"
@@ -151,6 +151,9 @@ async function requestOtp() {
     contentComponentProps: {
       otp: KioskStore.state.otp
     }
+  }).onClose(async () => {
+    // Refresh devices after dialog closes (in case a device was bound)
+    await KioskStore.getDevices()
   })
 }