[edit] type date

app/Http/Controllers/AppointmentController.php

@@ -11,8 +11,8 @@ class AppointmentController extends Controller
 {
     public function index(){
 
-        $educationAppointments = Appointment::where('date', '>=', Carbon::today())->where('service_type', '1')->get();
+        $educationAppointments = Appointment::where('service_type', '1')->get();
-        $visaAppointments = Appointment::where('date', '>=', Carbon::today())->where('service_type', '2')->get();
+        $visaAppointments = Appointment::where('service_type', '2')->get();
         // foreach($educationAppointments as $appointment){
         //     $startTime = Carbon::createFromFormat('H:i', $appointment->start_time);
         //     $date = Carbon::createFromFormat('H:i', $appointment->start_time);
@@ -30,7 +30,6 @@ class AppointmentController extends Controller
         $month_number = date_parse($date_parts[1])['month'];
         $carbon = Carbon::createFromDate($date_parts[3], $month_number, $date_parts[2]);
         $date = $carbon->format('Y-m-d');
-        
         $type_id = $request->id;
         $appointments_all = Appointment::whereDate('date',$date)->where(['service_type' => $type_id,'is_booked' => false,'status' => 1])->get();
         $old_date = Carbon::createFromFormat('Y-m-d', $date);
@@ -38,19 +37,22 @@ class AppointmentController extends Controller
         $currentTime = Carbon::now();
         $appointments = [];
         foreach ($appointments_all as $appointment) {
-            $start_time = explode(" ", $appointment->start_time);
+            $start_time = date("H:i", strtotime($appointment->start_time));
-            $start_time = $start_time[0];
             $appointmentDate = Carbon::createFromFormat('Y-m-d H:i', $appointment->date.' '.$start_time);
             if ($appointmentDate->gt($currentTime)) {
                 array_push($appointments, $appointment);
             }
         }
-      
+        // $users = DB::table('appointments')->whereDate('created_at', '2022-12-01')->get();
+        // $time = [];
+        // foreach($appointments as $appointment){
+        //     array_push($time, [$appointment->start_time, $appointment->id]);
+        // }
+        // dd($time);
         return response()->json(['appointment' => $appointments,'formated_date' => $formated_date]);
     }
 
     public function form_submit(Request $request){
-        
         $request->validate([
             'name' => 'required',
             'email' => 'required|email',
@@ -67,8 +69,6 @@ class AppointmentController extends Controller
         $appointment_detail->appointment_id = $appointment_id;
         $email = $request['email'];
         $name = $request['name'];
-        $phone = $request['phone'];
-
         if($appointment_detail->save()){
             
             $date = Carbon::createFromFormat('Y-m-d', $appointment->date);
@@ -76,8 +76,7 @@ class AppointmentController extends Controller
             $appointment->is_booked = true;
             $appointment->save();
             $subject = 'Appointment Confirmed';
-            dispatch(function() use ($name,$email,$phone,$subject,$formated_date,$appointment) {
+            dispatch(function() use ($name,$email,$subject,$formated_date,$appointment) {
-
             \Mail::send('appointment_confirmed', array(
 
                 'full_name' =>$name,
@@ -90,7 +89,7 @@ class AppointmentController extends Controller
 
                 'end_time' => $appointment['end_time'],
     
-                'phone' =>$phone,
+                'phone' =>$appointment['phone'],
     
                 'subject' =>$subject 
     
@@ -108,5 +107,8 @@ class AppointmentController extends Controller
 
         return response()->json(['appointment_detail' => $appointment_detail,'appointment' => $appointment,'formated_date' => $formated_date],200);
 
+
+
+
     }
 }

app/Http/Controllers/HomeController.php

@@ -8,17 +8,9 @@ use App\Models\Testimonial;
 use App\Models\NewsAndUpdate;
 use App\Models\Subscription;
 use App\Models\AboutUs;
-use Illuminate\Support\Facades\Artisan;
-use Database\Seeders\AppointmentTableSeeder;
 
 class HomeController extends Controller
 {
-    public function runSeeder(){
-     Artisan::call('db:seed', ['--class' => AppointmentTableSeeder::class]);
-    }
-    public function runQueueJobs(){
-        Artisan::call('queue:listen');
-      }
    public function index(){
        $sliders = Slider::where('status',1)->get();
        $testimonials = Testimonial::where('status',1)->get();

database/seeders/AppointmentTableSeeder.php

@@ -20,18 +20,13 @@ class AppointmentTableSeeder extends Seeder
     public function run()
     {
         
-        $latestAppointment = DB::table('appointments')->latest('date')->first();
-        $startDate = $latestAppointment ? Carbon::parse($latestAppointment->date)->addDay() : Carbon::now();
-
         $startTime = Carbon::parse("9:00 AM");
         $endTime = Carbon::parse("5:00 PM");
-        
         foreach(config('custom.service_type') as $key => $value){
-
             for ($i = 0; $i < 7; $i++) {
-                $date = $startDate->copy()->addDays($i);
+                $date = Carbon::now()->addDays($i);
-                for ($j = 0; $j <= ((($endTime->diffInMinutes($startTime)) / 30)-1); $j++) {
     
+                for ($j = 0; $j <= ((($endTime->diffInMinutes($startTime)) / 30)-1); $j++) {
                     $currentTime = $startTime->copy()->addMinutes(30 * $j);
                     $currentEndTime = $startTime->copy()->addMinutes(30 * $j + 30);
     

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

@@ -74,11 +74,9 @@
                                             <td class="text-center">{{$setting->is_booked ? 'Booked' : 'Not Booked'}}</td>
 
                                             <td class="d-flex justify-content-center action-icons">
-                                                @if($setting->appointment_booking_detail()->count() > 0)
                                                 <a href="{{url('admin/appointments/'.$setting->id.'/view')}}" class="btn btn-sm" data-bs-toggle="tooltip" data-bs-placement="top" title="view">
                                                     <i class="fa-solid fa-eye"></i>
                                                 </a>
-                                                @endif
                                                 <a href="{{url('admin/appointments/'.$setting->id.'/edit')}}" class="btn btn-sm" data-bs-toggle="tooltip" data-bs-placement="top" title="edit">
                                                     <i class="fas fa-pencil-alt"></i>
                                                 </a>

resources/views/appointment.blade.php

@@ -69,12 +69,12 @@
             <div class="modal-dialog" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <h3 class="modal-title" id="appointmentModalLabel">Book Appointment</span></h3>
+                        <h3 class="modal-title" id="appointmentModalLabel">Book Appointment</h3>
                         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                     </div>
                     <div class="modal-body">
                         <div class="book-modal-info">
-                            <p>You are about to book your appointment for <span id = "booking_service"></span> at date &nbsp;<span id = "booking_date"></span><span class="time" id = "start_time"></span> to <span id = "end_time"></span></p>
+                            <p>Book your appointment for &nbsp;<span id = "booking_date"></span><span class="time" id = "start_time"></span> to <span id = "end_time"></span></p>
                         </div>
                         <!-- Form with the fields name, email, phone, and notes -->
                         <form id ="appointment-form">
@@ -139,29 +139,25 @@
     function displayCalendar($calender,id){
         var id = id;
         var now = new Date();
-        var appointments_list = id == 1 ? {!! json_encode($educationAppointments) !!} : {!! json_encode($visaAppointments) !!};
-
-        var events = [];
-
-        appointments_list.forEach(function(list) {
-            events.push({ 
-                date: list.date,
-                classname: "clickable event-clickable"
-            });
-        });
-
         $calender.zabuto_calendar({
         classname: 'table event-colourful table-bordered lightgrey-weekends',
         week_starts: 'monday',
         show_days: true,
         cell_border: true,
+        show_days: true,
         weekstartson: 0,
         navigation_markup: {
             prev: '<i class="fas fa-chevron-circle-left"></i>',
             next: '<i class="fas fa-chevron-circle-right"></i>'
         },
-            
+        events:[
-            events:events
+            @foreach($educationAppointments as $appointment)
+                {
+                    date: "{{ $appointment->date }}",
+                    "classname": "clickable event-clickable"
+                },
+            @endforeach
+        ]
       
         });
 
@@ -221,13 +217,7 @@
                 var startTime = $(this).data("start-time");
                 var endTime = $(this).data("end-time");
                 $('#appointment-form input[name="appointment_id"]').val(appointmentId);
-                $('#booking_date').html('<b>'+formated_date+'</b>');
+                $('#booking_date').html(formated_date);
-                if(id == 1){
-                    $('#booking_service').html('<b>Education Service</b>');
-                }
-                if(id == 2){
-                    $('#booking_service').html('<b>Migration/Visa Service</b>');
-                }
                 $('#start_time').html('&nbsp;<b>('+startTime+'</b>');
                 $('#end_time').html('<b>'+endTime+')</b>');
                 $("#modal").modal("show");

routes/web.php

@@ -53,8 +53,7 @@ use App\Http\Controllers\Admin\AppointmentController;
 | contains the "web" middleware group. Now create something great!
 |
 */
-Route::get('/mycron', [HomeController::class,'runQueueJobs']);
+
-Route::get('/seed', [HomeController::class,'runSeeder']);
 Route::get('/', [HomeController::class,'index'])->name('home.index');
 
 Route::get('login', [HomeAdminController::class,'getLogin'])->name('login');