Sửa hiển thị tên/email của người thanh toán

AddLocationModal.tsx

@@ -250,13 +250,18 @@ export const AddLocationModal = ({ isOpen, onClose, tourId, initialLegId, editin
             </div>
             <div>
               <label className="block text-xs font-bold text-gray-600 mb-1">Thành viên đã thanh toán</label>
-              <select className="w-full px-3 py-2 bg-white border border-gray-200 rounded-xl outline-none text-sm" 
+               <select className="w-full px-3 py-2 bg-white border border-gray-200 rounded-xl outline-none text-sm" 
-                value={formData.paidById} onChange={e => setFormData({...formData, paidById: e.target.value})}>
+                 value={formData.paidById} onChange={e => setFormData({...formData, paidById: e.target.value})}>
-                <option value="">-- Chọn người thanh toán --</option>
+                 <option value="">-- Chọn người thanh toán --</option>
-                {currentTour?.participants?.map((p: any) => (
+                 {currentTour?.participants?.map((p: any) => {
-                  <option key={p.userId} value={p.userId}>{p.user?.name || p.userId}</option>
+                   const name = p.user?.name;
-                ))}
+                   const email = p.user?.email;
-              </select>
+                   const label = [name, email && name ? `(${email})` : email].filter(Boolean).join(' ');
+                   return (
+                   <option key={p.userId} value={p.userId}>{label || p.userId}</option>
+                   );
+                 })}
+               </select>
             </div>
           </div>
           <div>

dist/jwt.strategy.d.ts

@@ -7,10 +7,10 @@ export declare class JwtStrategy extends JwtStrategy_base {
     private prisma;
     constructor(prisma: PrismaService);
     validate(payload: any): Promise<{
+        name: string | null;
         id: string;
         email: string;
         passwordHash: string;
-        name: string | null;
         avatar: string | null;
         createdAt: Date;
         isAdmin: boolean;

dist/main.js

@@ -305,7 +305,13 @@ let TourController = class TourController {
         const tour = await this.prisma.tour.findUnique({
             where: { id },
             include: {
-                participants: true,
+                participants: {
+                    include: {
+                        user: {
+                            select: { id: true, name: true, email: true }
+                        }
+                    }
+                },
                 photos: true,
                 legs: {
                     orderBy: { sequence: 'asc' },

main.ts

@@ -339,7 +339,13 @@ class TourController {
     const tour = await this.prisma.tour.findUnique({
       where: { id },
       include: {
-        participants: true,
+        participants: {
+          include: {
+            user: {
+              select: { id: true, name: true, email: true }
+            }
+          }
+        },
         photos: true,
         legs: {
           orderBy: { sequence: 'asc' },