Merge branch 'master' of https://rav.triplestart.com/Petermuturi/snyder

app/Http/Controllers/AppController.php

@@ -6,8 +6,8 @@ use App\Http\Traits\StringGeneratorTrait;
 use Ramsey\Uuid\Uuid;
 
 use Illuminate\Http\Request;
-use App\Models\FindAClinicRequest;
-use App\Models\ContactMessage;
+use App\Models\PatientFindAClinicRequest;
+use App\Models\PatientContactMessage;
 
 class AppController extends Controller
 {
@@ -49,7 +49,7 @@ class AppController extends Controller
         'zip' => 'required|string'
       ]);
       
-      $record = new FindAClinicRequest;
+      $record = new PatientFindAClinicRequest;
       $record->iid = $this->makeIID();
       $record->uid = Uuid::uuid6();
       $record->name_first = $request->get('name_first');
@@ -73,7 +73,7 @@ class AppController extends Controller
         'message' => 'required|string'
       ]);
       
-      $record = new ContactMessage;
+      $record = new PatientContactMessage;
       $record->iid = $this->makeIID();
       $record->uid = Uuid::uuid6();
       $record->name_first = $request->get('name_first');

app/Http/Controllers/PhysiciansController.php

@@ -7,7 +7,8 @@ use Ramsey\Uuid\Uuid;
 
 use Illuminate\Http\Request;
 
-use App\Models\TrainingRequest;
+use App\Models\PhysicianTrainingRequest;
+use App\Models\PhysicianContactMessage;
 
 class PhysiciansController extends Controller
 {
@@ -58,7 +59,7 @@ class PhysiciansController extends Controller
       return view('app.physicians.reimbursement-guide');
     }
 
-    public function submitTrainingRequest(Request $request) {
+    public function submitPhysicianTrainingRequest(Request $request) {
       $request->validate([
         'name_first' => 'required|string',
         'name_last' => 'required|string',
@@ -70,7 +71,7 @@ class PhysiciansController extends Controller
         'training_format' => 'required|string',
       ]);
 
-      $record = new TrainingRequest;
+      $record = new PhysicianTrainingRequest;
       $record->iid = $this->makeIID();
       $record->uid = Uuid::uuid6();
       $record->name_first = $request->get('name_first');
@@ -87,4 +88,32 @@ class PhysiciansController extends Controller
       return redirect()->back()->with('success', 'Your request has been submitted!');
     }
 
+    public function submitContactUs(Request $request){
+      $request->validate([
+        'name_prefix' => 'required|string',
+        'name_first' => 'required|string',
+        'name_last' => 'required|string',
+        'practice_name' => 'required|string',
+        'email' => 'required|email',
+        'phone' => 'required|string',
+        'zip' => 'required|string',
+        'message' => 'required|string',
+      ]);
+
+      $record = new PhysicianContactMessage;
+      $record->iid = $this->makeIID();
+      $record->uid = Uuid::uuid6();
+      $record->name_prefix = $request->get('name_prefix');
+      $record->name_first = $request->get('name_first');
+      $record->name_last = $request->get('name_last');
+      $record->practice_name = $request->get('practice_name');
+      $record->email = $request->get('email');
+      $record->phone = $request->get('phone');
+      $record->zip = $request->get('zip');
+      $record->message = $request->get('message');
+
+      $record->save();
+      return redirect()->back()->with('success', 'Your request has been submitted!');
+    }
+
 }

app/Models/ContactMessage.php → app/Models/PatientContactMessage.php

@@ -5,7 +5,7 @@ namespace App\Models;
 use App\Models\Base\BaseModel;
 use Illuminate\Database\Eloquent\Model;
 
-class ContactMessage extends BaseModel
+class PatientContactMessage extends BaseModel
 {
-    protected $table = 'contact_message';
+    protected $table = 'patient_contact_message';
 }

app/Models/PatientFindAClinicRequest.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use App\Models\Base\BaseModel;
+use Illuminate\Database\Eloquent\Model;
+
+class PatientFindAClinicRequest extends BaseModel
+{
+    protected $table = 'patient_find_a_clinic_request';
+}

app/Models/FindAClinicRequest.php → app/Models/PhysicianContactMessage.php

@@ -5,7 +5,7 @@ namespace App\Models;
 use App\Models\Base\BaseModel;
 use Illuminate\Database\Eloquent\Model;
 
-class FindAClinicRequest extends BaseModel
+class PhysicianContactMessage extends BaseModel
 {
-    protected $table = 'find_a_clinic_request';
+    protected $table = 'physician_contact_message';
 }

app/Models/TrainingRequest.php → app/Models/PhysicianTrainingRequest.php

@@ -5,7 +5,7 @@ namespace App\Models;
 use App\Models\Base\BaseModel;
 use Illuminate\Database\Eloquent\Model;
 
-class TrainingRequest extends BaseModel
+class PhysicianTrainingRequest extends BaseModel
 {
-    protected $table = 'training_request';
+    protected $table = 'physician_training_request';
 }

database/migrations/2022_11_14_084640_create_find_a_clinic_request.php → database/migrations/2022_11_14_084640_create_patient_find_a_clinic_request.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateFindAClinicRequest extends Migration
+class CreatePatientFindAClinicRequest extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateFindAClinicRequest extends Migration
      */
     public function up()
     {
-        Schema::create('find_a_clinic_request', function (Blueprint $table) {
+        Schema::create('patient_find_a_clinic_request', function (Blueprint $table) {
             $table->id();
             $table->string('uid')->unique();
             $table->string('iid')->unique();
@@ -33,6 +33,6 @@ class CreateFindAClinicRequest extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('find_a_clinic_request');
+        Schema::dropIfExists('patient_find_a_clinic_request');
     }
 }

database/migrations/2022_11_14_092057_create_contact_message_table.php → database/migrations/2022_11_14_092057_create_patient_contact_message_table.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateContactMessageTable extends Migration
+class CreatePatientContactMessageTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateContactMessageTable extends Migration
      */
     public function up()
     {
-        Schema::create('contact_message', function (Blueprint $table) {
+        Schema::create('patient_contact_message', function (Blueprint $table) {
             $table->id();
             $table->string('uid')->unique();
             $table->string('iid')->unique();
@@ -35,6 +35,6 @@ class CreateContactMessageTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('contact_message');
+        Schema::dropIfExists('patient_contact_message');
     }
 }

database/migrations/2022_11_15_075223_create_training_request_table.php → database/migrations/2022_11_15_075223_create_physician_training_request_table.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateTrainingRequestTable extends Migration
+class CreatePhysicianTrainingRequestTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateTrainingRequestTable extends Migration
      */
     public function up()
     {
-        Schema::create('training_request', function (Blueprint $table) {
+        Schema::create('physician_training_request', function (Blueprint $table) {
             $table->id();
             $table->string('uid')->unique();
             $table->string('iid')->unique();
@@ -38,6 +38,6 @@ class CreateTrainingRequestTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('training_request');
+        Schema::dropIfExists('physician_training_request');
     }
 }

database/migrations/2022_11_16_073440_create_physician_contact_message_table.php

@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreatePhysicianContactMessageTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('physician_contact_message', function (Blueprint $table) {
+            $table->id();
+            $table->string('uid')->unique();
+            $table->string('iid')->unique();
+            $table->string('name_prefix')->nullable();
+            $table->string('name_first');
+            $table->string('name_last');
+            $table->string('practice_name')->nullable();
+            $table->string('email')->nullable();
+            $table->string('phone')->nullable();
+            $table->string('zip')->nullable();
+            $table->text('message')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('physician_contact_message');
+    }
+}

resources/views/app/contact.blade.php

@@ -18,6 +18,18 @@
       <form class="" action="{{ route('submit-contact') }}" method="post">
         @csrf
         <div class="row">
+          <div class="col-12">
+              @if($errors->any())
+            <div class="alert alert-danger fade show" role="alert">
+                There were errors found!
+            </div>
+            @endif
+            @if(session('success'))
+            <div class="alert alert-success fade show" role="alert">
+                {{session('success')}}
+            </div>
+            @endif
+          </div>
           <div class="col-lg-6 form-group mb-4">
             <input type="text" class="form-control rounded-0 py-3" name="name_first" placeholder="First Name" value="{{ old('name_first') }}">
             @error('name_first')
@@ -64,16 +76,6 @@
               <small class="text-warning">{{$message}}</small>
             @enderror
         </div>
-        @if($errors->any())
-        <div class="alert alert-danger fade show" role="alert">
-            There were errors found!
-        </div>
-        @endif
-        @if(session('success'))
-        <div class="alert alert-success fade show" role="alert">
-            {{session('success')}}
-        </div>
-        @endif
         <button type="submit" class="btn btn-pry w-100 py-3">Submit message</button>
       </form>
     </div>

resources/views/app/physicians/contact-us.blade.php

@@ -30,12 +30,25 @@
     <div class="row justify-content-center">
       <div class="col-lg-8">
         <h5 class="header">Contact Us</h5>
-        <form class="" action="" method="post">
+        <form class="" action="{{ route('physicians.submit-contact-us') }}" method="post">
           @csrf
+
+          @if(session('success'))
+            <div class="alert alert-success fade show" role="alert">
+                {{session('success')}}
+            </div>
+          @endif
+
+          @if($errors->any())
+          <div class="alert alert-danger fade show" role="alert">
+              There were errors found!
+          </div>
+          @endif
+          
           <label for="">Full Name <span class="text-danger">*</span> </label>
           <div class="row">
             <div class="col-lg-4 form-group mb-4">
-              <select class="form-control rounded-0 py-3" required name="prefix">
+              <select class="form-control rounded-0 py-3" required name="name_prefix">
                 <option value="">Select Prefix</option>
                 <option value="Dr.">Dr.</option>
                 <option value="Mr.">Mr.</option>
@@ -44,7 +57,7 @@
                 <option value="Ms.">Ms.</option>
                 <option value="Prof.">Prof.</option>
               </select>
-              @error('prefix')
+              @error('name_prefix')
                 <small class="text-warning">{{$message}}</small>
               @enderror
             </div>
@@ -64,22 +77,37 @@
           <div class="form-group mb-4">
             <label>Practice Name <span class="text-danger">*</span> </label>
             <input type="text" class="form-control rounded-0 py-3" required name="practice_name" value="{{ old('practice_name') }}">
+            @error('practice_name')
+                <small class="text-warning">{{$message}}</small>
+              @enderror
           </div>
           <div class="form-group mb-4">
             <label>Email <span class="text-danger">*</span> </label>
             <input type="email" class="form-control rounded-0 py-3" required name="email" value="{{ old('email') }}">
+            @error('email')
+                <small class="text-warning">{{$message}}</small>
+              @enderror
           </div>
           <div class="form-group mb-4">
             <label>Phone <span class="text-danger">*</span> </label>
             <input type="tel" class="form-control rounded-0 py-3" required phone name="phone" value="{{ old('phone') }}">
+            @error('phone')
+                <small class="text-warning">{{$message}}</small>
+              @enderror
           </div>
           <div class="form-group mb-4">
             <label>Zip / Postal Code <span class="text-danger">*</span> </label>
             <input type="text" class="form-control rounded-0 py-3" required phone name="zip" value="{{ old('zip') }}">
+            @error('zip')
+                <small class="text-warning">{{$message}}</small>
+              @enderror
           </div>
           <div class="form-group mb-4">
             <label>How Can We Help You?<span class="text-danger">*</span></label>
             <textarea name="message" class="form-control rounded-0" required rows="6">{{ old('message') }}</textarea>
+            @error('message')
+                <small class="text-warning">{{$message}}</small>
+              @enderror
           </div>
           <button type="submit" class="btn btn-pry w-100 py-3">SUBMIT</button>
         </form>

routes/web.php

@@ -39,6 +39,7 @@ Route::prefix('/physicians/')->name('physicians.')->group(function () {
     Route::get('/order-products/obp', [PhysiciansController::class, 'orderProductsObp'])->name('order-products-obp');
     Route::get('/fda-registration', [PhysiciansController::class, 'fdaRegistration'])->name('fda-registration');
     Route::get('/contact-us', [PhysiciansController::class, 'contactUs'])->name('contact-us');
+    Route::post('/submit-contact-us', [PhysiciansController::class, 'submitContactUs'])->name('submit-contact-us');
 
     Route::get('/get-trained', [PhysiciansController::class, 'getTrained'])->name('get-trained');
     Route::post('/submit-training-request', [PhysiciansController::class, 'submitTrainingRequest'])->name('submit-training-request');