diff --git a/app/Http/Controllers/Admin/AppointmentController.php b/app/Http/Controllers/Admin/AppointmentController.php index 69768e6..2ddbbeb 100644 --- a/app/Http/Controllers/Admin/AppointmentController.php +++ b/app/Http/Controllers/Admin/AppointmentController.php @@ -7,6 +7,7 @@ use App\Http\Controllers\Controller; use App\Models\Appointment; use Illuminate\Http\Request; +use Carbon\Carbon; class AppointmentController extends Controller { @@ -36,16 +37,17 @@ class AppointmentController extends Controller { $request->validate([ 'date' => 'required|date', - 'start_time' => 'required|date_format:H:i A', - 'end_time' => 'required|date_format:H:i A', + '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' => $request->get('start_time'), - 'end_time' => $request->get('end_time'), + 'start_time' => $start_time, + 'end_time' => $end_time, 'location' => $request->get('location'), 'description' => $request->get('description'), 'service_type' => $request->get('service_type'), @@ -58,8 +60,14 @@ class AppointmentController extends Controller public function edit($id) { - $appointment = Appointment::find($id); - + $appointment = Appointment::findorfail($id); + $start_time = explode(" ", $appointment->start_time); + $start_time = $start_time[0]; + + $end_time = explode(" ", $appointment->end_time); + $end_time = $end_time[0]; + $appointment['start_time'] = $start_time; + $appointment['end_time'] = $end_time; return view($this->view.'edit', compact('appointment')); } @@ -67,19 +75,22 @@ class AppointmentController extends Controller { $request->validate([ 'date' => 'required|date', - 'start_time' => 'required|date_format:H:i A', - 'end_time' => 'required|date_format:H:i A', + '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 = Appointment::find($id); $appointment->date = $request->get('date'); - $appointment->start_time = $request->get('start_time'); - $appointment->end_time = $request->get('end_time'); + $appointment->start_time = $start_time; + $appointment->end_time = $end_time; $appointment->location = $request->get('location'); $appointment->description = $request->get('description'); $appointment->service_type = $request->get('service_type'); + $appointment->status = $request->get('status'); $appointment->save(); return redirect($this->redirect)->with('success', 'Appointment has been updated'); diff --git a/app/Http/Controllers/AppointmentController.php b/app/Http/Controllers/AppointmentController.php index 5f11ec8..e4e4591 100644 --- a/app/Http/Controllers/AppointmentController.php +++ b/app/Http/Controllers/AppointmentController.php @@ -76,6 +76,7 @@ class AppointmentController extends Controller $appointment->is_booked = true; $appointment->save(); $subject = 'Appointment Confirmed'; + dispatch(function() use ($name,$email,$subject,$formated_date,$appointment) { \Mail::send('appointment_confirmed', array( 'full_name' =>$name, @@ -88,7 +89,7 @@ class AppointmentController extends Controller 'end_time' => $appointment['end_time'], - 'phone' =>$request['phone'], + 'phone' =>$appointment['phone'], 'subject' =>$subject @@ -101,6 +102,7 @@ class AppointmentController extends Controller // $message->cc('suman@extratechs.com.au', 'Extratech')->subject($subject); }); + }); } return response()->json(['appointment_detail' => $appointment_detail,'appointment' => $appointment,'formated_date' => $formated_date],200); diff --git a/resources/views/admin/appointment/edit.blade.php b/resources/views/admin/appointment/edit.blade.php index 81db134..cad1481 100644 --- a/resources/views/admin/appointment/edit.blade.php +++ b/resources/views/admin/appointment/edit.blade.php @@ -48,13 +48,13 @@
- +
- +