From ee38a888c11a79c90ff765085bd3c53fb24a3414 Mon Sep 17 00:00:00 2001
From: safavimohadeseh78 <safavimohadeseh78@gmail.com>
Date: Sun, 8 Nov 2026 12:04:52 +0330
Subject: [PATCH] Fix delivered status grouping and add auto-refresh to order
 details

---
 .env.development                     |  3 +-
 src/composables/useOrderList.ts      | 11 ++++++-
 src/utils/orderStatusGroups.ts       | 10 +++----
 src/views/orders/OrderDetailView.vue | 43 +++++++++++++++++++++-------
 4 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/.env.development b/.env.development
index 97c8b06..72cfce8 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,3 @@
-# Same-origin in dev (Vite proxies to the real API — avoids CORS)
-VITE_API_BASE_URL=/server/api
+VITE_API_BASE_URL=https://parche.montest.ir/server/api
 # Set true only for offline local OTP (code 1234)
 VITE_USE_MOCK_AUTH=false
diff --git a/src/composables/useOrderList.ts b/src/composables/useOrderList.ts
index e7ea934..dcbd1b6 100644
--- a/src/composables/useOrderList.ts
+++ b/src/composables/useOrderList.ts
@@ -1,4 +1,4 @@
-import { computed, ref, watch, onMounted } from 'vue'
+import { computed, ref, watch, onMounted, onUnmounted } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
 import { useOrderStore } from '@/stores/order'
 import { useAuthStore } from '@/stores/auth'
@@ -27,10 +27,19 @@ export function useOrderList() {
   const mobilePage = ref(1)
   const submitSuccessMessage = ref('')
 
+  function onWindowFocus() {
+    void orderStore.hydrate()
+  }
+
   onMounted(async () => {
+    window.addEventListener('focus', onWindowFocus)
     await Promise.all([orderStore.hydrate(), catalogStore.loadCompanies()])
   })
 
+  onUnmounted(() => {
+    window.removeEventListener('focus', onWindowFocus)
+  })
+
   watch(
     () => route.query.submitted,
     (submitted) => {
diff --git a/src/utils/orderStatusGroups.ts b/src/utils/orderStatusGroups.ts
index c7b6845..e4d93fb 100644
--- a/src/utils/orderStatusGroups.ts
+++ b/src/utils/orderStatusGroups.ts
@@ -15,6 +15,9 @@ export const IN_PROGRESS_STATUSES: OrderStatus[] = [
   'pricing',
   'check_in_progress',
   'awaiting_cash_confirmation',
+  'cash_confirmed',
+  'checks_approved',
+  'final_approved',
   'preparing',
   'ready_to_ship',
   'needs_correction',
@@ -29,12 +32,7 @@ export const IN_PROGRESS_STATUSES: OrderStatus[] = [
 
 export const SHIPPED_STATUSES: OrderStatus[] = ['shipped']
 
-export const DELIVERED_STATUSES: OrderStatus[] = [
-  'delivered',
-  'final_approved',
-  'checks_approved',
-  'cash_confirmed',
-]
+export const DELIVERED_STATUSES: OrderStatus[] = ['delivered']
 
 export const CANCELLED_STATUSES: OrderStatus[] = ['cancelled', 'rejected', 'expired', 'check_rejected']
 
diff --git a/src/views/orders/OrderDetailView.vue b/src/views/orders/OrderDetailView.vue
index 2b789df..66afa7a 100644
--- a/src/views/orders/OrderDetailView.vue
+++ b/src/views/orders/OrderDetailView.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, computed, watch } from 'vue'
+import { ref, computed, watch, onMounted, onUnmounted } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useMediaQuery } from '@vueuse/core'
 import { useOrderStore } from '@/stores/order'
@@ -122,21 +122,44 @@ watch(
   { immediate: true },
 )
 
+async function refreshCurrentOrder() {
+  if (!orderId.value) return
+  try {
+    await orderStore.fetchOrder(orderId.value)
+  } catch {
+    /* keep empty/existing state if fetch fails */
+  }
+}
+
 watch(
   () => orderId.value,
-  async (id) => {
-    if (!id) return
-    if (!orderStore.getOrderById(id)) {
-      try {
-        await orderStore.fetchOrder(id)
-      } catch {
-        /* keep empty state if fetch fails */
-      }
-    }
+  () => {
+    void refreshCurrentOrder()
   },
   { immediate: true },
 )
 
+let pollTimer: ReturnType<typeof setInterval> | null = null
+
+function onWindowFocus() {
+  void refreshCurrentOrder()
+}
+
+onMounted(() => {
+  window.addEventListener('focus', onWindowFocus)
+  pollTimer = setInterval(() => {
+    const s = order.value?.status
+    if (s && !['delivered', 'cancelled', 'rejected', 'expired'].includes(s)) {
+      void refreshCurrentOrder()
+    }
+  }, 15_000)
+})
+
+onUnmounted(() => {
+  window.removeEventListener('focus', onWindowFocus)
+  if (pollTimer) clearInterval(pollTimer)
+})
+
 const statusHero = computed(() => (order.value ? getStatusHero(order.value.status) : null))
 const trackingFooterLabel = computed(() =>
   order.value ? getTrackingFooterLabel(order.value.status) : 'مشاهده جزئیات سفارش',