Merge branch 'master' into dev-vj

app/Http/Controllers/PracticeManagementController.php

@@ -417,6 +417,42 @@ class PracticeManagementController extends Controller
             'view_treatment_service_utilization_by_patient'));
     }
 
+    public function processingBillMatrix(Request $request, $proUid = null)
+    {
+        $proUid = $proUid ? $proUid : $request->get('pro-uid');
+        $performerPro = $this->performer->pro;
+        $targetPro = null;
+        $allPros = [];
+        if ($performerPro->pro_type == 'ADMIN') {
+            $allPros = Pro::all();
+            $targetPro = Pro::where('uid', $proUid)->first();
+        } else {
+            $targetPro = $performerPro;
+        }
+        $bills = [];
+        if ($targetPro) {
+            $bills = Bill::where('hcp_pro_id', $targetPro->id)->
+            where('has_hcp_been_paid', false)->
+            where('is_cancelled', false)->
+            where('is_signed_by_hcp', true)->
+            orderBy('effective_date', 'desc')->paginate();
+        } else {
+            $bills = Bill::where('has_hcp_been_paid', false)->
+            where('is_cancelled', false)->
+            where('is_signed_by_hcp', true)->
+            orderBy('effective_date', 'desc')->
+            paginate();
+        }
+        $viewData = [
+            'bills' => $bills,
+            'allPros' => $allPros,
+            'targetPro' => $targetPro,
+            'performerPro' => $performerPro,
+            'proUid' => $proUid
+        ];
+        return view('app.practice-management.processing-bill-matrix', $viewData);
+    }
+
     public function hcpBillMatrix(Request $request, $proUid = null)
     {
         $proUid = $proUid ? $proUid : $request->get('pro-uid');

app/Models/Pro.php

@@ -334,7 +334,7 @@ class Pro extends Model
             $measurementsQuery
                 ->whereNotNull('client_bdt_measurement_id')
                 ->whereNotNull('ts')
-                ->where('is_cellular_zero', '!=', true)
+                ->where('is_cellular_zero', false)
                 ->where(function ($q) {
                     $q->whereNull('status')
                         ->orWhere(function ($q2) {

resources/views/app/patient/note/dashboard.blade.php

@@ -356,7 +356,7 @@
                                     </td>
                                     <td class="pl-2">
                                         @if($bill->has_hcp_been_paid)
-                                            <span class="text-dark">Received:</span><span class="font-weight-bold text-success ml-2">${{ $bill->hcp_payment_amount }}</span>
+                                            <span class="text-dark">Processed:</span><span class="font-weight-bold text-success ml-2">${{ $bill->hcp_payment_amount }}</span>
                                         @else
                                             <span class="text-dark">Expected:</span><span class="font-weight-bold text-dark ml-2">{{ $bill->hcp_expected_payment_amount ? '$' . $bill->hcp_expected_payment_amount : '-' }}</span>
                                         @endif
@@ -385,6 +385,21 @@
                                                     </span>
                                                 @endif
                                             @endif
+                                                @if(!$bill->has_hcp_been_paid && $pro->pro_type === 'ADMIN')
+                                                    <span class="mx-2 text-secondary">|</span>
+                                                    <span class="d-block" moe>
+                                                    <a class="text-danger" href="" show start>Submit Payment</a>
+                                                    <form url="/api/bill/payHcpAmount">
+                                                        <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                        <p>Submit payment:</p>
+                                                        <div class="mb-0">
+                                                            <input type="text" class="text form-control form-control-sm" name="hcpPaymentAmount" value="{{$bill->hcp_expected_payment_amount}}" placeholder="amount"><br>
+                                                            <button class="btn btn-success btn-sm" submit>Submit</button>
+                                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </span>
+                                                @endif
                                             @if($bill->is_cancelled)
                                                 <span class="mx-2 text-secondary">|</span>
                                                 <span class="d-block text-secondary">

resources/views/app/practice-management/financial-transactions.blade.php

@@ -26,9 +26,7 @@
                             <th class="px-3 border-0">Date</th>
                             <th class="border-0">Type</th>
                             <th class="border-0">Client</th>
-                            <th class="border-0">Note</th>
-                            {{--<th class="border-0">Reason</th>--}}
-                            <th class="border-0">Memo</th>
+                            <th class="border-0">Context</th>
                             <th class="border-0">Amount</th>
                             <th class="border-0">Balance</th>
                         </tr>
@@ -53,10 +51,14 @@
                                 </td>
                                 <td>
                                     @if($transaction->bill && $transaction->bill->note)
+                                        <a href="{{route('patients.view.notes.view.dashboard', ['patient'=>$transaction->client, 'note'=>$transaction->bill->note])}}">
+                                            ({{$transaction->bill->note->effective_dateest}})
                                         @if($transaction->bill->note->noteTemplate)
                                             {{ $transaction->bill->note->noteTemplate->title }}
                                         @endif
-                                        <a href="{{route('patients.view.notes.view.dashboard', ['patient'=>$transaction->client, 'note'=>$transaction->bill->note])}}">Go to note</a>
+                                        </a>
+                                    @else
+                                        {{ $transaction->custom_memo ? $transaction->custom_memo : '-' }}
                                     @endif
                                 </td>
                                 {{--<td>
@@ -90,8 +92,15 @@
                                         -
                                     @endif
                                 </td>--}}
-                                <td>{{ $transaction->custom_memo ? $transaction->custom_memo : '-' }}</td>
-                                <td>${{ $transaction->amount }}</td>
+                                <td>
+                                    @if($transaction->amount > 0)
+                                        ${{ $transaction->amount }}
+                                    @else
+                                        <span class="text-success font-weight-bold">
+                                            ${{ $transaction->amount }}
+                                        </span>
+                                    @endif
+                                </td>
                                 <td>${{ $transaction->resulting_balance }}</td>
                             </tr>
                         @endforeach

resources/views/app/practice-management/processing-bill-matrix.blade.php

@@ -0,0 +1,70 @@
+@extends ('layouts/template')
+
+@section('content')
+
+    <div class="p-3 mcp-theme-1">
+
+        <div class="card">
+
+            <div class="card-header px-3 py-2 d-flex align-items-center">
+                <strong class="mr-4">
+                    <i class="fas fa-user-injured"></i>
+                    Processing Bills
+                </strong>
+                <select class="ml-auto max-width-300px form-control form-control-sm"
+                        onchange="fastLoad('/practice-management/processing-bill-matrix/' + this.value, true, false, false)">
+                    <option value="" {{ $proUid === '' ? 'selected' : '' }}>All Pros</option>
+                    @foreach($allPros as $_pro)
+                        <option value="{{$_pro->uid}}" {{ $proUid === $_pro->uid ? 'selected' : '' }}>{{$_pro->displayName()}}</option>
+                    @endforeach
+                </select>
+            </div>
+            <div class="card-body p-0">
+                <table class="table table-sm table-condensed p-0 m-0">
+                    <thead class="bg-light">
+                    <tr>
+                        <th>Note Link</th>
+                        <td>Effective Date</td>
+                        <td>Pro</td>
+                        <td>Client</td>
+                        <td>Code</td>
+                        <td>Units</td>
+                        <td>HCP Expected Amount</td>
+                        <td>HCP Signed?</td>
+{{--                        <td>HCP Signed At</td>--}}
+                    </tr>
+                    </thead>
+                    <tbody>
+                    @foreach ($bills as $row)
+                        <tr class="">
+                            <td>
+                                @if($row->note)
+                                <a href="/patients/view/{{ $row->client->uid }}/notes/view/{{ $row->note->uid }}">
+                                    Note Link
+                                </a>
+                                @else
+                                    <a href="/patients/view/{{ $row->client->uid }}">
+                                        Chart
+                                    </a>
+                                @endif
+                            </td>
+                            <td>{{$row->effective_date}}</td>
+                            <td>{{$row->hcp->name_last}}, {{$row->hcp->name_first}}</td>
+                            <td>{{$row->client->name_last}}, {{$row->client->name_first}}</td>
+                            <td>{{$row->code}}</td>
+                            <td>{{$row->number_of_units}}</td>
+                            <td>{{$row->hcp_expected_payment_amount}}</td>
+                            <td>{{$row->is_signed_by_hcp}}</td>
+{{--                            <td>{{$row->signed_by_hcp_at}}</td>--}}
+                        </tr>
+                    @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </div>
+        <div>
+            {{$bills->links()}}
+        </div>
+    </div>
+
+@endsection

resources/views/app/practice-management/treatment-services-util.blade.php

@@ -19,6 +19,8 @@
                     <tr>
                         <th>Date</th>
                         <th>Total hrs.</th>
+                        <th>Total Bills</th>
+                        <th>Total Pros</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -32,6 +34,8 @@
                                 {{ $dowMap[date('w', strtotime($x->effective_date))] }}
                             </td>
                             <td>{{$x->total_hrs}}</td>
+                            <td>{{$x->total_bills}}</td>
+                            <td>{{$x->total_pros}}</td>
                         </tr>
                     @endforeach
                     </tbody>

resources/views/layouts/template.blade.php

@@ -116,6 +116,7 @@
                         <a class="dropdown-item" href="{{ route('practice-management.billingManager') }}">Billing Manager</a>
 
                         @if($pro && $pro->pro_type == 'ADMIN')
+                            <a class="dropdown-item" href="{{ route('practice-management.processingBillMatrix') }}">Processing Bills</a>
                             <a class="dropdown-item" href="{{ route('practice-management.cellularMeasurements') }}">Cellular Measurements</a>
                             <a class="dropdown-item" href="{{ route('practice-management.cellularDeviceManager') }}">Cellular Device Manager</a>
                             <a class="dropdown-item" href="{{ route('practice-management.claims') }}">Claims</a>

routes/web.php

@@ -96,6 +96,8 @@ Route::middleware('pro.auth')->group(function () {
 
             Route::get('cellular-measurements', 'PracticeManagementController@cellularMeasurements')->name('cellularMeasurements');
 
+            Route::get('processing-bill-matrix/{proUid?}', 'PracticeManagementController@processingBillMatrix')->name('processingBillMatrix');
+
             Route::get('hcp-bill-matrix/{proUid?}', 'PracticeManagementController@hcpBillMatrix')->name('hcpBillMatrix');
 
             Route::get('tickets', 'PracticeManagementController@tickets')->name('tickets');