implementing-task-scheduler

app/Console/Commands/CheckQueue.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Queue;
+
+class CheckQueue extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'queue:check';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Check if there is a job in the queue';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $count = Queue::size(); // Get the number of jobs in the queue
+        if ($count > 0) {
+            $this->call('queue:process'); // Call the ProcessQueue command if there is a job in the queue
+        }
+    }
+}

app/Console/Commands/ProcessQueue.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Queue;
+
+class ProcessQueue extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'queue:process';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Process the tasks in the queue';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        Queue::daemon(); // Process the tasks in the queue
+    }
+}

app/Console/Kernel.php

@@ -15,7 +15,7 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('inspire')->hourly();
+        $schedule->command('queue:check')->everyMinute();
     }
 
     /**

app/Http/Controllers/Admin/AppointmentController.php

@@ -13,19 +13,53 @@ class AppointmentController extends Controller
 {
     protected $view = 'admin.appointment.';
     protected $redirect = 'admin/appointments';
+    // protected $service;
 
-    public function index(){
+    public function education_appointments()
-        $appointments = Appointment::orderBy('id','DESC');
+    {
+        $appointments = Appointment::where('service_type', '1')->orderBy('id', 'DESC');
+        if (\request('date')) {
+            $date = \request('date');
+            $appointments = $appointments->whereDate('date', $date);
+        }
+        if (\request('status')) {
+            $status = \request('status');
+            $appointments = $appointments->where('status', $status);
+        }
+        if (\request('is_booked')) {
+            $is_booked = (\request('is_booked')) == '1' ? true : false;
+            $appointments = $appointments->where('is_booked', $is_booked);
+        }
+        $appointments = $appointments->paginate(20);
+        $service = 'Education';
+        $is_booked = $is_booked ?? null;
+        $date = $date ?? null;
+        $status = $status ?? null;
+        return view($this->view . 'index', compact('appointments', 'service', 'is_booked', 'date', 'status'));
+    }
+
+    public function visa_appointments()
+    {
+        $appointments = Appointment::where('service_type', '2')->orderBy('id', 'DESC');
         if (\request('date')) {
-            $key = \request('date');
+            $date = \request('date');
-            $appointments = $appointments->whereDate('date',$key);
+            $appointments = $appointments->whereDate('date', $date);
         }
         if (\request('status')) {
-            $key = \request('status');
+            $status = \request('status');
-            $appointments = $appointments->where('status',$key);
+            $appointments = $appointments->where('status', $status);
         }
-        $appointments = $appointments->paginate(30);
+        if (\request('is_booked')) {
-        return view($this->view.'index',compact('appointments'));
+
+            $is_booked = (\request('is_booked')) == '1' ? true : false;
+            $appointments = $appointments->where('is_booked', $is_booked);
+        }
+        $appointments = $appointments->paginate(20);
+        $is_booked = $is_booked ?? null;
+        $date = $date ?? null;
+        $status = $status ?? null;
+        $service = 'Migration|Visa';
+        return view($this->view . 'index', compact('appointments', 'service', 'is_booked', 'date', 'status'));
     }
 
     public function create()
@@ -39,11 +73,10 @@ class AppointmentController extends Controller
             'date' => 'required|date',
             'start_time' => 'required|date_format:H:i',
             'end_time' => 'required|date_format:H:i',
-            // 'location' => 'required|max:255',
-            // 'description' => 'required',
         ]);
         $start_time = Carbon::createFromFormat('H:i', $request->get('start_time'))->format('H:i A');
         $end_time = Carbon::createFromFormat('H:i', $request->get('end_time'))->format('H:i A');
+        
         $appointment = new Appointment([
             'date' => $request->get('date'),
             'start_time' => $start_time,
@@ -54,8 +87,13 @@ class AppointmentController extends Controller
         ]);
 
         $appointment->save();
+        if($request->get('service_type') == "1"){
+            $service = 'education';
+        }else{
+            $service = 'visa';
+        }
 
-        return redirect($this->redirect)->with('success', 'Appointment has been added');
+        return redirect($this->redirect.'/'.$service)->with('success', 'Appointment has been added');
     }
 
     public function edit($id)
@@ -73,12 +111,11 @@ class AppointmentController extends Controller
 
     public function update(Request $request, $id)
     {
+
         $request->validate([
             'date' => 'required|date',
             'start_time' => 'required|date_format:H:i',
             'end_time' => 'required|date_format:H:i',
-            // 'location' => 'required|max:255',
-            // 'description' => 'required',
         ]);
         $start_time = Carbon::createFromFormat('H:i', $request->get('start_time'))->format('H:i A');
         $end_time = Carbon::createFromFormat('H:i', $request->get('end_time'))->format('H:i A');
@@ -92,15 +129,20 @@ class AppointmentController extends Controller
         $appointment->service_type = $request->get('service_type');
         $appointment->status = $request->get('status');
         $appointment->save();
+        if($request->get('service_type') == "1"){
+            $service = 'education';
+        }else{
+            $service = 'visa';
+        }
 
-        return redirect($this->redirect)->with('success', 'Appointment has been updated');
+        return redirect($this->redirect.'/'.$service)->with('success', 'Appointment has been updated');
     }
 
-    public function show($id){
+    public function show($id)
+    {
         $appointment = Appointment::with('appointment_booking_detail')->findorfail($id);
 
         return view($this->view . 'show', compact('appointment'));
-
     }
 
     public function destroy($id)
@@ -111,4 +153,3 @@ class AppointmentController extends Controller
         return redirect($this->redirect)->with('success', 'Appointment has been deleted');
     }
 }
-

app/Http/Controllers/Admin/HomeController.php

@@ -4,8 +4,9 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
-use App\Models\Referral;
+use App\Models\Enquiry;
 use App\Models\Subscription;
+use App\Models\VisaService;
 use App\Models\Service;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Route;
@@ -20,12 +21,14 @@ class HomeController extends Controller
     public function indexAdmin()
     {
         if(Auth::check()){
-            $service= Service::where('status',true);
+            $visa_service= VisaService::where('status',true);
+            $education_service= Service::where('status',true);
+            $enquiry= Enquiry::all();
             $contact= Contact::all();
-            $subscription= Contact::all();
+            $subscription= Subscription::all();
              $contacts = Contact::paginate(config('custom.per_page'));
             // $referrals=Referral::paginate(config('custom.per_page'));
-            return view('admin.index', compact( 'service', 'contact', 'contacts','subscription'));
+            return view('admin.index', compact( 'visa_service', 'education_service', 'enquiry', 'contacts','contact','subscription'));
         }
         return view('admin.login');
     }

app/Http/Controllers/AppointmentController.php

@@ -75,7 +75,7 @@ class AppointmentController extends Controller
             $formated_date = $date->format('M d, Y');
             $appointment->is_booked = true;
             $appointment->save();
-            $subject = 'Appointment Confirmed';
+            $subject = 'Appointment Booked Successfully.';
             dispatch(function() use ($name,$email,$phone,$subject,$formated_date,$appointment) {
 
                 \Mail::send('appointment_confirmed', array(
@@ -98,11 +98,44 @@ class AppointmentController extends Controller
                ), function($message) use ($subject,$email,$name){
                         // $subject=($service!= '') ? 'Enquiry for '.$service : 'Contact/Feedback';
                        $message->subject($subject);
+                    //    $message->from('admin@eteducation.com.au', 'Admin');
                        $message->to($email, $name)->subject($subject);
                      // $message->cc('extratechweb@gmail.com', 'Extratech')->subject($subject);
-                // $message->cc('suman@extratechs.com.au', 'Extratech')->subject($subject);
+                    // $message->cc('admin@eteducation.com.au', 'Extratech')->subject($subject);
 
                });
+
+
+            });
+
+            dispatch(function() use ($name,$email,$phone,$subject,$formated_date,$appointment) {
+
+                \Mail::send('appointment_confirmed_for_admin', array(
+
+                'full_name' =>$name,
+
+                'email' =>$email,
+
+                'date' => $formated_date,
+
+                'start_time' => $appointment['start_time'],
+
+                'end_time' => $appointment['end_time'],
+
+                'phone' =>$phone,
+
+                'subject' =>$subject
+
+               ), function($message) use ($subject){
+                        // $subject=($service!= '') ? 'Enquiry for '.$service : 'Contact/Feedback';
+                       $message->subject($subject);
+                    //    $message->to($email, $name)->subject($subject);
+                      $message->to('mahesh@extratechs.com.au', 'Extratech')->subject($subject);
+                    // $message->cc('admin@eteducation.com.au', 'Extratech')->subject($subject);
+
+               });
+
+
             });
         }
 

app/Http/Controllers/BlogController.php

@@ -9,7 +9,7 @@ use App\Models\Page;
 class BlogController extends Controller
 {
     public function index(){
-        $page = Page::where(['title' => 'Blog','status' => 1])->first();
+        $page = Page::where(['title' => 'Blogs','status' => 1])->first();
         $blogs = NewsAndUpdate::where('status',1)->get();
         return view('blogs',compact('blogs','page'));
     }

app/Http/Controllers/EnquiryController.php

@@ -28,7 +28,6 @@ class EnquiryController extends Controller
         }
         $marital_status = $request->get('marital_status');
         if ($marital_status == 'Widow' || $marital_status == 'Single') {
-
             $request['married_date'] = null;
             $request['spouse_academics'] = null;
             $request['spouse_work_experience'] = null;

app/Http/Controllers/HomeController.php

@@ -20,6 +20,7 @@ class HomeController extends Controller
         Artisan::call('queue:listen');
     }
     public function index(){
+
        $sliders = Slider::where('status',1)->get();
        $testimonials = Testimonial::where('status',1)->get();
        $blogs = NewsAndUpdate::where('status',1)->get();

public/frontend/css/style.css

@@ -263,9 +263,14 @@ Responsive Codes
 }
 .top-links a{
     color: #326CBF;
-    font-weight: 500;
+    font-weight: bold;
     font-size: 16px;
     line-height: 24px;
+    text-decoration: none;
+}
+.top-links a:hover {
+    text-decoration: underline;
+    color: #d933a2;
 }
 .top-links h2{
     text-decoration: none;
@@ -457,7 +462,8 @@ Responsive Codes
 .student-visa-section,
 .services-page-section,
 .appointment-section,
-.enquiry-form-section{
+.enquiry-form-section,
+.privacy-policy-section{
     padding: 3rem 6rem;
 }
 .services-section .row,
@@ -1758,7 +1764,38 @@ table.lightgrey-weekends tbody td:nth-child(n+6) {
     line-height: 1.8rem;
 }
 /* enquiry page css ends */
-
+/* privacy policy css starts */
+.privacy-policy-section h1{
+    font-weight: 700;
+    text-align: center;
+    font-size: 36px;
+    line-height: 48px;
+    letter-spacing: 0.005em;
+    color: #326CBF;
+    margin-bottom: 1rem;
+}
+.privacy-policy-section ul li{
+    list-style: none;
+    color:#353030;
+    padding: 5px;
+  }
+.privacy-policy-section ul li::before{
+    content: "\f058";
+    color: #326CBF;
+    font-family: FontAwesome;
+    display: inline-block;
+    margin-right: 0.6em;
+    margin-left: -1.3em;
+    width: 1.3em;
+}
+.definition-policy,
+.personal-policy,
+.contact-policy{
+    background: #eff2f4;
+    padding: 2rem;
+    margin-bottom: 40px;
+}
+/* privacy policy css ends */
 /* Footer Css */
 .footer{
     background: #296AC7;
@@ -1943,16 +1980,16 @@ table.lightgrey-weekends tbody td:nth-child(n+6) {
     transition: all 200ms ease-in-out;
 }
 .fa-facebook:hover{
-    color: #d6249f;
+    color: #A9C5ED;
 }
 .fa-twitter:hover{
-    color: #d6249f;
+    color: #A9C5ED;
 }
 .fa-linkedin:hover{
-    color: #d6249f;
+    color: #A9C5ED;
 }
 .fa-instagram:hover {
-    color: #d6249f;
+    color: #A9C5ED;
     /* background: radial-gradient(circle at 30% 107%, #fdf497 0%, #fdf497 5%, #fd5949 45%,#d6249f 60%,#285AEB 90%) !important;
     background-clip: text;
     -webkit-background-clip: text;
@@ -2101,7 +2138,8 @@ table.lightgrey-weekends tbody td:nth-child(n+6) {
     .blog-banner,
     .overseas-section,
     .services-page-section,
-    .enquiry-form-section{
+    .enquiry-form-section,
+    .privacy-policy-section{
         padding: 2rem;
     }
     .contact-form-section,
@@ -2293,7 +2331,8 @@ table.lightgrey-weekends tbody td:nth-child(n+6) {
     .blog-banner,
     .overseas-section,
     .services-page-section,
-    .enquiry-form-section{
+    .enquiry-form-section,
+    .privacy-policy-section{
         padding: 3rem;
     }
     .services-content h1,
@@ -2386,7 +2425,8 @@ table.lightgrey-weekends tbody td:nth-child(n+6) {
     .our-values-section,
     .overseas-section,
     .services-page-section,
-    .enquiry-form-section{
+    .enquiry-form-section,
+    .privacy-policy-section{
         padding: 3rem;
     }
     .why-us-section::before,

resources/views/about.blade.php

@@ -71,33 +71,32 @@
         <div class="row gx-5">
             <div class="col-md-6">
                 <div class="values-left">
-                    <p>
+                    <p id="values-text">
-                        We work with you to turn your plan to study overseas into a launch pad for professional success and personal growth. 
+                        At ET Education, we prioritise transparent communication, fair pricing, and simplified procedures to ensure our students and clients have a stress-free experience as they work towards their educational and immigration aspirations.
-                        ET Education combines experience and technology to help you make the most informed decision possible.
                     </p>
                     <div class="values-img">
-                        <img src="{{url('frontend/images/about/tranprancy.jpg')}}" class="img-fluid" id="values-img" alt="">
+                        <img src="{{url('frontend/images/about/tranprancy.jpg')}}" class="w-100" id="values-img" alt="">
                     </div>
                 </div>
             </div>
             <div class="col-md-6">
                 <div class="values-lists">
-                    <a onclick="changeImg('{{url('frontend/images/about/tranprancy.jpg')}}','{{1}}')" id="values-link{{1}}" class="link-active">
+                    <a onclick="changeImg('{{url('frontend/images/about/tranprancy.jpg')}}','At ET Education, we prioritise transparent communication, fair pricing, and simplified procedures to ensure our students and clients have a stress-free experience as they work towards their educational and immigration aspirations.','{{1}}')" id="values-link{{1}}" class="link-active">
                         <h2>Transparency</h2>
                     </a>
-                    <a onclick="changeImg('{{url('frontend/images/about/Commitment.jpg')}}','{{2}}')" id="values-link{{2}}">
+                    <a onclick="changeImg('{{url('frontend/images/about/Commitment.jpg')}}','We are committed to providing exceptional education and visa services to students. With a team of experienced professionals, they ensure personalised guidance to help students achieve their academic and career goals.','{{2}}')" id="values-link{{2}}">
                         <h2>Commitment</h2>
                     </a>
-                    <a onclick="changeImg('{{url('frontend/images/about/professionlaiosn-1.jpg')}}','{{3}}')" id="values-link{{3}}">
+                    <a onclick="changeImg('{{url('frontend/images/about/professionlaiosn-1.jpg')}}','We work with you to turn your plan to study overseas into a launch pad for professional success and personal growth. ET Education combines experience and technology to help you make the most informed decision possible.','{{3}}')" id="values-link{{3}}">
                         <h2>Professionalism</h2>
                     </a>
-                    <a onclick="changeImg('{{url('frontend/images/about/realiability.jpg')}}','{{4}}')" id="values-link{{4}}">
+                    <a onclick="changeImg('{{url('frontend/images/about/realiability.jpg')}}','We are a reliable choice for students seeking assistance with education and visa services.  Our commitment to ethical and transparent practices, combined with expertise and experience, ensures that students can trust us to provide high-quality support throughout their journey.','{{4}}')" id="values-link{{4}}">
                         <h2>Reliability</h2>
                     </a>
-                    <a onclick="changeImg('{{url('frontend/images/about/Integrity.jpg')}}','{{5}}')" id="values-link{{5}}">
+                    <a onclick="changeImg('{{url('frontend/images/about/Integrity.jpg')}}','We believe in conducting ourselves ethically and having integrity in every aspect of our service. We believe in complete transparency in our communication, are committed to our student’s needs, and strive to achieve the best possible outcome in our every endeavour.','{{5}}')" id="values-link{{5}}">
                         <h2>Integrity</h2>
                     </a>
-                    <a onclick="changeImg('{{url('frontend/images/about/trusthworthy.jpg')}}','{{6}}')" id="values-link{{6}}">
+                    <a onclick="changeImg('{{url('frontend/images/about/trusthworthy.jpg')}}','At ET Education, we continuously strive to provide credible and trustworthy counselling to students worldwide to help them further their academic and professional growth in Australia. And in doing so, we always keep our customer’s welfare and satisfaction at the centre.','{{6}}')" id="values-link{{6}}">
                         <h2>Trustworthy</h2>
                     </a>
                 </div>
@@ -114,7 +113,7 @@
 @endsection
 @section('script')
     <script>
-        function changeImg(img, id){
+        function changeImg(img, para, id){
             if ($('.link-active').length > 0) {
                 pre_id = $('.link-active')[0]['id'];
                 myId = document.getElementById(pre_id);
@@ -124,7 +123,9 @@
             var link = document.getElementById("values-link"+ id);
             link.classList.add("link-active")
             var image = document.getElementById('values-img');
-            image.src=img
+            var paragraph = document.getElementById('values-text');
+            image.src=img;
+            paragraph.innerHTML=para;
         }
     </script>
 @endsection

resources/views/admin/appointment/index.blade.php

@@ -21,7 +21,7 @@
                     <div class="col-md-12">
                         <div class="card">
                             <div class="card-header">
-                                <h3 class="card-title">Appointments</h3>
+                                <h3 class="card-title">{{ $service }} Appointments</h3>
                                 <div class="card-tools">
                                     <a class="btn btn-green" href="{{url('admin/appointments/create')}}" role="button">Create</a>
                                 </div>
@@ -35,19 +35,29 @@
                                     <div class="row">
                                         <div class="col-md-4">
                                             <div class="input-group input-group-sm mb-3 table-search w-100">
-                                                <input type="date"  name="date" class="form-control ds-input" placeholder="Date" aria-label="Small" aria-describedby="inputGroup-sizing-sm" onchange="filterList()">
+                                                <input type="date"  name="date" value = "{{ $date ?? null }}" class="form-control ds-input" placeholder="Date" aria-label="Small" aria-describedby="inputGroup-sizing-sm" onchange="filterList()">
+                                            </div>
+                                        </div>
+                                        <div class="col-md-4">
+                                            <div class="input-group input-group-sm mb-3 table-search w-100">
+                                                <select name="is_booked" class="form-control ds-input" onchange="filterList()">
+                                                    <option value="" {{ is_null($is_booked) ? 'selected' : '' }} disabled >Filter By Booking Status</option>
+                                                        <option {{ $is_booked ? 'selected' : '' }} value="1">Booked</option>
+                                                        <option {{ (!is_null($is_booked) && !$is_booked) ? 'selected' : '' }} value="2">Open</option>
+                                                </select>
                                             </div>
                                         </div>
                                         <div class="col-md-4">
                                             <div class="input-group input-group-sm mb-3 table-search w-100">
                                                 <select name="status" class="form-control ds-input" onchange="filterList()">
-                                                    <option value="" disabled selected>Search By Status</option>
+                                                    <option value="" disabled selected>Filter By Status</option>
                                                     @foreach(config('custom.status') as $in => $val)
-                                                        <option value="{{$in}}">{{$val}}</option>
+                                                        <option value="{{$in}}" {{($status ==$in) ? 'selected':''}} >{{$val}}</option>
                                                     @endforeach
                                                 </select>
                                             </div>
                                         </div>
+
                                     </div>
                                 </form>
 
@@ -74,7 +84,7 @@
                                             @if($setting->is_booked)
                                                 <td class="text-center"><span class="badge booked text-bg-secondary">Booked</span></td>
                                             @else
-                                                <td class="text-center"><span class="badge notbooked text-bg-secondary">Available</span></td>
+                                                <td class="text-center"><span class="badge notbooked text-bg-secondary">Open</span></td>
                                             @endif
 
                                             <td class="d-flex justify-content-center action-icons">

resources/views/admin/enquiry/show.blade.php

@@ -145,10 +145,12 @@
                                         <span>Desired Study Field:</span>
                                         <span>{{$enquiry->desired_study_field ?? 'N/A'}} </span>
                                     </li>
+                                    @if(!is_null($enquiry->desired_location))
                                     <li class="d-flex">
                                         <span>Desired Location:</span>
-                                        <span>{{$enquiry->desired_location ?? 'N/A'}} </span>
+                                        <span>{{config('custom.states')[$enquiry->desired_location]}} </span>
                                     </li>
+                                    @endif
 
                                 </ul>
                             </div>

resources/views/admin/index.blade.php

@@ -29,8 +29,8 @@
                         <!-- small box -->
                         <div class="small-box bg-info">
                             <div class="inner">
-                                <h3>{{$service-> count()}}</h3>
+                                <h3>{{ $visa_service->count() }}</h3>
-                                <p>Service</p>
+                                <p>Visa Service</p>
                             </div>
                             <div class="icon">
                                 <i class="fa-solid fa-headset"></i>
@@ -38,49 +38,50 @@
                             <a href="#" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a>
                         </div>
                     </div>
-                    <!-- ./col -->
                     <div class="col-lg-3 col-6">
                         <!-- small box -->
-                        <div class="small-box bg-success">
+                        <div class="small-box bg-info">
                             <div class="inner">
-                                <h3>2</h3>
+                                <h3>{{ $education_service->count() }}</h3>
-                                <p>Total Number of Referral</p>
+                                <p>Education Service</p>
                             </div>
                             <div class="icon">
-                                <i class="fa-solid fa-user-group"></i>
+                                <i class="fa-solid fa-headset"></i>
                             </div>
-                            <a href="referrals" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a>
+                            <a href="#" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a>
                         </div>
                     </div>
                     <!-- ./col -->
                     <div class="col-lg-3 col-6">
                         <!-- small box -->
-                        <div class="small-box bg-warning">
+                        <div class="small-box bg-success">
                             <div class="inner">
-                                <h3>{{$contact -> count()}}</h3>
+                                <h3>{{ $enquiry->count() }}</h3>
-                                <p>Total Number of Contact</p>
+                                <p>Total Number of Enquiries</p>
                             </div>
                             <div class="icon">
-                                <i class="fa-solid fa-address-book"></i>
+                                <i class="fa-solid fa-user-group"></i>
                             </div>
-                            <a href="contacts" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a>
+                            <a href="enquiries" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a>
                         </div>
                     </div>
                     <!-- ./col -->
                     <div class="col-lg-3 col-6">
                         <!-- small box -->
-                        <div class="small-box bg-danger">
+                        <div class="small-box bg-warning">
                             <div class="inner">
-                                <h3>{{$subscription -> count()}}</h3>
+                                <h3>{{$contact->count()}}</h3>
-                                <p>Number of Subscription</p>
+                                <p>Total Number of Contacts</p>
                             </div>
                             <div class="icon">
-                                <i class="fa-solid fa-hand-pointer"></i>
+                                <i class="fa-solid fa-address-book"></i>
                             </div>
-                            <a href="subscriptions" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a>
+                            <a href="contacts" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a>
                         </div>
                     </div>
                     <!-- ./col -->
+                    
+                    <!-- ./col -->
                 </div>
                 <!-- /.row -->
                 <!-- Main row -->

resources/views/admin/layouts/menubar.blade.php

@@ -129,7 +129,7 @@
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link {{(Request::segment(2) == 'appointments') ? 'active' : ''}}">
+                        <a class="nav-link ">
                             <div class="sidebar-icon w-100" id="myAppointmentBtn">
                                 <i class="fa-regular fa-calendar-check"></i>
                                 <span class="menu-title w-100">
@@ -140,12 +140,12 @@
                         <div class="collapse" id="myAppointment">
                             <ul class="nav flex-column sub-menu">
                                 <li class="nav-item">
-                                    <a class="nav-link" href="{{url('admin/appointments')}}">
+                                    <a class="nav-link {{(Request::segment(2) == 'education') ? 'active' : ''}}" href="{{url('admin/appointments/education')}}">
                                         <i class="fa-solid fa-book-open-reader"></i> <p>Education Services</p>
                                     </a>
                                 </li>
                                 <li class="nav-item">
-                                    <a class="nav-link" href="{{url('admin/appointments')}}">
+                                    <a class="nav-link" href="{{url('admin/appointments/visa')}}">
                                         <i class="fa-brands fa-cc-visa"></i> <p>Visa Services</p>
                                     </a>
                                 </li>

resources/views/appointment_confirmed.blade.php

@@ -19,6 +19,7 @@
         <b>Appointment End Time:</b>{{$end_time}}<br /><br />
         <b>Your Full Name:</b> {{ $full_name }}<br /><br />
         <b>Phone:</b> {{$phone}}<br /><br />
+        
       </div>
     </div>
 

resources/views/appointment_confirmed_for_admin.blade.php

@@ -0,0 +1,25 @@
+
+<style>
+		.main-column{
+			display:flex;
+			width:100%;
+		}
+		.column-one{
+			width:50%;
+		}
+	</style>
+
+    <h1>Appointment Confirmed</h1>
+    <br />
+    <div class="main-column" style = "display:block; width:100%;">
+      <div class="column-one" style = "display:block; width:100%;">
+        <h3>Appointment Details</h3>
+        <b>Appointment Date: </b>{{$date}}<br /><br />
+        <b>Appointment Start Time: </b>{{$start_time}}<br /><br />
+        <b>Appointment End Time: </b>{{$end_time}}<br /><br />
+        <b>Appointee Full Name: </b> {{ $full_name }}<br /><br />
+        <b>Phone:</b> {{$phone}}<br /><br />
+        <b>Email:</b> {{$email}}<br /><br />
+      </div>
+    </div>
+

resources/views/blogs.blade.php

@@ -52,7 +52,7 @@
                             <h3 class="dinline mr-3">Study in Australia</h3>
                             <h6 class="dinline mr-3">{{$blog->publish_date}}</h6>
                             <h2>{{$blog->title}} </h2>
-                            {!!(\Illuminate\Support\Str::limit($blog->description, 200, $end='...'))!!}</p>
+                            {!!(\Illuminate\Support\Str::limit($blog->description, 200, $end=''))!!}</p>
                             <a href="{{url('/blog/'.$blog->slug)}}">Read More <i class="fa-solid fa-arrow-right-long ms-2 fa-xs"></i></a>
                         </div>
                     </div>

resources/views/enquiry-form.blade.php

@@ -248,10 +248,9 @@
                         <label for="name">Desired location (If Any)</label>
                         <select class="form-select" name="desired_location" id="desired-location">
                             <option hidden>Select your desired location</option>
-                            <option value="au" class="select-placeholder">Australia</option>
+                            @foreach(config('custom.states') as $in => $val)
-                            <option value="nz" class="select-placeholder">New Zeland</option>
+                               <option value="{{$in}}" @if(old('desired_location') == $in) selected @endif>{{$val}}</option>
-                            <option value="ca" class="select-placeholder">Canada</option>
+                            @endforeach
-                            <option value="us" class="select-placeholder">USA</option>
                         </select>
                     </div>
                 </div>

resources/views/enquiry_mail.blade.php

@@ -69,7 +69,7 @@
     <b>Desired Field of Study:</b> {{ $enquiry->desired_study_field }}<br /><br />
     @endif
     @if(!is_null($enquiry->desired_location))
-    <b>Desired Location:</b> {{ $enquiry->desired_location }}<br /><br />
+    <b>Desired Location:</b> {{ config('custom.states')[$enquiry->desired_location] }}<br /><br />
     @endif
   </div>
 </div>

resources/views/layout/app.blade.php

@@ -115,7 +115,7 @@
               </ul>
             </li>
             <li class="nav-item">
-                <a class="nav-link" href="{{url('/blogs')}}">BLOG</a>
+                <a class="nav-link" href="{{url('/blogs')}}">BLOGS</a>
             </li>
             <li class="nav-item">
                 <a class="nav-link" href="{{url('contact')}}">CONTACT</a>
@@ -258,7 +258,7 @@
             <div class="bottom-footer text-center p-3" >
               <div class='row footer-text'>
                 <p class='col-md-4'>ET Education and Visa Services  © 2023. All Rights Reserved.     </p>
-                <p class='col-md-4 policy'><a >Disclaimer</a> | <a >Privacy Policy</a> | <a >Feedback and Complaints</a></p>
+                <p class='col-md-4 policy'><a >Disclaimer</a> | <a href="privacy_policy">Privacy Policy</a> | <a >Feedback and Complaints</a></p>
                 <p class='col-md-4'>Designed & Developed By: <a target="-blank" rel="noreferrer" href="https://www.extratechs.com.au/">Extratech</a></p>
               </div>
             </div>
@@ -341,4 +341,44 @@
       }
     </script>
 
+    <!--Whatsapp-->
+    <script>
+    var fullPath1 = window.location.href;
+    var url = 'https://wati-integration-service.clare.ai/ShopifyWidget/shopifyWidget.js?69991';
+    var s = document.createElement('script');
+    s.type = 'text/javascript';
+    s.async = true;
+    s.src = url;
+        var options = {
+            "enabled":true,
+            "chatButtonSetting":{
+                "backgroundColor":"#4dc247",
+                "ctaText":"",
+                "borderRadius":"25",
+                "marginLeft":"30",
+                "marginBottom":"30",
+                "marginRight":"30",
+                "position":"right"
+            },
+            "brandSetting":{
+                "brandName":"ET Education | Visa",
+                "brandSubTitle":"Online",
+                "brandImg":"{{url('images/ET-Education.jpg')}}",
+                "welcomeText":"👋 Want to chat about ET Education?\n I'm here to help you find your way.",
+                "messageText":"Hello, I have a question about",
+                "backgroundColor":"#0a5f54",
+                "ctaText":"Start Chat",
+                "borderRadius":"25",
+                "autoShow":true,
+                "phoneNumber":"+61405978672"
+            }
+        };
+        s.onload = function() {
+            CreateWhatsappChatWidget(options);
+            $('.wa-chat-box-poweredby').hide();
+        };
+        var x = document.getElementsByTagName('script')[0];
+        x.parentNode.insertBefore(s, x);
+    </script>
+
 </html>

resources/views/privacy_policy.blade.php

@@ -0,0 +1,166 @@
+@extends('layout.app')
+@section('title')
+<title>Privacy Policy</title>
+    <meta name="description" content="ET Education and Visa Services, presented by Extratech, is an adept provider of excellent education consultation, information, and visa guidance solution to students seeking schooling abroad.">
+    <meta name="robots" content="index, follow" />
+    <meta property="og:url" content="" />
+    <meta property="og:image" content="{{url('frontend/images/banner.png')}}"/>
+    <meta property="og:title" content="ET-Visas"/>
+    <meta property="og:description" content="ET Education and Visa Services, presented by Extratech, is an adept provider of excellent education consultation, information, and visa guidance solution to students seeking schooling abroad."/>
+@endsection
+@section('content')
+    <section class="privacy-policy-section">
+        <h1>Privacy Policy</h1>
+        <p>At ET Education & Visa Services, we are committed to protecting the privacy and confidentiality of our client’s personal information. This Privacy Policy outlines the types of information we collect, how we use and safeguard this information, and your rights to access and control your information.
+            When you provide personal information to ET Education & Visa Services, you are giving your consent to the collection, use, and disclosure of your personal information as per this Privacy Policy and any other agreements between you and ET Education & Visa Services.
+            <br><br>
+            ET Education & Visa Services reserves the right to modify this Privacy Policy from time to time by publishing the changes on the Website. We recommend that you periodically visit the Website to stay updated with the current Privacy Policy of ET Education & Visa Services.
+            If you use the Website after any changes have been made to the Privacy Policy, you will be considered to have given your consent to those changes.
+        </p>
+        <div class="definition-policy">
+            <h2>Definitions</h2>
+            In this Privacy Policy:
+            <ul>
+                <li>"Personal information" means information that can be associated with a specific person and can be used to identify that person and includes your information and the types of information described in this Privacy Policy.</li>
+                <li>"Privacy Policy" means this privacy policy (as amended from time to time).</li>
+                <li>"ET Education & Visa Services," "we," "us," or "our" means ET Education & Visa Services and its associated entities.</li>
+                <li>"Specific Service" means any service, product, or good provided by ET Education & Visa Services, including but not limited to visa and immigration-related services and enrolment or recruitment-related services.</li>
+                <li>"Website" means the website provided by ET Education & Visa Services, which allows you to view, order, or otherwise deal with the services, products or goods provided or offered by ET Education & Visa Services.</li>
+            </ul>
+        </div>
+        <div class="personal-policy">
+            <h2>Collection of Personal Information</h2>
+            We may collect the following types of personal information from our clients:
+            <ol>
+                <li>Contact information, such as name, email address, phone number, and mailing address.</li>
+                <li>Demographic information, such as date of birth, nationality, and gender.</li>
+                <li>Educational information, such as academic records, transcripts, and degrees.</li>
+                <li>Visa-related information, such as passport number, visa application documents, and travel history.</li>
+                <li>Financial information, such as payment details and bank account information.</li>
+                <li>Your device ID, device type, geo-location information, computer and connection information, statistics on page views, traffic to and from the sites, ad data, IP address, standard web log information and page interaction information</li>
+                <li>Any additional information relating to you that you provide to ET Education & Visa Services directly through the Website or indirectly through your use of the Website or through other websites or accounts from which you permit ET Education & Visa Services to collect information.</li>
+                <li>Information you provide to ET Education & Visa Services (or its agents or representatives) through customer surveys.</li>
+                <li>Personal information based on your activities on the Website.</li>
+                <li>Any other personal information required to facilitate your dealings with ET Education & Visa Services.</li>
+                <li>We will only collect sensitive personal information about you if we have your express or implied consent or if the law otherwise permits it. The types of sensitive information that we may collect include:</li>
+                <ul>
+                    <li>Racial or ethnic origin</li>
+                    <li>Political opinions</li>
+                    <li>Criminal record</li>
+                    <li>Financial situation (including income or remuneration details)</li>
+                    <li>Health and medical information relating to your current and previous health status, medical conditions, and dietary requirements (where applicable)</li>
+                </ul>
+                <li>ET Education & Visa Services may collect personal information when you:</li>
+                <ul>
+                    <li>Register on or make use of the Website.</li>
+                    <li>Request a service, product or good from ET Education & Visa Services</li>
+                    <li>Communicate with ET Education & Visa Services through correspondence, chats, email, or when you share information with ET Education & Visa Services from other social applications, services, or websites.</li>
+                </ul>
+                <li>When you provide your personal information to ET Education & Visa Services to request a service or product from us (or our representatives or agents), your contact details may be retained even if the transaction is not completed.</li>
+                <li>ET Education & Visa Services may retain your contact information, even if a transaction still needs to be completed when you provide your personal information to request a service or product from us or our representatives or agents. These details are captured securely.</li>
+                If you provide us with sensitive information, we will only retain such information under the following circumstances:
+                <ul>
+                    <li>You have given consent for us to collect the information directly related to one of our functions, services, or activities.</li>
+                    <li>Information collection is required or authorised by Australian law, a court/tribunal order.</li>
+                    <li>Information collection is authorised for other purposes allowed under the Privacy Act, such as when we suspect unlawful activity or serious misconduct related to our functions, services, or activities has been, is being, or may be engaged in.</li>
+                </ul>
+            </ol>
+        </div>
+        <div class="personal-policy">
+            <h2>Use of Personal Information</h2>
+            We use the personal information we collect to provide services to our clients, including but not limited to the following:
+            <ol>
+                <li>To contact you and conduct our business or provide you with services or products requested.</li>
+                <li>To allow you to use and access our website.</li>
+                <li>To operate, protect, improve, and optimise our website and experiences, such as performing analytics, conducting research, and advertising and marketing.</li>
+                <li>To send you administrative, service, and support messages, as well as reminders, updates, and security alerts.</li>
+                <li>To send you the information requested by you.</li>
+                <li>To prepare and lodge visa applications, university and college applications, and other enrolment applications.</li>
+                <li>To provide information to migration agents, educational institutions or bodies, Department of Home Affairs or similar bodies or institutions, where required or permitted by law.</li>
+                <li>To send you marketing and promotional messages and other information that may interest you.</li>
+                <li>To detect, investigate and prevent potentially unlawful acts or omissions, or acts or omissions with the potential to breach our terms and conditions, this Privacy Policy, or other policies or arrangements between you and us.</li>
+                <li>To verify the information for accuracy or completeness (including by way of verification with third parties).</li>
+                <li>To comply with our legal obligations, resolve any disputes we may have with any of our customers or you, and enforce our agreements with you or any third parties.</li>
+                <li>To manage our relationship with you, including providing you with updates about the services or products that you have requested from us or responding to your enquiries.</li>
+                <li>For other purposes directed by you; and purposes authorised under an Australian law or to ensure that we comply with our obligations under European Union Member State law (if relevant)</li>
+            </ol>
+        </div>
+
+        <div class="personal-policy">
+            <h2>Access and Control of Personal Information</h2>
+            You may access the personal information we hold about you by contacting us using the information on our website.
+            <ol>
+                <li>We may need to verify your identity when you request personal information. However, there may be instances where we need help to provide access to all your personal information. We will notify you of any reason why access is denied. Within 30 days of your request, we will make every effort to grant access.</li>
+                <li>Clients have the right to access, modify, or delete their personal information by contacting us at the address below. Clients may also withdraw their consent to our collection, use, or disclosure of their personal information at any time, subject to legal or contractual obligations.</li>
+            </ol>
+        </div>
+
+        <div class="personal-policy">
+            <h2>Failure to Provide Personal Information:</h2>
+            You are not obliged to give us your personal information. We might be unable to provide you with the requested service if you decide not to give us the necessary personal information.
+            Sharing of Personal Information:
+            <ol>
+                <li>We may disclose personal information for the purposes described in this Privacy Policy to third parties such as the Department of Home Affairs, educational institutions, our employees and related bodies corporate, third-party suppliers and service providers, contractors, professional advisers or consultants, dealers and agents, web hosting providers, IT systems administrators, debt collectors, and payment systems operators.</li>
+                <li>We may also disclose your personal information to existing or potential agents, business partners, or sponsors, as well as to government agencies, regulatory bodies, and law enforcement agencies, or as required, authorised or permitted by law.</li>
+                <li>We may disclose personal information to third-party businesses located overseas and other countries referred to on our website.</li>
+                <li>Where you provide us with your personal information for a specific service, we may be required to provide such personal information to visa/immigration or enrolment/recruitment providers.</li>
+                <li>We have limited control over how these providers use, disclose, or store personal information. You should ensure you understand and agree with their privacy practices before providing us your personal information.</li>
+                <li>We do not sell or rent personal information to third parties, and we do not disclose personal information for marketing purposes without explicit consent from our clients.</li>
+            </ol>
+        </div>
+
+        <div class="row personal-policy">
+            <div class="col-md-6">
+                <h2>Opting Out:</h2>
+                <ol>
+                    <li>We may send you direct marketing communications and information about our services and products. You may opt out of receiving marketing materials from us by contacting us using the details on our website or clicking the unsubscribe link at the bottom of our emails.</li>
+                    <li> We take all reasonable steps to protect your personal information from misuse, loss, unauthorised access, modification, or disclosure. If you have any questions about this policy, please get in touch with us using the information on our website.</li>
+                </ol>
+            </div>
+            <div class="col-md-6">
+                <h2>Using our Website and Cookies</h2>
+                <ol>
+                    <li>ET Education & Visa Services may collect personal information about you.</li>
+                    <li>While we do not use browsing information to identify you personally, we may record certain information about your use of the website, such as which pages you visit, the time and date of your visit, and the internet protocol address assigned to your device.</li>
+                    <li>We may use "cookies" or similar tracking technologies on the website to track your usage and remember your preferences. Cookies are small files that store information on your device and enable us to recognise you across different websites, services, devices, and/or browsing sessions. If you disable cookies through your internet browser, the website may not work as intended for you.</li>
+                    <li>By using our website, you agree to ET Education & Visa Services placing cookies on your device and accessing them when you visit the website in the future.</li>
+                </ol>
+            </div>
+        </div>
+
+        <div class="personal-policy">
+        <h2>Links to Third-Party Websites</h2>
+            <ol>
+                <li>Our website might connect to external links, micro-sites, or analytics tools (like Google) that are not under ET Education & Visa Services' control or ownership. These links are provided solely for your convenience ("Third Party Websites"), and we do not warrant the accuracy or safety of these websites.</li>
+                <li>You are responsible for checking the policies and practices of Third-Party Websites before using them.</li>
+                <li>You acknowledge and agree that:</li>
+                <ul>
+                    <li>To the extent permitted by law, ET Education & Visa Services is not liable for any loss, expense, or cost suffered by you as a result of your use of Third-Party Websites.</li>
+                    <li>ET Education & Visa Services is not responsible for any Third-Party Website's privacy policies or content.</li>
+                </ul>
+            </ol>
+        </div>
+
+        <div class="row personal-policy">
+            <div class="col-md-6">
+                <h2>Protection of Personal Information</h2>
+                <p>We take reasonable measures to safeguard the personal information we collect from unauthorised access, use, or disclosure. We use physical, electronic, and administrative security measures to protect our client’s information and regularly review and update our security procedures.</p>
+            </div>
+            <div class="col-md-6">
+                <h2>Changes to Privacy Policy</h2>
+                <p>We may periodically update this privacy policy to reflect business practices or legal requirements changes. We will notify clients of any material changes to this Policy and obtain their consent where required.</p>
+            </div>
+        </div>
+
+        <div class="contact-policy">
+            <h2>Contact Information</h2>
+            <p>If you have any questions or concerns about our Privacy Policy or the collection, use, or disclosure of your personal information, please contact us at:</p>
+            <ul>
+                <li>ET Education & Visa Services</li>
+                <li><a href="https://goo.gl/maps/SFPf7MtojQ7yK9Nc9" target="_blank">Sydney Suite 132 & 133, Level 3, 10 Park Road, Hurstville NSW 2220</a></li>
+                <li>Email: <a href="mailto: admin@eteducation.com.au">admin@eteducation.com.au</a></li>
+                <li> Phone: <a href="telto: +61 02 9171 7740">+61 02 9171 7740</a></li>
+            </ul>
+        </div>
+    </section>
+@endsection

resources/views/welcome.blade.php

@@ -124,7 +124,7 @@
                     <div class="services-slider">
                         <div class="service-card">
                             <div class="service-icon">
-                                <img src="{{url('frontend/icons/abroad-icon.png')}}" alt="">
+                                <img src="{{url('frontend/icons/account-student.png')}}" alt="">
                             </div>
                             <h2>Student Visa</h2>
                             <p>Visit Australia to participate in the course of study.</p>

routes/web.php

@@ -272,7 +272,8 @@ Route::group(['middleware' => ['auth']], function () {
         Route::post('careers/{id}', [CareerController::class, 'update']);
         Route::get('careers/{id}', [CareerController::class, 'show']);
 
-        Route::get('appointments', [AppointmentController::class, 'index']);
+        Route::get('appointments/education', [AppointmentController::class, 'education_appointments']);
+        Route::get('appointments/visa', [AppointmentController::class, 'visa_appointments']);
         Route::get('appointments/create', [AppointmentController::class, 'create']);
         Route::post('appointments', [AppointmentController::class, 'store']);
         Route::get('appointments/{id}/edit', [AppointmentController::class, 'edit']);
@@ -308,6 +309,6 @@ Route::get('/insurance', function () {
 
 Route::get('/enquiry' , [EnquiryController::class, 'form']);
 Route::post('/enquiry' , [EnquiryController::class, 'submit'])->name('enquiry.submit');
-// Route::get('/visa', function () {
+Route::get('/privacy_policy ', function () {
-//     return view('visa');
+    return view('privacy_policy');
-// });
+});