diff --git a/backend/prisma/schema.prisma b/backend/prisma/schema.prisma index cd006589..a9ff9c22 100644 --- a/backend/prisma/schema.prisma +++ b/backend/prisma/schema.prisma @@ -230,6 +230,7 @@ model Product { metaDescription String? @map("meta_description") @db.Text canonicalUrl String? @map("canonical_url") @db.Text keywords String? @db.Text + stock Int @default(100) @map("stock") stockStatus StockStatus @default(IN_STOCK) @map("stock_status") noIndex Boolean @default(false) @map("no_index") noFollow Boolean @default(false) @map("no_follow") diff --git a/backend/src/admin/admin.service.ts b/backend/src/admin/admin.service.ts index ff62111d..8f0bfac9 100644 --- a/backend/src/admin/admin.service.ts +++ b/backend/src/admin/admin.service.ts @@ -581,7 +581,8 @@ export class AdminService { metaDescription: data.metaDescription || '', keywords: data.keywords || '', canonicalUrl: data.canonicalUrl || '', - stockStatus: data.stockStatus || 'IN_STOCK', + stock: data.stock !== undefined ? Number(data.stock) : (data.stockStatus === 'OUT_OF_STOCK' ? 0 : 100), + stockStatus: data.stockStatus || (data.stock !== undefined && Number(data.stock) <= 0 ? 'OUT_OF_STOCK' : 'IN_STOCK'), noIndex: data.noIndex ?? false, noFollow: data.noFollow ?? false, ogImage: data.ogImage || null, @@ -761,8 +762,14 @@ export class AdminService { metaDescription: data.metaDescription, keywords: data.keywords, canonicalUrl: data.canonicalUrl, + stock: + data.stock !== undefined ? Number(data.stock) : undefined, stockStatus: - data.stockStatus !== undefined ? data.stockStatus : undefined, + data.stockStatus !== undefined + ? data.stockStatus + : (data.stock !== undefined + ? (Number(data.stock) <= 0 ? 'OUT_OF_STOCK' : 'IN_STOCK') + : undefined), noIndex: data.noIndex !== undefined ? data.noIndex : undefined, noFollow: data.noFollow !== undefined ? data.noFollow : undefined, ogImage: data.ogImage !== undefined ? data.ogImage : undefined, diff --git a/backend/src/admin/dto/product.dto.ts b/backend/src/admin/dto/product.dto.ts index c44b0832..ffcdefd0 100644 --- a/backend/src/admin/dto/product.dto.ts +++ b/backend/src/admin/dto/product.dto.ts @@ -241,6 +241,11 @@ export class ProductDto { @IsString() stockStatus?: 'IN_STOCK' | 'OUT_OF_STOCK' | 'PRE_ORDER' | 'DISCONTINUED'; + @ApiPropertyOptional({ description: 'تعداد موجودی در انبار' }) + @IsOptional() + @IsNumber() + stock?: number; + @ApiPropertyOptional({ description: 'عدم ایندکس توسط موتورهای جستجو' }) @IsOptional() @IsBoolean() diff --git a/backend/src/orders/orders.service.ts b/backend/src/orders/orders.service.ts index c14d644e..567ac2f1 100644 --- a/backend/src/orders/orders.service.ts +++ b/backend/src/orders/orders.service.ts @@ -141,18 +141,23 @@ export class OrdersService { const productMap = new Map(products.map((p) => [p.id, p])); - for (const productId of productIds) { - const product = productMap.get(productId); + for (const item of createOrderDto.items) { + const product = productMap.get(item.productId); if (!product) { throw new NotFoundException(`محصول یافت نشد`); } const isOutOfStock = product.stockStatus === 'OUT_OF_STOCK' || product.stockStatus === 'DISCONTINUED' || - (product.packageSize !== null && Number(product.packageSize) <= 0); + product.stock <= 0; if (isOutOfStock) { throw new BadRequestException( - `محصول «${product.nameFa || product.name}» در حال حاضر ناموجود است و امکان ثبت سفارش آن وجود ندارد`, + `محصول «${product.nameFa || (product as any).name}» در حال حاضر ناموجود است و امکان ثبت سفارش آن وجود ندارد`, + ); + } + if (item.quantity > product.stock) { + throw new BadRequestException( + `تعداد درخواستی برای محصول «${product.nameFa || (product as any).name}» (${item.quantity} عدد) بیشتر از موجودی انبار (${product.stock} عدد) است`, ); } } @@ -272,6 +277,22 @@ export class OrdersService { .catch(() => {}); } + // Deduct inventory atomically for wallet orders + for (const item of createOrderDto.items) { + const updated = await tx.product.update({ + where: { id: item.productId }, + data: { + stock: { decrement: item.quantity }, + }, + }); + if (updated.stock <= 0) { + await tx.product.update({ + where: { id: item.productId }, + data: { stockStatus: 'OUT_OF_STOCK' }, + }); + } + } + return newOrder; }); @@ -289,27 +310,49 @@ export class OrdersService { const isOnline = createOrderDto.paymentMethod === 'online'; const initialStatus = isOnline ? 'pending_payment' : 'processing'; - const createdOrder = await this.prisma.order.create({ - data: { - userId, - couponId, - totalAmount: Number(finalAmount), - charityDonation: Number(charityAmount), - isRefill: Boolean(createOrderDto.isRefill), - refillIntervalDays: createOrderDto.refillIntervalDays || 60, - trackingNumber, - status: initialStatus, - paymentMethod: createOrderDto.paymentMethod || 'card', - shippingAddress: createOrderDto.shippingAddress, - orderItems: { - create: orderItemsData, + const createdOrder = await this.prisma.$transaction(async (tx) => { + const order = await tx.order.create({ + data: { + userId, + couponId, + totalAmount: Number(finalAmount), + charityDonation: Number(charityAmount), + isRefill: Boolean(createOrderDto.isRefill), + refillIntervalDays: createOrderDto.refillIntervalDays || 60, + trackingNumber, + status: initialStatus, + paymentMethod: createOrderDto.paymentMethod || 'card', + shippingAddress: createOrderDto.shippingAddress, + orderItems: { + create: orderItemsData, + }, }, - }, - include: { - orderItems: { - include: { product: true }, + include: { + orderItems: { + include: { product: true }, + }, }, - }, + }); + + // Deduct inventory immediately for non-online orders (card to card) + if (!isOnline) { + for (const item of createOrderDto.items) { + const updated = await tx.product.update({ + where: { id: item.productId }, + data: { + stock: { decrement: item.quantity }, + }, + }); + if (updated.stock <= 0) { + await tx.product.update({ + where: { id: item.productId }, + data: { stockStatus: 'OUT_OF_STOCK' }, + }); + } + } + } + + return order; }); // Send Order Confirmation SMS (for card-to-card or non-online orders, online orders get SMS on verify) diff --git a/backend/src/payment/payment.service.ts b/backend/src/payment/payment.service.ts index c0b453df..d709df78 100644 --- a/backend/src/payment/payment.service.ts +++ b/backend/src/payment/payment.service.ts @@ -433,12 +433,36 @@ export class PaymentService { }, }); - // Mark inventory reservations as CONSUMED + // Mark inventory reservations as CONSUMED and decrement product stock await tx.inventoryReservation.updateMany({ where: { orderId: transaction.orderId, status: 'ACTIVE' }, data: { status: 'CONSUMED' }, }); + const orderWithItems = await tx.order.findUnique({ + where: { id: transaction.orderId }, + include: { orderItems: true }, + }); + + if (orderWithItems?.orderItems) { + for (const item of orderWithItems.orderItems) { + if (item.productId) { + const updated = await tx.product.update({ + where: { id: item.productId }, + data: { + stock: { decrement: item.quantity }, + }, + }); + if (updated.stock <= 0) { + await tx.product.update({ + where: { id: item.productId }, + data: { stockStatus: 'OUT_OF_STOCK' }, + }); + } + } + } + } + // If charity donation was made, update user's total charity if ( transaction.order && diff --git a/backend/src/products/torob.controller.ts b/backend/src/products/torob.controller.ts index ac0c420e..3359d89e 100644 --- a/backend/src/products/torob.controller.ts +++ b/backend/src/products/torob.controller.ts @@ -187,7 +187,7 @@ export class TorobController { const isInStock = product.stockStatus !== 'DISCONTINUED' && product.stockStatus !== 'OUT_OF_STOCK' && - (product.packageSize === null || Number(product.packageSize) > 0) && + (product.stock === undefined || product.stock > 0) && String(product.stockStatus || '') .toLowerCase() .includes('in'); diff --git a/frontend/admin-panel/src/pages/Products.tsx b/frontend/admin-panel/src/pages/Products.tsx index ed066909..f6330121 100644 --- a/frontend/admin-panel/src/pages/Products.tsx +++ b/frontend/admin-panel/src/pages/Products.tsx @@ -96,6 +96,7 @@ export interface Product { keywords?: string; canonicalUrl?: string; slug?: string; + stock?: number; stockStatus?: 'IN_STOCK' | 'OUT_OF_STOCK' | 'PRE_ORDER' | 'DISCONTINUED'; noIndex?: boolean; noFollow?: boolean; @@ -249,6 +250,7 @@ export default function Products() { priceDisplay: '', unit: '', packageSize: '' as number | string, + stock: '' as number | string, dosageLogic: '', suitableFor: 'سگ و گربه', imageUrl: '', @@ -518,6 +520,7 @@ export default function Products() { priceDisplay: product.priceDisplay || '', unit: product.unit || '', packageSize: product.packageSize !== undefined && product.packageSize !== null ? Number(product.packageSize) : '', + stock: product.stock !== undefined && product.stock !== null ? Number(product.stock) : (product.stockStatus === 'OUT_OF_STOCK' ? 0 : 100), dosageLogic: product.dosageLogic || '', feedingAdvice: dosageConfig.feedingAdvice || product.feedingAdvice || product.dosageLogic || '', showFaqs: dosageConfig.showFaqs !== undefined ? Boolean(dosageConfig.showFaqs) : (product.showFaqs !== undefined ? Boolean(product.showFaqs) : true), @@ -576,7 +579,7 @@ export default function Products() { wholesaleMarginPercent: pricingSettings.defaultWholesaleMarginPercent, roundingStep: '', roundingMode: '', - priceDisplay: '', unit: '', packageSize: '', dosageLogic: '', + priceDisplay: '', unit: '', packageSize: '', stock: '', dosageLogic: '', feedingAdvice: '', showFaqs: true, faqs: [], @@ -906,7 +909,8 @@ export default function Products() { roundingMode: formData.roundingMode || null, priceDisplay: formData.priceDisplay || `${Number(formData.priceValue || 0).toLocaleString('fa-IR')} تومان`, unit: (formData.unit || '').trim() || undefined, - packageSize: Number(formData.packageSize) || 0, + packageSize: formData.packageSize !== '' ? Number(formData.packageSize) : 100, + stock: formData.stock !== '' ? Number(formData.stock) : (formData.stockStatus === 'OUT_OF_STOCK' ? 0 : 100), dosageLogic: (formData.dosageLogic || '').trim() || undefined, suitableFor: formData.suitableFor || 'سگ و گربه', imageUrl: (formData.imageUrl || '').trim() || undefined, @@ -927,7 +931,7 @@ export default function Products() { metaDescription: (formData.metaDescription || '').trim() || formData.shortDescription || 'خرید آنلاین مکمل اصل کنینا آلمان با بالاترین کیفیت بالینی...', keywords: (formData.keywords || '').trim() || undefined, canonicalUrl: (formData.canonicalUrl || '').trim() || `/shop/${derivedSlug}`, - stockStatus: (Number(formData.packageSize) <= 0) ? 'OUT_OF_STOCK' : (formData.stockStatus || 'IN_STOCK'), + stockStatus: (formData.stock !== '' && Number(formData.stock) <= 0) ? 'OUT_OF_STOCK' : (formData.stockStatus || 'IN_STOCK'), noIndex: Boolean(formData.noIndex), noFollow: Boolean(formData.noFollow), ogImage: (formData.ogImage || '').trim() || undefined, @@ -1303,7 +1307,14 @@ export default function Products() {
{Number(product.priceValue).toLocaleString()} تومان - {product.packageSize} موجودی +
+ 0 ? 'text-emerald-600' : 'text-rose-600'}`}> + {product.stock !== undefined ? `${product.stock} عدد موجود` : (product.stockStatus === 'OUT_OF_STOCK' ? 'ناموجود' : 'موجود')} + + {product.packageSize && ( + ({product.packageSize} {product.unit || 'واحد'}) + )} +
@@ -2822,23 +2833,39 @@ export default function Products() { -
+
- + setFormData({ ...formData, stock: e.target.value === '' ? '' : Number(e.target.value) })} + className="w-full px-4 py-3 rounded-xl border border-gray-200 focus:border-purple-500 outline-none text-left font-mono font-bold" + dir="ltr" + /> + تعداد فیزیکی کالا برای خرید و کنترل سقف سفارش +
+
+ + setFormData({ ...formData, packageSize: e.target.value === '' ? '' : Number(e.target.value) })} className="w-full px-4 py-3 rounded-xl border border-gray-200 focus:border-purple-500 outline-none text-left font-mono font-bold" dir="ltr" /> + جهت محاسبه روز مصرف و سئو
- setFormData({ ...formData, unit: e.target.value })} className="w-full px-4 py-3 rounded-xl border border-gray-200 focus:border-purple-500 outline-none text-sm" /> + setFormData({ ...formData, unit: e.target.value })} className="w-full px-4 py-3 rounded-xl border border-gray-200 focus:border-purple-500 outline-none text-sm" /> + واحد بسته (گرم، قرص، میلی‌لیتر)
diff --git a/frontend/application/app/ClientLayout.tsx b/frontend/application/app/ClientLayout.tsx index b1eed048..dadb3d00 100644 --- a/frontend/application/app/ClientLayout.tsx +++ b/frontend/application/app/ClientLayout.tsx @@ -231,7 +231,13 @@ export default function ClientLayout({ children }: { children: React.ReactNode } onClose={() => setIsPrescriptionModalOpen(false)} /> setIsPrescriptionModalOpen(true)} + onPrescriptionOpen={() => { + if (!isLoggedIn) { + setAuthModalOpen(true); + } else { + setIsPrescriptionModalOpen(true); + } + }} /> diff --git a/frontend/application/app/shop/[slug]/page.tsx b/frontend/application/app/shop/[slug]/page.tsx index f9263e34..3cf4d1f1 100644 --- a/frontend/application/app/shop/[slug]/page.tsx +++ b/frontend/application/app/shop/[slug]/page.tsx @@ -122,10 +122,10 @@ export default async function ShopProductPage({ params }: { params: Promise<{ sl const productUrl = `${siteUrl}/shop/${resolvedParams.slug}`; const priceInRial = product.priceValue * 10; - // Map stock status and packageSize to Schema.org availability + // Map stock status and stock quantity to Schema.org availability const isOutOfStock = product.stockStatus === 'OUT_OF_STOCK' || - (typeof product.packageSize === 'number' && product.packageSize <= 0); + (typeof product.stock === 'number' && product.stock <= 0); let availabilityUrl = 'https://schema.org/InStock'; if (product.stockStatus === 'DISCONTINUED') { diff --git a/frontend/application/components/Header.tsx b/frontend/application/components/Header.tsx index ad17a436..d54a2f65 100644 --- a/frontend/application/components/Header.tsx +++ b/frontend/application/components/Header.tsx @@ -250,7 +250,13 @@ export default function Header({ {/* Prescription Upload Button (Desktop & Mobile) */} {isPrescriptionEnabled && (