edit contact form

backend/package-lock.json

@@ -2909,7 +2909,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,

backend/src/modules/contacts/contacts.routes.ts

@@ -42,7 +42,7 @@ router.post(
   '/',
   authorize('contacts', 'contacts', 'create'),
   [
-    body('type').isIn(['INDIVIDUAL', 'COMPANY', 'HOLDING', 'GOVERNMENT','ORGANIZATION',
+    body('type').isIn(['INDIVIDUAL', 'COMPANY', 'HOLDING', 'GOVERNMENT','ORGANIZATION','EMBASSIES',
   'BANK','UNIVERSITY','SCHOOL','UN','NGO','INSTITUTION',]),
     body('name').notEmpty().trim(),
     body('email').optional().isEmail(),
@@ -58,7 +58,29 @@ router.put(
   authorize('contacts', 'contacts', 'update'),
   [
     param('id').isUUID(),
-    body('email').optional().isEmail(),
+    body('type')
+      .optional()
+      .isIn([
+        'INDIVIDUAL',
+        'COMPANY',
+        'HOLDING',
+        'GOVERNMENT',
+        'ORGANIZATION',
+        'EMBASSIES',
+        'BANK',
+        'UNIVERSITY',
+        'SCHOOL',
+        'UN',
+        'NGO',
+        'INSTITUTION',
+      ]),
+    body('email')
+      .optional({ values: 'falsy' })
+      .custom((value) => {
+        if (value === null || value === undefined || value === '') return true
+        return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value)
+      })
+      .withMessage('Invalid email format'),
     validate,
   ],
   contactsController.update

backend/src/modules/contacts/contacts.service.ts

@@ -330,9 +330,10 @@ class ContactsService {
     const contact = await prisma.contact.update({
   where: { id },
   data: {
+    type: data.type,
     name: data.name,
     nameAr: data.nameAr,
-        email: data.email,
+    email: data.email === '' || data.email === undefined ? null : data.email,
     phone: data.phone,
     mobile: data.mobile,
     website: data.website,
@@ -344,11 +345,14 @@ class ContactsService {
     city: data.city,
     country: data.country,
     postalCode: data.postalCode,
-        categories: data.categories ? {
-          set: data.categories.map(id => ({ id }))
-        } : undefined,
+    categories: data.categories
+      ? {
+          set: data.categories.map((id) => ({ id })),
+        }
+      : undefined,
     tags: data.tags,
-        employeeId: data.employeeId !== undefined ? (data.employeeId || null) : undefined,
+    employeeId:
+      data.employeeId !== undefined ? (data.employeeId || null) : undefined,
     source: data.source,
     status: data.status,
     rating: data.rating,
@@ -367,7 +371,7 @@ class ContactsService {
       },
     },
   },
-    });
+});
 
     // Log audit
     await AuditLogger.log({
@@ -679,7 +683,7 @@ class ContactsService {
         }
 
         // Validate type
-        if (!['INDIVIDUAL', 'COMPANY', 'HOLDING', 'GOVERNMENT',  'ORGANIZATION','BANK','UNIVERSITY','SCHOOL','UN','NGO','INSTITUTION',].includes(row.type)) {
+        if (!['INDIVIDUAL', 'COMPANY', 'HOLDING', 'GOVERNMENT',  'ORGANIZATION','EMBASSIES','BANK','UNIVERSITY','SCHOOL','UN','NGO','INSTITUTION',].includes(row.type)) {
           results.errors.push({
             row: rowNumber,
             field: 'type',

backend/src/modules/tenders/tenders.controller.ts

@@ -227,6 +227,39 @@ export class TendersController {
       next(error);
     }
   }
-}
+
+
+
+  async viewAttachment(req: AuthRequest, res: Response, next: NextFunction) {
+    try {
+      const file = await tendersService.getAttachmentFile(req.params.attachmentId)
+
+      const fs = require('fs')
+      if (!fs.existsSync(file)) {
+        return res.status(404).json(
+          ResponseFormatter.error('File not found', 'الملف غير موجود')
+        )
+      }
+
+      const path = require('path')
+      return res.sendFile(path.resolve(file))
+
+    } catch (error) {
+      console.error(error) 
+      next(error)
+    }
+  }
+
+  async deleteAttachment(req: AuthRequest, res: Response, next: NextFunction) {
+    try {
+      await tendersService.deleteAttachment(req.params.attachmentId)
+      res.json(ResponseFormatter.success(null, 'Deleted'))
+    } catch (error) {
+      next(error)
+    }
+  }
+  }
 
 export const tendersController = new TendersController();
+
+

backend/src/modules/tenders/tenders.routes.ts

@@ -28,6 +28,15 @@ const upload = multer({
   limits: { fileSize: config.upload.maxFileSize },
 });
 
+
+// View attachment
+router.get(
+  '/attachments/:attachmentId/view',
+  param('attachmentId').isUUID(),
+  validate,
+  tendersController.viewAttachment
+)
+
 router.use(authenticate);
 
 // Enum/lookup routes (no resource id) - place before /:id routes
@@ -173,3 +182,14 @@ router.post(
 );
 
 export default router;
+
+
+
+// Delete attachment
+router.delete(
+  '/attachments/:attachmentId',
+  authorize('tenders', 'tenders', 'update'),
+  param('attachmentId').isUUID(),
+  validate,
+  tendersController.deleteAttachment
+)

backend/src/modules/tenders/tenders.service.ts

@@ -3,6 +3,8 @@ import { AppError } from '../../shared/middleware/errorHandler';
 import { AuditLogger } from '../../shared/utils/auditLogger';
 import { Prisma } from '@prisma/client';
 import path from 'path';
+  import fs from 'fs'
+
 
 const TENDER_SOURCE_VALUES = [
   'GOVERNMENT_SITE',
@@ -33,18 +35,31 @@ export interface CreateTenderData {
   issuingBodyName: string;
   title: string;
   tenderNumber: string;
+
   termsValue: number;
   bondValue: number;
+
+  // new extra fields stored inside notes metadata
+  initialBondValue?: number;
+  finalBondValue?: number;
+  finalBondRefundPeriod?: string;
+  siteVisitRequired?: boolean;
+  siteVisitLocation?: string;
+  termsPickupProvince?: string;
+
   announcementDate: string;
   closingDate: string;
   announcementLink?: string;
+
   source: string;
   sourceOther?: string;
   announcementType: string;
+
   notes?: string;
   contactId?: string;
 }
 
+
 export interface CreateDirectiveData {
   type: string;
   notes?: string;
@@ -71,12 +86,92 @@ class TendersService {
     return `TND-${year}-${seq}`;
   }
 
+    private readonly EXTRA_META_START = '[EXTRA_TENDER_META]';
+  private readonly EXTRA_META_END = '[/EXTRA_TENDER_META]';
+
+  private extractTenderExtraMeta(notes?: string | null) {
+    if (!notes) {
+      return {
+        cleanNotes: '',
+        meta: {},
+      };
+    }
+
+    const start = notes.indexOf(this.EXTRA_META_START);
+    const end = notes.indexOf(this.EXTRA_META_END);
+
+    if (start === -1 || end === -1 || end < start) {
+      return {
+        cleanNotes: notes,
+        meta: {},
+      };
+    }
+
+    const jsonPart = notes.slice(start + this.EXTRA_META_START.length, end).trim();
+    const before = notes.slice(0, start).trim();
+    const after = notes.slice(end + this.EXTRA_META_END.length).trim();
+    const cleanNotes = [before, after].filter(Boolean).join('\n').trim();
+
+    try {
+      return {
+        cleanNotes,
+        meta: JSON.parse(jsonPart || '{}'),
+      };
+    } catch {
+      return {
+        cleanNotes: notes,
+        meta: {},
+      };
+    }
+  }
+
+  private buildTenderNotes(
+    plainNotes?: string | null,
+    extra?: {
+      initialBondValue?: number | null;
+      finalBondValue?: number | null;
+      finalBondRefundPeriod?: string | null;
+      siteVisitRequired?: boolean;
+      siteVisitLocation?: string | null;
+      termsPickupProvince?: string | null;
+    }
+  ) {
+    const cleanedNotes = plainNotes?.trim() || '';
+
+    const meta = {
+      initialBondValue: extra?.initialBondValue ?? null,
+      finalBondValue: extra?.finalBondValue ?? null,
+      finalBondRefundPeriod: extra?.finalBondRefundPeriod?.trim() || null,
+      siteVisitRequired: !!extra?.siteVisitRequired,
+      siteVisitLocation: extra?.siteVisitLocation?.trim() || null,
+      termsPickupProvince: extra?.termsPickupProvince?.trim() || null,
+    };
+
+    const metaBlock = `${this.EXTRA_META_START}${JSON.stringify(meta)}${this.EXTRA_META_END}`;
+
+    return cleanedNotes ? `${cleanedNotes}\n${metaBlock}` : metaBlock;
+  }
+
+  private mapTenderExtraFields<T extends { notes?: string | null; bondValue?: any }>(tender: T) {
+    const { cleanNotes, meta } = this.extractTenderExtraMeta(tender.notes);
+
+    return {
+      ...tender,
+      notes: cleanNotes || null,
+      initialBondValue: meta.initialBondValue ?? Number(tender.bondValue ?? 0),
+      finalBondValue: meta.finalBondValue ?? null,
+      finalBondRefundPeriod: meta.finalBondRefundPeriod ?? null,
+      siteVisitRequired: !!meta.siteVisitRequired,
+      siteVisitLocation: meta.siteVisitLocation ?? null,
+      termsPickupProvince: meta.termsPickupProvince ?? null,
+    };
+  }
+
   async findPossibleDuplicates(data: CreateTenderData): Promise<any[]> {
     const announcementDate = data.announcementDate ? new Date(data.announcementDate) : null;
     const closingDate = data.closingDate ? new Date(data.closingDate) : null;
     const termsValue = Number(data.termsValue);
-    const bondValue = Number(data.bondValue);
-
+    const bondValue = Number(data.initialBondValue ?? data.bondValue ?? 0);
     const where: Prisma.TenderWhereInput = {
       status: { not: 'CANCELLED' },
     };
@@ -135,20 +230,33 @@ class TendersService {
     const announcementDate = new Date(data.announcementDate);
     const closingDate = new Date(data.closingDate);
 
+    if (data.siteVisitRequired && !data.siteVisitLocation?.trim()) {
+      throw new AppError(400, 'مكان زيارة الموقع مطلوب عند اختيار زيارة موقع إجبارية');
+    }
+
+    const finalNotes = this.buildTenderNotes(data.notes, {
+      initialBondValue: data.initialBondValue ?? data.bondValue ?? 0,
+      finalBondValue: data.finalBondValue ?? null,
+      finalBondRefundPeriod: data.finalBondRefundPeriod ?? null,
+      siteVisitRequired: !!data.siteVisitRequired,
+      siteVisitLocation: data.siteVisitRequired ? data.siteVisitLocation ?? null : null,
+      termsPickupProvince: data.termsPickupProvince ?? null,
+    });
+
     const tender = await prisma.tender.create({
       data: {
         tenderNumber,
         issuingBodyName: data.issuingBodyName.trim(),
         title: data.title.trim(),
         termsValue: data.termsValue,
-        bondValue: data.bondValue,
+        bondValue: Number(data.initialBondValue ?? data.bondValue ?? 0),
         announcementDate,
         closingDate,
         announcementLink: data.announcementLink?.trim() || null,
         source: data.source,
         sourceOther: data.sourceOther?.trim() || null,
         announcementType: data.announcementType,
-        notes: data.notes?.trim() || null,
+        notes: finalNotes,
         contactId: data.contactId || null,
         createdById: userId,
       },
@@ -165,8 +273,10 @@ class TendersService {
       userId,
     });
 
-    return { tender, possibleDuplicates: possibleDuplicates.length ? possibleDuplicates : undefined };
-  }
+    return {
+      tender: this.mapTenderExtraFields(tender),
+      possibleDuplicates: possibleDuplicates.length ? possibleDuplicates.map((t) => this.mapTenderExtraFields(t)) : undefined,
+    };  }
 
   async findAll(filters: any, page: number, pageSize: number) {
     const skip = (page - 1) * pageSize;
@@ -195,7 +305,12 @@ class TendersService {
       },
       orderBy: { createdAt: 'desc' },
     });
-    return { tenders, total, page, pageSize };
+        return {
+      tenders: tenders.map((t) => this.mapTenderExtraFields(t)),
+      total,
+      page,
+      pageSize,
+    };
   }
 
   async findById(id: string) {
@@ -217,7 +332,7 @@ class TendersService {
       },
     });
         if (!tender) throw new AppError(404, 'Tender not found');
-    return tender;
+       return this.mapTenderExtraFields(tender);
   }
 
   async update(id: string, data: Partial<CreateTenderData>, userId: string) {
@@ -228,17 +343,76 @@ class TendersService {
     }
 
     const updateData: Prisma.TenderUpdateInput = {};
+        const existingMapped = this.mapTenderExtraFields(existing as any);
+
+    const mergedExtra = {
+      initialBondValue:
+        data.initialBondValue !== undefined
+          ? Number(data.initialBondValue)
+          : existingMapped.initialBondValue ?? Number(existing.bondValue ?? 0),
+
+      finalBondValue:
+        data.finalBondValue !== undefined
+          ? Number(data.finalBondValue)
+          : existingMapped.finalBondValue ?? null,
+
+      finalBondRefundPeriod:
+        data.finalBondRefundPeriod !== undefined
+          ? data.finalBondRefundPeriod
+          : existingMapped.finalBondRefundPeriod ?? null,
+
+      siteVisitRequired:
+        data.siteVisitRequired !== undefined
+          ? !!data.siteVisitRequired
+          : !!existingMapped.siteVisitRequired,
+
+      siteVisitLocation:
+        data.siteVisitLocation !== undefined
+          ? data.siteVisitLocation
+          : existingMapped.siteVisitLocation ?? null,
+
+      termsPickupProvince:
+        data.termsPickupProvince !== undefined
+          ? data.termsPickupProvince
+          : existingMapped.termsPickupProvince ?? null,
+    };
+
+    if (mergedExtra.siteVisitRequired && !mergedExtra.siteVisitLocation?.trim()) {
+      throw new AppError(400, 'مكان زيارة الموقع مطلوب عند اختيار زيارة موقع إجبارية');
+    }
     if (data.title !== undefined) updateData.title = data.title.trim();
     if (data.issuingBodyName !== undefined) updateData.issuingBodyName = data.issuingBodyName.trim();
     if (data.termsValue !== undefined) updateData.termsValue = data.termsValue;
-    if (data.bondValue !== undefined) updateData.bondValue = data.bondValue;
+    if (data.bondValue !== undefined || data.initialBondValue !== undefined) {
+      updateData.bondValue = Number(data.initialBondValue ?? data.bondValue ?? existing.bondValue);
+    }
     if (data.announcementDate !== undefined) updateData.announcementDate = new Date(data.announcementDate);
     if (data.closingDate !== undefined) updateData.closingDate = new Date(data.closingDate);
     if (data.announcementLink !== undefined) updateData.announcementLink = data.announcementLink?.trim() || null;
     if (data.source !== undefined) updateData.source = data.source;
     if (data.sourceOther !== undefined) updateData.sourceOther = data.sourceOther?.trim() || null;
     if (data.announcementType !== undefined) updateData.announcementType = data.announcementType;
-    if (data.notes !== undefined) updateData.notes = data.notes?.trim() || null;
+    if (
+      data.notes !== undefined ||
+      data.initialBondValue !== undefined ||
+      data.finalBondValue !== undefined ||
+      data.finalBondRefundPeriod !== undefined ||
+      data.siteVisitRequired !== undefined ||
+      data.siteVisitLocation !== undefined ||
+      data.termsPickupProvince !== undefined
+    ) {
+      updateData.notes = this.buildTenderNotes(
+        data.notes !== undefined ? data.notes : existingMapped.notes,
+        {
+          initialBondValue: mergedExtra.initialBondValue,
+          finalBondValue: mergedExtra.finalBondValue,
+          finalBondRefundPeriod: mergedExtra.finalBondRefundPeriod,
+          siteVisitRequired: mergedExtra.siteVisitRequired,
+          siteVisitLocation: mergedExtra.siteVisitRequired ? mergedExtra.siteVisitLocation : null,
+          termsPickupProvince: mergedExtra.termsPickupProvince,
+        }
+      );
+    }
     if (data.contactId !== undefined) {
       updateData.contact = data.contactId
         ? { connect: { id: data.contactId } }
@@ -261,7 +435,7 @@ class TendersService {
       userId,
       changes: { before: existing, after: data },
     });
-    return tender;
+    return this.mapTenderExtraFields(tender);
     }
 
   async createDirective(tenderId: string, data: CreateDirectiveData, userId: string) {
@@ -518,6 +692,34 @@ class TendersService {
     return attachment;
   }
 
+    async getAttachmentFile(attachmentId: string): Promise<string> {
+    const attachment = await prisma.attachment.findUnique({
+      where: { id: attachmentId },
+    })
+
+    if (!attachment) throw new AppError(404, 'File not found')
+
+    return attachment.path
+  }
+
+  async deleteAttachment(attachmentId: string): Promise<void> {
+    const attachment = await prisma.attachment.findUnique({
+      where: { id: attachmentId },
+    })
+
+    if (!attachment) throw new AppError(404, 'File not found')
+
+    // حذف من الديسك
+    if (attachment.path && fs.existsSync(attachment.path)) {
+      fs.unlinkSync(attachment.path)
+    }
+
+    // حذف من DB
+    await prisma.attachment.delete({
+      where: { id: attachmentId },
+    })
+  }
+
   private async generateDealNumber(): Promise<string> {
     const year = new Date().getFullYear();
     const prefix = `DEAL-${year}-`;

frontend/package.json

@@ -9,6 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
+    "@swc/helpers": "^0.5.21",
     "@tanstack/react-query": "^5.17.9",
     "axios": "^1.6.5",
     "date-fns": "^3.0.6",

frontend/src/app/contacts/[id]/page.tsx

@@ -100,6 +100,7 @@ function ContactDetailContent() {
       HOLDING: 'bg-purple-100 text-purple-700',
       GOVERNMENT: 'bg-orange-100 text-orange-700',
       ORGANIZATION: 'bg-cyan-100 text-cyan-700',
+      EMBASSIES: 'bg-red-100 text-red-700',
       BANK: 'bg-emerald-100 text-emerald-700',
       UNIVERSITY: 'bg-indigo-100 text-indigo-700',
       SCHOOL: 'bg-yellow-100 text-yellow-700',
@@ -119,6 +120,7 @@ function ContactDetailContent() {
       ORGANIZATION: 'منظمات - Organizations',
       BANK: 'بنوك - Banks',
       UNIVERSITY: 'جامعات - Universities',
+      EMBASSIES: 'سفارات - Embassies',
       SCHOOL: 'مدارس - Schools',
       UN: 'UN - United Nations',
       NGO: 'NGO - Non-Governmental Organization',

frontend/src/app/contacts/page.tsx

@@ -41,20 +41,17 @@ function flattenCategories(cats: Category[], result: Category[] = []): Category[
 }
 
 function ContactsContent() {
-  // State Management
   const [contacts, setContacts] = useState<Contact[]>([])
   const [loading, setLoading] = useState(true)
   const [error, setError] = useState<string | null>(null)
   const [selectedContacts, setSelectedContacts] = useState<Set<string>>(new Set())
   const [showBulkActions, setShowBulkActions] = useState(false)
 
-  // Pagination
   const [currentPage, setCurrentPage] = useState(1)
   const [totalPages, setTotalPages] = useState(1)
   const [total, setTotal] = useState(0)
   const pageSize = 10
 
-  // Filters
   const [searchTerm, setSearchTerm] = useState('')
   const [selectedType, setSelectedType] = useState('all')
   const [selectedStatus, setSelectedStatus] = useState('all')
@@ -64,7 +61,6 @@ function ContactsContent() {
   const [categories, setCategories] = useState<Category[]>([])
   const [showAdvancedFilters, setShowAdvancedFilters] = useState(false)
 
-  // Modals
   const [showCreateModal, setShowCreateModal] = useState(false)
   const [showEditModal, setShowEditModal] = useState(false)
   const [showDeleteDialog, setShowDeleteDialog] = useState(false)
@@ -75,7 +71,6 @@ function ContactsContent() {
   const [exporting, setExporting] = useState(false)
   const [exportExcludeCompanyEmployees, setExportExcludeCompanyEmployees] = useState(false)
 
-  // Fetch Contacts (with debouncing for search)
   const fetchContacts = useCallback(async () => {
     setLoading(true)
     setError(null)
@@ -104,21 +99,18 @@ function ContactsContent() {
     }
   }, [currentPage, searchTerm, selectedType, selectedStatus, selectedSource, selectedRating, selectedCategory])
 
-  // Debounced search
   useEffect(() => {
     const debounce = setTimeout(() => {
-      setCurrentPage(1) // Reset to page 1 on new search
+      setCurrentPage(1)
       fetchContacts()
     }, 500)
     return () => clearTimeout(debounce)
   }, [searchTerm])
 
-  // Fetch on filter/page change
   useEffect(() => {
     fetchContacts()
   }, [currentPage, selectedType, selectedStatus, selectedSource, selectedRating, selectedCategory])
 
-  // Create Contact
   const handleCreate = async (data: CreateContactData) => {
     setSubmitting(true)
     try {
@@ -136,7 +128,6 @@ function ContactsContent() {
     }
   }
 
-  // Edit Contact
   const handleEdit = async (data: UpdateContactData) => {
     if (!selectedContact) return
 
@@ -156,7 +147,6 @@ function ContactsContent() {
     }
   }
 
-  // Delete Contact
   const handleDelete = async () => {
     if (!selectedContact) return
 
@@ -175,7 +165,6 @@ function ContactsContent() {
     }
   }
 
-  // Utility Functions
   const resetForm = () => {
     setSelectedContact(null)
   }
@@ -197,6 +186,7 @@ function ContactsContent() {
       HOLDING: 'bg-purple-100 text-purple-700',
       GOVERNMENT: 'bg-orange-100 text-orange-700',
       ORGANIZATION: 'bg-cyan-100 text-cyan-700',
+      EMBASSIES: 'bg-red-100 text-red-700',
       BANK: 'bg-emerald-100 text-emerald-700',
       UNIVERSITY: 'bg-indigo-100 text-indigo-700',
       SCHOOL: 'bg-yellow-100 text-yellow-700',
@@ -218,6 +208,7 @@ function ContactsContent() {
       HOLDING: 'مجموعة',
       GOVERNMENT: 'حكومي',
       ORGANIZATION: 'منظمات',
+      EMBASSIES: 'سفارات',
       BANK: 'بنوك',
       UNIVERSITY: 'جامعات',
       SCHOOL: 'مدارس',
@@ -228,10 +219,36 @@ function ContactsContent() {
     return labels[type] || type
   }
 
+  const organizationTypes = new Set([
+    'COMPANY',
+    'HOLDING',
+    'GOVERNMENT',
+    'ORGANIZATION',
+    'EMBASSIES',
+    'BANK',
+    'UNIVERSITY',
+    'SCHOOL',
+    'UN',
+    'NGO',
+    'INSTITUTION',
+  ])
+
+  const isOrganizationContact = (contact: Contact) => organizationTypes.has(contact.type)
+
+  const getListContactName = (contact: Contact) => {
+    return contact.name || '-'
+  }
+
+  const getListCompanyName = (contact: Contact) => {
+    return contact.companyName || '-'
+  }
+
+  const getListContactNameAr = (contact: Contact) => {
+  return (contact as any).nameAr || ''
+}
 
   return (
     <div className="min-h-screen bg-gray-50">
-      {/* Header */}
       <header className="bg-white shadow-sm border-b">
         <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-4">
           <div className="flex items-center justify-between">
@@ -303,7 +320,6 @@ function ContactsContent() {
       </header>
 
       <main className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
-        {/* Stats Cards */}
         <div className="grid grid-cols-1 md:grid-cols-4 gap-6 mb-8">
           <div className="bg-white rounded-xl shadow-sm p-6 border border-gray-200">
             <div className="flex items-center justify-between">
@@ -358,12 +374,9 @@ function ContactsContent() {
           </div>
         </div>
 
-        {/* Filters and Search */}
         <div className="bg-white rounded-xl shadow-sm p-6 border border-gray-200 mb-6">
           <div className="space-y-4">
-            {/* Main Filters Row */}
             <div className="flex flex-col md:flex-row gap-4">
-              {/* Search */}
               <div className="flex-1 relative">
                 <Search className="absolute right-3 top-1/2 -translate-y-1/2 h-5 w-5 text-gray-400" />
                 <input
@@ -375,7 +388,6 @@ function ContactsContent() {
                 />
               </div>
 
-              {/* Type Filter */}
               <select
                 value={selectedType}
                 onChange={(e) => setSelectedType(e.target.value)}
@@ -387,6 +399,7 @@ function ContactsContent() {
                 <option value="HOLDING">Holdings</option>
                 <option value="GOVERNMENT">Government</option>
                 <option value="ORGANIZATION">Organizations</option>
+                <option value="EMBASSIES">Embassies</option>
                 <option value="BANK">Banks</option>
                 <option value="UNIVERSITY">Universities</option>
                 <option value="SCHOOL">Schools</option>
@@ -395,7 +408,6 @@ function ContactsContent() {
                 <option value="INSTITUTION">Institution</option>
               </select>
 
-              {/* Status Filter */}
               <select
                 value={selectedStatus}
                 onChange={(e) => setSelectedStatus(e.target.value)}
@@ -406,7 +418,6 @@ function ContactsContent() {
                 <option value="INACTIVE">Inactive</option>
               </select>
 
-              {/* Advanced Filters Toggle */}
               <button
                 onClick={() => setShowAdvancedFilters(!showAdvancedFilters)}
                 className={`flex items-center gap-2 px-4 py-3 border rounded-lg transition-colors ${
@@ -420,11 +431,9 @@ function ContactsContent() {
               </button>
             </div>
 
-            {/* Advanced Filters */}
             {showAdvancedFilters && (
               <div className="pt-4 border-t border-gray-200">
                 <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
-                  {/* Source Filter */}
                   <div>
                     <label className="block text-sm font-medium text-gray-700 mb-2">Source</label>
                     <select
@@ -444,7 +453,6 @@ function ContactsContent() {
                     </select>
                   </div>
 
-                  {/* Rating Filter */}
                   <div>
                     <label className="block text-sm font-medium text-gray-700 mb-2">Rating</label>
                     <select
@@ -461,7 +469,6 @@ function ContactsContent() {
                     </select>
                   </div>
 
-                  {/* Category Filter */}
                   <div>
                     <label className="block text-sm font-medium text-gray-700 mb-2">Category</label>
                     <select
@@ -476,7 +483,6 @@ function ContactsContent() {
                     </select>
                   </div>
 
-                  {/* Clear Filters */}
                   <div className="flex items-end">
                     <button
                       onClick={() => {
@@ -499,7 +505,6 @@ function ContactsContent() {
           </div>
         </div>
 
-        {/* Contacts Table */}
         <div className="bg-white rounded-xl shadow-sm border border-gray-200 overflow-hidden">
           {loading ? (
             <div className="p-12">
@@ -546,9 +551,9 @@ function ContactsContent() {
                           className="rounded border-gray-300 text-blue-600 focus:ring-blue-500"
                         />
                       </th>
-                      <th className="px-6 py-4 text-right text-xs font-semibold text-gray-700 uppercase">Contact</th>
-                      <th className="px-6 py-4 text-right text-xs font-semibold text-gray-700 uppercase">Contact Info</th>
                       <th className="px-6 py-4 text-right text-xs font-semibold text-gray-700 uppercase">Company</th>
+                      <th className="px-6 py-4 text-right text-xs font-semibold text-gray-700 uppercase">Contact Info</th>
+                      <th className="px-6 py-4 text-right text-xs font-semibold text-gray-700 uppercase">Contact</th>
                       <th className="px-6 py-4 text-right text-xs font-semibold text-gray-700 uppercase">Type</th>
                       <th className="px-6 py-4 text-right text-xs font-semibold text-gray-700 uppercase">Status</th>
                       <th className="px-6 py-4 text-right text-xs font-semibold text-gray-700 uppercase">Actions</th>
@@ -575,17 +580,18 @@ function ContactsContent() {
                               className="rounded border-gray-300 text-blue-600 focus:ring-blue-500"
                             />
                           </td>
+
                           <td className="px-6 py-4">
-                          <div className="flex items-center gap-3">
-                            <div className="h-10 w-10 rounded-full bg-gradient-to-br from-blue-500 to-blue-600 flex items-center justify-center text-white font-bold">
-                              {contact.name.charAt(0)}
-                            </div>
-                            <div>
-                              <p className="font-semibold text-gray-900">{contact.name}</p>
-                              {contact.nameAr && <p className="text-sm text-gray-600">{contact.nameAr}</p>}
-                            </div>
+                            {getListCompanyName(contact) !== '-' && (
+                              <div className="flex items-center gap-2">
+                                <Building2 className="h-4 w-4 text-gray-400" />
+                                <span className="text-sm text-gray-900">
+                                  {getListCompanyName(contact)}
+                                </span>
                               </div>
+                            )}
                           </td>
+
                           <td className="px-6 py-4">
                             <div className="space-y-1">
                               {contact.email && (
@@ -594,28 +600,40 @@ function ContactsContent() {
                                   {contact.email}
                                 </div>
                               )}
-                            {contact.phone && (
+                              {(contact.phone || contact.mobile) && (
                                 <div className="flex items-center gap-2 text-sm text-gray-600">
                                   <Phone className="h-4 w-4" />
-                                {contact.phone}
+                                  {contact.phone || contact.mobile}
                                 </div>
                               )}
                             </div>
                           </td>
+
                         <td className="px-6 py-4">
-                          {contact.companyName && (
-                            <div className="flex items-center gap-2">
-                              <Building2 className="h-4 w-4 text-gray-400" />
-                              <span className="text-sm text-gray-900">{contact.companyName}</span>
+                          <div className="flex items-center gap-3">
+                            <div className="h-10 w-10 rounded-full bg-gradient-to-br from-blue-500 to-blue-600 flex items-center justify-center text-white font-bold">
+                              {getListContactName(contact).charAt(0)}
                             </div>
+                            <div>
+                              <p className="font-semibold text-gray-900">
+                                {getListContactName(contact)}
+                              </p>
+                              {getListContactNameAr(contact) && (
+                                <p className="text-sm text-gray-600">
+                                  {getListContactNameAr(contact)}
+                                </p>
                               )}
+                            </div>
+                          </div>
                         </td>
+
                           <td className="px-6 py-4">
                             <span className={`inline-flex items-center gap-1 px-3 py-1 rounded-full text-xs font-medium ${getTypeColor(contact.type)}`}>
                               <Tag className="h-3 w-3" />
                               {getTypeLabel(contact.type)}
                             </span>
                           </td>
+
                           <td className="px-6 py-4">
                             <span className={`inline-flex items-center px-3 py-1 rounded-full text-xs font-medium ${
                               contact.status === 'ACTIVE'
@@ -625,6 +643,7 @@ function ContactsContent() {
                               {contact.status === 'ACTIVE' ? 'Active' : 'Inactive'}
                             </span>
                           </td>
+
                           <td className="px-6 py-4">
                             <div className="flex items-center gap-2">
                               <Link
@@ -651,12 +670,12 @@ function ContactsContent() {
                             </div>
                           </td>
                         </tr>
-                    )})}
+                      )
+                    })}
                   </tbody>
                 </table>
               </div>
 
-              {/* Pagination */}
               <div className="px-6 py-4 border-t border-gray-200 flex items-center justify-between">
                 <p className="text-sm text-gray-600">
                   Showing <span className="font-semibold">{((currentPage - 1) * pageSize) + 1}</span> to{' '}
@@ -702,7 +721,6 @@ function ContactsContent() {
         </div>
       </main>
 
-      {/* Create Modal */}
       <Modal
         isOpen={showCreateModal}
         onClose={() => {
@@ -713,6 +731,7 @@ function ContactsContent() {
         size="xl"
       >
         <ContactForm
+          key="create-contact"
           onSubmit={async (data) => {
             await handleCreate(data as CreateContactData)
           }}
@@ -724,7 +743,6 @@ function ContactsContent() {
         />
       </Modal>
 
-      {/* Edit Modal */}
       <Modal
         isOpen={showEditModal}
         onClose={() => {
@@ -735,6 +753,7 @@ function ContactsContent() {
         size="xl"
       >
         <ContactForm
+          key={selectedContact?.id || 'edit-contact'}
           contact={selectedContact || undefined}
           onSubmit={async (data) => {
             await handleEdit(data as UpdateContactData)
@@ -747,7 +766,6 @@ function ContactsContent() {
         />
       </Modal>
 
-      {/* Export Modal */}
       {showExportModal && (
         <div className="fixed inset-0 z-50 overflow-y-auto">
           <div className="fixed inset-0 bg-black bg-opacity-50" onClick={() => setShowExportModal(false)} />
@@ -841,7 +859,6 @@ function ContactsContent() {
         </div>
       )}
 
-      {/* Delete Confirmation Dialog */}
       {showDeleteDialog && selectedContact && (
         <div className="fixed inset-0 z-50 overflow-y-auto">
           <div className="fixed inset-0 bg-black bg-opacity-50" onClick={() => setShowDeleteDialog(false)} />
@@ -890,7 +907,6 @@ function ContactsContent() {
         </div>
       )}
 
-      {/* Import Modal */}
       {showImportModal && (
         <ContactImport
           onClose={() => setShowImportModal(false)}

frontend/src/app/hr/page.tsx

@@ -277,7 +277,7 @@ function HRContent() {
     mobile: '',
     dateOfBirth: '',
     gender: '',
-    nationality: 'Saudi Arabia',
+    nationality: 'Syria',
     nationalId: '',
     employmentType: 'FULL_TIME',
     contractType: 'UNLIMITED',

frontend/src/app/tenders/[id]/page.tsx

@@ -10,14 +10,13 @@ import {
   Calendar,
   Building2,
   DollarSign,
-  User,
   History,
   Plus,
   Loader2,
   CheckCircle2,
   Upload,
   ExternalLink,
-  AlertCircle,
+  MapPin,
 } from 'lucide-react'
 import ProtectedRoute from '@/components/ProtectedRoute'
 import LoadingSpinner from '@/components/LoadingSpinner'
@@ -51,8 +50,16 @@ function TenderDetailContent() {
   const [employees, setEmployees] = useState<any[]>([])
   const [contacts, setContacts] = useState<any[]>([])
   const [pipelines, setPipelines] = useState<any[]>([])
-  const [directiveForm, setDirectiveForm] = useState<CreateDirectiveData>({ type: 'BUY_TERMS', assignedToEmployeeId: '', notes: '' })
-  const [convertForm, setConvertForm] = useState({ contactId: '', pipelineId: '', ownerId: '' })
+  const [directiveForm, setDirectiveForm] = useState<CreateDirectiveData>({
+    type: 'BUY_TERMS',
+    assignedToEmployeeId: '',
+    notes: '',
+  })
+  const [convertForm, setConvertForm] = useState({
+    contactId: '',
+    pipelineId: '',
+    ownerId: '',
+  })
   const [completeNotes, setCompleteNotes] = useState('')
   const [directiveTypeValues, setDirectiveTypeValues] = useState<string[]>([])
   const [submitting, setSubmitting] = useState(false)
@@ -93,10 +100,17 @@ function TenderDetailContent() {
 
   useEffect(() => {
     if (showDirectiveModal || showConvertModal) {
-      employeesAPI.getAll({ status: 'ACTIVE', pageSize: 500 }).then((r: any) => setEmployees(r.employees || [])).catch(() => {})
+      employeesAPI
+        .getAll({ status: 'ACTIVE', pageSize: 500 })
+        .then((r: any) => setEmployees(r.employees || []))
+        .catch(() => {})
     }
+
     if (showConvertModal) {
-      contactsAPI.getAll({ pageSize: 500 }).then((r: any) => setContacts(r.contacts || [])).catch(() => {})
+      contactsAPI
+        .getAll({ pageSize: 500 })
+        .then((r: any) => setContacts(r.contacts || []))
+        .catch(() => {})
       pipelinesAPI.getAll().then(setPipelines).catch(() => {})
     }
   }, [showDirectiveModal, showConvertModal])
@@ -107,6 +121,7 @@ function TenderDetailContent() {
       toast.error(t('tenders.assignee') + ' ' + t('common.required'))
       return
     }
+
     setSubmitting(true)
     try {
       await tendersAPI.createDirective(tenderId, directiveForm)
@@ -124,9 +139,13 @@ function TenderDetailContent() {
   const handleCompleteDirective = async (e: React.FormEvent) => {
     e.preventDefault()
     if (!showCompleteModal) return
+
     setSubmitting(true)
     try {
-      await tendersAPI.updateDirective(showCompleteModal.id, { status: 'COMPLETED', completionNotes: completeNotes })
+      await tendersAPI.updateDirective(showCompleteModal.id, {
+        status: 'COMPLETED',
+        completionNotes: completeNotes,
+      })
       toast.success('Task completed')
       setShowCompleteModal(null)
       setCompleteNotes('')
@@ -144,6 +163,7 @@ function TenderDetailContent() {
       toast.error('Contact and Pipeline are required')
       return
     }
+
     setSubmitting(true)
     try {
       const deal = await tendersAPI.convertToDeal(tenderId, convertForm)
@@ -160,6 +180,7 @@ function TenderDetailContent() {
   const handleTenderFileUpload = async (e: React.ChangeEvent<HTMLInputElement>) => {
     const file = e.target.files?.[0]
     if (!file) return
+
     setSubmitting(true)
     try {
       await tendersAPI.uploadTenderAttachment(tenderId, file)
@@ -183,7 +204,9 @@ function TenderDetailContent() {
     const directiveId = directiveIdForUpload
     e.target.value = ''
     setDirectiveIdForUpload(null)
+
     if (!file || !directiveId) return
+
     setUploadingDirectiveId(directiveId)
     try {
       await tendersAPI.uploadDirectiveAttachment(directiveId, file)
@@ -220,10 +243,13 @@ function TenderDetailContent() {
               <ArrowLeft className="h-5 w-5" />
             </Link>
             <div>
-              <h1 className="text-2xl font-bold text-gray-900">{tender.tenderNumber} – {tender.title}</h1>
+              <h1 className="text-2xl font-bold text-gray-900">
+                {tender.tenderNumber} – {tender.title}
+              </h1>
               <p className="text-sm text-gray-600">{tender.issuingBodyName}</p>
             </div>
           </div>
+
           {tender.status === 'ACTIVE' && (
             <button
               onClick={() => setShowConvertModal(true)}
@@ -242,7 +268,9 @@ function TenderDetailContent() {
                 key={tab.id}
                 onClick={() => setActiveTab(tab.id as any)}
                 className={`flex items-center gap-2 px-4 py-2 rounded-lg text-sm font-medium ${
-                  activeTab === tab.id ? 'bg-indigo-100 text-indigo-800' : 'text-gray-600 hover:bg-gray-100'
+                  activeTab === tab.id
+                    ? 'bg-indigo-100 text-indigo-800'
+                    : 'text-gray-600 hover:bg-gray-100'
                 }`}
               >
                 <tab.icon className="h-4 w-4" />
@@ -262,6 +290,7 @@ function TenderDetailContent() {
                       <p>{tender.announcementDate?.split('T')[0]}</p>
                     </div>
                   </div>
+
                   <div className="flex items-start gap-2">
                     <Calendar className="h-5 w-5 text-gray-400 mt-0.5" />
                     <div>
@@ -269,6 +298,7 @@ function TenderDetailContent() {
                       <p>{tender.closingDate?.split('T')[0]}</p>
                     </div>
                   </div>
+
                   <div className="flex items-start gap-2">
                     <DollarSign className="h-5 w-5 text-gray-400 mt-0.5" />
                     <div>
@@ -276,21 +306,71 @@ function TenderDetailContent() {
                       <p>{Number(tender.termsValue)} SAR</p>
                     </div>
                   </div>
+
                   <div className="flex items-start gap-2">
                     <DollarSign className="h-5 w-5 text-gray-400 mt-0.5" />
                     <div>
-                      <p className="text-xs text-gray-500">{t('tenders.bondValue')}</p>
-                      <p>{Number(tender.bondValue)} SAR</p>
+                      <p className="text-xs text-gray-500">التأمينات الأولية</p>
+                      <p>{Number(tender.initialBondValue || tender.bondValue || 0)} SAR</p>
+                    </div>
+                  </div>
+
+                  <div className="flex items-start gap-2">
+                    <DollarSign className="h-5 w-5 text-gray-400 mt-0.5" />
+                    <div>
+                      <p className="text-xs text-gray-500">التأمينات النهائية</p>
+                      <p>{Number(tender.finalBondValue || 0)} SAR</p>
+                    </div>
+                  </div>
+
+                  <div className="flex items-start gap-2">
+                    <Calendar className="h-5 w-5 text-gray-400 mt-0.5" />
+                    <div>
+                      <p className="text-xs text-gray-500">زمن الاسترجاع</p>
+                      <p>{tender.finalBondRefundPeriod || '-'}</p>
+                    </div>
+                  </div>
+
+                  <div className="flex items-start gap-2">
+                    <Calendar className="h-5 w-5 text-gray-400 mt-0.5" />
+                    <div>
+                      <p className="text-xs text-gray-500">زيارة الموقع</p>
+                      <p>{tender.siteVisitRequired ? 'إجبارية' : 'غير إجبارية'}</p>
+                    </div>
+                  </div>
+
+                  {tender.siteVisitRequired && (
+                    <div className="flex items-start gap-2">
+                      <MapPin className="h-5 w-5 text-gray-400 mt-0.5" />
+                      <div>
+                        <p className="text-xs text-gray-500">مكان الزيارة</p>
+                        <p>{tender.siteVisitLocation || '-'}</p>
+                      </div>
+                    </div>
+                  )}
+
+                  <div className="flex items-start gap-2">
+                    <MapPin className="h-5 w-5 text-gray-400 mt-0.5" />
+                    <div>
+                      <p className="text-xs text-gray-500">مكان استلام دفتر الشروط</p>
+                      <p>{tender.termsPickupProvince || '-'}</p>
                     </div>
                   </div>
                 </div>
+
                 {tender.announcementLink && (
                   <p>
-                    <a href={tender.announcementLink} target="_blank" rel="noopener noreferrer" className="text-indigo-600 hover:underline">
+                    <a
+                      href={tender.announcementLink}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      className="text-indigo-600 hover:underline"
+                    >
                       {t('tenders.announcementLink')}
                     </a>
                   </p>
                 )}
+
                 {tender.notes && (
                   <div>
                     <p className="text-xs text-gray-500">{t('common.notes')}</p>
@@ -312,19 +392,29 @@ function TenderDetailContent() {
                     {t('tenders.addDirective')}
                   </button>
                 </div>
+
                 {!tender.directives?.length ? (
                   <p className="text-gray-500">{t('common.noData')}</p>
                 ) : (
                   <ul className="space-y-3">
                     {tender.directives.map((d) => (
-                      <li key={d.id} className="border rounded-lg p-4 flex flex-wrap items-center justify-between gap-2">
+                      <li
+                        key={d.id}
+                        className="border rounded-lg p-4 flex flex-wrap items-center justify-between gap-2"
+                      >
                         <div>
                           <p className="font-medium">{DIRECTIVE_TYPE_LABELS[d.type] || d.type}</p>
                           <p className="text-sm text-gray-600">
-                            {d.assignedToEmployee ? `${d.assignedToEmployee.firstName} ${d.assignedToEmployee.lastName}` : ''} · {d.status}
+                            {d.assignedToEmployee
+                              ? `${d.assignedToEmployee.firstName} ${d.assignedToEmployee.lastName}`
+                              : ''}{' '}
+                            · {d.status}
                           </p>
-                          {d.completionNotes && <p className="text-sm mt-1">{d.completionNotes}</p>}
+                          {d.completionNotes && (
+                            <p className="text-sm mt-1">{d.completionNotes}</p>
+                          )}
                         </div>
+
                         <div className="flex items-center gap-2">
                           {d.status !== 'COMPLETED' && d.assignedToEmployee?.user?.id && (
                             <button
@@ -334,19 +424,25 @@ function TenderDetailContent() {
                               {t('tenders.completeTask')}
                             </button>
                           )}
+
                           <input
                             type="file"
                             ref={directiveFileInputRef}
                             className="hidden"
                             onChange={handleDirectiveFileUpload}
                           />
+
                           <button
                             type="button"
                             onClick={() => handleDirectiveFileSelect(d.id)}
                             disabled={uploadingDirectiveId === d.id}
                             className="text-sm text-indigo-600 hover:underline flex items-center gap-1"
                           >
-                            {uploadingDirectiveId === d.id ? <Loader2 className="h-4 w-4 animate-spin" /> : <Upload className="h-4 w-4" />}
+                            {uploadingDirectiveId === d.id ? (
+                              <Loader2 className="h-4 w-4 animate-spin" />
+                            ) : (
+                              <Upload className="h-4 w-4" />
+                            )}
                             {t('tenders.uploadFile')}
                           </button>
                         </div>
@@ -371,17 +467,49 @@ function TenderDetailContent() {
                     disabled={submitting}
                     className="flex items-center gap-2 px-4 py-2 bg-indigo-600 text-white rounded-lg hover:bg-indigo-700 disabled:opacity-50"
                   >
-                    {submitting ? <Loader2 className="h-4 w-4 animate-spin" /> : <Upload className="h-4 w-4" />}
+                    {submitting ? (
+                      <Loader2 className="h-4 w-4 animate-spin" />
+                    ) : (
+                      <Upload className="h-4 w-4" />
+                    )}
                     {t('tenders.uploadFile')}
                   </button>
                 </div>
+
                 {!tender.attachments?.length ? (
                   <p className="text-gray-500">{t('common.noData')}</p>
                 ) : (
                   <ul className="space-y-2">
                     {tender.attachments.map((a: any) => (
-                      <li key={a.id} className="text-sm text-gray-700">
+                      <li
+                        key={a.id}
+                        className="flex items-center justify-between border rounded px-3 py-2"
+                      >
+                        <a
+                          href={`${process.env.NEXT_PUBLIC_API_URL}/tenders/attachments/${a.id}/view`}
+                          target="_blank"
+                          rel="noopener noreferrer"
+                          className="text-sm text-indigo-600 hover:underline flex items-center gap-1"
+                        >
+                          <ExternalLink className="h-4 w-4" />
                           {a.originalName || a.fileName}
+                        </a>
+
+                        <button
+                          onClick={async () => {
+                            if (!confirm('حذف الملف؟')) return
+                            try {
+                              await tendersAPI.deleteAttachment(a.id)
+                              toast.success('تم الحذف')
+                              fetchTender()
+                            } catch {
+                              toast.error('فشل الحذف')
+                            }
+                          }}
+                          className="text-red-600 text-sm hover:underline"
+                        >
+                          حذف
+                        </button>
                       </li>
                     ))}
                   </ul>
@@ -397,7 +525,8 @@ function TenderDetailContent() {
                   <ul className="space-y-2">
                     {history.map((h: any) => (
                       <li key={h.id} className="text-sm border-b border-gray-100 pb-2">
-                        <span className="font-medium">{h.action}</span> · {h.user?.username} · {h.createdAt?.split('T')[0]}
+                        <span className="font-medium">{h.action}</span> · {h.user?.username} ·{' '}
+                        {h.createdAt?.split('T')[0]}
                       </li>
                     ))}
                   </ul>
@@ -408,36 +537,54 @@ function TenderDetailContent() {
         </div>
       </div>
 
-      <Modal isOpen={showDirectiveModal} onClose={() => setShowDirectiveModal(false)} title={t('tenders.addDirective')}>
+      <Modal
+        isOpen={showDirectiveModal}
+        onClose={() => setShowDirectiveModal(false)}
+        title={t('tenders.addDirective')}
+      >
         <form onSubmit={handleAddDirective} className="space-y-4">
           <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.directiveType')}</label>
+            <label className="block text-sm font-medium text-gray-700 mb-1">
+              {t('tenders.directiveType')}
+            </label>
             <select
               value={directiveForm.type}
               onChange={(e) => setDirectiveForm({ ...directiveForm, type: e.target.value })}
               className="w-full px-3 py-2 border rounded-lg"
             >
               {directiveTypeValues.map((v) => (
-                <option key={v} value={v}>{DIRECTIVE_TYPE_LABELS[v] || v}</option>
+                <option key={v} value={v}>
+                  {DIRECTIVE_TYPE_LABELS[v] || v}
+                </option>
               ))}
             </select>
           </div>
+
           <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.assignee')} *</label>
+            <label className="block text-sm font-medium text-gray-700 mb-1">
+              {t('tenders.assignee')} *
+            </label>
             <select
               value={directiveForm.assignedToEmployeeId}
-              onChange={(e) => setDirectiveForm({ ...directiveForm, assignedToEmployeeId: e.target.value })}
+              onChange={(e) =>
+                setDirectiveForm({ ...directiveForm, assignedToEmployeeId: e.target.value })
+              }
               className="w-full px-3 py-2 border rounded-lg"
               required
             >
               <option value="">Select employee</option>
               {employees.map((emp) => (
-                <option key={emp.id} value={emp.id}>{emp.firstName} {emp.lastName}</option>
+                <option key={emp.id} value={emp.id}>
+                  {emp.firstName} {emp.lastName}
+                </option>
               ))}
             </select>
           </div>
+
           <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">{t('common.notes')}</label>
+            <label className="block text-sm font-medium text-gray-700 mb-1">
+              {t('common.notes')}
+            </label>
             <textarea
               value={directiveForm.notes || ''}
               onChange={(e) => setDirectiveForm({ ...directiveForm, notes: e.target.value })}
@@ -445,9 +592,20 @@ function TenderDetailContent() {
               rows={2}
             />
           </div>
+
           <div className="flex justify-end gap-2">
-            <button type="button" onClick={() => setShowDirectiveModal(false)} className="px-4 py-2 border rounded-lg">{t('common.cancel')}</button>
-            <button type="submit" disabled={submitting} className="px-4 py-2 bg-indigo-600 text-white rounded-lg disabled:opacity-50 flex items-center gap-2">
+            <button
+              type="button"
+              onClick={() => setShowDirectiveModal(false)}
+              className="px-4 py-2 border rounded-lg"
+            >
+              {t('common.cancel')}
+            </button>
+            <button
+              type="submit"
+              disabled={submitting}
+              className="px-4 py-2 bg-indigo-600 text-white rounded-lg disabled:opacity-50 flex items-center gap-2"
+            >
               {submitting && <Loader2 className="h-4 w-4 animate-spin" />}
               {t('common.save')}
             </button>
@@ -455,10 +613,16 @@ function TenderDetailContent() {
         </form>
       </Modal>
 
-      <Modal isOpen={!!showCompleteModal} onClose={() => setShowCompleteModal(null)} title={t('tenders.completeTask')}>
+      <Modal
+        isOpen={!!showCompleteModal}
+        onClose={() => setShowCompleteModal(null)}
+        title={t('tenders.completeTask')}
+      >
         <form onSubmit={handleCompleteDirective} className="space-y-4">
           <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.completionNotes')}</label>
+            <label className="block text-sm font-medium text-gray-700 mb-1">
+              {t('tenders.completionNotes')}
+            </label>
             <textarea
               value={completeNotes}
               onChange={(e) => setCompleteNotes(e.target.value)}
@@ -466,9 +630,20 @@ function TenderDetailContent() {
               rows={3}
             />
           </div>
+
           <div className="flex justify-end gap-2">
-            <button type="button" onClick={() => setShowCompleteModal(null)} className="px-4 py-2 border rounded-lg">{t('common.cancel')}</button>
-            <button type="submit" disabled={submitting} className="px-4 py-2 bg-green-600 text-white rounded-lg disabled:opacity-50 flex items-center gap-2">
+            <button
+              type="button"
+              onClick={() => setShowCompleteModal(null)}
+              className="px-4 py-2 border rounded-lg"
+            >
+              {t('common.cancel')}
+            </button>
+            <button
+              type="submit"
+              disabled={submitting}
+              className="px-4 py-2 bg-green-600 text-white rounded-lg disabled:opacity-50 flex items-center gap-2"
+            >
               {submitting && <Loader2 className="h-4 w-4 animate-spin" />}
               {t('common.save')}
             </button>
@@ -476,7 +651,11 @@ function TenderDetailContent() {
         </form>
       </Modal>
 
-      <Modal isOpen={showConvertModal} onClose={() => setShowConvertModal(false)} title={t('tenders.convertToDeal')}>
+      <Modal
+        isOpen={showConvertModal}
+        onClose={() => setShowConvertModal(false)}
+        title={t('tenders.convertToDeal')}
+      >
         <form onSubmit={handleConvertToDeal} className="space-y-4">
           <div>
             <label className="block text-sm font-medium text-gray-700 mb-1">Contact *</label>
@@ -488,10 +667,13 @@ function TenderDetailContent() {
             >
               <option value="">Select contact</option>
               {contacts.map((c) => (
-                <option key={c.id} value={c.id}>{c.name}</option>
+                <option key={c.id} value={c.id}>
+                  {c.name}
+                </option>
               ))}
             </select>
           </div>
+
           <div>
             <label className="block text-sm font-medium text-gray-700 mb-1">Pipeline *</label>
             <select
@@ -502,13 +684,26 @@ function TenderDetailContent() {
             >
               <option value="">Select pipeline</option>
               {pipelines.map((p) => (
-                <option key={p.id} value={p.id}>{p.name}</option>
+                <option key={p.id} value={p.id}>
+                  {p.name}
+                </option>
               ))}
             </select>
           </div>
+
           <div className="flex justify-end gap-2">
-            <button type="button" onClick={() => setShowConvertModal(false)} className="px-4 py-2 border rounded-lg">{t('common.cancel')}</button>
-            <button type="submit" disabled={submitting} className="px-4 py-2 bg-green-600 text-white rounded-lg disabled:opacity-50 flex items-center gap-2">
+            <button
+              type="button"
+              onClick={() => setShowConvertModal(false)}
+              className="px-4 py-2 border rounded-lg"
+            >
+              {t('common.cancel')}
+            </button>
+            <button
+              type="submit"
+              disabled={submitting}
+              className="px-4 py-2 bg-green-600 text-white rounded-lg disabled:opacity-50 flex items-center gap-2"
+            >
               {submitting && <Loader2 className="h-4 w-4 animate-spin" />}
               {t('tenders.convertToDeal')}
             </button>

frontend/src/app/tenders/page.tsx

@@ -10,9 +10,6 @@ import {
   FileText,
   Plus,
   Search,
-  Calendar,
-  Building2,
-  DollarSign,
   AlertCircle,
   ArrowLeft,
   Eye,
@@ -32,6 +29,23 @@ const SOURCE_LABELS: Record<string, string> = {
   MANUAL: 'Manual entry',
 }
 
+const SYRIA_PROVINCES = [
+  'دمشق',
+  'ريف دمشق',
+  'حلب',
+  'حمص',
+  'حماة',
+  'اللاذقية',
+  'طرطوس',
+  'إدلب',
+  'درعا',
+  'السويداء',
+  'القنيطرة',
+  'دير الزور',
+  'الرقة',
+  'الحسكة',
+]
+
 const ANNOUNCEMENT_LABELS: Record<string, string> = {
   FIRST: 'First announcement',
   RE_ANNOUNCEMENT_2: 'Re-announcement 2nd',
@@ -39,6 +53,27 @@ const ANNOUNCEMENT_LABELS: Record<string, string> = {
   RE_ANNOUNCEMENT_4: 'Re-announcement 4th',
 }
 
+const getInitialFormData = (): CreateTenderData => ({
+  tenderNumber: '',
+  issuingBodyName: '',
+  title: '',
+  termsValue: 0,
+  bondValue: 0,
+
+  initialBondValue: 0,
+  finalBondValue: 0,
+  finalBondRefundPeriod: '',
+  siteVisitRequired: false,
+  siteVisitLocation: '',
+  termsPickupProvince: '',
+
+  announcementDate: '',
+  closingDate: '',
+  source: 'MANUAL',
+  announcementType: 'FIRST',
+  notes: '',
+})
+
 function TendersContent() {
   const { t } = useLanguage()
   const [tenders, setTenders] = useState<Tender[]>([])
@@ -50,17 +85,8 @@ function TendersContent() {
   const [searchTerm, setSearchTerm] = useState('')
   const [selectedStatus, setSelectedStatus] = useState('all')
   const [showCreateModal, setShowCreateModal] = useState(false)
-  const [formData, setFormData] = useState<CreateTenderData>({
-    tenderNumber: '',
-    issuingBodyName: '',
-    title: '',
-    termsValue: 0,
-    bondValue: 0,
-    announcementDate: '',
-    closingDate: '',
-    source: 'MANUAL',
-    announcementType: 'FIRST',
-  })
+
+  const [formData, setFormData] = useState<CreateTenderData>(getInitialFormData())
   const [formErrors, setFormErrors] = useState<Record<string, string>>({})
   const [submitting, setSubmitting] = useState(false)
   const [possibleDuplicates, setPossibleDuplicates] = useState<Tender[]>([])
@@ -68,12 +94,20 @@ function TendersContent() {
   const [sourceValues, setSourceValues] = useState<string[]>([])
   const [announcementTypeValues, setAnnouncementTypeValues] = useState<string[]>([])
 
+  const resetForm = () => {
+    setFormData(getInitialFormData())
+    setFormErrors({})
+    setPossibleDuplicates([])
+    setShowDuplicateWarning(false)
+  }
+
   const fetchTenders = useCallback(async () => {
     setLoading(true)
     try {
       const filters: TenderFilters = { page: currentPage, pageSize }
       if (searchTerm) filters.search = searchTerm
       if (selectedStatus !== 'all') filters.status = selectedStatus
+
       const data = await tendersAPI.getAll(filters)
       setTenders(data.tenders)
       setTotal(data.total)
@@ -96,24 +130,39 @@ function TendersContent() {
 
   const handleCreate = async (e: React.FormEvent) => {
     e.preventDefault()
+
     const errors: Record<string, string> = {}
+
     if (!formData.tenderNumber?.trim()) errors.tenderNumber = t('common.required')
     if (!formData.issuingBodyName?.trim()) errors.issuingBodyName = t('common.required')
     if (!formData.title?.trim()) errors.title = t('common.required')
     if (!formData.announcementDate) errors.announcementDate = t('common.required')
     if (!formData.closingDate) errors.closingDate = t('common.required')
-    //if (Number(formData.termsValue) < 0) errors.termsValue = t('common.required')
-    if (Number(formData.bondValue) < 0) errors.bondValue = t('common.required')
+
+    if (Number(formData.initialBondValue || 0) < 0) {
+      errors.initialBondValue = t('common.required')
+    }
+
+    if (formData.siteVisitRequired && !formData.siteVisitLocation?.trim()) {
+      errors.siteVisitLocation = t('common.required')
+    }
+
     setFormErrors(errors)
     if (Object.keys(errors).length > 0) return
 
     setSubmitting(true)
     try {
-      const result = await tendersAPI.create(formData)
+      const result = await tendersAPI.create({
+        ...formData,
+        bondValue: Number(formData.initialBondValue ?? formData.bondValue ?? 0),
+      })
+
       if (result.possibleDuplicates && result.possibleDuplicates.length > 0) {
         setPossibleDuplicates(result.possibleDuplicates)
         setShowDuplicateWarning(true)
-        toast(t('tenders.duplicateWarning') || 'Possible duplicates found. Please review.', { icon: '⚠️' })
+        toast(t('tenders.duplicateWarning') || 'Possible duplicates found. Please review.', {
+          icon: '⚠️',
+        })
       } else {
         toast.success(t('tenders.createSuccess') || 'Tender created successfully')
         setShowCreateModal(false)
@@ -127,23 +176,6 @@ function TendersContent() {
     }
   }
 
-  const resetForm = () => {
-    setFormData({
-      tenderNumber: '',
-      issuingBodyName: '',
-      title: '',
-      termsValue: 0,
-      bondValue: 0,
-      announcementDate: '',
-      closingDate: '',
-      source: 'MANUAL',
-      announcementType: 'FIRST',
-    })
-    setFormErrors({})
-    setPossibleDuplicates([])
-    setShowDuplicateWarning(false)
-  }
-
   return (
     <div className="min-h-screen bg-gray-50">
       <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
@@ -155,16 +187,25 @@ function TendersContent() {
             >
               <ArrowLeft className="h-5 w-5" />
             </Link>
+
             <div className="flex items-center gap-2">
               <FileText className="h-8 w-8 text-indigo-600" />
               <div>
-                <h1 className="text-2xl font-bold text-gray-900">{t('nav.tenders') || 'Tenders'}</h1>
-                <p className="text-sm text-gray-600">{t('tenders.subtitle') || 'Tender Management'}</p>
+                <h1 className="text-2xl font-bold text-gray-900">
+                  {t('nav.tenders') || 'Tenders'}
+                </h1>
+                <p className="text-sm text-gray-600">
+                  {t('tenders.subtitle') || 'Tender Management'}
+                </p>
               </div>
             </div>
           </div>
+
           <button
-            onClick={() => { setShowCreateModal(true); resetForm(); }}
+            onClick={() => {
+              resetForm()
+              setShowCreateModal(true)
+            }}
             className="flex items-center gap-2 px-4 py-2 bg-indigo-600 text-white rounded-lg hover:bg-indigo-700"
           >
             <Plus className="h-5 w-5" />
@@ -184,6 +225,7 @@ function TendersContent() {
                 className="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500"
               />
             </div>
+
             <select
               value={selectedStatus}
               onChange={(e) => setSelectedStatus(e.target.value)}
@@ -209,26 +251,52 @@ function TendersContent() {
               <table className="min-w-full divide-y divide-gray-200">
                 <thead className="bg-gray-50">
                   <tr>
-                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">{t('tenders.tenderNumber') || 'Number'}</th>
-                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">{t('tenders.title') || 'Title'}</th>
-                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">{t('tenders.issuingBody') || 'Issuing body'}</th>
-                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">{t('tenders.closingDate') || 'Closing date'}</th>
-                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">{t('common.status')}</th>
-                    <th className="px-4 py-3 text-right text-xs font-medium text-gray-500 uppercase">{t('common.actions')}</th>
+                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">
+                      {t('tenders.tenderNumber') || 'Number'}
+                    </th>
+                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">
+                      {t('tenders.title') || 'Title'}
+                    </th>
+                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">
+                      {t('tenders.issuingBody') || 'Issuing body'}
+                    </th>
+                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">
+                      {t('tenders.closingDate') || 'Closing date'}
+                    </th>
+                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">
+                      {t('common.status')}
+                    </th>
+                    <th className="px-4 py-3 text-right text-xs font-medium text-gray-500 uppercase">
+                      {t('common.actions')}
+                    </th>
                   </tr>
                 </thead>
+
                 <tbody className="bg-white divide-y divide-gray-200">
                   {tenders.map((tender) => (
                     <tr key={tender.id} className="hover:bg-gray-50">
-                      <td className="px-4 py-3 text-sm font-medium text-gray-900">{tender.tenderNumber}</td>
-                      <td className="px-4 py-3 text-sm text-gray-900">{tender.title}</td>
-                      <td className="px-4 py-3 text-sm text-gray-600">{tender.issuingBodyName}</td>
-                      <td className="px-4 py-3 text-sm text-gray-600">{tender.closingDate?.split('T')[0]}</td>
+                      <td className="px-4 py-3 text-sm font-medium text-gray-900">
+                        {tender.tenderNumber}
+                      </td>
+                      <td className="px-4 py-3 text-sm text-gray-900">
+                        {tender.title}
+                      </td>
+                      <td className="px-4 py-3 text-sm text-gray-600">
+                        {tender.issuingBodyName}
+                      </td>
+                      <td className="px-4 py-3 text-sm text-gray-600">
+                        {tender.closingDate?.split('T')[0]}
+                      </td>
                       <td className="px-4 py-3">
-                        <span className={`px-2 py-1 text-xs rounded-full ${
-                          tender.status === 'ACTIVE' ? 'bg-green-100 text-green-800' :
-                          tender.status === 'CONVERTED_TO_DEAL' ? 'bg-blue-100 text-blue-800' : 'bg-gray-100 text-gray-800'
-                        }`}>
+                        <span
+                          className={`px-2 py-1 text-xs rounded-full ${
+                            tender.status === 'ACTIVE'
+                              ? 'bg-green-100 text-green-800'
+                              : tender.status === 'CONVERTED_TO_DEAL'
+                                ? 'bg-blue-100 text-blue-800'
+                                : 'bg-gray-100 text-gray-800'
+                          }`}
+                        >
                           {tender.status}
                         </span>
                       </td>
@@ -251,7 +319,8 @@ function TendersContent() {
           {totalPages > 1 && (
             <div className="px-4 py-3 border-t border-gray-200 flex items-center justify-between">
               <p className="text-sm text-gray-600">
-                {t('common.showing') || 'Showing'} {(currentPage - 1) * pageSize + 1}–{Math.min(currentPage * pageSize, total)} {t('common.of') || 'of'} {total}
+                {t('common.showing') || 'Showing'} {(currentPage - 1) * pageSize + 1}–
+                {Math.min(currentPage * pageSize, total)} {t('common.of') || 'of'} {total}
               </p>
               <div className="flex gap-2">
                 <button
@@ -276,113 +345,259 @@ function TendersContent() {
 
       <Modal
         isOpen={showCreateModal}
-        onClose={() => { setShowCreateModal(false); setShowDuplicateWarning(false); resetForm(); }}
+        onClose={() => {
+          setShowCreateModal(false)
+          resetForm()
+        }}
         title={t('tenders.addTender') || 'Add Tender'}
       >
         <form onSubmit={handleCreate} className="space-y-4">
           <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
             <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.tenderNumber')} *</label>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                {t('tenders.tenderNumber')} *
+              </label>
               <input
                 type="text"
                 value={formData.tenderNumber}
                 onChange={(e) => setFormData({ ...formData, tenderNumber: e.target.value })}
                 className="w-full px-3 py-2 border rounded-lg"
               />
-              {formErrors.tenderNumber && <p className="text-red-500 text-xs mt-1">{formErrors.tenderNumber}</p>}
+              {formErrors.tenderNumber && (
+                <p className="text-red-500 text-xs mt-1">{formErrors.tenderNumber}</p>
+              )}
             </div>
+
             <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.issuingBody')} *</label>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                {t('tenders.issuingBody')} *
+              </label>
               <input
                 type="text"
                 value={formData.issuingBodyName}
                 onChange={(e) => setFormData({ ...formData, issuingBodyName: e.target.value })}
                 className="w-full px-3 py-2 border rounded-lg"
               />
-              {formErrors.issuingBodyName && <p className="text-red-500 text-xs mt-1">{formErrors.issuingBodyName}</p>}
+              {formErrors.issuingBodyName && (
+                <p className="text-red-500 text-xs mt-1">{formErrors.issuingBodyName}</p>
+              )}
             </div>
           </div>
+
           <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.titleLabel')} *</label>
+            <label className="block text-sm font-medium text-gray-700 mb-1">
+              {t('tenders.titleLabel')} *
+            </label>
             <input
               type="text"
               value={formData.title}
               onChange={(e) => setFormData({ ...formData, title: e.target.value })}
               className="w-full px-3 py-2 border rounded-lg"
             />
-            {formErrors.title && <p className="text-red-500 text-xs mt-1">{formErrors.title}</p>}
+            {formErrors.title && (
+              <p className="text-red-500 text-xs mt-1">{formErrors.title}</p>
+            )}
           </div>
+
           <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
             <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.termsValue')} *</label>
-              <input
-                type="number"
-                value={formData.termsValue || ''}
-                onChange={(e) => setFormData({ ...formData, termsValue: Number(e.target.value) || 0 })}
-                className="w-full px-3 py-2 border rounded-lg"
-              />
-            </div>
-            <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.bondValue')} *</label>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                قيمة دفتر الشروط *
+              </label>
               <input
                 type="number"
                 min={0}
-                value={formData.bondValue || ''}
-                onChange={(e) => setFormData({ ...formData, bondValue: Number(e.target.value) || 0 })}
+                value={formData.termsValue || ''}
+                onChange={(e) =>
+                  setFormData({ ...formData, termsValue: Number(e.target.value) || 0 })
+                }
+                className="w-full px-3 py-2 border rounded-lg"
+              />
+            </div>
+
+            <div>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                قيمة التأمينات الأولية *
+              </label>
+              <input
+                type="number"
+                min={0}
+                value={formData.initialBondValue || ''}
+                onChange={(e) =>
+                  setFormData({
+                    ...formData,
+                    initialBondValue: Number(e.target.value) || 0,
+                    bondValue: Number(e.target.value) || 0,
+                  })
+                }
+                className="w-full px-3 py-2 border rounded-lg"
+              />
+              {formErrors.initialBondValue && (
+                <p className="text-red-500 text-xs mt-1">{formErrors.initialBondValue}</p>
+              )}
+            </div>
+
+            <div>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                قيمة التأمينات النهائية
+              </label>
+              <input
+                type="number"
+                min={0}
+                value={formData.finalBondValue || ''}
+                onChange={(e) =>
+                  setFormData({ ...formData, finalBondValue: Number(e.target.value) || 0 })
+                }
+                className="w-full px-3 py-2 border rounded-lg"
+              />
+            </div>
+
+            <div>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                زمن الاسترجاع
+              </label>
+              <input
+                type="text"
+                value={formData.finalBondRefundPeriod || ''}
+                onChange={(e) =>
+                  setFormData({ ...formData, finalBondRefundPeriod: e.target.value })
+                }
+                placeholder="مثال: بعد 90 يوم من التسليم النهائي"
                 className="w-full px-3 py-2 border rounded-lg"
               />
             </div>
           </div>
+
           <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
             <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.announcementDate')} *</label>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                {t('tenders.announcementDate')} *
+              </label>
               <input
                 type="date"
                 value={formData.announcementDate}
                 onChange={(e) => setFormData({ ...formData, announcementDate: e.target.value })}
                 className="w-full px-3 py-2 border rounded-lg"
               />
-              {formErrors.announcementDate && <p className="text-red-500 text-xs mt-1">{formErrors.announcementDate}</p>}
+              {formErrors.announcementDate && (
+                <p className="text-red-500 text-xs mt-1">{formErrors.announcementDate}</p>
+              )}
             </div>
+
             <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.closingDate')} *</label>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                {t('tenders.closingDate')} *
+              </label>
               <input
                 type="date"
                 value={formData.closingDate}
                 onChange={(e) => setFormData({ ...formData, closingDate: e.target.value })}
                 className="w-full px-3 py-2 border rounded-lg"
               />
-              {formErrors.closingDate && <p className="text-red-500 text-xs mt-1">{formErrors.closingDate}</p>}
+              {formErrors.closingDate && (
+                <p className="text-red-500 text-xs mt-1">{formErrors.closingDate}</p>
+              )}
             </div>
           </div>
+
           <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
             <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.source')}</label>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                {t('tenders.source')}
+              </label>
               <select
                 value={formData.source}
                 onChange={(e) => setFormData({ ...formData, source: e.target.value })}
                 className="w-full px-3 py-2 border rounded-lg"
               >
                 {sourceValues.map((s) => (
-                  <option key={s} value={s}>{SOURCE_LABELS[s] || s}</option>
+                  <option key={s} value={s}>
+                    {SOURCE_LABELS[s] || s}
+                  </option>
                 ))}
               </select>
             </div>
+
             <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.announcementType')}</label>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                {t('tenders.announcementType')}
+              </label>
               <select
                 value={formData.announcementType}
                 onChange={(e) => setFormData({ ...formData, announcementType: e.target.value })}
                 className="w-full px-3 py-2 border rounded-lg"
               >
                 {announcementTypeValues.map((a) => (
-                  <option key={a} value={a}>{ANNOUNCEMENT_LABELS[a] || a}</option>
+                  <option key={a} value={a}>
+                    {ANNOUNCEMENT_LABELS[a] || a}
+                  </option>
                 ))}
               </select>
             </div>
           </div>
+
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
             <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.announcementLink')}</label>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                زيارة الموقع
+              </label>
+              <select
+                value={formData.siteVisitRequired ? 'YES' : 'NO'}
+                onChange={(e) =>
+                  setFormData({
+                    ...formData,
+                    siteVisitRequired: e.target.value === 'YES',
+                    siteVisitLocation: e.target.value === 'YES' ? formData.siteVisitLocation || '' : '',
+                  })
+                }
+                className="w-full px-3 py-2 border rounded-lg"
+              >
+                <option value="NO">غير إجبارية</option>
+                <option value="YES">إجبارية</option>
+              </select>
+            </div>
+
+            <div>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                مكان استلام دفتر الشروط - المحافظة
+              </label>
+              <select
+                value={formData.termsPickupProvince || ''}
+                onChange={(e) => setFormData({ ...formData, termsPickupProvince: e.target.value })}
+                className="w-full px-3 py-2 border rounded-lg"
+              >
+                <option value="">اختر المحافظة</option>
+                {SYRIA_PROVINCES.map((province) => (
+                  <option key={province} value={province}>
+                    {province}
+                  </option>
+                ))}
+              </select>
+            </div>
+          </div>
+
+          {formData.siteVisitRequired && (
+            <div>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                مكان الزيارة *
+              </label>
+              <input
+                type="text"
+                value={formData.siteVisitLocation || ''}
+                onChange={(e) => setFormData({ ...formData, siteVisitLocation: e.target.value })}
+                className="w-full px-3 py-2 border rounded-lg"
+                placeholder="اكتب مكان أو عنوان زيارة الموقع"
+              />
+              {formErrors.siteVisitLocation && (
+                <p className="text-red-500 text-xs mt-1">{formErrors.siteVisitLocation}</p>
+              )}
+            </div>
+          )}
+
+          <div>
+            <label className="block text-sm font-medium text-gray-700 mb-1">
+              {t('tenders.announcementLink')}
+            </label>
             <input
               type="url"
               value={formData.announcementLink || ''}
@@ -390,8 +605,11 @@ function TendersContent() {
               className="w-full px-3 py-2 border rounded-lg"
             />
           </div>
+
           <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">{t('common.notes')}</label>
+            <label className="block text-sm font-medium text-gray-700 mb-1">
+              {t('common.notes')}
+            </label>
             <textarea
               value={formData.notes || ''}
               onChange={(e) => setFormData({ ...formData, notes: e.target.value })}
@@ -399,29 +617,39 @@ function TendersContent() {
               rows={2}
             />
           </div>
+
           {showDuplicateWarning && possibleDuplicates.length > 0 && (
             <div className="p-3 bg-amber-50 border border-amber-200 rounded-lg flex items-start gap-2">
               <AlertCircle className="h-5 w-5 text-amber-600 flex-shrink-0 mt-0.5" />
               <div>
-                <p className="text-sm font-medium text-amber-800">{t('tenders.duplicateWarning') || 'Possible duplicates found'}</p>
+                <p className="text-sm font-medium text-amber-800">
+                  {t('tenders.duplicateWarning') || 'Possible duplicates found'}
+                </p>
                 <ul className="text-sm text-amber-700 mt-1 list-disc list-inside">
                   {possibleDuplicates.slice(0, 3).map((d) => (
                     <li key={d.id}>
-                      <Link href={`/tenders/${d.id}`} className="underline">{d.tenderNumber} - {d.title}</Link>
+                      <Link href={`/tenders/${d.id}`} className="underline">
+                        {d.tenderNumber} - {d.title}
+                      </Link>
                     </li>
                   ))}
                 </ul>
               </div>
             </div>
           )}
+
           <div className="flex justify-end gap-2 pt-4">
             <button
               type="button"
-              onClick={() => { setShowCreateModal(false); resetForm(); }}
+              onClick={() => {
+                setShowCreateModal(false)
+                resetForm()
+              }}
               className="px-4 py-2 border rounded-lg"
             >
               {t('common.cancel')}
             </button>
+
             <button
               type="submit"
               disabled={submitting}

frontend/src/components/contacts/ContactForm.tsx

@@ -15,11 +15,7 @@ interface ContactFormProps {
   submitting?: boolean
 }
 
-export default function ContactForm({ contact, onSubmit, onCancel, submitting = false }: ContactFormProps) {
-  const isEdit = !!contact
-
-  // Form state
-  const [formData, setFormData] = useState<CreateContactData>({
+const buildInitialFormData = (contact?: Contact): CreateContactData => ({
   type: contact?.type || 'INDIVIDUAL',
   name: contact?.name || '',
   nameAr: contact?.nameAr,
@@ -33,7 +29,7 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
   commercialRegister: contact?.commercialRegister,
   address: contact?.address,
   city: contact?.city,
-    country: contact?.country || 'Saudi Arabia',
+  country: contact?.country || 'Syria',
   postalCode: contact?.postalCode,
   source: contact?.source || 'WEBSITE',
   categories: contact?.categories?.map((c: any) => c.id || c) || [],
@@ -41,14 +37,25 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
   parentId: contact?.parent?.id,
   employeeId: contact?.employeeId ?? undefined,
   customFields: contact?.customFields
-  })
+})
 
+export default function ContactForm({ contact, onSubmit, onCancel, submitting = false }: ContactFormProps) {
+  const isEdit = !!contact
+
+  const [formData, setFormData] = useState<CreateContactData>(buildInitialFormData(contact))
   const [rating, setRating] = useState<number>(contact?.rating || 0)
   const [newTag, setNewTag] = useState('')
   const [formErrors, setFormErrors] = useState<Record<string, string>>({})
   const [categories, setCategories] = useState<Category[]>([])
   const [employees, setEmployees] = useState<Employee[]>([])
 
+  useEffect(() => {
+    setFormData(buildInitialFormData(contact))
+    setRating(contact?.rating || 0)
+    setNewTag('')
+    setFormErrors({})
+  }, [contact])
+
   useEffect(() => {
     categoriesAPI.getTree().then(setCategories).catch(() => {})
   }, [])
@@ -72,7 +79,23 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
 
   const isCompanyEmployeeSelected = companyEmployeeCategoryId && (formData.categories || []).includes(companyEmployeeCategoryId)
 
-  // Validation
+  const organizationTypes = new Set([
+    'COMPANY',
+    'HOLDING',
+    'GOVERNMENT',
+    'ORGANIZATION',
+    'EMBASSIES',
+    'BANK',
+    'UNIVERSITY',
+    'SCHOOL',
+    'UN',
+    'NGO',
+    'INSTITUTION',
+  ])
+
+  const isOrganizationType = organizationTypes.has(formData.type)
+  const showCompanyFields = isOrganizationType
+
   const validateForm = (): boolean => {
     const errors: Record<string, string> = {}
 
@@ -103,28 +126,49 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault()
     if (!validateForm()) return
+const cleanData = Object.entries({ ...formData, rating }).reduce((acc, [key, value]) => {
+  const requiredFields = ['type', 'name', 'source', 'country']
 
-    // Clean up empty strings to undefined for optional fields
-    const cleanData = Object.entries({ ...formData, rating }).reduce((acc, [key, value]) => {
-      // Keep the value if it's not an empty string, or if it's a required field
-      if (value !== '' || ['type', 'name', 'source', 'country'].includes(key)) {
+    // keep required fields as-is
+    if (requiredFields.includes(key)) {
+      acc[key] = value
+      return acc
+    }
+
+    // in edit mode, allow clearing optional fields by sending null
+    if (isEdit && value === '') {
+      acc[key] = null
+      return acc
+    }
+
+    // in create mode, ignore empty optional fields
+    if (value !== '') {
       acc[key] = value
     }
+
     return acc
   }, {} as any)
 
-    // Remove parentId if it's empty or undefined
     if (!cleanData.parentId) {
       delete cleanData.parentId
     }
 
-    // Remove categories if empty array
     if (cleanData.categories && cleanData.categories.length === 0) {
       delete cleanData.categories
     }
 
-    // Remove employeeId if empty
-    if (!cleanData.employeeId) {
+    if (!cleanData.parentId) {
+  delete cleanData.parentId
+}
+
+    if (cleanData.categories && cleanData.categories.length === 0) {
+      delete cleanData.categories
+    }
+
+    // employeeId:
+    // - in create: remove if empty
+    // - in edit: keep null if user cleared it
+    if (!isEdit && !cleanData.employeeId) {
       delete cleanData.employeeId
     }
 
@@ -152,16 +196,12 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
     })
   }
 
-  const showCompanyFields = ['COMPANY', 'HOLDING', 'GOVERNMENT'].includes(formData.type)
-
   return (
-    <form onSubmit={handleSubmit} className="space-y-6">
-      {/* Basic Information Section */}
+    <form onSubmit={handleSubmit} noValidate className="space-y-6">
       <div>
         <h3 className="text-lg font-semibold text-gray-900 mb-4">Basic Information</h3>
         <div className="space-y-4">
           <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-            {/* Contact Type */}
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 Contact Type <span className="text-red-500">*</span>
@@ -176,6 +216,7 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
                 <option value="HOLDING">Holding - مجموعة</option>
                 <option value="GOVERNMENT">Government - حكومي</option>
                 <option value="ORGANIZATION">Organizations - منظمات</option>
+                <option value="EMBASSIES">Embassies - سفارات</option>
                 <option value="BANK">Banks - بنوك</option>
                 <option value="UNIVERSITY">Universities - جامعات</option>
                 <option value="SCHOOL">Schools - مدارس</option>
@@ -186,7 +227,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
               {formErrors.type && <p className="text-red-500 text-xs mt-1">{formErrors.type}</p>}
             </div>
 
-            {/* Source */}
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 Source <span className="text-red-500">*</span>
@@ -209,37 +249,20 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
             </div>
           </div>
 
-          {/* Name */}
           <div>
             <label className="block text-sm font-medium text-gray-700 mb-1">
-              Name <span className="text-red-500">*</span>
+              {isOrganizationType ? 'Contact Person Name' : 'Name'} <span className="text-red-500">*</span>
             </label>
             <input
               type="text"
               value={formData.name}
               onChange={(e) => setFormData({ ...formData, name: e.target.value })}
               className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 bg-white text-gray-900"
-              placeholder="Enter contact name"
+              placeholder={isOrganizationType ? 'Enter contact person name' : 'Enter contact name'}
             />
             {formErrors.name && <p className="text-red-500 text-xs mt-1">{formErrors.name}</p>}
           </div>
 
-          {/* Arabic Name */}
-          <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">
-              Arabic Name - الاسم بالعربية
-            </label>
-            <input
-              type="text"
-              value={formData.nameAr || ''}
-              onChange={(e) => setFormData({ ...formData, nameAr: e.target.value })}
-              className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 bg-white text-gray-900"
-              placeholder="أدخل الاسم بالعربية"
-              dir="rtl"
-            />
-          </div>
-
-          {/* Rating */}
           <div>
             <label className="block text-sm font-medium text-gray-700 mb-2">
               Rating
@@ -275,12 +298,10 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
         </div>
       </div>
 
-      {/* Contact Methods Section */}
       <div className="pt-6 border-t">
         <h3 className="text-lg font-semibold text-gray-900 mb-4">Contact Methods</h3>
         <div className="space-y-4">
           <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-            {/* Email */}
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 Email
@@ -295,7 +316,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
               {formErrors.email && <p className="text-red-500 text-xs mt-1">{formErrors.email}</p>}
             </div>
 
-            {/* Phone */}
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 Phone
@@ -312,7 +332,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
           </div>
 
           <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-            {/* Mobile */}
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 Mobile
@@ -326,7 +345,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
               />
             </div>
 
-            {/* Website */}
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 Website
@@ -343,44 +361,27 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
         </div>
       </div>
 
-      {/* Company Information Section (conditional) */}
       {showCompanyFields && (
         <div className="pt-6 border-t">
           <h3 className="text-lg font-semibold text-gray-900 mb-4">Company Information</h3>
           <div className="space-y-4">
             <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-              {/* Company Name */}
               <div>
                 <label className="block text-sm font-medium text-gray-700 mb-1">
-                  Company Name
+                  {formData.type === 'EMBASSIES' ? 'Embassy Name' : 'Company / Organization Name'}
                 </label>
                 <input
                   type="text"
                   value={formData.companyName || ''}
                   onChange={(e) => setFormData({ ...formData, companyName: e.target.value })}
                   className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 bg-white text-gray-900"
-                  placeholder="Company name"
+                  placeholder={formData.type === 'EMBASSIES' ? 'Embassy name' : 'Company / organization name'}
                 />
               </div>
 
-              {/* Company Name Arabic */}
-              <div>
-                <label className="block text-sm font-medium text-gray-700 mb-1">
-                  Company Name (Arabic) - اسم الشركة
-                </label>
-                <input
-                  type="text"
-                  value={formData.companyNameAr || ''}
-                  onChange={(e) => setFormData({ ...formData, companyNameAr: e.target.value })}
-                  className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 bg-white text-gray-900"
-                  placeholder="اسم الشركة بالعربية"
-                  dir="rtl"
-                />
-              </div>
             </div>
 
             <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-              {/* Tax Number */}
               <div>
                 <label className="block text-sm font-medium text-gray-700 mb-1">
                   Tax Number
@@ -394,7 +395,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
                 />
               </div>
 
-              {/* Commercial Register */}
               <div>
                 <label className="block text-sm font-medium text-gray-700 mb-1">
                   Commercial Register
@@ -412,11 +412,9 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
         </div>
       )}
 
-      {/* Address Section */}
       <div className="pt-6 border-t">
         <h3 className="text-lg font-semibold text-gray-900 mb-4">Address Information</h3>
         <div className="space-y-4">
-          {/* Address */}
           <div>
             <label className="block text-sm font-medium text-gray-700 mb-1">
               Street Address
@@ -431,7 +429,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
           </div>
 
           <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
-            {/* City */}
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 City
@@ -445,7 +442,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
               />
             </div>
 
-            {/* Country */}
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 Country
@@ -459,7 +455,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
               />
             </div>
 
-            {/* Postal Code */}
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 Postal Code
@@ -476,7 +471,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
         </div>
       </div>
 
-      {/* Categories Section */}
       <div className="pt-6 border-t">
         <h3 className="text-lg font-semibold text-gray-900 mb-4">Categories</h3>
         <CategorySelector
@@ -486,7 +480,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
         />
       </div>
 
-      {/* Employee Link - when Company Employee category is selected */}
       {isCompanyEmployeeSelected && (
         <div className="pt-6 border-t">
           <h3 className="text-lg font-semibold text-gray-900 mb-4">Link to Employee (Optional)</h3>
@@ -508,11 +501,9 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
         </div>
       )}
 
-      {/* Tags Section */}
       <div className="pt-6 border-t">
         <h3 className="text-lg font-semibold text-gray-900 mb-4">Tags</h3>
         <div className="space-y-3">
-          {/* Tag input */}
           <div className="flex gap-2">
             <input
               type="text"
@@ -531,7 +522,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
             </button>
           </div>
 
-          {/* Tags display */}
           {formData.tags && formData.tags.length > 0 && (
             <div className="flex flex-wrap gap-2">
               {formData.tags.map((tag, index) => (
@@ -554,7 +544,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
         </div>
       </div>
 
-      {/* Duplicate Detection */}
       <DuplicateAlert
         email={formData.email}
         phone={formData.phone}
@@ -563,14 +552,12 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
         commercialRegister={formData.commercialRegister}
         excludeId={contact?.id}
         onMerge={(contactId) => {
-          // Navigate to merge page with pre-selected contacts
           if (typeof window !== 'undefined') {
             window.location.href = `/contacts/merge?sourceId=${contactId}`
           }
         }}
       />
 
-      {/* Form Actions */}
       <div className="flex items-center justify-end gap-3 pt-6 border-t">
         <button
           type="button"

frontend/src/lib/api/tenders.ts

@@ -5,8 +5,18 @@ export interface Tender {
   tenderNumber: string
   issuingBodyName: string
   title: string
+
   termsValue: number
   bondValue: number
+
+  // extra fields stored inside notes metadata for now
+  initialBondValue?: number | null
+  finalBondValue?: number | null
+  finalBondRefundPeriod?: string | null
+  siteVisitRequired?: boolean
+  siteVisitLocation?: string | null
+  termsPickupProvince?: string | null
+
   announcementDate: string
   closingDate: string
   announcementLink?: string
@@ -26,6 +36,7 @@ export interface Tender {
   _count?: { directives: number }
 }
 
+
 export interface TenderDirective {
   id: string
   tenderId: string
@@ -48,8 +59,18 @@ export interface CreateTenderData {
   tenderNumber: string
   issuingBodyName: string
   title: string
+
   termsValue: number
   bondValue: number
+
+  // extra UI/backend fields without DB migration
+  initialBondValue?: number
+  finalBondValue?: number
+  finalBondRefundPeriod?: string
+  siteVisitRequired?: boolean
+  siteVisitLocation?: string
+  termsPickupProvince?: string
+
   announcementDate: string
   closingDate: string
   announcementLink?: string
@@ -166,6 +187,10 @@ export const tendersAPI = {
     return response.data.data
   },
 
+  deleteAttachment: async (attachmentId: string): Promise<void> => {
+  await api.delete(`/tenders/attachments/${attachmentId}`)
+  },
+
   getSourceValues: async (): Promise<string[]> => {
     const response = await api.get('/tenders/source-values')
     return response.data.data