@@ -29,20 +73,36 @@ defineProps<{
align-items: center;
justify-content: center;
flex: 1;
+ width: 100%;
padding: 48px 24px;
- min-height: 320px;
+ min-height: 280px;
text-align: center;
}
.empty-state__icon {
margin-bottom: 16px;
+ color: var(--color-text-muted);
+ opacity: 0.75;
+}
+
+.empty-state__title {
+ margin: 0 0 8px;
+ font-size: 1rem;
+ font-weight: 700;
+ color: var(--color-text);
+ line-height: 1.4;
}
.empty-state__message {
margin: 0 0 24px;
- font-size: 0.9375rem;
+ font-size: 0.875rem;
color: var(--color-text-muted);
line-height: 1.5;
+ max-width: 280px;
+}
+
+.empty-state__message:last-child {
+ margin-bottom: 0;
}
.empty-state__action {
diff --git a/src/components/ui/FilterTabs.vue b/src/components/ui/FilterTabs.vue
index 861e38a..b17da03 100644
--- a/src/components/ui/FilterTabs.vue
+++ b/src/components/ui/FilterTabs.vue
@@ -50,10 +50,10 @@ defineEmits<{
flex-shrink: 0;
height: 36px;
padding: 0 18px;
- border: none;
+ border: 1px solid transparent;
border-radius: 999px;
- background: #f5f5f5;
- color: #64748b;
+ background: var(--color-tab-inactive-bg);
+ color: var(--color-tab-inactive-text);
font-family: inherit;
font-size: 0.875rem;
font-weight: 500;
@@ -61,7 +61,8 @@ defineEmits<{
cursor: pointer;
transition:
background 0.15s,
- color 0.15s;
+ color 0.15s,
+ border-color 0.15s;
}
.filter-tabs--equal .filter-tab {
@@ -76,6 +77,7 @@ defineEmits<{
.filter-tab.active {
background: var(--color-primary);
+ border-color: var(--color-primary);
color: #fff;
font-weight: 600;
}
@@ -85,6 +87,7 @@ defineEmits<{
}
.filter-tab:not(.active):hover {
- background: #eceff1;
+ border-color: var(--color-border);
+ color: var(--color-text);
}
diff --git a/src/components/ui/PersianDateInput.vue b/src/components/ui/PersianDateInput.vue
index d999e12..b9743e8 100644
--- a/src/components/ui/PersianDateInput.vue
+++ b/src/components/ui/PersianDateInput.vue
@@ -269,7 +269,7 @@ onBeforeUnmount(() => {
height: 32px;
border: 1px solid var(--color-border);
border-radius: var(--radius-sm);
- background: #fff;
+ background: var(--color-elevated);
color: var(--color-text);
cursor: pointer;
font-size: 1.125rem;
diff --git a/src/components/ui/SearchField.vue b/src/components/ui/SearchField.vue
index 9cddb1e..45496a8 100644
--- a/src/components/ui/SearchField.vue
+++ b/src/components/ui/SearchField.vue
@@ -37,7 +37,7 @@ defineEmits<{
}
.search-field__input::placeholder {
- color: #94a3b8;
+ color: var(--color-text-muted);
}
.search-field__input:focus {
diff --git a/src/composables/useCartPage.ts b/src/composables/useCartPage.ts
index ceca3ba..cafb1ad 100644
--- a/src/composables/useCartPage.ts
+++ b/src/composables/useCartPage.ts
@@ -41,8 +41,8 @@ export function useCartPage() {
router.push('/checkout/settlement')
}
- function createNewInvoice() {
- cartStore.createNewCartForSameCompany()
+ async function createNewInvoice() {
+ await cartStore.createNewCartForSameCompany()
showFullDialog.value = false
const companyId = cartStore.selectedCompanyId || cartStore.activeCart?.companyId
if (companyId) {
diff --git a/src/composables/useOrderList.ts b/src/composables/useOrderList.ts
index ddcbdcd..88f9a46 100644
--- a/src/composables/useOrderList.ts
+++ b/src/composables/useOrderList.ts
@@ -1,8 +1,8 @@
-import { computed, ref, watch } from 'vue'
+import { computed, ref, watch, onMounted } from 'vue'
import { useRouter } from 'vue-router'
import { useOrderStore } from '@/stores/order'
import { useAuthStore } from '@/stores/auth'
-import { getCompanyById } from '@/data/mockData'
+import { useCatalogStore } from '@/stores/catalog'
import type { Order } from '@/types'
import {
DELIVERED_STATUSES,
@@ -14,12 +14,19 @@ import {
} from '@/utils/orderStatusGroups'
const DESKTOP_PAGE_SIZE = 5
+const MOBILE_PAGE_SIZE = 5
export function useOrderList() {
const router = useRouter()
const orderStore = useOrderStore()
const authStore = useAuthStore()
+ const catalogStore = useCatalogStore()
const currentPage = ref(1)
+ const mobilePage = ref(1)
+
+ onMounted(async () => {
+ await Promise.all([orderStore.hydrate(), catalogStore.loadCompanies()])
+ })
const tab = computed({
get: () => (router.currentRoute.value.query.tab as string) ?? 'all',
@@ -103,12 +110,50 @@ export function useOrderList() {
return pages
})
+ const mobileTotalPages = computed(() =>
+ Math.max(1, Math.ceil(filteredOrdersMobile.value.length / MOBILE_PAGE_SIZE)),
+ )
+
+ const paginatedOrdersMobile = computed(() => {
+ const start = (mobilePage.value - 1) * MOBILE_PAGE_SIZE
+ return filteredOrdersMobile.value.slice(start, start + MOBILE_PAGE_SIZE)
+ })
+
+ const mobilePaginationRange = computed(() => {
+ if (filteredOrdersMobile.value.length === 0) return { start: 0, end: 0 }
+ const start = (mobilePage.value - 1) * MOBILE_PAGE_SIZE + 1
+ const end = Math.min(mobilePage.value * MOBILE_PAGE_SIZE, filteredOrdersMobile.value.length)
+ return { start, end }
+ })
+
+ const mobileVisiblePages = computed(() => {
+ const total = mobileTotalPages.value
+ const current = mobilePage.value
+ if (total <= 5) return Array.from({ length: total }, (_, i) => i + 1)
+
+ const pages: (number | 'ellipsis')[] = [1]
+ if (current > 3) pages.push('ellipsis')
+
+ const rangeStart = Math.max(2, current - 1)
+ const rangeEnd = Math.min(total - 1, current + 1)
+ for (let p = rangeStart; p <= rangeEnd; p += 1) pages.push(p)
+
+ if (current < total - 2) pages.push('ellipsis')
+ if (total > 1) pages.push(total)
+
+ return pages
+ })
+
watch([filteredOrdersDesktop, desktopFilter, searchQuery], () => {
currentPage.value = 1
})
+ watch([filteredOrdersMobile, tab, searchQuery], () => {
+ mobilePage.value = 1
+ })
+
function companySlug(order: Order) {
- return getCompanyById(order.companyId)?.slug ?? 'par'
+ return catalogStore.getCompany(order.companyId)?.slug ?? 'par'
}
function iconVariant(order: Order) {
@@ -125,6 +170,11 @@ export function useOrderList() {
currentPage.value = page
}
+ function setMobilePage(page: number) {
+ if (page < 1 || page > mobileTotalPages.value) return
+ mobilePage.value = page
+ }
+
function setDesktopFilter(filter: DesktopOrderFilterId) {
desktopFilter.value = desktopFilter.value === filter && filter !== 'all' ? 'all' : filter
}
@@ -141,14 +191,20 @@ export function useOrderList() {
filteredOrdersMobile,
filteredOrdersDesktop,
paginatedOrders,
+ paginatedOrdersMobile,
totalPages,
+ mobileTotalPages,
paginationRange,
+ mobilePaginationRange,
visiblePages,
+ mobileVisiblePages,
currentPage,
+ mobilePage,
companySlug,
iconVariant,
goToOrder,
setPage,
+ setMobilePage,
setDesktopFilter,
viewStatFilter,
}
diff --git a/src/composables/useProductOrdering.ts b/src/composables/useProductOrdering.ts
index f436e23..51a888d 100644
--- a/src/composables/useProductOrdering.ts
+++ b/src/composables/useProductOrdering.ts
@@ -1,4 +1,4 @@
-import { ref, computed } from 'vue'
+import { ref, computed, watch, onMounted } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { useCatalogStore } from '@/stores/catalog'
import { useCartStore } from '@/stores/cart'
@@ -8,6 +8,7 @@ export function useProductOrdering() {
const router = useRouter()
const catalogStore = useCatalogStore()
const cartStore = useCartStore()
+ const loading = ref(true)
const companyId = computed(() => route.params.companyId as string)
const catalogId = computed(() => route.params.catalogId as string)
@@ -29,6 +30,27 @@ export function useProductOrdering() {
const errors = ref
>({})
const toast = ref('')
+ async function load() {
+ loading.value = true
+ if (!catalogStore.getCompany(companyId.value)) {
+ await catalogStore.loadCompanies()
+ }
+ if (!catalogStore.getCatalog(catalogId.value)) {
+ await catalogStore.loadCatalogs(companyId.value)
+ }
+ await catalogStore.loadProducts(catalogId.value)
+ loading.value = false
+ }
+
+ onMounted(load)
+ watch([companyId, catalogId], load)
+ watch(colorFilter, async (color) => {
+ await catalogStore.loadProducts(
+ catalogId.value,
+ color === 'all' ? undefined : color,
+ )
+ })
+
function getMeterage(productId: string) {
return meterages.value[productId] ?? 0
}
@@ -38,7 +60,7 @@ export function useProductOrdering() {
meterages.value[productId] = Math.max(0, current + delta * step)
}
- function addProduct(productId: string) {
+ async function addProduct(productId: string) {
const product = catalogStore.getProduct(productId)
if (!product || !catalog.value) return
@@ -48,7 +70,7 @@ export function useProductOrdering() {
return
}
- const result = cartStore.addItem(product, catalog.value.code, meterage)
+ const result = await cartStore.addItem(product, catalog.value.code, meterage)
if (result.success) {
errors.value[productId] = ''
toast.value = `${product.name} به سبد اضافه شد.`
@@ -84,6 +106,7 @@ export function useProductOrdering() {
meterages,
errors,
toast,
+ loading,
cartStore,
adjustMeterage,
setMeterage,
diff --git a/src/main.ts b/src/main.ts
index adea8df..0a34cd0 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,6 +3,8 @@ import { createPinia } from 'pinia'
import App from './App.vue'
import router from './router'
+import { useThemeStore } from '@/stores/theme'
+import 'virtual:uno.css'
import './assets/styles/fonts.css'
import './assets/styles/main.css'
import './assets/styles/app-shell.css'
@@ -11,8 +13,11 @@ import './assets/styles/desktop.css'
import './assets/styles/desktop-pages.css'
const app = createApp(App)
+const pinia = createPinia()
-app.use(createPinia())
+app.use(pinia)
app.use(router)
+useThemeStore(pinia)
+
app.mount('#app')
diff --git a/src/router/index.ts b/src/router/index.ts
index 8e1663b..8be3223 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,5 +1,5 @@
import { createRouter, createWebHistory } from 'vue-router'
-import { getCurrentUser } from '@/services/authService'
+import { isAuthenticated } from '@/services/authService'
const router = createRouter({
history: createWebHistory(import.meta.env.BASE_URL),
@@ -137,13 +137,13 @@ const router = createRouter({
})
router.beforeEach((to) => {
- const isAuthenticated = !!getCurrentUser()
+ const authed = isAuthenticated()
- if (to.meta.requiresAuth && !isAuthenticated) {
+ if (to.meta.requiresAuth && !authed) {
return { name: 'login', query: { redirect: to.fullPath } }
}
- if (to.meta.guest && isAuthenticated) {
+ if (to.meta.guest && authed) {
return { name: 'home' }
}
diff --git a/src/services/authService.ts b/src/services/authService.ts
index 1b59aa6..0236766 100644
--- a/src/services/authService.ts
+++ b/src/services/authService.ts
@@ -1,37 +1,31 @@
-import { MOCK_OTP_CODE } from '@/utils/constants'
-import { generateId, normalizePhone } from '@/utils/format'
-import { getItem, setItem, STORAGE_KEYS } from './storage'
+import { normalizePhone } from '@/utils/format'
+import { apiRequest, ApiError, getAccessToken, setAccessToken } from './http'
import type { User } from '@/types'
-interface PendingOtp {
- phone: string
- firstName?: string
- lastName?: string
- isRegister: boolean
- code: string
- expiresAt: string
+const USER_KEY = 'ft_user'
+
+function cacheUser(user: User | null): void {
+ if (user) localStorage.setItem(USER_KEY, JSON.stringify(user))
+ else localStorage.removeItem(USER_KEY)
}
-export function getUsers(): User[] {
- return getItem(STORAGE_KEYS.users, [])
-}
-
-function saveUsers(users: User[]): void {
- setItem(STORAGE_KEYS.users, users)
-}
-
-export function getSessionUserId(): string | null {
- return getItem(STORAGE_KEYS.session, null)
-}
-
-export function setSessionUserId(userId: string | null): void {
- setItem(STORAGE_KEYS.session, userId)
+export function getCachedUser(): User | null {
+ try {
+ const raw = localStorage.getItem(USER_KEY)
+ if (!raw) return null
+ return JSON.parse(raw) as User
+ } catch {
+ return null
+ }
}
export function getCurrentUser(): User | null {
- const id = getSessionUserId()
- if (!id) return null
- return getUsers().find((u) => u.id === id) ?? null
+ if (!getAccessToken()) return null
+ return getCachedUser()
+}
+
+export function isAuthenticated(): boolean {
+ return !!getAccessToken()
}
export async function sendOtp(
@@ -43,34 +37,31 @@ export async function sendOtp(
return { success: false, message: 'شماره موبایل معتبر نیست.' }
}
- if (options.isRegister) {
- if (!options.firstName?.trim() || !options.lastName?.trim()) {
- return { success: false, message: 'نام و نام خانوادگی الزامی است.' }
- }
- const exists = getUsers().some((u) => u.phone === normalized)
- if (exists) {
- return { success: false, message: 'این شماره قبلاً ثبت شده است. وارد شوید.' }
- }
- } else {
- const exists = getUsers().some((u) => u.phone === normalized)
- if (!exists) {
- return { success: false, message: 'کاربری با این شماره یافت نشد. ثبتنام کنید.' }
- }
+ if (options.isRegister && (!options.firstName?.trim() || !options.lastName?.trim())) {
+ return { success: false, message: 'نام و نام خانوادگی الزامی است.' }
}
- const pending: PendingOtp = {
- phone: normalized,
- firstName: options.firstName,
- lastName: options.lastName,
- isRegister: options.isRegister,
- code: MOCK_OTP_CODE,
- expiresAt: new Date(Date.now() + 5 * 60 * 1000).toISOString(),
- }
- setItem(STORAGE_KEYS.pendingOtp, pending)
-
- return {
- success: true,
- message: `کد تأیید ارسال شد. (نسخه آزمایشی: ${MOCK_OTP_CODE})`,
+ try {
+ const res = await apiRequest<{ success: boolean; message: string; debugCode?: string }>(
+ '/auth/otp/request',
+ {
+ method: 'POST',
+ auth: false,
+ body: {
+ phone: normalized,
+ firstName: options.firstName,
+ lastName: options.lastName,
+ isRegister: options.isRegister,
+ },
+ },
+ )
+ const hint = res.debugCode ? ` (کد آزمایشی: ${res.debugCode})` : ''
+ return { success: true, message: `${res.message}${hint}` }
+ } catch (e) {
+ return {
+ success: false,
+ message: e instanceof ApiError ? e.message : 'ارسال کد ناموفق بود.',
+ }
}
}
@@ -78,53 +69,55 @@ export async function verifyOtp(
phone: string,
code: string,
): Promise<{ success: boolean; message: string; user?: User }> {
- const pending = getItem(STORAGE_KEYS.pendingOtp, null)
const normalized = normalizePhone(phone)
-
- if (!pending || pending.phone !== normalized) {
- return { success: false, message: 'ابتدا درخواست کد دهید.' }
- }
- if (new Date(pending.expiresAt) < new Date()) {
- return { success: false, message: 'کد منقضی شده است. دوباره درخواست دهید.' }
- }
- if (code.trim() !== pending.code) {
- return { success: false, message: 'کد تأیید نادرست است.' }
- }
-
- let user: User
- const users = getUsers()
-
- if (pending.isRegister) {
- user = {
- id: generateId(),
- firstName: pending.firstName!,
- lastName: pending.lastName!,
- phone: normalized,
- createdAt: new Date().toISOString(),
+ try {
+ const res = await apiRequest<{ accessToken: string; user: User }>('/auth/otp/verify', {
+ method: 'POST',
+ auth: false,
+ body: { phone: normalized, code },
+ })
+ setAccessToken(res.accessToken)
+ cacheUser(res.user)
+ return { success: true, message: 'ورود موفق.', user: res.user }
+ } catch (e) {
+ return {
+ success: false,
+ message: e instanceof ApiError ? e.message : 'تأیید کد ناموفق بود.',
}
- users.push(user)
- saveUsers(users)
- } else {
- user = users.find((u) => u.phone === normalized)!
}
-
- setSessionUserId(user.id)
- setItem(STORAGE_KEYS.pendingOtp, null)
- return { success: true, message: 'ورود موفق.', user }
}
export function logout(): void {
- setSessionUserId(null)
+ setAccessToken(null)
+ cacheUser(null)
}
-export function updateProfile(
- userId: string,
+export async function fetchMe(): Promise {
+ if (!getAccessToken()) {
+ cacheUser(null)
+ return null
+ }
+ try {
+ const user = await apiRequest('/auth/me')
+ cacheUser(user)
+ return user
+ } catch {
+ logout()
+ return null
+ }
+}
+
+export async function updateProfile(
data: Partial>,
-): User | null {
- const users = getUsers()
- const index = users.findIndex((u) => u.id === userId)
- if (index === -1) return null
- users[index] = { ...users[index]!, ...data }
- saveUsers(users)
- return users[index]!
+): Promise {
+ try {
+ const user = await apiRequest('/auth/profile', {
+ method: 'PATCH',
+ body: data,
+ })
+ cacheUser(user)
+ return user
+ } catch {
+ return null
+ }
}
diff --git a/src/services/http.ts b/src/services/http.ts
new file mode 100644
index 0000000..fd6820b
--- /dev/null
+++ b/src/services/http.ts
@@ -0,0 +1,83 @@
+const TOKEN_KEY = 'ft_access_token'
+
+export function getApiBaseUrl(): string {
+ return (import.meta.env.VITE_API_BASE_URL as string | undefined)?.replace(/\/$/, '')
+ || 'https://parche.montech.ir/server/api'
+}
+
+export function getAccessToken(): string | null {
+ return localStorage.getItem(TOKEN_KEY)
+}
+
+export function setAccessToken(token: string | null): void {
+ if (token) localStorage.setItem(TOKEN_KEY, token)
+ else localStorage.removeItem(TOKEN_KEY)
+}
+
+export class ApiError extends Error {
+ status: number
+ constructor(status: number, message: string) {
+ super(message)
+ this.status = status
+ }
+}
+
+type RequestOptions = {
+ method?: string
+ body?: unknown
+ auth?: boolean
+ query?: Record
+}
+
+function buildUrl(path: string, query?: RequestOptions['query']): string {
+ const base = getApiBaseUrl()
+ const url = new URL(path.startsWith('http') ? path : `${base}${path.startsWith('/') ? '' : '/'}${path}`)
+ if (query) {
+ for (const [key, value] of Object.entries(query)) {
+ if (value === undefined || value === null || value === '') continue
+ url.searchParams.set(key, String(value))
+ }
+ }
+ return url.toString()
+}
+
+export async function apiRequest(path: string, options: RequestOptions = {}): Promise {
+ const headers: Record = {
+ Accept: 'application/json',
+ }
+ if (options.body !== undefined) {
+ headers['Content-Type'] = 'application/json'
+ }
+ if (options.auth !== false) {
+ const token = getAccessToken()
+ if (token) headers.Authorization = `Bearer ${token}`
+ }
+
+ const res = await fetch(buildUrl(path, options.query), {
+ method: options.method ?? (options.body !== undefined ? 'POST' : 'GET'),
+ headers,
+ body: options.body !== undefined ? JSON.stringify(options.body) : undefined,
+ })
+
+ const text = await res.text()
+ let data: unknown = null
+ if (text) {
+ try {
+ data = JSON.parse(text)
+ } catch {
+ data = text
+ }
+ }
+
+ if (!res.ok) {
+ const message =
+ typeof data === 'object' && data && 'message' in data
+ ? Array.isArray((data as { message: unknown }).message)
+ ? ((data as { message: string[] }).message).join('، ')
+ : String((data as { message: unknown }).message)
+ : `خطای سرور (${res.status})`
+ throw new ApiError(res.status, message)
+ }
+
+ return data as T
+}
diff --git a/src/stores/auth.ts b/src/stores/auth.ts
index b97a43a..ed700f9 100644
--- a/src/stores/auth.ts
+++ b/src/stores/auth.ts
@@ -7,7 +7,11 @@ import {
sendOtp,
verifyOtp,
updateProfile as authUpdateProfile,
+ fetchMe,
} from '@/services/authService'
+import { useCartStore } from './cart'
+import { useOrderStore } from './order'
+import { useCatalogStore } from './catalog'
export const useAuthStore = defineStore('auth', () => {
const user = ref(getCurrentUser())
@@ -42,6 +46,11 @@ export const useAuthStore = defineStore('auth', () => {
loading.value = false
if (result.success && result.user) {
user.value = result.user
+ await Promise.all([
+ useCatalogStore().loadCompanies(),
+ useCartStore().hydrate(),
+ useOrderStore().hydrate(),
+ ])
} else {
error.value = result.message
}
@@ -51,17 +60,22 @@ export const useAuthStore = defineStore('auth', () => {
function logout() {
authLogout()
user.value = null
+ useCartStore().resetLocal()
+ useOrderStore().resetLocal()
}
- function updateProfile(data: Partial>) {
+ async function updateProfile(data: Partial>) {
if (!user.value) return null
- const updated = authUpdateProfile(user.value.id, data)
+ const updated = await authUpdateProfile(data)
if (updated) user.value = updated
return updated
}
- function hydrate() {
+ async function hydrate() {
user.value = getCurrentUser()
+ if (!user.value) return
+ const me = await fetchMe()
+ user.value = me
}
return {
diff --git a/src/stores/cart.ts b/src/stores/cart.ts
index d78a8da..622075d 100644
--- a/src/stores/cart.ts
+++ b/src/stores/cart.ts
@@ -1,31 +1,22 @@
import { defineStore } from 'pinia'
import { ref, computed } from 'vue'
-import type { Cart, CartItem, Company, Product } from '@/types'
-import { generateId } from '@/utils/format'
+import type { Cart, Company, Product } from '@/types'
import { validateMeterage } from '@/utils/validation'
-import { getItem, setItem, STORAGE_KEYS } from '@/services/storage'
-import { getCompanyById } from '@/data/mockData'
+import { apiRequest, ApiError } from '@/services/http'
+import { getAccessToken } from '@/services/http'
+import { useCatalogStore } from './catalog'
const DEFAULT_MAX_METERAGE = 5000
-function loadCarts(): Cart[] {
- return getItem(STORAGE_KEYS.carts, [])
+type ApiCart = Cart & { totalMeterage?: number; itemCount?: number }
+
+function emptyCart(): Cart {
+ return { id: 'local', companyId: '', companyName: '', items: [] }
}
-function saveCarts(carts: Cart[]) {
- setItem(STORAGE_KEYS.carts, carts)
-}
-
-function loadActiveCartId(): string | null {
- return getItem(STORAGE_KEYS.activeCartId, null)
-}
-
-function saveActiveCartId(id: string | null) {
- setItem(STORAGE_KEYS.activeCartId, id)
-}
-
-function getCartTotalMeterage(cart: Cart): number {
- return cart.items.reduce((sum, item) => sum + item.meterage, 0)
+function uniqueCompanyNames(items: Cart['items']): string {
+ const names = [...new Set(items.map((item) => item.companyName).filter(Boolean))]
+ return names.join('، ')
}
function companyMeterage(cart: Cart, companyId: string): number {
@@ -34,35 +25,13 @@ function companyMeterage(cart: Cart, companyId: string): number {
.reduce((sum, item) => sum + item.meterage, 0)
}
-function uniqueCompanyNames(items: CartItem[]): string {
- const names = [...new Set(items.map((item) => item.companyName).filter(Boolean))]
- return names.join('، ')
-}
-
-function syncCartCompanyMeta(cart: Cart) {
- if (cart.items.length === 0) return
- const first = cart.items[0]!
- cart.companyId = first.companyId
- cart.companyName = uniqueCompanyNames(cart.items) || first.companyName
-}
-
-function migrateCartItems(carts: Cart[]): Cart[] {
- return carts.map((cart) => ({
- ...cart,
- items: cart.items.map((item) => ({
- ...item,
- companyId: item.companyId || cart.companyId,
- companyName: item.companyName || cart.companyName,
- })),
- }))
-}
-
export const useCartStore = defineStore('cart', () => {
- const carts = ref(migrateCartItems(loadCarts()))
- const activeCartId = ref(loadActiveCartId())
+ const carts = ref([emptyCart()])
+ const activeCartId = ref('local')
const selectedCompanyId = ref(null)
+ const syncing = ref(false)
- const activeCart = computed(() => carts.value.find((c) => c.id === activeCartId.value) ?? null)
+ const activeCart = computed(() => carts.value.find((c) => c.id === activeCartId.value) ?? carts.value[0] ?? null)
const totalMeterage = computed(
() => activeCart.value?.items.reduce((sum, i) => sum + i.meterage, 0) ?? 0,
@@ -75,107 +44,101 @@ export const useCartStore = defineStore('cart', () => {
return uniqueCompanyNames(activeCart.value.items)
})
+ const catalogStore = useCatalogStore()
+
const maxMeterage = computed(() => {
if (!activeCart.value?.items.length) {
const selected = selectedCompanyId.value
- ? getCompanyById(selectedCompanyId.value)
+ ? catalogStore.getCompany(selectedCompanyId.value)
: null
return selected?.maxMeteragePerInvoice ?? DEFAULT_MAX_METERAGE
}
const companyIds = [...new Set(activeCart.value.items.map((item) => item.companyId))]
return companyIds.reduce((sum, id) => {
- const company = getCompanyById(id)
+ const company = catalogStore.getCompany(id)
return sum + (company?.maxMeteragePerInvoice ?? DEFAULT_MAX_METERAGE)
}, 0)
})
const remainingCapacity = computed(() => Math.max(0, maxMeterage.value - totalMeterage.value))
-
const isFull = computed(() => totalMeterage.value >= maxMeterage.value)
- function persist() {
- saveCarts(carts.value)
- saveActiveCartId(activeCartId.value)
- }
-
- function createEmptyCart(company?: Company): Cart {
+ function applyServerCart(serverCart: ApiCart) {
const cart: Cart = {
- id: generateId(),
- companyId: company?.id ?? '',
- companyName: company?.name ?? '',
- items: [],
+ id: serverCart.id,
+ companyId: serverCart.companyId || '',
+ companyName: serverCart.companyName || uniqueCompanyNames(serverCart.items),
+ items: serverCart.items ?? [],
+ notes: serverCart.notes,
}
- carts.value.push(cart)
+ carts.value = [cart]
activeCartId.value = cart.id
- if (company) selectedCompanyId.value = company.id
- persist()
- return cart
+ if (cart.companyId) selectedCompanyId.value = cart.companyId
}
- function getOrCreateCart(company?: Company): Cart {
- if (activeCart.value) return activeCart.value
-
- const withItems = carts.value.find((cart) => cart.items.length > 0)
- if (withItems) {
- activeCartId.value = withItems.id
- selectedCompanyId.value = selectedCompanyId.value ?? withItems.companyId
- persist()
- return withItems
+ async function hydrate() {
+ if (!getAccessToken()) {
+ resetLocal()
+ return
}
-
- const open = carts.value.find(
- (cart) => getCartTotalMeterage(cart) < DEFAULT_MAX_METERAGE,
- )
- if (open) {
- activeCartId.value = open.id
- if (company) selectedCompanyId.value = company.id
- persist()
- return open
+ syncing.value = true
+ try {
+ const serverCart = await apiRequest('/carts')
+ applyServerCart(serverCart)
+ } catch {
+ resetLocal()
+ } finally {
+ syncing.value = false
}
-
- return createEmptyCart(company)
}
- /** @deprecated Prefer getOrCreateCart / selectCompany — kept for callers. */
- function initCartForCompany(company: Company): Cart {
- selectedCompanyId.value = company.id
- const cart = getOrCreateCart(company)
- if (!cart.companyId) {
- cart.companyId = company.id
- cart.companyName = company.name
- persist()
- }
- return cart
+ function resetLocal() {
+ carts.value = [emptyCart()]
+ activeCartId.value = carts.value[0]!.id
+ selectedCompanyId.value = null
}
function selectCompany(company: Company): void {
selectedCompanyId.value = company.id
- getOrCreateCart(company)
+ if (activeCart.value && !activeCart.value.items.length) {
+ activeCart.value.companyId = company.id
+ activeCart.value.companyName = company.name
+ }
}
- function createNewCartForSameCompany(): Cart | null {
- const company = selectedCompanyId.value
- ? getCompanyById(selectedCompanyId.value)
- : activeCart.value?.companyId
- ? getCompanyById(activeCart.value.companyId)
- : undefined
- return createEmptyCart(company)
+ function initCartForCompany(company: Company): Cart {
+ selectCompany(company)
+ return activeCart.value ?? emptyCart()
}
- function addItem(
+ function getOrCreateCart(company?: Company): Cart {
+ if (company) selectCompany(company)
+ return activeCart.value ?? emptyCart()
+ }
+
+ async function createNewCartForSameCompany(): Promise {
+ try {
+ const serverCart = await apiRequest('/carts', { method: 'DELETE' })
+ applyServerCart(serverCart)
+ return activeCart.value
+ } catch (e) {
+ console.error(e)
+ return null
+ }
+ }
+
+ async function addItem(
product: Product,
catalogCode: string,
meterage: number,
- ): { success: boolean; message?: string } {
- const company = getCompanyById(product.companyId)
+ ): Promise<{ success: boolean; message?: string }> {
+ const company = catalogStore.getCompany(product.companyId)
if (!company) {
return { success: false, message: 'شرکت محصول یافت نشد.' }
}
const cart = getOrCreateCart(company)
- selectedCompanyId.value = company.id
-
const companyMax = company.maxMeteragePerInvoice
const currentCompanyMeterage = companyMeterage(cart, company.id)
const existing = cart.items.find((i) => i.productId === product.id)
@@ -192,41 +155,40 @@ export const useCartStore = defineStore('cart', () => {
return { success: false, message: validation.message }
}
- if (existing) {
- existing.meterage = meterage
- existing.catalogCode = catalogCode
- existing.companyId = company.id
- existing.companyName = company.name
- } else {
- cart.items.push({
- id: generateId(),
- productId: product.id,
- catalogCode,
- productName: product.name,
- productCode: product.code,
- color: product.color,
- meterage,
- unitPrice: product.basePrice,
- companyId: company.id,
- companyName: company.name,
- })
+ try {
+ let serverCart: ApiCart
+ if (existing) {
+ serverCart = await apiRequest(`/carts/items/${existing.id}`, {
+ method: 'PATCH',
+ body: { meterage },
+ })
+ } else {
+ serverCart = await apiRequest('/carts/items', {
+ method: 'POST',
+ body: { productId: product.id, meterage },
+ })
+ }
+ applyServerCart(serverCart)
+ selectedCompanyId.value = company.id
+ return { success: true }
+ } catch (e) {
+ return {
+ success: false,
+ message: e instanceof ApiError ? e.message : 'افزودن به سبد ناموفق بود.',
+ }
}
-
- syncCartCompanyMeta(cart)
- persist()
- return { success: true }
}
- function updateItemMeterage(
+ async function updateItemMeterage(
itemId: string,
meterage: number,
product: Product,
- ): { success: boolean; message?: string } {
+ ): Promise<{ success: boolean; message?: string }> {
if (!activeCart.value) return { success: false, message: 'سبد خرید یافت نشد.' }
const item = activeCart.value.items.find((i) => i.id === itemId)
if (!item) return { success: false, message: 'آیتم یافت نشد.' }
- const company = getCompanyById(item.companyId || product.companyId)
+ const company = catalogStore.getCompany(item.companyId || product.companyId)
const companyMax = company?.maxMeteragePerInvoice ?? DEFAULT_MAX_METERAGE
const currentCompanyMeterage = companyMeterage(activeCart.value, item.companyId)
@@ -241,56 +203,62 @@ export const useCartStore = defineStore('cart', () => {
return { success: false, message: validation.message }
}
- item.meterage = meterage
- persist()
- return { success: true }
+ try {
+ const serverCart = await apiRequest(`/carts/items/${itemId}`, {
+ method: 'PATCH',
+ body: { meterage },
+ })
+ applyServerCart(serverCart)
+ return { success: true }
+ } catch (e) {
+ return {
+ success: false,
+ message: e instanceof ApiError ? e.message : 'بهروزرسانی متراژ ناموفق بود.',
+ }
+ }
}
- function removeItem(itemId: string) {
- if (!activeCart.value) return
- activeCart.value.items = activeCart.value.items.filter((i) => i.id !== itemId)
- syncCartCompanyMeta(activeCart.value)
- persist()
+ async function removeItem(itemId: string) {
+ try {
+ const serverCart = await apiRequest(`/carts/items/${itemId}`, {
+ method: 'DELETE',
+ })
+ applyServerCart(serverCart)
+ } catch (e) {
+ console.error(e)
+ }
}
- function setNotes(notes: string) {
- if (!activeCart.value) return
- activeCart.value.notes = notes
- persist()
+ async function setNotes(notes: string) {
+ try {
+ const serverCart = await apiRequest('/carts/notes', {
+ method: 'PATCH',
+ body: { notes },
+ })
+ applyServerCart(serverCart)
+ } catch (e) {
+ console.error(e)
+ }
}
- function clearActiveCart() {
- if (!activeCart.value) return
- activeCart.value.items = []
- activeCart.value.notes = undefined
- persist()
+ async function clearActiveCart() {
+ try {
+ const serverCart = await apiRequest('/carts', { method: 'DELETE' })
+ applyServerCart(serverCart)
+ } catch {
+ resetLocal()
+ }
}
function ensureActiveCartForCartPage() {
- if (activeCart.value?.items.length) return
-
- const cartWithItems = carts.value.find((cart) => cart.items.length > 0)
- if (!cartWithItems) return
-
- activeCartId.value = cartWithItems.id
- selectedCompanyId.value = selectedCompanyId.value || cartWithItems.companyId
- persist()
- }
-
- function hydrate() {
- carts.value = migrateCartItems(loadCarts())
- activeCartId.value = loadActiveCartId()
- if (activeCart.value) {
- syncCartCompanyMeta(activeCart.value)
- selectedCompanyId.value = selectedCompanyId.value || activeCart.value.companyId
- persist()
- }
+ // server keeps a single cart
}
return {
carts,
activeCartId,
selectedCompanyId,
+ syncing,
activeCart,
totalMeterage,
itemCount,
@@ -308,5 +276,6 @@ export const useCartStore = defineStore('cart', () => {
clearActiveCart,
ensureActiveCartForCartPage,
hydrate,
+ resetLocal,
}
})
diff --git a/src/stores/catalog.ts b/src/stores/catalog.ts
index 8a732fe..d7040e1 100644
--- a/src/stores/catalog.ts
+++ b/src/stores/catalog.ts
@@ -1,38 +1,86 @@
import { defineStore } from 'pinia'
import { ref } from 'vue'
-import {
- companies as mockCompanies,
- getCatalogsByCompany,
- getProductsByCatalog,
- getCatalogById,
- getProductById,
- getCompanyById,
-} from '@/data/mockData'
-import type { Catalog, Company, Product } from '@/types'
+import { apiRequest } from '@/services/http'
+import type { BankAccount, Catalog, Company, Product } from '@/types'
export const useCatalogStore = defineStore('catalog', () => {
- const companies = ref(mockCompanies.filter((c) => c.isActive))
+ const companies = ref([])
+ const catalogs = ref([])
+ const products = ref([])
+ const bankAccounts = ref([])
const searchQuery = ref('')
+ const loading = ref(false)
+ const loaded = ref(false)
+
+ async function loadCompanies(force = false) {
+ if (loaded.value && !force) return companies.value
+ loading.value = true
+ try {
+ const list = await apiRequest('/companies', {
+ query: { activeOnly: true },
+ })
+ companies.value = list
+ .filter((c) => c.isActive)
+ .sort((a, b) => a.displayOrder - b.displayOrder)
+ loaded.value = true
+ } finally {
+ loading.value = false
+ }
+ return companies.value
+ }
function getActiveCompanies(): Company[] {
return [...companies.value].sort((a, b) => a.displayOrder - b.displayOrder)
}
function getCompany(id: string): Company | undefined {
- return getCompanyById(id)
+ return companies.value.find((c) => c.id === id)
+ }
+
+ async function loadCatalogs(companyId: string) {
+ const list = await apiRequest('/catalogs', {
+ query: { companyId, activeOnly: true },
+ })
+ catalogs.value = [
+ ...catalogs.value.filter((c) => c.companyId !== companyId),
+ ...list,
+ ]
+ return list
+ }
+
+ async function loadProducts(catalogId: string, color?: string) {
+ const list = await apiRequest('/products', {
+ query: {
+ catalogId,
+ color: color && color !== 'all' ? color : undefined,
+ activeOnly: true,
+ },
+ })
+ const others = products.value.filter((p) => p.catalogId !== catalogId)
+ products.value = [...others, ...list]
+ return list
+ }
+
+ async function loadBankAccounts(companyId: string) {
+ const list = await apiRequest(`/companies/${companyId}/bank-accounts`)
+ bankAccounts.value = [
+ ...bankAccounts.value.filter((b) => b.companyId !== companyId),
+ ...list.filter((b) => b.isActive),
+ ]
+ return bankAccounts.value.filter((b) => b.companyId === companyId)
}
function fetchCatalogs(companyId: string, query = ''): Catalog[] {
- let list = getCatalogsByCompany(companyId)
+ let list = catalogs.value.filter((c) => c.companyId === companyId && c.isActive)
if (query.trim()) {
const q = query.trim()
list = list.filter((c) => c.code.includes(q) || c.name.includes(q))
}
- return list
+ return [...list].sort((a, b) => a.displayOrder - b.displayOrder)
}
function fetchProducts(catalogId: string, colorFilter?: string): Product[] {
- let list = getProductsByCatalog(catalogId)
+ let list = products.value.filter((p) => p.catalogId === catalogId && p.isActive)
if (colorFilter && colorFilter !== 'all') {
list = list.filter((p) => p.color.includes(colorFilter))
}
@@ -40,21 +88,35 @@ export const useCatalogStore = defineStore('catalog', () => {
}
function getCatalog(id: string) {
- return getCatalogById(id)
+ return catalogs.value.find((c) => c.id === id)
}
function getProduct(id: string) {
- return getProductById(id)
+ return products.value.find((p) => p.id === id)
}
function getUniqueColors(catalogId: string): string[] {
- const products = getProductsByCatalog(catalogId)
- return [...new Set(products.map((p) => p.color))]
+ return [...new Set(fetchProducts(catalogId).map((p) => p.color))]
+ }
+
+ function getBankAccountsByCompany(companyId: string): BankAccount[] {
+ return bankAccounts.value
+ .filter((b) => b.companyId === companyId && b.isActive)
+ .sort((a, b) => a.displayOrder - b.displayOrder)
}
return {
companies,
+ catalogs,
+ products,
+ bankAccounts,
searchQuery,
+ loading,
+ loaded,
+ loadCompanies,
+ loadCatalogs,
+ loadProducts,
+ loadBankAccounts,
getActiveCompanies,
getCompany,
fetchCatalogs,
@@ -62,5 +124,6 @@ export const useCatalogStore = defineStore('catalog', () => {
getCatalog,
getProduct,
getUniqueColors,
+ getBankAccountsByCompany,
}
})
diff --git a/src/stores/order.ts b/src/stores/order.ts
index f781edc..939e04f 100644
--- a/src/stores/order.ts
+++ b/src/stores/order.ts
@@ -5,87 +5,29 @@ import type {
CheckData,
CashPaymentReceipt,
Order,
- OrderItem,
- OrderStatus,
- OrderStatusHistoryEntry,
SettlementType,
CheckRegistrationMode,
} from '@/types'
-import { generateId, generateOrderNumber } from '@/utils/format'
+import { generateId } from '@/utils/format'
import { calculateCheckRass } from '@/utils/checkRass'
-import { getItem, setItem, STORAGE_KEYS } from '@/services/storage'
-import { getCompanyById, getBankAccountsByCompany } from '@/data/mockData'
-
-function loadOrders(): Order[] {
- return getItem(STORAGE_KEYS.orders, [])
-}
-
-function saveOrders(orders: Order[]) {
- setItem(STORAGE_KEYS.orders, orders)
-}
-
-function createStatusEntry(
- from: OrderStatus | null,
- to: OrderStatus,
- note?: string,
-): OrderStatusHistoryEntry {
- return {
- id: generateId(),
- fromStatus: from,
- toStatus: to,
- changedAt: new Date().toISOString(),
- changedBy: 'customer',
- note,
- }
-}
-
-function cartToOrderItems(cart: Cart): OrderItem[] {
- return cart.items.map((item) => ({
- id: generateId(),
- productId: item.productId,
- catalogCode: item.catalogCode,
- productName: item.productName,
- productCode: item.productCode,
- color: item.color,
- requestedMeterage: item.meterage,
- unitPrice: item.unitPrice,
- notes: item.notes,
- }))
-}
-
-function computeCashExpiry(companyId: string): string {
- const company = getCompanyById(companyId)
- const now = new Date()
- if (company?.cashInvoiceValidUntilHour) {
- const expiry = new Date(now)
- expiry.setHours(company.cashInvoiceValidUntilHour, 0, 0, 0)
- if (expiry <= now) {
- expiry.setDate(expiry.getDate() + 1)
- }
- return expiry.toISOString()
- }
- const hours = company?.cashInvoiceValidityHours ?? 8
- return new Date(now.getTime() + hours * 60 * 60 * 1000).toISOString()
-}
+import { apiRequest, ApiError, getAccessToken } from '@/services/http'
+import { useCatalogStore } from './catalog'
export const useOrderStore = defineStore('order', () => {
- const orders = ref(loadOrders())
+ const orders = ref([])
const draftChecks = ref([])
const draftSettlementType = ref(null)
const draftCheckMode = ref(null)
const checkoutCartId = ref(null)
+ const loading = ref(false)
const userOrders = computed(
- () => (userId: string) =>
- orders.value
- .filter((o) => o.userId === userId)
- .sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()),
+ () => (_userId: string) =>
+ [...orders.value].sort(
+ (a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime(),
+ ),
)
- function persist() {
- saveOrders(orders.value)
- }
-
function getOrderById(id: string): Order | undefined {
return orders.value.find((o) => o.id === id)
}
@@ -120,108 +62,131 @@ export const useOrderStore = defineStore('order', () => {
return calculateCheckRass(draftChecks.value, baseDate ?? new Date())
}
- function submitOrder(
- userId: string,
- cart: Cart,
- settlementType: SettlementType,
- checks?: CheckData[],
- checkMode?: CheckRegistrationMode,
- ): Order {
- const items = cartToOrderItems(cart)
- const totalMeterage = items.reduce((s, i) => s + i.requestedMeterage, 0)
- const now = new Date().toISOString()
-
- let status: OrderStatus = 'awaiting_review'
- let checkRassDays: number | undefined
- let checkRassDate: string | undefined
- let cashInvoiceExpiresAt: string | undefined
-
- if (settlementType === 'check' && checks && checks.length > 0) {
- const rass = calculateCheckRass(checks, new Date())
- checkRassDays = rass.rassDays
- checkRassDate = rass.rassDate ?? undefined
- status = 'awaiting_review'
+ async function hydrate() {
+ if (!getAccessToken()) {
+ orders.value = []
+ return
}
-
- if (settlementType === 'cash') {
- cashInvoiceExpiresAt = computeCashExpiry(cart.companyId)
- status = 'awaiting_review'
+ loading.value = true
+ try {
+ orders.value = await apiRequest('/orders')
+ } catch {
+ orders.value = []
+ } finally {
+ loading.value = false
}
+ }
- const order: Order = {
- id: generateId(),
- orderNumber: generateOrderNumber(),
- userId,
- companyId: cart.companyId,
- companyName: cart.companyName,
- items,
- totalMeterage,
- settlementType,
- checkMode,
- checks: checks ? [...checks] : undefined,
- checkRassDays,
- checkRassDate,
- status,
- notes: cart.notes,
- cashInvoiceExpiresAt,
- statusHistory: [
- createStatusEntry(null, 'submitted', 'سفارش ثبت شد'),
- createStatusEntry('submitted', status, 'ارسال برای بررسی مدیریت'),
- ],
- createdAt: now,
- updatedAt: now,
- }
-
- orders.value.unshift(order)
- persist()
-
+ function resetLocal() {
+ orders.value = []
draftChecks.value = []
draftSettlementType.value = null
draftCheckMode.value = null
checkoutCartId.value = null
-
- return order
}
- function submitCashReceipt(
+ async function fetchOrder(id: string): Promise {
+ try {
+ const order = await apiRequest(`/orders/${id}`)
+ const idx = orders.value.findIndex((o) => o.id === id)
+ if (idx >= 0) orders.value[idx] = order
+ else orders.value.unshift(order)
+ return order
+ } catch {
+ return null
+ }
+ }
+
+ async function submitOrder(
+ _userId: string,
+ cart: Cart,
+ settlementType: SettlementType,
+ checks?: CheckData[],
+ checkMode?: CheckRegistrationMode,
+ ): Promise {
+ if (!cart.companyId) {
+ throw new Error('شرکت سبد مشخص نیست.')
+ }
+ if (!cart.items.length) {
+ throw new Error('سبد خرید خالی است.')
+ }
+
+ const body = {
+ companyId: cart.companyId,
+ settlementType,
+ checkMode: settlementType === 'check' ? (checkMode ?? 'full') : undefined,
+ notes: cart.notes,
+ items: cart.items.map((item) => ({
+ productId: item.productId,
+ meterage: item.meterage,
+ notes: item.notes,
+ })),
+ checks:
+ settlementType === 'check' && checks
+ ? checks.map(({ id: _id, ...rest }) => rest)
+ : undefined,
+ }
+
+ try {
+ const order = await apiRequest('/orders', {
+ method: 'POST',
+ body,
+ })
+ orders.value.unshift(order)
+ draftChecks.value = []
+ draftSettlementType.value = null
+ draftCheckMode.value = null
+ checkoutCartId.value = null
+ return order
+ } catch (e) {
+ throw new Error(e instanceof ApiError ? e.message : 'ثبت سفارش ناموفق بود.')
+ }
+ }
+
+ async function submitCashReceipt(
orderId: string,
receipt: Omit,
) {
- const order = getOrderById(orderId)
- if (!order) return null
-
- const fullReceipt: CashPaymentReceipt = {
- ...receipt,
- id: generateId(),
- submittedAt: new Date().toISOString(),
+ try {
+ const order = await apiRequest(`/orders/${orderId}/cash-receipt`, {
+ method: 'POST',
+ body: {
+ amount: receipt.amount,
+ transferDate: receipt.transferDate,
+ transferTime: receipt.transferTime,
+ trackingNumber: receipt.trackingNumber,
+ destinationAccountId: receipt.destinationAccountId,
+ receiptImage: receipt.receiptImage,
+ notes: receipt.notes,
+ },
+ })
+ const idx = orders.value.findIndex((o) => o.id === orderId)
+ if (idx >= 0) orders.value[idx] = order
+ else orders.value.unshift(order)
+ return order
+ } catch (e) {
+ throw new Error(e instanceof ApiError ? e.message : 'ثبت رسید ناموفق بود.')
}
-
- const prevStatus = order.status
- order.cashReceipt = fullReceipt
- order.status = 'awaiting_cash_confirmation'
- order.statusHistory.push(
- createStatusEntry(prevStatus, 'awaiting_cash_confirmation', 'رسید پرداخت ثبت شد'),
- )
- order.updatedAt = new Date().toISOString()
- persist()
- return order
}
- function updateOrderChecks(orderId: string, checks: CheckData[]) {
- const order = getOrderById(orderId)
- if (!order) return null
-
- const rass = calculateCheckRass(checks, new Date(order.createdAt))
- order.checks = checks
- order.checkRassDays = rass.rassDays
- order.checkRassDate = rass.rassDate ?? undefined
- order.updatedAt = new Date().toISOString()
- persist()
- return order
+ async function updateOrderChecks(orderId: string, checks: CheckData[]) {
+ try {
+ const order = await apiRequest(`/orders/${orderId}/checks`, {
+ method: 'PATCH',
+ body: {
+ checks: checks.map(({ id: _id, ...rest }) => rest),
+ },
+ })
+ const idx = orders.value.findIndex((o) => o.id === orderId)
+ if (idx >= 0) orders.value[idx] = order
+ return order
+ } catch {
+ return null
+ }
}
- function hydrate() {
- orders.value = loadOrders()
+ async function getBankAccountsForCompany(companyId: string) {
+ return useCatalogStore().loadBankAccounts(companyId)
}
return {
@@ -230,8 +195,8 @@ export const useOrderStore = defineStore('order', () => {
draftSettlementType,
draftCheckMode,
checkoutCartId,
+ loading,
userOrders,
- persist,
getOrderById,
startCheckout,
setCheckMode,
@@ -243,6 +208,8 @@ export const useOrderStore = defineStore('order', () => {
submitCashReceipt,
updateOrderChecks,
hydrate,
- getBankAccountsForCompany: getBankAccountsByCompany,
+ resetLocal,
+ fetchOrder,
+ getBankAccountsForCompany,
}
})
diff --git a/src/stores/theme.ts b/src/stores/theme.ts
new file mode 100644
index 0000000..4702205
--- /dev/null
+++ b/src/stores/theme.ts
@@ -0,0 +1,34 @@
+import { defineStore } from 'pinia'
+import { computed, watchEffect } from 'vue'
+import { usePreferredDark, useStorage } from '@vueuse/core'
+
+export type ThemePreference = 'light' | 'dark' | 'system'
+
+export const useThemeStore = defineStore('theme', () => {
+ const preference = useStorage('ft_theme', 'system')
+ const prefersDark = usePreferredDark()
+
+ const resolved = computed<'light' | 'dark'>(() => {
+ if (preference.value === 'system') return prefersDark.value ? 'dark' : 'light'
+ return preference.value
+ })
+
+ const isDark = computed(() => resolved.value === 'dark')
+
+ watchEffect(() => {
+ const root = document.documentElement
+ root.classList.toggle('dark', isDark.value)
+ root.style.colorScheme = resolved.value
+ })
+
+ function setPreference(value: ThemePreference) {
+ preference.value = value
+ }
+
+ return {
+ preference,
+ resolved,
+ isDark,
+ setPreference,
+ }
+})
diff --git a/src/types/index.ts b/src/types/index.ts
index 9f13623..caeafb5 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -72,6 +72,7 @@ export interface Catalog {
description?: string
displayOrder: number
isActive: boolean
+ productCount?: number
}
export interface Product {
diff --git a/src/utils/checkRass.ts b/src/utils/checkRass.ts
index 48a2c11..0cd6c13 100644
--- a/src/utils/checkRass.ts
+++ b/src/utils/checkRass.ts
@@ -1,20 +1,22 @@
import type { CheckData, CheckRassResult } from '@/types'
-import { parseISODate } from '@/utils/jalali'
+import { parseISODate, toISODate } from '@/utils/jalali'
+
+function emptyRass(): CheckRassResult {
+ return {
+ checkCount: 0,
+ totalAmount: 0,
+ nearestDueDate: null,
+ farthestDueDate: null,
+ rassDays: 0,
+ rassDate: null,
+ }
+}
export function calculateCheckRass(
checks: CheckData[],
baseDate: Date = new Date(),
): CheckRassResult {
- if (checks.length === 0) {
- return {
- checkCount: 0,
- totalAmount: 0,
- nearestDueDate: null,
- farthestDueDate: null,
- rassDays: 0,
- rassDate: null,
- }
- }
+ if (checks.length === 0) return emptyRass()
const base = new Date(baseDate)
base.setHours(0, 0, 0, 0)
@@ -24,7 +26,17 @@ export function calculateCheckRass(
const dueDates: Date[] = []
for (const check of checks) {
+ if (!check.dueDate) {
+ totalAmount += check.amount
+ continue
+ }
+
const due = parseISODate(check.dueDate)
+ if (Number.isNaN(due.getTime())) {
+ totalAmount += check.amount
+ continue
+ }
+
due.setHours(0, 0, 0, 0)
dueDates.push(due)
const diffMs = due.getTime() - base.getTime()
@@ -42,10 +54,10 @@ export function calculateCheckRass(
return {
checkCount: checks.length,
totalAmount,
- nearestDueDate: dueDates[0]?.toISOString() ?? null,
- farthestDueDate: dueDates[dueDates.length - 1]?.toISOString() ?? null,
+ nearestDueDate: dueDates[0] ? toISODate(dueDates[0]) : null,
+ farthestDueDate: dueDates.length ? toISODate(dueDates[dueDates.length - 1]!) : null,
rassDays,
- rassDate: rassDate.toISOString(),
+ rassDate: toISODate(rassDate),
}
}
@@ -53,6 +65,7 @@ export function daysUntilDue(dueDate: string): number {
const base = new Date()
base.setHours(0, 0, 0, 0)
const due = parseISODate(dueDate)
+ if (Number.isNaN(due.getTime())) return 0
due.setHours(0, 0, 0, 0)
return Math.max(0, Math.round((due.getTime() - base.getTime()) / (1000 * 60 * 60 * 24)))
}
diff --git a/src/utils/format.ts b/src/utils/format.ts
index b29c70e..5f71072 100644
--- a/src/utils/format.ts
+++ b/src/utils/format.ts
@@ -45,16 +45,22 @@ const persianDateTimeFormatter = new Intl.DateTimeFormat('fa-IR-u-ca-persian', {
function toDateValue(date: string | Date): Date {
if (typeof date !== 'string') return date
- if (/^\d{4}-\d{2}-\d{2}$/.test(date)) return parseISODate(date)
+ if (/^\d{4}-\d{2}-\d{2}/.test(date)) return parseISODate(date)
return new Date(date)
}
-export function formatDate(date: string | Date): string {
- return persianDateFormatter.format(toDateValue(date))
+export function formatDate(date: string | Date | null | undefined): string {
+ if (!date) return '—'
+ const value = toDateValue(date)
+ if (Number.isNaN(value.getTime())) return '—'
+ return persianDateFormatter.format(value)
}
-export function formatDateTime(date: string | Date): string {
- return persianDateTimeFormatter.format(toDateValue(date))
+export function formatDateTime(date: string | Date | null | undefined): string {
+ if (!date) return '—'
+ const value = toDateValue(date)
+ if (Number.isNaN(value.getTime())) return '—'
+ return persianDateTimeFormatter.format(value)
}
export function formatTime(date: string | Date): string {
@@ -70,10 +76,10 @@ export function toPersianDigits(input: string): string {
}
export function normalizePhone(phone: string): string {
- const digits = phone.replace(/\D/g, '')
- if (digits.startsWith('98')) return '0' + digits.slice(2)
- if (digits.startsWith('9') && digits.length === 10) return '0' + digits
- return digits
+ let digits = extractNumericString(phone)
+ if (digits.startsWith('98')) digits = '0' + digits.slice(2)
+ else if (digits.startsWith('9') && digits.length === 10) digits = '0' + digits
+ return digits.slice(0, 11)
}
export function generateId(): string {
diff --git a/src/utils/jalali.ts b/src/utils/jalali.ts
index c724465..b7b180f 100644
--- a/src/utils/jalali.ts
+++ b/src/utils/jalali.ts
@@ -30,8 +30,17 @@ export interface JalaliDate {
}
export function parseISODate(iso: string): Date {
- const [year, month, day] = iso.split('-').map(Number)
- return new Date(year!, month! - 1, day!)
+ const match = iso.trim().match(/^(\d{4})-(\d{2})-(\d{2})/)
+ if (match) {
+ return new Date(Number(match[1]), Number(match[2]) - 1, Number(match[3]))
+ }
+
+ const parsed = new Date(iso)
+ if (Number.isNaN(parsed.getTime())) {
+ return new Date(NaN)
+ }
+
+ return new Date(parsed.getFullYear(), parsed.getMonth(), parsed.getDate())
}
export function toISODate(date: Date): string {
diff --git a/src/utils/validation.ts b/src/utils/validation.ts
index 7598664..8b1e44a 100644
--- a/src/utils/validation.ts
+++ b/src/utils/validation.ts
@@ -1,4 +1,5 @@
import type { MeterageValidationResult, Product } from '@/types'
+import { normalizePhone } from '@/utils/format'
export function validateNationalId(nationalId: string): boolean {
if (!/^\d{10}$/.test(nationalId)) return false
@@ -17,7 +18,7 @@ export function validateSayadId(sayadId: string): boolean {
}
export function validatePhone(phone: string): boolean {
- return /^09\d{9}$/.test(phone.replace(/\D/g, '').replace(/^9/, '09').slice(0, 11))
+ return /^09\d{9}$/.test(normalizePhone(phone))
}
export function validateMeterage(
diff --git a/src/views/OrdersView.vue b/src/views/OrdersView.vue
index 30ebce7..3e89d3d 100644
--- a/src/views/OrdersView.vue
+++ b/src/views/OrdersView.vue
@@ -14,14 +14,20 @@ const {
filteredOrdersMobile,
filteredOrdersDesktop,
paginatedOrders,
+ paginatedOrdersMobile,
totalPages,
+ mobileTotalPages,
paginationRange,
+ mobilePaginationRange,
visiblePages,
+ mobileVisiblePages,
currentPage,
+ mobilePage,
companySlug,
iconVariant,
goToOrder,
setPage,
+ setMobilePage,
setDesktopFilter,
viewStatFilter,
} = useOrderList()
@@ -47,12 +53,18 @@ const desktopFilterTabs: { id: DesktopOrderFilterId; label: string }[] = [
class="mobile-only"
:tab="tab"
:tabs="mobileTabs"
- :orders="filteredOrdersMobile"
+ :orders="paginatedOrdersMobile"
+ :total-count="filteredOrdersMobile.length"
+ :current-page="mobilePage"
+ :total-pages="mobileTotalPages"
+ :pagination-range="mobilePaginationRange"
+ :visible-pages="mobileVisiblePages"
:company-slug="companySlug"
:icon-variant="iconVariant"
@update:tab="tab = $event"
@select="goToOrder"
@back="router.push('/')"
+ @set-page="setMobilePage"
/>
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
import { useRouter } from 'vue-router'
import { useAuthStore } from '@/stores/auth'
import BaseInput from '@/components/ui/BaseInput.vue'
import FormErrorBanner from '@/components/ui/FormErrorBanner.vue'
import BaseButton from '@/components/ui/BaseButton.vue'
-import { normalizePhone } from '@/utils/format'
+import { normalizePhone, toPersianDigits } from '@/utils/format'
+import { validatePhone } from '@/utils/validation'
import {
FORM_VALIDATION_SUMMARY,
clearFieldError,
@@ -20,24 +21,42 @@ const phone = ref('')
const fieldErrors = ref({})
const formError = ref('')
+const displayPhone = computed(() => (phone.value ? toPersianDigits(phone.value) : ''))
+
+function phoneErrorMessage(value: string): string {
+ if (!value) return 'شماره موبایل را وارد کنید.'
+ if (!validatePhone(value)) return 'شماره موبایل معتبر نیست. (مثال: ۰۹۱۲۱۲۳۴۵۶۷)'
+ return ''
+}
+
function clearPhoneError() {
fieldErrors.value = clearFieldError(fieldErrors.value, 'phone')
if (!hasFieldErrors(fieldErrors.value)) formError.value = ''
}
+function onPhoneInput(value: string) {
+ phone.value = normalizePhone(value)
+ clearPhoneError()
+}
+
+function onPhoneBlur() {
+ if (!phone.value) return
+ const message = phoneErrorMessage(phone.value)
+ if (message) {
+ fieldErrors.value = { ...fieldErrors.value, phone: message }
+ }
+}
+
async function submit() {
fieldErrors.value = {}
formError.value = ''
const normalized = normalizePhone(phone.value)
- const errors: FieldErrors = {}
+ phone.value = normalized
- if (!/^09\d{9}$/.test(normalized)) {
- errors.phone = 'شماره موبایل معتبر نیست.'
- }
-
- if (hasFieldErrors(errors)) {
- fieldErrors.value = errors
+ const message = phoneErrorMessage(normalized)
+ if (message) {
+ fieldErrors.value = { phone: message }
formError.value = FORM_VALIDATION_SUMMARY
return
}
@@ -52,59 +71,41 @@ async function submit() {
-
-
+
+
-
+
+
دریافت کد تأیید
+
-
+
-
-
diff --git a/src/views/auth/OtpView.vue b/src/views/auth/OtpView.vue
index c168c14..8fbe2db 100644
--- a/src/views/auth/OtpView.vue
+++ b/src/views/auth/OtpView.vue
@@ -1,10 +1,11 @@
-
-
+
+
-
+
+
+
+
تأیید و ورود
+
+ ارسال مجدد کد
+ ارسال مجدد کد ({{ timerLabel }})
+
+
+ تغییر شماره موبایل
+
+
diff --git a/src/views/auth/RegisterView.vue b/src/views/auth/RegisterView.vue
index e1ebe03..b2436ea 100644
--- a/src/views/auth/RegisterView.vue
+++ b/src/views/auth/RegisterView.vue
@@ -6,6 +6,7 @@ import BaseInput from '@/components/ui/BaseInput.vue'
import FormErrorBanner from '@/components/ui/FormErrorBanner.vue'
import BaseButton from '@/components/ui/BaseButton.vue'
import { normalizePhone } from '@/utils/format'
+import { validatePhone } from '@/utils/validation'
import {
FORM_VALIDATION_SUMMARY,
clearFieldError,
@@ -40,7 +41,7 @@ async function submit() {
if (!lastName.value.trim()) {
errors.lastName = 'نام خانوادگی الزامی است.'
}
- if (!/^09\d{9}$/.test(normalized)) {
+ if (!validatePhone(normalized)) {
errors.phone = 'شماره موبایل معتبر نیست.'
}
@@ -64,10 +65,10 @@ async function submit() {
-
-
+
+
@@ -100,36 +101,12 @@ async function submit() {
دریافت کد تأیید
-
+
-
-
diff --git a/src/views/cart/CartView.vue b/src/views/cart/CartView.vue
index 574cd26..01f9de2 100644
--- a/src/views/cart/CartView.vue
+++ b/src/views/cart/CartView.vue
@@ -30,49 +30,59 @@ function goToOrdering() {
-
+
+
-
+
-
-
-
سقف متراژ تکمیل شد
-
- سقف متراژ این فاکتور تکمیل شده است. آیا مایلید ادامه محصولات را در فاکتور جدید ثبت کنید؟
-
-
-
تسویه همین فاکتور
-
فاکتور جدید
+
+
+
سقف متراژ تکمیل شد
+
+ سقف متراژ این فاکتور تکمیل شده است. آیا مایلید ادامه محصولات را در فاکتور جدید ثبت کنید؟
+
+
+ تسویه همین فاکتور
+ فاکتور جدید
+
diff --git a/src/views/catalogs/CatalogListView.vue b/src/views/catalogs/CatalogListView.vue
index 611254b..3f7a104 100644
--- a/src/views/catalogs/CatalogListView.vue
+++ b/src/views/catalogs/CatalogListView.vue
@@ -1,14 +1,16 @@
@@ -42,8 +58,8 @@ function getProductCount(catalogId: string) {
class="catalog-page__search"
/>
-
-
+
+
-
کالیتهای یافت نشد.
+
@@ -76,7 +96,7 @@ function getProductCount(catalogId: string) {
class="catalog-page__search"
/>
-
+
-
کالیتهای یافت نشد.
+
diff --git a/src/views/checkout/CashSettlementView.vue b/src/views/checkout/CashSettlementView.vue
index 9d86896..a952d2e 100644
--- a/src/views/checkout/CashSettlementView.vue
+++ b/src/views/checkout/CashSettlementView.vue
@@ -1,20 +1,23 @@
@@ -115,9 +119,10 @@ function submitOrder() {
-
چکی ثبت نشده است.
-
ثبت چک جدید
-
ثبت سفارش جدید
+
+ ثبت چک جدید
+ ثبت سفارش جدید
+
-
+
ثبت چک جدید
@@ -293,7 +298,7 @@ function submitOrder() {
min-height: 0;
height: 100%;
padding: 12px var(--page-padding) 0;
- background: #ffffff;
+ background: var(--color-bg);
overflow: hidden;
}
@@ -360,8 +365,10 @@ function submitOrder() {
.summary-card {
padding: 14px 12px;
border-radius: 14px;
- background: #f1f5f9;
+ background: var(--color-summary-bg);
+ border: 1px solid var(--color-border);
text-align: center;
+ color: var(--color-text);
}
.summary-card__label {
@@ -422,8 +429,9 @@ function submitOrder() {
align-items: center;
padding: 12px;
border-radius: 14px;
- background: #f8fafc;
- border: 1px solid #eef2f7;
+ background: var(--color-elevated);
+ border: 1px solid var(--color-border);
+ color: var(--color-text);
}
.check-card__menu-wrap {
@@ -450,7 +458,7 @@ function submitOrder() {
min-width: 88px;
padding: 4px;
border-radius: var(--radius-sm);
- background: #fff;
+ background: var(--color-elevated);
border: 1px solid var(--color-border);
box-shadow: var(--shadow-md);
}
@@ -505,7 +513,7 @@ function submitOrder() {
border-radius: 8px;
object-fit: cover;
border: 1px solid var(--color-border);
- background: #fff;
+ background: var(--color-surface);
}
.check-card__thumb--empty {
@@ -519,8 +527,8 @@ function submitOrder() {
.rass-panel {
padding: 16px;
border-radius: 14px;
- background: #ecfdf3;
- border: 1px solid #bbf7d0;
+ background: var(--color-success-light);
+ border: 1px solid var(--color-success);
margin-bottom: 12px;
text-align: center;
}
@@ -529,26 +537,26 @@ function submitOrder() {
margin: 0 0 6px;
font-size: 0.875rem;
font-weight: 600;
- color: #166534;
+ color: var(--color-success);
}
.rass-panel__days {
font-size: 1.75rem;
font-weight: 700;
- color: #15803d;
+ color: var(--color-success);
line-height: 1.2;
}
.rass-panel__date {
margin: 6px 0 0;
font-size: 0.8125rem;
- color: #166534;
+ color: var(--color-success);
}
.check-list-page__footer {
flex-shrink: 0;
padding: 12px 0 calc(12px + env(safe-area-inset-bottom, 0));
- background: #fff;
+ background: var(--color-bg);
border-top: 1px solid var(--color-border);
box-shadow: 0 -4px 16px rgba(15, 23, 42, 0.06);
margin: 0 calc(-1 * var(--page-padding));
diff --git a/src/views/checkout/CheckModeSelectView.vue b/src/views/checkout/CheckModeSelectView.vue
index 21f8cfa..2ee9dda 100644
--- a/src/views/checkout/CheckModeSelectView.vue
+++ b/src/views/checkout/CheckModeSelectView.vue
@@ -71,8 +71,9 @@ function selectMode(mode: 'full' | 'brief') {
padding: 32px 24px;
border: none;
border-radius: 16px;
- background: #ffffff;
- box-shadow: 0 2px 12px rgba(15, 23, 42, 0.06);
+ background: var(--color-elevated);
+ color: var(--color-text);
+ box-shadow: var(--shadow-sm);
cursor: pointer;
transition:
box-shadow 0.15s,
diff --git a/src/views/checkout/SettlementTypeView.vue b/src/views/checkout/SettlementTypeView.vue
index 1262ec8..afae80f 100644
--- a/src/views/checkout/SettlementTypeView.vue
+++ b/src/views/checkout/SettlementTypeView.vue
@@ -99,9 +99,10 @@ function selectType(type: 'cash' | 'check') {
padding: 32px 24px;
border: none;
border-radius: 16px;
- background: #fff;
+ background: var(--color-elevated);
box-shadow: var(--shadow-sm);
cursor: pointer;
+ color: var(--color-text);
}
.settlement-card--desktop {
diff --git a/src/views/companies/CompanySelectView.vue b/src/views/companies/CompanySelectView.vue
index a5bfeb0..e243470 100644
--- a/src/views/companies/CompanySelectView.vue
+++ b/src/views/companies/CompanySelectView.vue
@@ -1,4 +1,5 @@
-
+
+ در حال بارگذاری…
+
+
+
-
+
+
diff --git a/src/views/companies/components/MobileCompanySelect.vue b/src/views/companies/components/MobileCompanySelect.vue
index 45e92e5..7954a24 100644
--- a/src/views/companies/components/MobileCompanySelect.vue
+++ b/src/views/companies/components/MobileCompanySelect.vue
@@ -46,7 +46,8 @@ defineEmits<{
display: flex;
flex-direction: column;
min-height: 0;
- background: #fff;
+ background: var(--color-bg);
+ color: var(--color-text);
padding: 12px 0;
}
@@ -91,13 +92,14 @@ defineEmits<{
.company-brand-card--par {
background: var(--color-primary);
color: #fff;
- box-shadow: 0 8px 24px rgba(29, 53, 87, 0.25);
+ box-shadow: var(--shadow-md);
}
.company-brand-card--fam-baft {
- background: #f3ece3;
- color: #1a202c;
- box-shadow: 0 4px 16px rgba(15, 23, 42, 0.06);
+ background: var(--color-brand-warm);
+ color: var(--color-brand-warm-text);
+ box-shadow: var(--shadow-card);
+ border: 1px solid var(--color-border);
}
.company-brand-card__logo {
@@ -121,6 +123,6 @@ defineEmits<{
}
.company-brand-card--fam-baft .company-brand-card__desc {
- color: #718096;
+ color: var(--color-brand-warm-muted);
}
diff --git a/src/views/orders/OrderDetailView.vue b/src/views/orders/OrderDetailView.vue
index beb648c..6787398 100644
--- a/src/views/orders/OrderDetailView.vue
+++ b/src/views/orders/OrderDetailView.vue
@@ -64,8 +64,31 @@ watch(destinationAccountId, () => {
if (!hasFieldErrors(fieldErrors.value)) formError.value = ''
})
-const bankAccounts = computed(() =>
- order.value ? orderStore.getBankAccountsForCompany(order.value.companyId) : [],
+const bankAccounts = ref(
+ [] as Awaited
>,
+)
+
+watch(
+ () => order.value?.companyId,
+ async (companyId) => {
+ if (!companyId) {
+ bankAccounts.value = []
+ return
+ }
+ bankAccounts.value = await orderStore.getBankAccountsForCompany(companyId)
+ },
+ { immediate: true },
+)
+
+watch(
+ () => orderId.value,
+ async (id) => {
+ if (!id) return
+ if (!orderStore.getOrderById(id)) {
+ await orderStore.fetchOrder(id)
+ }
+ },
+ { immediate: true },
)
const statusHero = computed(() => (order.value ? getStatusHero(order.value.status) : null))
@@ -114,7 +137,7 @@ async function handleReceiptImage(event: Event) {
receiptImage.value = await fileToBase64(file)
}
-function submitReceipt() {
+async function submitReceipt() {
if (!order.value) return
fieldErrors.value = {}
@@ -142,17 +165,21 @@ function submitReceipt() {
return
}
- orderStore.submitCashReceipt(order.value.id, {
- amount,
- transferDate: receiptDate.value,
- transferTime: receiptTime.value || '12:00',
- trackingNumber: trackingNumber.value,
- destinationAccountId: destinationAccountId.value,
- receiptImage: receiptImage.value || undefined,
- })
- showReceiptForm.value = false
- fieldErrors.value = {}
- formError.value = ''
+ try {
+ await orderStore.submitCashReceipt(order.value.id, {
+ amount,
+ transferDate: receiptDate.value,
+ transferTime: receiptTime.value || '12:00',
+ trackingNumber: trackingNumber.value,
+ destinationAccountId: destinationAccountId.value,
+ receiptImage: receiptImage.value || undefined,
+ })
+ showReceiptForm.value = false
+ fieldErrors.value = {}
+ formError.value = ''
+ } catch (e) {
+ formError.value = e instanceof Error ? e.message : 'ثبت رسید ناموفق بود.'
+ }
}
@@ -388,7 +415,8 @@ function submitReceipt() {
min-height: 0;
height: 100%;
padding: 12px var(--page-padding) 0;
- background: #ffffff;
+ background: var(--color-bg);
+ color: var(--color-text);
overflow: hidden;
}
@@ -457,15 +485,15 @@ function submitReceipt() {
}
.order-info-card {
- background: #ffffff;
+ background: var(--color-elevated);
border-radius: 20px;
- box-shadow: 0 4px 20px rgba(15, 23, 42, 0.08);
+ box-shadow: var(--shadow-sm);
padding: 20px 18px 8px;
}
.order-info-card__head {
padding-bottom: 16px;
- border-bottom: 1px solid #eeeeee;
+ border-bottom: 1px solid var(--color-border);
margin-bottom: 4px;
}
@@ -490,7 +518,7 @@ function submitReceipt() {
align-items: center;
gap: 12px;
padding: 14px 0;
- border-bottom: 1px solid #eeeeee;
+ border-bottom: 1px solid var(--color-border);
}
.order-info-card__row--last {
@@ -511,7 +539,7 @@ function submitReceipt() {
}
.order-info-card__value--accent {
- color: #2b66e3;
+ color: var(--color-primary);
font-weight: 500;
}
@@ -525,7 +553,7 @@ function submitReceipt() {
.order-detail-page__footer {
flex-shrink: 0;
padding: 12px 0;
- background: #ffffff;
+ background: var(--color-bg);
border-top: 1px solid var(--color-border);
box-shadow: 0 -4px 16px rgba(15, 23, 42, 0.06);
margin: 0 calc(-1 * var(--page-padding));
@@ -550,7 +578,7 @@ function submitReceipt() {
padding: 16px;
border: 1px solid var(--color-border);
border-radius: 16px;
- background: #ffffff;
+ background: var(--color-elevated);
box-shadow: var(--shadow-sm);
}
diff --git a/src/views/orders/components/DesktopOrdersPage.vue b/src/views/orders/components/DesktopOrdersPage.vue
index 263ebba..855cab8 100644
--- a/src/views/orders/components/DesktopOrdersPage.vue
+++ b/src/views/orders/components/DesktopOrdersPage.vue
@@ -203,7 +203,7 @@ const emit = defineEmits<{
-
+
ثبت سفارش جدید
diff --git a/src/views/products/components/DesktopProductPage.vue b/src/views/products/components/DesktopProductPage.vue
index e91a3c5..3737f19 100644
--- a/src/views/products/components/DesktopProductPage.vue
+++ b/src/views/products/components/DesktopProductPage.vue
@@ -1,5 +1,6 @@
-
-