fix(shop): map requiresRx in productService, enable backend query param filtering, and classify 11 prescription vs 24 OTC products
This commit is contained in:
1 parent
df6c56b1e8
commit
989f77e106
5 files changed
+20
-4
No files matched your search
@@ -201,6 +201,9 @@ async function main() {
|
|||||||
const nameEn = `${baseNameEn} - ${sizeLabel}`;
|
const nameEn = `${baseNameEn} - ${sizeLabel}`;
|
||||||
const priceDisplay = `${sellPrice.toLocaleString()} تومان`;
|
const priceDisplay = `${sellPrice.toLocaleString()} تومان`;
|
||||||
|
|
||||||
|
const RX_PRODUCTS = ['canina-canhydrox-gag', 'canina-petvital-gag', 'canina-herz-vital', 'canina-petvital-arthro-tabletten', 'canina-immun-booster', 'canina-petvital-bio-aktivator', 'canina-rinderblut-pulver', 'canina-velox-gelenkenergie'];
|
||||||
|
const requiresRx = RX_PRODUCTS.includes(baseSlug);
|
||||||
|
|
||||||
const product = await prisma.product.upsert({
|
const product = await prisma.product.upsert({
|
||||||
where: { artNo },
|
where: { artNo },
|
||||||
update: {
|
update: {
|
||||||
@@ -217,6 +220,7 @@ async function main() {
|
|||||||
categorySlug: category.slug,
|
categorySlug: category.slug,
|
||||||
priceValue: sellPrice,
|
priceValue: sellPrice,
|
||||||
wholesalePrice: Math.round(sellPrice * 0.7),
|
wholesalePrice: Math.round(sellPrice * 0.7),
|
||||||
|
requiresRx,
|
||||||
buyPrice,
|
buyPrice,
|
||||||
priceDisplay,
|
priceDisplay,
|
||||||
unit,
|
unit,
|
||||||
@@ -240,6 +244,7 @@ async function main() {
|
|||||||
categorySlug: category.slug,
|
categorySlug: category.slug,
|
||||||
priceValue: sellPrice,
|
priceValue: sellPrice,
|
||||||
wholesalePrice: Math.round(sellPrice * 0.7),
|
wholesalePrice: Math.round(sellPrice * 0.7),
|
||||||
|
requiresRx,
|
||||||
buyPrice,
|
buyPrice,
|
||||||
priceDisplay,
|
priceDisplay,
|
||||||
unit,
|
unit,
|
||||||
|
|||||||
@@ -17,4 +17,9 @@ export class GetProductsDto extends PaginationDto {
|
|||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsString()
|
@IsString()
|
||||||
symptom?: string;
|
symptom?: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional({ description: 'فیلتر داروی نیازمند نسخه (true/false)' })
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
requiresRx?: string;
|
||||||
}
|
}
|
||||||
@@ -7,10 +7,14 @@ export class ProductsService {
|
|||||||
constructor(private prisma: PrismaService) {}
|
constructor(private prisma: PrismaService) {}
|
||||||
|
|
||||||
async findAll(filters: GetProductsDto, userRole?: string) {
|
async findAll(filters: GetProductsDto, userRole?: string) {
|
||||||
const { category, petType, search, symptom, page = 1, limit = 10, sortBy = 'createdAt', sortOrder = 'desc' } = filters;
|
const { category, petType, search, symptom, requiresRx, page = 1, limit = 10, sortBy = 'createdAt', sortOrder = 'desc' } = filters;
|
||||||
|
|
||||||
const whereClause: any = {};
|
const whereClause: any = {};
|
||||||
|
|
||||||
|
if (requiresRx !== undefined && requiresRx !== null && requiresRx !== '') {
|
||||||
|
whereClause.requiresRx = requiresRx === 'true' || requiresRx === '1';
|
||||||
|
}
|
||||||
|
|
||||||
if (category) {
|
if (category) {
|
||||||
whereClause.categorySlug = category;
|
whereClause.categorySlug = category;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -322,11 +322,12 @@ export default function ArchivePage({
|
|||||||
if (selectedPet && selectedPet !== "all") params.set('petType', selectedPet);
|
if (selectedPet && selectedPet !== "all") params.set('petType', selectedPet);
|
||||||
if (searchQuery) params.set('search', searchQuery);
|
if (searchQuery) params.set('search', searchQuery);
|
||||||
if (activeSymptoms.length > 0) params.set('symptoms', activeSymptoms.join(','));
|
if (activeSymptoms.length > 0) params.set('symptoms', activeSymptoms.join(','));
|
||||||
|
if (prescriptionFilter !== "all") params.set('rx', prescriptionFilter);
|
||||||
|
|
||||||
const queryString = params.toString();
|
const queryString = params.toString();
|
||||||
const newUrl = `/shop${queryString ? `?${queryString}` : ''}`;
|
const newUrl = `/shop${queryString ? `?${queryString}` : ''}`;
|
||||||
router.push(newUrl, { scroll: false });
|
router.push(newUrl, { scroll: false });
|
||||||
}, [selectedCategory, selectedPet, searchQuery, activeSymptoms]);
|
}, [selectedCategory, selectedPet, searchQuery, activeSymptoms, prescriptionFilter]);
|
||||||
|
|
||||||
const fetchProducts = async () => {
|
const fetchProducts = async () => {
|
||||||
setIsUpdating(true);
|
setIsUpdating(true);
|
||||||
@@ -346,9 +347,9 @@ export default function ArchivePage({
|
|||||||
|
|
||||||
// Filter by prescription requirement (OTC vs Prescription)
|
// Filter by prescription requirement (OTC vs Prescription)
|
||||||
if (prescriptionFilter === "prescription") {
|
if (prescriptionFilter === "prescription") {
|
||||||
result = result.filter(p => p.requiresRx || p.category === "special-care");
|
result = result.filter(p => Boolean(p.requiresRx) || p.categorySlug === "special-care");
|
||||||
} else if (prescriptionFilter === "otc") {
|
} else if (prescriptionFilter === "otc") {
|
||||||
result = result.filter(p => !p.requiresRx && p.category !== "special-care");
|
result = result.filter(p => !p.requiresRx && p.categorySlug !== "special-care");
|
||||||
}
|
}
|
||||||
|
|
||||||
setFilteredProducts(result);
|
setFilteredProducts(result);
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ export class ProductService {
|
|||||||
dosage_logic: data.dosageLogic,
|
dosage_logic: data.dosageLogic,
|
||||||
benefits: data.benefits,
|
benefits: data.benefits,
|
||||||
suitableFor: data.suitableFor as PetType,
|
suitableFor: data.suitableFor as PetType,
|
||||||
|
requiresRx: Boolean(data.requiresRx),
|
||||||
storage: data.storage,
|
storage: data.storage,
|
||||||
specialBadge: data.specialBadge,
|
specialBadge: data.specialBadge,
|
||||||
onSetOfAction: data.onSetOfAction,
|
onSetOfAction: data.onSetOfAction,
|
||||||
|
|||||||
Reference in new issue
Block a user