fix(all): auto-create ticket tables, multi-tier otp rate limiting, packaged order status & badges, pet kindness footprint
Deploy Canina / deploy (push) Successful in 1m46s
Deploy Canina / deploy (push) Successful in 1m46s
This commit is contained in:
1 parent
d9254e9b01
commit
884b0486cc
8 files changed
+239
-24
No files matched your search
@@ -11,7 +11,10 @@ import {
|
||||
Clock,
|
||||
CreditCard,
|
||||
CheckCircle2,
|
||||
Truck
|
||||
Truck,
|
||||
PackageCheck,
|
||||
XCircle,
|
||||
AlertCircle
|
||||
} from "lucide-react";
|
||||
import { toPersian } from "../lib/utils";
|
||||
|
||||
@@ -188,7 +191,11 @@ export default function OrderDetailsModal({ isOpen, onClose, order }: OrderDetai
|
||||
switch (status) {
|
||||
case 'delivered': return <CheckCircle2 className="w-5 h-5 text-green-500" />;
|
||||
case 'shipped': return <Truck className="w-5 h-5 text-blue-500" />;
|
||||
default: return <Clock className="w-5 h-5 text-orange-500" />;
|
||||
case 'packaged':
|
||||
case 'ready_to_ship': return <PackageCheck className="w-5 h-5 text-purple-600" />;
|
||||
case 'cancelled': return <XCircle className="w-5 h-5 text-red-500" />;
|
||||
case 'pending_payment': return <AlertCircle className="w-5 h-5 text-rose-500" />;
|
||||
default: return <Clock className="w-5 h-5 text-amber-500" />;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -196,6 +203,11 @@ export default function OrderDetailsModal({ isOpen, onClose, order }: OrderDetai
|
||||
switch (status) {
|
||||
case 'delivered': return 'تحویل شده';
|
||||
case 'shipped': return 'ارسال شده';
|
||||
case 'packaged':
|
||||
case 'ready_to_ship': return 'بستهبندی شده (آماده ارسال)';
|
||||
case 'cancelled': return 'لغو شده';
|
||||
case 'pending_payment': return 'در انتظار پرداخت / ناموفق';
|
||||
case 'refunded': return 'مرجوع شده';
|
||||
default: return 'در حال پردازش';
|
||||
}
|
||||
};
|
||||
|
||||
@@ -94,6 +94,14 @@ export default function PetProfile({ initialView }: {
|
||||
return orders.filter(o => o.petId === activePet.id);
|
||||
}, [activePet, orders]);
|
||||
|
||||
const petCharityTotal = useMemo(() => {
|
||||
return petOrders.reduce((sum, o) => sum + (Number(o.charityDonation) || 0), 0);
|
||||
}, [petOrders]);
|
||||
|
||||
const allCharityTotal = useMemo(() => {
|
||||
return orders.reduce((sum, o) => sum + (Number(o.charityDonation) || 0), 0);
|
||||
}, [orders]);
|
||||
|
||||
const [step, setStep] = useState(1);
|
||||
const [formData, setFormData] = useState<Omit<GlobalPetProfile, "id">>({
|
||||
name: "",
|
||||
@@ -748,20 +756,32 @@ export default function PetProfile({ initialView }: {
|
||||
<Heart className="w-6 h-6 fill-white" />
|
||||
</div>
|
||||
<div>
|
||||
<h3 className="text-xl font-black text-medical-gray-900 italic">ردپای مهربانی</h3>
|
||||
<h3 className="text-xl font-black text-medical-gray-900 italic">ردپای مهربانی {activePet.name}</h3>
|
||||
<p className="text-[10px] font-black text-pink-500 uppercase tracking-widest mt-1">سفیر مهربانی: {activePet.name}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div className="space-y-4 relative z-10">
|
||||
<p className="text-sm text-medical-gray-600 font-medium leading-relaxed">
|
||||
{activePet.name} با خریدهای مکمل خود، تا کنون به تامین هزینههای درمانی و تغذیه حیوانات پناهگاهی کمک کرده است.
|
||||
</p>
|
||||
<div className="bg-white/80 backdrop-blur-sm rounded-2xl p-4 border border-pink-100">
|
||||
<div className="bg-white/90 backdrop-blur-sm rounded-2xl p-4 border border-pink-100 space-y-2.5">
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-[10px] font-black text-medical-gray-400">سطح مشارکت</span>
|
||||
<span className="text-sm font-black text-pink-500 italic">حامی وفادار</span>
|
||||
<span className="text-xs font-bold text-medical-gray-500">کمک اهدایی با نام {activePet.name}:</span>
|
||||
<span className="text-sm font-black text-pink-600 font-mono">
|
||||
{toPersian(petCharityTotal.toLocaleString())} <span className="text-[10px] font-normal">تومان</span>
|
||||
</span>
|
||||
</div>
|
||||
{allCharityTotal > 0 && (
|
||||
<div className="flex items-center justify-between text-[11px] font-bold text-medical-gray-400 pt-2 border-t border-pink-50">
|
||||
<span>مجموع مهربانی کل حساب:</span>
|
||||
<span>{toPersian(allCharityTotal.toLocaleString())} تومان</span>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<p className="text-xs text-medical-gray-600 font-medium leading-relaxed">
|
||||
{petCharityTotal > 0 ? (
|
||||
<>«{activePet.name}» با خریدهای مکمل خود تا کنون <strong className="text-pink-600">{toPersian(petCharityTotal.toLocaleString())} تومان</strong> به درمان و تغذیه حیوانات نیازمند پناهگاهی کمک کرده است.</>
|
||||
) : (
|
||||
<>با هر خرید برای «{activePet.name}» میتوانید با انتخاب گزینه ردپای مهربانی، مبلغی را به نام او به پناهگاههای حیوانات اختصاص دهید.</>
|
||||
)}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
@@ -826,15 +826,47 @@ export default function UserDashboard() {
|
||||
</div>
|
||||
<div className="text-left">
|
||||
<div className="text-lg font-black text-medical-gray-900 italic">{toPersian(order.total.toLocaleString())} <span className="text-xs">تومان</span></div>
|
||||
<div className="flex items-center gap-2 justify-end mt-1">
|
||||
<div className="flex flex-wrap items-center gap-2 justify-end mt-1.5">
|
||||
{order.isRefill && (
|
||||
<span className="text-[9px] font-black px-2 py-0.5 rounded-full bg-emerald-50 text-emerald-600 border border-emerald-100">
|
||||
تمدید خودکار ۵٪-
|
||||
</span>
|
||||
)}
|
||||
<span className={`text-[9px] font-black px-2.5 py-0.5 rounded-full uppercase tracking-tighter ${order.status === 'delivered' ? 'bg-green-50 text-green-600' : order.status === 'shipped' ? 'bg-blue-50 text-blue-600' : 'bg-amber-50 text-amber-600'}`}>
|
||||
{order.status === 'delivered' ? 'تحویل شده' : order.status === 'shipped' ? 'ارسال شده' : 'در حال پردازش'}
|
||||
</span>
|
||||
{Number(order.charityDonation) > 0 && (
|
||||
<span className="text-[9px] font-black px-2 py-0.5 rounded-full bg-rose-50 text-rose-600 border border-rose-100 flex items-center gap-1">
|
||||
<Heart className="w-2.5 h-2.5 fill-rose-500 text-rose-500" />
|
||||
مهربانی: {toPersian(Number(order.charityDonation).toLocaleString())} ت
|
||||
</span>
|
||||
)}
|
||||
{(() => {
|
||||
const st = order.status;
|
||||
let badgeLabel = 'در حال پردازش';
|
||||
let badgeColor = 'bg-amber-50 text-amber-700 border-amber-200';
|
||||
if (st === 'delivered') {
|
||||
badgeLabel = 'تحویل شده';
|
||||
badgeColor = 'bg-green-50 text-green-700 border-green-200';
|
||||
} else if (st === 'shipped') {
|
||||
badgeLabel = 'ارسال شده';
|
||||
badgeColor = 'bg-blue-50 text-blue-700 border-blue-200';
|
||||
} else if (st === 'packaged' || st === 'ready_to_ship') {
|
||||
badgeLabel = 'بستهبندی شده (آماده ارسال)';
|
||||
badgeColor = 'bg-purple-50 text-purple-700 border-purple-200';
|
||||
} else if (st === 'pending_payment') {
|
||||
badgeLabel = 'در انتظار پرداخت / ناموفق';
|
||||
badgeColor = 'bg-rose-50 text-rose-700 border-rose-200';
|
||||
} else if (st === 'cancelled') {
|
||||
badgeLabel = 'لغو شده';
|
||||
badgeColor = 'bg-red-50 text-red-700 border-red-200';
|
||||
} else if (st === 'refunded') {
|
||||
badgeLabel = 'مرجوع شده';
|
||||
badgeColor = 'bg-gray-100 text-gray-700 border-gray-200';
|
||||
}
|
||||
return (
|
||||
<span className={`text-[9px] font-black px-2.5 py-0.5 rounded-full border uppercase tracking-tighter ${badgeColor}`}>
|
||||
{badgeLabel}
|
||||
</span>
|
||||
);
|
||||
})()}
|
||||
<ChevronRight className="w-4 h-4 text-medical-gray-300 -rotate-180" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -23,7 +23,7 @@ interface Order {
|
||||
charityDonation?: number;
|
||||
paymentMethod?: string;
|
||||
isRefill?: boolean;
|
||||
status: 'processing' | 'shipped' | 'delivered';
|
||||
status: 'pending_payment' | 'processing' | 'packaged' | 'ready_to_ship' | 'shipped' | 'delivered' | 'cancelled' | 'refunded' | string;
|
||||
petId?: string;
|
||||
shippingAddress?: string;
|
||||
trackingNumber: string;
|
||||
@@ -128,7 +128,7 @@ export const useCartStore = create<CartStore>()(
|
||||
date: backendOrder.createdAt,
|
||||
total: Number(backendOrder.totalAmount),
|
||||
charityDonation: Number(backendOrder.charityDonation),
|
||||
status: (['processing', 'shipped', 'delivered'].includes(backendOrder.status) ? backendOrder.status : 'processing') as Order['status'],
|
||||
status: (backendOrder.status ? String(backendOrder.status) : 'processing') as Order['status'],
|
||||
isRefill: bo.isRefill !== undefined ? Boolean(bo.isRefill) : Boolean(orderData.isRefill || get().isSubscribed),
|
||||
paymentMethod: (bo.paymentMethod as string) || orderData.paymentMethod,
|
||||
trackingNumber: backendOrder.trackingNumber || `CN-${Math.floor(Math.random() * 90000) + 10000}`
|
||||
@@ -153,7 +153,7 @@ export const useCartStore = create<CartStore>()(
|
||||
})) || [],
|
||||
total: Number(bo.totalAmount),
|
||||
charityDonation: Number(bo.charityDonation),
|
||||
status: (['processing', 'shipped', 'delivered'].includes(String(bo.status)) ? bo.status : 'processing') as Order['status'],
|
||||
status: (bo.status ? String(bo.status) : 'processing') as Order['status'],
|
||||
isRefill: Boolean(bo.isRefill),
|
||||
paymentMethod: bo.paymentMethod as string | undefined,
|
||||
petId: (bo.petId as string) || ((bo.pet as { id?: string })?.id),
|
||||
|
||||
Reference in new issue
Block a user