From 0c5354f9ce513a480a496778d1770a28bafc2c2e Mon Sep 17 00:00:00 2001 From: Mahesh Sharma Date: Mon, 13 Feb 2023 12:41:05 +0545 Subject: [PATCH] admin-side --- .../Admin/AppointmentController.php | 8 ++- .../Controllers/AppointmentController.php | 35 +++++++++-- .../views/admin/appointment/index.blade.php | 7 ++- .../views/admin/appointment/show.blade.php | 63 +++++++++---------- .../views/appointment_confirmed.blade.php | 24 +++++++ 5 files changed, 97 insertions(+), 40 deletions(-) create mode 100644 resources/views/appointment_confirmed.blade.php diff --git a/app/Http/Controllers/Admin/AppointmentController.php b/app/Http/Controllers/Admin/AppointmentController.php index 0daadb8..68b90e2 100644 --- a/app/Http/Controllers/Admin/AppointmentController.php +++ b/app/Http/Controllers/Admin/AppointmentController.php @@ -49,7 +49,6 @@ class AppointmentController extends Controller 'location' => $request->get('location'), 'description' => $request->get('description'), 'service_type' => $request->get('service_type'), - ]); $appointment->save(); @@ -86,6 +85,13 @@ class AppointmentController extends Controller return redirect($this->redirect)->with('success', 'Appointment has been updated'); } + public function show($id){ + $appointment = Appointment::with('appointment_booking_detail')->findorfail($id); + + return view($this->view.'show', compact('appointment')); + + } + public function destroy($id) { $appointment = Appointment::find($id); diff --git a/app/Http/Controllers/AppointmentController.php b/app/Http/Controllers/AppointmentController.php index 98a4185..94e1014 100644 --- a/app/Http/Controllers/AppointmentController.php +++ b/app/Http/Controllers/AppointmentController.php @@ -51,22 +51,49 @@ class AppointmentController extends Controller 'email' => 'required|email', 'phone' => 'required', ]); + $appointment_id = $request->get('appointment_id'); + $appointment = Appointment::findorfail($appointment_id); $appointment_detail = new AppointmentBookingDetail(); $appointment_detail->name = $request->get('name'); $appointment_detail->email = $request->get('email'); $appointment_detail->phone = $request->get('phone'); $appointment_detail->notes = $request->get('notes'); - $appointment_id = $request->get('appointment_id'); $appointment_detail->appointment_id = $appointment_id; - + $email = $request['email']; + $name = $request['name']; if($appointment_detail->save()){ - $appointment = Appointment::findorfail($appointment_id); + $date = Carbon::createFromFormat('Y-m-d', $appointment->date); $formated_date = $date->format('M d, Y'); - // $isAm = ($appointment['start_time'] < '12:00:00') ? 'AM' :'PM'; $appointment->is_booked = true; $appointment->save(); + $subject = 'Appointment Confirmed'; + \Mail::send('appointment_confirmed', array( + + 'full_name' =>$name, + + 'email' =>$email, + + 'date' => $formated_date, + + 'start_time' => $appointment['start_time'], + + 'end_time' => $appointment['end_time'], + + 'phone' =>$request['phone'], + + 'subject' =>$subject + + + ), function($message) use ($subject,$email,$name){ + // $subject=($service!= '') ? 'Enquiry for '.$service : 'Contact/Feedback'; + $message->subject($subject); + $message->to($email, $name)->subject($subject); + // $message->cc('extratechweb@gmail.com', 'Extratech')->subject($subject); + // $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/index.blade.php b/resources/views/admin/appointment/index.blade.php index 39f0aa0..226d962 100644 --- a/resources/views/admin/appointment/index.blade.php +++ b/resources/views/admin/appointment/index.blade.php @@ -55,6 +55,7 @@ S.N. + Service Type Date Start Time End Time @@ -66,13 +67,17 @@ @foreach($appointments as $setting) {{$loop->iteration}} + {{config('custom.service_type')[$setting->service_type]}} {{$setting->date}} {{$setting->start_time}} {{$setting->end_time}} {{$setting->is_booked ? 'Booked' : 'Not Booked'}} - + + + + diff --git a/resources/views/admin/appointment/show.blade.php b/resources/views/admin/appointment/show.blade.php index c2fc697..a446c31 100644 --- a/resources/views/admin/appointment/show.blade.php +++ b/resources/views/admin/appointment/show.blade.php @@ -19,7 +19,7 @@
-

Applicant

+

Appointment Details

List
@@ -27,60 +27,55 @@ @include('errors.error')
-
-
+
+
  • - Full Name: - {{$applicants->name}} -
    • - -
  • - Email: - {{$applicants->email}} + Appointment Date: + {{$appointment->date}}
    • -
  • - Phone: - {{$applicants->phone}} + Appointment Start Time: + {{$appointment->start_time}}
  • - State: - {{config('custom.states')[$applicants->state]}} + Appointment End Time: + {{$appointment->end_time}}
    • + +
- -
-
+
+
    + @php $appointment_detail = $appointment->appointment_booking_detail; @endphp
  • - Sevices: - - @foreach($applicants->applicant_service as $service) - {{App\Models\Service::find($service->service_id)->name}}
    - @endforeach -     + Full Name: + {{$appointment_detail->name}}
    • +
  • - Message: - {{$applicants->message}} + Email: + {{$appointment_detail->email}}
  • - Resume: - - -

    View Resume

    -     - + Phone: + {{$appointment_detail->phone}}
    • + +
  • + Notes: + {{$appointment_detail->notes}} +
    • +
+ +
diff --git a/resources/views/appointment_confirmed.blade.php b/resources/views/appointment_confirmed.blade.php new file mode 100644 index 0000000..b3fbf5a --- /dev/null +++ b/resources/views/appointment_confirmed.blade.php @@ -0,0 +1,24 @@ + + + +

Appointment Booked Successfully

+
+
+
+

Please, find out the booking details below

+ Appointment Date:{{$date}}

+ Appointment Start Time:{{$start_time}}

+ Appointment End Time:{{$end_time}}

+ Your Full Name: {{ $full_name }}

+ Phone: {{$phone}}

+
+
+