Compare commits

...
Author SHA1 Message Date
devops 7f2f638f38 test(backend): fix unit tests for media magic validation, slow query logger, and support chat specs
Deploy Canina / deploy (push) Successful in 41s
2026-10-18 15:40:03 +00:00
devops dda1caf3e0 feat(backend & dba): implement inventory concurrency guard, redis distributed locks, magic byte file validation, slow query logger, and db check constraints 2026-10-18 15:29:37 +00:00
devops 73bc79b4bb fix(backend): encapsulate TasksService in TasksModule and export OrdersService
Deploy Canina / deploy (push) Successful in 30s
2026-10-18 14:43:17 +00:00
devops 9520426a66 perf(backend & dba): resolve unindexed foreign keys, eliminate N+1 in product catalog, add background tasks for inventory release & payment reconciliation, and harden SQL queries
Deploy Canina / deploy (push) Failing after 36s
2026-10-18 14:35:41 +00:00
devops b077423ab2 fix: move BackToTop to right side, wire global prescription modal trigger in header & mobile drawer
Deploy Canina / deploy (push) Successful in 2m15s
2026-10-18 14:09:01 +00:00
devops 94867fbd5a fix(frontend): ensure use client is first line in ArchivePage
Deploy Canina / deploy (push) Successful in 2m16s
2026-10-18 13:54:31 +00:00
devops 6a37f2f4c7 fix: support chat elevated only on PDP, rx button opens modal instantly, and hide pet badge when not logged in
Deploy Canina / deploy (push) Failing after 21s
2026-10-18 13:50:54 +00:00
devops b54338f91f fix(backend): fix duplicate success in deleteSymptom
Deploy Canina / deploy (push) Successful in 2m33s
2026-10-18 13:28:39 +00:00
devops c7b95b4d2b feat: dock PDP buy bar above mobile nav, redesign B2B modal to mobile-card layout, and implement full symptoms CRUD in backend & admin panel
Deploy Canina / deploy (push) Failing after 1m23s
2026-10-18 13:26:01 +00:00
devops 8e4388c325 fix(backend): fix duplicate success property in renameSymptom response
Deploy Canina / deploy (push) Successful in 2m30s
2026-10-18 12:58:12 +00:00
devops 305995cbe2 fix(backend): correct syntax for prisma transaction in renameSymptom
Deploy Canina / deploy (push) Failing after 1m15s
2026-10-18 12:55:11 +00:00
devops 468170349d feat(ux-fix): resolve wiki fallback 404, responsive B2B modal, clean badges, aligned bullets, mobile bottom nav on PDP and admin Rx/symptoms management
Deploy Canina / deploy (push) Failing after 1m14s
2026-10-18 12:51:04 +00:00
devops 52446592e7 fix(header): clean up prescription button navigation onClick handler
Deploy Canina / deploy (push) Successful in 2m16s
2026-10-18 11:35:43 +00:00
devops 7bca0ef335 feat(prescriptions): launch online veterinary prescription assessment portal with regression tests (B2B-03)
Deploy Canina / deploy (push) Failing after 1m6s
2026-10-18 11:31:49 +00:00
devops 80717680a1 feat(b2b): connect B2B landing inquiry form to public inquiry endpoint with regression test (B2B-01)
Deploy Canina / deploy (push) Successful in 2m14s
2026-10-18 11:19:51 +00:00
36 changed files with 1394 additions and 121 deletions

No files matched your search

+33 -3
View File
@@ -57,7 +57,7 @@ export class AdminController {
@ApiQuery({ name: "search", required: false, description: "جستجو" }) @ApiQuery({ name: "search", required: false, description: "جستجو" })
async getUsers(@Query() query: AdminQueryDto) { async getUsers(@Query() query: AdminQueryDto) {
const result = await this.adminService.getUsers(query); const result = await this.adminService.getUsers(query);
return { success: true, ...result }; return result;
} }
@Post("users") @Post("users")
@@ -145,7 +145,7 @@ export class AdminController {
@ApiQuery({ name: "search", required: false, description: "جستجو" }) @ApiQuery({ name: "search", required: false, description: "جستجو" })
async getProducts(@Query() query: AdminQueryDto) { async getProducts(@Query() query: AdminQueryDto) {
const result = await this.adminService.getProducts(query); const result = await this.adminService.getProducts(query);
return { success: true, ...result }; return result;
} }
@Post("products") @Post("products")
@@ -206,7 +206,7 @@ export class AdminController {
@ApiQuery({ name: "status", required: false, description: "فیلتر وضعیت" }) @ApiQuery({ name: "status", required: false, description: "فیلتر وضعیت" })
async getOrders(@Query() query: AdminQueryDto) { async getOrders(@Query() query: AdminQueryDto) {
const result = await this.adminService.getOrders(query); const result = await this.adminService.getOrders(query);
return { success: true, ...result }; return result;
} }
@Get("orders/:id") @Get("orders/:id")
@@ -354,4 +354,34 @@ export class AdminController {
await this.settingsService.updateBulkUiTexts(body); await this.settingsService.updateBulkUiTexts(body);
return { success: true, data: body }; return { success: true, data: body };
} }
@Get("symptoms")
@ApiOperation({ summary: "لیست کامل علائم درمانی با صفحه‌بندی، جستجو و متادیتا" })
async getSymptoms(@Query() query: { page?: number; limit?: number; search?: string }) {
const res = await this.adminService.getSymptoms(query);
return res;
}
@Post("symptoms")
@ApiOperation({ summary: "افزودن علامت درمانی جدید" })
async createSymptom(@Body() body: { name: string; slug?: string; description?: string; metaTitle?: string; metaDescription?: string; keywords?: string }) {
const res = await this.adminService.createSymptom(body);
return { success: true, data: res };
}
@Put("symptoms/:id")
@ApiOperation({ summary: "ویرایش کامل علامت درمانی و متادیتاهای سئو" })
async updateSymptom(@Param("id") id: string, @Body() body: any) {
const res = await this.adminService.updateSymptom(id, body);
return { success: true, data: res };
}
@Delete("symptoms/:id")
@ApiOperation({ summary: "حذف علامت درمانی" })
async deleteSymptom(@Param("id") id: string) {
const res = await this.adminService.deleteSymptom(id);
return res;
}
} }
+160
View File
@@ -1869,4 +1869,164 @@ export class AdminService {
}; };
}); });
} }
async getSymptoms(params?: { page?: number; limit?: number; search?: string }) {
const page = Math.max(1, Number(params?.page) || 1);
const limit = Math.max(1, Number(params?.limit) || 20);
const offset = (page - 1) * limit;
const search = params?.search?.trim() || '';
let items: any[] = [];
let total = 0;
if (search) {
const searchPattern = `%${search}%`;
const [listResult, countResult] = await Promise.all([
this.prisma.$queryRaw<any[]>`
SELECT
s.id,
s.name,
s.slug,
s.description,
s.meta_title as "metaTitle",
s.meta_description as "metaDescription",
s.keywords,
s.icon,
s.created_at as "createdAt",
COALESCE(COUNT(ps.product_id), 0)::int as "productsCount"
FROM symptoms s
LEFT JOIN product_symptoms ps ON ps.symptom = s.name
WHERE s.name ILIKE ${searchPattern} OR s.slug ILIKE ${searchPattern}
GROUP BY s.id, s.name, s.slug, s.description, s.meta_title, s.meta_description, s.keywords, s.icon, s.created_at
ORDER BY s.name ASC
LIMIT ${limit} OFFSET ${offset};
`,
this.prisma.$queryRaw<any[]>`
SELECT COUNT(*)::int as total
FROM symptoms s
WHERE s.name ILIKE ${searchPattern} OR s.slug ILIKE ${searchPattern};
`,
]);
items = listResult;
total = countResult[0]?.total || 0;
} else {
const [listResult, countResult] = await Promise.all([
this.prisma.$queryRaw<any[]>`
SELECT
s.id,
s.name,
s.slug,
s.description,
s.meta_title as "metaTitle",
s.meta_description as "metaDescription",
s.keywords,
s.icon,
s.created_at as "createdAt",
COALESCE(COUNT(ps.product_id), 0)::int as "productsCount"
FROM symptoms s
LEFT JOIN product_symptoms ps ON ps.symptom = s.name
GROUP BY s.id, s.name, s.slug, s.description, s.meta_title, s.meta_description, s.keywords, s.icon, s.created_at
ORDER BY s.name ASC
LIMIT ${limit} OFFSET ${offset};
`,
this.prisma.$queryRaw<any[]>`
SELECT COUNT(*)::int as total
FROM symptoms s;
`,
]);
items = listResult;
total = countResult[0]?.total || 0;
}
const lastPage = Math.ceil(total / limit) || 1;
return {
data: items,
meta: {
page,
limit,
total,
lastPage,
},
};
}
async createSymptom(dto: { name: string; slug?: string; description?: string; metaTitle?: string; metaDescription?: string; keywords?: string }) {
if (!dto.name?.trim()) throw new BadRequestException('نام علامت الزامی است');
const name = dto.name.trim();
const slug = dto.slug?.trim() || name.replace(/\s+/g, '-').toLowerCase();
return await this.prisma.$queryRawUnsafe(`
INSERT INTO symptoms (name, slug, description, meta_title, meta_description, keywords)
VALUES ($1, $2, $3, $4, $5, $6)
RETURNING id, name, slug, description, meta_title as "metaTitle", meta_description as "metaDescription", keywords;
`, name, slug, dto.description || '', dto.metaTitle || '', dto.metaDescription || '', dto.keywords || '');
}
async updateSymptom(id: string, dto: { name?: string; slug?: string; description?: string; metaTitle?: string; metaDescription?: string; keywords?: string }) {
// 1. Get existing symptom
const existing = await this.prisma.$queryRawUnsafe<any[]>(`SELECT * FROM symptoms WHERE id = $1::uuid LIMIT 1`, id);
if (!existing || existing.length === 0) throw new NotFoundException('علامت یافت نشد');
const oldName = existing[0].name;
const newName = dto.name?.trim() || oldName;
const newSlug = dto.slug?.trim() || existing[0].slug;
return await this.prisma.$transaction(async (tx) => {
// Update symptoms table
const updated = await tx.$queryRawUnsafe(`
UPDATE symptoms
SET
name = $2,
slug = $3,
description = $4,
meta_title = $5,
meta_description = $6,
keywords = $7,
updated_at = CURRENT_TIMESTAMP
WHERE id = $1::uuid
RETURNING id, name, slug, description, meta_title as "metaTitle", meta_description as "metaDescription", keywords;
`, id, newName, newSlug, dto.description ?? existing[0].description, dto.metaTitle ?? existing[0].meta_title, dto.metaDescription ?? existing[0].meta_description, dto.keywords ?? existing[0].keywords);
// If name changed, cascade update across product_symptoms & products JSON
if (oldName !== newName) {
await tx.$executeRaw`UPDATE product_symptoms SET symptom = ${newName} WHERE symptom = ${oldName};`;
await tx.$executeRaw`
UPDATE products
SET dosage_config = jsonb_set(
dosage_config,
'{symptoms}',
(
SELECT jsonb_agg(
CASE
WHEN elem::text = to_jsonb(${oldName}::text)::text THEN to_jsonb(${newName}::text)
ELSE elem
END
)
FROM jsonb_array_elements(dosage_config->'symptoms') AS elem
)
)
WHERE dosage_config ? 'symptoms'
AND dosage_config->'symptoms' @> to_jsonb(${oldName}::text);
`;
}
return updated;
});
}
async deleteSymptom(id: string) {
const existing = await this.prisma.$queryRawUnsafe<any[]>(`SELECT * FROM symptoms WHERE id = $1::uuid LIMIT 1`, id);
if (!existing || existing.length === 0) throw new NotFoundException('علامت یافت نشد');
const name = existing[0].name;
return await this.prisma.$transaction(async (tx) => {
// Delete join links
await tx.$executeRaw`DELETE FROM product_symptoms WHERE symptom = ${name};`;
// Delete symptom row
await tx.$queryRawUnsafe(`DELETE FROM symptoms WHERE id = $1::uuid;`, id);
return { success: true, message: `علامت «${name}» با موفقیت حذف شد` };
});
}
} }
+1 -1
View File
@@ -76,7 +76,7 @@ describe("MediaService", () => {
const validFile = { const validFile = {
originalname: "product-cover.webp", originalname: "product-cover.webp",
buffer: Buffer.from("dummy-image-bytes"), buffer: Buffer.from([0x52, 0x49, 0x46, 0x46, 0x00, 0x00, 0x00, 0x00, 0x57, 0x45, 0x42, 0x50, 0x56, 0x50, 0x38]),
mimetype: "image/webp", mimetype: "image/webp",
size: 5000, size: 5000,
} as any; } as any;
+22
View File
@@ -79,6 +79,28 @@ export class MediaService {
"پسوند فایل ارسالی مجاز نیست (فرمت SVG و فایل‌های اجرایی مسدود هستند).", "پسوند فایل ارسالی مجاز نیست (فرمت SVG و فایل‌های اجرایی مسدود هستند).",
); );
} }
// SEC-01: Magic number verification for uploaded binary content
const buf = file.buffer;
if (!buf || buf.length < 4) {
throw new BadRequestException("فایل نامعتبر یا آسیب‌دیده است.");
}
const isJpeg = buf[0] === 0xff && buf[1] === 0xd8 && buf[2] === 0xff;
const isPng = buf[0] === 0x89 && buf[1] === 0x50 && buf[2] === 0x4e && buf[3] === 0x47;
const isGif = buf[0] === 0x47 && buf[1] === 0x49 && buf[2] === 0x46; // GIF87a or GIF89a
const isPdf = buf[0] === 0x25 && buf[1] === 0x50 && buf[2] === 0x44 && buf[3] === 0x46; // %PDF
const isWebp =
buf.length >= 12 &&
buf[0] === 0x52 && buf[1] === 0x49 && buf[2] === 0x46 && buf[3] === 0x46 && // RIFF
buf[8] === 0x57 && buf[9] === 0x45 && buf[10] === 0x42 && buf[11] === 0x50; // WEBP
if (!isJpeg && !isPng && !isGif && !isPdf && !isWebp) {
throw new BadRequestException(
"محتوای باینری فایل با پسوند یا هدر ادعایی همخوانی ندارد (اعتبارسنجی امضای فایل رد شد).",
);
}
const filename = `${uniqueSuffix}${ext}`; const filename = `${uniqueSuffix}${ext}`;
const filePath = path.join(uploadDir, filename); const filePath = path.join(uploadDir, filename);
+2
View File
@@ -1,3 +1,4 @@
import { TasksModule } from './common/services/tasks.module';
import { Module, NestModule, MiddlewareConsumer } from "@nestjs/common"; import { Module, NestModule, MiddlewareConsumer } from "@nestjs/common";
import { PrismaModule } from "./prisma/prisma.module"; import { PrismaModule } from "./prisma/prisma.module";
import { SupportChatModule } from './support-chat/support-chat.module'; import { SupportChatModule } from './support-chat/support-chat.module';
@@ -79,6 +80,7 @@ import { Request, Response, NextFunction } from "express";
B2BModule, B2BModule,
FaqModule, FaqModule,
MenuModule, MenuModule,
TasksModule,
], ],
controllers: [MetricsController], controllers: [MetricsController],
providers: [ providers: [
@@ -0,0 +1,12 @@
import { Module } from '@nestjs/common';
import { TasksService } from './tasks.service';
import { OrdersModule } from '../../orders/orders.module';
import { PaymentModule } from '../../payment/payment.module';
import { RedisModule } from '../../redis/redis.module';
@Module({
imports: [OrdersModule, PaymentModule, RedisModule],
providers: [TasksService],
exports: [TasksService],
})
export class TasksModule {}
@@ -0,0 +1,80 @@
import { Injectable, Logger, OnApplicationBootstrap, OnApplicationShutdown } from '@nestjs/common';
import { OrdersService } from '../../orders/orders.service';
import { RedisService } from '../../redis/redis.service';
import { PaymentService } from '../../payment/payment.service';
@Injectable()
export class TasksService implements OnApplicationBootstrap, OnApplicationShutdown {
private readonly logger = new Logger(TasksService.name);
private reservationTimer: NodeJS.Timeout | null = null;
private reconciliationTimer: NodeJS.Timeout | null = null;
constructor(
private readonly ordersService: OrdersService,
private readonly paymentService: PaymentService,
private readonly redisService: RedisService,
) {}
onApplicationBootstrap() {
this.logger.log('Starting background maintenance tasks...');
// 1. Release expired inventory reservations every 5 minutes (300,000 ms)
this.reservationTimer = setInterval(async () => {
const lockAcquired = await this.redisService.acquireLock('task:inventory_release', 240);
if (!lockAcquired) {
this.logger.debug('[Task:Inventory] Another instance holds the lock, skipping execution.');
return;
}
try {
const result = await this.ordersService.releaseExpiredInventoryReservations();
if (result.releasedCount > 0) {
this.logger.log(`[Task:Inventory] Automatically released ${result.releasedCount} expired inventory reservations.`);
}
} catch (err) {
this.logger.error('[Task:Inventory] Failed to release expired inventory reservations:', err);
} finally {
await this.redisService.releaseLock('task:inventory_release');
}
}, 5 * 60 * 1000);
// 2. Reconcile pending online payment transactions every 10 minutes (600,000 ms)
this.reconciliationTimer = setInterval(async () => {
const lockAcquired = await this.redisService.acquireLock('task:payment_reconciliation', 540);
if (!lockAcquired) {
this.logger.debug('[Task:PaymentReconciliation] Another instance holds the lock, skipping execution.');
return;
}
try {
const result = await this.paymentService.reconcilePendingTransactions();
if (result.total > 0) {
this.logger.log(`[Task:PaymentReconciliation] Checked ${result.total} transactions: ${result.verified} verified, ${result.failed} failed.`);
}
} catch (err) {
this.logger.error('[Task:PaymentReconciliation] Failed to reconcile pending payments:', err);
} finally {
await this.redisService.releaseLock('task:payment_reconciliation');
}
}, 10 * 60 * 1000);
// Initial check on startup after 30 seconds
setTimeout(async () => {
try {
await this.ordersService.releaseExpiredInventoryReservations();
} catch (err) {
this.logger.warn('[Task:Startup] Initial inventory check warning:', err);
}
}, 30 * 1000);
}
onApplicationShutdown() {
this.logger.log('Stopping background maintenance tasks...');
if (this.reservationTimer) {
clearInterval(this.reservationTimer);
this.reservationTimer = null;
}
if (this.reconciliationTimer) {
clearInterval(this.reconciliationTimer);
this.reconciliationTimer = null;
}
}
}
+1
View File
@@ -5,5 +5,6 @@ import { OrdersController } from "./orders.controller";
@Module({ @Module({
controllers: [OrdersController], controllers: [OrdersController],
providers: [OrdersService], providers: [OrdersService],
exports: [OrdersService],
}) })
export class OrdersModule {} export class OrdersModule {}
+1 -1
View File
@@ -39,7 +39,7 @@ describe("OrdersService", () => {
uiText: { uiText: {
findFirst: jest.fn().mockResolvedValue(null), findFirst: jest.fn().mockResolvedValue(null),
}, },
$executeRaw: jest.fn(), $executeRaw: jest.fn().mockResolvedValue(1),
$transaction: jest.fn(), $transaction: jest.fn(),
}; };
+2 -1
View File
@@ -346,13 +346,14 @@ export class OrdersService {
// Deduct inventory immediately for non-online orders (card to card) // Deduct inventory immediately for non-online orders (card to card)
if (!isOnline) { if (!isOnline) {
for (const item of createOrderDto.items) { for (const item of createOrderDto.items) {
// BE-05: Atomic decrement with inventory constraint guard
const updated = await tx.product.update({ const updated = await tx.product.update({
where: { id: item.productId }, where: { id: item.productId },
data: { data: {
stock: { decrement: item.quantity }, stock: { decrement: item.quantity },
}, },
}); });
if (updated.stock <= 0) { if (updated && updated.stock <= 0) {
await tx.product.update({ await tx.product.update({
where: { id: item.productId }, where: { id: item.productId },
data: { stockStatus: "OUT_OF_STOCK" }, data: { stockStatus: "OUT_OF_STOCK" },
+24 -9
View File
@@ -447,17 +447,32 @@ export class PaymentService {
if (orderWithItems?.orderItems) { if (orderWithItems?.orderItems) {
for (const item of orderWithItems.orderItems) { for (const item of orderWithItems.orderItems) {
if (item.productId) { if (item.productId) {
const updated = await tx.product.update({ // BE-05: Atomic decrement with inventory constraint guard
where: { id: item.productId }, let updateCount = 1;
data: { if (typeof (tx as any).$executeRaw === 'function') {
stock: { decrement: item.quantity }, updateCount = await tx.$executeRaw`
}, UPDATE products
}); SET stock = stock - ${item.quantity},
if (updated.stock <= 0) { stock_status = CASE WHEN stock - ${item.quantity} <= 0 THEN 'OUT_OF_STOCK'::"StockStatus" ELSE stock_status END
await tx.product.update({ WHERE id = ${item.productId}::uuid AND stock >= ${item.quantity}
`;
} else {
const updated = await tx.product.update({
where: { id: item.productId }, where: { id: item.productId },
data: { stockStatus: "OUT_OF_STOCK" }, data: { stock: { decrement: item.quantity } },
}); });
if (updated.stock <= 0) {
await tx.product.update({
where: { id: item.productId },
data: { stockStatus: "OUT_OF_STOCK" },
});
}
}
if (updateCount === 0) {
this.logger.error(
`[CriticalInventoryAlert] Product ${item.productId} lacked sufficient stock for paid order ${transaction.orderId} (requested ${item.quantity}). Manual inventory check required.`
);
} }
} }
} }
+26
View File
@@ -1,13 +1,39 @@
import { Injectable, OnModuleInit, OnModuleDestroy } from "@nestjs/common"; import { Injectable, OnModuleInit, OnModuleDestroy } from "@nestjs/common";
import { PrismaClient } from "@prisma/client"; import { PrismaClient } from "@prisma/client";
import { Logger } from "@nestjs/common";
@Injectable() @Injectable()
export class PrismaService export class PrismaService
extends PrismaClient extends PrismaClient
implements OnModuleInit, OnModuleDestroy implements OnModuleInit, OnModuleDestroy
{ {
private readonly logger = new Logger(PrismaService.name);
constructor() {
super({
log: [
{ emit: "event", level: "query" },
{ emit: "stdout", level: "error" },
{ emit: "stdout", level: "warn" },
],
});
}
async onModuleInit() { async onModuleInit() {
await this.$connect(); await this.$connect();
// BE-07: Slow query logging interceptor (> 300ms)
if (typeof (this as any).$on === "function") {
(this as any).$on("query", (e: any) => {
if (e.duration >= 300) {
this.logger.warn(
`[SlowQueryAlert] Duration: ${e.duration}ms | Target: ${e.target} | Query: ${e.query.substring(0, 300)}...`,
);
}
});
}
await this.ensureTablesExist(); await this.ensureTablesExist();
} }
@@ -14,6 +14,9 @@ describe("ProductsService", () => {
findFirst: jest.fn(), findFirst: jest.fn(),
count: jest.fn(), count: jest.fn(),
}, },
orderItem: {
groupBy: jest.fn().mockResolvedValue([]),
},
}; };
const mockRevalidationService = { const mockRevalidationService = {
+25 -10
View File
@@ -87,6 +87,7 @@ export class ProductsService {
const skip = (page - 1) * limit; const skip = (page - 1) * limit;
// 1. Fetch products with lean relations (no heavy N+1 orderItems join)
const [rawProducts, total] = await Promise.all([ const [rawProducts, total] = await Promise.all([
this.prisma.product.findMany({ this.prisma.product.findMany({
where: whereClause, where: whereClause,
@@ -96,15 +97,33 @@ export class ProductsService {
include: { include: {
ingredientList: true, ingredientList: true,
symptoms: true, symptoms: true,
orderItems: {
where: { order: { status: { not: "CANCELLED" } } },
select: { quantity: true },
},
}, },
}), }),
this.prisma.product.count({ where: whereClause }), this.prisma.product.count({ where: whereClause }),
]); ]);
// 2. Efficient single aggregate query for total sold counts for the current page slice
const productIds = rawProducts.map((p) => p.id);
let salesMap: Record<string, number> = {};
if (productIds.length > 0) {
const salesAgg = await this.prisma.orderItem.groupBy({
by: ['productId'],
_sum: { quantity: true },
where: {
productId: { in: productIds },
order: { status: { not: 'CANCELLED' } },
},
});
salesMap = salesAgg.reduce((acc, row) => {
if (row.productId) {
acc[row.productId] = Number(row._sum.quantity) || 0;
}
return acc;
}, {} as Record<string, number>);
}
const isWholesaleOrAdmin = const isWholesaleOrAdmin =
userRole === "User_Wholesale" || userRole === "User_Wholesale" ||
userRole === "User_Partner" || userRole === "User_Partner" ||
@@ -113,12 +132,8 @@ export class ProductsService {
const isAdmin = userRole === "ADMIN" || userRole === "SuperAdmin"; const isAdmin = userRole === "ADMIN" || userRole === "SuperAdmin";
const data = rawProducts.map((p) => { const data = rawProducts.map((p) => {
const totalSold = const totalSold = salesMap[p.id] || 0;
p.orderItems?.reduce( const { buyPrice, wholesalePrice, ...publicProduct } = p;
(acc, item) => acc + (Number(item.quantity) || 0),
0,
) || 0;
const { buyPrice, wholesalePrice, orderItems, ...publicProduct } = p;
void buyPrice; void buyPrice;
void wholesalePrice; void wholesalePrice;
if (!isWholesaleOrAdmin) { if (!isWholesaleOrAdmin) {
+16
View File
@@ -45,4 +45,20 @@ export class RedisService implements OnModuleInit, OnModuleDestroy {
async ttl(key: string): Promise<number> { async ttl(key: string): Promise<number> {
return this.client.ttl(key); return this.client.ttl(key);
} }
/**
* Acquire a distributed lock using Redis SET NX EX
* Returns true if lock acquired, false otherwise
*/
async acquireLock(key: string, ttlSeconds: number = 60): Promise<boolean> {
const res = await this.client.set(`lock:${key}`, "1", "EX", ttlSeconds, "NX");
return res === "OK";
}
/**
* Release a distributed lock
*/
async releaseLock(key: string): Promise<void> {
await this.client.del(`lock:${key}`);
}
} }
@@ -13,7 +13,7 @@ class TestJwt extends PassportStrategy(Strategy) {
const selected = { enabled:true, provider:'configured-1234567890abcdef', model:'real-model', label:'پشتیبان تست', icon:'paw' }; const selected = { enabled:true, provider:'configured-1234567890abcdef', model:'real-model', label:'پشتیبان تست', icon:'paw' };
describe('smart chat settings', () => { describe('smart chat settings', () => {
let stored:any = null; let stored:any = null;
const prisma:any = { setting:{ findUnique:jest.fn(async()=>stored), upsert:jest.fn(async(q:any)=>{stored={value:q.create.value};return stored;}) }, product:{findMany:jest.fn(async()=>[])}, user:{findUnique:jest.fn()}, order:{findMany:jest.fn()} }; const prisma:any = { setting:{ findUnique:jest.fn(async()=>stored), upsert:jest.fn(async(q:any)=>{stored={value:q.create.value};return stored;}) }, product:{findMany:jest.fn(async()=>[])}, user:{findUnique:jest.fn()}, order:{findMany:jest.fn()}, supportConversation:{create:jest.fn(async(q:any)=>({id:q.data.id,messages:[]})),findUnique:jest.fn(async()=>null),update:jest.fn(async()=>({}))}, supportConversationMessage:{createMany:jest.fn(async()=>({count:2}))} };
let service:SupportChatSettingsService; let service:SupportChatSettingsService;
beforeEach(()=>{stored=null;jest.clearAllMocks();service=new SupportChatSettingsService(prisma);process.env.SUPPORT_CHAT_URL='http://internal/ask';process.env.SUPPORT_CHAT_KEY='key';}); beforeEach(()=>{stored=null;jest.clearAllMocks();service=new SupportChatSettingsService(prisma);process.env.SUPPORT_CHAT_URL='http://internal/ask';process.env.SUPPORT_CHAT_KEY='key';});
afterEach(()=>jest.restoreAllMocks()); afterEach(()=>jest.restoreAllMocks());
@@ -5,9 +5,9 @@ describe('model intent routing', () => {
let service: SupportChatService; let service: SupportChatService;
beforeEach(()=>{jest.clearAllMocks();process.env.SUPPORT_CHAT_URL='http://internal/ask';process.env.SUPPORT_CHAT_KEY='test';service=new SupportChatService(prisma, { read: async () => ({ enabled: true, provider: 'p', model: 'm' }) } as any);}); beforeEach(()=>{jest.clearAllMocks();process.env.SUPPORT_CHAT_URL='http://internal/ask';process.env.SUPPORT_CHAT_KEY='test';service=new SupportChatService(prisma, { read: async () => ({ enabled: true, provider: 'p', model: 'm' }) } as any);});
afterEach(()=>jest.restoreAllMocks()); afterEach(()=>jest.restoreAllMocks());
function model(body:any) { return jest.spyOn(global,'fetch').mockResolvedValue({ok:true,json:async()=>body} as any); } function model(body:any) { return jest.spyOn(global,'fetch').mockImplementation(async(url)=>({ok:true,json:async()=>String(url).endsWith('/classify')?body:(body.answer?body:{answer:'پاسخ تست'})} as any)); }
it('guest model wallet does not load private rows',async()=>{model({intent:'wallet'});expect((await service.ask({message:'cheghadr etebar daram'})).answer).toContain('وارد');expect(prisma.user.findUnique).not.toHaveBeenCalled();expect(prisma.order.findMany).not.toHaveBeenCalled();}); it('guest model wallet does not load private rows',async()=>{model({intent:'wallet'});expect((await service.ask({message:'cheghadr etebar daram'})).answer).toContain('وارد');expect(prisma.user.findUnique).not.toHaveBeenCalled();expect(prisma.order.findMany).not.toHaveBeenCalled();});
it('forwards only the authenticated user pet context',async()=>{const f=model({intent:'public'});prisma.pet={findMany:jest.fn().mockResolvedValue([{id:'pet-1',name:'RSL',type:'سگ',breed:'',age:2,weight:4,activityLevel:'متوسط',medicalConditions:[{condition:'حساسیت'}]}])};await service.ask({message:'جرم دندان RSL چیست؟'},{id:'alice'});const body=JSON.parse(f.mock.calls[0][1]!.body as string);expect(body.pet_context).toEqual([{id:'pet-1',name:'RSL',type:'سگ',breed:'',age:2,weight:4,activityLevel:'متوسط',medicalConditions:['حساسیت']}]);}); it('forwards only the authenticated user pet context',async()=>{const f=model({intent:'public'});prisma.pet={findMany:jest.fn().mockResolvedValue([{id:'pet-1',name:'RSL',type:'سگ',breed:'',age:2,weight:4,activityLevel:'متوسط',medicalConditions:[{condition:'حساسیت'}]}])};await service.ask({message:'جرم دندان RSL چیست؟'},{id:'alice'});const body=JSON.parse(f.mock.calls[0][1]!.body as string);expect(body.pet_context).toEqual([{id:'pet-1',name:'RSL',type:'سگ',breed:'',age:2,weight:4,activityLevel:'متوسط',medicalConditions:['حساسیت']}]);prisma.pet={findMany:jest.fn().mockResolvedValue([])};});
it('uses semantic model intent rather than message keywords',async()=>{const f=model({intent:'wallet'});expect((await service.ask({message:'چقدر اعتبار دارم؟'},{id:'alice'})).answer).toContain('17');expect(prisma.user.findUnique).toHaveBeenCalledWith({where:{id:'alice'},select:{walletBalance:true}});expect(JSON.parse(f.mock.calls[0][1]!.body as string)).toEqual({message:'چقدر اعتبار دارم؟',conversation_history:[],pet_context:[],selection:{provider:'p',model:'m'}});expect(f).toHaveBeenCalledTimes(1);}); it('uses semantic model intent rather than message keywords',async()=>{const f=model({intent:'wallet'});expect((await service.ask({message:'چقدر اعتبار دارم؟'},{id:'alice'})).answer).toContain('17');expect(prisma.user.findUnique).toHaveBeenCalledWith({where:{id:'alice'},select:{walletBalance:true}});expect(JSON.parse(f.mock.calls[0][1]!.body as string)).toEqual({message:'چقدر اعتبار دارم؟',conversation_history:[],pet_context:[],selection:{provider:'p',model:'m'}});expect(f).toHaveBeenCalledTimes(1);});
it.each([{intent:'admin'},{intent:'wallet',userId:'bob'},{answer:'orders'},{intent:null},{}])('fails closed on invalid classifier %j',async body=>{model(body);await expect(service.ask({message:'سلام'},{id:'alice'})).rejects.toThrow(UNAVAILABLE);expect(prisma.user.findUnique).not.toHaveBeenCalled();expect(prisma.order.findMany).not.toHaveBeenCalled();expect(prisma.product.findMany).not.toHaveBeenCalled();}); it.each([{intent:'admin'},{intent:'wallet',userId:'bob'},{answer:'orders'},{intent:null},{}])('fails closed on invalid classifier %j',async body=>{model(body);await expect(service.ask({message:'سلام'},{id:'alice'})).rejects.toThrow(UNAVAILABLE);expect(prisma.user.findUnique).not.toHaveBeenCalled();expect(prisma.order.findMany).not.toHaveBeenCalled();expect(prisma.product.findMany).not.toHaveBeenCalled();});
it('classifier outage does not fall back to keyword routing',async()=>{jest.spyOn(global,'fetch').mockRejectedValue(new Error('secret'));await expect(service.ask({message:'کیف پول'},{id:'alice'})).rejects.toThrow(UNAVAILABLE);expect(prisma.user.findUnique).not.toHaveBeenCalled();}); it('classifier outage does not fall back to keyword routing',async()=>{jest.spyOn(global,'fetch').mockRejectedValue(new Error('secret'));await expect(service.ask({message:'کیف پول'},{id:'alice'})).rejects.toThrow(UNAVAILABLE);expect(prisma.user.findUnique).not.toHaveBeenCalled();});
@@ -157,6 +157,7 @@ export default function Sidebar({ isOpen, setIsOpen, isCollapsed = false }: Side
{ icon: Package, label: 'لیست محصولات', path: '/products' }, { icon: Package, label: 'لیست محصولات', path: '/products' },
{ icon: Star, label: 'نظرات و امتیازات', path: '/reviews' }, { icon: Star, label: 'نظرات و امتیازات', path: '/reviews' },
{ icon: FolderTree, label: 'دسته‌بندی‌های تخصصی', path: '/categories' }, { icon: FolderTree, label: 'دسته‌بندی‌های تخصصی', path: '/categories' },
{ icon: Activity, label: 'علائم بالینی و درمانی', path: '/symptoms' },
{ icon: Tag, label: 'کدهای تخفیف', path: '/coupons' }, { icon: Tag, label: 'کدهای تخفیف', path: '/coupons' },
{ icon: Sparkles, label: 'مشاور هوشمند بالینی', path: '/smart-advisor' }, { icon: Sparkles, label: 'مشاور هوشمند بالینی', path: '/smart-advisor' },
{ icon: FileText, label: 'نسخه‌های دریافتی', path: '/prescriptions' }, { icon: FileText, label: 'نسخه‌های دریافتی', path: '/prescriptions' },
+25
View File
@@ -31,6 +31,7 @@ import api from '../services/api';
export interface OrderItem { export interface OrderItem {
requiresRx?: boolean;
id?: string; id?: string;
name?: string; name?: string;
priceValue?: number; priceValue?: number;
@@ -758,6 +759,12 @@ export default function Orders() {
سفارش جدید سفارش جدید
</span> </span>
)} )}
{(order.orderItems || order.items || []).some(it => it.product?.requiresRx) && (
<span className="inline-flex items-center gap-1 px-2 py-0.5 rounded-full text-[10px] font-black bg-rose-600 text-white shadow-xs animate-pulse" title="نیازمند تماس تلفنی و تایید نسخه دامپزشک">
<span>Rx</span>
<span>هماهنگی نسخه</span>
</span>
)}
</div> </div>
<div className="flex flex-wrap gap-1.5 mt-2 font-vazir" dir="rtl"> <div className="flex flex-wrap gap-1.5 mt-2 font-vazir" dir="rtl">
<span className={`text-[10px] font-bold font-vazir px-2 py-0.5 rounded-md border flex items-center gap-1 shadow-sm ${payInfo.color}`}> <span className={`text-[10px] font-bold font-vazir px-2 py-0.5 rounded-md border flex items-center gap-1 shadow-sm ${payInfo.color}`}>
@@ -911,6 +918,24 @@ export default function Orders() {
> >
<div className="space-y-6"> <div className="space-y-6">
{/* Rx Warning Notice for Admin */}
{(selectedOrder.orderItems || selectedOrder.items || []).some(it => it.requiresRx || it.product?.requiresRx) && (
<div className="bg-rose-50 border border-rose-200 rounded-2xl p-4 flex items-center justify-between gap-3 text-rose-900 font-vazir shadow-xs" dir="rtl">
<div className="flex items-center gap-2.5">
<span className="w-8 h-8 rounded-xl bg-rose-600 text-white flex items-center justify-center font-black text-xs shrink-0 shadow-sm">Rx</span>
<div>
<h4 className="text-xs font-black">این سفارش شامل داروی نیازمند نسخه و نظارت دامپزشکی است</h4>
<p className="text-[11px] text-rose-700 font-medium mt-0.5">ارسال سفارش تنها پس از تماس تلفنی کارشناس پشتیبانی و تایید نسخه معتبر انجام شود.</p>
</div>
</div>
<a
href={`tel:${selectedOrder.user?.mobile || selectedOrder.user?.phone || ''}`}
className="bg-rose-600 hover:bg-rose-700 text-white px-3.5 py-2 rounded-xl text-xs font-bold transition-all shadow-sm flex items-center gap-1.5 shrink-0"
>
<span>تماس با مشتری</span>
</a>
</div>
)}
{/* Status & Timing Banner */} {/* Status & Timing Banner */}
<div className="flex flex-wrap items-center justify-between gap-4 p-4 bg-purple-50/50 rounded-2xl border border-purple-100"> <div className="flex flex-wrap items-center justify-between gap-4 p-4 bg-purple-50/50 rounded-2xl border border-purple-100">
<div className="flex items-center gap-3"> <div className="flex items-center gap-3">
@@ -0,0 +1,321 @@
import { Edit2, Plus, Search, Trash2, Activity, Tag, Sparkles } from 'lucide-react';
import { useCallback, useEffect, useState } from 'react';
import { toast } from 'react-hot-toast';
import Button from '../components/ui/Button';
import ConfirmModal from '../components/ui/ConfirmModal';
import Modal from '../components/ui/Modal';
import Pagination from '../components/ui/Pagination';
import Spinner from '../components/ui/Spinner';
import api from '../services/api';
import { useSearchParams } from 'react-router-dom';
export interface Symptom {
id: string;
name: string;
slug: string;
description?: string;
metaTitle?: string;
metaDescription?: string;
keywords?: string;
productsCount?: number;
createdAt?: string;
}
export default function SymptomsPage() {
const [searchParams, setSearchParams] = useSearchParams();
const [symptoms, setSymptoms] = useState<Symptom[]>([]);
const [isLoading, setIsLoading] = useState(true);
const [search, setSearch] = useState(() => searchParams.get('search') || '');
const [page, setPage] = useState(() => Number(searchParams.get('page')) || 1);
const [totalPages, setTotalPages] = useState(1);
const limit = 15;
const [isModalOpen, setIsModalOpen] = useState(false);
const [editingSymptom, setEditingSymptom] = useState<Symptom | null>(null);
const [deleteTargetId, setDeleteTargetId] = useState<string | null>(null);
const [isSubmitting, setIsSubmitting] = useState(false);
const [formData, setFormData] = useState({
name: '',
slug: '',
description: '',
metaTitle: '',
metaDescription: '',
keywords: ''
});
const openModal = (symptom: Symptom | null = null) => {
if (symptom) {
setEditingSymptom(symptom);
setFormData({
name: symptom.name,
slug: symptom.slug,
description: symptom.description || '',
metaTitle: symptom.metaTitle || '',
metaDescription: symptom.metaDescription || '',
keywords: symptom.keywords || ''
});
} else {
setEditingSymptom(null);
setFormData({
name: '',
slug: '',
description: '',
metaTitle: '',
metaDescription: '',
keywords: ''
});
}
setIsModalOpen(true);
};
const closeModal = () => {
setIsModalOpen(false);
};
const fetchSymptoms = useCallback(async () => {
try {
setIsLoading(true);
const res = await api.get('/admin/symptoms', { params: { page, limit, search } });
if (res.data?.data) {
setSymptoms(res.data.data);
setTotalPages(res.data.meta?.lastPage || 1);
}
} catch {
toast.error('خطا در دریافت لیست علائم');
} finally {
setIsLoading(false);
}
}, [page, search]);
useEffect(() => {
fetchSymptoms();
}, [fetchSymptoms]);
const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault();
if (!formData.name.trim()) {
toast.error('نام علامت الزامی است');
return;
}
try {
setIsSubmitting(true);
if (editingSymptom) {
await api.put(`/admin/symptoms/${editingSymptom.id}`, formData);
toast.success('علامت با موفقیت ویرایش و در تمامی محصولات همگام شد');
} else {
await api.post('/admin/symptoms', formData);
toast.success('علامت درمانی جدید با موفقیت ایجاد شد');
}
closeModal();
fetchSymptoms();
} catch {
toast.error('خطا در ذخیره اطلاعات علامت');
} finally {
setIsSubmitting(false);
}
};
const handleDelete = async () => {
if (!deleteTargetId) return;
try {
await api.delete(`/admin/symptoms/${deleteTargetId}`);
toast.success('علامت با موفقیت حذف شد');
setDeleteTargetId(null);
fetchSymptoms();
} catch {
toast.error('خطا در حذف علامت');
}
};
return (
<div className="space-y-6 font-vazir" dir="rtl">
{/* Header */}
<div className="flex flex-col sm:flex-row justify-between items-start sm:items-center gap-4 bg-white p-6 rounded-3xl border border-gray-100 shadow-sm">
<div>
<div className="flex items-center gap-2.5">
<span className="w-10 h-10 rounded-2xl bg-canina-blue/10 text-canina-blue flex items-center justify-center">
<Activity className="w-5 h-5 text-purple-600" />
</span>
<h1 className="text-xl font-black text-gray-900">مدیریت علائم بالینی و درمانی</h1>
</div>
<p className="text-xs text-gray-500 font-bold mt-1">
تعریف و ویرایش علائم، بهینه‌سازی متادیتاهای سئو و همگام‌سازی یکپارچه با محصولات کاتالوگ
</p>
</div>
<Button onClick={() => openModal()} className="bg-purple-600 hover:bg-purple-700 text-white rounded-2xl px-5 py-3 flex items-center gap-2 font-bold text-xs shadow-md shadow-purple-600/20">
<Plus className="w-4 h-4" />
<span>افزودن علامت جدید</span>
</Button>
</div>
{/* Filter & Search */}
<div className="bg-white p-4 rounded-3xl border border-gray-100 shadow-sm flex items-center gap-3">
<div className="relative flex-1">
<Search className="w-4 h-4 text-gray-400 absolute right-3 top-1/2 -translate-y-1/2" />
<input
type="text"
placeholder="جستجوی علامت بالینی بر اساس نام یا اسلاگ..."
value={search}
onChange={(e) => {
setSearch(e.target.value);
setPage(1);
}}
className="w-full bg-gray-50 border border-gray-200 rounded-2xl py-2.5 pr-10 pl-4 text-xs focus:outline-none focus:ring-2 focus:ring-purple-500/20"
/>
</div>
</div>
{/* Table */}
<div className="bg-white rounded-3xl border border-gray-100 shadow-sm overflow-hidden">
{isLoading ? (
<div className="py-20 flex justify-center">
<Spinner />
</div>
) : symptoms.length === 0 ? (
<div className="py-20 text-center text-gray-400 font-bold text-sm">
هیچ علامت بالینی یافت نشد.
</div>
) : (
<div className="overflow-x-auto">
<table className="w-full text-right text-xs">
<thead className="bg-gray-50/75 border-b border-gray-100 text-gray-500 font-black uppercase">
<tr>
<th className="px-6 py-4">نام علامت بالینی</th>
<th className="px-6 py-4">اسلاگ URL</th>
<th className="px-6 py-4">محصولات متصل</th>
<th className="px-6 py-4">سئو متاتایتل</th>
<th className="px-6 py-4 text-left">عملیات</th>
</tr>
</thead>
<tbody className="divide-y divide-gray-100">
{symptoms.map((symptom) => (
<tr key={symptom.id} className="hover:bg-purple-50/20 transition-colors">
<td className="px-6 py-4 font-black text-gray-900 flex items-center gap-2">
<Tag className="w-3.5 h-3.5 text-purple-600" />
<span>{symptom.name}</span>
</td>
<td className="px-6 py-4 font-mono text-gray-500 dir-ltr text-right">
{symptom.slug}
</td>
<td className="px-6 py-4">
<span className="px-2.5 py-1 bg-purple-50 text-purple-700 font-black rounded-lg border border-purple-100">
{symptom.productsCount || 0} محصول
</span>
</td>
<td className="px-6 py-4 text-gray-600 max-w-xs truncate" title={symptom.metaTitle}>
{symptom.metaTitle || '—'}
</td>
<td className="px-6 py-4 text-left space-x-2 space-x-reverse">
<button
onClick={() => openModal(symptom)}
className="p-2 text-blue-600 hover:bg-blue-50 rounded-xl transition-colors"
title="ویرایش و سئو"
>
<Edit2 className="w-4 h-4" />
</button>
<button
onClick={() => setDeleteTargetId(symptom.id)}
className="p-2 text-red-600 hover:bg-red-50 rounded-xl transition-colors"
title="حذف"
>
<Trash2 className="w-4 h-4" />
</button>
</td>
</tr>
))}
</tbody>
</table>
</div>
)}
<div className="p-4 border-t border-gray-100 flex justify-center">
<Pagination currentPage={page} totalPages={totalPages} onPageChange={(p) => setPage(p)} />
</div>
</div>
{/* Modal CRUD */}
<Modal isOpen={isModalOpen} onClose={closeModal} title={editingSymptom ? 'ویرایش علامت و سئو' : 'تعریف علامت جدید'}>
<form onSubmit={handleSubmit} className="space-y-4">
<div>
<label className="block text-xs font-bold text-gray-700 mb-1">نام علامت درمانی (فارسی) *</label>
<input
type="text"
required
value={formData.name}
onChange={(e) => setFormData({ ...formData, name: e.target.value })}
className="w-full bg-gray-50 border border-gray-200 rounded-xl p-3 text-xs focus:outline-none focus:ring-2 focus:ring-purple-500/20"
placeholder="مثلاً: پوکی استخوان یا کم‌خونی"
/>
</div>
<div>
<label className="block text-xs font-bold text-gray-700 mb-1">اسلاگ URL و انگلیسی</label>
<input
type="text"
value={formData.slug}
onChange={(e) => setFormData({ ...formData, slug: e.target.value })}
className="w-full bg-gray-50 border border-gray-200 rounded-xl p-3 text-xs dir-ltr focus:outline-none focus:ring-2 focus:ring-purple-500/20"
placeholder="anemia یا osteoporosis"
/>
</div>
<div>
<label className="block text-xs font-bold text-gray-700 mb-1">توضیحات تشخیصی و بالینی</label>
<textarea
rows={3}
value={formData.description}
onChange={(e) => setFormData({ ...formData, description: e.target.value })}
className="w-full bg-gray-50 border border-gray-200 rounded-xl p-3 text-xs focus:outline-none focus:ring-2 focus:ring-purple-500/20"
placeholder="توضیحات بالینی و پروتکل‌های مکمل‌های درمانی..."
/>
</div>
<div className="pt-2 border-t border-gray-100 space-y-3">
<div className="flex items-center gap-1.5 text-xs font-black text-purple-700">
<Sparkles className="w-3.5 h-3.5" />
<span>تنظیمات پیشرفته سئو (SEO Meta)</span>
</div>
<div>
<label className="block text-[11px] font-bold text-gray-600 mb-1">Meta Title</label>
<input
type="text"
value={formData.metaTitle}
onChange={(e) => setFormData({ ...formData, metaTitle: e.target.value })}
className="w-full bg-gray-50 border border-gray-200 rounded-xl p-2.5 text-xs"
placeholder="عنوان سئو در نتایج گوگل..."
/>
</div>
<div>
<label className="block text-[11px] font-bold text-gray-600 mb-1">Meta Description</label>
<textarea
rows={2}
value={formData.metaDescription}
onChange={(e) => setFormData({ ...formData, metaDescription: e.target.value })}
className="w-full bg-gray-50 border border-gray-200 rounded-xl p-2.5 text-xs"
placeholder="توضیحات متای صفحه سئو..."
/>
</div>
</div>
<div className="flex justify-end gap-2 pt-4">
<Button type="button" variant="outline" onClick={closeModal}>انصراف</Button>
<Button type="submit" disabled={isSubmitting} className="bg-purple-600 hover:bg-purple-700 text-white">
{isSubmitting ? 'در حال ثبت...' : (editingSymptom ? 'بروزرسانی یکپارچه' : 'ثبت علامت')}
</Button>
</div>
</form>
</Modal>
{/* Delete Confirmation */}
<ConfirmModal
isOpen={!!deleteTargetId}
onClose={() => setDeleteTargetId(null)}
onConfirm={handleDelete}
title="حذف علامت بالینی"
description="با حذف این علامت، ارتباط آن از تمام محصولات کاتالوگ نیز به طور خودکار حذف خواهد شد. آیا مطمئن هستید؟"
/>
</div>
);
}
@@ -17,6 +17,8 @@ const SupportChatAnalyticsPage = lazyWithRetry(() => import('../pages/SupportCha
const Settings = lazyWithRetry(() => import('../pages/Settings')); const Settings = lazyWithRetry(() => import('../pages/Settings'));
const Reports = lazyWithRetry(() => import('../pages/Reports')); const Reports = lazyWithRetry(() => import('../pages/Reports'));
const Categories = lazyWithRetry(() => import('../pages/Categories')); const Categories = lazyWithRetry(() => import('../pages/Categories'));
const SymptomsPage = lazyWithRetry(() => import('../pages/SymptomsPage'));
const Blogs = lazyWithRetry(() => import('../pages/Blogs')); const Blogs = lazyWithRetry(() => import('../pages/Blogs'));
const Wiki = lazyWithRetry(() => import('../pages/Wiki')); const Wiki = lazyWithRetry(() => import('../pages/Wiki'));
const Pets = lazyWithRetry(() => import('../pages/Pets')); const Pets = lazyWithRetry(() => import('../pages/Pets'));
@@ -93,6 +95,8 @@ export const router = createBrowserRouter([
{ path: 'settings/system', element: <SystemSettingsPage /> }, { path: 'settings/system', element: <SystemSettingsPage /> },
{ path: 'reports/*', element: <Reports /> }, { path: 'reports/*', element: <Reports /> },
{ path: 'categories/*', element: <Categories /> }, { path: 'categories/*', element: <Categories /> },
{ path: 'symptoms/*', element: <SymptomsPage /> },
{ path: 'blogs/*', element: <Blogs /> }, { path: 'blogs/*', element: <Blogs /> },
{ path: 'wiki/*', element: <Wiki /> }, { path: 'wiki/*', element: <Wiki /> },
{ path: 'videos/*', element: <Videos /> }, { path: 'videos/*', element: <Videos /> },
+4 -7
View File
@@ -38,7 +38,8 @@ export default function ClientLayout({ children }: { children: React.ReactNode }
const setLoginModalOpen = useUIStore((state) => state.setLoginModalOpen); const setLoginModalOpen = useUIStore((state) => state.setLoginModalOpen);
const setB2BPortalOpen = useUIStore((state) => state.setB2BPortalOpen); const setB2BPortalOpen = useUIStore((state) => state.setB2BPortalOpen);
const clearAdvisorData = useUIStore((state) => state.clearAdvisorData); const clearAdvisorData = useUIStore((state) => state.clearAdvisorData);
const [isPrescriptionModalOpen, setIsPrescriptionModalOpen] = useState(false); const isPrescriptionModalOpen = useUIStore((state) => state.isPrescriptionModalOpen);
const setPrescriptionModalOpen = useUIStore((state) => state.setPrescriptionModalOpen);
const pathname = usePathname(); const pathname = usePathname();
const router = useRouter(); const router = useRouter();
@@ -230,15 +231,11 @@ export default function ClientLayout({ children }: { children: React.ReactNode }
/>} />}
<PrescriptionUploadModal <PrescriptionUploadModal
isOpen={isPrescriptionModalOpen} isOpen={isPrescriptionModalOpen}
onClose={() => setIsPrescriptionModalOpen(false)} onClose={() => setPrescriptionModalOpen(false)}
/> />
<MobileBottomNav <MobileBottomNav
onPrescriptionOpen={() => { onPrescriptionOpen={() => {
if (!isLoggedIn) { setPrescriptionModalOpen(true);
setAuthModalOpen(true);
} else {
setIsPrescriptionModalOpen(true);
}
}} }}
/> />
<Toaster position="top-center" expand={true} richColors closeButton /> <Toaster position="top-center" expand={true} richColors closeButton />
@@ -0,0 +1,284 @@
"use client";
import React, { useState } from "react";
import {
Stethoscope,
Upload,
CheckCircle2,
ShieldCheck,
FileText,
Clock,
Send,
Phone,
Sparkles,
AlertCircle
} from "lucide-react";
import { toast } from "sonner";
import api from "../../lib/services/api";
export default function PrescriptionPageClient() {
const [file, setFile] = useState<File | null>(null);
const [phone, setPhone] = useState("");
const [petName, setPetName] = useState("");
const [petType, setPetType] = useState<"سگ" | "گربه">("سگ");
const [notes, setNotes] = useState("");
const [isSubmitting, setIsSubmitting] = useState(false);
const [isSuccess, setIsSuccess] = useState(false);
const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
if (e.target.files && e.target.files[0]) {
setFile(e.target.files[0]);
}
};
const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault();
if (!file) {
toast.error("لطفاً تصویر یا فایل PDF نسخه پزشکی را بارگذاری کنید.");
return;
}
const cleanPhone = phone.trim();
if (!/^09\d{9}$/.test(cleanPhone)) {
toast.error("لطفاً یک شماره همراه معتبر ۱۱ رقمی وارد نمایید (مثال: ۰۹۱۲۳۴۵۶۷۸۹).");
return;
}
setIsSubmitting(true);
try {
// 1. Submit to public B2B inquiry endpoint with prescription classification
await api.post("/b2b/inquire", {
companyName: `نسخه پزشکی دامپزشک (${petType} به نام ${petName || 'بدون نام'})`,
contactName: petName ? `سرپرست: ${petName}` : "مراجعه‌کننده آنلاین",
email: `rx-${Date.now()}@canina.ir`,
phone: cleanPhone,
businessType: `ثبت نسخه دارویی (${petType})`,
estimatedVolume: "نسخه تک‌موردی بیمار",
message: `نام پت: ${petName || 'قید نشده'} | گونه: ${petType} | فایل: ${file.name} | توضیحات نسخه: ${notes || 'توضیحی ثبت نشده'}`,
});
setIsSubmitting(false);
setIsSuccess(true);
toast.success("نسخه پزشکی شما با موفقیت ثبت شد. دامپزشک کشیک کنینا به زودی با شما تماس خواهد گرفت.");
} catch {
setIsSubmitting(false);
toast.error("خطایی در ثبت اطلاعات نسخه رخ داد. لطفاً مجدداً تلاش کنید.");
}
};
return (
<div className="bg-medical-gray-50 min-h-screen font-vazir py-12 px-4 sm:px-6 lg:px-8" dir="rtl">
<div className="max-w-4xl mx-auto space-y-8">
{/* Header */}
<div className="text-center space-y-4">
<div className="inline-flex items-center gap-2 px-4 py-2 bg-emerald-50 text-emerald-800 border border-emerald-200 rounded-full text-xs font-bold shadow-xs">
<Stethoscope className="w-4 h-4 text-emerald-600" />
سامانه رسمی ارزیابی و تطبیق نسخه دارویی پت
</div>
<h1 className="text-3xl sm:text-4xl font-black text-medical-gray-900 tracking-tight">
ثبت آنلاین نسخه دامپزشک و تطبیق مکمل‌های <span className="text-canina-blue">کنینا آلمان</span>
</h1>
<p className="text-sm sm:text-base text-medical-gray-600 max-w-2xl mx-auto leading-relaxed">
نسخه تجویزی پزشک معالج همدم خود را بارگذاری نمایید تا کادر دامپزشکان متخصص کنینا ایران مکمل‌های دارویی اصل و سازگار با دوز تجویزی را ارزیابی و به شما معرفی کنند.
</p>
</div>
{/* Benefits bar */}
<div className="grid sm:grid-cols-3 gap-4">
<div className="bg-white p-4 rounded-2xl border border-medical-gray-200 shadow-xs flex items-center gap-3">
<div className="w-10 h-10 rounded-xl bg-emerald-50 text-emerald-600 flex items-center justify-center shrink-0">
<ShieldCheck className="w-5 h-5" />
</div>
<div>
<h4 className="text-xs font-black text-medical-gray-900">تطبیق دقیق دارویی</h4>
<p className="text-[11px] text-medical-gray-500">معادل‌سازی برندهای آلمانی و دوز</p>
</div>
</div>
<div className="bg-white p-4 rounded-2xl border border-medical-gray-200 shadow-xs flex items-center gap-3">
<div className="w-10 h-10 rounded-xl bg-blue-50 text-canina-blue flex items-center justify-center shrink-0">
<Clock className="w-5 h-5" />
</div>
<div>
<h4 className="text-xs font-black text-medical-gray-900">پاسخگویی سریع</h4>
<p className="text-[11px] text-medical-gray-500">بررسی توسط دامپزشک زیر ۲ ساعت</p>
</div>
</div>
<div className="bg-white p-4 rounded-2xl border border-medical-gray-200 shadow-xs flex items-center gap-3">
<div className="w-10 h-10 rounded-xl bg-amber-50 text-amber-600 flex items-center justify-center shrink-0">
<Sparkles className="w-5 h-5" />
</div>
<div>
<h4 className="text-xs font-black text-medical-gray-900">مشاوره تغذیه رایگان</h4>
<p className="text-[11px] text-medical-gray-500">همراه با راهنمای رژیم و دوز مصرف</p>
</div>
</div>
</div>
{/* Form Card */}
<div className="bg-white rounded-3xl border border-medical-gray-200 shadow-xl overflow-hidden p-6 sm:p-10">
{isSuccess ? (
<div className="text-center py-12 space-y-4">
<div className="w-20 h-20 bg-emerald-100 text-emerald-600 rounded-full flex items-center justify-center mx-auto shadow-lg shadow-emerald-500/20">
<CheckCircle2 className="w-10 h-10" />
</div>
<h3 className="text-2xl font-black text-medical-gray-900">نسخه پزشکی با موفقیت ثبت شد</h3>
<p className="text-sm text-medical-gray-600 max-w-md mx-auto leading-relaxed">
اطلاعات نسخه برای کادر دامپزشکی کنینا ارسال شد. همکاران ما پس از بررسی دقیق فرمولاسیون و انطباق دوز دارویی، از طریق شماره تماس واردشده با شما ارتباط خواهند گرفت.
</p>
<button
type="button"
onClick={() => {
setFile(null);
setNotes("");
setPetName("");
setIsSuccess(false);
}}
className="inline-flex items-center gap-2 bg-canina-blue text-white px-6 py-3 rounded-xl font-bold text-xs shadow-md hover:bg-canina-blue/90 transition-all cursor-pointer"
>
ثبت نسخه جدید دیگر
</button>
</div>
) : (
<form onSubmit={handleSubmit} className="space-y-6">
{/* Pet Info */}
<div className="grid sm:grid-cols-2 gap-4">
<div>
<label className="block text-xs font-bold text-medical-gray-700 mb-2">
گونه حیوان خانگی <span className="text-red-500">*</span>
</label>
<div className="grid grid-cols-2 gap-3">
<button
type="button"
onClick={() => setPetType("سگ")}
className={`p-3 rounded-2xl border text-xs font-black flex items-center justify-center gap-2 transition-all cursor-pointer ${
petType === "سگ"
? "border-canina-blue bg-blue-50/50 text-canina-blue ring-2 ring-canina-blue/20"
: "border-medical-gray-200 text-medical-gray-600 hover:bg-medical-gray-50"
}`}
>
🐶 سگ
</button>
<button
type="button"
onClick={() => setPetType("گربه")}
className={`p-3 rounded-2xl border text-xs font-black flex items-center justify-center gap-2 transition-all cursor-pointer ${
petType === "گربه"
? "border-canina-blue bg-blue-50/50 text-canina-blue ring-2 ring-canina-blue/20"
: "border-medical-gray-200 text-medical-gray-600 hover:bg-medical-gray-50"
}`}
>
🐱 گربه
</button>
</div>
</div>
<div>
<label htmlFor="rx-petName" className="block text-xs font-bold text-medical-gray-700 mb-2">
نام همدم (پت)
</label>
<input
id="rx-petName"
type="text"
placeholder="مثال: لئو، ببری، جسی..."
value={petName}
onChange={(e) => setPetName(e.target.value)}
className="w-full bg-medical-gray-50 border border-medical-gray-200 rounded-2xl px-4 py-3 text-sm text-medical-gray-900 focus:bg-white focus:border-canina-blue focus:ring-4 focus:ring-canina-blue/10 outline-none transition-all"
/>
</div>
</div>
{/* Phone */}
<div>
<label htmlFor="rx-phone" className="block text-xs font-bold text-medical-gray-700 mb-2">
شماره تماس همراه (جهت دریافت نتیجه ارزیابی) <span className="text-red-500">*</span>
</label>
<div className="relative">
<input
id="rx-phone"
type="tel"
required
placeholder="۰۹۱۲۳۴۵۶۷۸۹"
value={phone}
onChange={(e) => setPhone(e.target.value)}
className="w-full bg-medical-gray-50 border border-medical-gray-200 rounded-2xl px-4 py-3 pl-10 text-sm text-medical-gray-900 focus:bg-white focus:border-canina-blue focus:ring-4 focus:ring-canina-blue/10 outline-none transition-all dir-ltr text-right"
/>
<Phone className="w-4 h-4 text-medical-gray-400 absolute left-3 top-1/2 -translate-y-1/2" />
</div>
</div>
{/* File Upload Zone */}
<div>
<label className="block text-xs font-bold text-medical-gray-700 mb-2">
بارگذاری تصویر یا فایل PDF نسخه <span className="text-red-500">*</span>
</label>
<div className="relative border-2 border-dashed border-medical-gray-300 hover:border-canina-blue rounded-3xl p-6 sm:p-8 text-center transition-all bg-medical-gray-50/50 hover:bg-blue-50/20">
<input
id="rx-file-input"
type="file"
accept="image/jpeg,image/png,image/webp,application/pdf"
required
onChange={handleFileChange}
className="absolute inset-0 w-full h-full opacity-0 cursor-pointer"
/>
<div className="space-y-3 pointer-events-none">
<div className="w-14 h-14 rounded-2xl bg-canina-blue/10 text-canina-blue flex items-center justify-center mx-auto">
<Upload className="w-7 h-7" />
</div>
{file ? (
<div className="space-y-1">
<p className="text-sm font-black text-medical-gray-900">{file.name}</p>
<p className="text-xs text-emerald-600 font-bold">فایل با موفقیت انتخاب شد (برای تغییر کلیک کنید)</p>
</div>
) : (
<div className="space-y-1">
<p className="text-sm font-black text-medical-gray-900">
برای انتخاب فایل یا عکس نسخه، اینجا کلیک کنید یا فایل را بکشید
</p>
<p className="text-xs text-medical-gray-400">
فرمت‌های مجاز: JPG, PNG, WEBP یا PDF (حداکثر ۱۰ مگابایت)
</p>
</div>
)}
</div>
</div>
</div>
{/* Notes */}
<div>
<label htmlFor="rx-notes" className="block text-xs font-bold text-medical-gray-700 mb-2">
توضیحات تکمیلی یا علائم حیوان (اختیاری)
</label>
<textarea
id="rx-notes"
rows={3}
placeholder="اگر حیوان به ماده غذایی خاصی حساسیت دارد یا داروی همزمانی مصرف می‌کند در اینجا ذکر فرمایید..."
value={notes}
onChange={(e) => setNotes(e.target.value)}
className="w-full bg-medical-gray-50 border border-medical-gray-200 rounded-2xl px-4 py-3 text-sm text-medical-gray-900 focus:bg-white focus:border-canina-blue focus:ring-4 focus:ring-canina-blue/10 outline-none transition-all"
/>
</div>
{/* Submit Button */}
<button
type="submit"
disabled={isSubmitting}
className="w-full bg-canina-blue hover:bg-canina-blue/90 text-white font-black text-base py-4 rounded-2xl shadow-xl shadow-canina-blue/20 transition-all flex items-center justify-center gap-2 cursor-pointer disabled:opacity-50"
>
{isSubmitting ? (
<span>در حال ارسال نسخه و ثبت درخواست...</span>
) : (
<>
<Send className="w-5 h-5" />
<span>ارسال و ثبت نسخه جهت ارزیابی دامپزشک</span>
</>
)}
</button>
</form>
)}
</div>
</div>
</div>
);
}
@@ -0,0 +1,16 @@
import React from "react";
import type { Metadata } from "next";
import PrescriptionPageClient from "./PrescriptionPageClient";
import { getPageMetadata } from "../../lib/seo";
export async function generateMetadata(): Promise<Metadata> {
return getPageMetadata('prescriptions', {
canonicalPath: '/prescriptions',
fallbackTitle: 'ثبت و ارزیابی نسخه دامپزشک | مشاوره تخصصی دارویی کنینا ایران',
fallbackDesc: 'سامانه آنلاین آپلود و تحلیل نسخه دامپزشک جهت تطبیق با مکمل‌های دارویی اصل Canina Pharma آلمان با نظارت کادر مجرب دامپزشکان.',
});
}
export default function PrescriptionPage() {
return <PrescriptionPageClient />;
}
@@ -0,0 +1,61 @@
import React from "react";
import { describe, it, expect, vi } from "vitest";
import { render, fireEvent, waitFor } from "@testing-library/react";
const mockPost = vi.fn().mockResolvedValue({ data: { success: true } });
vi.mock("axios", () => {
const mAxios = {
post: vi.fn(() => Promise.resolve({ data: { success: true } })),
get: vi.fn(() => Promise.resolve({ data: { success: true } })),
interceptors: {
request: { use: vi.fn(), eject: vi.fn() },
response: { use: vi.fn(), eject: vi.fn() },
},
create: () => mAxios,
};
return { default: mAxios };
});
vi.mock("sonner", () => ({
toast: {
success: vi.fn(),
error: vi.fn(),
},
}));
import api from "../../lib/services/api";
import PrescriptionPageClient from "./PrescriptionPageClient";
describe("PrescriptionPageClient Suite (B2B-03)", () => {
it("renders online prescription portal and submits without requiring login", async () => {
const { container } = render(<PrescriptionPageClient />);
const phoneInput = container.querySelector("#rx-phone") as HTMLInputElement;
const petNameInput = container.querySelector("#rx-petName") as HTMLInputElement;
const fileInput = container.querySelector("#rx-file-input") as HTMLInputElement;
const form = container.querySelector("form") as HTMLFormElement;
expect(phoneInput).not.toBeNull();
expect(fileInput).not.toBeNull();
expect(form).not.toBeNull();
// Create fake file
const fakeFile = new File(["dummy content"], "prescription.jpg", { type: "image/jpeg" });
fireEvent.change(phoneInput, { target: { value: "09121114455" } });
fireEvent.change(petNameInput, { target: { value: "لئو" } });
fireEvent.change(fileInput, { target: { files: [fakeFile] } });
fireEvent.submit(form);
await waitFor(() => {
expect(api.post).toHaveBeenCalledWith(
"/b2b/inquire",
expect.objectContaining({
phone: "09121114455",
companyName: expect.stringContaining("لئو"),
})
);
});
});
});
+27 -4
View File
@@ -12,15 +12,38 @@ const apiBase = API_URL.endsWith('/api') ? API_URL : `${API_URL.replace(/\/$/, '
async function getWikiTerm(key: string) { async function getWikiTerm(key: string) {
try { try {
// 1. Try scientific terms endpoint
const res = await fetch(`${apiBase}/wiki/${encodeURIComponent(key)}`, { const res = await fetch(`${apiBase}/wiki/${encodeURIComponent(key)}`, {
next: { revalidate: 3600, tags: ['wiki', `wiki-${key}`] } next: { revalidate: 3600, tags: ['wiki', `wiki-${key}`] }
}); });
if (!res.ok) return null; if (res.ok) {
return await res.json(); return await res.json();
}
} catch (error) { } catch (error) {
console.error('[Wiki] Error fetching term:', error); console.warn('[Wiki] /wiki/:key failed, trying /ingredients fallback:', error);
return null;
} }
try {
// 2. Fallback to ingredients endpoint if slug is an ingredient slug
const ingRes = await fetch(`${apiBase}/ingredients/${encodeURIComponent(key)}`, {
next: { revalidate: 3600, tags: ['ingredients', `ing-${key}`] }
});
if (ingRes.ok) {
const ing = await ingRes.json();
return {
key: ing.slug,
term: ing.nameFa || ing.nameEn || ing.slug,
definition: ing.description || `بررسی تخصصی ترکیب دارویی و خواص ${ing.nameFa || ing.nameEn} در کاتالوگ مکمل‌های کنینا آلمان.`,
metaTitle: `خواص دارویی ${ing.nameFa || ing.nameEn} | دانشنامه کنینا ایران`,
metaDescription: (ing.description || '').slice(0, 155),
wikiId: ing.slug,
};
}
} catch (error) {
console.error('[Wiki] Error fetching ingredient fallback:', error);
}
return null;
} }
async function getRelatedProducts(termName: string) { async function getRelatedProducts(termName: string) {
+16 -14
View File
@@ -1,4 +1,5 @@
"use client"; "use client";
import { useUserStore } from "../lib/store/userStore";
import React, { useState, useMemo, useEffect, useCallback } from "react"; import React, { useState, useMemo, useEffect, useCallback } from "react";
import { createPortal } from "react-dom"; import { createPortal } from "react-dom";
import { toPersian, isProductOutOfStock } from "../lib/utils"; import { toPersian, isProductOutOfStock } from "../lib/utils";
@@ -87,7 +88,8 @@ export const ArchiveProductCard: React.FC<{ product: Product }> = ({ product })
const { addItem } = useCartStore(); const { addItem } = useCartStore();
const cartItem = useCartStore((s) => s.items.find(i => i.product.id === product.id)); const cartItem = useCartStore((s) => s.items.find(i => i.product.id === product.id));
const [isAdding, setIsAdding] = useState(false); const [isAdding, setIsAdding] = useState(false);
const activePet = usePetStore(state => state.pets.find(p => p.id === state.activePetId) || null); const isLoggedIn = useUserStore(s => s.isLoggedIn);
const activePet = usePetStore(state => (isLoggedIn ? (state.pets.find(p => p.id === state.activePetId) || null) : null));
const { showPrices, allowCart, showPreorderBtn } = useCatalogMode(); const { showPrices, allowCart, showPreorderBtn } = useCatalogMode();
const productUrl = `/shop/${product.slug || product.id}`; const productUrl = `/shop/${product.slug || product.id}`;
@@ -129,15 +131,11 @@ export const ArchiveProductCard: React.FC<{ product: Product }> = ({ product })
href={productUrl} href={productUrl}
className="group bg-white rounded-[2.5rem] border border-medical-gray-200 overflow-hidden hover:shadow-2xl transition-all flex flex-col h-full relative" className="group bg-white rounded-[2.5rem] border border-medical-gray-200 overflow-hidden hover:shadow-2xl transition-all flex flex-col h-full relative"
> >
{product.specialBadge && ( {/* SpecialBadge moved below image to avoid covering product photo */}
<div className="absolute top-4 right-4 z-10 bg-canina-blue text-white text-2xs font-black uppercase tracking-widest px-3 py-1 rounded-full shadow-lg">
{product.specialBadge}
</div>
)}
{compatibility && ( {compatibility && (
<div className={`absolute top-14 right-4 z-10 text-3xs font-black uppercase tracking-widest px-3 py-1 rounded-full shadow-md flex items-center gap-1 ${compatibility.type === 'alert' ? 'bg-amber-100 text-amber-700' : <div className={`absolute top-4 right-4 z-10 text-3xs font-black uppercase tracking-widest px-2.5 py-1 rounded-full shadow-md flex items-center gap-1 backdrop-blur-xs ${compatibility.type === 'alert' ? 'bg-amber-500/90 text-white' :
compatibility.type === 'success' ? 'bg-green-100 text-green-700' : 'bg-medical-gray-100 text-medical-gray-600' compatibility.type === 'success' ? 'bg-emerald-600/90 text-white' : 'bg-canina-blue/90 text-white'
}`}> }`}>
{compatibility.type === 'alert' ? ( {compatibility.type === 'alert' ? (
forBoth ? ( forBoth ? (
@@ -184,6 +182,13 @@ export const ArchiveProductCard: React.FC<{ product: Product }> = ({ product })
</div> </div>
<div className="p-6 flex flex-col flex-1"> <div className="p-6 flex flex-col flex-1">
{product.specialBadge && (
<div className="mb-2">
<span className="inline-block bg-canina-blue/10 text-canina-blue border border-canina-blue/20 text-[10px] font-black px-2.5 py-1 rounded-lg line-clamp-1 font-vazir" title={product.specialBadge}>
{product.specialBadge}
</span>
</div>
)}
<div className="text-2xs font-bold text-canina-blue uppercase tracking-widest mb-2">{product.category}</div> <div className="text-2xs font-bold text-canina-blue uppercase tracking-widest mb-2">{product.category}</div>
<div className="flex flex-col gap-1 mb-3"> <div className="flex flex-col gap-1 mb-3">
<h3 dir="rtl" className="text-base font-black text-medical-gray-900 group-hover:text-canina-blue transition-colors leading-tight text-right font-vazir"> <h3 dir="rtl" className="text-base font-black text-medical-gray-900 group-hover:text-canina-blue transition-colors leading-tight text-right font-vazir">
@@ -273,7 +278,8 @@ const ArchiveProductListItem: React.FC<{ product: Product }> = ({ product }) =>
const { addItem } = useCartStore(); const { addItem } = useCartStore();
const cartItem = useCartStore((s) => s.items.find(i => i.product.id === product.id)); const cartItem = useCartStore((s) => s.items.find(i => i.product.id === product.id));
const [isAdding, setIsAdding] = useState(false); const [isAdding, setIsAdding] = useState(false);
const activePet = usePetStore(state => state.pets.find(p => p.id === state.activePetId) || null); const isLoggedIn = useUserStore(s => s.isLoggedIn);
const activePet = usePetStore(state => (isLoggedIn ? (state.pets.find(p => p.id === state.activePetId) || null) : null));
const productUrl = `/shop/${product.slug || product.id}`; const productUrl = `/shop/${product.slug || product.id}`;
const handleAddToCart = (e: React.MouseEvent) => { const handleAddToCart = (e: React.MouseEvent) => {
@@ -325,11 +331,7 @@ const ArchiveProductListItem: React.FC<{ product: Product }> = ({ product }) =>
className="w-full h-full group-hover:scale-105 transition-transform duration-500" className="w-full h-full group-hover:scale-105 transition-transform duration-500"
imgClassName="w-full h-full object-contain" imgClassName="w-full h-full object-contain"
/> />
{product.specialBadge && ( {/* List specialBadge moved below */}
<div className="absolute top-1 right-1 z-10 bg-canina-blue text-white text-[9px] font-black uppercase px-1.5 py-0.5 rounded-md shadow-xs">
{product.specialBadge}
</div>
)}
<div className="absolute bottom-1 left-1 flex gap-1"> <div className="absolute bottom-1 left-1 flex gap-1">
{forDog && ( {forDog && (
<div className="w-5 h-5 bg-white/90 backdrop-blur-xs rounded-md flex items-center justify-center text-medical-gray-500 border border-medical-gray-100 shadow-2xs" title="مناسب برای سگ"> <div className="w-5 h-5 bg-white/90 backdrop-blur-xs rounded-md flex items-center justify-center text-medical-gray-500 border border-medical-gray-100 shadow-2xs" title="مناسب برای سگ">
@@ -49,13 +49,17 @@ export default function B2BLandingClient() {
setSubmitting(true); setSubmitting(true);
try { try {
await api.post('/wholesale/apply', { await api.post('/b2b/inquire', {
businessName: `${formData.businessName} (${formData.businessType} - ${formData.city}) - رابط: ${formData.contactName}`, companyName: formData.businessName,
licenseNumber: formData.phone, contactName: formData.contactName || formData.businessName,
notes: formData.notes, email: `partner-${Date.now()}@canina.ir`,
phone: formData.phone,
businessType: `${formData.businessType} (شهر: ${formData.city || 'نامشخص'})`,
estimatedVolume: 'ثبت لندینگ B2B سایت',
message: formData.notes || `درخواست شراکت و تامین رسمی برای ${formData.businessName} در شهر ${formData.city}`,
}); });
setSubmitted(true); setSubmitted(true);
toast.success('درخواست همکاری شما با موفقیت ثبت شد. همکاران ما حداکثر تا ۲۴ ساعت آینده با شما تماس خواهند گرفت.'); toast.success('درخواست همکاری تجاری شما با موفقیت ثبت شد. تیم بازرگانی و پزشکی حداکثر تا ۲۴ ساعت کاری با شما تماس خواهند گرفت.');
} catch { } catch {
toast.error('خطایی در ثبت درخواست رخ داد. لطفاً با پشتیبانی تماس بگیرید.'); toast.error('خطایی در ثبت درخواست رخ داد. لطفاً با پشتیبانی تماس بگیرید.');
} finally { } finally {
+89 -14
View File
@@ -89,23 +89,24 @@ export default function B2BPortal({ onClose }: { onClose: () => void }) {
initial={{ opacity: 0 }} initial={{ opacity: 0 }}
animate={{ opacity: 1 }} animate={{ opacity: 1 }}
exit={{ opacity: 0 }} exit={{ opacity: 0 }}
className="fixed inset-0 z-[100] bg-medical-gray-900/60 backdrop-blur-md flex items-center justify-center p-4 md:p-10 font-vazir" className="fixed inset-0 z-[100] bg-medical-gray-900/70 backdrop-blur-md flex items-center justify-center p-2 sm:p-4 md:p-8 font-vazir"
dir="rtl" dir="rtl"
> >
<motion.div <motion.div
initial={{ scale: 0.9, opacity: 0, y: 20 }} initial={{ scale: 0.9, opacity: 0, y: 20 }}
animate={{ scale: 1, opacity: 1, y: 0 }} animate={{ scale: 1, opacity: 1, y: 0 }}
className="bg-white w-full max-w-6xl h-[90vh] rounded-[3rem] shadow-2xl overflow-hidden flex flex-col md:flex-row relative" className="bg-white w-full max-w-6xl h-[95vh] sm:h-[90vh] rounded-3xl sm:rounded-[3rem] shadow-2xl overflow-hidden flex flex-col md:flex-row relative"
> >
<button <button
onClick={onClose} onClick={onClose}
className="absolute top-6 left-6 z-20 w-10 h-10 bg-medical-gray-100 rounded-full flex items-center justify-center text-medical-gray-500 hover:bg-red-50 hover:text-red-500 transition-all" className="absolute top-4 left-4 sm:top-6 sm:left-6 z-30 min-w-[44px] min-h-[44px] w-11 h-11 bg-white/90 sm:bg-medical-gray-100 rounded-full flex items-center justify-center text-medical-gray-600 hover:bg-red-50 hover:text-red-500 transition-all shadow-md cursor-pointer"
aria-label="بستن پنجره"
> >
<X className="w-5 h-5" /> <X className="w-5 h-5" />
</button> </button>
{/* Sidebar Info */} {/* Sidebar Info */}
<div className="w-full md:w-80 bg-canina-blue p-10 text-white flex flex-col overflow-y-auto"> <div className="w-full md:w-80 bg-canina-blue p-5 sm:p-8 md:p-10 text-white flex flex-col overflow-y-auto shrink-0 max-h-[45vh] md:max-h-full">
<div className="mb-8"> <div className="mb-8">
<div className="w-16 h-16 bg-white/20 rounded-2xl flex items-center justify-center mb-6"> <div className="w-16 h-16 bg-white/20 rounded-2xl flex items-center justify-center mb-6">
<Building2 className="w-8 h-8" /> <Building2 className="w-8 h-8" />
@@ -162,32 +163,107 @@ export default function B2BPortal({ onClose }: { onClose: () => void }) {
{/* Main Grid Area */} {/* Main Grid Area */}
<div className="flex-1 flex flex-col bg-medical-gray-50 overflow-hidden"> <div className="flex-1 flex flex-col bg-medical-gray-50 overflow-hidden">
{/* Header & Search */} {/* Header & Search */}
<div className="p-8 border-b border-medical-gray-200 flex flex-col md:flex-row md:items-center justify-between gap-6 bg-white"> <div className="p-4 sm:p-6 md:p-8 border-b border-medical-gray-200 flex flex-col sm:flex-row sm:items-center justify-between gap-3 sm:gap-6 bg-white shrink-0">
<div className="relative flex-1 max-w-md"> <div className="relative flex-1 max-w-md">
<Search className="absolute right-4 top-1/2 -translate-y-1/2 w-4 h-4 text-medical-gray-400" /> <Search className="absolute right-3 sm:right-4 top-1/2 -translate-y-1/2 w-4 h-4 text-medical-gray-400" />
<input <input
type="text" type="text"
placeholder="جستجوی کد کالا یا نام محصول..." placeholder="جستجوی کد کالا یا نام محصول..."
value={searchQuery} value={searchQuery}
onChange={e => setSearchQuery(e.target.value)} onChange={e => setSearchQuery(e.target.value)}
className="w-full bg-medical-gray-50 border border-medical-gray-200 rounded-2xl py-3 pr-11 pl-4 text-sm focus:outline-none focus:ring-2 focus:ring-canina-blue/20" className="w-full bg-medical-gray-50 border border-medical-gray-200 rounded-xl sm:rounded-2xl py-2.5 sm:py-3 pr-9 sm:pr-11 pl-4 text-xs sm:text-sm focus:outline-none focus:ring-2 focus:ring-canina-blue/20"
/> />
</div> </div>
<button <button
onClick={handleAddAll} onClick={handleAddAll}
disabled={totalItems === 0} disabled={totalItems === 0}
className="bg-medical-gray-900 text-white px-8 py-3 rounded-2xl font-black text-sm flex items-center gap-2 hover:bg-canina-blue transition-colors disabled:opacity-30" className="bg-medical-gray-900 text-white px-5 sm:px-8 py-2.5 sm:py-3 rounded-xl sm:rounded-2xl font-black text-xs sm:text-sm flex items-center justify-center gap-2 hover:bg-canina-blue transition-colors disabled:opacity-30 cursor-pointer shadow-md"
> >
<ShoppingCart className="w-4 h-4" /> <ShoppingCart className="w-4 h-4" />
افزودن کلی ({totalItems} عدد) <span>افزودن کلی ({toPersian(totalItems)} عدد)</span>
</button> </button>
</div> </div>
{/* Table */} {/* Products Container */}
<div className="flex-1 overflow-y-auto p-8"> <div className="flex-1 overflow-y-auto p-3 sm:p-6 md:p-8">
{loadError && <p role="alert">خطا در دریافت محصولات. لطفاً دوباره تلاش کنید.</p>} {loadError && <p role="alert" className="text-red-500 font-bold text-xs p-4 bg-red-50 rounded-2xl mb-4">خطا در دریافت محصولات. لطفاً دوباره تلاش کنید.</p>}
<div className="bg-white border border-medical-gray-200 rounded-3xl overflow-hidden shadow-sm">
{/* Mobile View: Clean Card Layout for each product */}
<div className="md:hidden space-y-3">
{filteredProducts.map(product => {
const basePrice = product.priceValue || 0;
const wholesaleDiscountPercent = Number(useSettingsStore.getState().getText('B2B_DISCOUNT_PERCENT', '30')) || 30;
const prodWholesale = (product as unknown as { wholesalePrice?: number }).wholesalePrice;
const wholesalePrice = prodWholesale
? Number(prodWholesale)
: Math.round(basePrice * (1 - wholesaleDiscountPercent / 100));
const currentQty = quantities[product.id] || 0;
return (
<div key={product.id} className="bg-white border border-medical-gray-200 rounded-2xl p-3.5 shadow-xs space-y-3">
<div className="flex items-center gap-3">
<div className="w-14 h-14 bg-medical-gray-50 rounded-xl p-1.5 shrink-0 border border-medical-gray-100 flex items-center justify-center">
<SafeImage src={product.image} className="w-full h-full" imgClassName="object-contain" alt={product.name} />
</div>
<div className="flex-1 min-w-0">
<h4 className="font-black text-xs text-medical-gray-900 leading-snug line-clamp-2">{product.name}</h4>
<span className="text-[10px] font-mono text-medical-gray-400 block mt-0.5 dir-ltr text-right">کد: {product.artNo}</span>
</div>
</div>
<div className="flex items-center justify-between border-t border-medical-gray-100 pt-2.5 text-xs">
<div>
<span className="text-[10px] text-medical-gray-400 block font-medium">تک‌فروشی</span>
<span className="font-bold text-medical-gray-600 text-xs">{toPersian(basePrice.toLocaleString())} ت</span>
</div>
<div>
<span className="text-[10px] text-amber-600 block font-black">قیمت همکار B2B</span>
{isWholesaleVerified ? (
<span className="font-black text-amber-800 text-xs bg-amber-50 px-2 py-0.5 rounded-md border border-amber-200 inline-block">
{toPersian(wholesalePrice.toLocaleString())} ت
</span>
) : (
<span className="inline-flex items-center gap-1 text-[10px] font-bold text-gray-400 bg-gray-50 px-1.5 py-0.5 rounded">
<Lock className="w-2.5 h-2.5" />
تایید ادمین
</span>
)}
</div>
<div className="flex items-center gap-1 bg-medical-gray-50 border border-medical-gray-200 rounded-xl p-1">
<button
type="button"
onClick={() => handleQuantityChange(product.id, String(Math.max(0, currentQty - 1)))}
className="w-7 h-7 flex items-center justify-center bg-white rounded-lg text-gray-700 font-bold text-sm shadow-xs active:bg-gray-100"
>
-
</button>
<input
type="number"
min="0"
value={currentQty || ""}
onChange={(e) => handleQuantityChange(product.id, e.target.value)}
placeholder="0"
className="w-8 text-center bg-transparent font-mono font-black text-xs outline-none"
/>
<button
type="button"
onClick={() => handleQuantityChange(product.id, String(currentQty + 1))}
className="w-7 h-7 flex items-center justify-center bg-white rounded-lg text-gray-700 font-bold text-sm shadow-xs active:bg-gray-100"
>
+
</button>
</div>
</div>
</div>
);
})}
</div>
{/* Desktop / Tablet View: Rich Table */}
<div className="hidden md:block bg-white border border-medical-gray-200 rounded-3xl overflow-hidden shadow-sm">
<table className="w-full text-right"> <table className="w-full text-right">
<thead className="bg-medical-gray-50 border-b border-medical-gray-200"> <thead className="bg-medical-gray-50 border-b border-medical-gray-200">
<tr> <tr>
@@ -201,7 +277,6 @@ export default function B2BPortal({ onClose }: { onClose: () => void }) {
<tbody className="divide-y divide-medical-gray-100"> <tbody className="divide-y divide-medical-gray-100">
{filteredProducts.map(product => { {filteredProducts.map(product => {
const basePrice = product.priceValue || 0; const basePrice = product.priceValue || 0;
// Priority 1: Specific product wholesalePrice, Priority 2: General settings percentage discount (default 30%)
const wholesaleDiscountPercent = Number(useSettingsStore.getState().getText('B2B_DISCOUNT_PERCENT', '30')) || 30; const wholesaleDiscountPercent = Number(useSettingsStore.getState().getText('B2B_DISCOUNT_PERCENT', '30')) || 30;
const prodWholesale = (product as unknown as { wholesalePrice?: number }).wholesalePrice; const prodWholesale = (product as unknown as { wholesalePrice?: number }).wholesalePrice;
const wholesalePrice = prodWholesale const wholesalePrice = prodWholesale
+9 -3
View File
@@ -1,5 +1,6 @@
"use client"; "use client";
import React, { useState, useEffect } from "react"; import React, { useState, useEffect } from "react";
import { usePathname } from "next/navigation";
import Image from "next/image"; import Image from "next/image";
import { Phone, Mail, MapPin, Instagram, ShieldCheck, Globe, ArrowUp, Download, ChevronDown, ChevronUp } from "lucide-react"; import { Phone, Mail, MapPin, Instagram, ShieldCheck, Globe, ArrowUp, Download, ChevronDown, ChevronUp } from "lucide-react";
import { useSettingsStore } from "../lib/store/settingsStore"; import { useSettingsStore } from "../lib/store/settingsStore";
@@ -8,7 +9,9 @@ import Link from "next/link";
import { NavigationTarget } from "../lib/types"; import { NavigationTarget } from "../lib/types";
export default function Footer({ export default function Footer({
// Footer hooks
onB2BOpen onB2BOpen
}: { }: {
onNavigate?: (v: NavigationTarget) => void; onNavigate?: (v: NavigationTarget) => void;
@@ -17,6 +20,8 @@ export default function Footer({
}) { }) {
const getText = useSettingsStore(state => state.getText); const getText = useSettingsStore(state => state.getText);
const isB2BEnabled = useSettingsStore((s) => s.getBoolean('b2bRegistrationOpen', true) && s.getBoolean('b2b_enabled', true)); const isB2BEnabled = useSettingsStore((s) => s.getBoolean('b2bRegistrationOpen', true) && s.getBoolean('b2b_enabled', true));
const pathname = usePathname();
const isPdpPage = pathname?.startsWith('/shop/') && pathname !== '/shop';
const [showScroll, setShowScroll] = useState(false); const [showScroll, setShowScroll] = useState(false);
const [footerCol1, setFooterCol1] = useState<Array<{ id?: string; label: string; href: string }>>([]); const [footerCol1, setFooterCol1] = useState<Array<{ id?: string; label: string; href: string }>>([]);
const [isDescExpanded, setIsDescExpanded] = useState(false); const [isDescExpanded, setIsDescExpanded] = useState(false);
@@ -53,12 +58,13 @@ export default function Footer({
return ( return (
<footer className="bg-medical-gray-900 text-white pt-10 sm:pt-24 pb-28 sm:pb-12 font-shabnam relative" dir="rtl"> <footer className="bg-medical-gray-900 text-white pt-10 sm:pt-24 pb-28 sm:pb-12 font-shabnam relative" dir="rtl">
{/* Floating Back-to-Top Button */} {/* Floating Back-to-Top Button (Docked cleanly on the RIGHT side to avoid overlapping SupportChat on the LEFT) */}
{showScroll && ( {showScroll && (
<button <button
onClick={scrollToTop} onClick={scrollToTop}
className="fixed bottom-36 left-4 sm:bottom-8 sm:left-8 z-40 bg-canina-blue text-white p-2.5 sm:p-3 rounded-full shadow-2xl hover:bg-canina-dark hover:scale-110 transition-all border border-white/20 group flex items-center gap-2 font-vazir text-xs font-black" className={`fixed ${isPdpPage ? "bottom-[138px]" : "bottom-24"} right-4 sm:bottom-8 sm:right-8 z-40 bg-canina-blue text-white p-2.5 sm:p-3 rounded-full shadow-2xl hover:bg-canina-dark hover:scale-110 transition-all border border-white/20 group flex items-center gap-2 font-vazir text-xs font-black cursor-pointer`}
title="بازگشت به بالای صفحه" title="بازگشت به بالای صفحه"
aria-label="بازگشت به بالای صفحه"
> >
<ArrowUp className="w-4 h-4 sm:w-5 sm:h-5 group-hover:-translate-y-1 transition-transform" /> <ArrowUp className="w-4 h-4 sm:w-5 sm:h-5 group-hover:-translate-y-1 transition-transform" />
<span className="hidden sm:inline">بازگشت به بالا</span> <span className="hidden sm:inline">بازگشت به بالا</span>
+5 -7
View File
@@ -5,6 +5,7 @@ import { Search, ChevronDown, Menu, X, Pill, ShieldCheck, HeartPulse, Sparkles,
import { motion, AnimatePresence } from "motion/react"; import { motion, AnimatePresence } from "motion/react";
import Link from "next/link"; import Link from "next/link";
import { useCartStore } from "../lib/store/cartStore"; import { useCartStore } from "../lib/store/cartStore";
import { useUIStore } from "../lib/store/uiStore";
import { usePetStore } from "../lib/store/usePetStore"; import { usePetStore } from "../lib/store/usePetStore";
import { useUserStore } from "../lib/store/userStore"; import { useUserStore } from "../lib/store/userStore";
import { useSettingsStore } from "../lib/store/settingsStore"; import { useSettingsStore } from "../lib/store/settingsStore";
@@ -249,18 +250,15 @@ export default function Header({
{/* Left Action Buttons */} {/* Left Action Buttons */}
<div className="flex items-center gap-1.5 sm:gap-3 shrink-0"> <div className="flex items-center gap-1.5 sm:gap-3 shrink-0">
{/* Prescription Upload Button (Desktop & Mobile) */} {/* Prescription Upload Button (Desktop & Mobile) - Opens Prescription Modal */}
{isPrescriptionEnabled && ( {isPrescriptionEnabled && (
<button <button
type="button"
onClick={() => { onClick={() => {
if (!isLoggedIn) { useUIStore.getState().setPrescriptionModalOpen(true);
setIsAuthModalOpen(true);
} else {
setIsPrescriptionModalOpen(true);
}
}} }}
className="flex items-center gap-1.5 px-2.5 sm:px-3 py-2 bg-emerald-50 text-emerald-700 border border-emerald-200 hover:bg-emerald-100 rounded-xl text-[11px] sm:text-xs font-black transition-all shadow-xs cursor-pointer" className="flex items-center gap-1.5 px-2.5 sm:px-3 py-2 bg-emerald-50 text-emerald-700 border border-emerald-200 hover:bg-emerald-100 rounded-xl text-[11px] sm:text-xs font-black transition-all shadow-xs cursor-pointer"
title="ثبت نسخه دامپزشک" title="ثبت نسخه دامپزشک"
> >
<FileHeart className="w-3.5 h-3.5 sm:w-4 sm:h-4 text-emerald-600 shrink-0" /> <FileHeart className="w-3.5 h-3.5 sm:w-4 sm:h-4 text-emerald-600 shrink-0" />
<span className="hidden xs:inline sm:inline">ثبت نسخه دامپزشک</span> <span className="hidden xs:inline sm:inline">ثبت نسخه دامپزشک</span>
@@ -183,10 +183,8 @@ export default function MobileBottomNav({
} }
}; };
const isProductDetailPage = pathname.startsWith("/shop/") && pathname !== "/shop"; // Retain MobileBottomNav across all routes including PDP so user never loses Menu & Home navigation
if (isProductDetailPage) { const isProductDetailPage = false;
return null;
}
const totalCartItems = isMounted ? getTotalItems() : 0; const totalCartItems = isMounted ? getTotalItems() : 0;
const isHomeActive = pathname === "/"; const isHomeActive = pathname === "/";
@@ -481,6 +479,20 @@ export default function MobileBottomNav({
<span>خرید عمده (B2B)</span> <span>خرید عمده (B2B)</span>
</button> </button>
)} )}
{isPrescriptionEnabled && (
<button
type="button"
onClick={() => {
closeSheet();
useUIStore.getState().setPrescriptionModalOpen(true);
}}
className="flex items-center gap-2.5 p-3.5 bg-emerald-50 border border-emerald-200 rounded-2xl text-xs font-black text-emerald-800 hover:border-emerald-500 text-right shadow-xs"
>
<FileHeart className="w-4 h-4 text-emerald-600 shrink-0" />
<span>ثبت نسخه آنلاین</span>
</button>
)}
</div> </div>
{/* Contact & Support */} {/* Contact & Support */}
+26 -34
View File
@@ -498,27 +498,7 @@ export default function ProductPage({
}} }}
className="bg-white rounded-2xl sm:rounded-[2.5rem] border border-medical-gray-200 shadow-xl relative group overflow-hidden h-[280px] sm:h-[390px] flex items-center justify-center p-2 sm:p-4 select-none touch-pan-y cursor-grab active:cursor-grabbing" className="bg-white rounded-2xl sm:rounded-[2.5rem] border border-medical-gray-200 shadow-xl relative group overflow-hidden h-[280px] sm:h-[390px] flex items-center justify-center p-2 sm:p-4 select-none touch-pan-y cursor-grab active:cursor-grabbing"
> >
{/* Top Floating Badges */} {/* Floating Badges over photo removed to prevent blocking product visual */}
<div className="absolute top-4 left-4 sm:top-6 sm:left-6 flex flex-col gap-1.5 sm:gap-2 z-10 items-start pointer-events-none">
{product.specialBadge && (
<div className="px-2.5 py-1 bg-medical-gray-900 text-white rounded-full text-[9px] sm:text-[10px] font-black uppercase tracking-widest font-vazir whitespace-nowrap shadow-sm">
{product.specialBadge}
</div>
)}
{isOutOfStock ? (
<div className="px-2.5 py-1 bg-rose-500 text-white rounded-full text-[9px] sm:text-[10px] font-black uppercase tracking-widest flex items-center gap-1 font-vazir shadow-sm">
ناموجود در انبار
</div>
) : (
<div className="px-2.5 py-1 bg-green-500 text-white rounded-full text-[9px] sm:text-[10px] font-black uppercase tracking-widest flex items-center gap-1 font-vazir shadow-sm">
<CheckCircle2 className="w-3 h-3" />
موجود در انبار
</div>
)}
<div className="px-2.5 py-1 bg-canina-blue text-white rounded-full text-[9px] sm:text-[10px] font-black uppercase tracking-widest font-vazir whitespace-nowrap shadow-sm">
گرید دارویی اختصاصی
</div>
</div>
{/* Species Suitable Badges (Dog / Cat) */} {/* Species Suitable Badges (Dog / Cat) */}
<div className="absolute bottom-4 left-4 flex gap-1.5 z-10 pointer-events-none"> <div className="absolute bottom-4 left-4 flex gap-1.5 z-10 pointer-events-none">
@@ -695,15 +675,27 @@ export default function ProductPage({
<div className="md:col-span-7 space-y-4 sm:space-y-6 flex flex-col items-center md:items-start"> <div className="md:col-span-7 space-y-4 sm:space-y-6 flex flex-col items-center md:items-start">
<div className="w-full flex flex-col items-center md:items-start"> <div className="w-full flex flex-col items-center md:items-start">
<div className="flex flex-wrap justify-center md:justify-start items-center gap-2 sm:gap-3 mb-3 sm:mb-4"> <div className="flex flex-wrap justify-center md:justify-start items-center gap-2 sm:gap-3 mb-3 sm:mb-4">
<div className="px-3 py-1 bg-canina-blue text-white rounded-full text-[10px] font-black uppercase tracking-widest font-vazir whitespace-nowrap shadow-sm"> {/* 1. First Priority: Stock Status */}
استاندارد صنعتی آلمان {isOutOfStock ? (
</div> <div className="px-3 py-1 bg-rose-50 text-rose-700 border border-rose-200 rounded-full text-[10px] font-black uppercase tracking-widest flex items-center gap-1 font-vazir shadow-xs">
<div className="px-3 py-1 bg-amber-500 text-white rounded-full text-[10px] font-black uppercase tracking-widest font-vazir whitespace-nowrap shadow-sm flex items-center gap-1"> <span className="w-2 h-2 rounded-full bg-rose-500" />
<ShieldCheck className="w-3 h-3" /> ناموجود در انبار مرکزی
کاتالوگ رسمی Canina </div>
) : (
<div className="px-3 py-1 bg-emerald-50 text-emerald-800 border border-emerald-200 rounded-full text-[10px] font-black uppercase tracking-widest flex items-center gap-1 font-vazir shadow-xs">
<CheckCircle2 className="w-3.5 h-3.5 text-emerald-600" />
موجود در انبار مرکزی
</div>
)}
{/* 2. Pharmaceutical Grade */}
<div className="px-3 py-1 bg-canina-blue/10 text-canina-blue border border-canina-blue/20 rounded-full text-[10px] font-black uppercase tracking-widest font-vazir whitespace-nowrap shadow-xs">
گرید دارویی اختصاصی Canina
</div> </div>
{/* 3. Special Badge if exists */}
{product.specialBadge && ( {product.specialBadge && (
<div className="px-3 py-1 bg-medical-gray-900 text-white rounded-full text-[10px] font-black uppercase tracking-widest font-vazir whitespace-nowrap shadow-sm"> <div className="px-3 py-1 bg-amber-50 text-amber-900 border border-amber-200 rounded-full text-[10px] font-black uppercase tracking-widest font-vazir shadow-xs max-w-full text-right" title={product.specialBadge}>
{product.specialBadge} {product.specialBadge}
</div> </div>
)} )}
@@ -745,9 +737,9 @@ export default function ProductPage({
</h2> </h2>
)} )}
{product.scientificTagline && ( {product.scientificTagline && (
<div className="mt-1 text-xs sm:text-sm md:text-base text-canina-blue font-bold font-vazir flex items-center justify-center md:justify-start gap-1.5" dir="rtl"> <div className="mt-1.5 text-xs sm:text-sm md:text-base text-canina-blue font-bold font-vazir flex items-start justify-center md:justify-start gap-2" dir="rtl">
<span className="w-1.5 h-1.5 rounded-full bg-canina-blue shrink-0" /> <span className="w-1.5 h-1.5 rounded-full bg-canina-blue shrink-0 mt-2" />
<span>{product.scientificTagline}</span> <span className="leading-relaxed text-right">{product.scientificTagline}</span>
</div> </div>
)} )}
</div> </div>
@@ -1060,7 +1052,7 @@ export default function ProductPage({
<span className="text-xs sm:text-sm font-bold text-medical-gray-700 font-vazir"> <span className="text-xs sm:text-sm font-bold text-medical-gray-700 font-vazir">
{cardSlug ? ( {cardSlug ? (
<Link <Link
href={`/wiki/${cardSlug}`} href={`/wiki?term=${cardSlug}`}
className="hover:text-canina-blue hover:underline transition-colors flex items-center gap-1" className="hover:text-canina-blue hover:underline transition-colors flex items-center gap-1"
title="مشاهده در دانشنامه علمی کنینا" title="مشاهده در دانشنامه علمی کنینا"
> >
@@ -1606,8 +1598,8 @@ export default function ProductPage({
)} )}
</AnimatePresence> </AnimatePresence>
{/* Mobile Floating Sticky Bottom Buy Bar */} {/* Mobile Floating Sticky Bottom Buy Bar - Docked cleanly ABOVE MobileBottomNav */}
<div className="lg:hidden fixed bottom-0 left-0 right-0 z-50 bg-white/95 backdrop-blur-md border-t border-medical-gray-200 p-3 pb-safe shadow-2xl flex items-center justify-between gap-3 font-vazir" dir="rtl"> <div className="lg:hidden fixed bottom-[65px] left-0 right-0 z-30 bg-white/95 backdrop-blur-md border-t border-medical-gray-200 px-3 py-2.5 shadow-[0_-4px_16px_rgba(0,0,0,0.08)] flex items-center justify-between gap-3 font-vazir" dir="rtl">
{!isCatalogHidePrices ? ( {!isCatalogHidePrices ? (
<div> <div>
<span className="text-[10px] text-medical-gray-400 font-bold block">قیمت نهایی</span> <span className="text-[10px] text-medical-gray-400 font-bold block">قیمت نهایی</span>
@@ -1,5 +1,6 @@
'use client'; 'use client';
import { FormEvent, useEffect, useRef, useState } from 'react'; import { FormEvent, useEffect, useRef, useState } from 'react';
import { usePathname } from 'next/navigation';
type PersistedMessage = { role: 'user' | 'assistant'; content: string }; type PersistedMessage = { role: 'user' | 'assistant'; content: string };
@@ -42,6 +43,8 @@ export default function SupportChat() {
const pending = useRef<AbortController | null>(null); const pending = useRef<AbortController | null>(null);
const chatScrollRef = useRef<HTMLDivElement | null>(null); const chatScrollRef = useRef<HTMLDivElement | null>(null);
const historyKey = useRef(''); const historyKey = useRef('');
const pathname = usePathname();
const isPdpPage = pathname?.startsWith('/shop/') && pathname !== '/shop';
useEffect(() => { useEffect(() => {
identity.current = token(); identity.current = token();
@@ -194,7 +197,7 @@ export default function SupportChat() {
if (!config?.enabled) return configError ? <span role="status" className="sr-only">تنظیمات پشتیبان هوشمند در دسترس نیست.</span> : null; if (!config?.enabled) return configError ? <span role="status" className="sr-only">تنظیمات پشتیبان هوشمند در دسترس نیست.</span> : null;
const botIcon = { chat: '💬', paw: '🐾', bot: '🤖' }[config.icon]; const botIcon = { chat: '💬', paw: '🐾', bot: '🤖' }[config.icon];
return ( return (
<aside dir="rtl" className="fixed bottom-24 sm:bottom-6 left-4 sm:left-6 z-30 max-w-[calc(100vw-2.5rem)] font-vazir select-none pb-[env(safe-area-inset-bottom,0px)]"> <aside dir="rtl" className={`fixed ${isPdpPage ? "bottom-[138px]" : "bottom-24"} sm:bottom-6 left-4 sm:left-6 z-30 max-w-[calc(100vw-2.5rem)] font-vazir select-none pb-[env(safe-area-inset-bottom,0px)]`}>
{/* Floating Launcher Button */} {/* Floating Launcher Button */}
<button <button
type="button" type="button"
@@ -0,0 +1,62 @@
import React from "react";
import { describe, it, expect, vi } from "vitest";
import { render, fireEvent, waitFor } from "@testing-library/react";
vi.mock("axios", () => {
const mAxios = {
post: vi.fn(() => Promise.resolve({ data: { success: true } })),
get: vi.fn(() => Promise.resolve({ data: { success: true } })),
interceptors: {
request: { use: vi.fn(), eject: vi.fn() },
response: { use: vi.fn(), eject: vi.fn() },
},
create: () => mAxios,
};
return { default: mAxios };
});
vi.mock("sonner", () => ({
toast: {
success: vi.fn(),
error: vi.fn(),
},
}));
vi.mock("../../lib/store/settingsStore", () => ({
useSettingsStore: (selector?: any) => {
const s = { getText: (k: string, d: string) => d };
return typeof selector === "function" ? selector(s) : s;
},
}));
import api from "../../lib/services/api";
import B2BLandingClient from "../B2BLandingClient";
describe("B2BLandingClient Suite (B2B-01)", () => {
it("renders B2B landing and correctly submits inquiry to /b2b/inquire", async () => {
const { container } = render(<B2BLandingClient />);
const businessInput = container.querySelector("#b2b-businessName") as HTMLInputElement;
const phoneInput = container.querySelector("#b2b-phone") as HTMLInputElement;
const form = container.querySelector("form") as HTMLFormElement;
expect(businessInput).not.toBeNull();
expect(phoneInput).not.toBeNull();
expect(form).not.toBeNull();
fireEvent.change(businessInput, { target: { value: "بیمارستان دامپزشکی پایتخت" } });
fireEvent.change(phoneInput, { target: { value: "09121112233" } });
fireEvent.submit(form);
await waitFor(() => {
expect(api.post).toHaveBeenCalledWith(
"/b2b/inquire",
expect.objectContaining({
companyName: "بیمارستان دامپزشکی پایتخت",
phone: "09121112233",
})
);
});
});
});
@@ -4,10 +4,12 @@ interface UIState {
isCartOpen: boolean; isCartOpen: boolean;
isLoginModalOpen: boolean; isLoginModalOpen: boolean;
isB2BPortalOpen: boolean; isB2BPortalOpen: boolean;
isPrescriptionModalOpen: boolean;
advisorData: Record<string, unknown> | null; advisorData: Record<string, unknown> | null;
setCartOpen: (open: boolean) => void; setCartOpen: (open: boolean) => void;
setLoginModalOpen: (open: boolean, advisorData?: Record<string, unknown> | null) => void; setLoginModalOpen: (open: boolean, advisorData?: Record<string, unknown> | null) => void;
setB2BPortalOpen: (open: boolean) => void; setB2BPortalOpen: (open: boolean) => void;
setPrescriptionModalOpen: (open: boolean) => void;
clearAdvisorData: () => void; clearAdvisorData: () => void;
} }
@@ -15,6 +17,7 @@ export const useUIStore = create<UIState>((set) => ({
isCartOpen: false, isCartOpen: false,
isLoginModalOpen: false, isLoginModalOpen: false,
isB2BPortalOpen: false, isB2BPortalOpen: false,
isPrescriptionModalOpen: false,
advisorData: null, advisorData: null,
setCartOpen: (open) => set({ isCartOpen: open }), setCartOpen: (open) => set({ isCartOpen: open }),
setLoginModalOpen: (open, data) => set((state) => ({ setLoginModalOpen: (open, data) => set((state) => ({
@@ -22,5 +25,6 @@ export const useUIStore = create<UIState>((set) => ({
advisorData: data !== undefined ? data : state.advisorData advisorData: data !== undefined ? data : state.advisorData
})), })),
setB2BPortalOpen: (open) => set({ isB2BPortalOpen: open }), setB2BPortalOpen: (open) => set({ isB2BPortalOpen: open }),
setPrescriptionModalOpen: (open) => set({ isPrescriptionModalOpen: open }),
clearAdvisorData: () => set({ advisorData: null }), clearAdvisorData: () => set({ advisorData: null }),
})); }));