all customer fixing added
This commit is contained in:
@@ -174,7 +174,7 @@ import SettingValueField from './SettingValueField.vue'
|
||||
import SettingCard from './SettingCard.vue'
|
||||
import { refreshAppModeMenu } from '@/router'
|
||||
import { useUserStore } from '@/store/userStore'
|
||||
import { applyBannerEnabledFromRows, applyTrackingSystemsEnabledFromRows, setBannerEnabledFromSettings, setStoreModeFromSettings, setTrackingSystemsEnabledFromSettings } from '@/utils/config'
|
||||
import { applyBannerEnabledFromRows, applyTrackingSystemsEnabledFromRows, applyConditionalOrderEnabledFromRows, setBannerEnabledFromSettings, setConditionalOrderEnabledFromSettings, setStoreModeFromSettings, setTrackingSystemsEnabledFromSettings } from '@/utils/config'
|
||||
import {
|
||||
EDITABLE_SETTING_GROUPS,
|
||||
SYSTEM_SETTING_GROUPS,
|
||||
@@ -279,7 +279,8 @@ const filteredRows = computed(() =>
|
||||
(baseData.value || []).filter((row) => {
|
||||
if (row.id == null || !matchesFilter(row)) return false
|
||||
if (isSystemMode.value) {
|
||||
// API با system_only=1 فیلتر کرده؛ فقط جستجو اعمال میشود
|
||||
// کارمزد سفارش شرطی فقط وقتی قابلیت سراسری روشن است دیده شود
|
||||
if (row.key === 'fee_conditional_order' && !isSettingVisible(row.key)) return false
|
||||
return true
|
||||
}
|
||||
return isEditable(row) && isSettingVisible(row.key)
|
||||
@@ -425,9 +426,11 @@ async function initConfig() {
|
||||
if (isSystemMode.value) {
|
||||
applyBannerEnabledFromRows(baseData.value)
|
||||
applyTrackingSystemsEnabledFromRows(baseData.value)
|
||||
applyConditionalOrderEnabledFromRows(baseData.value)
|
||||
} else {
|
||||
applyBannerEnabledFromRows(baseData.value)
|
||||
applyTrackingSystemsEnabledFromRows(baseData.value)
|
||||
applyConditionalOrderEnabledFromRows(baseData.value)
|
||||
const storeRow = baseData.value.find((row) => row.key === 'is_store')
|
||||
if (storeRow) {
|
||||
setStoreModeFromSettings(isSwitchOn(storeRow.value))
|
||||
@@ -544,6 +547,9 @@ async function saveSettingRow(row: Const) {
|
||||
if (row.key === 'tracking_systems_enabled') {
|
||||
setTrackingSystemsEnabledFromSettings(isSwitchOn(value))
|
||||
}
|
||||
if (row.key === 'enable_conditional_order') {
|
||||
setConditionalOrderEnabledFromSettings(isSwitchOn(value))
|
||||
}
|
||||
savedFlashIds.value.add(id)
|
||||
if (saveTimers.has(id)) clearTimeout(saveTimers.get(id))
|
||||
saveTimers.set(
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import type { Const } from '@/model/configuration'
|
||||
import { isStoreApp } from '@/utils/config'
|
||||
import { conditionalOrderEnabledSetting, isStoreApp } from '@/utils/config'
|
||||
|
||||
export type SettingFieldType =
|
||||
| 'text'
|
||||
@@ -208,6 +208,7 @@ export function isSettingVisible(key: string | undefined | null): boolean {
|
||||
if (!k) return false
|
||||
if (HIDDEN_LEGACY_SETTING_KEYS.has(k)) return false
|
||||
if (STORE_ONLY_SETTING_KEYS.has(k) && !isStoreApp()) return false
|
||||
if (k === 'fee_conditional_order' && !conditionalOrderEnabledSetting.value) return false
|
||||
return true
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user