Merge origin/modular into feature/responsive-layout-refactor.

Keep responsive layout refactor while taking modular store-hours, transaction price, and garoosi login fixes.

Co-authored-by: Cursor <cursoragent@cursor.com>

src/utils/categoryTabs.ts

@@ -1,6 +1,6 @@
 import { getStoreCategories } from '@/api/categories'
 
-/** تب‌های فیلتر محصول — فقط از API دسته‌بندی (هماهنگ با پنل ادمین) */
+/** تب‌های فیلتر محصول — دسته‌های فعال که محصول دارند (خودکار از API) */
 export async function loadProductCategoryTabNames(): Promise<string[]> {
   const categories = await getStoreCategories()
   return categories.map((item) => item.name)

src/utils/storeHours.ts

@@ -0,0 +1,107 @@
+import { useSettingsStore } from '@/store/settingsStore'
+import { lastPrice } from '@/utils/price'
+
+export interface StoreTradingHours {
+  start: string
+  end: string
+  closePriceEnabled: boolean
+}
+
+export interface EffectiveTradingHours {
+  start: string
+  end: string
+  enforced: boolean
+}
+
+let productTradingHours: { start: string; end: string } | null = null
+
+function parseTimeToSeconds(time: string): number {
+  const parts = time.trim().split(':').map(Number)
+  const [hours = 0, minutes = 0, seconds = 0] = parts
+  return hours * 3600 + minutes * 60 + seconds
+}
+
+export function formatTradingTimeDisplay(time: string): string {
+  const parts = time.trim().split(':')
+  if (parts.length >= 3) {
+    return `${parts[0]}:${parts[1]}:${parts[2]}`
+  }
+  if (parts.length >= 2) {
+    return `${parts[0]}:${parts[1]}:00`
+  }
+  return time
+}
+
+export function setProductTradingHours(start?: string | null, end?: string | null) {
+  if (start && end) {
+    productTradingHours = { start, end }
+  }
+}
+
+export function getStoreTradingHours(): StoreTradingHours {
+  const settings = useSettingsStore()
+  const closeRaw = settings.getSettingByKey('close_price')
+  const closePriceEnabled =
+    closeRaw === true ||
+    closeRaw === 1 ||
+    String(closeRaw ?? 'false').trim().toLowerCase() === 'true'
+
+  return {
+    start: String(settings.getSettingByKey('startDay') ?? '00:00'),
+    end: String(settings.getSettingByKey('endDay') ?? '23:59'),
+    closePriceEnabled,
+  }
+}
+
+export function getEffectiveTradingHours(): EffectiveTradingHours {
+  const settings = getStoreTradingHours()
+  if (settings.closePriceEnabled) {
+    return {
+      start: settings.start,
+      end: settings.end,
+      enforced: true,
+    }
+  }
+
+  if (productTradingHours?.start && productTradingHours?.end) {
+    return {
+      start: productTradingHours.start,
+      end: productTradingHours.end,
+      enforced: true,
+    }
+  }
+
+  return {
+    start: settings.start,
+    end: settings.end,
+    enforced: false,
+  }
+}
+
+export function isStoreClosedBySchedule(now = new Date()): boolean {
+  const { start, end, enforced } = getEffectiveTradingHours()
+  if (!enforced) {
+    return false
+  }
+
+  const currentSeconds = now.getHours() * 3600 + now.getMinutes() * 60 + now.getSeconds()
+  const openSeconds = parseTimeToSeconds(start)
+  const closeSeconds = parseTimeToSeconds(end)
+
+  return currentSeconds < openSeconds || currentSeconds > closeSeconds
+}
+
+export function isStoreClosed(): boolean {
+  if (lastPrice.value?.closed === true) {
+    return true
+  }
+
+  return isStoreClosedBySchedule()
+}
+
+export function getStoreClosedMessage(): string {
+  const { start, end } = getEffectiveTradingHours()
+  const open = formatTradingTimeDisplay(start)
+  const close = formatTradingTimeDisplay(end)
+  return `فروشگاه در حال حاضر بسته است. ساعت کاری از ${open} تا ${close} می‌باشد.`
+}

src/utils/supportMessenger.ts

@@ -17,9 +17,6 @@ export interface SupportMessengerSettings {
 
 export const supportMessengerSettings = ref<SupportMessengerSettings>({})
 
-export const DEFAULT_SUPPORT_MESSENGER_TEXT =
-  'جهت شارژ حساب کاربری خود، کلمه "شماره حساب" را برای پشتیبانی ارسال نمایید.'
-
 function getSupportSettingValue(
   settings: Array<{ key?: string; is_active?: boolean | number; value?: unknown }>,
   key: string
@@ -39,9 +36,11 @@ export function buildSupportMessengerUrl(messenger?: string, messengerId?: strin
 
   if (/^https?:\/\//i.test(id)) return id
 
-  const type = (messenger ?? '').trim().toLowerCase() || 'bale'
+  const type = (messenger ?? '').trim().toLowerCase()
   const username = id.replace(/^@/, '')
 
+  if (!type) return ''
+
   switch (type) {
     case 'bale':
       if (id.includes('ble.ir')) {
@@ -59,7 +58,7 @@ export function buildSupportMessengerUrl(messenger?: string, messengerId?: strin
     case 'soroush':
       return `https://splus.ir/splus/${username}`
     default:
-      return `https://ble.ir/${username}`
+      return ''
   }
 }
 
@@ -69,7 +68,7 @@ export async function loadSupportMessengerFromSettings() {
     if (!settings || !Array.isArray(settings)) return
 
     supportMessengerSettings.value = {
-      messenger: getSupportSettingValue(settings, 'support_messenger') || 'bale',
+      messenger: getSupportSettingValue(settings, 'support_messenger'),
       messengerId: getSupportSettingValue(settings, 'support_messenger_id'),
       messengerText: getSupportSettingValue(settings, 'support_messenger_text'),
     }

src/utils/useDraggableFloatingButton.ts

@@ -1,24 +1,54 @@
 import { computed, onMounted, onUnmounted, ref } from 'vue'
 
 const DRAG_THRESHOLD = 6
+const POSITION_VERSION = 1
 
 type FabPosition = { x: number; y: number }
 
+type SavedFabOffset = {
+  version: number
+  dx: number
+  dy: number
+}
+
 type DraggableFloatingOptions = {
   width?: number
   height?: number
-  defaultBottomOffset?: number
+  /** فاصله از پایینِ نوار منو + montzar (px) — مثل تصویر */
+  defaultBottomGap?: number
   defaultRightOffset?: number
 }
 
+function readBottomChromeHeight(): number {
+  const styles = getComputedStyle(document.documentElement)
+  const direct = parseFloat(styles.getPropertyValue('--app-bottom-chrome-height'))
+  if (!Number.isNaN(direct) && direct > 0) {
+    return direct
+  }
+
+  const nav = parseFloat(styles.getPropertyValue('--app-nav-height')) || 80
+  const creditOffset = parseFloat(styles.getPropertyValue('--app-credit-footer-offset'))
+  if (!Number.isNaN(creditOffset) && creditOffset > 0) {
+    return nav + creditOffset
+  }
+
+  const probe = document.createElement('div')
+  probe.style.cssText = 'position:fixed;visibility:hidden;pointer-events:none;height:var(--app-bottom-chrome-height)'
+  document.body.appendChild(probe)
+  const measured = probe.getBoundingClientRect().height
+  document.body.removeChild(probe)
+
+  return measured > 0 ? measured : nav + 28
+}
+
 export function useDraggableFloatingButton(
   storageKey: string,
   options: DraggableFloatingOptions = {}
 ) {
   const width = options.width ?? 96
   const height = options.height ?? 44
-  const defaultBottomOffset = options.defaultBottomOffset ?? 120
-  const defaultRightOffset = options.defaultRightOffset ?? 20
+  const defaultBottomGap = options.defaultBottomGap ?? 12
+  const defaultRightOffset = options.defaultRightOffset ?? 16
 
   const pos = ref<FabPosition>({ x: 0, y: 0 })
   const dragging = ref(false)
@@ -44,26 +74,40 @@ export function useDraggableFloatingButton(
   function getHorizontalOffset() {
     const vw = window.innerWidth
     const contentWidth = getViewportWidth()
+
     return Math.max(0, (vw - contentWidth) / 2)
   }
 
-  function resetToDefault() {
+  function getDefaultPosition(): FabPosition {
     const vh = window.innerHeight
     const offsetX = getHorizontalOffset()
     const contentWidth = getViewportWidth()
+    const bottomChrome = readBottomChromeHeight()
 
-    pos.value = {
+    return {
       x: offsetX + contentWidth - width - defaultRightOffset,
-      y: vh - defaultBottomOffset - height
+      y: vh - bottomChrome - defaultBottomGap - height
     }
   }
 
+  function applySavedOffset(dx: number, dy: number) {
+    const base = getDefaultPosition()
+    pos.value = {
+      x: base.x + dx,
+      y: base.y + dy
+    }
+    clampToViewport()
+  }
+
   function clampToViewport() {
-    const vw = window.innerWidth
     const vh = window.innerHeight
+    const offsetX = getHorizontalOffset()
+    const contentWidth = getViewportWidth()
+    const minX = offsetX
+    const maxX = offsetX + contentWidth - width
 
     pos.value = {
-      x: Math.max(0, Math.min(vw - width, pos.value.x)),
+      x: Math.max(minX, Math.min(maxX, pos.value.x)),
       y: Math.max(0, Math.min(vh - height, pos.value.y))
     }
   }
@@ -72,25 +116,56 @@ export function useDraggableFloatingButton(
     try {
       const raw = localStorage.getItem(storageKey)
       if (!raw) return false
-      const parsed = JSON.parse(raw) as FabPosition
-      if (typeof parsed?.x === 'number' && typeof parsed?.y === 'number') {
-        pos.value = parsed
-        clampToViewport()
+
+      const parsed = JSON.parse(raw) as SavedFabOffset
+      if (
+        parsed?.version === POSITION_VERSION
+        && typeof parsed.dx === 'number'
+        && typeof parsed.dy === 'number'
+      ) {
+        applySavedOffset(parsed.dx, parsed.dy)
         return true
       }
     } catch {
       // ignore
     }
+
     return false
   }
 
   function savePosition() {
-    localStorage.setItem(storageKey, JSON.stringify(pos.value))
+    const base = getDefaultPosition()
+    const payload: SavedFabOffset = {
+      version: POSITION_VERSION,
+      dx: pos.value.x - base.x,
+      dy: pos.value.y - base.y
+    }
+    localStorage.setItem(storageKey, JSON.stringify(payload))
+  }
+
+  function resetToDefault() {
+    pos.value = getDefaultPosition()
   }
 
   function handleResize() {
-    clampToViewport()
-    savePosition()
+    try {
+      const raw = localStorage.getItem(storageKey)
+      if (raw) {
+        const parsed = JSON.parse(raw) as SavedFabOffset
+        if (
+          parsed?.version === POSITION_VERSION
+          && typeof parsed.dx === 'number'
+          && typeof parsed.dy === 'number'
+        ) {
+          applySavedOffset(parsed.dx, parsed.dy)
+          return
+        }
+      }
+    } catch {
+      // ignore
+    }
+
+    resetToDefault()
   }
 
   function handlePointerDown(event: PointerEvent) {

src/utils/usePrice.ts

@@ -24,3 +24,58 @@ export function useTowDecimal(num: string | number): string | number {
 export function useFormat(num: string | number, unit = '') {
   return usePrice(Math.abs(+useTowDecimal(num)), true, unit)
 }
+
+type TransactionPriceSource = {
+  cash?: number | null
+  gold?: number | null
+  order?: {
+    price?: number | null
+    total_price?: number | null
+    amount?: number | null
+  } | null
+}
+
+export function getTransactionTradePrice(item: TransactionPriceSource): number {
+  const orderPrice = Number(item.order?.price)
+  if (Number.isFinite(orderPrice) && orderPrice > 0) {
+    return Math.round(orderPrice)
+  }
+
+  const cashAmount = Math.abs(Number(item.cash) || 0)
+  const goldAmount =
+    Math.abs(Number(item.gold) || 0) || Math.abs(Number(item.order?.amount) || 0)
+
+  if (goldAmount > 0 && cashAmount > 0) {
+    return Math.round(cashAmount / goldAmount)
+  }
+
+  const totalPrice = Number(item.order?.total_price)
+  if (Number.isFinite(totalPrice) && totalPrice > 0) {
+    return Math.round(totalPrice)
+  }
+
+  return 0
+}
+
+export function getTransactionGoldAmount(item: TransactionPriceSource): number {
+  const gold = Number(item.gold) || 0
+  if (Math.abs(gold) > 0) {
+    return gold
+  }
+
+  const orderAmount = Number(item.order?.amount) || 0
+  if (orderAmount > 0) {
+    const cash = Number(item.cash) || 0
+    if (cash < 0) return orderAmount
+    if (cash > 0) return -orderAmount
+    return orderAmount
+  }
+
+  return gold
+}
+
+export function formatGoldAmount(amount?: number | null): string {
+  const num = Number(amount)
+  if (!Number.isFinite(num)) return '0'
+  return String(Number(num.toFixed(3)))
+}