merge issues

app/Http/Controllers/WebsiteController.php

@@ -30,7 +30,6 @@ class WebsiteController extends Controller
         $this->path = config('app.client_path');
         $headerMenu = Menulocations::where('alias', 'header-menu')->first();
         $headerMenuItems = Menuitems::where('menulocations_id', $headerMenu->menulocation_id)->where('status','<>',-1)->where('parent_menu', 0)->with('children')->orderBy('display_order', 'asc')->get();
-
         $footerMenu = Menulocations::where('alias', 'footer-menu')->first();
         $footerMenuItems = Menuitems::where('menulocations_id', $footerMenu->menulocation_id)->where('status','<>',-1)->where('parent_menu', 0)->with('children')->orderBy('display_order', 'asc')->get();
         // dd($footerMenuItems);
@@ -89,7 +88,11 @@ class WebsiteController extends Controller
         $data["sliders"] = Sliders::where('status', 1)->latest()->get();
         $data["franchises"] = Franchises::latest()->take(4)->get();
         $data["testimonials"] = Testimonials::where('status', 1)->latest()->get();
+<<<<<<< HEAD
         $data['services'] = Services::take(6)->get();
+=======
+        $data['services'] = Services::latest()->where('parent_service',null)->take(6)->get();
+>>>>>>> 9fa6a5d79720007756721d82c4fde70e31a0f1f1
         $data['partners'] = Partners::latest()->get();
         $data["news"] = News::latest()->take(6)->get();
 
@@ -172,7 +175,7 @@ class WebsiteController extends Controller
         ->orWhere('parent_service', 0)
         ->select(['title', 'alias'])
         ->get();
-        $service = Services::where('alias', $alias)->where('status','<>',-1)->with('children')->first();
+        $service = Services::where('alias', $alias)->where('status','<>',-1)->with('children',fn($query)=>$query->latest())->first();
         return view('client.topCargo.service-single', compact('service', 'serviceLists'));
     }
 
@@ -201,8 +204,7 @@ class WebsiteController extends Controller
                 'message' => 'required|min:10',
                 'phone' => 'required|string|regex:/^98\d{8}$/',
             ]);
-
-            $sent = Mail::to('sm.bibhuti@gmail.com')->send(new ContactMail($validated));
+            $sent = Mail::to(SITEVARS->email)->send(new ContactMail($validated));
 
             if ($sent) {
                 return response()->json(['success' => 'Email sent successfully']);
@@ -221,7 +223,7 @@ class WebsiteController extends Controller
                 'freightType' => 'required|array',
                 'freightType.*' => 'required|string',
             ]);
-            $sent = Mail::to('sm.bibhuti@gmail.com')->send(new QuoteMail($validated));
+            $sent = Mail::to(SITEVARS->email)->send(new QuoteMail($validated));
             if ($sent) {
                 return response()->json(['success' => 'Email sent successfully']);
             } else {

app/Models/News.php

@@ -1,6 +1,7 @@
 <?php
 namespace App\Models;
 
+use App\Models\Scopes\StatusScope;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -49,4 +50,9 @@ class News extends Model
             get: fn($value) => User::find($value) ? User::find($value)->name : '',
         );
     }
+
+    public static function boot(){
+        parent::boot();
+        static::addGlobalScope(new StatusScope());
+    }
 }

app/Models/Scopes/StatusScope.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models\Scopes;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Scope;
+
+class StatusScope implements Scope
+{
+    /**
+     * Apply the scope to a given Eloquent query builder.
+     */
+    public function apply(Builder $builder, Model $model): void
+    {
+        $builder->where('status',1);
+    }
+}