fix bug of product-modal

src/views/base/gold/index.vue

@@ -308,6 +308,7 @@ import {
   productMaxOrderCash,
   productMinOrderCash
 } from '@/utils/productOrderLimit'
+import { isProductBuyOpen, isProductSellOpen } from '@/utils/productTradeOpen'
 
 const infoVisible = ref(false)
 const walletStore = useWalletStore()
@@ -689,6 +690,8 @@ function useStyle() {
 
 
 function setIsBuy(val: boolean) {
+  if (val && !isProductBuyOpen(props?.ProductItem)) return
+  if (!val && !isProductSellOpen(props?.ProductItem)) return
   isBuy.value = val
   form.value.goldValue = undefined
   form.value.goldCash = undefined

src/views/base/products/composables/useProductsPage.ts

@@ -1,5 +1,6 @@
 import {
   inject,
+  nextTick,
   onMounted,
   onUnmounted,
   provide,
@@ -8,12 +9,13 @@ import {
   computed,
   type InjectionKey,
 } from 'vue'
+import { message } from 'ant-design-vue'
 import router from '@/router'
 import { loading } from '@/utils'
 import type { Product } from '@/models/products'
 import { cloneDeep } from 'lodash'
 import { isProductPriceInactive } from '@/utils/productPrice'
-import { getStoreClosedHint, shouldBlockStoreTrading } from '@/utils/storeHours'
+import { getStoreClosedHint, resolveStoreClosedNotice, shouldBlockStoreTrading } from '@/utils/storeHours'
 import { useUserStore } from '@/store/userStore'
 import { lastPrice } from '@/utils/price'
 import {
@@ -61,10 +63,21 @@ export function useProductsPageProvider() {
     getStoreClosedHint(userStore.getValueByKey('closed_message')),
   )
 
+  function openStoreClosedModal() {
+    showFilter.value = false
+    if (isAfterCloseTime.value) {
+      isAfterCloseTime.value = false
+      nextTick(() => {
+        isAfterCloseTime.value = true
+      })
+      return
+    }
+    isAfterCloseTime.value = true
+  }
+
   function syncStoreClosedState() {
     if (shouldBlockStoreTrading()) {
-      showFilter.value = false
-      isAfterCloseTime.value = true
+      openStoreClosedModal()
     }
   }
 
@@ -78,8 +91,8 @@ export function useProductsPageProvider() {
     if (!item?.show) return
 
     if (shouldBlockStoreTrading()) {
-      showFilter.value = false
-      isAfterCloseTime.value = true
+      message.warning(resolveStoreClosedNotice(userStore.getValueByKey('closed_message')))
+      openStoreClosedModal()
       return
     }
 
@@ -100,8 +113,8 @@ export function useProductsPageProvider() {
 
   watch(showFilter, (open) => {
     if (open && shouldBlockStoreTrading()) {
-      showFilter.value = false
-      isAfterCloseTime.value = true
+      message.warning(resolveStoreClosedNotice(userStore.getValueByKey('closed_message')))
+      openStoreClosedModal()
       return
     }
     if (!open) {

src/views/base/products/desktop/DesktopProductsView.vue

@@ -43,7 +43,7 @@
             :product="item"
             :inactive="isProductPriceInactive(item)"
             :locked="storeClosed"
-            @click="clickProduct(item)"
+            @select="clickProduct(item)"
           />
           <div v-if="!loading && !items?.length" class="dproducts-empty">
             محصولی برای نمایش وجود ندارد.
@@ -58,7 +58,7 @@
 import DesktopPageTopbar from '@/layouts/components/DesktopPageTopbar.vue'
 import DesktopProductCard from './components/DesktopProductCard.vue'
 import { useProductsPageContext } from '../composables/useProductsPage'
-import { isStoreClosed, STORE_CLOSED_TITLE } from '@/utils/storeHours'
+import { isStoreClosed, shouldBlockStoreTrading, STORE_CLOSED_TITLE } from '@/utils/storeHours'
 import { computed } from 'vue'
 
 const {
@@ -72,7 +72,7 @@ const {
   storeClosedMessage,
 } = useProductsPageContext()
 
-const storeClosed = computed(() => isStoreClosed())
+const storeClosed = computed(() => isStoreClosed() || shouldBlockStoreTrading())
 </script>
 
 <style lang="less" src="./styles/desktop-products.less"></style>

src/views/base/products/desktop/components/DesktopProductCard.vue

@@ -7,7 +7,7 @@
       'dproducts-card--locked': locked,
     }"
     :disabled="!isClickable"
-    @click="$emit('click')"
+    @click="handleClick"
   >
     <div class="dproducts-card__image-wrap">
       <img :src="displayImage" class="dproducts-card__image" alt="">
@@ -48,12 +48,17 @@ const props = withDefaults(
   { inactive: false, locked: false },
 )
 
-defineEmits<{
-  click: []
+const emit = defineEmits<{
+  select: []
 }>()
 
 const isClickable = computed(() => props.product.show && !props.inactive && !props.locked)
 
+function handleClick() {
+  if (!isClickable.value) return
+  emit('select')
+}
+
 const displayImage = computed(() => getProductDisplayImage(props.product))
 
 const price = computed(() => getProductBuyPrice(props.product))

src/views/base/products/index.vue

@@ -12,7 +12,7 @@
     <BasicActionSheet v-if="!isDesktop" placement="bottom" v-model:show="showFilter">
       <div v-if="showFilter" :key="orderSheetKey">
         <indexGold
-          v-if="usesQuantityTrade(selectedProduct)"
+          v-if="usesMeltedOrQuantityTrade(selectedProduct)"
           :ProductItem="selectedProduct"
         />
         <DealProduct v-else :ProductItem="selectedProduct" @ordered="onProductOrdered" />
@@ -22,14 +22,14 @@
     <BasicModal
       v-else
       v-model:visible="showFilter"
-      class="dproducts-order-panel"
+      wrap-class-name="dproducts-order-panel"
       :title="selectedProduct?.title ?? 'ثبت سفارش'"
       width="560px"
       destroy-on-close
     >
       <div v-if="showFilter" :key="orderSheetKey">
         <indexGold
-          v-if="usesQuantityTrade(selectedProduct)"
+          v-if="usesMeltedOrQuantityTrade(selectedProduct)"
           :ProductItem="selectedProduct"
         />
         <DealProduct v-else :ProductItem="selectedProduct" @ordered="onProductOrdered" />
@@ -73,7 +73,12 @@ import DealProduct from '@/views/base/products/components/DealProduct.vue'
 import BasicModal from '@/components/BasicPacks/BasicModal.vue'
 import ResponsiveViewPair from '@/layouts/components/ResponsiveViewPair.vue'
 import { useDesktopBreakpoint } from '@/layouts/composables/useAppLayout'
-import { usesQuantityTrade } from '@/utils/productCategories'
+import type { Product } from '@/models/products'
+import { isMeltedTradeGroup, usesQuantityTrade } from '@/utils/productCategories'
+
+function usesMeltedOrQuantityTrade(product?: Product) {
+  return usesQuantityTrade(product) || isMeltedTradeGroup(product?.group_type)
+}
 import { STORE_CLOSED_TITLE } from '@/utils/storeHours'
 import { useProductsPageProvider } from './composables/useProductsPage'
 import MobileProductsView from './mobile/MobileProductsView.vue'

src/views/login/desktop/components/DesktopAuthShell.vue

@@ -106,7 +106,7 @@ import router from '@/router'
 import BasicIcon from '@/components/BasicPacks/BasicIcon.vue'
 import { getProjectLoginLogo } from '@/utils/config'
 import { useDraggableFloatingButton } from '@/utils/useDraggableFloatingButton'
-import copperProducts from '../../assets/img/login-copper-hero.jpg'
+import copperProducts from '../../assets/img/login-copper-hero.webp'
 
 const pageLogo = getProjectLoginLogo()