feat(sms): fire ORDER_SHIPPED only on shipped status with courier fallback, add tracking modal in orders, and user search picker in sms recipient
Deploy Canina / deploy (push) Successful in 2m13s
E2E Playwright Tests / Run Full E2E & Security Suites (push) Failing after 0s

This commit is contained in:
parsa aghaei committed 2026-09-05 11:57:41 +03:30
1 parent 4be51741e0
commit 7093978e27
5 files changed
+382 -26

No files matched your search

+3 -1
View File
@@ -202,11 +202,13 @@ export class AdminController {
@Param('id') id: string,
@Body('status') status: string,
@Body('trackingCode') trackingCode?: string,
@Body('trackingNumber') trackingNumber?: string,
) {
const finalTracking = trackingNumber !== undefined ? trackingNumber : trackingCode;
const order = await this.adminService.updateOrderStatus(
id,
status,
trackingCode,
finalTracking,
);
return { success: true, data: order };
}
+87 -1
View File
@@ -3,10 +3,12 @@ import {
HttpException,
NotFoundException,
BadRequestException,
Optional,
} from '@nestjs/common';
import { Prisma } from '@prisma/client';
import { PrismaService } from '../prisma/prisma.service';
import { RedisService } from '../redis/redis.service';
import { SmsService } from '../common/services/sms.service';
import * as bcrypt from 'bcryptjs';
import { CreateUserDto, UpdateUserDto } from './dto/user.dto';
import { ProductDto } from './dto/product.dto';
@@ -65,6 +67,7 @@ export class AdminService {
private prisma: PrismaService,
private redisService: RedisService,
private revalidationService: RevalidationService,
@Optional() private smsService?: SmsService,
) {}
async getDashboardStats() {
@@ -824,7 +827,7 @@ export class AdminService {
if (trackingNumber !== undefined) {
dataToUpdate.trackingNumber = trackingNumber;
}
return this.prisma.order.update({
const updatedOrder = await this.prisma.order.update({
where: { id },
data: dataToUpdate,
include: {
@@ -836,6 +839,89 @@ export class AdminService {
},
},
});
// Send Shipping SMS with Tracking Code or Courier fallback
if (status === 'shipped' && this.smsService && updatedOrder.user?.mobile) {
try {
const rawShipping = updatedOrder.shippingAddress;
let shipping: Record<string, any> = {};
if (typeof rawShipping === 'object' && rawShipping !== null) {
shipping = rawShipping;
} else if (typeof rawShipping === 'string') {
const trimmed = rawShipping.trim();
if (trimmed.startsWith('{') && trimmed.endsWith('}')) {
try {
shipping = JSON.parse(trimmed);
} catch {
shipping = {};
}
}
if (!shipping.province || !shipping.address) {
let text = trimmed;
const recipientMatch = text.match(/\(گیرنده:\s*([^-)]+)(?:-\s*([^)]+))?\)/);
if (recipientMatch) {
if (!shipping.fullName) shipping.fullName = recipientMatch[1]?.trim();
if (!shipping.phone && recipientMatch[2]) shipping.phone = recipientMatch[2]?.trim();
text = text.replace(recipientMatch[0], '').trim();
}
const postalMatch = text.match(/\(کد پستی:\s*([^)]+)\)/);
if (postalMatch) {
if (!shipping.postalCode) shipping.postalCode = postalMatch[1]?.trim();
text = text.replace(postalMatch[0], '').trim();
}
const parts = text.split(/[،,]/).map((p) => p.trim()).filter(Boolean);
if (parts.length >= 3) {
if (!shipping.province) shipping.province = parts[0];
if (!shipping.city) shipping.city = parts[1];
if (!shipping.address) shipping.address = parts.slice(2).join('، ');
} else if (parts.length === 2) {
if (!shipping.province) shipping.province = parts[0];
if (!shipping.address) shipping.address = parts[1];
} else if (parts.length === 1 && !shipping.address) {
shipping.address = parts[0];
}
}
}
const user = updatedOrder.user;
const customerFullName = (
user?.firstName
? `${user.firstName} ${user.lastName || ''}`
: shipping.fullName || 'مشتری'
).trim();
const recipientFullName = (
shipping.fullName ||
shipping.receptorName ||
customerFullName
).trim();
const finalTracking = trackingNumber || updatedOrder.trackingNumber || '';
const orderData = {
orderNumber: updatedOrder.trackingNumber || updatedOrder.id.slice(0, 8),
amount: Number(updatedOrder.totalAmount || 0).toLocaleString('fa-IR'),
customerName: customerFullName,
customerPhone: user?.mobile || shipping.phone || '',
recipientName: recipientFullName,
recipientPhone: shipping.phone || user?.mobile || '',
provinceCity: (shipping.province && shipping.city ? `${shipping.province} - ${shipping.city}` : shipping.province || shipping.city || 'ثبت نشده').trim(),
postalCode: shipping.postalCode || shipping.zipCode || '',
address: (shipping.address || (typeof rawShipping === 'string' ? rawShipping : '')).trim(),
trackingCode: finalTracking || 'ارسال با پیک شهری',
shippingTrackingCode: finalTracking || 'ارسال با پیک شهری',
shippingMethod: finalTracking ? 'پست پیشتاز / تیپاکس' : 'پیک شهری',
orderDate: new Date().toLocaleDateString('fa-IR'),
};
this.smsService.triggerEvent('ORDER_SHIPPED', orderData).catch(() => {});
} catch (smsErr) {
// Silently catch SMS errors to avoid breaking status update
}
}
return updatedOrder;
}
async refundOrderToWallet(