From 338d01506954d68a4c4156d867d0c72d9ca3465c Mon Sep 17 00:00:00 2001 From: Mahesh Sharma Date: Fri, 17 Feb 2023 12:40:46 +0545 Subject: [PATCH] enquiry-backend --- .../Admin/AppointmentController.php | 6 +- app/Http/Controllers/EnquiryController.php | 32 +++ .../views/admin/appointment/index.blade.php | 2 +- resources/views/admin/career/create.blade.php | 157 -------------- resources/views/admin/career/edit.blade.php | 203 ------------------ resources/views/admin/career/index.blade.php | 116 ---------- resources/views/admin/career/show.blade.php | 148 ------------- .../{referral => enquiry}/index.blade.php | 53 ++--- resources/views/admin/enquiry/mail.blade.php | 22 ++ resources/views/admin/enquiry/show.blade.php | 158 ++++++++++++++ .../views/admin/layouts/menubar.blade.php | 34 +-- .../views/admin/referral/create.blade.php | 157 -------------- resources/views/admin/referral/edit.blade.php | 203 ------------------ resources/views/admin/referral/show.blade.php | 135 ------------ resources/views/appointment.blade.php | 40 ++-- resources/views/enquiry_mail.blade.php | 2 +- routes/web.php | 5 +- 17 files changed, 271 insertions(+), 1202 deletions(-) delete mode 100644 resources/views/admin/career/create.blade.php delete mode 100644 resources/views/admin/career/edit.blade.php delete mode 100644 resources/views/admin/career/index.blade.php delete mode 100644 resources/views/admin/career/show.blade.php rename resources/views/admin/{referral => enquiry}/index.blade.php (70%) create mode 100644 resources/views/admin/enquiry/mail.blade.php create mode 100644 resources/views/admin/enquiry/show.blade.php delete mode 100644 resources/views/admin/referral/create.blade.php delete mode 100644 resources/views/admin/referral/edit.blade.php delete mode 100644 resources/views/admin/referral/show.blade.php diff --git a/app/Http/Controllers/Admin/AppointmentController.php b/app/Http/Controllers/Admin/AppointmentController.php index 2ddbbeb..6c60c96 100644 --- a/app/Http/Controllers/Admin/AppointmentController.php +++ b/app/Http/Controllers/Admin/AppointmentController.php @@ -13,7 +13,7 @@ class AppointmentController extends Controller { protected $view= 'admin.appointment.'; protected $redirect = 'admin/appointments'; - + public function index(){ $appointments = Appointment::orderBy('id','DESC'); if(\request('date')){ @@ -24,7 +24,7 @@ class AppointmentController extends Controller $key = \request('status'); $appointments = $appointments->where('status',$key); } - $appointments = $appointments->paginate(20); + $appointments = $appointments->paginate(30); return view($this->view.'index',compact('appointments')); } @@ -63,7 +63,7 @@ class AppointmentController extends Controller $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; diff --git a/app/Http/Controllers/EnquiryController.php b/app/Http/Controllers/EnquiryController.php index 8cb726a..5b1e2b1 100644 --- a/app/Http/Controllers/EnquiryController.php +++ b/app/Http/Controllers/EnquiryController.php @@ -7,6 +7,9 @@ use App\Models\Country; use App\Models\Enquiry; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Session; + + class EnquiryController extends Controller { @@ -42,4 +45,33 @@ class EnquiryController extends Controller dispatch(new SendEnquiryMailJob($enquiry)); return redirect()->back()->with(['msg' => 'We have recieved your enquiry. You will be contacted soon!', 'status' => true], 200); } + + public function index() + { + + $enquiries = Enquiry::orderBy('id', 'DESC'); + if (\request('name')) { + $key = \request('name'); + $enquiries = $enquiries->where('first_name', 'like', $key . '%'); + } + if (\request('email')) { + $key = \request('email'); + $enquiries = $enquiries->where('email', 'like', $key . '%'); + } + $enquiries = $enquiries->paginate(30); + return view('admin.enquiry.index', compact('enquiries')); + } + + public function show($id) + { + $enquiry = Enquiry::findorfail($id); + return view('admin.enquiry.show', compact('enquiry')); + } + public function delete($id) + { + $enquiry = Enquiry::findorfail($id); + $enquiry->delete(); + Session::flash('success', 'Enquiry has been successfully deleted!'); + return redirect('admin/enquiries'); + } } diff --git a/resources/views/admin/appointment/index.blade.php b/resources/views/admin/appointment/index.blade.php index b91072c..40166e2 100644 --- a/resources/views/admin/appointment/index.blade.php +++ b/resources/views/admin/appointment/index.blade.php @@ -35,7 +35,7 @@
- +
diff --git a/resources/views/admin/career/create.blade.php b/resources/views/admin/career/create.blade.php deleted file mode 100644 index 4614e64..0000000 --- a/resources/views/admin/career/create.blade.php +++ /dev/null @@ -1,157 +0,0 @@ -@extends('admin.layouts.app') -@section('content') - -
- -
-
-
-
-

Career

-
-
-
-
- - -
-
- -
-
-

Create Career

- List - -
-
- @include('success.success') - @include('errors.error') - {!! Form::open(['url' => '/admin/careers', 'class' => 'form-horizontal', 'method'=> 'POST','files' => true,'autocomplete' => 'OFF']) !!} -
- -
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
- -
-
- - -
-
- -
-
- - -
-
-
-
- - -{{-- --}} -
-
-
-
- - -
-
- -
- -
-
-
-
-
- - -
-
-
- -
- -
- -
-
-
-
-
- - -
-
-
- -
-
- -
-
- {!! Form::close() !!} -
-
-
-
-
-@endsection -@section('script') - - - -@endsection - diff --git a/resources/views/admin/career/edit.blade.php b/resources/views/admin/career/edit.blade.php deleted file mode 100644 index f92bcbc..0000000 --- a/resources/views/admin/career/edit.blade.php +++ /dev/null @@ -1,203 +0,0 @@ -@extends('admin.layouts.app') -@section('content') - -
- -
-
-
-
-

Career

-
-
-
-
- - -
-
- -
-
-

Edit Career

- Back - -
-
- @include('success.success') - @include('errors.error') - {!! Form::open(['url' => '/admin/careers/'.$about_us->id, 'class' => 'form-horizontal', 'method'=> 'POST','files' => true]) !!} -
- -
-
- - -
- - - - - -
-
- - - - -
-
- - -
-
-
-
- - -
-
-
-
- - -
-
- - -
-
- - -
-
- -
-
- - -
-
-
-
- - -
-
-
-
- - -
-
- - - - - - - -
- - @if($about_us->career_points->count() > 0) -
-
-
-
-
- - - -
- @foreach($about_us->career_points as $point) -
-
-
- -
- @endforeach - -
- -
-
-
-
-
- - -
-
-
- @endif -
-
- -
-
- {!! Form::close() !!} -
-
-
-
-
-@endsection -@section('script') - -@endsection - diff --git a/resources/views/admin/career/index.blade.php b/resources/views/admin/career/index.blade.php deleted file mode 100644 index c5d3852..0000000 --- a/resources/views/admin/career/index.blade.php +++ /dev/null @@ -1,116 +0,0 @@ -@extends('admin.layouts.app') -@section('content') - - -
- -
-
-
-
-

Career

-
-
-
-
- - -
-
-
-
-
-
-

Career Table

-
- Create -
-
- - -
- @include('success.success') - @include('errors.error') - - - - - - - - - - - - - - - @foreach($settings as $setting) - - - - - - - - - - - - @endforeach - - -
S.N.ImageTitleSlugStatusAction
{{$loop->iteration}} - - - - - {!!$setting->title!!}{{$setting->slug}} {{config('custom.status')[$setting->status]}} - - - - View - - - - - Edit - - -
-
- {!! $settings->links() !!} -
-
- -
- - -
- -
- -
-
- -
- -@endsection diff --git a/resources/views/admin/career/show.blade.php b/resources/views/admin/career/show.blade.php deleted file mode 100644 index 08cdce4..0000000 --- a/resources/views/admin/career/show.blade.php +++ /dev/null @@ -1,148 +0,0 @@ -@extends('admin.layouts.app') -@section('content') - -
- -
-
-
-
-

Show Career

-
-
-
-
- - -
-
- -
-
-

Show Career

-
-
- @include('success.success') - @include('errors.error') -
- -
-
- -
- - - - - -
-
- - - - - - - - -
-
- - -
-
-
-
- - -
-
-
-
- - -
-
- - -
-
- - -
-
- -
-
- - -
-
-
-
- - -
-
-
-
- - -
-
- - - -
- - @if($about_us->career_points) -
-
-
-
-
- - - -
- @foreach($about_us->career_points as $point) -
-
-
-
- @endforeach - -
-
-
-
-
-
- - -
-
-
- @endif - -
-
-
-
-
-@endsection -@section('script') - -@endsection - diff --git a/resources/views/admin/referral/index.blade.php b/resources/views/admin/enquiry/index.blade.php similarity index 70% rename from resources/views/admin/referral/index.blade.php rename to resources/views/admin/enquiry/index.blade.php index a7fcd75..3ceb07a 100644 --- a/resources/views/admin/referral/index.blade.php +++ b/resources/views/admin/enquiry/index.blade.php @@ -20,30 +20,27 @@
-
-

Referrals

- -
- +
+

Enquiries

+
+{{-- Create--}} +
+
@include('success.success') @include('errors.error') +
- + @@ -102,9 +102,6 @@ - - -
  • @@ -157,38 +154,23 @@
    • - - - - - - - -
  • - +

    - Contact/Enquiry + Contact

    • - - - - - - - - + diff --git a/resources/views/admin/referral/create.blade.php b/resources/views/admin/referral/create.blade.php deleted file mode 100644 index 4614e64..0000000 --- a/resources/views/admin/referral/create.blade.php +++ /dev/null @@ -1,157 +0,0 @@ -@extends('admin.layouts.app') -@section('content') - -
    - -
    -
    -
    -
    -

    Career

    -
    -
    -
    -
    - - -
    -
    - -
    -
    -

    Create Career

    - List - -
    -
    - @include('success.success') - @include('errors.error') - {!! Form::open(['url' => '/admin/careers', 'class' => 'form-horizontal', 'method'=> 'POST','files' => true,'autocomplete' => 'OFF']) !!} -
    - -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    - -
    -
    - - -
    -
    - -
    -
    - - -
    -
    -
    -
    - - -{{-- --}} -
    -
    -
    -
    - - -
    -
    - -
    - -
    -
    -
    -
    -
    - - -
    -
    -
    - -
    - -
    - -
    -
    -
    -
    -
    - - -
    -
    -
    - -
    -
    - -
    -
    - {!! Form::close() !!} -
    -
    -
    -
    -
    -@endsection -@section('script') - - - -@endsection - diff --git a/resources/views/admin/referral/edit.blade.php b/resources/views/admin/referral/edit.blade.php deleted file mode 100644 index f92bcbc..0000000 --- a/resources/views/admin/referral/edit.blade.php +++ /dev/null @@ -1,203 +0,0 @@ -@extends('admin.layouts.app') -@section('content') - -
    - -
    -
    -
    -
    -

    Career

    -
    -
    -
    -
    - - -
    -
    - -
    -
    -

    Edit Career

    - Back - -
    -
    - @include('success.success') - @include('errors.error') - {!! Form::open(['url' => '/admin/careers/'.$about_us->id, 'class' => 'form-horizontal', 'method'=> 'POST','files' => true]) !!} -
    - -
    -
    - - -
    - - - - - -
    -
    - - - - -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    - - - - - - - -
    - - @if($about_us->career_points->count() > 0) -
    -
    -
    -
    -
    - - - -
    - @foreach($about_us->career_points as $point) -
    -
    -
    - -
    - @endforeach - -
    - -
    -
    -
    -
    -
    - - -
    -
    -
    - @endif -
    -
    - -
    -
    - {!! Form::close() !!} -
    -
    -
    -
    -
    -@endsection -@section('script') - -@endsection - diff --git a/resources/views/admin/referral/show.blade.php b/resources/views/admin/referral/show.blade.php deleted file mode 100644 index 82047f6..0000000 --- a/resources/views/admin/referral/show.blade.php +++ /dev/null @@ -1,135 +0,0 @@ -@extends('admin.layouts.app') -@section('content') - -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - - -
    -
    - -
    -
    -

    Referral

    - List -
    -
    - @include('success.success') - @include('errors.error') -
    -
    -
    -
    -
      -
    • - Full Name: - {{$referral->name}} -
      • -
    • - Gender: - @if($referral->gender == '1') Male @elseif($referral->gender == '2') Female @else Other @endif -
      • -
    • - Email: - {{$referral->email}} -
      • -
    • - Date of Birth: - {{$referral->dob}} -
      • -
    • - Phone: - {{$referral->mobile_no}} -
      • -
    -
    - -
    -
    -
      -
    • - Suburb: - {{$referral->suburb}} -
      • -
    • - State/Region: - {{$referral->state_name}} -
      • -
    • - Postal Code: - {{$referral->postalcode}} -
      • -
    -
    - - @if($referral->is_ndis == '1') -
    -
    -
      -
    • - NDIS Number: - {{$referral->ndis_number}} -
      • -
    • - NDIS Expiry Date: - {{$referral->ndis_expiry_date}} -
      • -
    • - NDIS Plan: - {{config('custom.ndis_plan')[$referral->ndis_plan]}} -
      • -
    -
    - @endif - -
    -
    -
      -
    • - Sevices: - - @foreach($referral->referral_services as $service) - - {{App\Models\Service::find($service->service_id)->name}}
      - @endforeach -       -
      • -
    • - Details: - {{$referral->services_details}} -
      • -
    -
    - -
    -
    -
      -
    • - Referrer Full Name: - {{$referral->referrer_full_name}} -
      • -
    • - Referrer Contact Number: - {{$referral->referrer_contact_no}} -
      • - -
    -
    -
    -
    - -
    -
    -
    -
    -
    -@endsection \ No newline at end of file diff --git a/resources/views/appointment.blade.php b/resources/views/appointment.blade.php index 350d7f5..c2755f7 100644 --- a/resources/views/appointment.blade.php +++ b/resources/views/appointment.blade.php @@ -20,8 +20,8 @@
    +
    @@ -74,7 +74,7 @@
    -

    You are about to book your appointment for at date   to

    +

    You are about to book appointment for at date   to

    @@ -117,8 +117,8 @@ 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') } }); - - + + $('#v-pills-education-tab').click(function (e) { var id = $(this).data("type"); var $calender = $("#"+id+"-calendar-apppearance"); @@ -144,7 +144,7 @@ var events = []; appointments_list.forEach(function(list) { - events.push({ + events.push({ date: list.date, classname: "clickable event-clickable" }); @@ -160,9 +160,9 @@ prev: '', next: '' }, - + events:events - + }); let allBtns = document.querySelectorAll("td") @@ -192,13 +192,13 @@ allBtns.forEach(function(el){ el.classList.remove("active"); }); - + // Add the class on clicked one e.target.classList.add("active"); }) } - function dispalyAppointments(appointments,formated_date,id) { - + function dispalyAppointments(appointments,formated_date,id) { + //display available appointments in timeslot if (appointments.length > 0) { @@ -233,12 +233,12 @@ $("#modal").modal("show"); }); - + } else{ $('#'+id+'-available-dates').html("No appointments available for " + ""+formated_date+""); - } - + } + } function submitAppointment(event){ @@ -251,19 +251,19 @@ $("#modal").modal("hide"); // var isAmStart = response.appointment.start_time < '12:00:00'; // var isAmEnd = response.appointment.end_time < '12:00:00'; - + Swal.fire({ title: 'Booked!!', text: 'Appointment Successfully Booked for '+response.appointment_detail['name']+' at '+response.formated_date +'('+response.appointment['start_time']+' - ' + response.appointment['end_time']+' )', icon: 'success' - }).then(function(){ + }).then(function(){ location.reload(); } - ) + ) } }); - + } -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/enquiry_mail.blade.php b/resources/views/enquiry_mail.blade.php index 0e788cc..02c836a 100644 --- a/resources/views/enquiry_mail.blade.php +++ b/resources/views/enquiry_mail.blade.php @@ -37,7 +37,7 @@ @if(!is_null($enquiry->stream)) Stream: {{$enquiry->stream}}

    @endif - % or GPA {{$enquiry->gpa}}

    + % or GPA: {{$enquiry->gpa}}

    Graduated year: {{$enquiry->graduate_year}}

    Gap: {{$enquiry->gap}}

    Current Status: {{$enquiry->current_status}}

    diff --git a/routes/web.php b/routes/web.php index 4c2f6b7..c69d070 100644 --- a/routes/web.php +++ b/routes/web.php @@ -254,8 +254,9 @@ Route::group(['middleware' => ['auth']], function () { Route::get('contacts', [ContactUsController::class, 'index']); Route::get('contacts/{id}/view', [ContactUsController::class, 'show']); - Route::get('enrollments', [EnrollmentController::class, 'index']); - Route::get('enrollments/{id}/view', [EnrollmentController::class, 'show']); + Route::get('enquiries', [EnquiryController::class, 'index']); + Route::get('enquiries/{id}/view', [EnquiryController::class, 'show']); + Route::get('enquiries/{id}/delete', [EnquiryController::class, 'delete']); Route::get('teams', [TeamController::class, 'index']); Route::get('teams/create', [TeamController::class, 'create']);