fix: app name, order purchasable, and section title, books

Author: itsemon245

app/Http/Controllers/Backend/OrderController.php

@@ -16,7 +16,7 @@ class OrderController extends Controller
 {
     public function index(Request $request)
     {
-        $payments = Purchase::where('approved', $request->status)->with('user')->latest('updated_at')->latest()->paginate(paginateCount());
+        $payments = Purchase::where('approved', $request->status)->has('purchasable')->with('user')->latest('updated_at')->latest()->paginate(paginateCount());
         return view('backend.payment.approved', compact('payments'));
     }
 

app/Http/Controllers/Backend/Settings/SettingController.php

@@ -62,6 +62,7 @@ public function store(Request $request)
             'whatsapp' => 'required|string',
             'favicon' => 'image|max:1024',
             'address' => 'required|string',
+            'app_name' => 'required|string|max:255',
         ]);
         $logo = $request->has('logo') ? saveImage($request->logo, 'settings', 'logo') : $this->setting->basic->logo;
         $favicon = $request->has('favicon') ? saveImage($request->favicon, 'settings', 'favicon') : $this->setting->basic->favicon;
@@ -72,6 +73,7 @@ public function store(Request $request)
             'phone' => $request->phone,
             'whatsapp' => $request->whatsapp,
             'address' => $request->address,
+            'app_name' => $request->app_name,
         ];
         if ($this->setting) {
             $this->setting->basic = $array;

app/Http/Controllers/Frontend/HomeController.php

@@ -27,8 +27,8 @@ public function index()
         // $products = Product::mappedProducts(['product_category_id' => 1]);
         $banners = Banner::latest()->take(6)->latest()->get();
         $reviews = Testimonial::latest()->get();
-        $infos1 = Info::where(['section_id' => 1, 'page_name' => 'homepage'])->latest()->take(4)->latest()->get();
-        $infos2 = Info::where(['section_id' => 2, 'page_name' => 'homepage'])->latest()->take(4)->latest()->get();
+        $infos1 = Info::where(['section_id' => 1, 'page_name' => 'homepage'])->latest()->get();
+        $infos2 = Info::where(['section_id' => 2, 'page_name' => 'homepage'])->latest()->get();
         $achievements = Achievement::latest()->take(12)->latest()->get();
         $customServices = CustomService::with('image')->where('page_name', PageName::Home)->latest()->get();
         return view(

app/Http/Controllers/Frontend/Page/PageController.php

@@ -34,8 +34,8 @@ public function industriesPage()
         $achievements   = Achievement::latest()->latest()->get();
         $partners       = PartnerSection::latest()->limit(10)->latest()->get();
         $customServices = CustomService::with('image')->where('page_name', PageName::Account)->latest()->get();
-        $infos1 = Info::where(['section_id' => 1, 'page_name' => 'account'])->latest()->take(4)->latest()->get();
-        $infos2 = Info::where(['section_id' => 2, 'page_name' => 'account'])->latest()->take(4)->latest()->get();
+        $infos1 = Info::where(['section_id' => 1, 'page_name' => 'account'])->latest()->get();
+        $infos2 = Info::where(['section_id' => 2, 'page_name' => 'account'])->latest()->get();
         return view('frontend.pages.industries.industries', compact('subCategories', 'achievements', 'partners', 'customServices', 'infos1', 'infos2'));
     }
     public function clientStudioPage()

app/Http/Requests/StoreInfoRequest.php

@@ -24,7 +24,7 @@ public function rules(): array
         return [
             'section' => 'required',
             'title' => 'required|max:100',
-            'description' => 'required|max:200',
+            'description' => 'required|string',
             'info_image' => 'required|max:5120|image',
             'page_name' => 'required|string'
         ];

app/Http/Requests/UpdateInfoRequest.php

@@ -24,7 +24,7 @@ public function rules(): array
         return [
             'section'       => 'required',
             'title'         => 'required|max:100',
-            'description'   => 'required|max:200',
+            'description'   => 'required|string',
             'page_name' => 'required|string'
 
         ];

app/Providers/SingletonQueryProvider.php

@@ -4,6 +4,7 @@
 
 use App\Models\Course;
 use App\Enums\PageName;
+use App\Models\BookCategory;
 use App\Models\Setting;
 use App\Models\CustomService;
 use App\Models\ServiceCategory;
@@ -15,20 +16,28 @@ class SingletonQueryProvider extends ServiceProvider
     /**
      * Register services.
      */
-    public function register() : void
+    public function register(): void
     {
         //
     }
 
     /**
      * Bootstrap services.
      */
-    public function boot() : void
+    public function boot(): void
     {
         $this->app->singleton('setting', fn (Application $app) => Setting::first());
         $this->app->singleton('categories', fn (Application $app) => ServiceCategory::with(['serviceSubCategories', 'serviceSubCategories.services'])->get());
+        $this->app->singleton('bookCategories', fn (Application $app) => BookCategory::get());
         $this->app->singleton('courses', fn (Application $app) => Course::get(['id', 'name']));
         $this->app->singleton('customServices', fn (Application $app) => CustomService::with('image')->where('page_name', PageName::Home->value)->get());
         $this->app->singleton('customServicesAccount', fn (Application $app) => CustomService::with('image')->where('page_name', PageName::Account->value)->get());
+
+        if (app('setting')->basic?->app_name ?? false) {
+            config([
+                'app.name' => app('setting')->basic?->app_name,
+                'mail.from.name'=> app('setting')->basic?->app_name,
+            ]);
+        }
     }
 }

resources/views/backend/book/edit-book.blade.php

@@ -52,7 +52,7 @@
 
                         <div class="col-md-12">
                             <label for="book_desc">Book Description</label>
-                            <textarea required type="text" name="book_desc" class="form-control" rows="4">+{{ $book->description }}</textarea>
+                            <textarea required type="text" name="book_desc" class="form-control" rows="4">{{ $book->description }}</textarea>
                         </div>
 
 

resources/views/backend/info/createInfo.blade.php

@@ -34,8 +34,7 @@
                     <input type="hidden" name="old_title">
 
                     <div class="mt-1">
-                        <label for="desc" class="form-label">Description</label>
-                        <textarea id="desc" class="form-control" name="description" id="description" placeholder="Description"></textarea>
+                        <x-form.ck-editor id="desc" class="form-control" name="description" id="description" placeholder="Description" required></x-form.ck-editor>
                     </div>
 
 

resources/views/backend/info/editInfo.blade.php

@@ -43,8 +43,7 @@
                     </x-backend.form.select-input>
 
                     <div class="mt-1">
-                        <label for="desc" class="form-label">Description</label>
-                        <textarea id="desc" class="form-control" name="description" id="description" placeholder="Description">{{ $info->description }}</textarea>
+                        <x-form.ck-editor id="desc" class="form-control" name="description" id="description" placeholder="Description" required>{!! $info->description !!}</x-form.ck-editor>
                     </div>
 
 

resources/views/backend/info/viewInfo.blade.php

@@ -43,7 +43,11 @@
                                                 alt="{{ $info->title }}" width="80px" loading="lazy"></td>
                                         <td>{{ Str::limit($info->title, 20, '...') }}</td>
                                         <td>{{ $info->section_id === 1 ? 'Section 1' : 'Section 2' }}</td>
-                                        <td>{!! Str::limit($info->description, 40, '...') !!}</td>
+                                        <td style="width:250px;
+                                        white-space: normal;
+                                        overflow-wrap: break-word!important;
+                                    word-wrap: break-word!important;
+                                word-break: break-word!important;">{!! $info->description !!}</td>
                                         @can('manage info section')
                                             <td>
                                                 <x-backend.ui.button type="edit" href="{{ route('info.edit', $info) }}"

resources/views/backend/layouts/head.blade.php

@@ -1,14 +1,13 @@
 <head>
 
     <meta charset="utf-8" />
-    <meta name="csrf-token" content="{{ csrf_token() }}" />
-    <title>{{ env('APP_NAME') }}</title>
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta content="A fully featured admin theme which can be used to build CRM, CMS, etc." name="description" />
-    <meta content="Coderthemes" name="author" />
+    <meta content="Fill tax with ease & comfort" name="description" />
+    <meta content="{{ config('app.name') }}" name="author" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <link rel="stylesheet" href="{{ asset('libs/tail.select.js-1.0.2/css/tail.select.css') }}">
+    <title>{{ config('app.name') }}</title>
     <style>
         .tail-select {
             width: 100% !important;