diff --git a/Dockerfile b/Dockerfile index 1f89853..89bb00d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ FROM node:22-alpine AS build WORKDIR /app COPY package.json package-lock.json ./ +RUN npm config set registry https://mirror2.chabokan.net/npm/ RUN npm ci COPY . . diff --git a/src/views/products/ProductDetailView.vue b/src/views/products/ProductDetailView.vue index 277f944..cf7ded4 100644 --- a/src/views/products/ProductDetailView.vue +++ b/src/views/products/ProductDetailView.vue @@ -7,7 +7,7 @@ import { useCartStore } from '@/stores/cart' import { useCatalogStore } from '@/stores/catalog' import type { CatalogProductCard } from '@/types/crm' import type { Product } from '@/types' -import { formatNumber } from '@/utils/format' +import { formatMeterage, formatNumber } from '@/utils/format' import IconChevronBack from '@/components/icons/IconChevronBack.vue' import IconCart from '@/components/icons/IconCart.vue' import IconCatalog from '@/components/icons/IconCatalog.vue' @@ -35,10 +35,13 @@ const showAllSpecs = ref(false) const rollMeters = computed(() => product.value?.rollMeters ?? 50) const orderMeters = computed(() => rolls.value * rollMeters.value) -const minRolls = computed(() => { - const min = product.value?.minMeterage ?? rollMeters.value - return Math.max(1, Math.ceil(min / rollMeters.value)) +const minOrderMeters = computed(() => { + const min = product.value?.minMeterage + return min && min > 0 ? min : rollMeters.value }) +const minRolls = computed(() => + Math.max(1, Math.ceil(minOrderMeters.value / rollMeters.value)), +) async function load() { if (!productId.value) { @@ -295,7 +298,7 @@ function shareProduct() { {{ adding ? 'در حال افزودن...' : 'افزودن به سفارش' }} -

حداقل سفارش: {{ formatNumber(minRolls) }} طاقه

+

حداقل سفارش: {{ formatMeterage(minOrderMeters) }}