Merge remote-tracking branch 'origin/main'

app/Http/Controllers/PageController.php

@@ -22,6 +22,9 @@ public function ngosPage(Request $request)
     public function ngoPage(string $local, string $slug)
     {
         $ngo = Ngo::query()->where('slug', $slug)->with(['city', 'county'])->firstOrFail();
+
+
+
         $breadcrumbs =
             [
                 [

app/Models/Ngo.php

@@ -74,4 +74,9 @@ public function getActivityDomainsNameAttribute(): \Illuminate\Support\Collectio
     {
         return ActivityDomain::whereIn('id', $this->activity_domains)->pluck('name', 'id');
     }
+    public function getInterventionDomainsNameAttribute(): \Illuminate\Support\Collection
+    {
+
+        return $this->services()->with('interventionDomain')->get()->pluck('interventionDomain')->flatten()->pluck('name', 'id');
+    }
 }

resources/views/ngos_index.blade.php

@@ -35,20 +35,15 @@ class="my-2 mt-3 h-12 flex justify-center  text-center items-center  w-full bg-o
             </p>
             <p class="font-bold">{{ __('txt.ngo_card.intervention_domains') }}
                 @php $tmpDomains = []; @endphp
-                @foreach($ngo->services as $service)
-                    @foreach($service->interventionDomain as $domain)
-                        @if(!in_array($domain->id,$tmpDomains))
-                            @php $tmpDomains[] = $domain->id;
-                            @endphp
+                @foreach($ngo->intervention_domains_name as $domain)
                             <span class="text-orange1">
-                    {{ $domain->name }}
-                </span>
-                        @endif
-                    @endforeach
+                    {{$domain}}
+                            </span>
                     @if(!$loop->last)
                         ,
                     @endif
-                @endforeach
+                    @endforeach
+
 
             </p>
             <p class="font-bold">{{ __('txt.ngo_card.beneficiaries_nr') }} <span