fixed dob,demographics,mcnInfo forms

app/Http/Controllers/AppSessionController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-
+use Illuminate\Support\Facades\Cookie;
 use Illuminate\Support\Facades\Http;
 
 
@@ -44,7 +44,8 @@ class AppSessionController extends Controller
         if(!$response['success']){
             return back()->with("message", $response['message']);
         }
-        $cookie = cookie()->forget('sessionKey', '/');
+        Cookie::queue(Cookie::forget('sessionKey'));
+        //$cookie = cookie()->forget('sessionKey', '/');
         return redirect(route('pro-request-sms-login-token'))->withCookie($cookie);
     }
 

app/Http/Controllers/clients_SINGLE_Controller.php

@@ -98,6 +98,12 @@ class clients_SINGLE_Controller extends Controller
 		return response()->view('pro/clients_SINGLE/ACTION_editName', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
+	// GET /clients/view/{uid}/ACTION_editDob
+	public function ACTION_editDob(Request $request, $uid) {
+		$record = Client::where('uid', $uid)->first();
+		return response()->view('pro/clients_SINGLE/ACTION_editDob', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
 	// GET /clients/view/{uid}/ACTION_editDemographics
 	public function ACTION_editDemographics(Request $request, $uid) {
 		$record = Client::where('uid', $uid)->first();
@@ -176,10 +182,10 @@ class clients_SINGLE_Controller extends Controller
 		return response()->view('pro/clients_SINGLE/ACTION_editSsn', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /clients/view/{uid}/ACTION_putMcn
-	public function ACTION_putMcn(Request $request, $uid) {
+	// GET /clients/view/{uid}/ACTION_putMedicareInfo
+	public function ACTION_putMedicareInfo(Request $request, $uid) {
 		$record = Client::where('uid', $uid)->first();
-		return response()->view('pro/clients_SINGLE/ACTION_putMcn', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		return response()->view('pro/clients_SINGLE/ACTION_putMedicareInfo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_removeMcn

generatecv/tree.txt

@@ -77,9 +77,9 @@ PRO
                 nameNickname=name_nickname
                 nameMaiden=name_maiden
                 namePrevious=name_previous
-            editDemographics
+            editDob
                 dob:date=dob
-                ageInYears:number=age_in_years
+            editDemographics
                 sex:select:M,F=sex
                 genderIdentity=gender_identity
                 sexualOrientation=sexual_orientation
@@ -181,7 +181,10 @@ PRO
                 pharmacyFacilityUid:record:facility:uid,name
             editSsn
                 ssn=ssn
-            putMcn
+            putMedicareInfo
+                nameFirst*=name_first
+                nameLast*=name_last
+                dob*:date=dob
                 mcn*=mcn
             removeMcn
             updateWebcamInfo
@@ -278,7 +281,8 @@ PRO
                 !grp:Source:source,source_memo,source_at,source_detail,source_client_id,source_pro_id,source_facility_id:Update source:circle=>/clients/view/$uid/ACTION_editSource
                 !grp:Duplicate:is_duplicate,duplicate_of_client_id
                 !grp:Name:name_prefix,name_first,name_middle,name_last,name_suffix,name_credential,name_nickname,name_maiden,name_previous:Edit name:circle=>/clients/view/$uid/ACTION_editName
-                !grp:Demographics:dob,age_in_years,sex,gender_identity,sexual_orientation,is_sexually_active,sexually_active_memo,marital_status:Edit demographics:circle=>/clients/view/$uid/ACTION_editDemographics
+                !grp:Dob:dob:Edit DOB:circle=>/clients/view/$uid/ACTION_editDob
+                !grp:Demographics:sex,gender_identity,sexual_orientation,is_sexually_active,sexually_active_memo,marital_status:Edit demographics:circle=>/clients/view/$uid/ACTION_editDemographics
                 !grp:Spouse:spouse_relationship_id:Edit spouse:circle=>/clients/view/$uid/ACTION_editSpouse
                 !grp:Intake:intake_text,intake_detail:Edit intake details:circle=>/clients/view/$uid/ACTION_editIntakeDetails
                 !grp:Responsible party:is_responsible_party_someone_else,responsible_party_relationship_id:Edit responsible party:circle=>/clients/view/$uid/ACTION_editResponsibleParty
@@ -293,7 +297,7 @@ PRO
                 !grp:Deceased:is_deceased,date_and_time_of_death,cause_of_death
                 !grp:Pharmacy:pharmacy,pharmacy_facility_id:Edit pharmancy:circle=>/clients/view/$uid/ACTION_editPharmacy
                 !grp:SSN:ssn:Edit SSN:circle=>/clients/view/$uid/ACTION_editSsn
-                !grp:MCN:mcn,was_medicare_validation_successful,is_mcn_valid_number,mcn_address_street_line1,mcn_address_street_line2,mcn_address_city,mcn_address_state,mcn_address_zip,is_partbprimary,is_hospice,mcn_response_detail,billing_address,reason_not_partb,reason_not_partbmemo,is_medicare_advantage,medicare_advantage_plan,mcn_reject_reason_code,mcn_reject_reason_description,mcn_follow_up_action_code,mcn_follow_up_action_description,mcn_error_details:Put MSN:circle=>/clients/view/$uid/ACTION_putMcn
+                !grp:MCN:mcn,was_medicare_validation_successful,is_mcn_valid_number,mcn_address_street_line1,mcn_address_street_line2,mcn_address_city,mcn_address_state,mcn_address_zip,is_partbprimary,is_hospice,mcn_response_detail,billing_address,reason_not_partb,reason_not_partbmemo,is_medicare_advantage,medicare_advantage_plan,mcn_reject_reason_code,mcn_reject_reason_description,mcn_follow_up_action_code,mcn_follow_up_action_description,mcn_error_details:Put MSN:circle=>/clients/view/$uid/ACTION_putMedicareInfo
                 !grp:Webcam:has_webcam_device,webcam_device:Update webcam info:circle=>/clients/view/$uid/ACTION_updateWebcamInfo
                 !grp:MCP:mcp_pro_id:Put MCP:circle=>/clients/view/$uid/ACTION_putMcp
                 !grp:MCP Visit:has_mcp_done_onboarding_visit,mcp_onboarding_visit_date,mcp_onboarding_visit_note_id,reason_onboarding_visit_note_outside_system,is_mcp_onboarding_active,why_is_mcp_onboarding_not_active_category,why_is_mcp_onboarding_not_active_memo:Update source:circle=>/clients/view/$uid/ACTION_updateMcpOnboardingVisitInfo

resources/views/pro/bills/index.blade.php

@@ -36,6 +36,7 @@
 <th>Is Submitted</th>
 <th>Marked Cancelled At</th>
 <th>Marked Submitted At</th>
+<th>Memo</th>
 <th>Modifier</th>
 <th>Number Of Units</th>
 <th>Reason1</th>
@@ -70,6 +71,11 @@
 <th>Signed By Hcp Session Id</th>
 <th>Signed By Rme Session Id</th>
 <th>Signed By Rmm Session Id</th>
+<th>Na Payment Pro Transaction Id</th>
+<th>Has Na Been Paid</th>
+<th>Na Expected Payment Amount</th>
+<th>Na Payment Amount</th>
+<th>Na Pro Id</th>
             </tr>
             </thead>
             <tbody>
@@ -99,6 +105,7 @@
 <td><?= $record->is_submitted ?></td>
 <td><?= friendly_date_time($record->marked_cancelled_at) ?></td>
 <td><?= friendly_date_time($record->marked_submitted_at) ?></td>
+<td><?= $record->memo ?></td>
 <td><?= $record->modifier ?></td>
 <td><?= $record->number_of_units ?></td>
 <td><?= $record->reason1 ?></td>
@@ -133,6 +140,11 @@
 <td><?= $record->signed_by_hcp_session_id ?></td>
 <td><?= $record->signed_by_rme_session_id ?></td>
 <td><?= $record->signed_by_rmm_session_id ?></td>
+<td><?= $record->na_payment_pro_transaction_id ?></td>
+<td><?= $record->has_na_been_paid ?></td>
+<td><?= $record->na_expected_payment_amount ?></td>
+<td><?= $record->na_payment_amount ?></td>
+<td><?= $record->na_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

resources/views/pro/care_months_SINGLE/SUB_bills.blade.php

@@ -38,6 +38,7 @@
 <th>Is Submitted</th>
 <th>Marked Cancelled At</th>
 <th>Marked Submitted At</th>
+<th>Memo</th>
 <th>Modifier</th>
 <th>Number Of Units</th>
 <th>Reason1</th>
@@ -72,6 +73,11 @@
 <th>Signed By Hcp Session Id</th>
 <th>Signed By Rme Session Id</th>
 <th>Signed By Rmm Session Id</th>
+<th>Na Payment Pro Transaction Id</th>
+<th>Has Na Been Paid</th>
+<th>Na Expected Payment Amount</th>
+<th>Na Payment Amount</th>
+<th>Na Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -101,6 +107,7 @@
 <td><?= $subRecord->is_submitted ?></td>
 <td><?= friendly_date_time($subRecord->marked_cancelled_at) ?></td>
 <td><?= friendly_date_time($subRecord->marked_submitted_at) ?></td>
+<td><?= $subRecord->memo ?></td>
 <td><?= $subRecord->modifier ?></td>
 <td><?= $subRecord->number_of_units ?></td>
 <td><?= $subRecord->reason1 ?></td>
@@ -135,6 +142,11 @@
 <td><?= $subRecord->signed_by_hcp_session_id ?></td>
 <td><?= $subRecord->signed_by_rme_session_id ?></td>
 <td><?= $subRecord->signed_by_rmm_session_id ?></td>
+<td><?= $subRecord->na_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->has_na_been_paid ?></td>
+<td><?= $subRecord->na_expected_payment_amount ?></td>
+<td><?= $subRecord->na_payment_amount ?></td>
+<td><?= $subRecord->na_pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

resources/views/pro/clients/actions.blade.php

@@ -12,6 +12,7 @@
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_setIsDuplicateToTrue?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Set Is Duplicate To True</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_setIsDuplicateToFalse?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Set Is Duplicate To False</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_editName?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Edit Name</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_editDob?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Edit Dob</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_editDemographics?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Edit Demographics</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_editSpouse?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Edit Spouse</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_editIntakeDetails?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Edit Intake Details</a>
@@ -25,7 +26,7 @@
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_setIsDeceasedToFalse?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Set Is Deceased To False</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_editPharmacy?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Edit Pharmacy</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_editSsn?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Edit Ssn</a>
-<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putMcn?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Put Mcn</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putMedicareInfo?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Put Medicare Info</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeMcn?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Remove Mcn</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_updateWebcamInfo?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Webcam Info</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putMcp?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Put Mcp</a>

resources/views/pro/clients/info.blade.php

@@ -1,91 +1,3 @@
-<?php /*
-
-<?
-    $client = $record;
-    $thumbnail = $client->profile_picture_base64;
-    $initials = !$thumbnail ? substr($client->name_first, 0, 1).substr($client->name_last, 0, 1) : '';
-    $fullName = zImplode(', ', [
-        zImplode(' ', [$client->name_prefix, $client->name_first, $client->name_middle, $client->name_last, $client->name_suffix]),
-        $client->name_credential
-    ]);
-
-    $sex = str_replace(['F', 'M'], ['Female', 'Male'], $client->sex);
-    $gender = $sex
-            ? $sex.($client->gender_identity ? " ($client->gender_identity)" : '')
-            : $client->gender_identity;
-    $age = date_diff(date_create($client->dob), date_create('today'))->y ?: $client->age_in_years;
-    $birthplace = zImplode(', ', [$client->birth_city, $client->birth_state, $client->birth_country]);
-
-    $confirmedCell = $client->is_cell_number_confirmed ? $client->cell_number : null;
-    $confirmedEmail = $client->is_email_address_confirmed ? $client->email_address : null;
-    $location = zImplode(', ', [$client->home_address_city, $client->home_address_state])
-        ?: zImplode(', ', [$client->mailing_address_city, $client->mailing_address_state])
-        ?: zImplode(', ', [$client->secondary_home_address_city, $client->secondary_home_address_state])
-        ?: zImplode(', ', [$client->secondary_mailing_address_city, $client->secondary_mailing_address_state])
-        ?: $birthplace
-        ?: null;
-
-    $memberSince = date_diff(date_create($client->created_at), date_create('now'))->days;
-    if ($memberSince > 30) $memberSince = date('F, Y', strtotime($client->created_at));
-    else if ($memberSince > 1) $memberSince .= ' days ago';
-    else if ($memberSince === 1) $memberSince = 'yesterday';
-    else if ($memberSince === 0) $memberSince = 'today';
-
-    $medicareStatus = [
-        'true' => 'medicare-valid',
-        'false' => 'medicare-invalid',
-        'NULL' => null
-    ][var_export($client->medicareStatus(), true)];
-
-    // print_r($client); exit;
-?>
-
-<section class=z><a href=SUB_detail>
-<header class=hbox>
-    <div class="dp <?=$medicareStatus?>" style="background-image:<?=$thumbnail?>"><?=$initials?></div>
-    <div>
-        <div class=name title="<?=$fullName?>"><?=zFormalName($client)?></div>
-        <div class=separators title="<?=date('jS F Y', strtotime($client->dob))?>">
-            <span><?=$gender?></span>
-            <span><?=$age ? ($gender ? $age : "$age years old") : null?></span>
-            <span><?=$birthplace ? "Hails from $birthplace" : null?></span>
-        </div>
-        <ul class=hbox>
-            <li>
-                <i class="fa fa-phone-alt" aria-hidden="true"></i>
-                <span class=contact><?=$confirmedCell ?? 'Edit'?></span>
-            </li>
-            <li>
-                <i class="fa fa-envelope" aria-hidden="true"></i>
-                <span class=contact><?=$confirmedEmail ?? 'Edit'?></span>
-            </li>
-            <li>
-                <i class="fa fa-map-marker-alt" aria-hidden="true"></i>
-                <?=$location ?? 'Add location'?>
-            </li>
-        </ul>
-        <div class=separators>
-            <span>
-                <span>Joined <?=$memberSince?></span>
-                <span title="<?=$client->source_memo?>"><?=$client->source ? " via $client->source" : null?></span>
-            </span>
-            <span><?=$client->mcp_pro_id ? 'Currently under c/o '.zFormalName($client->mcpPro) : null?></span>
-        </div>
-    </div>
-</header>
-</a></section>
-
 <h4 class="d-flex my-3 px-3 stag-heading stag-heading-info">
-    <div>
-        Clients: [<?= $client->name_display() ?>]
-        @if($client->is_duplicate)
-            <div>
-                <p> This client is a duplicate of
-                <a href="{{route('clients_SINGLE-SUB_dashboard', $client->duplicateOfClient->uid)}}">{{$client->duplicateOfClient->name_display()}}</a>.
-                <a up-modal=".form-contents" up-width="800" up-history="false" href="{{route('clients_SINGLE-ACTION_setIsDuplicateToFalse', $client->uid)}}" title="Set as not duplicate">✏️ </a></p>
-            </div>
-        @endif
-    </div>
+    <div>Clients: Single [<?= $record->uid ?>]</div>
 </h4>
-
- */ ?>

resources/views/pro/clients_SINGLE/ACTION_editDemographics.blade.php

@@ -27,14 +27,6 @@
         <input type="hidden" name="_success" value="{{route('clients-view', ['uid' => $record->uid])}}">
         <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_editDemographics', ['uid' => $record->uid])}}">
         <div class='form-group mb-3'>
-<label class='control-label'>Dob </label>
-<input class='form-control' type='date' name='dob' value='{{ old('dob') ? old('dob') : $record->dob }}' >
-</div>
-<div class='form-group mb-3'>
-<label class='control-label'>Age In Years </label>
-<input class='form-control' type='number' name='ageInYears' value='{{ old('ageInYears') ? old('ageInYears') : $record->age_in_years }}' >
-</div>
-<div class='form-group mb-3'>
 <label class='control-label'>Sex </label>
 <select class='form-control' name='sex' value='{{ old('sex') ? old('sex') : $record->sex }}' >
 <option value=''>-- Select --</option>

resources/views/pro/clients_SINGLE/ACTION_editDob.blade.php

@@ -0,0 +1,41 @@
+@extends('pro.clients.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Edit Dob</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="false"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/client/editDob">
+        <input type="hidden" name="_success" value="{{route('clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_editDob', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Dob </label>
+<input class='form-control' type='date' name='dob' value='{{ old('dob') ? old('dob') : $record->dob }}' >
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('clients-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

resources/views/pro/clients_SINGLE/ACTION_putMedicareInfo.blade.php

@@ -0,0 +1,53 @@
+@extends('pro.clients.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Put Medicare Info</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="false"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/client/putMedicareInfo">
+        <input type="hidden" name="_success" value="{{route('clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_putMedicareInfo', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Name First *</label>
+<input class='form-control' type='text' name='nameFirst' value='{{ old('nameFirst') ? old('nameFirst') : $record->name_first }}' required>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Name Last *</label>
+<input class='form-control' type='text' name='nameLast' value='{{ old('nameLast') ? old('nameLast') : $record->name_last }}' required>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Dob *</label>
+<input class='form-control' type='date' name='dob' value='{{ old('dob') ? old('dob') : $record->dob }}' required>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Mcn *</label>
+<input class='form-control' type='text' name='mcn' value='{{ old('mcn') ? old('mcn') : $record->mcn }}' required>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('clients-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

resources/views/pro/clients_SINGLE/SUB_bills.blade.php

@@ -38,6 +38,7 @@
 <th>Is Submitted</th>
 <th>Marked Cancelled At</th>
 <th>Marked Submitted At</th>
+<th>Memo</th>
 <th>Modifier</th>
 <th>Number Of Units</th>
 <th>Reason1</th>
@@ -72,6 +73,11 @@
 <th>Signed By Hcp Session Id</th>
 <th>Signed By Rme Session Id</th>
 <th>Signed By Rmm Session Id</th>
+<th>Na Payment Pro Transaction Id</th>
+<th>Has Na Been Paid</th>
+<th>Na Expected Payment Amount</th>
+<th>Na Payment Amount</th>
+<th>Na Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -101,6 +107,7 @@
 <td><?= $subRecord->is_submitted ?></td>
 <td><?= friendly_date_time($subRecord->marked_cancelled_at) ?></td>
 <td><?= friendly_date_time($subRecord->marked_submitted_at) ?></td>
+<td><?= $subRecord->memo ?></td>
 <td><?= $subRecord->modifier ?></td>
 <td><?= $subRecord->number_of_units ?></td>
 <td><?= $subRecord->reason1 ?></td>
@@ -135,6 +142,11 @@
 <td><?= $subRecord->signed_by_hcp_session_id ?></td>
 <td><?= $subRecord->signed_by_rme_session_id ?></td>
 <td><?= $subRecord->signed_by_rmm_session_id ?></td>
+<td><?= $subRecord->na_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->has_na_been_paid ?></td>
+<td><?= $subRecord->na_expected_payment_amount ?></td>
+<td><?= $subRecord->na_payment_amount ?></td>
+<td><?= $subRecord->na_pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

resources/views/pro/clients_SINGLE/SUB_detail.blade.php

@@ -65,6 +65,21 @@
     </table>
 </div>
 
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Dob
+                <span class="ml-auto"><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_editDob' title='Edit DOB?optimised=1'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Edit DOB</span></a></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Date of Birth</td><td class="w-75 px-2 font-weight-bold"><?= $record->dob ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
 <div class="table-responsive p-0 bg-white table-sm mb-3">
     <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
         <thead>
@@ -75,9 +90,7 @@
         </tr>
         </thead>
         <tbody>
-            <tr><td class="w-25 px-2 text-secondary border-right">Date of Birth</td><td class="w-75 px-2 font-weight-bold"><?= $record->dob ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Age In Years</td><td class="w-75 px-2 font-weight-bold"><?= $record->age_in_years ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Sex</td><td class="w-75 px-2 font-weight-bold"><?= $record->sex ?></td></tr>
+            <tr><td class="w-25 px-2 text-secondary border-right">Sex</td><td class="w-75 px-2 font-weight-bold"><?= $record->sex ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Gender Identity</td><td class="w-75 px-2 font-weight-bold"><?= $record->gender_identity ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Sexual Orientation</td><td class="w-75 px-2 font-weight-bold"><?= $record->sexual_orientation ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Is Sexually Active</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_sexually_active ?></td></tr>
@@ -384,7 +397,7 @@
         <thead>
         <tr>
             <th colspan="2" class="px-2">MCN
-                <span class="ml-auto"><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putMcn' title='Put MSN?optimised=1'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Put MSN</span></a></span>
+                <span class="ml-auto"><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putMedicareInfo' title='Put MSN?optimised=1'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Put MSN</span></a></span>
             </th>
         </tr>
         </thead>

resources/views/pro/notes_SINGLE/SUB_bills.blade.php

@@ -38,6 +38,7 @@
 <th>Is Submitted</th>
 <th>Marked Cancelled At</th>
 <th>Marked Submitted At</th>
+<th>Memo</th>
 <th>Modifier</th>
 <th>Number Of Units</th>
 <th>Reason1</th>
@@ -72,6 +73,11 @@
 <th>Signed By Hcp Session Id</th>
 <th>Signed By Rme Session Id</th>
 <th>Signed By Rmm Session Id</th>
+<th>Na Payment Pro Transaction Id</th>
+<th>Has Na Been Paid</th>
+<th>Na Expected Payment Amount</th>
+<th>Na Payment Amount</th>
+<th>Na Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -101,6 +107,7 @@
 <td><?= $subRecord->is_submitted ?></td>
 <td><?= friendly_date_time($subRecord->marked_cancelled_at) ?></td>
 <td><?= friendly_date_time($subRecord->marked_submitted_at) ?></td>
+<td><?= $subRecord->memo ?></td>
 <td><?= $subRecord->modifier ?></td>
 <td><?= $subRecord->number_of_units ?></td>
 <td><?= $subRecord->reason1 ?></td>
@@ -135,6 +142,11 @@
 <td><?= $subRecord->signed_by_hcp_session_id ?></td>
 <td><?= $subRecord->signed_by_rme_session_id ?></td>
 <td><?= $subRecord->signed_by_rmm_session_id ?></td>
+<td><?= $subRecord->na_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->has_na_been_paid ?></td>
+<td><?= $subRecord->na_expected_payment_amount ?></td>
+<td><?= $subRecord->na_payment_amount ?></td>
+<td><?= $subRecord->na_pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

routes/generated.php

@@ -30,6 +30,7 @@ Route::prefix('/clients/view/{uid}')->group(function () {
 	Route::get('ACTION_setIsDuplicateToTrue', 'clients_SINGLE_Controller@ACTION_setIsDuplicateToTrue')->name('clients_SINGLE-ACTION_setIsDuplicateToTrue');
 	Route::get('ACTION_setIsDuplicateToFalse', 'clients_SINGLE_Controller@ACTION_setIsDuplicateToFalse')->name('clients_SINGLE-ACTION_setIsDuplicateToFalse');
 	Route::get('ACTION_editName', 'clients_SINGLE_Controller@ACTION_editName')->name('clients_SINGLE-ACTION_editName');
+	Route::get('ACTION_editDob', 'clients_SINGLE_Controller@ACTION_editDob')->name('clients_SINGLE-ACTION_editDob');
 	Route::get('ACTION_editDemographics', 'clients_SINGLE_Controller@ACTION_editDemographics')->name('clients_SINGLE-ACTION_editDemographics');
 	Route::get('ACTION_editSpouse', 'clients_SINGLE_Controller@ACTION_editSpouse')->name('clients_SINGLE-ACTION_editSpouse');
 	Route::get('ACTION_editIntakeDetails', 'clients_SINGLE_Controller@ACTION_editIntakeDetails')->name('clients_SINGLE-ACTION_editIntakeDetails');
@@ -43,7 +44,7 @@ Route::prefix('/clients/view/{uid}')->group(function () {
 	Route::get('ACTION_setIsDeceasedToFalse', 'clients_SINGLE_Controller@ACTION_setIsDeceasedToFalse')->name('clients_SINGLE-ACTION_setIsDeceasedToFalse');
 	Route::get('ACTION_editPharmacy', 'clients_SINGLE_Controller@ACTION_editPharmacy')->name('clients_SINGLE-ACTION_editPharmacy');
 	Route::get('ACTION_editSsn', 'clients_SINGLE_Controller@ACTION_editSsn')->name('clients_SINGLE-ACTION_editSsn');
-	Route::get('ACTION_putMcn', 'clients_SINGLE_Controller@ACTION_putMcn')->name('clients_SINGLE-ACTION_putMcn');
+	Route::get('ACTION_putMedicareInfo', 'clients_SINGLE_Controller@ACTION_putMedicareInfo')->name('clients_SINGLE-ACTION_putMedicareInfo');
 	Route::get('ACTION_removeMcn', 'clients_SINGLE_Controller@ACTION_removeMcn')->name('clients_SINGLE-ACTION_removeMcn');
 	Route::get('ACTION_updateWebcamInfo', 'clients_SINGLE_Controller@ACTION_updateWebcamInfo')->name('clients_SINGLE-ACTION_updateWebcamInfo');
 	Route::get('ACTION_putMcp', 'clients_SINGLE_Controller@ACTION_putMcp')->name('clients_SINGLE-ACTION_putMcp');