diff --git a/app/(main)/worker/profile/page.tsx b/app/(main)/worker/profile/page.tsx
index 9ef3252..44b0773 100644
--- a/app/(main)/worker/profile/page.tsx
+++ b/app/(main)/worker/profile/page.tsx
@@ -21,6 +21,7 @@ export default function ProfilePage() {
   const supabase = createClient()
   const router = useRouter()
   const [subscription, setSubscription] = useState<WorkerSubscription | null>(null)
+  const [orgMembership, setOrgMembership] = useState<{ org_name: string; org_rating: number; org_id: string } | null>(null)
 
   useEffect(() => {
     if (!profile?.id) return
@@ -31,6 +32,24 @@ export default function ProfilePage() {
     fetchSub()
   }, [profile])
 
+  useEffect(() => {
+    if (!profile?.id) return
+    const fetchOrg = async () => {
+      const { data } = await supabase
+        .from('organization_workers')
+        .select('organization_id, organizations!inner(id, name, rating)')
+        .eq('linked_user_id', profile.id)
+        .eq('is_active', true)
+        .limit(1)
+        .maybeSingle()
+      if (data?.organizations) {
+        const org = data.organizations as any
+        setOrgMembership({ org_name: org.name, org_rating: org.rating || 0, org_id: org.id })
+      }
+    }
+    fetchOrg()
+  }, [profile?.id, supabase])
+
   const handleLogout = async () => {
     await supabase.auth.signOut()
     router.push('/login')
@@ -159,6 +178,28 @@ export default function ProfilePage() {
         </div>
       </div>
 
+      {/* Org Membership Rating */}
+      {orgMembership && (
+        <div className="px-6 mb-6">
+          <div
+            onClick={() => router.push(`/client/organization/${orgMembership.org_id}`)}
+            className="bg-gradient-to-r from-[#FF8A00]/10 to-[#FFB800]/5 border border-[#FF8A00]/20 rounded-2xl p-4 flex items-center gap-3 cursor-pointer active:scale-[0.98] transition-transform"
+          >
+            <div className="w-10 h-10 rounded-xl bg-[#FF8A00]/10 flex items-center justify-center shrink-0">
+              <Building2 size={18} className="text-[#FF8A00]" />
+            </div>
+            <div className="flex-1 min-w-0">
+              <p className="text-xs text-[#FF8A00] font-bold">تقييم كجزء من المؤسسة</p>
+              <p className="text-sm font-bold mt-0.5 truncate">{orgMembership.org_name}</p>
+            </div>
+            <div className="flex items-center gap-1 shrink-0">
+              <Star size={14} className="text-[#FFB800] fill-[#FFB800]" />
+              <span className="text-sm font-bold text-[#FFB800]">{orgMembership.org_rating || '0.0'}</span>
+            </div>
+          </div>
+        </div>
+      )}
+
       <div className="flex justify-center mb-8">
         <span className="text-xs text-[#4B5A7A]">حرفة - الإصدار 2.4.0</span>
       </div>
diff --git a/app/(main)/worker/profile/summary/page.tsx b/app/(main)/worker/profile/summary/page.tsx
index d1e44c0..dc9bad2 100644
--- a/app/(main)/worker/profile/summary/page.tsx
+++ b/app/(main)/worker/profile/summary/page.tsx
@@ -1,9 +1,9 @@
 'use client'
 
-import React from 'react'
+import React, { useState, useEffect } from 'react'
 import { useRouter } from 'next/navigation'
 import Image from 'next/image'
-import { CheckCircle2, Power, Briefcase, Star } from 'lucide-react'
+import { CheckCircle2, Power, Briefcase, Star, Building2 } from 'lucide-react'
 import { PageHeader } from '@/components/ui/PageHeader'
 import { SubPageLayout } from '@/components/ui/SubPageLayout'
 import { StatCard } from '@/components/ui/profile/StatCard'
@@ -12,10 +12,31 @@ import { ServiceSummaryCard } from '@/components/ui/profile/ServiceSummaryCard'
 import { ContactInfoCard } from '@/components/ui/profile/ContactInfoCard'
 import { useProfileSummary } from '@/hooks/useProfileSummary'
 import { PageLoader } from '@/components/ui/PageLoader'
+import { createClient } from '@/lib/supabase/client'
 
 export default function ProfileSummaryPage() {
   const router = useRouter()
   const { profile, services, reviews, loading } = useProfileSummary()
+  const supabase = createClient()
+  const [orgMembership, setOrgMembership] = useState<{ org_name: string; org_rating: number; org_id: string } | null>(null)
+
+  useEffect(() => {
+    if (!profile?.id) return
+    const fetchOrg = async () => {
+      const { data } = await supabase
+        .from('organization_workers')
+        .select('organization_id, organizations!inner(id, name, rating)')
+        .eq('linked_user_id', profile.id)
+        .eq('is_active', true)
+        .limit(1)
+        .maybeSingle()
+      if (data?.organizations) {
+        const org = data.organizations as any
+        setOrgMembership({ org_name: org.name, org_rating: org.rating || 0, org_id: org.id })
+      }
+    }
+    fetchOrg()
+  }, [profile?.id, supabase])
 
   return (
     <SubPageLayout>
@@ -63,6 +84,26 @@ export default function ProfileSummaryPage() {
             </div>
           </>
         )}
+
+        {/* Org Membership Rating */}
+        {orgMembership && (
+          <div
+            onClick={() => router.push(`/client/organization/${orgMembership.org_id}`)}
+            className="mt-8 bg-gradient-to-r from-[#FF8A00]/10 to-[#FFB800]/5 border border-[#FF8A00]/20 rounded-2xl p-4 flex items-center gap-3 cursor-pointer active:scale-[0.98] transition-transform"
+          >
+            <div className="w-10 h-10 rounded-xl bg-[#FF8A00]/10 flex items-center justify-center shrink-0">
+              <Building2 size={18} className="text-[#FF8A00]" />
+            </div>
+            <div className="flex-1 min-w-0">
+              <p className="text-xs text-[#FF8A00] font-bold">تقييم كجزء من المؤسسة</p>
+              <p className="text-sm font-bold mt-0.5 truncate">{orgMembership.org_name}</p>
+            </div>
+            <div className="flex items-center gap-1 shrink-0">
+              <Star size={14} className="text-[#FFB800] fill-[#FFB800]" />
+              <span className="text-sm font-bold text-[#FFB800]">{orgMembership.org_rating || '0.0'}</span>
+            </div>
+          </div>
+        )}
       </div>
     </SubPageLayout>
   )
diff --git a/app/client/booking/[workerId]/ClientPage.tsx b/app/client/booking/[workerId]/ClientPage.tsx
index 0b141d5..d709f17 100644
--- a/app/client/booking/[workerId]/ClientPage.tsx
+++ b/app/client/booking/[workerId]/ClientPage.tsx
@@ -3,7 +3,7 @@
 import { useState, useMemo, use, useEffect } from 'react'
 import { useRouter } from 'next/navigation'
 import Image from 'next/image'
-import { ArrowLeft, Plus, Clock, CalendarDays } from 'lucide-react'
+import { ArrowLeft, Plus, Clock, CalendarDays, Building2, Briefcase } from 'lucide-react'
 import { createClient } from '@/lib/supabase/client'
 import LocationPicker from '@/components/shared/LocationPicker'
 
@@ -76,11 +76,22 @@ function generateTimeSlots(start: string, end: string): string[] {
   return slots
 }
 
+interface OrgService {
+  id: string
+  name: string
+  description: string | null
+  price: number | null
+  icon: string | null
+}
+
 export default function BookingPage({ params }: { params: Promise<{ workerId: string }> }) {
   const router = useRouter()
   const { workerId } = use(params)
   const supabase = createClient()
-  
+
+  const searchParams = typeof window !== 'undefined' ? new URLSearchParams(window.location.search) : null
+  const orgId = searchParams?.get('organization_id') || ''
+
   const weekDates = useMemo(() => getDateRange(14), [])
   const [selectedDate, setSelectedDate] = useState(todayStr)
   const [selectedTime, setSelectedTime] = useState('')
@@ -91,44 +102,83 @@ export default function BookingPage({ params }: { params: Promise<{ workerId: st
   const [images, setImages] = useState<string[]>([])
 
   const [workerProfile, setWorkerProfile] = useState<any>(null)
+  const [orgProfile, setOrgProfile] = useState<any>(null)
+  const [orgServices, setOrgServices] = useState<OrgService[]>([])
+  const [selectedService, setSelectedService] = useState<OrgService | null>(null)
   const [schedule, setSchedule] = useState<any[]>([])
   const [bookedTimes, setBookedTimes] = useState<string[]>([])
   const [loading, setLoading] = useState(true)
 
+  const isOrg = !!orgId
+
   useEffect(() => {
     let active = true
     async function loadData() {
       setLoading(true)
-      const { data: prof } = await supabase.from('profiles').select('*').eq('id', workerId).single()
-      if (!active) return
-      setWorkerProfile(prof)
-      
-      if (prof) {
-        const { data: sched } = await supabase.from('worker_schedule').select('*').eq('worker_id', workerId)
-        if (active && sched) setSchedule(sched)
-        
+
+      if (isOrg) {
+        const { data: org } = await supabase
+          .from('organizations')
+          .select('*')
+          .eq('id', orgId)
+          .eq('is_active', true)
+          .single()
+        if (!active) return
+        setOrgProfile(org)
+
+        const { data: services } = await supabase
+          .from('organization_services')
+          .select('*')
+          .eq('organization_id', orgId)
+          .order('sort_order', { ascending: true })
+        if (active && services) {
+          setOrgServices(services)
+          if (services.length === 1) setSelectedService(services[0])
+        }
+
         const { data: books } = await supabase
           .from('bookings')
           .select('appointment_time')
-          .eq('worker_id', workerId)
+          .eq('organization_id', orgId)
           .eq('appointment_date', selectedDate)
           .not('status', 'eq', 'cancelled')
-        
+
         if (active && books) {
           setBookedTimes(books.map(b => b.appointment_time.slice(0, 5)))
         }
+      } else {
+        const { data: prof } = await supabase.from('profiles').select('*').eq('id', workerId).single()
+        if (!active) return
+        setWorkerProfile(prof)
+
+        if (prof) {
+          const { data: sched } = await supabase.from('worker_schedule').select('*').eq('worker_id', workerId)
+          if (active && sched) setSchedule(sched)
+
+          const { data: books } = await supabase
+            .from('bookings')
+            .select('appointment_time')
+            .eq('worker_id', workerId)
+            .eq('appointment_date', selectedDate)
+            .not('status', 'eq', 'cancelled')
+
+          if (active && books) {
+            setBookedTimes(books.map(b => b.appointment_time.slice(0, 5)))
+          }
+        }
       }
       setLoading(false)
     }
     loadData()
-    return () => {
-      active = false
-    }
-  }, [workerId, selectedDate, supabase])
+    return () => { active = false }
+  }, [workerId, orgId, isOrg, selectedDate, supabase])
 
   const currentDayKey = useMemo(() => getDayKey(selectedDate), [selectedDate])
-  
+
   const daySched = useMemo(() => {
+    if (isOrg) {
+      return defaultSchedule[currentDayKey]
+    }
     const dbSched = schedule.find(s => s.day_id === currentDayKey)
     if (dbSched) {
       return {
@@ -138,7 +188,7 @@ export default function BookingPage({ params }: { params: Promise<{ workerId: st
       }
     }
     return defaultSchedule[currentDayKey]
-  }, [schedule, currentDayKey])
+  }, [schedule, currentDayKey, isOrg])
 
   const timeSlots = useMemo(() => {
     if (!daySched || !daySched.active) return []
@@ -160,6 +210,7 @@ export default function BookingPage({ params }: { params: Promise<{ workerId: st
   const scheduleSummary = useMemo(() => {
     const dayKeys = ['sat', 'sun', 'mon', 'tue', 'wed', 'thu', 'fri']
     return dayKeys.map(key => {
+      if (isOrg) return { key, ...defaultSchedule[key] }
       const db = schedule.find(s => s.day_id === key)
       if (db) {
         return {
@@ -171,7 +222,7 @@ export default function BookingPage({ params }: { params: Promise<{ workerId: st
       }
       return { key, ...defaultSchedule[key] }
     })
-  }, [schedule])
+  }, [schedule, isOrg])
 
   const handleContinue = () => {
     if (!selectedTime) return
@@ -179,7 +230,6 @@ export default function BookingPage({ params }: { params: Promise<{ workerId: st
       alert('يرجى إرفاق صورة توضيحية واحدة على الأقل')
       return
     }
-
     if (!address && (!lat || !lng)) {
       alert('يرجى تحديد موقعك الحالي أو إدخال العنوان التفصيلي')
       return
@@ -192,18 +242,16 @@ export default function BookingPage({ params }: { params: Promise<{ workerId: st
       return
     }
 
-    const params = new URLSearchParams(window.location.search)
-    const serviceName = params.get('serviceName') || ''
-    const servicePrice = params.get('servicePrice') || ''
-    const orgId = params.get('organization_id') || ''
-    
+    const serviceName = isOrg ? (selectedService?.name || '') : (new URLSearchParams(window.location.search).get('serviceName') || '')
+    const servicePrice = isOrg ? (selectedService?.price?.toString() || '') : (new URLSearchParams(window.location.search).get('servicePrice') || '')
+
     let url = `/client/booking/confirm?workerId=${workerId}&date=${selectedDate}&time=${selectedTime}&notes=${encodeURIComponent(notes)}`
-    if (orgId) url += `&organization_id=${orgId}`
+    if (isOrg) url += `&organization_id=${orgId}`
     if (serviceName) url += `&serviceName=${encodeURIComponent(serviceName)}`
     if (servicePrice) url += `&servicePrice=${servicePrice}`
     if (address) url += `&address=${encodeURIComponent(address)}`
     if (lat && lng) url += `&lat=${lat}&lng=${lng}`
-    
+
     router.push(url)
   }
 
@@ -236,12 +284,20 @@ export default function BookingPage({ params }: { params: Promise<{ workerId: st
   if (loading) {
     return (
       <div dir="rtl" className="min-h-screen bg-[#020617] flex items-center justify-center">
-        <div className="text-white">جاري التحميل...</div>
+        <div className="w-8 h-8 border-2 border-[#FF8A00] border-t-transparent rounded-full animate-spin" />
+      </div>
+    )
+  }
+
+  if (isOrg && !orgProfile) {
+    return (
+      <div dir="rtl" className="min-h-screen bg-[#020617] flex items-center justify-center">
+        <div className="text-white">المؤسسة غير موجودة</div>
       </div>
     )
   }
 
-  if (!workerProfile) {
+  if (!isOrg && !workerProfile) {
     return (
       <div dir="rtl" className="min-h-screen bg-[#020617] flex items-center justify-center">
         <div className="text-white">الحرفي غير موجود</div>
@@ -256,39 +312,103 @@ export default function BookingPage({ params }: { params: Promise<{ workerId: st
           <button onClick={() => router.back()}>
             <ArrowLeft size={16} className="text-white" />
           </button>
-          <h1 className="text-white text-xl font-semibold">تحديد الموعد</h1>
+          <h1 className="text-white text-xl font-semibold">{isOrg ? 'حجز خدمة مؤسسة' : 'تحديد الموعد'}</h1>
           <div className="w-6" />
         </div>
       </div>
 
       <div className="max-w-[512px] mx-auto px-4 pb-40">
 
-        <div className="mt-6 bg-[#0F172A]/40 rounded-2xl p-4 border border-white/5">
-          <div className="flex items-center gap-2 mb-3">
-            <CalendarDays size={16} className="text-[#FFA504]" />
-            <h3 className="text-[#E4E1E5] font-bold text-sm">أوقات العمل الأسبوعية</h3>
+        {/* Org Header */}
+        {isOrg && orgProfile && (
+          <div className="mt-6 flex items-center gap-4 bg-[#0F172A]/40 rounded-2xl p-4 border border-white/5">
+            <div className="w-14 h-14 rounded-xl overflow-hidden bg-[#1E2538] flex items-center justify-center shrink-0">
+              {orgProfile.logo_url ? (
+                <Image src={orgProfile.logo_url} alt="" width={56} height={56} className="w-full h-full object-cover" />
+              ) : (
+                <Building2 size={24} className="text-[#FF8A00]" />
+              )}
+            </div>
+            <div>
+              <h2 className="text-white font-bold text-sm">{orgProfile.name}</h2>
+              {orgProfile.category && <p className="text-[#FF8A00] text-xs mt-0.5">{orgProfile.category}</p>}
+            </div>
           </div>
-          <div className="flex flex-wrap gap-2">
-            {scheduleSummary.map(s => (
-              <div
-                key={s.key}
-                className={`text-[11px] px-2.5 py-1.5 rounded-lg font-bold ${
-                  s.active
-                    ? 'bg-[#FFA504]/10 text-[#FFA504] border border-[#FFA504]/20'
-                    : 'bg-white/5 text-[#6B7A99] border border-white/5'
-                }`}
-              >
-                {DAY_NAMES_FULL[s.key]?.short}
-                {s.active && (
-                  <span className="mr-1 opacity-70">
-                    {to12Hour(s.start)} - {to12Hour(s.end)}
-                  </span>
-                )}
-              </div>
-            ))}
+        )}
+
+        {/* Org Services Selection */}
+        {isOrg && orgServices.length > 0 && (
+          <div className="mt-6">
+            <h3 className="text-[#E4E1E5] font-bold text-sm mb-3 flex items-center gap-2">
+              <Briefcase size={14} className="text-[#FF8A00]" />
+              اختر الخدمة
+            </h3>
+            <div className="flex flex-col gap-2">
+              {orgServices.map(service => {
+                const isSelected = selectedService?.id === service.id
+                return (
+                  <div
+                    key={service.id}
+                    onClick={() => setSelectedService(isSelected ? null : service)}
+                    className={`bg-[#0F172A]/40 border rounded-xl p-3 flex items-center justify-between cursor-pointer transition-all active:scale-[0.99] ${
+                      isSelected ? 'border-[#FF8A00] bg-[#FF8A00]/5' : 'border-white/5'
+                    }`}
+                  >
+                    <div className="flex-1 text-right">
+                      <span className="font-bold text-sm text-white">{service.name}</span>
+                      {service.description && (
+                        <p className="text-[#C7C5CF] text-xs mt-0.5 leading-5">{service.description}</p>
+                      )}
+                    </div>
+                    <div className="flex items-center gap-3 mr-3">
+                      {service.price != null && (
+                        <span className="text-[10px] bg-[#FF8A00]/10 text-[#FF8A00] px-2 py-0.5 rounded-md font-bold">
+                          {service.price} ج.م
+                        </span>
+                      )}
+                      <div className={`w-6 h-6 rounded-full flex items-center justify-center text-xs font-bold transition-colors ${
+                        isSelected ? 'bg-[#FF8A00] text-white' : 'bg-white/10 text-white'
+                      }`}>
+                        {isSelected ? '✓' : '+'}
+                      </div>
+                    </div>
+                  </div>
+                )
+              })}
+            </div>
           </div>
-        </div>
+        )}
+
+        {/* Worker Schedule Summary (worker only) */}
+        {!isOrg && (
+          <div className="mt-6 bg-[#0F172A]/40 rounded-2xl p-4 border border-white/5">
+            <div className="flex items-center gap-2 mb-3">
+              <CalendarDays size={16} className="text-[#FFA504]" />
+              <h3 className="text-[#E4E1E5] font-bold text-sm">أوقات العمل الأسبوعية</h3>
+            </div>
+            <div className="flex flex-wrap gap-2">
+              {scheduleSummary.map(s => (
+                <div
+                  key={s.key}
+                  className={`text-[11px] px-2.5 py-1.5 rounded-lg font-bold ${
+                    s.active
+                      ? 'bg-[#FFA504]/10 text-[#FFA504] border border-[#FFA504]/20'
+                      : 'bg-white/5 text-[#6B7A99] border border-white/5'
+                  }`}
+                >
+                  {DAY_NAMES_FULL[s.key]?.short}
+                  {s.active && (
+                    <span className="mr-1 opacity-70">
+                      {to12Hour(s.start)} - {to12Hour(s.end)}
+                    </span>
+                  )}
+                </div>
+              ))}
+            </div>
+          </div>
+        )}
 
+        {/* Date Picker */}
         <div className="mt-6">
           <div className="flex items-center justify-between mb-4">
             <div className="flex items-center gap-2">
@@ -321,6 +441,7 @@ export default function BookingPage({ params }: { params: Promise<{ workerId: st
           </div>
         </div>
 
+        {/* Time Slots */}
         <div className="mt-8">
           <h3 className="text-[#E4E1E5] font-bold text-sm mb-4">
             المواعيد المتاحة
@@ -333,7 +454,7 @@ export default function BookingPage({ params }: { params: Promise<{ workerId: st
           {!daySched.active ? (
             <div className="text-center py-12 bg-[#0F172A]/40 rounded-2xl border border-dashed border-white/5">
               <Clock size={32} className="text-[#6B7A99] mx-auto mb-3 opacity-50" />
-              <span className="text-sm text-[#6B7A99] font-bold">الحرفي في إجازة هذا اليوم</span>
+              <span className="text-sm text-[#6B7A99] font-bold">{isOrg ? 'المؤسسة غير متاحة هذا اليوم' : 'الحرفي في إجازة هذا اليوم'}</span>
             </div>
           ) : timeSlots.length === 0 ? (
             <div className="text-center py-8 bg-[#0F172A]/40 rounded-2xl border border-dashed border-white/5">
@@ -345,7 +466,7 @@ export default function BookingPage({ params }: { params: Promise<{ workerId: st
                 const isSelected = selectedTime === time
                 const available = isSlotAvailable(time)
                 const isDisabled = !available
-                
+
                 return (
                   <button
                     key={time}
@@ -365,9 +486,10 @@ export default function BookingPage({ params }: { params: Promise<{ workerId: st
           )}
         </div>
 
+        {/* Address */}
         <div className="mt-8">
           <h3 className="text-[#E4E1E5] font-bold text-sm mb-4">العنوان التفصيلي (اختياري)</h3>
-          <LocationPicker 
+          <LocationPicker
             onLocationSelected={(data) => {
               const fullAddress = [data.governorate, data.area, data.address].filter(Boolean).join(' - ')
               if (fullAddress) setAddress(fullAddress)
@@ -386,6 +508,7 @@ export default function BookingPage({ params }: { params: Promise<{ workerId: st
           />
         </div>
 
+        {/* Notes */}
         <div className="mt-8">
           <h3 className="text-[#E4E1E5] font-bold text-sm mb-4">ملاحظات إضافية</h3>
           <textarea
@@ -397,6 +520,7 @@ export default function BookingPage({ params }: { params: Promise<{ workerId: st
           />
         </div>
 
+        {/* Images */}
         <div className="mt-8">
           <div className="flex items-center justify-between mb-4">
             <h3 className="text-[#E4E1E5] font-bold text-sm">صور توضيحية</h3>
@@ -406,7 +530,7 @@ export default function BookingPage({ params }: { params: Promise<{ workerId: st
             {images.map((img, idx) => (
               <div key={idx} className="relative w-20 h-20 rounded-2xl overflow-hidden bg-[#1E2538] flex-shrink-0">
                 <Image src={img} alt="صورة توضيحية" fill className="object-cover" />
-                <button 
+                <button
                   onClick={() => setImages(prev => prev.filter((_, i) => i !== idx))}
                   className="absolute top-1 right-1 w-5 h-5 bg-red-500 rounded-full flex items-center justify-center text-white"
                 >
@@ -426,10 +550,10 @@ export default function BookingPage({ params }: { params: Promise<{ workerId: st
         <div className="max-w-[512px] mx-auto">
           <button
             onClick={handleContinue}
-            disabled={!selectedTime || images.length === 0}
+            disabled={!selectedTime || images.length === 0 || (isOrg && !selectedService)}
             className="w-full py-4 rounded-xl bg-gradient-to-l from-[#FF8A00] to-[#FFB800] text-white text-xl font-medium shadow-lg shadow-[#FF8A00]/20 disabled:opacity-50 disabled:cursor-not-allowed"
           >
-            احجز الان
+            {isOrg ? 'حجز الآن' : 'احجز الان'}
           </button>
         </div>
       </div>
diff --git a/app/client/booking/confirm/page.tsx b/app/client/booking/confirm/page.tsx
index 53b3125..212311c 100644
--- a/app/client/booking/confirm/page.tsx
+++ b/app/client/booking/confirm/page.tsx
@@ -65,7 +65,7 @@ function ConfirmContent() {
   const totalAmount = servicePrice
 
   const handleConfirm = async () => {
-    if (!profile) return
+    if (!orgId && !profile) return
     const { data: { user }, error: userError } = await supabase.auth.getUser()
     if (userError || !user) {
       alert('يجب تسجيل الدخول أولاً')
diff --git a/app/client/craftsman/[id]/ClientPage.tsx b/app/client/craftsman/[id]/ClientPage.tsx
index f688bdf..5ae05f6 100644
--- a/app/client/craftsman/[id]/ClientPage.tsx
+++ b/app/client/craftsman/[id]/ClientPage.tsx
@@ -2,16 +2,37 @@
 
 import { useRouter, useParams } from 'next/navigation'
 import Image from 'next/image'
-import { useState } from 'react'
-import { ArrowLeft, Heart, Share2, Star, MapPin, X, ChevronLeft, ChevronRight } from 'lucide-react'
+import { useState, useEffect } from 'react'
+import { ArrowLeft, Heart, Share2, Star, MapPin, X, ChevronLeft, ChevronRight, Building2 } from 'lucide-react'
 import { useCraftsmanProfile } from '@/hooks/useCraftsmanProfile'
+import { createClient } from '@/lib/supabase/client'
 
 export default function CraftsmanPage() {
   const router = useRouter()
   const params = useParams()
+  const supabase = createClient()
   const { profile, gallery, services, reviews, loading } = useCraftsmanProfile(params.id as string)
   const [modalIndex, setModalIndex] = useState<number | null>(null)
   const [selectedService, setSelectedService] = useState<any>(null)
+  const [orgMembership, setOrgMembership] = useState<{ org_name: string; org_rating: number; org_id: string } | null>(null)
+
+  useEffect(() => {
+    if (!params.id) return
+    const fetchOrg = async () => {
+      const { data } = await supabase
+        .from('organization_workers')
+        .select('organization_id, organizations!inner(id, name, rating)')
+        .eq('linked_user_id', params.id as string)
+        .eq('is_active', true)
+        .limit(1)
+        .maybeSingle()
+      if (data?.organizations) {
+        const org = data.organizations as any
+        setOrgMembership({ org_name: org.name, org_rating: org.rating || 0, org_id: org.id })
+      }
+    }
+    fetchOrg()
+  }, [params.id, supabase])
 
   if (loading) {
     return (
@@ -218,6 +239,26 @@ export default function CraftsmanPage() {
           </div>
         )}
 
+        {/* Org Membership Rating */}
+        {orgMembership && (
+          <div
+            onClick={() => router.push(`/client/organization/${orgMembership.org_id}`)}
+            className="mt-8 bg-gradient-to-r from-[#FF8A00]/10 to-[#FFB800]/5 border border-[#FF8A00]/20 rounded-2xl p-4 flex items-center gap-3 cursor-pointer active:scale-[0.98] transition-transform"
+          >
+            <div className="w-10 h-10 rounded-xl bg-[#FF8A00]/10 flex items-center justify-center shrink-0">
+              <Building2 size={18} className="text-[#FF8A00]" />
+            </div>
+            <div className="flex-1 min-w-0">
+              <p className="text-xs text-[#FF8A00] font-bold">تقييم كجزء من المؤسسة</p>
+              <p className="text-sm font-bold text-white mt-0.5 truncate">{orgMembership.org_name}</p>
+            </div>
+            <div className="flex items-center gap-1 shrink-0">
+              <Star size={14} className="text-[#FFB800] fill-[#FFB800]" />
+              <span className="text-sm font-bold text-[#FFB800]">{orgMembership.org_rating || '0.0'}</span>
+            </div>
+          </div>
+        )}
+
       </div>
 
       {modalIndex !== null && gallery[modalIndex] && (
diff --git a/app/client/home/page.tsx b/app/client/home/page.tsx
index 4bf520b..baad7d4 100644
--- a/app/client/home/page.tsx
+++ b/app/client/home/page.tsx
@@ -207,14 +207,14 @@ export default function ClientHomePage() {
           {loading ? (
             <div className="space-y-4">{[1,2].map(i => <div key={i} className="h-24 rounded-2xl bg-white/5 animate-pulse" />)}</div>
           ) : (
-            <div className="space-y-4">
+            <div className="flex flex-col gap-5">
               {workers.map((item) => {
                 const isOrg = 'listing_type' in item && item.listing_type === 'organization'
                 const orgItem = item as OrgCard
                 const workerItem = item as any
                 return (
                   <Link key={item.id} href={isOrg ? `/client/organization/${item.id}` : `/client/craftsman/${item.id}`}>
-                    <div className="flex items-center gap-4 p-4 rounded-2xl border border-white/5 bg-[#0F172A]/60">
+                    <div className="flex items-center gap-4 p-4 rounded-2xl border border-[#FF8A00]/30 bg-[#0F172A]/60">
                       <div className="w-16 h-16 rounded-xl overflow-hidden flex-shrink-0 bg-[#1E2538]">
                         {isOrg ? (
                           orgItem.logo_url ? (
diff --git a/app/client/order/invoice/page.tsx b/app/client/order/invoice/page.tsx
index cad05fa..e81e348 100644
--- a/app/client/order/invoice/page.tsx
+++ b/app/client/order/invoice/page.tsx
@@ -10,6 +10,8 @@ interface BookingData {
   payment_method: string | null
   status: string
   created_at: string
+  organization_id: string | null
+  assigned_worker_id: string | null
   worker: {
     id: string
     full_name: string | null
@@ -17,6 +19,15 @@ interface BookingData {
     profession: string | null
     rating: number | null
   } | null
+  org: {
+    name: string
+    logo_url: string | null
+    rating: number | null
+  } | null
+  org_worker: {
+    display_name: string
+    avatar_url: string | null
+  } | null
 }
 
 function InvoiceContent() {
@@ -34,7 +45,7 @@ function InvoiceContent() {
       const supabase = createClient()
       const { data } = await supabase
         .from('bookings')
-        .select('*, worker:worker_id(id, full_name, avatar_url, profession, rating)')
+        .select('*, worker:worker_id(id, full_name, avatar_url, profession, rating), org:organization_id(name, logo_url, rating), org_worker:assigned_worker_id(display_name, avatar_url)')
         .eq('id', bookingId)
         .single()
       if (data) {
@@ -170,30 +181,47 @@ function InvoiceContent() {
               </div>
             </div>
 
-            {/* Craftsman Profile */}
-            {worker && (
-              <div className="px-6 py-4 border-t border-[#F1F5F9] flex items-center gap-4">
-                <div className="flex items-center gap-1">
-                  <span className="text-[#020617] text-sm font-semibold">{worker.rating?.toFixed(1) || '٤.٩'}</span>
-                  <svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-                    <path d="M2.23125 11.0833L3.17917 6.98542L0 4.22917L4.2 3.86458L5.83333 0L7.46667 3.86458L11.6667 4.22917L8.4875 6.98542L9.43542 11.0833L5.83333 8.91042L2.23125 11.0833Z" fill="#FFA500" />
-                  </svg>
-                </div>
-                <div className="flex-1 text-right">
-                  <p className="text-[#020617] text-sm font-semibold">{worker.full_name || 'حرفي'}</p>
-                  <p className="text-[#909099] text-xs font-medium">{worker.profession || 'حرفي معتمد'}</p>
-                </div>
-                <div className="w-12 h-12 rounded-full border-2 border-white overflow-hidden shadow-sm flex items-center justify-center bg-[#E2E8F0]">
-                  {worker.avatar_url ? (
-                    <img src={worker.avatar_url} alt="" className="w-full h-full object-cover" />
+            {/* Craftsman/Organization Profile */}
+            <div className="px-6 py-4 border-t border-[#F1F5F9] flex items-center gap-4">
+              <div className="flex items-center gap-1">
+                <span className="text-[#020617] text-sm font-semibold">
+                  {booking?.org
+                    ? (booking.org.rating?.toFixed(1) || '٤.٩')
+                    : (worker?.rating?.toFixed(1) || '٤.٩')
+                  }
+                </span>
+                <svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+                  <path d="M2.23125 11.0833L3.17917 6.98542L0 4.22917L4.2 3.86458L5.83333 0L7.46667 3.86458L11.6667 4.22917L8.4875 6.98542L9.43542 11.0833L5.83333 8.91042L2.23125 11.0833Z" fill="#FFA500" />
+                </svg>
+              </div>
+              <div className="flex-1 text-right">
+                <p className="text-[#020617] text-sm font-semibold">
+                  {booking?.org
+                    ? booking.org.name
+                    : (worker?.full_name || 'حرفي')
+                  }
+                </p>
+                <p className="text-[#909099] text-xs font-medium">
+                  {booking?.org
+                    ? (booking.org_worker?.display_name || 'حرفي')
+                    : (worker?.profession || 'حرفي معتمد')
+                  }
+                </p>
+              </div>
+              <div className="w-12 h-12 rounded-full border-2 border-white overflow-hidden shadow-sm flex items-center justify-center bg-[#E2E8F0]">
+                {booking?.org ? (
+                  booking.org.logo_url ? (
+                    <img src={booking.org.logo_url} alt="" className="w-full h-full object-cover" />
                   ) : (
-                    <span className="text-[#64748B] font-bold text-sm">
-                      {worker.full_name?.charAt(0) || '?'}
-                    </span>
-                  )}
-                </div>
+                    <span className="text-[#64748B] font-bold text-sm">{booking.org.name?.charAt(0) || '?'}</span>
+                  )
+                ) : worker?.avatar_url ? (
+                  <img src={worker.avatar_url} alt="" className="w-full h-full object-cover" />
+                ) : (
+                  <span className="text-[#64748B] font-bold text-sm">{worker?.full_name?.charAt(0) || '?'}</span>
+                )}
               </div>
-            )}
+            </div>
           </div>
         </div>
       )}
diff --git a/app/client/orders/page.tsx b/app/client/orders/page.tsx
index c89e824..24b6acc 100644
--- a/app/client/orders/page.tsx
+++ b/app/client/orders/page.tsx
@@ -4,6 +4,7 @@ import { useEffect, useState } from 'react'
 import { useRouter } from 'next/navigation'
 import { createClient } from '@/lib/supabase/client'
 import { getActiveSubscription } from '@/lib/supabase/subscriptions'
+import { Building2 } from 'lucide-react'
 interface Booking {
   id: string
   client_id: string
@@ -13,6 +14,8 @@ interface Booking {
   status: string
   price: number
   worker_id: string
+  organization_id: string | null
+  assigned_worker_id: string | null
   service_name: string
   address: string
   warranty_expires_at: string | null
@@ -22,6 +25,14 @@ interface Booking {
     avatar_url: string | null
     profession: string | null
   } | null
+  org: {
+    name: string
+    logo_url: string | null
+  } | null
+  org_worker: {
+    display_name: string
+    avatar_url: string | null
+  } | null
 }
 
 type TabKey = 'all' | 'in_progress' | 'completed' | 'cancelled'
@@ -80,7 +91,7 @@ export default function OrdersPage() {
 
       const { data } = await supabase
         .from('bookings')
-        .select('*, worker:worker_id(full_name, avatar_url, profession)')
+        .select('*, worker:worker_id(full_name, avatar_url, profession), org:organization_id(name, logo_url), org_worker:assigned_worker_id(display_name, avatar_url)')
         .eq('client_id', user.id)
         .order('created_at', { ascending: false })
 
@@ -206,7 +217,13 @@ export default function OrdersPage() {
                     {/* Avatar */}
                     <div className="relative flex-shrink-0">
                       <div className="w-16 h-16 rounded-full border-2 border-[#FFA504]/10 overflow-hidden bg-[#1E2538] flex items-center justify-center text-white font-bold text-lg">
-                        {booking.worker?.avatar_url ? (
+                        {booking.org ? (
+                          booking.org.logo_url ? (
+                            <img src={booking.org.logo_url} alt="" className="w-full h-full object-cover" />
+                          ) : (
+                            <Building2 size={20} className="text-[#FFA504]" />
+                          )
+                        ) : booking.worker?.avatar_url ? (
                           <img src={booking.worker.avatar_url} alt="" className="w-full h-full object-cover" />
                         ) : (
                           booking.worker?.full_name?.charAt(0) || '؟'
@@ -219,14 +236,17 @@ export default function OrdersPage() {
                     <div className="flex-1 min-w-0">
                       <div className="flex items-center justify-between">
                         <h3 className="text-white text-xl font-semibold truncate">
-                          {booking.worker?.profession || 'خدمة'}
+                          {booking.org ? booking.org.name : (booking.worker?.profession || 'خدمة')}
                         </h3>
                         <span style={{ color: statusInfo.color }} className="text-sm font-bold whitespace-nowrap">
                           {statusInfo.label}
                         </span>
                       </div>
                       <p className="text-[#73799F] text-sm font-semibold mt-0.5">
-                        {booking.worker?.full_name || 'حرفي'}
+                        {booking.org
+                          ? (booking.org_worker?.display_name || booking.worker?.full_name || 'حرفي')
+                          : (booking.worker?.full_name || 'حرفي')
+                        }
                       </p>
 
                       {/* Date & Time */}
diff --git a/app/client/organization/[id]/ClientPage.tsx b/app/client/organization/[id]/ClientPage.tsx
index e241ecc..2119cb3 100644
--- a/app/client/organization/[id]/ClientPage.tsx
+++ b/app/client/organization/[id]/ClientPage.tsx
@@ -3,14 +3,15 @@
 import { useEffect, useState } from 'react'
 import { useRouter } from 'next/navigation'
 import Image from 'next/image'
-import { ArrowLeft, Building2, Star, MapPin, User, Users, Briefcase, Image as ImageIcon, Phone } from 'lucide-react'
+import { ArrowLeft, Building2, Star, MapPin, User, Users, Briefcase, Image as ImageIcon, Phone, MessageSquare, ChevronLeft, ChevronRight, X } from 'lucide-react'
 import { createClient } from '@/lib/supabase/client'
-import type { Organization, OrganizationWorker, OrganizationWorkerPortfolio, OrganizationService, OrganizationGallery } from '@/lib/types'
+import type { Organization, OrganizationWorker, OrganizationWorkerPortfolio, OrganizationService, OrganizationGallery, OrganizationReview } from '@/lib/types'
 
 interface OrgProfile extends Organization {
   workers: (OrganizationWorker & { portfolio: OrganizationWorkerPortfolio[] })[]
   services: OrganizationService[]
   gallery: OrganizationGallery[]
+  reviews: OrganizationReview[]
   owner_phone?: string | null
   owner_email?: string | null
 }
@@ -20,6 +21,8 @@ export default function OrgProfilePage({ id }: { id: string }) {
   const supabase = createClient()
   const [org, setOrg] = useState<OrgProfile | null>(null)
   const [loading, setLoading] = useState(true)
+  const [selectedService, setSelectedService] = useState<OrganizationService | null>(null)
+  const [modalIndex, setModalIndex] = useState<number | null>(null)
 
   useEffect(() => {
     const fetchOrg = async () => {
@@ -31,7 +34,7 @@ export default function OrgProfilePage({ id }: { id: string }) {
         .single()
 
       if (orgData) {
-        const [workerData, servicesData, galleryData, ownerProfile] = await Promise.all([
+        const [workerData, servicesData, galleryData, ownerProfile, reviewsData] = await Promise.all([
           supabase
             .from('organization_workers')
             .select('*')
@@ -53,6 +56,12 @@ export default function OrgProfilePage({ id }: { id: string }) {
             .select('phone, email')
             .eq('id', orgData.owner_id)
             .maybeSingle(),
+          supabase
+            .from('organization_reviews')
+            .select('id, organization_id, client_id, booking_id, rating, text, created_at')
+            .eq('organization_id', orgData.id)
+            .order('created_at', { ascending: false })
+            .limit(20),
         ])
 
         const workersWithPortfolio = await Promise.all(
@@ -66,11 +75,29 @@ export default function OrgProfilePage({ id }: { id: string }) {
           })
         )
 
+        const reviewsWithNames: OrganizationReview[] = []
+        if (reviewsData.data && reviewsData.data.length > 0) {
+          const clientIds = [...new Set(reviewsData.data.map(r => r.client_id))]
+          const { data: clients } = await supabase
+            .from('profiles')
+            .select('id, full_name')
+            .in('id', clientIds)
+          const clientMap: Record<string, string> = {}
+          clients?.forEach(c => { clientMap[c.id] = c.full_name || 'عميل' })
+          reviewsWithNames.push(
+            ...reviewsData.data.map(r => ({
+              ...r,
+              client_name: clientMap[r.client_id] || 'عميل',
+            }))
+          )
+        }
+
         setOrg({
           ...orgData,
           workers: workersWithPortfolio,
           services: servicesData.data || [],
           gallery: galleryData.data || [],
+          reviews: reviewsWithNames,
           owner_phone: ownerProfile.data?.phone || null,
           owner_email: ownerProfile.data?.email || null,
         })
@@ -96,6 +123,9 @@ export default function OrgProfilePage({ id }: { id: string }) {
     )
   }
 
+  const avgRating = org.rating || 0
+  const reviewsCount = org.reviews_count || 0
+
   return (
     <div dir="rtl" className="min-h-screen bg-[#020617] pb-32">
       <div className="sticky top-0 z-10 bg-[#020617] px-4 h-14 flex items-center justify-between max-w-[512px] mx-auto">
@@ -107,7 +137,7 @@ export default function OrgProfilePage({ id }: { id: string }) {
       </div>
 
       <div className="max-w-[512px] mx-auto px-4">
-        {/* Org Header */}
+        {/* ── Org Header ── */}
         <div className="flex flex-col items-center pt-8">
           <div className="w-32 h-32 rounded-2xl border-4 border-[#2A2A2C] overflow-hidden bg-[#1E2538] flex items-center justify-center">
             {org.logo_url ? (
@@ -133,7 +163,7 @@ export default function OrgProfilePage({ id }: { id: string }) {
           )}
         </div>
 
-        {/* Stats */}
+        {/* ── Stats ── */}
         <div className="flex items-center justify-center gap-3 mt-6">
           <div className="flex-1 bg-[#0C1222] rounded-2xl py-4 text-center">
             <div className="flex items-center justify-center gap-1">
@@ -148,55 +178,133 @@ export default function OrgProfilePage({ id }: { id: string }) {
             <p className="text-white/70 text-sm mt-1">خدمات</p>
           </div>
           <div className="flex-1 bg-[#0C1222] rounded-2xl py-4 text-center">
-            <Star size={20} className="text-[#FFB800] mx-auto" />
-            <p className="text-white/70 text-sm mt-1">قريباً</p>
+            <div className="flex items-center justify-center gap-1">
+              <Star size={16} className="text-[#FFB800] fill-[#FFB800]" />
+              <p className="text-white font-bold">{avgRating > 0 ? avgRating : '0'}</p>
+            </div>
+            <p className="text-white/70 text-sm mt-1">{reviewsCount > 0 ? `${reviewsCount} تقييم` : 'لا توجد تقييمات'}</p>
           </div>
         </div>
 
-        {/* Gallery */}
-        {org.gallery.length > 0 && (
-          <div className="mt-8">
-            <h3 className="text-white font-bold text-base mb-4 flex items-center gap-2">
-              <ImageIcon size={16} className="text-[#FF8A00]" />
-              معرض الأعمال
-            </h3>
-            <div className="grid grid-cols-4 gap-2">
-              {org.gallery.map((photo) => (
-                <div key={photo.id} className="aspect-square rounded-xl overflow-hidden bg-[#1E2538]">
-                  <Image src={photo.image_url} alt="" width={200} height={200} className="w-full h-full object-cover" />
+        {/* ── Services Catalog (like worker profile) ── */}
+        <div className="mt-8">
+          <h3 className="text-white font-bold text-base mb-4 flex items-center gap-2">
+            <Briefcase size={16} className="text-[#FF8A00]" />
+            كتالوج الخدمات
+          </h3>
+          {org.services.length > 0 ? (
+            <div className="flex flex-col gap-3">
+              {org.services.map(service => {
+                const isSelected = selectedService?.id === service.id
+                return (
+                  <div
+                    key={service.id}
+                    onClick={() => setSelectedService(isSelected ? null : service)}
+                    className={`bg-[#0C1222] border rounded-2xl p-4 flex items-start justify-between cursor-pointer transition-all active:scale-[0.99] ${
+                      isSelected ? 'border-[#FF8A00] bg-[#FF8A00]/5' : 'border-white/5'
+                    }`}
+                  >
+                    <div className="flex-1 pr-1 text-right flex flex-col gap-1">
+                      <span className="font-bold text-sm text-white">{service.name}</span>
+                      {service.description && (
+                        <p className="text-[#C7C5CF] text-xs leading-5">{service.description}</p>
+                      )}
+                      {service.price != null && (
+                        <div className="flex items-center gap-2 mt-2">
+                          <span className="text-[10px] bg-[#FF8A00]/10 text-[#FF8A00] px-2 py-0.5 rounded-md font-bold">
+                            {service.price} ج.م
+                          </span>
+                        </div>
+                      )}
+                    </div>
+                    <div className="flex items-center justify-center mr-4 self-center">
+                      <div className={`w-8 h-8 rounded-full flex items-center justify-center font-bold text-xs transition-colors ${
+                        isSelected ? 'bg-[#FF8A00] text-white' : 'bg-white/10 text-white hover:bg-[#FF8A00]/20'
+                      }`}>
+                        {isSelected ? '✓' : '+'}
+                      </div>
+                    </div>
+                  </div>
+                )
+              })}
+            </div>
+          ) : (
+            <div className="text-center py-8 bg-[#0C1222]/50 rounded-2xl border border-dashed border-white/5">
+              <Briefcase size={24} className="text-[#6B7A99] mx-auto mb-2" />
+              <span className="text-xs text-[#6B7A99]">لا توجد خدمات محددة حالياً</span>
+            </div>
+          )}
+        </div>
+
+        {/* ── Portfolio (5 photos) ── */}
+        <div className="mt-8">
+          <h3 className="text-white font-bold text-base mb-4 flex items-center gap-2">
+            <ImageIcon size={16} className="text-[#FF8A00]" />
+            معرض الأعمال
+            {org.gallery.length > 0 && (
+              <span className="text-white/40 text-xs font-normal">({org.gallery.length})</span>
+            )}
+          </h3>
+          {org.gallery.length > 0 ? (
+            <div className="grid grid-cols-2 gap-2">
+              {org.gallery.slice(0, 5).map((photo, i) => (
+                <div
+                  key={photo.id}
+                  onClick={() => setModalIndex(i)}
+                  className={`rounded-xl overflow-hidden bg-[#1E2538] cursor-pointer active:scale-[0.98] transition-transform ${
+                    i === 0 && org.gallery.length === 5 ? 'col-span-2 aspect-[2/1]' : 'aspect-square'
+                  }`}
+                >
+                  <Image src={photo.image_url} alt="" width={400} height={400} className="w-full h-full object-cover" />
                 </div>
               ))}
             </div>
-          </div>
-        )}
+          ) : (
+            <div className="text-center py-8 bg-[#0C1222]/50 rounded-2xl border border-dashed border-white/5">
+              <ImageIcon size={24} className="text-[#6B7A99] mx-auto mb-2" />
+              <span className="text-xs text-[#6B7A99]">لا توجد صور في المعرض بعد</span>
+            </div>
+          )}
+        </div>
 
-        {/* Services */}
-        {org.services.length > 0 && (
-          <div className="mt-8">
-            <h3 className="text-white font-bold text-base mb-4">الخدمات</h3>
-            <div className="flex flex-col gap-3">
-              {org.services.map((service) => (
-                <div key={service.id} className="bg-[#0C1222] rounded-2xl p-4 border border-white/5">
+        {/* ── Reviews Section ── */}
+        <div className="mt-8">
+          <h3 className="text-white font-bold text-base mb-4 flex items-center gap-2">
+            <MessageSquare size={16} className="text-[#FF8A00]" />
+            التقييمات
+            {reviewsCount > 0 && (
+              <span className="text-white/40 text-xs font-normal">({reviewsCount})</span>
+            )}
+          </h3>
+          {org.reviews.length > 0 ? (
+            <div className="space-y-3">
+              {org.reviews.map(review => (
+                <div key={review.id} className="bg-[#0F172A]/60 rounded-2xl p-4 border border-white/5">
                   <div className="flex items-center justify-between">
-                    <div>
-                      <h4 className="text-white font-bold text-sm">{service.name}</h4>
-                      {service.description && (
-                        <p className="text-[#C7C5CF] text-xs mt-1 leading-5">{service.description}</p>
-                      )}
+                    <div className="flex items-center gap-1">
+                      <Star size={12} className="text-[#FFA504] fill-[#FFA504]" />
+                      <span className="text-[#FFA504] text-sm font-bold">{review.rating}</span>
                     </div>
-                    {service.price && (
-                      <span className="text-[#FF8A00] font-bold text-sm shrink-0 mr-3">{service.price} ج.م</span>
-                    )}
+                    <span className="text-white font-medium text-sm">{review.client_name || 'عميل'}</span>
                   </div>
+                  {review.text && <p className="text-[#C7C5CF] text-xs mt-2">{review.text}</p>}
                 </div>
               ))}
             </div>
-          </div>
-        )}
+          ) : (
+            <div className="text-center py-8 bg-[#0C1222]/50 rounded-2xl border border-dashed border-white/5">
+              <MessageSquare size={24} className="text-[#6B7A99] mx-auto mb-2" />
+              <span className="text-xs text-[#6B7A99]">لا توجد تقييمات بعد</span>
+            </div>
+          )}
+        </div>
 
-        {/* Workers */}
+        {/* ── Workers (team) ── */}
         <div className="mt-8">
-          <h3 className="text-white font-bold text-base mb-4">فريق العمل</h3>
+          <h3 className="text-white font-bold text-base mb-4 flex items-center gap-2">
+            <Users size={16} className="text-[#FF8A00]" />
+            فريق العمل
+          </h3>
           {org.workers.length === 0 ? (
             <div className="text-center py-8 bg-[#0C1222]/50 rounded-2xl border border-dashed border-white/5">
               <span className="text-xs text-[#6B7A99]">لا يوجد عمال مسجلين حالياً</span>
@@ -237,14 +345,88 @@ export default function OrgProfilePage({ id }: { id: string }) {
         </div>
       </div>
 
-      {/* Book CTA */}
-      <div className="fixed bottom-0 left-0 right-0 bg-[#020617] border-t border-white/5 p-4">
+      {/* ── Gallery Modal ── */}
+      {modalIndex !== null && org.gallery[modalIndex] && (
+        <div
+          onClick={() => setModalIndex(null)}
+          className="fixed inset-0 z-50 flex items-center justify-center p-4"
+          style={{ backgroundColor: 'rgba(0,0,0,0.8)' }}
+        >
+          <div
+            onClick={e => e.stopPropagation()}
+            className="w-full flex flex-col"
+            style={{ backgroundColor: '#0A0D1A', borderRadius: 24, maxWidth: 440, border: '1px solid rgba(255,255,255,0.1)', maxHeight: '85vh' }}
+          >
+            <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', padding: '16px 20px', borderBottom: '1px solid rgba(255,255,255,0.05)' }}>
+              <span style={{ color: 'white', fontWeight: 700, fontSize: 18 }}>
+                معرض الأعمال
+              </span>
+              <button onClick={() => setModalIndex(null)} style={{ color: 'rgba(255,255,255,0.5)', background: 'none', border: 'none', cursor: 'pointer' }}>
+                <X size={24} />
+              </button>
+            </div>
+
+            <div style={{ padding: 20, display: 'flex', flexDirection: 'column', gap: 16, overflowY: 'auto' }}>
+              <div className="rounded-2xl overflow-hidden" style={{ borderRadius: 16, overflow: 'hidden' }}>
+                <div className="aspect-square bg-[#1E2538] relative">
+                  <Image
+                    src={org.gallery[modalIndex].image_url}
+                    alt=""
+                    width={400}
+                    height={400}
+                    className="w-full h-full object-cover"
+                  />
+                </div>
+              </div>
+
+              <div className="flex items-center justify-between gap-2">
+                <button
+                  disabled={modalIndex === 0}
+                  onClick={() => setModalIndex(modalIndex - 1)}
+                  style={{
+                    flex: 1, padding: '10px 0', borderRadius: 12, border: 'none', cursor: modalIndex > 0 ? 'pointer' : 'not-allowed',
+                    backgroundColor: modalIndex > 0 ? 'rgba(255,255,255,0.1)' : 'rgba(255,255,255,0.05)',
+                    color: modalIndex > 0 ? 'white' : 'rgba(255,255,255,0.3)',
+                    fontSize: 14, fontWeight: 500
+                  }}
+                >
+                  <div className="flex items-center justify-center gap-1">
+                    <ChevronRight size={16} />
+                    <span>السابق</span>
+                  </div>
+                </button>
+
+                <span style={{ color: 'rgba(255,255,255,0.5)', fontSize: 12, whiteSpace: 'nowrap' }}>{modalIndex + 1} / {org.gallery.length}</span>
+
+                <button
+                  disabled={modalIndex === org.gallery.length - 1}
+                  onClick={() => setModalIndex(modalIndex + 1)}
+                  style={{
+                    flex: 1, padding: '10px 0', borderRadius: 12, border: 'none', cursor: modalIndex < org.gallery.length - 1 ? 'pointer' : 'not-allowed',
+                    backgroundColor: modalIndex < org.gallery.length - 1 ? 'rgba(255,255,255,0.1)' : 'rgba(255,255,255,0.05)',
+                    color: modalIndex < org.gallery.length - 1 ? 'white' : 'rgba(255,255,255,0.3)',
+                    fontSize: 14, fontWeight: 500
+                  }}
+                >
+                  <div className="flex items-center justify-center gap-1">
+                    <span>التالي</span>
+                    <ChevronLeft size={16} />
+                  </div>
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>
+      )}
+
+      {/* ── Book CTA ── */}
+      <div className="fixed bottom-[88px] left-0 right-0 z-[60] bg-[#020617] border-t border-white/5 p-4">
         <div className="max-w-[512px] mx-auto">
           <button
             onClick={() => router.push(`/client/booking/${org.id}?organization_id=${org.id}`)}
             className="w-full py-4 rounded-xl bg-gradient-to-l from-[#FF8A00] to-[#FFB800] text-white text-xl font-medium shadow-lg shadow-[#FF8A00]/20"
           >
-            احجز المؤسسة
+            {selectedService ? `حجز ${selectedService.name}` : 'احجز المؤسسة'}
           </button>
         </div>
       </div>
diff --git a/app/client/rate-review/[bookingId]/ClientPage.tsx b/app/client/rate-review/[bookingId]/ClientPage.tsx
index 6440bb4..1f37130 100644
--- a/app/client/rate-review/[bookingId]/ClientPage.tsx
+++ b/app/client/rate-review/[bookingId]/ClientPage.tsx
@@ -22,22 +22,37 @@ export default function RateReviewPage() {
   const [loading, setLoading] = useState(true)
   const [submitting, setSubmitting] = useState(false)
   const [submitted, setSubmitted] = useState(false)
+  const [orgName, setOrgName] = useState('')
+  const [orgId, setOrgId] = useState('')
+  const [isOrgBooking, setIsOrgBooking] = useState(false)
 
   useEffect(() => {
     if (!bookingId) return
     const fetchBooking = async () => {
       const { data } = await supabase
         .from('bookings')
-        .select('*, worker:worker_id(id, full_name, avatar_url, profession)')
+        .select('*, worker:worker_id(id, full_name, avatar_url, profession), org:organization_id(name, logo_url), org_worker:assigned_worker_id(display_name, avatar_url)')
         .eq('id', bookingId)
         .single()
       if (data) {
-        const w = data.worker
-        if (w) {
-          setWorkerId(w.id)
-          setWorkerName(w.full_name || 'حرفي')
-          setWorkerProfession(w.profession || '')
-          setWorkerAvatar(w.avatar_url || '')
+        const isOrg = !!data.organization_id
+        setIsOrgBooking(isOrg)
+        setOrgId(data.organization_id || '')
+
+        if (isOrg) {
+          setOrgName(data.org?.name || 'المؤسسة')
+          setWorkerName(data.org_worker?.display_name || data.worker?.full_name || 'حرفي')
+          setWorkerAvatar(data.org_worker?.avatar_url || data.worker?.avatar_url || '')
+          setWorkerProfession(data.worker?.profession || '')
+          setWorkerId(data.worker?.id || '')
+        } else {
+          const w = data.worker
+          if (w) {
+            setWorkerId(w.id)
+            setWorkerName(w.full_name || 'حرفي')
+            setWorkerProfession(w.profession || '')
+            setWorkerAvatar(w.avatar_url || '')
+          }
         }
       }
       setLoading(false)
@@ -51,6 +66,7 @@ export default function RateReviewPage() {
     const { data: { user } } = await supabase.auth.getUser()
     if (!user) { setSubmitting(false); return }
 
+    // Insert worker review (trigger will auto-add org review if applicable)
     const { error } = await supabase
       .from('reviews')
       .insert({
@@ -73,7 +89,8 @@ export default function RateReviewPage() {
     // Mark booking as closed
     await supabase.from('bookings').update({ status: 'closed' }).eq('id', bookingId)
 
-    createNotification(user.id, 'تم إضافة تقييم', `قيمت ${workerName} بتقييم ${rating} نجوم`)
+    const rateName = isOrgBooking ? orgName : workerName
+    createNotification(user.id, 'تم إضافة تقييم', `قيمت ${rateName} بتقييم ${rating} نجوم`)
     setSubmitted(true)
     setSubmitting(false)
   }
@@ -115,7 +132,7 @@ export default function RateReviewPage() {
           <button onClick={() => router.back()} className="absolute right-4">
             <ArrowLeft size={16} className="text-[#E4E1E5]" />
           </button>
-          <h1 className="text-[#E4E1E5] text-xl font-bold">تقييم الحرفي</h1>
+          <h1 className="text-[#E4E1E5] text-xl font-bold">تقييم {isOrgBooking ? 'المؤسسة' : 'الحرفي'}</h1>
         </div>
       </div>
 
@@ -128,7 +145,9 @@ export default function RateReviewPage() {
               workerName.charAt(0) || '?'
             )}
           </div>
-          <h2 className="text-white text-lg font-bold mt-2">{workerName}</h2>
+          <h2 className="text-white text-lg font-bold mt-2">
+            {isOrgBooking ? orgName : workerName}
+          </h2>
           {workerProfession && (
             <p className="text-[#C7C5CF] text-sm font-bold">{workerProfession}</p>
           )}
diff --git a/app/client/services/[categoryId]/ClientPage.tsx b/app/client/services/[categoryId]/ClientPage.tsx
index 31f7aad..e3ba691 100644
--- a/app/client/services/[categoryId]/ClientPage.tsx
+++ b/app/client/services/[categoryId]/ClientPage.tsx
@@ -56,14 +56,14 @@ export default function ServicesPage() {
             <p>لا يوجد حرفيين متاحين حالياً</p>
           </div>
         ) : (
-          <div className="space-y-4 mt-2">
+          <div className="flex flex-col gap-5 mt-2">
             {workers.map((item) => {
               const isOrg = 'listing_type' in item && item.listing_type === 'organization'
               const orgItem = item as OrgServiceWorker
               const workerItem = item as any
               return (
                 <Link key={item.id} href={isOrg ? `/client/organization/${item.id}` : `/client/craftsman/${item.id}`}>
-                  <div className="flex items-center gap-4 p-4 rounded-2xl bg-[#0F172A]/60 shadow-sm">
+                  <div className="flex items-center gap-4 p-4 rounded-2xl border border-[#FF8A00]/30 bg-[#0F172A]/60 shadow-sm">
                     <div className="flex flex-col items-center gap-0.5">
                       <div className="w-16 h-16 rounded-full overflow-hidden border-2 border-[#FFA504]/10 bg-[#1E2538] flex items-center justify-center">
                         {isOrg ? (
diff --git a/app/organization/home/page.tsx b/app/organization/home/page.tsx
index 017f3c6..8809719 100644
--- a/app/organization/home/page.tsx
+++ b/app/organization/home/page.tsx
@@ -2,9 +2,12 @@
 
 import { useState, useEffect } from 'react'
 import { useRouter } from 'next/navigation'
+import Link from 'next/link'
 import {
-  Building2, Users, Plus, Pencil, Trash2, Camera, X, Upload,
-  Search, UserPlus, User, Crown, ArrowUpCircle, Image as ImageIcon
+  Building2, Users, Plus, Pencil, Camera, X, Upload,
+  Crown, ArrowUpCircle, Image as ImageIcon,
+  ClipboardList, Clock, CheckCircle2, Banknote, TrendingUp, Star,
+  ArrowLeft, CalendarDays, User
 } from 'lucide-react'
 import { PageHeader } from '@/components/ui/PageHeader'
 import { SubPageLayout } from '@/components/ui/SubPageLayout'
@@ -19,9 +22,8 @@ export default function OrgHomePage() {
   const { profile } = useAuth()
   const supabase = createClient()
   const {
-    org, workers, loading, refresh,
-    createOrg, updateOrg, addWorker, removeWorker, addPortfolioPhoto, removePortfolioPhoto,
-    workerLimit, canAddWorker,
+    org, loading,
+    createOrg, updateOrg,
   } = useOrganization()
 
   const [showCreateForm, setShowCreateForm] = useState(false)
@@ -33,20 +35,88 @@ export default function OrgHomePage() {
   const [orgLogo, setOrgLogo] = useState<string | null>(null)
   const [orgSubmitting, setOrgSubmitting] = useState(false)
 
-  const [showAddWorker, setShowAddWorker] = useState(false)
-  const [workerName, setWorkerName] = useState('')
-  const [workerPhone, setWorkerPhone] = useState('')
-  const [workerAvatar, setWorkerAvatar] = useState<string | null>(null)
-  const [workerSearchQuery, setWorkerSearchQuery] = useState('')
-  const [searchResults, setSearchResults] = useState<any[]>([])
-  const [selectedLinkedUser, setSelectedLinkedUser] = useState<any | null>(null)
-  const [workerSubmitting, setWorkerSubmitting] = useState(false)
-
-  const [uploadingWorkerId, setUploadingWorkerId] = useState<string | null>(null)
-
   const [gallery, setGallery] = useState<{ id: string; image_url: string }[]>([])
   const [uploadingGallery, setUploadingGallery] = useState(false)
 
+  const [stats, setStats] = useState({
+    total: 0,
+    pending: 0,
+    confirmed: 0,
+    completed: 0,
+    revenue: 0,
+    rating: 0,
+    reviewsCount: 0,
+  })
+  const [recentOrders, setRecentOrders] = useState<any[]>([])
+  const [recentWorkerAssignments, setRecentWorkerAssignments] = useState<any[]>([])
+
+  useEffect(() => {
+    if (!org?.id) return
+    const fetchDashboardData = async () => {
+      const [totalRes, pendingRes, confirmedRes, completedRes, revenueRes, orgRes, reviewsRes] = await Promise.all([
+        supabase.from('bookings').select('*', { count: 'exact', head: true }).eq('organization_id', org.id),
+        supabase.from('bookings').select('*', { count: 'exact', head: true }).eq('organization_id', org.id).eq('status', 'pending'),
+        supabase.from('bookings').select('*', { count: 'exact', head: true }).eq('organization_id', org.id).in('status', ['confirmed', 'in_progress', 'awaiting_payment_confirmation', 'awaiting_code_entry']),
+        supabase.from('bookings').select('*', { count: 'exact', head: true }).eq('organization_id', org.id).eq('status', 'completed'),
+        supabase.from('bookings').select('price').eq('organization_id', org.id).eq('status', 'completed'),
+        supabase.from('organizations').select('rating, reviews_count').eq('id', org.id).single(),
+        supabase.from('organization_reviews').select('id', { count: 'exact', head: true }).eq('organization_id', org.id),
+      ])
+
+      const revenue = (revenueRes.data || []).reduce((sum: number, b: any) => sum + (b.price || 0), 0)
+
+      setStats({
+        total: totalRes.count || 0,
+        pending: pendingRes.count || 0,
+        confirmed: confirmedRes.count || 0,
+        completed: completedRes.count || 0,
+        revenue,
+        rating: orgRes.data?.rating || 0,
+        reviewsCount: orgRes.data?.reviews_count || reviewsRes.count || 0,
+      })
+
+      const { data: recent } = await supabase
+        .from('bookings')
+        .select('id, service_name, status, price, appointment_date, appointment_time, created_at, client:client_id(full_name, avatar_url)')
+        .eq('organization_id', org.id)
+        .order('created_at', { ascending: false })
+        .limit(5)
+
+      if (recent) setRecentOrders(recent)
+
+      const { data: workerBookings } = await supabase
+        .from('bookings')
+        .select('id, service_name, status, created_at, worker_id, craftsman_id, organization_id')
+        .eq('organization_id', org.id)
+        .not('worker_id', 'is', null)
+        .order('created_at', { ascending: false })
+        .limit(5)
+
+      if (workerBookings && workerBookings.length > 0) {
+        const workerIds = [...new Set(workerBookings.map(b => b.worker_id).filter(Boolean))]
+        const craftsmanIds = [...new Set(workerBookings.map(b => b.craftsman_id).filter(Boolean))]
+
+        const [linkedWorkersRes, orgWorkersRes, profilesRes] = await Promise.all([
+          workerIds.length > 0 ? supabase.from('organization_workers').select('id, display_name, avatar_url, linked_user_id').in('id', workerIds) : Promise.resolve({ data: [] }),
+          craftsmanIds.length > 0 ? supabase.from('organization_workers').select('id, display_name, avatar_url, linked_user_id').in('id', craftsmanIds) : Promise.resolve({ data: [] }),
+          craftsmanIds.length > 0 ? supabase.from('profiles').select('id, full_name, avatar_url').in('id', craftsmanIds) : Promise.resolve({ data: [] }),
+        ])
+
+        const workerMap = new Map<string, any>()
+        ;(linkedWorkersRes.data || []).forEach((w: any) => workerMap.set(w.id, w))
+        ;(orgWorkersRes.data || []).forEach((w: any) => workerMap.set(w.id, w))
+        ;(profilesRes.data || []).forEach((p: any) => workerMap.set(p.id, { display_name: p.full_name, avatar_url: p.avatar_url, id: p.id, linked_user_id: p.id }))
+
+        const assignments = workerBookings.map(b => ({
+          ...b,
+          worker: workerMap.get(b.worker_id) || workerMap.get(b.craftsman_id) || null,
+        }))
+        setRecentWorkerAssignments(assignments)
+      }
+    }
+    fetchDashboardData()
+  }, [org?.id, supabase])
+
   useEffect(() => {
     if (!org?.id) return
     supabase.from('organization_gallery').select('id, image_url').eq('organization_id', org.id).order('sort_order', { ascending: true }).then(({ data }) => {
@@ -142,68 +212,27 @@ export default function OrgHomePage() {
     reader.readAsDataURL(file)
   }
 
-  const handleSearchUser = async (q: string) => {
-    setWorkerSearchQuery(q)
-    if (q.trim().length < 2) { setSearchResults([]); return }
-    const { data } = await supabase
-      .from('profiles')
-      .select('id, full_name, avatar_url, phone')
-      .or(`full_name.ilike.%${q}%,phone.ilike.%${q}%`)
-      .eq('role', 'worker')
-      .limit(5)
-    setSearchResults(data as any[] || [])
-  }
-
-  const handleAddWorker = async (e: React.FormEvent) => {
-    e.preventDefault()
-    if (!workerName.trim()) return
-    setWorkerSubmitting(true)
-    try {
-      await addWorker({
-        display_name: workerName.trim(),
-        linked_user_id: selectedLinkedUser?.id || null,
-        avatar_url: selectedLinkedUser?.avatar_url || workerAvatar || null,
-        phone: workerPhone || null,
-      })
-      setShowAddWorker(false)
-      setWorkerName('')
-      setWorkerPhone('')
-      setWorkerAvatar(null)
-      setWorkerSearchQuery('')
-      setSearchResults([])
-      setSelectedLinkedUser(null)
-    } catch (err: any) {
-      if (err?.message === 'WORKER_LIMIT_REACHED') {
-        alert('لقد وصلت إلى الحد الأقصى لعدد العمال في الباقة المجانية. قم بالترقية للباقة الاحترافية لإضافة المزيد.')
-      } else {
-        console.error('Add worker error:', err)
-      }
+  const statusLabel = (s: string) => {
+    const map: Record<string, string> = {
+      pending: 'جديد', confirmed: 'مؤكد', completed: 'مكتمل', cancelled: 'ملغي',
+      in_progress: 'قيد التنفيذ', awaiting_payment_confirmation: 'بانتظار الدفع',
+      awaiting_code_entry: 'بانتظار الكود', disputed: 'متنازع',
     }
-    setWorkerSubmitting(false)
+    return map[s] || s
   }
 
-  const handlePortfolioUpload = async (workerId: string, e: React.ChangeEvent<HTMLInputElement>) => {
-    const file = e.target.files?.[0]
-    if (!file) return
-    setUploadingWorkerId(workerId)
-    const reader = new FileReader()
-    reader.onloadend = async () => {
-      try {
-        const res = await fetch('/api/upload-booking-images', {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ images: [reader.result] }),
-        })
-        const result = await res.json()
-        if (result.success && result.urls[0]) {
-          await addPortfolioPhoto(workerId, result.urls[0])
-        }
-      } catch (err) {
-        console.error(err)
-      }
-      setUploadingWorkerId(null)
+  const statusColor = (s: string) => {
+    const map: Record<string, string> = {
+      pending: 'text-[#FF8A00] bg-[#FF8A00]/10',
+      confirmed: 'text-blue-400 bg-blue-400/10',
+      completed: 'text-[#22C55E] bg-[#22C55E]/10',
+      cancelled: 'text-red-400 bg-red-400/10',
+      in_progress: 'text-purple-400 bg-purple-400/10',
+      awaiting_payment_confirmation: 'text-yellow-400 bg-yellow-400/10',
+      awaiting_code_entry: 'text-cyan-400 bg-cyan-400/10',
+      disputed: 'text-red-400 bg-red-400/10',
     }
-    reader.readAsDataURL(file)
+    return map[s] || 'text-gray-400 bg-gray-400/10'
   }
 
   if (loading) {
@@ -292,9 +321,10 @@ export default function OrgHomePage() {
 
   return (
     <SubPageLayout>
-      <PageHeader title="المؤسسة" />
+      <PageHeader title="لوحة التحكم" />
 
-      <div className="mx-6 mb-6 bg-gradient-to-br from-[#0A0D1A] to-[#0F1322] border border-white/5 rounded-2xl p-5">
+      {/* ── Org Header Card ── */}
+      <div className="mx-6 mb-4 bg-gradient-to-br from-[#0A0D1A] to-[#0F1322] border border-white/5 rounded-2xl p-5">
         <div className="flex items-start gap-4">
           <div className="w-16 h-16 rounded-2xl overflow-hidden bg-[#1E2538] flex items-center justify-center shrink-0">
             {org?.logo_url ? (
@@ -311,7 +341,6 @@ export default function OrgHomePage() {
               </button>
             </div>
             {org?.category && <p className="text-xs text-[#FF8A00] mt-1">{org.category}</p>}
-            {org?.description && <p className="text-xs text-[#6B7A99] mt-2 leading-5">{org.description}</p>}
             {org?.city && <p className="text-xs text-[#4B5A7A] mt-1">{org.city}</p>}
           </div>
         </div>
@@ -320,7 +349,7 @@ export default function OrgHomePage() {
             <div className="flex items-center gap-2">
               <Users size={16} className="text-[#FF8A00]" />
               <span className="text-sm font-bold">{org?.worker_count || 0}</span>
-              <span className="text-xs text-[#6B7A99]">/ {workerLimit === Infinity ? '∞' : workerLimit} عامل</span>
+              <span className="text-xs text-[#6B7A99]">عامل</span>
             </div>
             <div className={`flex items-center gap-1 text-[10px] font-bold px-2 py-1 rounded-full ${org?.plan === 'pro' ? 'bg-gradient-to-r from-[#FF8A00] to-[#FFB800] text-[#050814]' : 'bg-[#1E2538] text-[#6B7A99]'}`}>
               {org?.plan === 'pro' ? <Crown size={10} /> : <Building2 size={10} />}
@@ -336,56 +365,155 @@ export default function OrgHomePage() {
         </div>
       </div>
 
-      {showEditForm && (
-        <div className="fixed inset-0 z-50 bg-black/60 flex items-end sm:items-center justify-center">
-          <div className="w-full max-w-[480px] bg-[#050814] border border-white/10 rounded-t-3xl sm:rounded-3xl max-h-[85vh] overflow-y-auto">
-            <div className="sticky top-0 bg-[#050814] z-10 flex items-center justify-between px-6 py-4 border-b border-white/5">
-              <h3 className="text-base font-bold">تعديل المؤسسة</h3>
-              <button onClick={() => setShowEditForm(false)}><X size={20} className="text-[#6B7A99]" /></button>
+      {/* ── Stats Grid ── */}
+      <div className="mx-6 mb-4 grid grid-cols-2 gap-3">
+        <div className="bg-[#0C1222] rounded-2xl p-4 border border-white/5">
+          <div className="flex items-center gap-2 mb-2">
+            <div className="w-8 h-8 rounded-lg bg-[#FF8A00]/10 flex items-center justify-center">
+              <ClipboardList size={14} className="text-[#FF8A00]" />
             </div>
-            <form onSubmit={handleUpdateOrg} className="flex flex-col gap-5 p-6">
-              <div className="flex flex-col items-center mb-2">
-                <div className="relative w-20 h-20 mb-2">
-                  <div className="w-full h-full rounded-2xl overflow-hidden border-2 border-dashed border-[#1E2538] bg-[#0A0D1A] flex items-center justify-center">
-                    {orgLogo ? <Image src={orgLogo} alt="" fill className="object-cover" /> : <Building2 size={24} className="text-[#6B7A99]" />}
+            <span className="text-[10px] text-[#6B7A99]">إجمالي الطلبات</span>
+          </div>
+          <p className="text-2xl font-bold text-white">{stats.total}</p>
+        </div>
+        <div className="bg-[#0C1222] rounded-2xl p-4 border border-white/5">
+          <div className="flex items-center gap-2 mb-2">
+            <div className="w-8 h-8 rounded-lg bg-[#FF8A00]/10 flex items-center justify-center">
+              <Clock size={14} className="text-[#FF8A00]" />
+            </div>
+            <span className="text-[10px] text-[#6B7A99]">قيد الانتظار</span>
+          </div>
+          <p className="text-2xl font-bold text-white">{stats.pending}</p>
+        </div>
+        <div className="bg-[#0C1222] rounded-2xl p-4 border border-white/5">
+          <div className="flex items-center gap-2 mb-2">
+            <div className="w-8 h-8 rounded-lg bg-[#22C55E]/10 flex items-center justify-center">
+              <CheckCircle2 size={14} className="text-[#22C55E]" />
+            </div>
+            <span className="text-[10px] text-[#6B7A99]">مكتملة</span>
+          </div>
+          <p className="text-2xl font-bold text-white">{stats.completed}</p>
+        </div>
+        <div className="bg-[#0C1222] rounded-2xl p-4 border border-white/5">
+          <div className="flex items-center gap-2 mb-2">
+            <div className="w-8 h-8 rounded-lg bg-[#22C55E]/10 flex items-center justify-center">
+              <Banknote size={14} className="text-[#22C55E]" />
+            </div>
+            <span className="text-[10px] text-[#6B7A99]">الإيرادات</span>
+          </div>
+          <p className="text-2xl font-bold text-[#22C55E]">{stats.revenue} <span className="text-sm">ج.م</span></p>
+        </div>
+      </div>
+
+      {/* ── Rating & Reviews ── */}
+      <div className="mx-6 mb-4 bg-[#0C1222] rounded-2xl p-4 border border-white/5 flex items-center justify-between">
+        <div className="flex items-center gap-3">
+          <div className="w-10 h-10 rounded-xl bg-[#FFB800]/10 flex items-center justify-center">
+            <Star size={18} className="text-[#FFB800] fill-[#FFB800]" />
+          </div>
+          <div>
+            <div className="flex items-center gap-1">
+              <span className="text-lg font-bold text-white">{stats.rating > 0 ? stats.rating : '—'}</span>
+              <span className="text-xs text-[#6B7A99]">/ 5</span>
+            </div>
+            <span className="text-[10px] text-[#6B7A99]">{stats.reviewsCount} تقييم</span>
+          </div>
+        </div>
+        <Link href="/organization/orders" className="flex items-center gap-1 text-xs text-[#FF8A00] font-bold">
+          <span>عرض الطلبات</span>
+          <ArrowLeft size={14} />
+        </Link>
+      </div>
+
+      {/* ── Recent Orders ── */}
+      <div className="mx-6 mb-4">
+        <div className="flex items-center justify-between mb-3">
+          <h3 className="text-sm font-bold flex items-center gap-2">
+            <CalendarDays size={16} className="text-[#FF8A00]" />
+            آخر الطلبات
+          </h3>
+          <Link href="/organization/orders" className="text-xs text-[#FF8A00] font-bold flex items-center gap-1">
+            <span>عرض الكل</span>
+            <ArrowLeft size={12} />
+          </Link>
+        </div>
+        {recentOrders.length === 0 ? (
+          <div className="bg-[#0A0D1A] rounded-2xl p-6 flex flex-col items-center text-center border border-dashed border-white/5">
+            <ClipboardList size={28} className="text-[#4B5A7A] mb-2" />
+            <p className="text-xs text-[#6B7A99]">لا توجد طلبات بعد</p>
+          </div>
+        ) : (
+          <div className="flex flex-col gap-2">
+            {recentOrders.map((order) => (
+              <div key={order.id} className="bg-[#0C1222] rounded-xl p-3 border border-white/5 flex items-center justify-between">
+                <div className="flex items-center gap-3 min-w-0">
+                  <div className="relative w-9 h-9 rounded-full overflow-hidden bg-[#1E2538] shrink-0">
+                    <Image
+                      src={order.client?.avatar_url || '/client_avatar.png'}
+                      alt=""
+                      width={36}
+                      height={36}
+                      className="w-full h-full object-cover"
+                    />
+                  </div>
+                  <div className="min-w-0">
+                    <p className="text-xs font-bold text-white truncate">{order.client?.full_name || 'عميل'}</p>
+                    <p className="text-[10px] text-[#6B7A99] truncate">{order.service_name}</p>
                   </div>
-                  <button type="button" onClick={() => document.getElementById('edit-org-logo')?.click()} className="absolute -bottom-1 -left-1 w-7 h-7 bg-[#FF8A00] rounded-full flex items-center justify-center border-2 border-[#050814]">
-                    <Camera size={10} className="text-[#050814]" />
-                  </button>
-                  <input id="edit-org-logo" type="file" accept="image/*" className="hidden" onChange={handleLogoUpload} />
+                </div>
+                <div className="flex flex-col items-end shrink-0 ml-3">
+                  <span className={`text-[10px] px-2 py-0.5 rounded-full font-bold ${statusColor(order.status)}`}>
+                    {statusLabel(order.status)}
+                  </span>
+                  <span className="text-[10px] text-[#6B7A99] mt-1">{order.price} ج.م</span>
                 </div>
               </div>
-              <FormInput label="اسم المؤسسة" value={orgName} onChange={e => setOrgName(e.target.value)} required />
-              <div className="flex flex-col gap-2">
-                <label className="text-xs text-[#6B7A99] font-bold px-1">التخصص</label>
-                <select value={orgCategory} onChange={e => setOrgCategory(e.target.value)} className="w-full bg-[#0A0D1A] border border-white/5 rounded-2xl py-4 px-4 text-sm focus:border-[#FF8A00] outline-none transition-colors text-white">
-                  <option value="">اختر التخصص</option>
-                  {categories.map(c => <option key={c} value={c}>{c}</option>)}
-                </select>
-              </div>
-              <FormInput label="المدينة" value={orgCity} onChange={e => setOrgCity(e.target.value)} />
-              <textarea value={orgDesc} onChange={e => setOrgDesc(e.target.value)} placeholder="وصف المؤسسة..." rows={3} className="w-full bg-[#0A0D1A] border border-white/5 rounded-2xl py-4 px-4 text-sm focus:border-[#FF8A00] outline-none transition-colors resize-none" />
-              <button type="submit" disabled={orgSubmitting} className="w-full bg-gradient-to-r from-[#FF8A00] to-[#FFB800] text-[#050814] font-bold rounded-2xl py-4 shadow-[0_4px_20px_rgba(255,138,0,0.3)] hover:opacity-90 disabled:opacity-50 transition-opacity">
-                {orgSubmitting ? 'جاري الحفظ...' : 'حفظ التغييرات'}
-              </button>
-            </form>
+            ))}
           </div>
+        )}
+      </div>
+
+      {/* ── Quick Actions ── */}
+      <div className="mx-6 mb-4">
+        <h3 className="text-sm font-bold mb-3">إجراءات سريعة</h3>
+        <div className="grid grid-cols-2 gap-3">
+          <Link href="/organization/orders" className="bg-[#0C1222] rounded-2xl p-4 border border-white/5 flex flex-col items-center gap-2 hover:border-[#FF8A00]/20 transition-colors">
+            <ClipboardList size={20} className="text-[#FF8A00]" />
+            <span className="text-xs font-bold">الطلبات</span>
+            {stats.pending > 0 && (
+              <span className="text-[10px] bg-[#FF8A00] text-white px-2 py-0.5 rounded-full font-bold">{stats.pending} جديد</span>
+            )}
+          </Link>
+          <Link href="/organization/workers" className="bg-[#0C1222] rounded-2xl p-4 border border-white/5 flex flex-col items-center gap-2 hover:border-[#FF8A00]/20 transition-colors">
+            <Users size={20} className="text-[#FF8A00]" />
+            <span className="text-xs font-bold">العمال</span>
+            <span className="text-[10px] text-[#6B7A99]">{org?.worker_count || 0} عامل</span>
+          </Link>
+          <Link href="/organization/settings/services" className="bg-[#0C1222] rounded-2xl p-4 border border-white/5 flex flex-col items-center gap-2 hover:border-[#FF8A00]/20 transition-colors">
+            <TrendingUp size={20} className="text-[#FF8A00]" />
+            <span className="text-xs font-bold">الخدمات</span>
+          </Link>
+          <Link href="/organization/wallet" className="bg-[#0C1222] rounded-2xl p-4 border border-white/5 flex flex-col items-center gap-2 hover:border-[#FF8A00]/20 transition-colors">
+            <Banknote size={20} className="text-[#FF8A00]" />
+            <span className="text-xs font-bold">المحفظة</span>
+            <span className="text-[10px] text-[#22C55E] font-bold">{stats.revenue} ج.م</span>
+          </Link>
         </div>
-      )}
+      </div>
 
-      {/* Gallery Section */}
+      {/* ── Gallery Section ── */}
       <div className="mx-6 mb-4">
         <div className="flex items-center justify-between mb-3">
           <h3 className="text-sm font-bold flex items-center gap-2">
             <ImageIcon size={16} className="text-[#FF8A00]" />
             معرض الأعمال
           </h3>
-          {gallery.length < 4 && (
+          {gallery.length < 5 && (
             <>
               <input type="file" accept="image/*" className="hidden" id="gallery-upload" onChange={handleGalleryUpload} />
               <button onClick={() => document.getElementById('gallery-upload')?.click()} disabled={uploadingGallery} className="text-xs text-[#FF8A00] font-bold flex items-center gap-1">
                 <Upload size={12} />
-                {uploadingGallery ? 'جاري الرفع...' : `إضافة صورة (${gallery.length}/4)`}
+                {uploadingGallery ? 'جاري الرفع...' : `إضافة صورة (${gallery.length}/5)`}
               </button>
             </>
           )}
@@ -393,7 +521,7 @@ export default function OrgHomePage() {
         {gallery.length === 0 ? (
           <div className="bg-[#0A0D1A] rounded-2xl p-6 flex flex-col items-center text-center border border-dashed border-white/5">
             <ImageIcon size={28} className="text-[#4B5A7A] mb-2" />
-            <p className="text-xs text-[#6B7A99]">أضف صوراً لأعمال المؤسسة (الحد الأقصى 4)</p>
+            <p className="text-xs text-[#6B7A99]">أضف صوراً لأعمال المؤسسة (الحد الأقصى 5)</p>
           </div>
         ) : (
           <div className="grid grid-cols-4 gap-2">
@@ -409,170 +537,89 @@ export default function OrgHomePage() {
         )}
       </div>
 
-      <div className="px-6">
-        <div className="flex items-center justify-between mb-4">
-          <h3 className="text-sm font-bold">العمال والفنيين</h3>
-          {canAddWorker ? (
-            <button onClick={() => setShowAddWorker(true)} className="text-xs text-[#FF8A00] font-bold flex items-center gap-1">
-              <UserPlus size={14} />
-              إضافة عامل
-            </button>
-          ) : (
-            <button onClick={() => router.push('/organization/settings')} className="text-xs text-[#EF4444] font-bold flex items-center gap-1">
-              <ArrowUpCircle size={14} />
-              ترقية للاستمرار
-            </button>
-          )}
+      {/* ── Recent Worker Assignments ── */}
+      <div className="px-6 mb-6">
+        <div className="flex items-center justify-between mb-3">
+          <h3 className="text-sm font-bold flex items-center gap-2">
+            <Users size={16} className="text-[#FF8A00]" />
+            آخر عمال تم تعيينهم
+          </h3>
+          <Link href="/organization/workers" className="text-xs text-[#FF8A00] font-bold flex items-center gap-1">
+            <span>عرض الكل</span>
+            <ArrowLeft size={12} />
+          </Link>
         </div>
-        {!canAddWorker && workers.length > 0 && (
-          <div className="bg-[#1E1212] border border-[#EF4444]/20 rounded-2xl p-3 mb-4 flex items-center gap-2">
-            <Crown size={16} className="text-[#EF4444] shrink-0" />
-            <p className="text-xs text-[#EF4444]">لقد وصلت للحد الأقصى للعمال ({workerLimit === Infinity ? '∞' : workerLimit}). قم بالترقية للباقة الاحترافية لإضافة المزيد.</p>
-          </div>
-        )}
-
-        {workers.length === 0 ? (
-          <div className="bg-[#0A0D1A] rounded-2xl p-8 flex flex-col items-center text-center border border-white/5">
-            <Users size={32} className="text-[#4B5A7A] mb-3" />
-            <p className="text-sm text-[#6B7A99] mb-2">لا يوجد عمال بعد</p>
-            <p className="text-xs text-[#4B5A7A]">أضف العمال إلى مؤسستك لعرضهم للعملاء</p>
+        {recentWorkerAssignments.length === 0 ? (
+          <div className="bg-[#0A0D1A] rounded-2xl p-6 flex flex-col items-center text-center border border-dashed border-white/5">
+            <Users size={28} className="text-[#4B5A7A] mb-2" />
+            <p className="text-xs text-[#6B7A99]">لا توجد تعيينات بعد</p>
           </div>
         ) : (
-          <div className="flex flex-col gap-3">
-            {workers.map((worker) => (
-              <div key={worker.id} className="bg-[#0A0D1A] rounded-2xl p-4 border border-white/5">
-                <div className="flex items-center gap-3">
-                  <div className="w-12 h-12 rounded-xl overflow-hidden bg-[#1E2538] flex items-center justify-center shrink-0">
-                    {worker.avatar_url ? (
-                      <Image src={worker.avatar_url} alt="" width={48} height={48} className="w-full h-full object-cover" />
+          <div className="flex flex-col gap-2">
+            {recentWorkerAssignments.map((assignment) => (
+              <div key={assignment.id} className="bg-[#0C1222] rounded-xl p-3 border border-white/5 flex items-center justify-between">
+                <div className="flex items-center gap-3 min-w-0">
+                  <div className="relative w-9 h-9 rounded-full overflow-hidden bg-[#1E2538] shrink-0 flex items-center justify-center">
+                    {assignment.worker?.avatar_url ? (
+                      <Image src={assignment.worker.avatar_url} alt="" width={36} height={36} className="w-full h-full object-cover" />
                     ) : (
-                      <User size={20} className="text-[#6B7A99]" />
+                      <User size={14} className="text-[#6B7A99]" />
                     )}
                   </div>
-                  <div className="flex-1 min-w-0">
-                    <h4 className="text-sm font-bold">{worker.display_name}</h4>
-                    <div className="flex items-center gap-2 mt-1">
-                      {worker.linked_user_id && <span className="text-[10px] bg-[#FF8A00]/10 text-[#FF8A00] px-2 py-0.5 rounded-full">حساب مرتبط</span>}
-                      {worker.phone && <span className="text-[10px] text-[#4B5A7A]">{worker.phone}</span>}
-                    </div>
+                  <div className="min-w-0">
+                    <p className="text-xs font-bold text-white truncate">{assignment.worker?.display_name || 'عامل'}</p>
+                    <p className="text-[10px] text-[#6B7A99] truncate">{assignment.service_name}</p>
                   </div>
-                  <button onClick={() => removeWorker(worker.id)} className="w-8 h-8 rounded-full bg-[#1E1212] flex items-center justify-center hover:bg-[#2A1515] transition-colors">
-                    <Trash2 size={14} className="text-[#EF4444]" />
-                  </button>
                 </div>
-
-                {worker.portfolio.length > 0 && (
-                  <div className="flex gap-2 mt-3 overflow-x-auto pb-1">
-                    {worker.portfolio.map((photo: any) => (
-                      <div key={photo.id} className="relative w-16 h-16 rounded-xl overflow-hidden bg-[#1E2538] shrink-0 group">
-                        <Image src={photo.image_url} alt="" width={64} height={64} className="w-full h-full object-cover" />
-                        <button onClick={() => removePortfolioPhoto(photo.id)} className="absolute inset-0 bg-black/50 flex items-center justify-center opacity-0 group-hover:opacity-100 transition-opacity">
-                          <X size={14} className="text-white" />
-                        </button>
-                      </div>
-                    ))}
-                  </div>
-                )}
-
-                {worker.portfolio.length < 4 && (
-                  <div className="mt-3">
-                    <input
-                      type="file"
-                      accept="image/*"
-                      className="hidden"
-                      id={`portfolio-${worker.id}`}
-                      onChange={(e) => handlePortfolioUpload(worker.id, e)}
-                    />
-                    <button
-                      type="button"
-                      onClick={() => document.getElementById(`portfolio-${worker.id}`)?.click()}
-                      disabled={uploadingWorkerId === worker.id}
-                      className="text-xs text-[#6B7A99] flex items-center gap-1 hover:text-[#FF8A00] transition-colors"
-                    >
-                      <Upload size={12} />
-                      {uploadingWorkerId === worker.id ? 'جاري الرفع...' : `إضافة صورة (${worker.portfolio.length}/4)`}
-                    </button>
-                  </div>
-                )}
+                <div className="flex flex-col items-end shrink-0 ml-3">
+                  <span className={`text-[10px] px-2 py-0.5 rounded-full font-bold ${statusColor(assignment.status)}`}>
+                    {statusLabel(assignment.status)}
+                  </span>
+                </div>
               </div>
             ))}
           </div>
         )}
       </div>
 
-      {showAddWorker && (
+      {/* ── Edit Modal ── */}
+      {showEditForm && (
         <div className="fixed inset-0 z-50 bg-black/60 flex items-end sm:items-center justify-center">
           <div className="w-full max-w-[480px] bg-[#050814] border border-white/10 rounded-t-3xl sm:rounded-3xl max-h-[85vh] overflow-y-auto">
             <div className="sticky top-0 bg-[#050814] z-10 flex items-center justify-between px-6 py-4 border-b border-white/5">
-              <h3 className="text-base font-bold">إضافة عامل</h3>
-              <button onClick={() => { setShowAddWorker(false); setSelectedLinkedUser(null); setWorkerSearchQuery(''); setSearchResults([]) }}><X size={20} className="text-[#6B7A99]" /></button>
+              <h3 className="text-base font-bold">تعديل المؤسسة</h3>
+              <button onClick={() => setShowEditForm(false)}><X size={20} className="text-[#6B7A99]" /></button>
             </div>
-            <form onSubmit={handleAddWorker} className="flex flex-col gap-5 p-6">
-              <div className="flex flex-col gap-2">
-                <label className="text-xs text-[#6B7A99] font-bold px-1">البحث عن حساب حرفي مرتبط</label>
-                <div className="relative">
-                  <Search size={16} className="absolute top-1/2 -translate-y-1/2 right-4 text-[#6B7A99]" />
-                  <input
-                    value={workerSearchQuery}
-                    onChange={e => handleSearchUser(e.target.value)}
-                    placeholder="ابحث بالاسم أو رقم الهاتف..."
-                    className="w-full bg-[#0A0D1A] border border-white/5 rounded-2xl py-4 pr-12 pl-4 text-sm focus:border-[#FF8A00] outline-none transition-colors"
-                  />
-                </div>
-                {searchResults.length > 0 && (
-                  <div className="bg-[#0A0D1A] border border-white/5 rounded-2xl overflow-hidden mt-1">
-                    {searchResults.map((u) => (
-                      <button
-                        key={u.id}
-                        type="button"
-                        onClick={() => {
-                          setSelectedLinkedUser(u)
-                          setWorkerName(u.full_name || '')
-                          setWorkerAvatar(u.avatar_url)
-                          setWorkerSearchQuery('')
-                          setSearchResults([])
-                        }}
-                        className="w-full flex items-center gap-3 px-4 py-3 hover:bg-[#1E2538] transition-colors text-right"
-                      >
-                        <div className="w-10 h-10 rounded-full bg-[#1E2538] overflow-hidden shrink-0 flex items-center justify-center">
-                          {u.avatar_url ? <Image src={u.avatar_url} alt="" width={40} height={40} className="w-full h-full object-cover" /> : <User size={16} className="text-[#6B7A99]" />}
-                        </div>
-                        <div className="text-right">
-                          <p className="text-sm font-bold">{u.full_name}</p>
-                          {u.phone && <p className="text-xs text-[#6B7A99]">{u.phone}</p>}
-                        </div>
-                      </button>
-                    ))}
-                  </div>
-                )}
-                {selectedLinkedUser && (
-                  <div className="bg-[#FF8A00]/10 border border-[#FF8A00]/20 rounded-2xl p-3 flex items-center gap-3 mt-1">
-                    <div className="w-10 h-10 rounded-full bg-[#1E2538] overflow-hidden shrink-0 flex items-center justify-center">
-                      {selectedLinkedUser.avatar_url ? <Image src={selectedLinkedUser.avatar_url} alt="" width={40} height={40} className="w-full h-full object-cover" /> : <User size={16} className="text-[#FF8A00]" />}
-                    </div>
-                    <div className="flex-1">
-                      <p className="text-sm font-bold text-[#FF8A00]">{selectedLinkedUser.full_name}</p>
-                      <p className="text-xs text-[#6B7A99]">سيتم ربط الحساب بهذا العامل</p>
-                    </div>
-                    <button type="button" onClick={() => { setSelectedLinkedUser(null); setWorkerName(''); setWorkerAvatar(null) }}>
-                      <X size={16} className="text-[#6B7A99]" />
-                    </button>
+            <form onSubmit={handleUpdateOrg} className="flex flex-col gap-5 p-6">
+              <div className="flex flex-col items-center mb-2">
+                <div className="relative w-20 h-20 mb-2">
+                  <div className="w-full h-full rounded-2xl overflow-hidden border-2 border-dashed border-[#1E2538] bg-[#0A0D1A] flex items-center justify-center">
+                    {orgLogo ? <Image src={orgLogo} alt="" fill className="object-cover" /> : <Building2 size={24} className="text-[#6B7A99]" />}
                   </div>
-                )}
+                  <button type="button" onClick={() => document.getElementById('edit-org-logo')?.click()} className="absolute -bottom-1 -left-1 w-7 h-7 bg-[#FF8A00] rounded-full flex items-center justify-center border-2 border-[#050814]">
+                    <Camera size={10} className="text-[#050814]" />
+                  </button>
+                  <input id="edit-org-logo" type="file" accept="image/*" className="hidden" onChange={handleLogoUpload} />
+                </div>
               </div>
-
-              <div className="h-px bg-gradient-to-r from-transparent via-white/10 to-transparent" />
-
-              <FormInput label="اسم العامل" value={workerName} onChange={e => setWorkerName(e.target.value)} placeholder="أدخل اسم العامل" required />
-              <FormInput label="رقم الهاتف (اختياري)" type="tel" value={workerPhone} onChange={e => setWorkerPhone(e.target.value)} placeholder="01xxxxxxxxx" dir="ltr" className="text-right" />
-
-              <button type="submit" disabled={workerSubmitting || !workerName.trim()} className="w-full bg-gradient-to-r from-[#FF8A00] to-[#FFB800] text-[#050814] font-bold rounded-2xl py-4 shadow-[0_4px_20px_rgba(255,138,0,0.3)] hover:opacity-90 disabled:opacity-50 transition-opacity">
-                {workerSubmitting ? 'جاري الإضافة...' : 'إضافة العامل'}
+              <FormInput label="اسم المؤسسة" value={orgName} onChange={e => setOrgName(e.target.value)} required />
+              <div className="flex flex-col gap-2">
+                <label className="text-xs text-[#6B7A99] font-bold px-1">التخصص</label>
+                <select value={orgCategory} onChange={e => setOrgCategory(e.target.value)} className="w-full bg-[#0A0D1A] border border-white/5 rounded-2xl py-4 px-4 text-sm focus:border-[#FF8A00] outline-none transition-colors text-white">
+                  <option value="">اختر التخصص</option>
+                  {categories.map(c => <option key={c} value={c}>{c}</option>)}
+                </select>
+              </div>
+              <FormInput label="المدينة" value={orgCity} onChange={e => setOrgCity(e.target.value)} />
+              <textarea value={orgDesc} onChange={e => setOrgDesc(e.target.value)} placeholder="وصف المؤسسة..." rows={3} className="w-full bg-[#0A0D1A] border border-white/5 rounded-2xl py-4 px-4 text-sm focus:border-[#FF8A00] outline-none transition-colors resize-none" />
+              <button type="submit" disabled={orgSubmitting} className="w-full bg-gradient-to-r from-[#FF8A00] to-[#FFB800] text-[#050814] font-bold rounded-2xl py-4 shadow-[0_4px_20px_rgba(255,138,0,0.3)] hover:opacity-90 disabled:opacity-50 transition-opacity">
+                {orgSubmitting ? 'جاري الحفظ...' : 'حفظ التغييرات'}
               </button>
             </form>
           </div>
         </div>
       )}
+
     </SubPageLayout>
   )
 }
diff --git a/app/organization/layout.tsx b/app/organization/layout.tsx
index ce3c7d5..a5d1972 100644
--- a/app/organization/layout.tsx
+++ b/app/organization/layout.tsx
@@ -1,13 +1,14 @@
 'use client'
 import Link from 'next/link'
 import { usePathname } from 'next/navigation'
-import { Building2, ClipboardList, MessageSquare, Wallet, Settings } from 'lucide-react'
+import { Building2, ClipboardList, Users, MessageSquare, Wallet, Settings } from 'lucide-react'
 
 export default function OrgLayout({ children }: { children: React.ReactNode }) {
   const p = usePathname()
   const tabs = [
     { h: '/organization/home', i: Building2, l: 'المؤسسة' },
     { h: '/organization/orders', i: ClipboardList, l: 'الطلبات' },
+    { h: '/organization/workers', i: Users, l: 'العمال' },
     { h: '/organization/messages', i: MessageSquare, l: 'الرسائل' },
     { h: '/organization/wallet', i: Wallet, l: 'المحفظة' },
     { h: '/organization/settings', i: Settings, l: 'الإعدادات' },
diff --git a/app/organization/workers/page.tsx b/app/organization/workers/page.tsx
new file mode 100644
index 0000000..3225283
--- /dev/null
+++ b/app/organization/workers/page.tsx
@@ -0,0 +1,296 @@
+'use client'
+
+import { useState } from 'react'
+import { useRouter } from 'next/navigation'
+import Image from 'next/image'
+import {
+  Users, Plus, Trash2, Upload, X, Search, UserPlus, User, Crown,
+  ArrowUpCircle, Camera
+} from 'lucide-react'
+import { PageHeader } from '@/components/ui/PageHeader'
+import { SubPageLayout } from '@/components/ui/SubPageLayout'
+import { FormInput } from '@/components/ui/forms/FormInput'
+import { useOrganization } from '@/hooks/useOrganization'
+import { createClient } from '@/lib/supabase/client'
+
+export default function OrgWorkersPage() {
+  const router = useRouter()
+  const supabase = createClient()
+  const {
+    org, workers, loading, refresh,
+    addWorker, removeWorker, addPortfolioPhoto, removePortfolioPhoto,
+    workerLimit, canAddWorker,
+  } = useOrganization()
+
+  const [showAddWorker, setShowAddWorker] = useState(false)
+  const [workerName, setWorkerName] = useState('')
+  const [workerPhone, setWorkerPhone] = useState('')
+  const [workerAvatar, setWorkerAvatar] = useState<string | null>(null)
+  const [workerSearchQuery, setWorkerSearchQuery] = useState('')
+  const [searchResults, setSearchResults] = useState<any[]>([])
+  const [selectedLinkedUser, setSelectedLinkedUser] = useState<any | null>(null)
+  const [workerSubmitting, setWorkerSubmitting] = useState(false)
+  const [uploadingWorkerId, setUploadingWorkerId] = useState<string | null>(null)
+
+  const handleSearchUser = async (q: string) => {
+    setWorkerSearchQuery(q)
+    if (q.trim().length < 2) { setSearchResults([]); return }
+    const { data } = await supabase
+      .from('profiles')
+      .select('id, full_name, avatar_url, phone')
+      .or(`full_name.ilike.%${q}%,phone.ilike.%${q}%`)
+      .eq('role', 'worker')
+      .limit(5)
+    setSearchResults(data as any[] || [])
+  }
+
+  const handleAddWorker = async (e: React.FormEvent) => {
+    e.preventDefault()
+    if (!workerName.trim()) return
+    setWorkerSubmitting(true)
+    try {
+      await addWorker({
+        display_name: workerName.trim(),
+        linked_user_id: selectedLinkedUser?.id || null,
+        avatar_url: selectedLinkedUser?.avatar_url || workerAvatar || null,
+        phone: workerPhone || null,
+      })
+      setShowAddWorker(false)
+      setWorkerName('')
+      setWorkerPhone('')
+      setWorkerAvatar(null)
+      setWorkerSearchQuery('')
+      setSearchResults([])
+      setSelectedLinkedUser(null)
+    } catch (err: any) {
+      if (err?.message === 'WORKER_LIMIT_REACHED') {
+        alert('لقد وصلت إلى الحد الأقصى لعدد العمال في الباقة المجانية. قم بالترقية للباقة الاحترافية لإضافة المزيد.')
+      } else {
+        console.error('Add worker error:', err)
+      }
+    }
+    setWorkerSubmitting(false)
+  }
+
+  const handlePortfolioUpload = async (workerId: string, e: React.ChangeEvent<HTMLInputElement>) => {
+    const file = e.target.files?.[0]
+    if (!file) return
+    setUploadingWorkerId(workerId)
+    const reader = new FileReader()
+    reader.onloadend = async () => {
+      try {
+        const res = await fetch('/api/upload-booking-images', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ images: [reader.result] }),
+        })
+        const result = await res.json()
+        if (result.success && result.urls[0]) {
+          await addPortfolioPhoto(workerId, result.urls[0])
+        }
+      } catch (err) {
+        console.error(err)
+      }
+      setUploadingWorkerId(null)
+    }
+    reader.readAsDataURL(file)
+  }
+
+  if (loading) {
+    return (
+      <SubPageLayout>
+        <PageHeader title="العمال" />
+        <div className="flex items-center justify-center py-20">
+          <div className="w-8 h-8 border-2 border-[#FF8A00] border-t-transparent rounded-full animate-spin" />
+        </div>
+      </SubPageLayout>
+    )
+  }
+
+  return (
+    <SubPageLayout>
+      <PageHeader title="العمال والفنيين" />
+
+      <div className="px-6 pt-4">
+        {/* Plan limit warning */}
+        {!canAddWorker && workers.length > 0 && (
+          <div className="bg-[#1E1212] border border-[#EF4444]/20 rounded-2xl p-3 mb-4 flex items-center gap-2">
+            <Crown size={16} className="text-[#EF4444] shrink-0" />
+            <p className="text-xs text-[#EF4444]">لقد وصلت للحد الأقصى للعمال ({workerLimit === Infinity ? '∞' : workerLimit}). قم بالترقية للباقة الاحترافية لإضافة المزيد.</p>
+          </div>
+        )}
+
+        {/* Worker count */}
+        <div className="flex items-center justify-between mb-4">
+          <div className="flex items-center gap-2">
+            <Users size={16} className="text-[#FF8A00]" />
+            <span className="text-sm font-bold">{workers.filter(w => w.is_active !== false).length} عامل</span>
+            <span className="text-xs text-[#6B7A99]">/ {workerLimit === Infinity ? '∞' : workerLimit}</span>
+          </div>
+          {canAddWorker ? (
+            <button onClick={() => setShowAddWorker(true)} className="text-xs text-[#FF8A00] font-bold flex items-center gap-1">
+              <UserPlus size={14} />
+              إضافة عامل
+            </button>
+          ) : (
+            <button onClick={() => router.push('/organization/settings')} className="text-xs text-[#EF4444] font-bold flex items-center gap-1">
+              <ArrowUpCircle size={14} />
+              ترقية
+            </button>
+          )}
+        </div>
+
+        {/* Workers list */}
+        {workers.length === 0 ? (
+          <div className="bg-[#0A0D1A] rounded-2xl p-10 flex flex-col items-center text-center border border-dashed border-white/5">
+            <Users size={40} className="text-[#4B5A7A] mb-3" />
+            <p className="text-sm text-[#6B7A99] mb-2">لا يوجد عمال بعد</p>
+            <p className="text-xs text-[#4B5A7A] mb-4">أضف العمال إلى مؤسستك لعرضهم للعملاء</p>
+            <button
+              onClick={() => setShowAddWorker(true)}
+              className="bg-gradient-to-r from-[#FF8A00] to-[#FFB800] text-[#050814] font-bold rounded-xl py-3 px-6 text-sm flex items-center gap-2"
+            >
+              <UserPlus size={16} />
+              إضافة أول عامل
+            </button>
+          </div>
+        ) : (
+          <div className="flex flex-col gap-3">
+            {workers.map((worker) => (
+              <div key={worker.id} className="bg-[#0A0D1A] rounded-2xl p-4 border border-white/5">
+                <div className="flex items-center gap-3">
+                  <div className="w-12 h-12 rounded-xl overflow-hidden bg-[#1E2538] flex items-center justify-center shrink-0">
+                    {worker.avatar_url ? (
+                      <Image src={worker.avatar_url} alt="" width={48} height={48} className="w-full h-full object-cover" />
+                    ) : (
+                      <User size={20} className="text-[#6B7A99]" />
+                    )}
+                  </div>
+                  <div className="flex-1 min-w-0">
+                    <h4 className="text-sm font-bold">{worker.display_name}</h4>
+                    <div className="flex items-center gap-2 mt-1">
+                      {worker.linked_user_id && <span className="text-[10px] bg-[#FF8A00]/10 text-[#FF8A00] px-2 py-0.5 rounded-full">حساب مرتبط</span>}
+                      {worker.phone && <span className="text-[10px] text-[#4B5A7A]">{worker.phone}</span>}
+                    </div>
+                  </div>
+                  <button onClick={() => removeWorker(worker.id)} className="w-8 h-8 rounded-full bg-[#1E1212] flex items-center justify-center hover:bg-[#2A1515] transition-colors">
+                    <Trash2 size={14} className="text-[#EF4444]" />
+                  </button>
+                </div>
+
+                {worker.portfolio.length > 0 && (
+                  <div className="flex gap-2 mt-3 overflow-x-auto pb-1">
+                    {worker.portfolio.map((photo: any) => (
+                      <div key={photo.id} className="relative w-16 h-16 rounded-xl overflow-hidden bg-[#1E2538] shrink-0 group">
+                        <Image src={photo.image_url} alt="" width={64} height={64} className="w-full h-full object-cover" />
+                        <button onClick={() => removePortfolioPhoto(photo.id)} className="absolute inset-0 bg-black/50 flex items-center justify-center opacity-0 group-hover:opacity-100 transition-opacity">
+                          <X size={14} className="text-white" />
+                        </button>
+                      </div>
+                    ))}
+                  </div>
+                )}
+
+                {worker.portfolio.length < 4 && (
+                  <div className="mt-3">
+                    <input
+                      type="file"
+                      accept="image/*"
+                      className="hidden"
+                      id={`portfolio-${worker.id}`}
+                      onChange={(e) => handlePortfolioUpload(worker.id, e)}
+                    />
+                    <button
+                      type="button"
+                      onClick={() => document.getElementById(`portfolio-${worker.id}`)?.click()}
+                      disabled={uploadingWorkerId === worker.id}
+                      className="text-xs text-[#6B7A99] flex items-center gap-1 hover:text-[#FF8A00] transition-colors"
+                    >
+                      <Upload size={12} />
+                      {uploadingWorkerId === worker.id ? 'جاري الرفع...' : `إضافة صورة (${worker.portfolio.length}/4)`}
+                    </button>
+                  </div>
+                )}
+              </div>
+            ))}
+          </div>
+        )}
+      </div>
+
+      {/* Add Worker Modal */}
+      {showAddWorker && (
+        <div className="fixed inset-0 z-50 bg-black/60 flex items-end sm:items-center justify-center">
+          <div className="w-full max-w-[480px] bg-[#050814] border border-white/10 rounded-t-3xl sm:rounded-3xl max-h-[85vh] overflow-y-auto">
+            <div className="sticky top-0 bg-[#050814] z-10 flex items-center justify-between px-6 py-4 border-b border-white/5">
+              <h3 className="text-base font-bold">إضافة عامل</h3>
+              <button onClick={() => { setShowAddWorker(false); setSelectedLinkedUser(null); setWorkerSearchQuery(''); setSearchResults([]) }}><X size={20} className="text-[#6B7A99]" /></button>
+            </div>
+            <form onSubmit={handleAddWorker} className="flex flex-col gap-5 p-6">
+              <div className="flex flex-col gap-2">
+                <label className="text-xs text-[#6B7A99] font-bold px-1">البحث عن حساب حرفي مرتبط</label>
+                <div className="relative">
+                  <Search size={16} className="absolute top-1/2 -translate-y-1/2 right-4 text-[#6B7A99]" />
+                  <input
+                    value={workerSearchQuery}
+                    onChange={e => handleSearchUser(e.target.value)}
+                    placeholder="ابحث بالاسم أو رقم الهاتف..."
+                    className="w-full bg-[#0A0D1A] border border-white/5 rounded-2xl py-4 pr-12 pl-4 text-sm focus:border-[#FF8A00] outline-none transition-colors"
+                  />
+                </div>
+                {searchResults.length > 0 && (
+                  <div className="bg-[#0A0D1A] border border-white/5 rounded-2xl overflow-hidden mt-1">
+                    {searchResults.map((u) => (
+                      <button
+                        key={u.id}
+                        type="button"
+                        onClick={() => {
+                          setSelectedLinkedUser(u)
+                          setWorkerName(u.full_name || '')
+                          setWorkerAvatar(u.avatar_url)
+                          setWorkerSearchQuery('')
+                          setSearchResults([])
+                        }}
+                        className="w-full flex items-center gap-3 px-4 py-3 hover:bg-[#1E2538] transition-colors text-right"
+                      >
+                        <div className="w-10 h-10 rounded-full bg-[#1E2538] overflow-hidden shrink-0 flex items-center justify-center">
+                          {u.avatar_url ? <Image src={u.avatar_url} alt="" width={40} height={40} className="w-full h-full object-cover" /> : <User size={16} className="text-[#6B7A99]" />}
+                        </div>
+                        <div className="text-right">
+                          <p className="text-sm font-bold">{u.full_name}</p>
+                          {u.phone && <p className="text-xs text-[#6B7A99]">{u.phone}</p>}
+                        </div>
+                      </button>
+                    ))}
+                  </div>
+                )}
+                {selectedLinkedUser && (
+                  <div className="bg-[#FF8A00]/10 border border-[#FF8A00]/20 rounded-2xl p-3 flex items-center gap-3 mt-1">
+                    <div className="w-10 h-10 rounded-full bg-[#1E2538] overflow-hidden shrink-0 flex items-center justify-center">
+                      {selectedLinkedUser.avatar_url ? <Image src={selectedLinkedUser.avatar_url} alt="" width={40} height={40} className="w-full h-full object-cover" /> : <User size={16} className="text-[#FF8A00]" />}
+                    </div>
+                    <div className="flex-1">
+                      <p className="text-sm font-bold text-[#FF8A00]">{selectedLinkedUser.full_name}</p>
+                      <p className="text-xs text-[#6B7A99]">سيتم ربط الحساب بهذا العامل</p>
+                    </div>
+                    <button type="button" onClick={() => { setSelectedLinkedUser(null); setWorkerName(''); setWorkerAvatar(null) }}>
+                      <X size={16} className="text-[#6B7A99]" />
+                    </button>
+                  </div>
+                )}
+              </div>
+
+              <div className="h-px bg-gradient-to-r from-transparent via-white/10 to-transparent" />
+
+              <FormInput label="اسم العامل" value={workerName} onChange={e => setWorkerName(e.target.value)} placeholder="أدخل اسم العامل" required />
+              <FormInput label="رقم الهاتف (اختياري)" type="tel" value={workerPhone} onChange={e => setWorkerPhone(e.target.value)} placeholder="01xxxxxxxxx" dir="ltr" className="text-right" />
+
+              <button type="submit" disabled={workerSubmitting || !workerName.trim()} className="w-full bg-gradient-to-r from-[#FF8A00] to-[#FFB800] text-[#050814] font-bold rounded-2xl py-4 shadow-[0_4px_20px_rgba(255,138,0,0.3)] hover:opacity-90 disabled:opacity-50 transition-opacity">
+                {workerSubmitting ? 'جاري الإضافة...' : 'إضافة العامل'}
+              </button>
+            </form>
+          </div>
+        </div>
+      )}
+    </SubPageLayout>
+  )
+}
diff --git a/components/payment/CodeEntryForm.tsx b/components/payment/CodeEntryForm.tsx
index 3bee65d..22485fe 100644
--- a/components/payment/CodeEntryForm.tsx
+++ b/components/payment/CodeEntryForm.tsx
@@ -123,7 +123,7 @@ export function CodeEntryForm({
       return
     }
 
-    setError(`كود غير صحيح. تبقى ${data?.attempts_remaining || 0} محاولات.`)
+    setError(`كود غير صحيح. تبقى ${data?.remaining || 0} محاولات.`)
     setDigits(Array(6).fill(''))
     inputsRef.current[0]?.focus()
     setActiveIndex(0)
diff --git a/components/ui/orders/OrderCard.tsx b/components/ui/orders/OrderCard.tsx
index 77412f0..05f44fa 100644
--- a/components/ui/orders/OrderCard.tsx
+++ b/components/ui/orders/OrderCard.tsx
@@ -1,10 +1,11 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect, useCallback } from 'react'
 import Image from 'next/image'
-import { ClipboardCheck, Clock, MapPin, Banknote, Navigation, Save, ShieldAlert, Star } from 'lucide-react'
+import { ClipboardCheck, Clock, MapPin, Banknote, Navigation, Save, ShieldAlert, Star, Users, CheckCircle2 } from 'lucide-react'
 import { createClient } from '@/lib/supabase/client'
 import { CodeEntryForm } from '@/components/payment/CodeEntryForm'
 import { getActiveSubscription } from '@/lib/supabase/subscriptions'
 import { getActiveWorkerSubscription } from '@/lib/supabase/worker-subscriptions'
+import { createNotification } from '@/lib/notifications'
 
 type TabType = 'pending' | 'confirmed' | 'completed'
 
@@ -25,6 +26,13 @@ export function OrderCard({ order, activeTab, onUpdateStatus, onUpdateTracking }
   const supabase = createClient()
   const [clientPlan, setClientPlan] = useState<string | null>(null)
   const [workerPlan, setWorkerPlan] = useState<string | null>(null)
+  const [orgWorkers, setOrgWorkers] = useState<any[]>([])
+  const [selectedWorkerId, setSelectedWorkerId] = useState<string>('')
+  const [assigning, setAssigning] = useState(false)
+  const [showWorkerList, setShowWorkerList] = useState(false)
+
+  const isOrgBooking = !!order.organization_id
+  const needsWorkerAssignment = isOrgBooking && !order.worker_id && activeTab === 'pending'
 
   useEffect(() => {
     const fetchSubs = async () => {
@@ -40,6 +48,59 @@ export function OrderCard({ order, activeTab, onUpdateStatus, onUpdateTracking }
     fetchSubs()
   }, [order.client_id, order.worker_id])
 
+  const fetchOrgWorkers = useCallback(async () => {
+    if (!order.organization_id) return
+    const { data: orgWorkers, error } = await supabase
+      .from('organization_workers')
+      .select('id, linked_user_id, display_name, avatar_url, phone')
+      .eq('organization_id', order.organization_id)
+      .eq('is_active', true)
+    if (!error && orgWorkers) {
+      const workerIds = orgWorkers.map(w => w.linked_user_id).filter(Boolean)
+      let profilesMap: Record<string, any> = {}
+      if (workerIds.length > 0) {
+        const { data: profiles } = await supabase
+          .from('profiles')
+          .select('id, full_name, avatar_url, phone, specializations')
+          .in('id', workerIds)
+        if (profiles) {
+          profiles.forEach(p => { profilesMap[p.id] = p })
+        }
+      }
+      setOrgWorkers(orgWorkers.map(w => {
+        const p = w.linked_user_id ? profilesMap[w.linked_user_id] : null
+        return {
+          id: w.linked_user_id || w.id,
+          full_name: p?.full_name || w.display_name,
+          avatar_url: p?.avatar_url || w.avatar_url,
+          phone: p?.phone || w.phone,
+          specializations: p?.specializations || [],
+        }
+      }).filter(w => w.id))
+    }
+  }, [order.organization_id, supabase])
+
+  const handleAssignWorker = async () => {
+    if (!selectedWorkerId) return
+    setAssigning(true)
+    const { error } = await supabase
+      .from('bookings')
+      .update({ worker_id: selectedWorkerId, status: 'confirmed' })
+      .eq('id', order.id)
+    if (!error) {
+      await createNotification(selectedWorkerId, 'حجز جديد', 'تم تعيينك لحجز جديد من المنظمة')
+      onUpdateStatus(order.id, 'confirmed')
+    }
+    setAssigning(false)
+    setShowWorkerList(false)
+  }
+
+  useEffect(() => {
+    if (needsWorkerAssignment && showWorkerList) {
+      fetchOrgWorkers()
+    }
+  }, [needsWorkerAssignment, showWorkerList, fetchOrgWorkers])
+
   const tStatus = order.tracking_status || 'accepted'
   
   let displayAddress = order.address || ''
@@ -182,14 +243,72 @@ export function OrderCard({ order, activeTab, onUpdateStatus, onUpdateTracking }
       )}
 
       {activeTab === 'pending' && (
-        <div className="grid grid-cols-[1fr_2fr] gap-3">
-          <button onClick={() => onUpdateStatus(order.id, 'cancelled')} className="bg-[#1E2538] text-white text-xs font-bold py-3 rounded-xl hover:opacity-90 transition-opacity">
-            رفض
-          </button>
-          <button onClick={() => onUpdateStatus(order.id, 'confirmed')} className="bg-gradient-to-r from-[#FF8A00] to-[#FFB800] text-white text-xs font-bold py-3 rounded-xl shadow-[0_4px_12px_rgba(255,138,0,0.3)] hover:opacity-90 transition-opacity">
-            قبول الطلب
-          </button>
-        </div>
+        <>
+          {needsWorkerAssignment && !showWorkerList ? (
+            <div className="flex flex-col gap-2">
+              <button onClick={() => setShowWorkerList(true)} className="bg-gradient-to-r from-[#FF8A00] to-[#FFB800] text-white text-xs font-bold py-3 rounded-xl shadow-[0_4px_12px_rgba(255,138,0,0.3)] hover:opacity-90 transition-opacity flex items-center justify-center gap-2">
+                <Users size={14} />
+                تعيين عامل للحجز
+              </button>
+              <button onClick={() => onUpdateStatus(order.id, 'cancelled')} className="bg-[#1E2538] text-white text-xs font-bold py-3 rounded-xl hover:opacity-90 transition-opacity">
+                رفض
+              </button>
+            </div>
+          ) : needsWorkerAssignment && showWorkerList ? (
+            <div className="flex flex-col gap-3 bg-[#050814]/40 p-3 rounded-xl border border-[#FF8A00]/10">
+              <span className="text-[11px] text-[#FF8A00] font-bold">اختر عامل:</span>
+              {orgWorkers.length === 0 ? (
+                <span className="text-[11px] text-slate-400">لا يوجد عمال نشطين في المنظمة</span>
+              ) : (
+                <div className="flex flex-col gap-2">
+                  {orgWorkers.map((w: any) => (
+                    <button
+                      key={w.id}
+                      onClick={() => setSelectedWorkerId(w.id)}
+                      className={`flex items-center gap-3 p-2.5 rounded-xl text-right transition-all ${
+                        selectedWorkerId === w.id
+                          ? 'bg-[#FF8A00]/15 border border-[#FF8A00]/40'
+                          : 'bg-[#050814]/60 border border-white/5 hover:border-white/10'
+                      }`}
+                    >
+                      <div className="relative w-8 h-8 rounded-full overflow-hidden flex-shrink-0">
+                        <Image src={w.avatar_url || '/worker_avatar.png'} fill className="object-cover" alt={w.full_name} />
+                      </div>
+                      <div className="flex flex-col flex-1 min-w-0">
+                        <span className="text-xs text-white font-bold truncate">{w.full_name}</span>
+                        <span className="text-[10px] text-slate-400 truncate">{w.specializations?.[0] || ''}</span>
+                      </div>
+                      {selectedWorkerId === w.id && (
+                        <CheckCircle2 size={16} className="text-[#FF8A00] flex-shrink-0" />
+                      )}
+                    </button>
+                  ))}
+                </div>
+              )}
+              <div className="grid grid-cols-[1fr_1fr] gap-2">
+                <button onClick={() => { setShowWorkerList(false); setSelectedWorkerId(''); }} className="bg-[#1E2538] text-white text-xs font-bold py-2.5 rounded-xl hover:opacity-90 transition-opacity">
+                  رجوع
+                </button>
+                <button
+                  disabled={!selectedWorkerId || assigning}
+                  onClick={handleAssignWorker}
+                  className="bg-gradient-to-r from-[#22C55E] to-[#16A34A] text-white text-xs font-bold py-2.5 rounded-xl shadow-[0_4px_12px_rgba(34,197,94,0.3)] hover:opacity-90 transition-opacity disabled:opacity-50"
+                >
+                  {assigning ? 'جاري التعيين...' : 'تأكيد التعيين'}
+                </button>
+              </div>
+            </div>
+          ) : (
+            <div className="grid grid-cols-[1fr_2fr] gap-3">
+              <button onClick={() => onUpdateStatus(order.id, 'cancelled')} className="bg-[#1E2538] text-white text-xs font-bold py-3 rounded-xl hover:opacity-90 transition-opacity">
+                رفض
+              </button>
+              <button onClick={() => onUpdateStatus(order.id, 'confirmed')} className="bg-gradient-to-r from-[#FF8A00] to-[#FFB800] text-white text-xs font-bold py-3 rounded-xl shadow-[0_4px_12px_rgba(255,138,0,0.3)] hover:opacity-90 transition-opacity">
+                قبول الطلب
+              </button>
+            </div>
+          )}
+        </>
       )}
 
       {activeTab === 'confirmed' && (
diff --git a/lib/supabase/booking-payments.ts b/lib/supabase/booking-payments.ts
index 126b57b..7a5cba5 100644
--- a/lib/supabase/booking-payments.ts
+++ b/lib/supabase/booking-payments.ts
@@ -3,7 +3,7 @@ import { SupabaseClient } from '@supabase/supabase-js'
 export async function processBookingCompletion(supabase: SupabaseClient, bookingId: string) {
   const { data: booking, error: fetchErr } = await supabase
     .from('bookings')
-    .select('id, worker_id, client_id, price, payment_method')
+    .select('id, worker_id, client_id, price, payment_method, organization_id')
     .eq('id', bookingId)
     .single()
   
@@ -12,45 +12,78 @@ export async function processBookingCompletion(supabase: SupabaseClient, booking
   }
 
   const price = booking.price || 0
-  
-  // Fetch active worker subscription to determine commission fee
-  const { data: workerSub } = await supabase
-    .from('worker_subscriptions')
-    .select('plan_type')
-    .eq('worker_id', booking.worker_id)
-    .eq('status', 'active')
-    .order('created_at', { ascending: false })
-    .limit(1)
-    .single()
+  const isOrgBooking = !!booking.organization_id
+
+  // For org bookings, money goes to the org owner
+  let recipientId = booking.worker_id
+  if (isOrgBooking) {
+    const { data: org } = await supabase
+      .from('organizations')
+      .select('owner_id')
+      .eq('id', booking.organization_id)
+      .single()
+    if (org?.owner_id) {
+      recipientId = org.owner_id
+    }
+  }
 
-  let feePercentage = 0.15 // Default basic
+  // Fetch active subscription to determine commission fee
+  let feePercentage = 0.15
   let planName = 'الأساسية'
-  if (workerSub) {
-    if (workerSub.plan_type === 'premium') { feePercentage = 0; planName = 'بريميوم' }
-    else if (workerSub.plan_type === 'master') { feePercentage = 0.05; planName = 'ماستر' }
-    else if (workerSub.plan_type === 'pro') { feePercentage = 0.1; planName = 'برو' }
+  
+  if (isOrgBooking) {
+    // Use org owner's subscription for commission
+    const { data: orgSub } = await supabase
+      .from('worker_subscriptions')
+      .select('plan_type')
+      .eq('worker_id', recipientId)
+      .eq('status', 'active')
+      .order('created_at', { ascending: false })
+      .limit(1)
+      .maybeSingle()
+    if (orgSub) {
+      if (orgSub.plan_type === 'premium') { feePercentage = 0; planName = 'بريميوم' }
+      else if (orgSub.plan_type === 'master') { feePercentage = 0.05; planName = 'ماستر' }
+      else if (orgSub.plan_type === 'pro') { feePercentage = 0.1; planName = 'برو' }
+    }
+  } else {
+    // Use worker's subscription for commission
+    const { data: workerSub } = await supabase
+      .from('worker_subscriptions')
+      .select('plan_type')
+      .eq('worker_id', booking.worker_id)
+      .eq('status', 'active')
+      .order('created_at', { ascending: false })
+      .limit(1)
+      .maybeSingle()
+    if (workerSub) {
+      if (workerSub.plan_type === 'premium') { feePercentage = 0; planName = 'بريميوم' }
+      else if (workerSub.plan_type === 'master') { feePercentage = 0.05; planName = 'ماستر' }
+      else if (workerSub.plan_type === 'pro') { feePercentage = 0.1; planName = 'برو' }
+    }
   }
 
   const fee = price * feePercentage
-  const workerEarnings = price - fee
+  const earnings = price - fee
 
-  const { data: workerProfile, error: workerErr } = await supabase
+  const { data: recipientProfile, error: recipientErr } = await supabase
     .from('profiles')
     .select('wallet_balance, total_earnings, completed_orders')
-    .eq('id', booking.worker_id)
+    .eq('id', recipientId)
     .single()
   
-  if (workerErr || !workerProfile) {
-    throw new Error('لم يتم العثور على حساب الحرفي')
+  if (recipientErr || !recipientProfile) {
+    throw new Error('لم يتم العثور على الحساب')
   }
 
-  const currentBalance = workerProfile.wallet_balance || 0
-  const currentTotalEarnings = workerProfile.total_earnings || 0
-  const currentCompletedOrders = workerProfile.completed_orders || 0
+  const currentBalance = recipientProfile.wallet_balance || 0
+  const currentTotalEarnings = recipientProfile.total_earnings || 0
+  const currentCompletedOrders = recipientProfile.completed_orders || 0
+  const label = isOrgBooking ? 'المؤسسة' : 'الحرفي'
 
   if (booking.payment_method === 'cash') {
     const newBalance = currentBalance - fee
-    const newTotalEarnings = currentTotalEarnings + workerEarnings
+    const newTotalEarnings = currentTotalEarnings + earnings
     
     await supabase
       .from('profiles')
@@ -59,17 +92,17 @@ export async function processBookingCompletion(supabase: SupabaseClient, booking
         total_earnings: newTotalEarnings,
         completed_orders: currentCompletedOrders + 1
       })
-      .eq('id', booking.worker_id)
+      .eq('id', recipientId)
     
     await supabase.from('transactions').insert({
-      user_id: booking.worker_id,
+      user_id: recipientId,
       type: 'payment',
       amount: -fee,
-      description: `خصم عمولة المنصة (${feePercentage * 100}%) لباقة ${planName} للطلب #${booking.id}`
+      description: `خصم عمولة المنصة (${feePercentage * 100}%) لباقة ${planName} للطلب #${booking.id}${isOrgBooking ? ' (مؤسسة)' : ''}`
     })
   } else {
-    const newBalance = currentBalance + workerEarnings
-    const newTotalEarnings = currentTotalEarnings + workerEarnings
+    const newBalance = currentBalance + earnings
+    const newTotalEarnings = currentTotalEarnings + earnings
     
     await supabase
       .from('profiles')
@@ -78,13 +111,13 @@ export async function processBookingCompletion(supabase: SupabaseClient, booking
         total_earnings: newTotalEarnings,
         completed_orders: currentCompletedOrders + 1
       })
-      .eq('id', booking.worker_id)
+      .eq('id', recipientId)
     
     await supabase.from('transactions').insert({
-      user_id: booking.worker_id,
+      user_id: recipientId,
       type: 'deposit',
-      amount: workerEarnings,
-      description: `أرباح الطلب #${booking.id}`
+      amount: earnings,
+      description: `أرباح الطلب #${booking.id}${isOrgBooking ? ' (مؤسسة)' : ''}`
     })
   }
 }
diff --git a/lib/types.ts b/lib/types.ts
index 26b118b..4ee1455 100644
--- a/lib/types.ts
+++ b/lib/types.ts
@@ -253,10 +253,23 @@ export interface Organization {
   category: string | null
   city: string | null
   is_active: boolean
+  rating?: number | null
+  reviews_count?: number | null
   created_at: string
   updated_at: string
 }
 
+export interface OrganizationReview {
+  id: string
+  organization_id: string
+  client_id: string
+  booking_id: string | null
+  rating: number
+  text: string | null
+  client_name?: string | null
+  created_at: string
+}
+
 export interface OrganizationWorker {
   id: string
   organization_id: string
diff --git a/supabase/migrations/20260712010000_org_services_gallery.sql b/supabase/migrations/20260712010000_org_services_gallery.sql
index 622acf1..5c3c69e 100644
--- a/supabase/migrations/20260712010000_org_services_gallery.sql
+++ b/supabase/migrations/20260712010000_org_services_gallery.sql
@@ -18,47 +18,35 @@ CREATE TABLE IF NOT EXISTS public.organization_services (
 
 ALTER TABLE public.organization_services ENABLE ROW LEVEL SECURITY;
 
--- Anyone can see services of active organizations
-CREATE POLICY "Anyone can read organization services"
-  ON public.organization_services FOR SELECT
-  USING (
-    EXISTS (
-      SELECT 1 FROM public.organizations
-      WHERE organizations.id = organization_services.organization_id
-      AND organizations.is_active = true
-    )
-  );
-
--- Owner can manage services
-CREATE POLICY "Owner can insert organization services"
-  ON public.organization_services FOR INSERT
-  WITH CHECK (
-    EXISTS (
-      SELECT 1 FROM public.organizations
-      WHERE organizations.id = organization_services.organization_id
-      AND organizations.owner_id = auth.uid()
-    )
-  );
-
-CREATE POLICY "Owner can update organization services"
-  ON public.organization_services FOR UPDATE
-  USING (
-    EXISTS (
-      SELECT 1 FROM public.organizations
-      WHERE organizations.id = organization_services.organization_id
-      AND organizations.owner_id = auth.uid()
-    )
-  );
-
-CREATE POLICY "Owner can delete organization services"
-  ON public.organization_services FOR DELETE
-  USING (
-    EXISTS (
-      SELECT 1 FROM public.organizations
-      WHERE organizations.id = organization_services.organization_id
-      AND organizations.owner_id = auth.uid()
-    )
-  );
+-- Policies (skip if already exist)
+DO $$ BEGIN
+  IF NOT EXISTS (SELECT 1 FROM pg_policies WHERE policyname = 'Anyone can read organization services' AND tablename = 'organization_services') THEN
+    CREATE POLICY "Anyone can read organization services"
+      ON public.organization_services FOR SELECT
+      USING (EXISTS (SELECT 1 FROM public.organizations WHERE organizations.id = organization_services.organization_id AND organizations.is_active = true));
+  END IF;
+END $$;
+DO $$ BEGIN
+  IF NOT EXISTS (SELECT 1 FROM pg_policies WHERE policyname = 'Owner can insert organization services' AND tablename = 'organization_services') THEN
+    CREATE POLICY "Owner can insert organization services"
+      ON public.organization_services FOR INSERT
+      WITH CHECK (EXISTS (SELECT 1 FROM public.organizations WHERE organizations.id = organization_services.organization_id AND organizations.owner_id = auth.uid()));
+  END IF;
+END $$;
+DO $$ BEGIN
+  IF NOT EXISTS (SELECT 1 FROM pg_policies WHERE policyname = 'Owner can update organization services' AND tablename = 'organization_services') THEN
+    CREATE POLICY "Owner can update organization services"
+      ON public.organization_services FOR UPDATE
+      USING (EXISTS (SELECT 1 FROM public.organizations WHERE organizations.id = organization_services.organization_id AND organizations.owner_id = auth.uid()));
+  END IF;
+END $$;
+DO $$ BEGIN
+  IF NOT EXISTS (SELECT 1 FROM pg_policies WHERE policyname = 'Owner can delete organization services' AND tablename = 'organization_services') THEN
+    CREATE POLICY "Owner can delete organization services"
+      ON public.organization_services FOR DELETE
+      USING (EXISTS (SELECT 1 FROM public.organizations WHERE organizations.id = organization_services.organization_id AND organizations.owner_id = auth.uid()));
+  END IF;
+END $$;
 
 -- ============================================
 -- 2. ORGANIZATION GALLERY TABLE
@@ -73,57 +61,45 @@ CREATE TABLE IF NOT EXISTS public.organization_gallery (
 
 ALTER TABLE public.organization_gallery ENABLE ROW LEVEL SECURITY;
 
--- Anyone can read gallery of active organizations
-CREATE POLICY "Anyone can read organization gallery"
-  ON public.organization_gallery FOR SELECT
-  USING (
-    EXISTS (
-      SELECT 1 FROM public.organizations
-      WHERE organizations.id = organization_gallery.organization_id
-      AND organizations.is_active = true
-    )
-  );
-
--- Owner can manage gallery
-CREATE POLICY "Owner can insert organization gallery"
-  ON public.organization_gallery FOR INSERT
-  WITH CHECK (
-    EXISTS (
-      SELECT 1 FROM public.organizations
-      WHERE organizations.id = organization_gallery.organization_id
-      AND organizations.owner_id = auth.uid()
-    )
-  );
-
-CREATE POLICY "Owner can update organization gallery"
-  ON public.organization_gallery FOR UPDATE
-  USING (
-    EXISTS (
-      SELECT 1 FROM public.organizations
-      WHERE organizations.id = organization_gallery.organization_id
-      AND organizations.owner_id = auth.uid()
-    )
-  );
-
-CREATE POLICY "Owner can delete organization gallery"
-  ON public.organization_gallery FOR DELETE
-  USING (
-    EXISTS (
-      SELECT 1 FROM public.organizations
-      WHERE organizations.id = organization_gallery.organization_id
-      AND organizations.owner_id = auth.uid()
-    )
-  );
+-- Policies (skip if already exist)
+DO $$ BEGIN
+  IF NOT EXISTS (SELECT 1 FROM pg_policies WHERE policyname = 'Anyone can read organization gallery' AND tablename = 'organization_gallery') THEN
+    CREATE POLICY "Anyone can read organization gallery"
+      ON public.organization_gallery FOR SELECT
+      USING (EXISTS (SELECT 1 FROM public.organizations WHERE organizations.id = organization_gallery.organization_id AND organizations.is_active = true));
+  END IF;
+END $$;
+DO $$ BEGIN
+  IF NOT EXISTS (SELECT 1 FROM pg_policies WHERE policyname = 'Owner can insert organization gallery' AND tablename = 'organization_gallery') THEN
+    CREATE POLICY "Owner can insert organization gallery"
+      ON public.organization_gallery FOR INSERT
+      WITH CHECK (EXISTS (SELECT 1 FROM public.organizations WHERE organizations.id = organization_gallery.organization_id AND organizations.owner_id = auth.uid()));
+  END IF;
+END $$;
+DO $$ BEGIN
+  IF NOT EXISTS (SELECT 1 FROM pg_policies WHERE policyname = 'Owner can update organization gallery' AND tablename = 'organization_gallery') THEN
+    CREATE POLICY "Owner can update organization gallery"
+      ON public.organization_gallery FOR UPDATE
+      USING (EXISTS (SELECT 1 FROM public.organizations WHERE organizations.id = organization_gallery.organization_id AND organizations.owner_id = auth.uid()));
+  END IF;
+END $$;
+DO $$ BEGIN
+  IF NOT EXISTS (SELECT 1 FROM pg_policies WHERE policyname = 'Owner can delete organization gallery' AND tablename = 'organization_gallery') THEN
+    CREATE POLICY "Owner can delete organization gallery"
+      ON public.organization_gallery FOR DELETE
+      USING (EXISTS (SELECT 1 FROM public.organizations WHERE organizations.id = organization_gallery.organization_id AND organizations.owner_id = auth.uid()));
+  END IF;
+END $$;
 
 -- ============================================
--- 3. GALLERY LIMIT ENFORCEMENT (max 4)
+-- 3. GALLERY LIMIT ENFORCEMENT (max 5)
 -- ============================================
 CREATE OR REPLACE FUNCTION public.check_org_gallery_limit()
 RETURNS trigger AS $$
 BEGIN
   IF (SELECT COUNT(*) FROM public.organization_gallery
-      WHERE organization_id = NEW.organization_id) >= 4 THEN
-    RAISE EXCEPTION 'Gallery limit of 4 photos reached for this organization';
+      WHERE organization_id = NEW.organization_id) >= 5 THEN
+    RAISE EXCEPTION 'Gallery limit of 5 photos reached for this organization';
   END IF;
   RETURN NEW;
 END;
diff --git a/supabase/migrations/20260713010000_org_reviews.sql b/supabase/migrations/20260713010000_org_reviews.sql
new file mode 100644
index 0000000..7ab4a3e
--- /dev/null
+++ b/supabase/migrations/20260713010000_org_reviews.sql
@@ -0,0 +1,86 @@
+-- ════════════════════════════════════════════
+-- HIRFA — Organization Reviews & Ratings
+-- Run this in: supabase.com/dashboard/project/fahbfbzxxpqlvhipbmtv/sql/new
+-- ════════════════════════════════════════════
+
+-- 1. ADD RATING COLUMNS TO ORGANIZATIONS
+ALTER TABLE public.organizations ADD COLUMN IF NOT EXISTS rating NUMERIC(3,2) DEFAULT 0;
+ALTER TABLE public.organizations ADD COLUMN IF NOT EXISTS reviews_count INTEGER DEFAULT 0;
+
+-- 2. ORGANIZATION REVIEWS TABLE
+CREATE TABLE IF NOT EXISTS public.organization_reviews (
+  id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+  organization_id UUID NOT NULL REFERENCES public.organizations(id) ON DELETE CASCADE,
+  client_id UUID NOT NULL REFERENCES auth.users(id) ON DELETE CASCADE,
+  booking_id UUID,
+  rating SMALLINT NOT NULL CHECK (rating >= 1 AND rating <= 5),
+  text TEXT,
+  created_at TIMESTAMPTZ NOT NULL DEFAULT now()
+);
+
+ALTER TABLE public.organization_reviews ENABLE ROW LEVEL SECURITY;
+
+-- Anyone can read reviews of active organizations
+CREATE POLICY "Anyone can read organization reviews"
+  ON public.organization_reviews FOR SELECT
+  USING (
+    EXISTS (
+      SELECT 1 FROM public.organizations
+      WHERE organizations.id = organization_reviews.organization_id
+      AND organizations.is_active = true
+    )
+  );
+
+-- Authenticated users can insert reviews
+CREATE POLICY "Authenticated users can insert org reviews"
+  ON public.organization_reviews FOR INSERT
+  TO authenticated
+  WITH CHECK (auth.uid() = client_id);
+
+-- Client can update their own reviews
+CREATE POLICY "Client can update own org reviews"
+  ON public.organization_reviews FOR UPDATE
+  TO authenticated
+  USING (auth.uid() = client_id);
+
+-- Client can delete their own reviews
+CREATE POLICY "Client can delete own org reviews"
+  ON public.organization_reviews FOR DELETE
+  TO authenticated
+  USING (auth.uid() = client_id);
+
+-- 3. UPDATE ORG RATING FUNCTION
+CREATE OR REPLACE FUNCTION public.update_org_rating(p_org_id UUID)
+RETURNS void AS $$
+BEGIN
+  UPDATE public.organizations
+  SET
+    rating = COALESCE((SELECT ROUND(AVG(rating)::NUMERIC, 1) FROM public.organization_reviews WHERE organization_id = p_org_id), 0),
+    reviews_count = (SELECT COUNT(*) FROM public.organization_reviews WHERE organization_id = p_org_id),
+    updated_at = now()
+  WHERE id = p_org_id;
+END;
+$$ LANGUAGE plpgsql SECURITY DEFINER;
+
+-- 4. AUTO-UPDATE RATING ON REVIEW INSERT/UPDATE/DELETE
+CREATE OR REPLACE FUNCTION public.trigger_update_org_rating()
+RETURNS trigger AS $$
+BEGIN
+  IF TG_OP = 'DELETE' THEN
+    PERFORM public.update_org_rating(OLD.organization_id);
+    RETURN OLD;
+  ELSE
+    PERFORM public.update_org_rating(NEW.organization_id);
+    RETURN NEW;
+  END IF;
+END;
+$$ LANGUAGE plpgsql;
+
+DROP TRIGGER IF EXISTS on_org_review_change ON public.organization_reviews;
+CREATE TRIGGER on_org_review_change
+  AFTER INSERT OR UPDATE OR DELETE ON public.organization_reviews
+  FOR EACH ROW EXECUTE FUNCTION public.trigger_update_org_rating();
+
+-- 5. INDEXES
+CREATE INDEX IF NOT EXISTS idx_org_reviews_org_id ON public.organization_reviews(organization_id);
+CREATE INDEX IF NOT EXISTS idx_org_reviews_client_id ON public.organization_reviews(client_id);
diff --git a/supabase/migrations/20260713020000_make_worker_id_nullable.sql b/supabase/migrations/20260713020000_make_worker_id_nullable.sql
new file mode 100644
index 0000000..8015bb7
--- /dev/null
+++ b/supabase/migrations/20260713020000_make_worker_id_nullable.sql
@@ -0,0 +1,4 @@
+-- Make worker_id and craftsman_id nullable on bookings table
+-- so organization bookings can be created without assigning a worker immediately
+ALTER TABLE public.bookings ALTER COLUMN worker_id DROP NOT NULL;
+ALTER TABLE public.bookings ALTER COLUMN craftsman_id DROP NOT NULL;
diff --git a/supabase/migrations/20260713030000_finish_job_org_owner.sql b/supabase/migrations/20260713030000_finish_job_org_owner.sql
new file mode 100644
index 0000000..334f899
--- /dev/null
+++ b/supabase/migrations/20260713030000_finish_job_org_owner.sql
@@ -0,0 +1,71 @@
+-- Allow org owner to also finish a job (not just the assigned worker)
+CREATE OR REPLACE FUNCTION public.finish_job(p_booking_id UUID)
+RETURNS JSONB
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = public
+AS $$
+DECLARE
+  v_booking RECORD;
+  v_current_status TEXT;
+  v_code TEXT;
+  v_code_hash TEXT;
+  v_is_owner BOOLEAN := false;
+BEGIN
+  SELECT * INTO v_booking
+  FROM public.bookings
+  WHERE id = p_booking_id
+  FOR UPDATE;
+
+  IF NOT FOUND THEN
+    RETURN jsonb_build_object('success', false, 'error', 'Booking not found');
+  END IF;
+
+  -- Allow the assigned worker OR the org owner to finish
+  IF v_booking.worker_id <> auth.uid() THEN
+    IF v_booking.organization_id IS NOT NULL THEN
+      SELECT EXISTS (
+        SELECT 1 FROM public.organizations
+        WHERE id = v_booking.organization_id AND owner_id = auth.uid()
+      ) INTO v_is_owner;
+    END IF;
+
+    IF NOT v_is_owner THEN
+      RETURN jsonb_build_object('success', false, 'error', 'Only the assigned worker can finish this job');
+    END IF;
+  END IF;
+
+  v_current_status := v_booking.status;
+  IF v_current_status NOT IN ('confirmed', 'in_progress', 'awaiting_payment_confirmation') THEN
+    RETURN jsonb_build_object('success', false, 'error', 'Job cannot be finished in current status: ' || v_current_status);
+  END IF;
+
+  v_code := LPAD(FLOOR(RANDOM() * 900000 + 100000)::TEXT, 6, '0');
+  v_code_hash := md5(v_code);
+
+  UPDATE public.bookings
+  SET
+    status = 'awaiting_code_entry',
+    confirmation_code = v_code_hash,
+    temp_code = v_code,
+    code_generated_at = NOW(),
+    finished_tapped_at = NOW(),
+    code_attempts = 0,
+    status_history = COALESCE(status_history, '[]'::jsonb) || jsonb_build_object(
+      'status', 'awaiting_code_entry',
+      'timestamp', NOW(),
+      'notes', 'Worker finished job, code auto-generated'
+    )
+  WHERE id = p_booking_id;
+
+  INSERT INTO public.job_events (booking_id, event_type, actor_role, actor_id, metadata)
+  VALUES (p_booking_id, 'finish_tapped', 'worker', auth.uid(),
+    jsonb_build_object('previous_status', v_current_status, 'is_org_owner', v_is_owner));
+
+  RETURN jsonb_build_object(
+    'success', true,
+    'code', v_code,
+    'code_generated_at', NOW()
+  );
+END;
+$$;
diff --git a/supabase/migrations/20260713040000_fix_finish_job_md5.sql b/supabase/migrations/20260713040000_fix_finish_job_md5.sql
new file mode 100644
index 0000000..6a0cd99
--- /dev/null
+++ b/supabase/migrations/20260713040000_fix_finish_job_md5.sql
@@ -0,0 +1,70 @@
+-- Fix: use md5() instead of digest() for finish_job (pgcrypto not available)
+CREATE OR REPLACE FUNCTION public.finish_job(p_booking_id UUID)
+RETURNS JSONB
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = public
+AS $$
+DECLARE
+  v_booking RECORD;
+  v_current_status TEXT;
+  v_code TEXT;
+  v_code_hash TEXT;
+  v_is_owner BOOLEAN := false;
+BEGIN
+  SELECT * INTO v_booking
+  FROM public.bookings
+  WHERE id = p_booking_id
+  FOR UPDATE;
+
+  IF NOT FOUND THEN
+    RETURN jsonb_build_object('success', false, 'error', 'Booking not found');
+  END IF;
+
+  IF v_booking.worker_id <> auth.uid() THEN
+    IF v_booking.organization_id IS NOT NULL THEN
+      SELECT EXISTS (
+        SELECT 1 FROM public.organizations
+        WHERE id = v_booking.organization_id AND owner_id = auth.uid()
+      ) INTO v_is_owner;
+    END IF;
+
+    IF NOT v_is_owner THEN
+      RETURN jsonb_build_object('success', false, 'error', 'Only the assigned worker can finish this job');
+    END IF;
+  END IF;
+
+  v_current_status := v_booking.status;
+  IF v_current_status NOT IN ('confirmed', 'in_progress', 'awaiting_payment_confirmation') THEN
+    RETURN jsonb_build_object('success', false, 'error', 'Job cannot be finished in current status: ' || v_current_status);
+  END IF;
+
+  v_code := LPAD(FLOOR(RANDOM() * 900000 + 100000)::TEXT, 6, '0');
+  v_code_hash := md5(v_code);
+
+  UPDATE public.bookings
+  SET
+    status = 'awaiting_code_entry',
+    confirmation_code = v_code_hash,
+    temp_code = v_code,
+    code_generated_at = NOW(),
+    finished_tapped_at = NOW(),
+    code_attempts = 0,
+    status_history = COALESCE(status_history, '[]'::jsonb) || jsonb_build_object(
+      'status', 'awaiting_code_entry',
+      'timestamp', NOW(),
+      'notes', 'Worker finished job, code auto-generated'
+    )
+  WHERE id = p_booking_id;
+
+  INSERT INTO public.job_events (booking_id, event_type, actor_role, actor_id, metadata)
+  VALUES (p_booking_id, 'finish_tapped', 'worker', auth.uid(),
+    jsonb_build_object('previous_status', v_current_status, 'is_org_owner', v_is_owner));
+
+  RETURN jsonb_build_object(
+    'success', true,
+    'code', v_code,
+    'code_generated_at', NOW()
+  );
+END;
+$$;
diff --git a/supabase/migrations/20260713050000_fix_verify_code_org_owner.sql b/supabase/migrations/20260713050000_fix_verify_code_org_owner.sql
new file mode 100644
index 0000000..3d559e2
--- /dev/null
+++ b/supabase/migrations/20260713050000_fix_verify_code_org_owner.sql
@@ -0,0 +1,111 @@
+-- Fix verify_confirmation_code: allow org owner + fix attempts display
+CREATE OR REPLACE FUNCTION public.verify_confirmation_code(
+  p_booking_id UUID,
+  p_code TEXT
+)
+RETURNS JSONB
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = public
+AS $$
+DECLARE
+  v_booking RECORD;
+  v_submitted_hash TEXT;
+  v_current_attempts INT;
+  v_max_attempts INT;
+  v_is_owner BOOLEAN := false;
+BEGIN
+  SELECT * INTO v_booking
+  FROM public.bookings
+  WHERE id = p_booking_id
+  FOR UPDATE;
+
+  IF NOT FOUND THEN
+    RETURN jsonb_build_object('success', false, 'error', 'Booking not found');
+  END IF;
+
+  IF v_booking.worker_id <> auth.uid() THEN
+    IF v_booking.organization_id IS NOT NULL THEN
+      SELECT EXISTS (
+        SELECT 1 FROM public.organizations
+        WHERE id = v_booking.organization_id AND owner_id = auth.uid()
+      ) INTO v_is_owner;
+    END IF;
+
+    IF NOT v_is_owner THEN
+      RETURN jsonb_build_object('success', false, 'error', 'Only the assigned worker can verify the code');
+    END IF;
+  END IF;
+
+  IF v_booking.status <> 'awaiting_code_entry' THEN
+    RETURN jsonb_build_object('success', false, 'error', 'Cannot verify code in current status: ' || v_booking.status);
+  END IF;
+
+  v_current_attempts := COALESCE(v_booking.code_attempts, 0);
+  v_max_attempts := COALESCE(v_booking.code_max_attempts, 5);
+
+  IF v_current_attempts >= v_max_attempts THEN
+    RETURN jsonb_build_object('success', false, 'error', 'Maximum attempts exceeded');
+  END IF;
+
+  v_submitted_hash := md5(p_code);
+
+  IF v_submitted_hash = v_booking.confirmation_code THEN
+    UPDATE public.bookings
+    SET
+      status = 'completed',
+      completed_at = NOW(),
+      temp_code = NULL,
+      code_attempts = v_current_attempts + 1,
+      status_history = COALESCE(status_history, '[]'::jsonb) || jsonb_build_object(
+        'status', 'completed',
+        'timestamp', NOW(),
+        'notes', 'Code verified successfully'
+      )
+    WHERE id = p_booking_id;
+
+    INSERT INTO public.job_events (booking_id, event_type, actor_role, actor_id, metadata)
+    VALUES (p_booking_id, 'code_success', 'worker', auth.uid(),
+      jsonb_build_object('attempts_used', v_current_attempts + 1, 'is_org_owner', v_is_owner));
+
+    UPDATE public.profiles
+    SET completed_jobs_count = COALESCE(completed_jobs_count, 0) + 1
+    WHERE id IN (v_booking.client_id, v_booking.worker_id);
+
+    RETURN jsonb_build_object('success', true, 'status', 'completed', 'completed_at', NOW());
+  ELSE
+    v_current_attempts := v_current_attempts + 1;
+
+    UPDATE public.bookings
+    SET
+      code_attempts = v_current_attempts
+    WHERE id = p_booking_id;
+
+    INSERT INTO public.job_events (booking_id, event_type, actor_role, actor_id, metadata)
+    VALUES (p_booking_id, 'code_attempt_failed', 'worker', auth.uid(),
+      jsonb_build_object('attempt', v_current_attempts, 'max_attempts', v_max_attempts, 'remaining', v_max_attempts - v_current_attempts));
+
+    IF v_current_attempts >= v_max_attempts THEN
+      UPDATE public.bookings
+      SET status = 'disputed'
+      WHERE id = p_booking_id;
+
+      INSERT INTO public.disputes (booking_id, raised_by_role, raised_by_id, reason, description, status)
+      VALUES (p_booking_id, 'worker', auth.uid(), 'other',
+        'Maximum code verification attempts exceeded (' || v_current_attempts || '/' || v_max_attempts || ')',
+        'open');
+
+      INSERT INTO public.job_events (booking_id, event_type, actor_role, actor_id, metadata)
+      VALUES (p_booking_id, 'disputed', 'system', NULL,
+        jsonb_build_object('reason', 'Max code attempts exceeded', 'total_attempts', v_current_attempts));
+    END IF;
+
+    RETURN jsonb_build_object(
+      'success', false,
+      'error', CASE WHEN v_current_attempts >= v_max_attempts THEN 'Maximum attempts exceeded. Booking disputed.' ELSE 'Wrong code' END,
+      'attempts_used', v_current_attempts,
+      'remaining', v_max_attempts - v_current_attempts
+    );
+  END IF;
+END;
+$$;
diff --git a/supabase/migrations/20260713060000_review_to_org_trigger.sql b/supabase/migrations/20260713060000_review_to_org_trigger.sql
new file mode 100644
index 0000000..7e93bb7
--- /dev/null
+++ b/supabase/migrations/20260713060000_review_to_org_trigger.sql
@@ -0,0 +1,36 @@
+-- ════════════════════════════════════════════
+-- HIRFA — Worker Reviews Auto-Propagate to Org
+-- When a worker review is inserted and the worker
+-- belongs to an org, also insert an org review.
+-- The existing on_org_review_change trigger will
+-- auto-update the org's average rating.
+-- ════════════════════════════════════════════
+
+-- 1. Trigger function: worker review → org review
+CREATE OR REPLACE FUNCTION public.trigger_review_to_org_review()
+RETURNS trigger AS $$
+DECLARE
+  v_org_id UUID;
+BEGIN
+  -- Check if this craftsman is linked to any active organization
+  SELECT organization_id INTO v_org_id
+  FROM public.organization_workers
+  WHERE linked_user_id = NEW.craftsman_id
+    AND is_active = true
+  LIMIT 1;
+
+  -- If linked to an org, insert org review (bypasses RLS via SECURITY DEFINER)
+  IF v_org_id IS NOT NULL THEN
+    INSERT INTO public.organization_reviews (organization_id, client_id, booking_id, rating, text)
+    VALUES (v_org_id, NEW.client_id, NEW.booking_id, NEW.rating, NEW.text);
+  END IF;
+
+  RETURN NEW;
+END;
+$$ LANGUAGE plpgsql SECURITY DEFINER;
+
+-- 2. Create trigger on reviews table
+DROP TRIGGER IF EXISTS on_review_to_org ON public.reviews;
+CREATE TRIGGER on_review_to_org
+  AFTER INSERT ON public.reviews
+  FOR EACH ROW EXECUTE FUNCTION public.trigger_review_to_org_review();