@feedmepos/mf-order-setting 0.0.105 → 0.0.106

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (102) hide show
  1. package/dist/DisplaySystemView-aLqc6lz9.js +9068 -0
  2. package/dist/{FoodCourtInvitationsView-Bo174yfB.js → FoodCourtInvitationsView-B30qld2i.js} +4 -4
  3. package/dist/{FoodCourtOrderSettingsView-uUe53O0Z.js → FoodCourtOrderSettingsView-CWmaKgbe.js} +1 -1
  4. package/dist/{FoodCourtOrdersView-CxC5oGp2.js → FoodCourtOrdersView-FfrganVo.js} +4 -4
  5. package/dist/{FoodCourtStallsView-BEpRBmSL.js → FoodCourtStallsView-CpGZNP6p.js} +2 -2
  6. package/dist/{FoodCourtStatusView-DA7mdsuf.js → FoodCourtStatusView-ljQUwIwk.js} +1 -1
  7. package/dist/{KioskDevicesView-BY9Egk75.js → KioskDevicesView-BwDAYIhX.js} +1 -1
  8. package/dist/{KioskDevicesView.vue_vue_type_script_setup_true_lang-CxroxD-b.js → KioskDevicesView.vue_vue_type_script_setup_true_lang-VidDJfGG.js} +487 -473
  9. package/dist/KioskSettingView-mfhi9vuf.js +1240 -0
  10. package/dist/{KioskView-BYL0u6kj.js → KioskView-6p5h92fk.js} +173 -167
  11. package/dist/{OrderSettingsView-BBHAhgE9.js → OrderSettingsView-Cf_Ye9U_.js} +11 -11
  12. package/dist/{RestaurantSelector.vue_vue_type_script_setup_true_lang--9bdtLE1.js → RestaurantSelector.vue_vue_type_script_setup_true_lang-TJJ3PBlq.js} +1 -1
  13. package/dist/{app-BV2USn83.js → app-BorqCaJT.js} +6965 -6415
  14. package/dist/app.js +1 -1
  15. package/dist/{dayjs.min-Bp4Kgnt_.js → dayjs.min-CTTY2vkL.js} +1 -1
  16. package/dist/display-preview/assets/{BandBoard-DIcfXsNV.js → BandBoard-BLwgs3WX.js} +1 -1
  17. package/dist/display-preview/assets/{CarouselBlock-XAhTyEWB.js → CarouselBlock-CUrVSbQp.js} +1 -1
  18. package/dist/display-preview/assets/{CategoryBoard-DBKe18hv.js → CategoryBoard-BkvpcxHR.js} +1 -1
  19. package/dist/display-preview/assets/{ImageBlock-BCbnYSHq.js → ImageBlock-0UYDHTm0.js} +1 -1
  20. package/dist/display-preview/assets/{PickupMode-Df_TPCh8.js → PickupMode-BY4iL0BH.js} +1 -1
  21. package/dist/display-preview/assets/{StatusBoard-28z3bPOf.js → StatusBoard-DGEZ6hvH.js} +1 -1
  22. package/dist/display-preview/assets/{TextBlock-CvJKITtx.js → TextBlock-CxKwtqoO.js} +1 -1
  23. package/dist/display-preview/assets/{VideoBlock-Dop43wDv.js → VideoBlock-BKkxdLAd.js} +1 -1
  24. package/dist/display-preview/assets/{index-cqMoOpSN.js → index-B1olKQmQ.js} +2 -2
  25. package/dist/display-preview/assets/{pickupView-DRMVXqrc.js → pickupView-CB9fV5jD.js} +1 -1
  26. package/dist/display-preview/images/feedme-bg-left-image.png +0 -0
  27. package/dist/display-preview/index.html +1 -1
  28. package/dist/{featureFlag-C1uGG7u6.js → featureFlag-DFenoxmg.js} +1 -1
  29. package/dist/frontend/mf-order/src/api/display-system/index.d.ts +2 -2
  30. package/dist/frontend/mf-order/src/app.d.ts +118 -12
  31. package/dist/frontend/mf-order/src/composables/useDisplaySystemPermission.d.ts +5 -0
  32. package/dist/frontend/mf-order/src/main.d.ts +118 -12
  33. package/dist/frontend/mf-order/src/modules/display-system/interface.d.ts +9 -11
  34. package/dist/frontend/mf-order/src/modules/display-system/legacy-ods/convert.d.ts +10 -0
  35. package/dist/frontend/mf-order/src/modules/kiosk/deviceCount.d.ts +18 -0
  36. package/dist/frontend/mf-order/src/modules/order-setting/kiosk/interface.d.ts +12 -0
  37. package/dist/frontend/mf-order/src/modules/order-setting/kiosk/tableNumberHint.d.ts +33 -0
  38. package/dist/frontend/mf-order/src/stores/display-system/index.d.ts +10 -70
  39. package/dist/frontend/mf-order/src/stores/order-setting/index.d.ts +51 -0
  40. package/dist/frontend/mf-order/src/views/display-system/DisplayTemplateEditor.vue.d.ts +2 -0
  41. package/dist/frontend/mf-order/src/views/display-system/legacy-ods/LegacyOdsTemplateList.vue.d.ts +11 -2
  42. package/dist/frontend/mf-order/src/views/display-system/view-selection.d.ts +1 -2
  43. package/dist/frontend/mf-order/tsconfig.app.tsbuildinfo +1 -1
  44. package/dist/{index-0GuybwuA.js → index-BZkJr7iu.js} +1 -1
  45. package/dist/{index-HF3qh9qG.js → index-C4Isv-r7.js} +1 -1
  46. package/dist/{index-CRNutZC_.js → index-DuJOWWP8.js} +4 -4
  47. package/dist/{index-D0ZIByef.js → index-nUvyt9Wm.js} +1 -1
  48. package/dist/{index-KWOCCun9.js → index-tLkJL436.js} +2 -2
  49. package/dist/{order.dto-GQaBESZq.js → order.dto-nVwtcdX2.js} +6049 -5992
  50. package/dist/package/entity/display/mediaHosts.d.ts +4 -0
  51. package/dist/package/entity/food-court/order-v2.do.d.ts +667 -0
  52. package/dist/package/entity/food-court/order-v2.dto.d.ts +262 -0
  53. package/dist/package/entity/incoming-order/incoming-order-to-bill.dto.d.ts +16 -0
  54. package/dist/package/entity/order-platform/menu.dto.d.ts +44 -44
  55. package/dist/package/entity/order-setting/kiosk/kiosk.do.d.ts +52 -0
  56. package/dist/package/entity/order-setting/kiosk/kiosk.dto.d.ts +293 -0
  57. package/dist/package/entity/order-setting/order-setting.do.d.ts +42 -0
  58. package/dist/package/entity/order-setting/order-setting.dto.d.ts +174 -0
  59. package/dist/package/entity/restaurant/restaurant.dto.d.ts +42 -0
  60. package/dist/package/entity/websocket/websocket.dto.d.ts +92 -0
  61. package/dist/style.css +1 -1
  62. package/dist/{useInternalUser-C39xpsBU.js → useInternalUser-HhxjbzGl.js} +1 -1
  63. package/package.json +3 -3
  64. package/src/api/display-system/index.ts +2 -2
  65. package/src/composables/useDisplaySystemPermission.spec.ts +27 -0
  66. package/src/composables/useDisplaySystemPermission.ts +16 -0
  67. package/src/locales/en-US.json +51 -17
  68. package/src/locales/ja-JP.json +26 -11
  69. package/src/locales/th-TH.json +32 -17
  70. package/src/locales/zh-CN.json +51 -17
  71. package/src/modules/display-system/interface.spec.ts +1 -32
  72. package/src/modules/display-system/interface.ts +7 -24
  73. package/src/modules/display-system/legacy-ods/convert.spec.ts +65 -0
  74. package/src/modules/display-system/legacy-ods/convert.ts +95 -0
  75. package/src/modules/display-system/legacy-ods/media.spec.ts +16 -0
  76. package/src/modules/kiosk/deviceCount.spec.ts +23 -0
  77. package/src/modules/kiosk/deviceCount.ts +21 -0
  78. package/src/modules/order-setting/kiosk/interface.ts +13 -0
  79. package/src/modules/order-setting/kiosk/tableNumberHint.spec.ts +68 -0
  80. package/src/modules/order-setting/kiosk/tableNumberHint.ts +71 -0
  81. package/src/router/display-system-permission.spec.ts +13 -0
  82. package/src/router/routes.ts +2 -1
  83. package/src/stores/display-system/index.spec.ts +104 -0
  84. package/src/stores/display-system/index.ts +18 -7
  85. package/src/stores/order-setting/mapper.ts +11 -2
  86. package/src/views/display-system/DisplayInspector.vue +3 -0
  87. package/src/views/display-system/DisplayModulePickerDialog.vue +8 -0
  88. package/src/views/display-system/DisplaySystemView.conversion.spec.ts +164 -0
  89. package/src/views/display-system/DisplaySystemView.vue +72 -26
  90. package/src/views/display-system/DisplayTemplateEditor.spec.ts +18 -0
  91. package/src/views/display-system/DisplayTemplateEditor.vue +8 -2
  92. package/src/views/display-system/legacy-ods/LegacyOdsTemplateList.spec.ts +44 -4
  93. package/src/views/display-system/legacy-ods/LegacyOdsTemplateList.vue +12 -4
  94. package/src/views/display-system/view-selection.spec.ts +4 -17
  95. package/src/views/display-system/view-selection.ts +3 -4
  96. package/src/views/kiosk/devices/KioskDevicesView.vue +6 -2
  97. package/src/views/kiosk/devices/KioskLicenseSummary.spec.ts +45 -0
  98. package/src/views/kiosk/devices/KioskLicenseSummary.vue +9 -2
  99. package/src/views/kiosk/settings/KioskSettingView.vue +140 -6
  100. package/vitest.config.ts +1 -0
  101. package/dist/DisplaySystemView-CFr9DnaD.js +0 -8926
  102. package/dist/KioskSettingView-DPaQ7YFV.js +0 -1124
@@ -0,0 +1,164 @@
1
+ // @vitest-environment happy-dom
2
+ import { afterEach, describe, expect, it, vi } from 'vitest'
3
+ import { mount, flushPromises } from '@vue/test-utils'
4
+ import { reactive, ref } from 'vue'
5
+ import { convertLegacyOds } from '@/modules/display-system/legacy-ods/convert'
6
+
7
+ const mocks = vi.hoisted(() => ({ query: {} as Record<string, string>, store: {} as any, core: {} as any, permission: {} as any, replace: vi.fn(), error: vi.fn() }))
8
+ vi.mock('vue-router', () => ({ useRoute: () => ({ query: mocks.query }), useRouter: () => ({ replace: mocks.replace }) }))
9
+ vi.mock('@feedmepos/mf-common', () => ({ useCoreStore: () => mocks.core, useI18n: () => ({ t: (key: string) => key }) }))
10
+ vi.mock('@/stores/display-system', () => ({ useDisplaySystemStore: () => mocks.store }))
11
+ vi.mock('@/composables/useDisplaySystemPermission', () => ({ useDisplaySystemPermission: () => ({ canManageDisplaySystem: mocks.permission }) }))
12
+ vi.mock('@/composables/useMiniProgramPermission', () => ({ useMiniProgramPermission: () => ({ canManageBrandkit: ref(true) }) }))
13
+ vi.mock('@/api/brandkit', () => ({ getBusinessBrandkit: vi.fn().mockResolvedValue({}) }))
14
+ vi.mock('@/components/snackbar', () => ({ useSnackbarFunctions: () => ({ showError: mocks.error, showSuccess: vi.fn() }) }))
15
+ vi.mock('./DisplayTemplateEditor.vue', () => ({ default: { name: 'Editor', props: ['modelValue','template','initialDraft','conversionNotices','saving'], template: '<div />' } }))
16
+ vi.mock('./DisplayScreenEditor.vue', () => ({ default: { template: '<div />' } }))
17
+ vi.mock('./DisplayLayoutMap.vue', () => ({ default: { template: '<div />' } }))
18
+ vi.mock('./legacy-ods/LegacyOdsTemplateList.vue', () => ({ default: { name: 'Legacy', props: ['canConvert','converting'], template: '<div />' } }))
19
+ import View from './DisplaySystemView.vue'
20
+ let wrapper: ReturnType<typeof mount> | undefined
21
+ const entry = { label: 'Old', isDefault: true }
22
+ afterEach(() => { wrapper?.unmount(); vi.clearAllMocks() })
23
+ async function setup(newView = false) {
24
+ mocks.query = newView ? { view: 'v8' } : {}
25
+ mocks.permission = ref(true)
26
+ mocks.core = { currentBusiness: ref({ _id:'business' }), currentCountry: ref('MY'), namespace: ref('dev'), currentRestaurant: ref({ _id:'outlet' }), restaurants: ref([{ _id:'outlet', posVersion:'7.12.40', profile: { name:'Outlet' } }]) }
27
+ mocks.store = reactive({ templates: [], screens: [], screenCapabilities: { posSupported: true, tvDisplaySettingsEnabled: true, screenLimit: 1, screenUsed: 0, capabilities:['PICKUP'] },
28
+ loadTemplates: vi.fn().mockResolvedValue(undefined), loadScreens: vi.fn().mockResolvedValue(undefined), loadScreenCapabilities: vi.fn().mockResolvedValue(undefined), createTemplate: vi.fn().mockResolvedValue({ _id:'new' }), updateTemplate: vi.fn().mockResolvedValue({}) })
29
+ wrapper = mount(View, { global: { stubs: { FmPageHead:true,FmButton:true,FmTab:true,FmTabs:true,FmSelect:true,FmCircularProgress:true } } })
30
+ await flushPromises()
31
+ return wrapper
32
+ }
33
+ async function convert(w: ReturnType<typeof mount>) {
34
+ w.findComponent({ name:'Legacy' }).vm.$emit('convert', entry, 'Old')
35
+ // crypto.subtle.digest completes outside Vue's microtask queue.
36
+ await vi.waitFor(() => expect(w.findComponent({ name:'Editor' }).props('modelValue')).toBe(true))
37
+ return w.findComponent({ name:'Editor' })
38
+ }
39
+
40
+ describe('ODS conversion flow', () => {
41
+ it('opens an unsaved preview and creates only after Save; failures leave the editor open', async () => {
42
+ const w = await setup()
43
+ expect(w.find('[data-testid="legacy-migration-note"]').exists()).toBe(true)
44
+ const editor = await convert(w)
45
+ expect(mocks.store.createTemplate).not.toHaveBeenCalled()
46
+ const draft = editor.props('initialDraft')
47
+ expect(draft.label).toBe('Old')
48
+ mocks.store.createTemplate.mockRejectedValueOnce(new Error('offline'))
49
+ editor.vm.$emit('save', draft)
50
+ await flushPromises()
51
+ expect(editor.props('modelValue')).toBe(true)
52
+ expect(mocks.error).toHaveBeenCalledWith('offline')
53
+ editor.vm.$emit('save', draft)
54
+ await flushPromises()
55
+ expect(editor.props('modelValue')).toBe(false)
56
+ expect(mocks.replace).toHaveBeenCalledWith({ query: { view:'v8' } })
57
+ })
58
+ it('reopens the saved conversion rather than creating another template', async () => {
59
+ const w = await setup()
60
+ const conversion = await convertLegacyOds(entry, 'Old')
61
+ mocks.store.templates = [{ ...conversion.draft, _id:'converted', revision:2 }]
62
+ const editor = await convert(w)
63
+ expect(editor.props('template')._id).toBe('converted')
64
+ editor.vm.$emit('save', conversion.draft)
65
+ await flushPromises()
66
+ expect(mocks.store.createTemplate).not.toHaveBeenCalled()
67
+ expect(mocks.store.updateTemplate).toHaveBeenCalledWith('converted', expect.objectContaining({ expectedRevision:2 }))
68
+ })
69
+ it('does not offer conversion without Display System permission', async () => {
70
+ const w = await setup()
71
+ const legacy = w.findComponent({ name:'Legacy' }).vm
72
+ mocks.permission.value = false
73
+ await flushPromises()
74
+ expect(w.findComponent({ name:'Legacy' }).exists()).toBe(false)
75
+ expect(w.find('[data-testid="legacy-migration-note"]').exists()).toBe(false)
76
+ legacy.$emit('convert', entry, 'Old')
77
+ await flushPromises()
78
+ expect(w.findComponent({ name:'Editor' }).exists()).toBe(false)
79
+ expect(mocks.store.createTemplate).not.toHaveBeenCalled()
80
+ })
81
+ })
82
+
83
+
84
+ describe('Display System availability messages', () => {
85
+ it('distinguishes supported v7, unsupported, loading and unavailable capabilities', async () => {
86
+ const w = await setup(true)
87
+ expect(w.text()).not.toContain('order.displaySystem.posUnsupportedVersion')
88
+ mocks.store.screenCapabilities.posSupported = false
89
+ await flushPromises()
90
+ expect(w.text()).toContain('order.displaySystem.posUnsupportedVersion')
91
+ mocks.store.loadingScreenCapabilities = true
92
+ await flushPromises()
93
+ expect(w.text()).not.toContain('order.displaySystem.posUnsupportedVersion')
94
+ expect(w.text()).not.toContain('order.displaySystem.availabilityUnavailable')
95
+ mocks.store.screenCapabilities = undefined
96
+ mocks.store.loadingScreenCapabilities = false
97
+ await flushPromises()
98
+ expect(w.text()).toContain('order.displaySystem.availabilityUnavailable')
99
+ expect(w.text()).not.toContain('order.displaySystem.posUnsupportedVersion')
100
+ expect(w.text()).not.toContain('order.displaySystem.screenLimitReached')
101
+ const retry = w.findAllComponents({ name: 'FmButton' }).find(b => b.attributes('label') === 'order.displaySystem.retryAvailability')
102
+ expect(retry).toBeDefined()
103
+ const before = mocks.store.loadScreenCapabilities.mock.calls.length
104
+ retry!.vm.$emit('click')
105
+ await flushPromises()
106
+ expect(mocks.store.loadScreenCapabilities).toHaveBeenCalledTimes(before + 1)
107
+ })
108
+ it('retains support for v8 responses from an older backend', async () => {
109
+ const w = await setup(true)
110
+ mocks.core.restaurants.value[0].posVersion = '8.0.0'
111
+ mocks.store.screenCapabilities = { posV8: true, screenLimit: 1, screenUsed: 0, capabilities: ['PICKUP'] }
112
+ await flushPromises()
113
+ expect(w.text()).not.toContain('order.displaySystem.posUnsupportedVersion')
114
+ mocks.store.screenCapabilities.posV8 = false
115
+ await flushPromises()
116
+ expect(w.text()).toContain('order.displaySystem.posUnsupportedVersion')
117
+ })
118
+ })
119
+
120
+
121
+ describe('POS v7 settings rollout in Portal', () => {
122
+ it('blocks adding screens while retaining existing screens and template editing', async () => {
123
+ const w = await setup(true)
124
+ mocks.store.templates = [{ _id:'template', label:'Welcome', root:{ kind:'ZONE', id:'root' }, orientation:'LANDSCAPE' }]
125
+ mocks.store.screens = [{ _id:'screen', name:'Lobby', status:'ACTIVE', templateId:'template' }]
126
+ await flushPromises()
127
+ const addScreen = () => w.findAllComponents({ name:'FmButton' }).find(b => b.attributes('label') === 'order.displaySystem.addScreen')!
128
+ expect(addScreen().attributes('disabled')).toBe('false')
129
+ mocks.store.screenCapabilities.tvDisplaySettingsEnabled = false
130
+ await flushPromises()
131
+ expect(addScreen().attributes('disabled')).toBe('true')
132
+ expect(w.text()).toContain('order.displaySystem.tvSettingsNotEnabled')
133
+ expect(w.text()).not.toContain('order.displaySystem.posUnsupportedVersion')
134
+ expect(w.text()).not.toContain('order.displaySystem.screenLimitReached')
135
+ expect(w.text()).not.toContain('order.displaySystem.unlicensedNote')
136
+ expect(w.text()).toContain('Lobby')
137
+ expect(w.findAllComponents({ name:'FmButton' }).some(b => b.attributes('icon') === 'edit')).toBe(true)
138
+ const tabs = w.findComponent({ name:'FmTabs' })
139
+ tabs.vm.$emit('update:modelValue', 'templates')
140
+ await flushPromises()
141
+ const addTemplate = w.findAllComponents({ name:'FmButton' }).find(b => b.attributes('label') === 'order.displaySystem.addTemplateAction')!
142
+ expect(addTemplate.attributes('disabled')).toBe('false')
143
+ expect(w.text()).not.toContain('order.displaySystem.tvSettingsNotEnabled')
144
+ })
145
+ it('uses neutral ODS wording and hides migration offers while rollout is closed', async () => {
146
+ const w = await setup()
147
+ mocks.store.screenCapabilities.tvDisplaySettingsEnabled = false
148
+ await flushPromises()
149
+ expect(w.findComponent({ name:'FmPageHead' }).attributes('title')).toBe('order.displaySystem.odsTitle')
150
+ expect(w.text()).toContain('order.displaySystem.odsDescription')
151
+ expect(w.find('[data-testid="legacy-migration-note"]').exists()).toBe(false)
152
+ expect(w.findComponent({ name:'Legacy' }).props('canConvert')).toBe(false)
153
+ })
154
+ it('distinguishes an unavailable rollout read and ignores the v7 flag for v8', async () => {
155
+ const w = await setup(true)
156
+ mocks.store.screenCapabilities.tvDisplaySettingsEnabled = null
157
+ await flushPromises()
158
+ expect(w.text()).toContain('order.displaySystem.availabilityUnavailable')
159
+ expect(w.text()).not.toContain('order.displaySystem.tvSettingsNotEnabled')
160
+ mocks.core.restaurants.value[0].posVersion = '8.0.0'
161
+ await flushPromises()
162
+ expect(w.find('[data-testid="tv-settings-restriction"]').exists()).toBe(false)
163
+ })
164
+ })
@@ -6,15 +6,16 @@ import type { FmTabProps, ISelectItem } from '@feedmepos/ui-library'
6
6
 
7
7
  import { useSnackbarFunctions } from '@/components/snackbar'
8
8
  import type { CreateDisplayScreen, DisplayScreen, DisplayTemplate, DisplayTemplateDraft } from '@/modules/display-system/interface'
9
- import { displayTemplatePayload, displayTemplateToDraft, templateCapabilities, unlicensedScreenIds, walkZones } from '@/modules/display-system/interface'
9
+ import { displayTemplatePayload, displayTemplateToDraft, templateCapabilities, walkZones } from '@/modules/display-system/interface'
10
10
  import { useDisplaySystemStore } from '@/stores/display-system'
11
11
  import DisplayScreenEditor from './DisplayScreenEditor.vue'
12
12
  import DisplayTemplateEditor from './DisplayTemplateEditor.vue'
13
13
  import DisplayLayoutMap from './DisplayLayoutMap.vue'
14
- import { useOrderSettingPermission } from '@/composables/useOrderSettingPermission'
15
- import { useMiniProgramPermission } from '@/composables/useMiniProgramPermission'
14
+ import { useDisplaySystemPermission } from '@/composables/useDisplaySystemPermission'
16
15
  import { getBusinessBrandkit } from '@/api/brandkit'
17
16
  import { availableDisplaySystemViews, defaultDisplaySystemView, isPosV8, requestedDisplaySystemView, type DisplaySystemView } from './view-selection'
17
+ import { convertLegacyOds } from '@/modules/display-system/legacy-ods/convert'
18
+ import type { OdsConfigEntry } from '@/modules/display-system/legacy-ods/interface'
18
19
  import LegacyOdsTemplateList from './legacy-ods/LegacyOdsTemplateList.vue'
19
20
 
20
21
  const { t } = useI18n()
@@ -23,13 +24,11 @@ const route = useRoute()
23
24
  const router = useRouter()
24
25
  const core = useCoreStore()
25
26
  const store = useDisplaySystemStore()
26
- const { canManageOrderSetting } = useOrderSettingPermission()
27
- const { canManageBrandkit } = useMiniProgramPermission()
27
+ const { canManageDisplaySystem } = useDisplaySystemPermission()
28
28
  const hasLegacyOdsConfigs = ref(false)
29
29
  const availableViews = computed(() =>
30
30
  availableDisplaySystemViews({
31
- canManageOrderSetting: canManageOrderSetting.value,
32
- canManageBrandkit: canManageBrandkit.value,
31
+ canManageDisplaySystem: canManageDisplaySystem.value,
33
32
  outlets: core.restaurants.value,
34
33
  hasLegacyOdsConfigs: hasLegacyOdsConfigs.value
35
34
  })
@@ -61,7 +60,7 @@ function switchView(view: DisplaySystemView) {
61
60
  }
62
61
  // Only an all-v8 business needs this: one with a v7 outlet already gets the v7 view.
63
62
  watch(
64
- [() => core.currentBusiness.value?._id, canManageBrandkit, () => core.restaurants.value.some((outlet) => outlet.posVersion && !isPosV8(outlet.posVersion))],
63
+ [() => core.currentBusiness.value?._id, canManageDisplaySystem, () => core.restaurants.value.some((outlet) => outlet.posVersion && !isPosV8(outlet.posVersion))],
65
64
  async ([businessId, canManage, hasV7Outlet]) => {
66
65
  hasLegacyOdsConfigs.value = false
67
66
  if (!businessId || !canManage || hasV7Outlet) return
@@ -80,6 +79,30 @@ const templateEditorOpen = ref(false)
80
79
  const screenEditorOpen = ref(false)
81
80
  const editingTemplate = ref<DisplayTemplate>()
82
81
  const editingScreen = ref<DisplayScreen>()
82
+ const conversionDraft = ref<DisplayTemplateDraft>()
83
+ const conversionNotices = ref<string[]>([])
84
+ const converting = ref(false)
85
+ function clearConversion() { conversionDraft.value = undefined; conversionNotices.value = [] }
86
+ async function convertOds(entry: OdsConfigEntry, label: string) {
87
+ if (!showMigration.value || converting.value) return
88
+ converting.value = true
89
+ const businessId = core.currentBusiness.value?._id
90
+ const namespace = core.namespace.value
91
+ try {
92
+ const conversion = await convertLegacyOds(entry, label)
93
+ await store.loadTemplates()
94
+ if (businessId !== core.currentBusiness.value?._id || namespace !== core.namespace.value || !canManageDisplaySystem.value) return
95
+ const existing = store.templates.find(template => walkZones(template.root as never).some(zone => zone.id === conversion.sourceZoneId))
96
+ editingTemplate.value = existing
97
+ conversionDraft.value = conversion.draft
98
+ conversionNotices.value = [
99
+ ...(existing ? [t('order.displaySystem.legacyOds.conversion.existing')] : []),
100
+ ...conversion.notices.map(notice => t(`order.displaySystem.legacyOds.conversion.${notice}`))
101
+ ]
102
+ templateEditorOpen.value = true
103
+ } catch (error) { showError(error instanceof Error ? error.message : t('order.displaySystem.saveFailed')) }
104
+ finally { converting.value = false }
105
+ }
83
106
  const saving = ref(false)
84
107
  const legacyOdsList = ref<InstanceType<typeof LegacyOdsTemplateList>>()
85
108
 
@@ -90,13 +113,23 @@ const selectedRestaurant = computed(() =>
90
113
  const selectedRestaurantIsV8 = computed(() => isPosV8(selectedRestaurant.value?.posVersion))
91
114
  const restaurantItems = computed<ISelectItem[]>(() => core.restaurants.value.map((restaurant) => ({ label: restaurant.profile.name, value: restaurant._id })))
92
115
  const entitlement = computed(() => store.screenCapabilities)
93
- // Oldest screens keep the licence, so the newest lose it first. Merchants can
94
- // act on this: buy another screen, or pause one.
95
- const unlicensedScreens = computed(() =>
96
- unlicensedScreenIds(store.screens, entitlement.value?.screenLimit ?? 0))
116
+ // Capability availability is distinct from an unsupported POS version.
117
+ // Older servers still expose posV8; current servers decide v7 support too.
118
+ const selectedRestaurantSupported = computed(() => {
119
+ const capabilities = entitlement.value
120
+ if (!capabilities || store.loadingScreenCapabilities) return undefined
121
+ return capabilities.posSupported ?? (selectedRestaurantIsV8.value && capabilities.posV8)
122
+ })
123
+ // Never turn a hidden settings entry into a licence or runtime restriction.
124
+ const settingsEnabled = computed(() => selectedRestaurantIsV8.value
125
+ ? true : entitlement.value?.tvDisplaySettingsEnabled)
126
+ const canConfigureTv = computed(() => selectedRestaurantSupported.value === true && settingsEnabled.value === true)
127
+ const showMigration = computed(() => canManageDisplaySystem.value && canConfigureTv.value)
128
+ const legacyTitle = computed(() => t(showMigration.value ? 'order.displaySystem.legacyOds.title' : 'order.displaySystem.odsTitle'))
129
+ const legacyDescription = computed(() => t(showMigration.value ? 'order.displaySystem.legacyOds.description' : 'order.displaySystem.odsDescription'))
97
130
  const remainingScreens = computed(() => Math.max(0, (entitlement.value?.screenLimit ?? 0) - (entitlement.value?.screenUsed ?? 0)))
98
131
  const applicableTemplates = computed(() => store.templates.filter((template) => !template.restaurantIds?.length || template.restaurantIds.includes(selectedRestaurantId.value)))
99
- const canAddScreen = computed(() => Boolean(selectedRestaurantId.value && selectedRestaurantIsV8.value && entitlement.value?.posV8 && remainingScreens.value > 0 && applicableTemplates.value.length))
132
+ const canAddScreen = computed(() => Boolean(selectedRestaurantId.value && canConfigureTv.value && remainingScreens.value > 0 && applicableTemplates.value.length))
100
133
 
101
134
  function templateName(id: string) { return store.templates.find((template) => template._id === id)?.label ?? 'Unknown template' }
102
135
  function orientationMismatch(screen: DisplayScreen) {
@@ -112,7 +145,7 @@ function layoutSummary(template: DisplayTemplate) {
112
145
  function isOnline(screen: DisplayScreen) { return Boolean(screen.lastSeenAt && Date.now() - new Date(screen.lastSeenAt).getTime() < 120_000) }
113
146
 
114
147
  async function loadContext() {
115
- if (!canManageOrderSetting.value || !selectedRestaurantId.value) return
148
+ if (!canManageDisplaySystem.value || !selectedRestaurantId.value) return
116
149
  try { await Promise.all([store.loadScreens(selectedRestaurantId.value), store.loadScreenCapabilities(selectedRestaurantId.value)]) }
117
150
  catch (error) { showError(error instanceof Error ? error.message : t('order.displaySystem.loadFailed')) }
118
151
  }
@@ -122,18 +155,20 @@ async function selectRestaurant(id: string) {
122
155
  if (restaurant) await core.changeRestaurant(restaurant)
123
156
  await loadContext()
124
157
  }
125
- function addTemplate() { editingTemplate.value = undefined; templateEditorOpen.value = true }
126
- function editTemplate(template: DisplayTemplate) { editingTemplate.value = template; templateEditorOpen.value = true }
158
+ function addTemplate() { clearConversion(); editingTemplate.value = undefined; templateEditorOpen.value = true }
159
+ function editTemplate(template: DisplayTemplate) { clearConversion(); editingTemplate.value = template; templateEditorOpen.value = true }
127
160
  function addScreen() { if (canAddScreen.value) { editingScreen.value = undefined; screenEditorOpen.value = true } }
128
161
  function editScreen(screen: DisplayScreen) { editingScreen.value = screen; screenEditorOpen.value = true }
129
162
 
130
163
  async function saveTemplate(draft: DisplayTemplateDraft) {
164
+ if (saving.value || !canManageDisplaySystem.value) return
131
165
  saving.value = true
132
166
  try {
133
167
  const payload = displayTemplatePayload(draft)
134
168
  if (editingTemplate.value) await store.updateTemplate(editingTemplate.value._id, { ...payload, expectedRevision: editingTemplate.value.revision })
135
169
  else await store.createTemplate(payload)
136
170
  templateEditorOpen.value = false
171
+ if (conversionDraft.value) { selectedTab.value = 'templates'; switchView('v8'); clearConversion() }
137
172
  showSuccess(t('order.displaySystem.templateSaved'))
138
173
  } catch (error) { showError(error instanceof Error ? error.message : t('order.displaySystem.saveFailed')) }
139
174
  finally { saving.value = false }
@@ -172,7 +207,7 @@ async function toggleStatus(screen: DisplayScreen) {
172
207
 
173
208
  onMounted(async () => {
174
209
  if (!selectedRestaurantId.value && core.restaurants.value.length) selectedRestaurantId.value = core.restaurants.value[0]._id
175
- if (!canManageOrderSetting.value) return
210
+ if (!canManageDisplaySystem.value) return
176
211
  try { await store.loadTemplates() } catch (error) { showError(error instanceof Error ? error.message : t('order.displaySystem.loadFailed')) }
177
212
  await loadContext()
178
213
  })
@@ -180,25 +215,33 @@ watch(() => core.restaurants.value.length, async (length) => { if (!selectedRest
180
215
  </script>
181
216
 
182
217
  <template>
183
- <div class="py-[1.5rem]"><FmPageHead :title="selectedView === 'v7' ? t('order.displaySystem.legacyOds.title') : t('order.displaySystem.title')" />
218
+ <div class="py-[1.5rem]"><FmPageHead :title="selectedView === 'v7' ? legacyTitle : t('order.displaySystem.title')" />
184
219
  <div class="px-[1.5rem]">
185
- <div class="display-toolbar"><p class="text-sm text-gray-500">{{ selectedView === 'v7' ? t('order.displaySystem.legacyOds.description') : t('order.displaySystem.description') }}</p><div class="display-actions"><FmButton v-if="otherView" variant="plain" size="md" :label="otherView === 'v7' ? t('order.displaySystem.legacyOds.switchToLegacy') : t('order.displaySystem.legacyOds.switchToDisplaySystem')" @click="switchView(otherView)" /><FmButton v-if="selectedView === 'v7'" icon="add" size="md" :label="t('order.displaySystem.legacyOds.addConfiguration')" @click="legacyOdsList?.addOdsEntry()" /><FmButton v-else-if="selectedView === 'v8'" icon="add" size="md" :label="selectedTab === 'screens' ? t('order.displaySystem.addScreen') : t('order.displaySystem.addTemplateAction')" :disabled="selectedTab === 'screens' && !canAddScreen" @click="selectedTab === 'screens' ? addScreen() : addTemplate()" /></div></div>
220
+ <div class="display-toolbar"><p class="text-sm text-gray-500">{{ selectedView === 'v7' ? legacyDescription : t('order.displaySystem.description') }}</p><div class="display-actions"><FmButton v-if="otherView" variant="plain" size="md" :label="otherView === 'v7' ? (showMigration ? t('order.displaySystem.legacyOds.switchToLegacy') : t('order.displaySystem.switchToOds')) : t('order.displaySystem.legacyOds.switchToDisplaySystem')" @click="switchView(otherView)" /><FmButton v-if="selectedView === 'v7'" icon="add" size="md" :label="t('order.displaySystem.legacyOds.addConfiguration')" @click="legacyOdsList?.addOdsEntry()" /><FmButton v-else-if="selectedView === 'v8'" icon="add" size="md" :label="selectedTab === 'screens' ? t('order.displaySystem.addScreen') : t('order.displaySystem.addTemplateAction')" :disabled="selectedTab === 'screens' && !canAddScreen" @click="selectedTab === 'screens' ? addScreen() : addTemplate()" /></div></div>
186
221
  <template v-if="selectedView === 'v8'">
187
222
  <!-- The outlet picker and its allowance belong to the Screens tab only:
188
223
  screens are bought and paired per outlet, while templates are
189
224
  business-wide and would read as outlet-scoped next to a picker. -->
190
225
  <div class="display-controls"><FmTabs v-model:model-value="selectedTab" :items="tabs" /><div v-if="selectedTab === 'screens'" class="display-outlet"><p v-if="entitlement" class="display-entitlement">{{ t('order.displaySystem.screensUsed', { used: entitlement.screenUsed, limit: entitlement.screenLimit }) }} · {{ entitlement.capabilities.join(', ') || t('order.displaySystem.noModulesLicensed') }}</p><FmSelect class="display-restaurant-select" :model-value="selectedRestaurantId" :items="restaurantItems" :placeholder="t('order.displaySystem.selectRestaurant')" searchable @update:model-value="selectRestaurant" /></div></div>
191
- <div v-if="selectedTab === 'screens' && selectedRestaurant && !selectedRestaurantIsV8" class="restriction-note">
192
- <p>{{ selectedRestaurant.posVersion ? t('order.displaySystem.posV8RequiredVersion', { version: selectedRestaurant.posVersion }) : t('order.displaySystem.posV8Required') }}</p>
226
+ <div v-if="selectedTab === 'screens' && selectedRestaurant && !store.loadingScreenCapabilities && selectedRestaurantSupported === undefined" class="restriction-note">
227
+ <p>{{ t('order.displaySystem.availabilityUnavailable') }}</p>
228
+ <FmButton variant="plain" :label="t('order.displaySystem.retryAvailability')" @click="loadContext()" />
229
+ </div>
230
+ <div v-else-if="selectedTab === 'screens' && selectedRestaurant && selectedRestaurantSupported === false" class="restriction-note">
231
+ <p>{{ selectedRestaurant.posVersion ? t('order.displaySystem.posUnsupportedVersion', { version: selectedRestaurant.posVersion }) : t('order.displaySystem.posUnsupported') }}</p>
193
232
  <FmButton v-if="availableViews.includes('v7')" variant="plain" :label="t('order.displaySystem.legacyOds.openLegacyTab')" @click="switchView('v7')" />
194
233
  </div>
234
+ <div v-else-if="selectedTab === 'screens' && selectedRestaurant && !store.loadingScreenCapabilities && settingsEnabled !== true" class="restriction-note" data-testid="tv-settings-restriction">
235
+ <p>{{ settingsEnabled === false ? t('order.displaySystem.tvSettingsNotEnabled') : t('order.displaySystem.availabilityUnavailable') }}</p>
236
+ <FmButton v-if="settingsEnabled !== false" variant="plain" :label="t('order.displaySystem.retryAvailability')" @click="loadContext()" />
237
+ </div>
195
238
  <p v-else-if="selectedTab === 'screens' && !canAddScreen && !store.loadingScreenCapabilities" class="restriction-note">{{ applicableTemplates.length ? t('order.displaySystem.screenLimitReached') : t('order.displaySystem.noTemplatesDescription') }}</p>
196
239
 
197
240
  <section v-if="selectedTab === 'screens'" class="mt-12">
198
241
  <div v-if="store.loadingScreens" class="flex justify-center py-40"><FmCircularProgress size="lg" /></div>
199
242
  <div v-else-if="!store.screens.length" class="empty-state"><strong>{{ t('order.displaySystem.noScreens') }}</strong><span>Create a screen and assign one applicable template.</span></div>
200
243
  <div v-else class="grid grid-cols-1 gap-16 xl:grid-cols-2">
201
- <article v-for="screen in store.screens" :key="screen._id" class="resource-card"><div class="flex justify-between gap-12"><div class="min-w-0"><div class="flex flex-wrap items-center gap-8"><h3 class="truncate text-lg font-semibold">{{ screen.name }}</h3><span class="status-badge" :class="screen.status.toLowerCase()">{{ screen.status }}</span><span class="online-dot" :class="{ online: isOnline(screen) }">{{ isOnline(screen) ? t('order.displaySystem.online') : t('order.displaySystem.offline') }}</span><span v-if="unlicensedScreens.has(screen._id)" class="status-badge unlicensed">{{ t('order.displaySystem.unlicensed') }}</span></div><p class="mt-4 text-sm text-gray-500">{{ templateName(screen.templateId) }}</p><p v-if="orientationMismatch(screen)" class="mt-2 text-xs text-orange-700">Reported viewport orientation does not match the template.</p><p v-if="unlicensedScreens.has(screen._id)" class="mt-2 text-xs text-red-700">{{ t('order.displaySystem.unlicensedNote') }}</p></div><div class="flex gap-4"><FmButton :icon="screen.status === 'DISABLED' ? 'play_arrow' : 'pause'" variant="plain" @click="toggleStatus(screen)" /><FmButton icon="edit" variant="plain" @click="editScreen(screen)" /><FmButton icon="delete" variant="plain" @click="removeScreen(screen)" /></div></div><dl class="meta-grid"><div><dt>{{ t('order.displaySystem.deviceId') }}</dt><dd>{{ screen.deviceId || '—' }}</dd></div><div><dt>{{ t('order.displaySystem.lastSeen') }}</dt><dd>{{ screen.lastSeenAt ? new Date(screen.lastSeenAt).toLocaleString() : '—' }}</dd></div></dl></article>
244
+ <article v-for="screen in store.screens" :key="screen._id" class="resource-card"><div class="flex justify-between gap-12"><div class="min-w-0"><div class="flex flex-wrap items-center gap-8"><h3 class="truncate text-lg font-semibold">{{ screen.name }}</h3><span class="status-badge" :class="screen.status.toLowerCase()">{{ screen.status }}</span><span class="online-dot" :class="{ online: isOnline(screen) }">{{ isOnline(screen) ? t('order.displaySystem.online') : t('order.displaySystem.offline') }}</span><span v-if="screen.status !== 'DISABLED' && screen.licensed === false" class="status-badge unlicensed">{{ t('order.displaySystem.unlicensed') }}</span></div><p class="mt-4 text-sm text-gray-500">{{ templateName(screen.templateId) }}</p><p v-if="orientationMismatch(screen)" class="mt-2 text-xs text-orange-700">Reported viewport orientation does not match the template.</p><p v-if="screen.status !== 'DISABLED' && screen.licensed === false" class="mt-2 text-xs text-red-700">{{ t('order.displaySystem.unlicensedNote') }}</p></div><div class="flex gap-4"><FmButton :icon="screen.status === 'DISABLED' ? 'play_arrow' : 'pause'" variant="plain" @click="toggleStatus(screen)" /><FmButton icon="edit" variant="plain" @click="editScreen(screen)" /><FmButton icon="delete" variant="plain" @click="removeScreen(screen)" /></div></div><dl class="meta-grid"><div><dt>{{ t('order.displaySystem.deviceId') }}</dt><dd>{{ screen.deviceId || '—' }}</dd></div><div><dt>{{ t('order.displaySystem.lastSeen') }}</dt><dd>{{ screen.lastSeenAt ? new Date(screen.lastSeenAt).toLocaleString() : '—' }}</dd></div></dl></article>
202
245
  </div>
203
246
  </section>
204
247
  <section v-else-if="selectedTab === 'templates'" class="mt-12">
@@ -207,13 +250,16 @@ watch(() => core.restaurants.value.length, async (length) => { if (!selectedRest
207
250
  <div v-else class="grid grid-cols-1 gap-16 xl:grid-cols-2"><article v-for="template in store.templates" :key="template._id" class="resource-card"><div class="flex justify-between gap-12"><div class="min-w-0"><div class="flex items-center gap-8"><h3 class="truncate text-lg font-semibold">{{ template.label }}</h3><span class="mode-badge">{{ template.orientation }}</span></div><p class="mt-2 text-xs text-gray-500">{{ templateCapabilities(template).join(', ') || 'INFO' }}</p></div><div class="flex gap-4"><FmButton icon="edit" variant="plain" @click="editTemplate(template)" /><FmButton icon="content_copy" variant="plain" @click="duplicateTemplate(template)" /><FmButton icon="delete" variant="plain" @click="removeTemplate(template)" /></div></div><div class="layout-thumb"><DisplayLayoutMap :node="template.root as never" selected-zone-id="" :start-index="1" /></div><p class="thumb-caption">{{ t('order.displaySystem.areasCount', { count: layoutSummary(template).areas }) }} · {{ t('order.displaySystem.modulesCount', { count: layoutSummary(template).modules }) }}</p></article></div>
208
251
  </section>
209
252
  </template>
210
- <LegacyOdsTemplateList v-else-if="selectedView === 'v7'" ref="legacyOdsList" />
253
+ <template v-else-if="selectedView === 'v7'">
254
+ <p v-if="showMigration" class="migration-note" data-testid="legacy-migration-note">{{ t('order.displaySystem.legacyOds.migrationNote') }}</p>
255
+ <LegacyOdsTemplateList ref="legacyOdsList" :can-convert="showMigration" :converting="converting" @convert="convertOds" />
256
+ </template>
211
257
  </div>
212
258
  </div>
213
- <DisplayTemplateEditor v-if="canManageOrderSetting" v-model="templateEditorOpen" :template="editingTemplate" :preview-restaurant-id="selectedRestaurantId" :outlet-capabilities="entitlement?.capabilities ?? []" :saving="saving" @save="saveTemplate" />
214
- <DisplayScreenEditor v-if="canManageOrderSetting && selectedRestaurantId" v-model="screenEditorOpen" :screen="editingScreen" :templates="applicableTemplates" :restaurant-id="selectedRestaurantId" :saving="saving" @save="saveScreen" />
259
+ <DisplayTemplateEditor v-if="canManageDisplaySystem" v-model="templateEditorOpen" :template="editingTemplate" :initial-draft="conversionDraft" :conversion-notices="conversionNotices" :preview-restaurant-id="selectedRestaurantId" :outlet-capabilities="entitlement?.capabilities ?? []" :saving="saving" @save="saveTemplate" />
260
+ <DisplayScreenEditor v-if="canManageDisplaySystem && selectedRestaurantId" v-model="screenEditorOpen" :screen="editingScreen" :templates="applicableTemplates" :restaurant-id="selectedRestaurantId" :saving="saving" @save="saveScreen" />
215
261
  </template>
216
262
 
217
263
  <style scoped>
218
- .display-toolbar{display:flex;align-items:center;justify-content:space-between;gap:16px;border-bottom:1px solid #e5e7eb;padding-bottom:14px}.display-actions{display:flex;flex-shrink:0;align-items:center;gap:8px}.display-controls{display:flex;align-items:center;justify-content:space-between;gap:16px;padding-top:12px}.display-restaurant-select{width:min(360px,100%)}.display-outlet{display:flex;align-items:center;gap:16px}.display-entitlement{color:#6b7280;font-size:12px;white-space:nowrap}.restriction-note{margin-top:12px;border:1px solid #fed7aa;border-radius:10px;padding:10px 12px;color:#9a3412;background:#fff7ed;font-size:13px}.empty-state{display:grid;justify-items:center;gap:6px;border:1px dashed #d1d5db;border-radius:12px;padding:56px 20px;color:#6b7280;text-align:center}.empty-state strong{color:#111827}.layout-thumb{display:flex;height:auto;min-height:96px;margin-top:16px;border-radius:10px;background:#f3f4f6;padding:5px;pointer-events:none}.thumb-caption{margin-top:8px;color:#6b7280;font-size:11px}.resource-card{border:1px solid #e5e7eb;border-radius:12px;padding:20px;background:white;box-shadow:0 2px 8px #0000000a}.mode-badge,.status-badge{border-radius:999px;padding:3px 8px;background:#f3f4f6;font-size:11px;font-weight:700}.status-badge.active{color:#166534;background:#dcfce7}.status-badge.disabled{color:#991b1b;background:#fee2e2}.status-badge.unlicensed{color:#b42318;background:#fef3f2;border:1px solid #fecdca}.online-dot{color:#6b7280;font-size:11px}.online-dot::before{display:inline-block;width:7px;height:7px;margin-right:5px;border-radius:50%;background:#9ca3af;content:''}.online-dot.online{color:#15803d}.online-dot.online::before{background:#22c55e}.meta-grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:12px;margin-top:18px;border-top:1px solid #f0f0f0;padding-top:16px}.meta-grid dt{color:#6b7280;font-size:11px}.meta-grid dd{overflow:hidden;margin-top:2px;font-size:12px;text-overflow:ellipsis;white-space:nowrap}@media(max-width:640px){.display-toolbar{align-items:flex-start}.display-controls{align-items:stretch;flex-direction:column}.display-outlet{align-items:stretch;flex-direction:column;gap:8px}.display-restaurant-select{width:100%}}
264
+ .display-toolbar{display:flex;align-items:center;justify-content:space-between;gap:16px;border-bottom:1px solid #e5e7eb;padding-bottom:14px}.display-actions{display:flex;flex-shrink:0;align-items:center;gap:8px}.display-controls{display:flex;align-items:center;justify-content:space-between;gap:16px;padding-top:12px}.display-restaurant-select{width:min(360px,100%)}.display-outlet{display:flex;align-items:center;gap:16px}.display-entitlement{color:#6b7280;font-size:12px;white-space:nowrap}.migration-note{margin-top:12px;border:1px solid #bfdbfe;border-radius:10px;padding:10px 12px;color:#1e3a8a;background:#eff6ff;font-size:13px}.restriction-note{margin-top:12px;border:1px solid #fed7aa;border-radius:10px;padding:10px 12px;color:#9a3412;background:#fff7ed;font-size:13px}.empty-state{display:grid;justify-items:center;gap:6px;border:1px dashed #d1d5db;border-radius:12px;padding:56px 20px;color:#6b7280;text-align:center}.empty-state strong{color:#111827}.layout-thumb{display:flex;height:auto;min-height:96px;margin-top:16px;border-radius:10px;background:#f3f4f6;padding:5px;pointer-events:none}.thumb-caption{margin-top:8px;color:#6b7280;font-size:11px}.resource-card{border:1px solid #e5e7eb;border-radius:12px;padding:20px;background:white;box-shadow:0 2px 8px #0000000a}.mode-badge,.status-badge{border-radius:999px;padding:3px 8px;background:#f3f4f6;font-size:11px;font-weight:700}.status-badge.active{color:#166534;background:#dcfce7}.status-badge.disabled{color:#991b1b;background:#fee2e2}.status-badge.unlicensed{color:#b42318;background:#fef3f2;border:1px solid #fecdca}.online-dot{color:#6b7280;font-size:11px}.online-dot::before{display:inline-block;width:7px;height:7px;margin-right:5px;border-radius:50%;background:#9ca3af;content:''}.online-dot.online{color:#15803d}.online-dot.online::before{background:#22c55e}.meta-grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:12px;margin-top:18px;border-top:1px solid #f0f0f0;padding-top:16px}.meta-grid dt{color:#6b7280;font-size:11px}.meta-grid dd{overflow:hidden;margin-top:2px;font-size:12px;text-overflow:ellipsis;white-space:nowrap}@media(max-width:640px){.display-toolbar{align-items:flex-start}.display-controls{align-items:stretch;flex-direction:column}.display-outlet{align-items:stretch;flex-direction:column;gap:8px}.display-restaurant-select{width:100%}}
219
265
  </style>
@@ -149,3 +149,21 @@ describe('DisplayTemplateEditor review regressions', () => {
149
149
  )
150
150
  })
151
151
  })
152
+
153
+ describe('converted template preview', () => {
154
+ it('opens the supplied draft, shows conversion notes and saves without touching its source', async () => {
155
+ const w = await editor()
156
+ const initialDraft = defaultDisplayTemplateDraft('pickup')
157
+ initialDraft.label = 'Imported'
158
+ await w.setProps({ modelValue: false })
159
+ await w.setProps({ template: undefined, initialDraft, conversionNotices: ['Review the side image'] })
160
+ await w.setProps({ modelValue: true })
161
+ expect(w.find('[data-testid="conversion-notices"]').text()).toContain('Review the side image')
162
+ expect(w.findComponent(Canvas).props('root')).toEqual(initialDraft.root)
163
+ await button(w, '.save').trigger('click')
164
+ const saved = w.emitted('save')?.[0]?.[0]
165
+ expect(saved).toEqual(initialDraft)
166
+ expect(saved).not.toBe(initialDraft)
167
+ expect(FdtoCreateDisplayTemplate.safeParse(displayTemplatePayload(saved as never)).success).toBe(true)
168
+ })
169
+ })
@@ -44,6 +44,8 @@ import DisplayInspector from './DisplayInspector.vue'
44
44
  const props = defineProps<{
45
45
  modelValue: boolean
46
46
  template?: DisplayTemplate
47
+ initialDraft?: DisplayTemplateDraft
48
+ conversionNotices?: string[]
47
49
  previewRestaurantId?: string
48
50
  /** The selected outlet's entitlement. Used only for the warning line --
49
51
  * neither authoring nor the preview is ever gated, because a template is
@@ -182,10 +184,10 @@ watch(
182
184
  () => props.modelValue,
183
185
  (open) => {
184
186
  if (!open) return
185
- draft.value = props.template ? displayTemplateToDraft(props.template) : defaultDisplayTemplateDraft('pickup')
187
+ draft.value = props.template ? displayTemplateToDraft(props.template) : props.initialDraft ? JSON.parse(JSON.stringify(props.initialDraft)) : defaultDisplayTemplateDraft('pickup')
186
188
  // A brand-new template benefits from picking a shape first; an existing one
187
189
  // should open on its own layout.
188
- presetsOpen.value = !props.template
190
+ presetsOpen.value = !props.template && !props.initialDraft
189
191
  selectFirst()
190
192
  error.value = ''
191
193
  void loadPreviewBrandKit()
@@ -552,6 +554,10 @@ function save(): void {
552
554
  </div>
553
555
  </header>
554
556
 
557
+ <details v-if="conversionNotices?.length" open class="mx-12 mb-8 max-h-[180px] overflow-auto rounded bg-amber-50 p-12 text-sm" data-testid="conversion-notices">
558
+ <summary class="cursor-pointer font-semibold">{{ t('order.displaySystem.legacyOds.conversion.review') }}</summary>
559
+ <ul class="list-disc pl-20"><li v-for="notice in conversionNotices" :key="notice">{{ notice }}</li></ul>
560
+ </details>
555
561
  <p v-if="error" class="editor-error">{{ error }}</p>
556
562
 
557
563
  <div class="editor-body">
@@ -1,5 +1,5 @@
1
1
  // @vitest-environment happy-dom
2
- import { afterEach, describe, expect, it, vi } from 'vitest'
2
+ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
3
3
  import { flushPromises, mount, type VueWrapper } from '@vue/test-utils'
4
4
  import { ref } from 'vue'
5
5
  import { getBusinessBrandkit, saveBusinessOds } from '@/api/brandkit'
@@ -10,8 +10,9 @@ vi.mock('@/api/brandkit', () => ({ getBusinessBrandkit: vi.fn(), saveBusinessOds
10
10
  vi.mock('@/components/snackbar', () => ({
11
11
  useSnackbarFunctions: () => ({ showError: vi.fn(), showSuccess: vi.fn() })
12
12
  }))
13
- vi.mock('@/composables/useLegacyOdsAccess', () => ({
14
- useLegacyOdsAccess: () => ({ canAccessOdsTemplateSettings: ref(false) })
13
+ const permission = ref(true)
14
+ vi.mock('@/composables/useDisplaySystemPermission', () => ({
15
+ useDisplaySystemPermission: () => ({ canManageDisplaySystem: permission })
15
16
  }))
16
17
  vi.mock('@feedmepos/mf-common', () => ({
17
18
  useCoreStore: () => ({
@@ -31,6 +32,7 @@ vi.mock('./LegacyOdsEditorDialog.vue', () => ({
31
32
  import List from './LegacyOdsTemplateList.vue'
32
33
 
33
34
  const wrappers: VueWrapper[] = []
35
+ beforeEach(() => { permission.value = true })
34
36
  afterEach(() => {
35
37
  wrappers.forEach((wrapper) => wrapper.unmount())
36
38
  wrappers.length = 0
@@ -68,7 +70,30 @@ function editor(wrapper: VueWrapper) {
68
70
  return wrapper.findComponent({ name: 'LegacyOdsEditorDialog' })
69
71
  }
70
72
 
71
- describe('legacy ODS list without the template flag', () => {
73
+ describe('legacy ODS list with Display System IAM access', () => {
74
+ it('does not load or save configuration without the dedicated permission', async () => {
75
+ permission.value = false
76
+ const wrapper = await list()
77
+ expect(getBusinessBrandkit).not.toHaveBeenCalled()
78
+ expect(buttons(wrapper, 'edit')).toHaveLength(0)
79
+ editor(wrapper).vm.$emit('save', { label: 'Denied', isDefault: true })
80
+ await flushPromises()
81
+ expect(saveBusinessOds).not.toHaveBeenCalled()
82
+ })
83
+
84
+ it('closes an open editor and prevents saving when permission is revoked', async () => {
85
+ const wrapper = await list()
86
+ await buttons(wrapper, 'edit')[0].trigger('click')
87
+ expect(editor(wrapper).props('modelValue')).toBe(true)
88
+ permission.value = false
89
+ await flushPromises()
90
+ expect(editor(wrapper).props('modelValue')).toBe(false)
91
+ expect(buttons(wrapper, 'edit')).toHaveLength(0)
92
+ editor(wrapper).vm.$emit('save', { label: 'Denied', isDefault: true })
93
+ await flushPromises()
94
+ expect(saveBusinessOds).not.toHaveBeenCalled()
95
+ })
96
+
72
97
  it('saves a new default right away and clears the old default', async () => {
73
98
  const wrapper = await list()
74
99
  ;(wrapper.vm as unknown as { addOdsEntry: () => void }).addOdsEntry()
@@ -122,3 +147,18 @@ describe('legacy ODS list without the template flag', () => {
122
147
  expect(editor(wrapper).props('allEntries')[0].isDefault).toBe(true)
123
148
  })
124
149
  })
150
+
151
+ describe('legacy ODS conversion entry', () => {
152
+ it('requires new-template permission and emits a detached source without saving legacy data', async () => {
153
+ const wrapper = await list()
154
+ expect(buttons(wrapper, 'upgrade')).toHaveLength(0)
155
+ await wrapper.setProps({ canConvert: true })
156
+ await buttons(wrapper, 'upgrade')[1].trigger('click')
157
+ expect(wrapper.emitted('convert')?.[0]).toEqual([
158
+ { label: 'Other', isDefault: false, restaurantIds: ['other'] }, 'Other'
159
+ ])
160
+ expect(saveBusinessOds).not.toHaveBeenCalled()
161
+ await wrapper.setProps({ converting: true })
162
+ expect(buttons(wrapper, 'upgrade')[1].attributes('disabled')).toBeDefined()
163
+ })
164
+ })
@@ -2,6 +2,7 @@
2
2
  import { computed, ref, watch } from 'vue'
3
3
  import { useCoreStore, useI18n } from '@feedmepos/mf-common'
4
4
  import { useDialog } from '@feedmepos/ui-library'
5
+ import { useDisplaySystemPermission } from '@/composables/useDisplaySystemPermission'
5
6
  import { getBusinessBrandkit, saveBusinessOds } from '@/api/brandkit'
6
7
  import { useSnackbarFunctions } from '@/components/snackbar'
7
8
  import {
@@ -11,7 +12,11 @@ import {
11
12
  } from '@/modules/display-system/legacy-ods/interface'
12
13
  import LegacyOdsEditorDialog from './LegacyOdsEditorDialog.vue'
13
14
 
15
+ defineProps<{ canConvert?: boolean; converting?: boolean }>()
16
+ const emit = defineEmits<{ (event: 'convert', entry: OdsConfigEntry, label: string): void }>()
17
+
14
18
  const Core = useCoreStore()
19
+ const { canManageDisplaySystem } = useDisplaySystemPermission()
15
20
  const { t } = useI18n()
16
21
  const dialog = useDialog()
17
22
  const { showError, showSuccess } = useSnackbarFunctions()
@@ -101,7 +106,7 @@ const entryLabel = (entry: OdsConfigEntry, index: number) =>
101
106
  async function persist(ods: OdsConfigEntry[]) {
102
107
  const businessId = Core.currentBusiness.value?._id
103
108
  const namespace = Core.namespace.value
104
- if (!businessId || !loaded.value || saving.value) return false
109
+ if (!canManageDisplaySystem.value || !businessId || !loaded.value || saving.value) return false
105
110
  saving.value = true
106
111
  try {
107
112
  await saveBusinessOds(businessId, ods, namespace)
@@ -220,8 +225,8 @@ const restaurantNamesForEntry = (entry: OdsConfigEntry) => {
220
225
  }
221
226
 
222
227
  watch(
223
- [() => Core.currentBusiness.value?._id, () => Core.namespace.value],
224
- async ([businessId, namespace], _, onCleanup) => {
228
+ [() => Core.currentBusiness.value?._id, () => Core.namespace.value, canManageDisplaySystem],
229
+ async ([businessId, namespace, canManage], _, onCleanup) => {
225
230
  let cancelled = false
226
231
  onCleanup(() => {
227
232
  cancelled = true
@@ -229,7 +234,7 @@ watch(
229
234
  odsEditorOpen.value = false
230
235
  loaded.value = false
231
236
  loading.value = true
232
- if (!businessId) {
237
+ if (!businessId || !canManage) {
233
238
  loading.value = false
234
239
  return
235
240
  }
@@ -275,6 +280,9 @@ defineExpose({ addOdsEntry })
275
280
  <FmButton v-if="!entry.isDefault" icon="delete" variant="plain" :disabled="saving" @click="deleteOdsEntry(index)" />
276
281
  </div>
277
282
  </div>
283
+ <FmButton v-if="canConvert" class="mt-12" icon="upgrade" variant="plain"
284
+ :label="t('order.displaySystem.legacyOds.conversion.action')" :disabled="saving || converting"
285
+ @click="emit('convert', JSON.parse(JSON.stringify(entry)), entryLabel(entry, index))" />
278
286
  </article>
279
287
  </div>
280
288
  </template>
@@ -12,25 +12,12 @@ const v8a = { _id: 'v8a', posVersion: '8.0.0-beta.1' }
12
12
  const v8b = { _id: 'v8b', posVersion: '9.0.0' }
13
13
  const fresh = { _id: 'fresh', posVersion: null }
14
14
 
15
- const both = { canManageOrderSetting: true, canManageBrandkit: true, hasLegacyOdsConfigs: false }
15
+ const both = { canManageDisplaySystem: true, hasLegacyOdsConfigs: false }
16
16
 
17
17
  describe('available Display System views', () => {
18
- it('offers each view only to users with its permission', () => {
18
+ it('gates both versions with the Display System permission', () => {
19
19
  expect(availableDisplaySystemViews({ ...both, outlets: [v7a, v8a] })).toEqual(['v8', 'v7'])
20
- expect(
21
- availableDisplaySystemViews({ ...both, canManageBrandkit: false, outlets: [v7a] })
22
- ).toEqual(['v8'])
23
- expect(
24
- availableDisplaySystemViews({ ...both, canManageOrderSetting: false, outlets: [v7a] })
25
- ).toEqual(['v7'])
26
- expect(
27
- availableDisplaySystemViews({
28
- ...both,
29
- canManageOrderSetting: false,
30
- canManageBrandkit: false,
31
- outlets: [v7a]
32
- })
33
- ).toEqual([])
20
+ expect(availableDisplaySystemViews({ ...both, canManageDisplaySystem: false, outlets: [v7a, v8a] })).toEqual([])
34
21
  })
35
22
 
36
23
  it('offers the v7 view to an all-v8 business only while it still has v7 ODS configs', () => {
@@ -43,7 +30,7 @@ describe('available Display System views', () => {
43
30
  it('does not count outlets without a POS version as v7', () => {
44
31
  expect(availableDisplaySystemViews({ ...both, outlets: [fresh] })).toEqual(['v8'])
45
32
  expect(
46
- availableDisplaySystemViews({ ...both, canManageOrderSetting: false, outlets: [fresh, v8a] })
33
+ availableDisplaySystemViews({ ...both, canManageDisplaySystem: false, outlets: [fresh, v8a] })
47
34
  ).toEqual([])
48
35
  })
49
36
  })