@feedmepos/mf-order-setting 0.0.52 → 0.0.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feedmepos/mf-order-setting",
-  "version": "0.0.52",
+  "version": "0.0.53",
   "type": "module",
   "module": "./dist/app.js",
   "license": "UNLICENSED",
@@ -17,7 +17,9 @@
     "build:mf": "vite build --mode fmmf",
     "build:dts": "NODE_OPTIONS=--max-old-space-size=16384 vue-tsc --declaration --emitDeclarationOnly -p tsconfig.app.json --outDir ./dist",
     "publish-npm": "yarn build && yarn npm publish --no-git-checks",
-    "build-only": "dotenv -e .env.dev -- yarn build:mf && yarn build:dts",
+    "build-only": "yarn build-only:dev",
+    "build-only:dev": "dotenv -e .env.dev -- yarn build:mf && yarn build:dts",
+    "build-only:prod": "dotenv -e .env.prod -- yarn build:mf && yarn build:dts",
     "build:dev": "cross-env NODE_ENV=dev vite build --mode dev",
     "build:prod": "vite build --mode prod",
     "type-check": "set NODE_OPTIONS=--max-old-space-size=16384 && vue-tsc --noEmit -p tsconfig.app.json --composite false",

package/src/App.vue

@@ -2,6 +2,9 @@
 import { onMounted } from "vue"
 import { googleMap, setGoogleMap } from "./helpers/map"
 import { Loader } from 'google-maps'
+import { ensureFirebaseApp } from '@/utils/firebase-app'
+
+ensureFirebaseApp()
 
 async function initGoogleMap() {
     if (googleMap()) return

package/src/locales/en-US.json

@@ -95,8 +95,6 @@
         "deliveryZone": "Delivery Zone",
         "deviceBinding": "Device Binding",
         "deviceDetails": "Device Details",
-        "otaChannel": "OTA channel",
-        "otaChannelHint": "Optional. Leave blank to use the default OTA feed.",
         "dineIn": "Dine In",
         "dineInCanTakeaway": "Allow Takeaway",
         "driveThru": "Drive Thru",
@@ -168,6 +166,19 @@
         "kioskSettingFailed": "Failed to update kiosk order setting",
         "kioskSettingSuccess": "Kiosk order setting updated",
         "kioskSummary": "Kiosk Summary",
+        "coverImage": "Cover Image",
+        "coverImageLandscape": "Cover Image (Landscape)",
+        "coverImagePortrait": "Cover Image (Portrait)",
+        "coverImageLandscapeHint": "Recommended size: 1920 x 1080",
+        "coverImagePortraitHint": "Recommended size: 1080 x 1920",
+        "coverImageFallbackHint": "If not set, it will default to the Cover Image from restaurant settings.",
+        "uploadImage": "Upload Image",
+        "imageUrl": "Image URL",
+        "imageUrlPlaceholder": "Enter image URL",
+        "clearImage": "Clear Image",
+        "imageUploadSuccess": "Image uploaded",
+        "imageUploadFailed": "Failed to upload image",
+        "imageUploadRejected": "Image upload rejected",
         "lastOrderBeforeClosing": "Last order before closing",
         "lastOrderBeforeClosingDescription": "Orders must be placed before the designated closing time",
         "lastOrderMinutesBeforeCloseRule": "Cannot be less than 0 minutes",
@@ -228,6 +239,8 @@
         "disableRemoteQueue": "Disable Remote Queue",
         "disableSMS": "Disable SMS",
         "printChecklist": "Print Checklist",
+        "overridePax": "Overwrite Bill Pax",
+        "overridePaxSublabel": "Incoming order will overwrite the existing bill pax",
         "codeSettings": "Queue Code Settings",
         "addCodeSetting": "Add Queue Code Setting",
         "current": "Current",

package/src/locales/ja-JP.json

@@ -91,17 +91,15 @@
         "deliveryOrder": "配達注文",
         "deliveryTerm": "配達条件",
         "deliveryTime": "配達時間",
-        "deliveryTitle": "{company}配達",
-        "deliveryZone": "配達エリア",
-        "deviceBinding": "デバイス紐付け",
-        "deviceDetails": "デバイス詳細",
-        "otaChannel": "OTAチャネル",
-        "otaChannelHint": "任意。空欄の場合はデフォルトのOTAフィードを使用します。",
-        "dineIn": "店内飲食",
-        "dineInCanTakeaway": "テイクアウト許可",
-        "driveThru": "ドライブスルー",
-        "driveThruSettingUpdated": "ドライブスルー設定が更新されました。",
-        "enableDriveThru": "ドライブスルーを有効にする",
+        "deliveryTitle": "{company}配達",
+        "deliveryZone": "配達エリア",
+        "deviceBinding": "デバイス紐付け",
+        "deviceDetails": "デバイス詳細",
+        "dineIn": "店内飲食",
+        "dineInCanTakeaway": "テイクアウト許可",
+        "driveThru": "ドライブスルー",
+        "driveThruSettingUpdated": "ドライブスルー設定が更新されました。",
+        "enableDriveThru": "ドライブスルーを有効にする",
         "enableDriveThruSublabel": "お客様向けのドライブスルー注文を有効にする",
         "dineInType": "店内飲食タイプ",
         "discountCampaign": "割引キャンペーン",
@@ -159,11 +157,24 @@
         "item": "商品",
         "kiosk": "キオスク",
         "kioskDisplay": "キオスクディスプレイ",
-        "kioskDisplayDescription": "「デバイスを紐付け」をクリックしてデバイス紐付け用の特別コードを取得してください。",
-        "kioskSettingFailed": "キオスク注文設定の更新に失敗しました",
-        "kioskSettingSuccess": "キオスク注文設定が更新されました",
-        "kioskSummary": "キオスクサマリー",
-        "lastOrderBeforeClosing": "閉店前の最終注文",
+        "kioskDisplayDescription": "「デバイスを紐付け」をクリックしてデバイス紐付け用の特別コードを取得してください。",
+        "kioskSettingFailed": "キオスク注文設定の更新に失敗しました",
+        "kioskSettingSuccess": "キオスク注文設定が更新されました",
+        "kioskSummary": "キオスクサマリー",
+        "coverImage": "カバー画像",
+        "coverImageLandscape": "カバー画像（横向き）",
+        "coverImagePortrait": "カバー画像（縦向き）",
+        "coverImageLandscapeHint": "推奨サイズ: 1920 x 1080",
+        "coverImagePortraitHint": "推奨サイズ: 1080 x 1920",
+        "coverImageFallbackHint": "未設定の場合、レストラン設定のカバー画像が使用されます",
+        "uploadImage": "画像をアップロード",
+        "imageUrl": "画像URL",
+        "imageUrlPlaceholder": "画像URLを入力",
+        "clearImage": "画像をクリア",
+        "imageUploadSuccess": "画像をアップロードしました",
+        "imageUploadFailed": "画像のアップロードに失敗しました",
+        "imageUploadRejected": "画像アップロードが拒否されました",
+        "lastOrderBeforeClosing": "閉店前の最終注文",
         "lastOrderBeforeClosingDescription": "指定された閉店時間前に注文を行う必要があります",
         "lastOrderMinutesBeforeCloseRule": "0分未満にはできません",
         "lastSync": "最終同期",
@@ -222,8 +233,10 @@
         "duration": "時間",
         "disableRemoteQueue": "リモート順番待ちを無効にする",
         "disableSMS": "SMSを無効にする",
-        "printChecklist": "チェックリストを印刷",
-        "codeSettings": "順番待ちコード設定",
+        "printChecklist": "チェックリストを印刷",
+        "overridePax": "請求書の人数を上書き",
+        "overridePaxSublabel": "新しい注文が既存の請求書の人数を上書きします",
+        "codeSettings": "順番待ちコード設定",
         "addCodeSetting": "順番待ちコード設定を追加",
         "current": "現在",
         "paxMin": "最小人数",

package/src/locales/th-TH.json

@@ -95,8 +95,6 @@
         "deliveryZone": "โซนการจัดส่ง",
         "deviceBinding": "การผูกอุปกรณ์",
         "deviceDetails": "รายละเอียดอุปกรณ์",
-        "otaChannel": "ช่อง OTA",
-        "otaChannelHint": "ไม่บังคับ เว้นว่างเพื่อใช้ฟีด OTA เริ่มต้น",
         "dineIn": "รับประทานอาหารที่ร้าน",
         "dineInCanTakeaway": "อนุญาตให้นำกลับบ้าน",
         "driveThru": "ไดรฟ์ทรู",
@@ -166,6 +164,19 @@
         "kioskSettingFailed": "อัปเดตการตั้งค่าคำสั่งซื้อคีออสก์ล้มเหลว",
         "kioskSettingSuccess": "อัปเดตการตั้งค่าคำสั่งซื้อคีออสก์แล้ว",
         "kioskSummary": "สรุปคีออสก์",
+        "coverImage": "รูปภาพหน้าปก",
+        "coverImageLandscape": "รูปภาพหน้าปก (แนวนอน)",
+        "coverImagePortrait": "รูปภาพหน้าปก (แนวตั้ง)",
+        "coverImageLandscapeHint": "ขนาดที่แนะนำ: 1920 x 1080",
+        "coverImagePortraitHint": "ขนาดที่แนะนำ: 1080 x 1920",
+        "coverImageFallbackHint": "หากไม่ตั้งค่า ระบบจะใช้ Cover Image จากการตั้งค่าร้านอาหารโดยอัตโนมัติ",
+        "uploadImage": "อัปโหลดรูปภาพ",
+        "imageUrl": "ลิงก์รูปภาพ",
+        "imageUrlPlaceholder": "กรอกลิงก์รูปภาพ",
+        "clearImage": "ล้างรูปภาพ",
+        "imageUploadSuccess": "อัปโหลดรูปภาพแล้ว",
+        "imageUploadFailed": "อัปโหลดรูปภาพไม่สำเร็จ",
+        "imageUploadRejected": "การอัปโหลดรูปภาพถูกปฏิเสธ",
         "lastOrderBeforeClosing": "เวลาสั่งอาหารครั้งสุดท้ายก่อนปิดร้าน",
         "lastOrderBeforeClosingDescription": "ต้องทำรายการสั่งซื้อก่อนเวลาปิดที่กำหนด",
         "lastOrderMinutesBeforeCloseRule": "ไม่สามารถน้อยกว่า 0 นาทีได้",
@@ -211,6 +222,8 @@
         "pleaseSelectRestaurant": "โปรดเลือกร้านอาหาร",
         "prefix": "คำนำหน้า",
         "printChecklist": "พิมพ์รายการตรวจสอบ",
+        "overridePax": "เขียนทับจำนวนคนในบิล",
+        "overridePaxSublabel": "ออเดอร์ใหม่จะเขียนทับจำนวนคนในบิลที่มีอยู่",
         "preOrder": "สั่งซื้อล่วงหน้า",
         "preOrderHint": "สั่งซื้อในวันที่ {today} ลูกค้าสามารถสั่งซื้อได้ระหว่าง  {start} และ {end} สูงสุด 7 วัน",
         "pricePerMessage": "ราคาต่อข้อความ",

package/src/locales/zh-CN.json

@@ -96,8 +96,6 @@
         "deliveryZone": "配送区域",
         "deviceBinding": "设备绑定",
         "deviceDetails": "设备详情",
-        "otaChannel": "OTA 渠道",
-        "otaChannelHint": "可选。留空将使用默认的 OTA 源。",
         "dineIn": "堂食",
         "dineInCanTakeaway": "允许外带",
         "driveThru": "得来速",
@@ -170,6 +168,19 @@
         "kioskSettingFailed": "自助点餐设备订单设置更新失败",
         "kioskSettingSuccess": "自助点餐设备订单设置更新成功",
         "kioskSummary": "自助点餐设备概览",
+        "coverImage": "封面图片",
+        "coverImageLandscape": "封面图片（横向）",
+        "coverImagePortrait": "封面图片（竖向）",
+        "coverImageLandscapeHint": "推荐尺寸：1920 x 1080",
+        "coverImagePortraitHint": "推荐尺寸：1080 x 1920",
+        "coverImageFallbackHint": "若不设置，将默认使用餐厅设置中的 Cover Image",
+        "uploadImage": "上传图片",
+        "imageUrl": "图片链接",
+        "imageUrlPlaceholder": "请输入图片链接",
+        "clearImage": "清除图片",
+        "imageUploadSuccess": "图片上传成功",
+        "imageUploadFailed": "图片上传失败",
+        "imageUploadRejected": "图片上传被拒绝",
         "lastOrderBeforeClosing": "关闭前最后点餐时间",
         "lastOrderBeforeClosingDescription": "订单必须在指定的关闭时间前提交",
         "lastOrderMinutesBeforeCloseRule": "不能少过0分钟",
@@ -215,6 +226,8 @@
         "pleaseSelectRestaurant": "请选择一个餐厅",
         "prefix": "前缀",
         "printChecklist": "打印清单",
+        "overridePax": "覆盖账单人数",
+        "overridePaxSublabel": "新订单将覆盖现有账单的人数",
         "preOrder": "预订",
         "preOrderHint": "于今日 {today} 下单，客户可以在 {start} 和 {end} 之间预订。最多 7 天。",
         "printReceiptAfterClose": "自动关闭账单后打印收据",

package/src/main.ts

@@ -7,8 +7,7 @@ import { router } from './router'
 import { initialize, useCoreStore } from '@feedmepos/mf-common'
 import { FeedMeUI } from '@feedmepos/ui-library';
 import { AuthApi } from './api/auth'
-import { getAuth, signInWithCustomToken } from 'firebase/auth'
-import { initializeApp } from 'firebase/app'
+import { signInWithCustomToken } from 'firebase/auth'
 import { useIframeStore } from './stores/iframe'
 import { createFeedMeI18n, type I18n, detectLocale } from "@feedmepos/mf-common"
 import enUS from "./locales/en-US.json"
@@ -16,6 +15,8 @@ import zhCN from "./locales/zh-CN.json"
 import thTH from "./locales/th-TH.json"
 import jaJP from "./locales/ja-JP.json"
 
+import { getFirebaseAuth } from '@/utils/firebase-app'
+
 export const i18nMessages = {
     "en-US": enUS,
     "zh-CN": zhCN,
@@ -34,15 +35,15 @@ function initI18n(): I18n {
 
 const app = createApp(Entry)
 
+app.use(initI18n())
+app.use(createPinia())
+app.use(router)
+
+
 app.use(FeedMeUI, {
     locale: detectLocale(),
 })
 
-app.use(createPinia() as any)
-app.use(router)
-app.use(initI18n() as any)
-
-
 const CoreStore = useCoreStore();
 const iframeMode = computed(() => {
     return new URLSearchParams(window.location.search).get('iframe') === 'true';
@@ -50,18 +51,7 @@ const iframeMode = computed(() => {
 
 useIframeStore().init(iframeMode.value);
 
-const firebaseApp = initializeApp({
-    apiKey: import.meta.env.VITE_FIREBASE_API_KEY,
-    authDomain: import.meta.env.VITE_FIREBASE_AUTH_DOMAIN,
-    projectId: import.meta.env.VITE_FIREBASE_PROJECT_ID,
-    storageBucket: import.meta.env.VITE_FIREBASE_STORAGE_BUCKET,
-    messagingSenderId: import.meta.env.VITE_FIREBASE_MESSAGING_SENDER_ID,
-    appId: import.meta.env.VITE_FIREBASE_APP_ID,
-    measurementId: import.meta.env.VITE_FIREBASE_MEASUREMENT_ID,
-    databaseURL: import.meta.env.VITE_FIREBASE_DATABASE_URL,
-});
-
-const firebaseAuth = getAuth(firebaseApp);
+const firebaseAuth = getFirebaseAuth()
 
 async function signInWithToken(token: string) {
     const customToken = await AuthApi.getCustomToken(token);
@@ -94,4 +84,4 @@ async function init() {
 }
 
 
-init().then(() => app.mount('#app'))
+init().then(() => app.mount('#app'))

package/src/modules/order-setting/kiosk/interface.ts

@@ -80,7 +80,8 @@ export interface MfKioskOrderSetting {
     takeaway: MfKioskTakeawaySetting,
     paymentSetting: MfKioskPaymentSetting,
     menuItem: MfKioskOrderSettingMenuItemForm,
-    otaChannel?: string | null,
+    coverImageLandscape: string | null,
+    coverImagePortrait: string | null,
 }
 
 export interface MfKioskOrderSettingMenuItemForm {
@@ -92,7 +93,8 @@ export interface MfKioskOrderSettingForm {
     takeaway: KioskTakeawaySettingForm,
     paymentSetting: KioskPaymentSettingForm,
     menuItem: KioskMenuItemSettingForm,
-    otaChannel?: string | null,
+    coverImageLandscape: string | null,
+    coverImagePortrait: string | null,
 }
 
 export type KioskPickAtCounterSettingForm = MfKioskPickAtCounterSetting;

package/src/stores/order-setting/mapper.ts

@@ -50,7 +50,7 @@ export const defaultPickUp: KioskPickAtCounterSettingForm = {
   enablePaxDialog: false
 }
 
-export const defaultKioskOrderSetting: MfKioskOrderSettingForm = {
+export const defaultKioskOrderSetting: MfKioskOrderSettingForm = {
   dineIn: {
     enabled: false,
     pickUp: defaultPickUp,
@@ -74,12 +74,13 @@ export const defaultKioskOrderSetting: MfKioskOrderSettingForm = {
         scanPay: false
       }
     }
-  },
-  menuItem: {
-    showAllOnly: false
-  },
-  otaChannel: ''
-}
+  },
+  menuItem: {
+    showAllOnly: false
+  },
+  coverImageLandscape: null,
+  coverImagePortrait: null
+}
 
 export const defaultSubmitOrderInstruction: MfKioskSubmitOrderInstruction = {
   payAtCounter: null,
@@ -108,10 +109,10 @@ const toKiosk = (
       enabled: kioskOrderSettings?.canTakeaway ?? false,
       submitOrderInstruction: kioskOrderSettings?.takeaway?.submitOrderInstruction
         ? {
-          payAtCounter:
-            kioskOrderSettings?.takeaway?.submitOrderInstruction?.payAtCounter?.['en'] ?? null,
-          paid: kioskOrderSettings?.takeaway?.submitOrderInstruction?.paid?.['en'] ?? null
-        }
+            payAtCounter:
+              kioskOrderSettings?.takeaway?.submitOrderInstruction?.payAtCounter?.['en'] ?? null,
+            paid: kioskOrderSettings?.takeaway?.submitOrderInstruction?.paid?.['en'] ?? null
+          }
         : defaultSubmitOrderInstruction
     },
     paymentSetting: {
@@ -130,12 +131,13 @@ const toKiosk = (
           }
         })
     },
-    menuItem: {
-      showAllOnly: kioskOrderSettings?.menuItem?.showAllOnly ?? false
-    },
-    otaChannel: kioskOrderSettings?.otaChannel ?? ''
-  }
-}
+    menuItem: {
+      showAllOnly: kioskOrderSettings?.menuItem?.showAllOnly ?? false
+    },
+    coverImageLandscape: kioskOrderSettings?.coverImageLandscape ?? null,
+    coverImagePortrait: kioskOrderSettings?.coverImagePortrait ?? null
+  }
+}
 
 const toKioskDineInSetting = (
   kioskDineInSeq: OrderKioskDineInSequenceDto,
@@ -146,35 +148,35 @@ const toKioskDineInSetting = (
     sequenceNumber: kioskDineInSeq,
     pickUp: kioskDineInSetting?.pickUp
       ? {
-        ...kioskDineInSetting.pickUp,
-        submitOrderInstruction: kioskDineInSetting.pickUp.submitOrderInstruction
-          ? {
-            payAtCounter:
-              kioskDineInSetting.pickUp.submitOrderInstruction?.payAtCounter?.['en'] ?? null,
-            paid: kioskDineInSetting.pickUp.submitOrderInstruction?.paid?.['en'] ?? null
-          }
-          : defaultSubmitOrderInstruction,
-        enablePaxDialog: kioskDineInSetting.pickUp.enablePaxDialog
-          ? kioskDineInSetting.pickUp.enablePaxDialog
-          : false
-      }
+          ...kioskDineInSetting.pickUp,
+          submitOrderInstruction: kioskDineInSetting.pickUp.submitOrderInstruction
+            ? {
+                payAtCounter:
+                  kioskDineInSetting.pickUp.submitOrderInstruction?.payAtCounter?.['en'] ?? null,
+                paid: kioskDineInSetting.pickUp.submitOrderInstruction?.paid?.['en'] ?? null
+              }
+            : defaultSubmitOrderInstruction,
+          enablePaxDialog: kioskDineInSetting.pickUp.enablePaxDialog
+            ? kioskDineInSetting.pickUp.enablePaxDialog
+            : false
+        }
       : defaultPickUp,
     displayStand: kioskDineInSetting?.displayStand
       ? {
-        enabled: kioskDineInSetting.displayStand.enabled,
-        standSlotRange: kioskDineInSetting.displayStand.standSlotRange,
-        prefix: kioskDineInSetting.displayStand.prefix,
-        padDigit: kioskDineInSetting.displayStand.padDigit,
-        enablePaxDialog: kioskDineInSetting.displayStand.enablePaxDialog ?? false,
-        submitOrderInstruction: kioskDineInSetting.displayStand.submitOrderInstruction
-          ? {
-            payAtCounter:
-              kioskDineInSetting.displayStand.submitOrderInstruction?.payAtCounter?.['en'] ??
-              null,
-            paid: kioskDineInSetting.displayStand.submitOrderInstruction?.paid?.['en'] ?? null
-          }
-          : defaultSubmitOrderInstruction
-      }
+          enabled: kioskDineInSetting.displayStand.enabled,
+          standSlotRange: kioskDineInSetting.displayStand.standSlotRange,
+          prefix: kioskDineInSetting.displayStand.prefix,
+          padDigit: kioskDineInSetting.displayStand.padDigit,
+          enablePaxDialog: kioskDineInSetting.displayStand.enablePaxDialog ?? false,
+          submitOrderInstruction: kioskDineInSetting.displayStand.submitOrderInstruction
+            ? {
+                payAtCounter:
+                  kioskDineInSetting.displayStand.submitOrderInstruction?.payAtCounter?.['en'] ??
+                  null,
+                paid: kioskDineInSetting.displayStand.submitOrderInstruction?.paid?.['en'] ?? null
+              }
+            : defaultSubmitOrderInstruction
+        }
       : defaultDisplayStand
   }
 }
@@ -191,13 +193,13 @@ const toOrderKioskSettingsDto = (
       submitOrderInstruction: {
         payAtCounter: dineInSetting.displayStand.submitOrderInstruction?.payAtCounter
           ? {
-            en: dineInSetting.displayStand.submitOrderInstruction.payAtCounter
-          }
+              en: dineInSetting.displayStand.submitOrderInstruction.payAtCounter
+            }
           : null,
         paid: dineInSetting.displayStand.submitOrderInstruction?.paid
           ? {
-            en: dineInSetting.displayStand.submitOrderInstruction.paid
-          }
+              en: dineInSetting.displayStand.submitOrderInstruction.paid
+            }
           : null
       }
     },
@@ -206,26 +208,27 @@ const toOrderKioskSettingsDto = (
       submitOrderInstruction: {
         payAtCounter: dineInSetting.pickUp.submitOrderInstruction?.payAtCounter
           ? {
-            en: dineInSetting.pickUp.submitOrderInstruction.payAtCounter
-          }
+              en: dineInSetting.pickUp.submitOrderInstruction.payAtCounter
+            }
           : null,
         paid: dineInSetting.pickUp.submitOrderInstruction?.paid
           ? {
-            en: dineInSetting.pickUp.submitOrderInstruction.paid
-          }
+              en: dineInSetting.pickUp.submitOrderInstruction.paid
+            }
           : null
       }
     }
   })
 
-  const createKioskSettings = (dineIn?: OrderKioskDineIn): OrderKioskSettings => ({
-    canTakeaway: kioskSetting.takeaway.enabled,
-    dineIn,
-    menuItem: kioskSetting.menuItem,
-    paymentSetting: createPaymentSettings(kioskSetting.paymentSetting),
-    otaChannel: kioskSetting.otaChannel || undefined,
-    takeaway: kioskSetting.takeaway.submitOrderInstruction
-      ? {
+  const createKioskSettings = (dineIn?: OrderKioskDineIn): OrderKioskSettings => ({
+    canTakeaway: kioskSetting.takeaway.enabled,
+    dineIn,
+    menuItem: kioskSetting.menuItem,
+    coverImageLandscape: kioskSetting.coverImageLandscape,
+    coverImagePortrait: kioskSetting.coverImagePortrait,
+    paymentSetting: createPaymentSettings(kioskSetting.paymentSetting),
+    takeaway: kioskSetting.takeaway.submitOrderInstruction
+      ? {
           submitOrderInstruction: {
             payAtCounter: kioskSetting.takeaway.submitOrderInstruction.payAtCounter
               ? {
@@ -237,8 +240,8 @@ const toOrderKioskSettingsDto = (
                   en: kioskSetting.takeaway.submitOrderInstruction.paid
                 }
               : null
+          }
         }
-      }
       : undefined
   })
 

package/src/utils/firebase-app.ts

@@ -0,0 +1,34 @@
+import type { FirebaseApp } from 'firebase/app'
+import { getApp, getApps, initializeApp } from 'firebase/app'
+import { getAuth } from 'firebase/auth'
+import { getStorage } from 'firebase/storage'
+
+let firebaseApp: FirebaseApp | null = null
+
+export function ensureFirebaseApp(): FirebaseApp {
+  if (firebaseApp) return firebaseApp
+
+  firebaseApp =
+    getApps().length > 0
+      ? getApp()
+      : initializeApp({
+          apiKey: import.meta.env.VITE_FIREBASE_API_KEY,
+          authDomain: import.meta.env.VITE_FIREBASE_AUTH_DOMAIN,
+          projectId: import.meta.env.VITE_FIREBASE_PROJECT_ID,
+          storageBucket: import.meta.env.VITE_FIREBASE_STORAGE_BUCKET,
+          messagingSenderId: import.meta.env.VITE_FIREBASE_MESSAGING_SENDER_ID,
+          appId: import.meta.env.VITE_FIREBASE_APP_ID,
+          measurementId: import.meta.env.VITE_FIREBASE_MEASUREMENT_ID,
+          databaseURL: import.meta.env.VITE_FIREBASE_DATABASE_URL
+        })
+
+  return firebaseApp
+}
+
+export function getFirebaseAuth() {
+  return getAuth(ensureFirebaseApp())
+}
+
+export function getFirebaseStorage() {
+  return getStorage(ensureFirebaseApp())
+}

package/src/utils/firebase-storage.ts

@@ -0,0 +1,112 @@
+import { AuthApi } from '@/api/auth'
+import { SvcConfig } from '@/api'
+import { signInWithCustomToken, signOut } from 'firebase/auth'
+import { ref, uploadBytes } from 'firebase/storage'
+import { getFirebaseAuth, getFirebaseStorage } from './firebase-app'
+
+let pendingFirebaseSignIn: Promise<void> | null = null
+
+function getFileExtension(file: File): string {
+  const nameExt = file.name.split('.').pop()?.toLowerCase()
+  if (nameExt && /^[a-z0-9]+$/.test(nameExt)) return nameExt
+
+  const mimeExtMap: Record<string, string> = {
+    'image/jpeg': 'jpg',
+    'image/png': 'png',
+    'image/webp': 'webp',
+    'image/gif': 'gif'
+  }
+  return mimeExtMap[file.type] ?? 'bin'
+}
+
+function getStorageBucketHost(): string {
+  const endpointWithFirebase = appEndpoint as typeof appEndpoint & {
+    firebase?: { storageBucket?: string }
+  }
+
+  const bucket =
+    endpointWithFirebase.firebase?.storageBucket ??
+    appApi.firebase.storageBucket ??
+    import.meta.env.VITE_FIREBASE_STORAGE_BUCKET
+
+  return bucket.replace(/^https?:\/\//, '').replace(/\/+$/, '')
+}
+
+export function generateItemThumbnailUrl(path: string): string {
+  const normalizedPath = path.replace(/^\/+/, '')
+  return `https://${getStorageBucketHost()}/${normalizedPath}`
+}
+
+async function ensureFirebaseAuth(): Promise<void> {
+  const auth = getFirebaseAuth()
+  if (auth.currentUser) return
+  await auth.authStateReady()
+  if (auth.currentUser) return
+
+  if (!pendingFirebaseSignIn) {
+    pendingFirebaseSignIn = (async () => {
+      const idToken = SvcConfig.getIdToken()
+      if (!idToken) {
+        throw new Error('Missing session token for Firebase authentication')
+      }
+
+      const customToken = await AuthApi.getCustomToken(idToken)
+      await signInWithCustomToken(auth, customToken)
+    })().finally(() => {
+      pendingFirebaseSignIn = null
+    })
+  }
+
+  await pendingFirebaseSignIn
+  if (!auth.currentUser) {
+    throw new Error('User not authenticated for image upload')
+  }
+}
+
+async function forceRefreshFirebaseAuth(): Promise<void> {
+  const auth = getFirebaseAuth()
+  const idToken = SvcConfig.getIdToken()
+  if (!idToken) {
+    throw new Error('Missing session token for Firebase authentication')
+  }
+
+  if (auth.currentUser) {
+    await signOut(auth)
+  }
+
+  const customToken = await AuthApi.getCustomToken(idToken)
+  await signInWithCustomToken(auth, customToken)
+}
+
+async function uploadWithAuthRetry(storagePath: string, file: File): Promise<void> {
+  const storage = getFirebaseStorage()
+  const fileRef = ref(storage, storagePath)
+  try {
+    await uploadBytes(fileRef, file, {
+      contentType: file.type || undefined
+    })
+    return
+  } catch (error) {
+    const code = (error as { code?: string })?.code
+    if (code !== 'storage/unauthorized') {
+      throw error
+    }
+  }
+
+  await forceRefreshFirebaseAuth()
+  const retriedRef = ref(storage, storagePath)
+  await uploadBytes(retriedRef, file, {
+    contentType: file.type || undefined
+  })
+}
+
+export async function uploadImageFile(pathPrefix: string, file: File): Promise<string> {
+  await ensureFirebaseAuth()
+
+  const normalizedPrefix = pathPrefix.replace(/^\/+/, '').replace(/\/+$/, '')
+  const ext = getFileExtension(file)
+  const fileName = `${Date.now()}_${Math.random().toString(36).slice(2, 10)}.${ext}`
+  const fullPath = `${normalizedPrefix}/${fileName}`
+  await uploadWithAuthRetry(fullPath, file)
+  return generateItemThumbnailUrl(fullPath)
+}