fixed care month entries

app/Http/Controllers/care_months_SINGLE_Controller.php

@@ -212,6 +212,13 @@ class care_months_SINGLE_Controller extends Controller
 		return response()->view('pro/care_months_SINGLE/SUB_rm_time_entries', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
+	// GET /care_months/view/{uid}/SUB_bills
+	public function SUB_bills(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		$subRecords = DB::table('bill')->where('care_month_id', $record->id)->get();
+		return response()->view('pro/care_months_SINGLE/SUB_bills', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
 	// GET /care_months/view/{uid}/SUB_audit_log
 	public function SUB_audit_log(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();

generatecv/tree.txt

@@ -678,7 +678,7 @@ PRO
                 !nal:
 # :: need remove
             cm_time_entries
-                id=care_month_entry.care_month_id,cm_or_rm='CM'
+                id=care_month_entry.care_month_id,cm_or_rm='CM'=>/care_month_entries/view/UID
                 !inc:content_text,content_detail,time_in_seconds
                 add_new:care_month_entry:createForCm
                     careMonthUid:hidden=uid
@@ -692,7 +692,7 @@ PRO
                     contentDetail
 # :: need remove
             rm_time_entries
-                id=care_month_entry.care_month_id,cm_or_rm='RM'
+                id=care_month_entry.care_month_id,cm_or_rm='RM'=>/care_month_entries/view/UID
                 add_new:care_month_entry:createForRm
                     careMonthUid:hidden=uid
                     proUid:record:pro:uid,name_display
@@ -703,6 +703,8 @@ PRO
                     endingTime:time
                     contentText
                     contentDetail
+            bills
+                id=bill.care_month_id=>/bills/view/UID
             audit_log
     care_month_entries|care_month_entry|view|icon:calendar-alt
         !qry:pros:SELECT id, name_display FROM pro
@@ -713,11 +715,11 @@ PRO
                 contentText
                 contentDetail
             updateTiming
-                effectiveDate
-                timeInSeconds
+                effectiveDate:date
+                timeInSeconds:number
                 isTimeSpecific:bool
-                startingTime
-                endingTime
+                startingTime:time
+                endingTime:time
         SUB
             dashboard
     bills|bill|view|icon:file-invoice-dollar

resources/views/pro/care_month_entries_SINGLE/ACTION_updateTiming.blade.php

@@ -28,11 +28,11 @@
         <input type="hidden" name="_return" value="{{route('care_month_entries_SINGLE-ACTION_updateTiming', ['uid' => $record->uid])}}">
         <div class='form-group mb-3'>
 <label class='control-label'>Effective Date </label>
-<input class='form-control' type='text' name='effectiveDate' value='{{ old('effectiveDate') ? old('effectiveDate') : '' }}' >
+<input class='form-control' type='date' name='effectiveDate' value='{{ old('effectiveDate') ? old('effectiveDate') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Time In Seconds </label>
-<input class='form-control' type='text' name='timeInSeconds' value='{{ old('timeInSeconds') ? old('timeInSeconds') : '' }}' >
+<input class='form-control' type='number' name='timeInSeconds' value='{{ old('timeInSeconds') ? old('timeInSeconds') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Is Time Specific 
@@ -41,11 +41,11 @@
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Starting Time </label>
-<input class='form-control' type='text' name='startingTime' value='{{ old('startingTime') ? old('startingTime') : '' }}' >
+<input class='form-control' type='time' name='startingTime' value='{{ old('startingTime') ? old('startingTime') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Ending Time </label>
-<input class='form-control' type='text' name='endingTime' value='{{ old('endingTime') ? old('endingTime') : '' }}' >
+<input class='form-control' type='time' name='endingTime' value='{{ old('endingTime') ? old('endingTime') : '' }}' >
 </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>

resources/views/pro/care_months/subs.blade.php

@@ -1,4 +1,5 @@
 <a href='/care_months/view/<?= $record->uid ?>/SUB_dashboard' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_dashboard' ? 'bg-secondary text-white font-weight-bold' : '' }}{{ strpos(request()->route()->getActionMethod(), 'ACTION_') === 0 ? 'bg-secondary text-white font-weight-bold' : '' }}'>Dashboard</a>
 <a href='/care_months/view/<?= $record->uid ?>/SUB_cm_time_entries' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_cm_time_entries' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Cm Time Entries</a>
 <a href='/care_months/view/<?= $record->uid ?>/SUB_rm_time_entries' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_rm_time_entries' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Rm Time Entries</a>
+<a href='/care_months/view/<?= $record->uid ?>/SUB_bills' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_bills' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Bills</a>
 <a href='/care_months/view/<?= $record->uid ?>/SUB_audit_log' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_audit_log' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Audit Log</a>

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

@@ -0,0 +1,146 @@
+@extends('pro.care_months.view')
+@section('content-inner')
+
+    <div class="pb-3">
+
+        <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
+            <div>Bills</div>
+            <div class="ml-auto">
+                <!-- _ADD_NEW_LINK_ -->
+            </div>
+        </h5>
+
+        <div class="table-responsive p-0 bg-white border stag-table stag-table-sub">
+            <table class="table table-hover text-nowrap">
+                <thead>
+                <tr>
+                    <th>&nbsp;</th>
+<th>Created At</th>
+<th>Type</th>
+<th>Bill Service Type</th>
+<th>Cm Expected Payment Amount</th>
+<th>Cm Or Rm</th>
+<th>Cm Payment Amount</th>
+<th>Code</th>
+<th>Collected Amount</th>
+<th>Effective Date</th>
+<th>Has Cm Been Paid</th>
+<th>Has Hcp Been Paid</th>
+<th>Has Rme Been Paid</th>
+<th>Has Rmm Been Paid</th>
+<th>Hcp Expected Payment Amount</th>
+<th>Hcp Payment Amount</th>
+<th>Is Cancelled</th>
+<th>Is Signed By Cm</th>
+<th>Is Signed By Hcp</th>
+<th>Is Signed By Rme</th>
+<th>Is Signed By Rmm</th>
+<th>Is Submitted</th>
+<th>Marked Cancelled At</th>
+<th>Marked Submitted At</th>
+<th>Modifier</th>
+<th>Number Of Units</th>
+<th>Reason1</th>
+<th>Reason2</th>
+<th>Reason3</th>
+<th>Reason3plus</th>
+<th>Rme Expected Payment Amount</th>
+<th>Rme Payment Amount</th>
+<th>Rmm Expected Payment Amount</th>
+<th>Rmm Payment Amount</th>
+<th>Service Location</th>
+<th>Signed By Cm At</th>
+<th>Signed By Hcp At</th>
+<th>Signed By Rme At</th>
+<th>Signed By Rmm At</th>
+<th>Created By Session Id</th>
+<th>Care Month Id</th>
+<th>Client Id</th>
+<th>Cm Payment Pro Transaction Id</th>
+<th>Cm Pro Id</th>
+<th>Hcp Payment Pro Transaction Id</th>
+<th>Hcp Pro Id</th>
+<th>Marked Cancelled By Session Id</th>
+<th>Marked Submitted By Session Id</th>
+<th>Note Id</th>
+<th>Note Ally Id</th>
+<th>Rme Payment Pro Transaction Id</th>
+<th>Rme Pro Id</th>
+<th>Rmm Payment Pro Transaction Id</th>
+<th>Rmm Pro Id</th>
+<th>Signed By Cm Session Id</th>
+<th>Signed By Hcp Session Id</th>
+<th>Signed By Rme Session Id</th>
+<th>Signed By Rmm Session Id</th>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach($subRecords as $subRecord)
+                    <tr>
+                        <td><a href="/bills/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
+<td><?= friendly_date_time($subRecord->created_at) ?></td>
+<td><?= $subRecord->type ?></td>
+<td><?= $subRecord->bill_service_type ?></td>
+<td><?= $subRecord->cm_expected_payment_amount ?></td>
+<td><?= $subRecord->cm_or_rm ?></td>
+<td><?= $subRecord->cm_payment_amount ?></td>
+<td><?= $subRecord->code ?></td>
+<td><?= $subRecord->collected_amount ?></td>
+<td><?= $subRecord->effective_date ?></td>
+<td><?= $subRecord->has_cm_been_paid ?></td>
+<td><?= $subRecord->has_hcp_been_paid ?></td>
+<td><?= $subRecord->has_rme_been_paid ?></td>
+<td><?= $subRecord->has_rmm_been_paid ?></td>
+<td><?= $subRecord->hcp_expected_payment_amount ?></td>
+<td><?= $subRecord->hcp_payment_amount ?></td>
+<td><?= $subRecord->is_cancelled ?></td>
+<td><?= $subRecord->is_signed_by_cm ?></td>
+<td><?= $subRecord->is_signed_by_hcp ?></td>
+<td><?= $subRecord->is_signed_by_rme ?></td>
+<td><?= $subRecord->is_signed_by_rmm ?></td>
+<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->modifier ?></td>
+<td><?= $subRecord->number_of_units ?></td>
+<td><?= $subRecord->reason1 ?></td>
+<td><?= $subRecord->reason2 ?></td>
+<td><?= $subRecord->reason3 ?></td>
+<td><?= $subRecord->reason3plus ?></td>
+<td><?= $subRecord->rme_expected_payment_amount ?></td>
+<td><?= $subRecord->rme_payment_amount ?></td>
+<td><?= $subRecord->rmm_expected_payment_amount ?></td>
+<td><?= $subRecord->rmm_payment_amount ?></td>
+<td><?= $subRecord->service_location ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_cm_at) ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_hcp_at) ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_rme_at) ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_rmm_at) ?></td>
+<td><?= $subRecord->created_by_session_id ?></td>
+<td><?= $subRecord->care_month_id ?></td>
+<td><?= $subRecord->client_id ?></td>
+<td><?= $subRecord->cm_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->cm_pro_id ?></td>
+<td><?= $subRecord->hcp_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->hcp_pro_id ?></td>
+<td><?= $subRecord->marked_cancelled_by_session_id ?></td>
+<td><?= $subRecord->marked_submitted_by_session_id ?></td>
+<td><?= $subRecord->note_id ?></td>
+<td><?= $subRecord->note_ally_id ?></td>
+<td><?= $subRecord->rme_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->rme_pro_id ?></td>
+<td><?= $subRecord->rmm_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->rmm_pro_id ?></td>
+<td><?= $subRecord->signed_by_cm_session_id ?></td>
+<td><?= $subRecord->signed_by_hcp_session_id ?></td>
+<td><?= $subRecord->signed_by_rme_session_id ?></td>
+<td><?= $subRecord->signed_by_rmm_session_id ?></td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+
+@endsection

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

@@ -23,7 +23,7 @@
                 <tbody>
                 @foreach($subRecords as $subRecord)
                     <tr>
-                        <td><a href=""><i class="fas fa-share-square"></i></a></td>
+                        <td><a href="/care_month_entries/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
 <td><?= $subRecord->content_text ?></td>
 <td><?= $subRecord->content_detail ?></td>
 <td><?= $subRecord->time_in_seconds ?></td>

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

@@ -43,7 +43,7 @@
                 <tbody>
                 @foreach($subRecords as $subRecord)
                     <tr>
-                        <td><a href=""><i class="fas fa-share-square"></i></a></td>
+                        <td><a href="/care_month_entries/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
 <td><?= friendly_date_time($subRecord->created_at) ?></td>
 <td><?= $subRecord->type ?></td>
 <td><?= $subRecord->is_removed ?></td>

routes/generated.php

@@ -205,6 +205,7 @@ Route::prefix('/care_months/view/{uid}')->group(function () {
 	Route::get('SUB_dashboard', 'care_months_SINGLE_Controller@SUB_dashboard')->name('care_months_SINGLE-SUB_dashboard');
 	Route::get('SUB_cm_time_entries', 'care_months_SINGLE_Controller@SUB_cm_time_entries')->name('care_months_SINGLE-SUB_cm_time_entries');
 	Route::get('SUB_rm_time_entries', 'care_months_SINGLE_Controller@SUB_rm_time_entries')->name('care_months_SINGLE-SUB_rm_time_entries');
+	Route::get('SUB_bills', 'care_months_SINGLE_Controller@SUB_bills')->name('care_months_SINGLE-SUB_bills');
 	Route::get('SUB_audit_log', 'care_months_SINGLE_Controller@SUB_audit_log')->name('care_months_SINGLE-SUB_audit_log');
 	Route::get('ACTION_cm_time_entriesAddNew', 'care_months_SINGLE_Controller@ACTION_cm_time_entriesAddNew')->name('care_months_SINGLE-ACTION_cm_time_entriesAddNew');
 	Route::get('ACTION_rm_time_entriesAddNew', 'care_months_SINGLE_Controller@ACTION_rm_time_entriesAddNew')->name('care_months_SINGLE-ACTION_rm_time_entriesAddNew');