feat(sms): fire ORDER_SHIPPED only on shipped status with courier fallback, add tracking modal in orders, and user search picker in sms recipient
This commit is contained in:
1 parent
4be51741e0
commit
7093978e27
5 files changed
+382
-26
No files matched your search
@@ -221,6 +221,11 @@ export default function Orders() {
|
||||
const [refundReason, setRefundReason] = useState<string>('');
|
||||
const [isProcessingRefund, setIsProcessingRefund] = useState(false);
|
||||
|
||||
// Shipping Status Modal State
|
||||
const [shippingModalOrder, setShippingModalOrder] = useState<Order | null>(null);
|
||||
const [shippingTrackingInput, setShippingTrackingInput] = useState('');
|
||||
const [isSubmittingShipping, setIsSubmittingShipping] = useState(false);
|
||||
|
||||
const openOrderModal = (order: Order) => {
|
||||
setSelectedOrder(order);
|
||||
setModalTrackingCode(order.trackingNumber || '');
|
||||
@@ -317,6 +322,16 @@ export default function Orders() {
|
||||
}, [fetchOrders]);
|
||||
|
||||
const handleUpdateStatus = async (id: string, newStatus: string, trackingNumber?: string) => {
|
||||
// If setting to shipped from the table and tracking is not provided, open modal prompt
|
||||
if (newStatus === 'shipped' && trackingNumber === undefined) {
|
||||
const order = orders.find((o) => o.id === id);
|
||||
if (order) {
|
||||
setShippingModalOrder(order);
|
||||
setShippingTrackingInput(order.trackingNumber || '');
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
setProcessingId(id);
|
||||
await api.put(`/admin/orders/${id}/status`, {
|
||||
@@ -324,13 +339,39 @@ export default function Orders() {
|
||||
trackingNumber: trackingNumber !== undefined ? trackingNumber : undefined
|
||||
});
|
||||
await fetchOrders();
|
||||
toast.success('وضعیت سفارش بروزرسانی شد');
|
||||
} catch (err) {
|
||||
console.error('Failed to update status', err);
|
||||
toast.error('خطا در بروزرسانی وضعیت سفارش');
|
||||
} finally {
|
||||
setProcessingId(null);
|
||||
}
|
||||
};
|
||||
|
||||
const handleConfirmShipping = async () => {
|
||||
if (!shippingModalOrder) return;
|
||||
try {
|
||||
setIsSubmittingShipping(true);
|
||||
await api.put(`/admin/orders/${shippingModalOrder.id}/status`, {
|
||||
status: 'shipped',
|
||||
trackingNumber: shippingTrackingInput.trim() || undefined,
|
||||
});
|
||||
toast.success(
|
||||
shippingTrackingInput.trim()
|
||||
? 'سفارش به ارسال شده تغییر یافت و پیامک حاوی کد رهگیری ارسال شد.'
|
||||
: 'سفارش به ارسال شده با پیک تغییر یافت و پیامک ارسال شد.'
|
||||
);
|
||||
setShippingModalOrder(null);
|
||||
setShippingTrackingInput('');
|
||||
await fetchOrders();
|
||||
} catch (err) {
|
||||
console.error('Failed to set shipped status', err);
|
||||
toast.error('خطا در تغییر وضعیت سفارش به ارسال شده');
|
||||
} finally {
|
||||
setIsSubmittingShipping(false);
|
||||
}
|
||||
};
|
||||
|
||||
const [isUpdatingModalStatus, setIsUpdatingModalStatus] = useState(false);
|
||||
|
||||
const handleSaveModalStatus = async (newStatus: string) => {
|
||||
@@ -340,10 +381,14 @@ export default function Orders() {
|
||||
setModalStatus(newStatus);
|
||||
await api.put(`/admin/orders/${selectedOrder.id}/status`, {
|
||||
status: newStatus,
|
||||
trackingNumber: modalTrackingCode || undefined,
|
||||
trackingNumber: modalTrackingCode.trim() || undefined,
|
||||
});
|
||||
await fetchOrders();
|
||||
toast.success('وضعیت سفارش با موفقیت بروزرسانی شد');
|
||||
toast.success(
|
||||
newStatus === 'shipped'
|
||||
? 'وضعیت به ارسال شده تغییر یافت و پیامک مربوطه صادر شد.'
|
||||
: 'وضعیت سفارش با موفقیت بروزرسانی شد'
|
||||
);
|
||||
} catch (err) {
|
||||
console.error('Failed to update modal status', err);
|
||||
toast.error('خطا در بروزرسانی وضعیت سفارش');
|
||||
@@ -358,7 +403,7 @@ export default function Orders() {
|
||||
setIsSavingTracking(true);
|
||||
await api.put(`/admin/orders/${selectedOrder.id}/status`, {
|
||||
status: modalStatus,
|
||||
trackingNumber: modalTrackingCode,
|
||||
trackingNumber: modalTrackingCode.trim() || undefined,
|
||||
});
|
||||
await fetchOrders();
|
||||
toast.success('تغییرات سفارش با موفقیت ذخیره شد');
|
||||
@@ -1176,6 +1221,75 @@ export default function Orders() {
|
||||
</div>
|
||||
</Modal>
|
||||
)}
|
||||
|
||||
{/* Shipping Status & Tracking Code Modal */}
|
||||
{shippingModalOrder && (
|
||||
<Modal
|
||||
isOpen={!!shippingModalOrder}
|
||||
onClose={() => {
|
||||
if (!isSubmittingShipping) {
|
||||
setShippingModalOrder(null);
|
||||
setShippingTrackingInput('');
|
||||
}
|
||||
}}
|
||||
title={`ثبت ارسال مرسوله - سفارش #${shippingModalOrder.trackingNumber || shippingModalOrder.id.slice(0, 8)}`}
|
||||
size="md"
|
||||
footer={
|
||||
<div className="flex items-center justify-end gap-3 w-full">
|
||||
<Button
|
||||
variant="ghost"
|
||||
onClick={() => {
|
||||
setShippingModalOrder(null);
|
||||
setShippingTrackingInput('');
|
||||
}}
|
||||
disabled={isSubmittingShipping}
|
||||
>
|
||||
انصراف
|
||||
</Button>
|
||||
<Button
|
||||
variant="primary"
|
||||
onClick={handleConfirmShipping}
|
||||
isLoading={isSubmittingShipping}
|
||||
className="bg-purple-600 hover:bg-purple-700 text-white"
|
||||
>
|
||||
تایید ارسال و صدور پیامک
|
||||
</Button>
|
||||
</div>
|
||||
}
|
||||
>
|
||||
<div className="space-y-4 py-2 text-xs">
|
||||
<div className="bg-purple-50 p-4 rounded-2xl border border-purple-100 flex items-start gap-3">
|
||||
<Truck className="w-5 h-5 text-purple-600 shrink-0 mt-0.5" />
|
||||
<div className="space-y-1">
|
||||
<div className="font-bold text-gray-900">
|
||||
تغییر وضعیت سفارش به «ارسال شده»
|
||||
</div>
|
||||
<div className="text-gray-600 leading-relaxed">
|
||||
با تایید این مرحله، وضعیت سفارش به ارسال شده تغییر یافته و پیامک اطلاعرسانی ارسال مرسوله برای مشتری ارسال خواهد شد.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<label className="block font-bold text-gray-800">
|
||||
کد رهگیری پستی / تیپاکس (اختیاری):
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
value={shippingTrackingInput}
|
||||
onChange={(e) => setShippingTrackingInput(e.target.value)}
|
||||
placeholder="مثلاً: 184920394857283948571928"
|
||||
className="w-full border border-gray-300 rounded-xl p-3 font-mono font-bold text-sm outline-none focus:ring-2 focus:ring-purple-500 bg-white"
|
||||
dir="ltr"
|
||||
autoFocus
|
||||
/>
|
||||
<p className="text-[11px] text-gray-500 leading-relaxed">
|
||||
💡 <span className="font-bold text-gray-700">توجه:</span> اگر این سفارش با <span className="font-bold text-purple-700">پیک موتوری / پیک شهری</span> ارسال شده یا بارکد پستی ندارد، نیازی به پر کردن این فیلد نیست و میتوانید آن را خالی بگذارید. پیامک با عنوان ارسال با پیک برای مشتری ارسال میگردد.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</Modal>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -175,6 +175,12 @@ export default function SmsSettingsPage() {
|
||||
const [ruleFormDescription, setRuleFormDescription] = useState('');
|
||||
const [isTestingRuleId, setIsTestingRuleId] = useState<string | null>(null);
|
||||
|
||||
// User Picker for Custom Recipient
|
||||
const [systemUsers, setSystemUsers] = useState<Array<{ id: string; firstName?: string; lastName?: string; mobile?: string; role?: string }>>([]);
|
||||
const [isLoadingUsers, setIsLoadingUsers] = useState(false);
|
||||
const [userSearchQuery, setUserSearchQuery] = useState('');
|
||||
const [isUserDropdownOpen, setIsUserDropdownOpen] = useState(false);
|
||||
|
||||
// Pattern Modals
|
||||
const [isAddModalOpen, setIsAddModalOpen] = useState(false);
|
||||
const [isEditModalOpen, setIsEditModalOpen] = useState(false);
|
||||
@@ -379,7 +385,23 @@ export default function SmsSettingsPage() {
|
||||
setRuleFormPatternId(initialPatternId ? String(initialPatternId) : String(config.orderBodyId || ''));
|
||||
setRuleFormVariables(['customerName', 'orderNumber', 'amount']);
|
||||
setRuleFormDescription('');
|
||||
setUserSearchQuery('');
|
||||
setIsUserDropdownOpen(false);
|
||||
setIsRuleModalOpen(true);
|
||||
fetchSystemUsers();
|
||||
};
|
||||
|
||||
const fetchSystemUsers = async (searchQuery = '') => {
|
||||
try {
|
||||
setIsLoadingUsers(true);
|
||||
const res = await api.get(`/admin/users?limit=30${searchQuery ? `&search=${encodeURIComponent(searchQuery)}` : ''}`);
|
||||
const list = res.data?.data || [];
|
||||
setSystemUsers(list);
|
||||
} catch (err) {
|
||||
console.error('Failed to fetch system users', err);
|
||||
} finally {
|
||||
setIsLoadingUsers(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleOpenEditRuleModal = (rule: SmsRule) => {
|
||||
@@ -392,7 +414,10 @@ export default function SmsSettingsPage() {
|
||||
setRuleFormPatternId(String(rule.patternId || ''));
|
||||
setRuleFormVariables(rule.variables || []);
|
||||
setRuleFormDescription(rule.description || '');
|
||||
setUserSearchQuery('');
|
||||
setIsUserDropdownOpen(false);
|
||||
setIsRuleModalOpen(true);
|
||||
fetchSystemUsers();
|
||||
};
|
||||
|
||||
const handleDuplicateRule = (rule: SmsRule) => {
|
||||
@@ -2150,23 +2175,152 @@ export default function SmsSettingsPage() {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Custom Phone Number Input if custom */}
|
||||
{/* Custom Phone Number Input / User Picker if custom */}
|
||||
{ruleFormRecipientType === 'custom' && (
|
||||
<div className="bg-amber-50/70 p-3.5 rounded-xl border border-amber-200 space-y-1">
|
||||
<label className="block text-xs font-bold text-amber-900">
|
||||
شمارههای موبایل دریافتکننده (Custom Phone Numbers) *
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
required
|
||||
value={ruleFormCustomPhone}
|
||||
onChange={(e) => setRuleFormCustomPhone(e.target.value)}
|
||||
placeholder="مثلاً: 09123456789 (برای چند شماره با کاما یا ویرگول جدا کنید)"
|
||||
className="w-full border border-amber-300 rounded-xl p-2.5 outline-none focus:ring-2 focus:ring-amber-500 text-xs font-mono font-bold bg-white"
|
||||
dir="ltr"
|
||||
/>
|
||||
<div className="bg-amber-50/70 p-4 rounded-xl border border-amber-200 space-y-3">
|
||||
<div className="flex items-center justify-between">
|
||||
<label className="block text-xs font-bold text-amber-900">
|
||||
شمارههای موبایل دریافتکننده (Custom Phone Numbers) *
|
||||
</label>
|
||||
<span className="text-[11px] text-amber-700 font-medium">
|
||||
انتخاب از کاربران/مدیران سیستم یا درج مستقیم
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{/* Searchable User Selector */}
|
||||
<div className="relative">
|
||||
<div className="flex items-center gap-2">
|
||||
<div className="relative flex-1">
|
||||
<Search className="w-3.5 h-3.5 absolute right-3 top-1/2 -translate-y-1/2 text-gray-400" />
|
||||
<input
|
||||
type="text"
|
||||
value={userSearchQuery}
|
||||
onChange={(e) => {
|
||||
const q = e.target.value;
|
||||
setUserSearchQuery(q);
|
||||
setIsUserDropdownOpen(true);
|
||||
fetchSystemUsers(q);
|
||||
}}
|
||||
onFocus={() => {
|
||||
setIsUserDropdownOpen(true);
|
||||
if (systemUsers.length === 0) fetchSystemUsers();
|
||||
}}
|
||||
placeholder="جستجوی کاربر یا مدیر در سیستم (نام، شماره تماس)..."
|
||||
className="w-full pr-8 pl-3 py-2 bg-white border border-amber-300 rounded-xl text-xs outline-none focus:ring-2 focus:ring-amber-500"
|
||||
/>
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setIsUserDropdownOpen((prev) => !prev)}
|
||||
className="px-3 py-2 bg-amber-200/70 hover:bg-amber-200 text-amber-900 rounded-xl text-xs font-bold shrink-0 transition-all flex items-center gap-1 cursor-pointer"
|
||||
>
|
||||
<Users className="w-3.5 h-3.5" />
|
||||
<span>لیست کاربران</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* Dropdown list */}
|
||||
{isUserDropdownOpen && (
|
||||
<div className="absolute z-50 mt-1.5 w-full bg-white border border-gray-200 rounded-xl shadow-xl max-h-56 overflow-y-auto divide-y divide-gray-100">
|
||||
<div className="p-2 bg-gray-50 flex items-center justify-between text-[11px] text-gray-500 font-bold">
|
||||
<span>انتخاب کاربر برای اضافه شدن به لیست شمارهها:</span>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setIsUserDropdownOpen(false)}
|
||||
className="text-gray-400 hover:text-gray-700 cursor-pointer"
|
||||
>
|
||||
<X className="w-3.5 h-3.5" />
|
||||
</button>
|
||||
</div>
|
||||
{isLoadingUsers ? (
|
||||
<div className="p-4 text-center text-xs text-gray-500">در حال بارگذاری کاربران...</div>
|
||||
) : systemUsers.length === 0 ? (
|
||||
<div className="p-4 text-center text-xs text-gray-500">کاربری یافت نشد</div>
|
||||
) : (
|
||||
systemUsers.map((u) => {
|
||||
const uName = (u.firstName ? `${u.firstName} ${u.lastName || ''}` : 'بدون نام').trim();
|
||||
const uPhone = u.mobile || '';
|
||||
const isAlreadySelected = uPhone && ruleFormCustomPhone.includes(uPhone);
|
||||
const roleBadge = u.role === 'Admin' ? 'مدیر' : u.role === 'Vet' ? 'دامپزشک' : 'کاربر';
|
||||
|
||||
return (
|
||||
<button
|
||||
key={u.id}
|
||||
type="button"
|
||||
onClick={() => {
|
||||
if (!uPhone) {
|
||||
toast.error('این کاربر شماره همراه ثبتشده ندارد');
|
||||
return;
|
||||
}
|
||||
const currentPhones = ruleFormCustomPhone
|
||||
.split(/[,;\s]+/)
|
||||
.map((p) => p.trim())
|
||||
.filter(Boolean);
|
||||
if (currentPhones.includes(uPhone)) {
|
||||
// Remove
|
||||
const filtered = currentPhones.filter((p) => p !== uPhone);
|
||||
setRuleFormCustomPhone(filtered.join(' ، '));
|
||||
toast.success(`${uName} از گیرندگان حذف شد`);
|
||||
} else {
|
||||
// Add
|
||||
const next = [...currentPhones, uPhone];
|
||||
setRuleFormCustomPhone(next.join(' ، '));
|
||||
toast.success(`${uName} (${uPhone}) به گیرندگان اضافه شد`);
|
||||
}
|
||||
}}
|
||||
className={`w-full p-2.5 text-right flex items-center justify-between hover:bg-amber-50/50 transition-colors text-xs cursor-pointer ${
|
||||
isAlreadySelected ? 'bg-amber-50' : ''
|
||||
}`}
|
||||
>
|
||||
<div className="flex items-center gap-2">
|
||||
<div className="w-7 h-7 rounded-lg bg-amber-100 text-amber-800 font-bold flex items-center justify-center text-xs shrink-0">
|
||||
{uName.charAt(0)}
|
||||
</div>
|
||||
<div>
|
||||
<div className="font-bold text-gray-900 flex items-center gap-1.5">
|
||||
<span>{uName}</span>
|
||||
<span className="text-[10px] px-1.5 py-0.5 rounded-md bg-gray-100 text-gray-600 font-normal">
|
||||
{roleBadge}
|
||||
</span>
|
||||
</div>
|
||||
<div className="text-[11px] text-gray-500 font-mono" dir="ltr">
|
||||
{uPhone || 'بدون شماره'}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div className="shrink-0">
|
||||
{isAlreadySelected ? (
|
||||
<span className="text-emerald-600 font-bold flex items-center gap-1 text-[11px]">
|
||||
<Check className="w-3.5 h-3.5" /> انتخاب شده
|
||||
</span>
|
||||
) : (
|
||||
<span className="text-purple-600 hover:underline text-[11px] font-bold">
|
||||
+ افزودن
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</button>
|
||||
);
|
||||
})
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<input
|
||||
type="text"
|
||||
required
|
||||
value={ruleFormCustomPhone}
|
||||
onChange={(e) => setRuleFormCustomPhone(e.target.value)}
|
||||
placeholder="مثلاً: 09123456789 (برای چند شماره با کاما یا ویرگول جدا کنید)"
|
||||
className="w-full border border-amber-300 rounded-xl p-2.5 outline-none focus:ring-2 focus:ring-amber-500 text-xs font-mono font-bold bg-white"
|
||||
dir="ltr"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<p className="text-[11px] text-amber-700">
|
||||
پیامک این سناریو به این شمارهها ارسال خواهد شد (مانند تلفن همراه راننده، مسئول انبار یا واحد هماهنگی).
|
||||
💡 میتوانید از جستجوی بالا مدیر یا کاربر مدنظرتان را انتخاب کنید یا شمارهها را مستقیماً تایپ نمایید.
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
Reference in new issue
Block a user