Fixes

app/Http/Controllers/DnaController.php

@@ -132,7 +132,7 @@ class DnaController extends Controller
         $filters = $request->all();
         $financialTransactions = ProTransaction::select('pro_transaction.*')
                                 ->join('bill', 'bill.id', '=', 'pro_transaction.bill_id')
-                                ->where('bill.na_pro_id', $this->performer->pro->id);
+                                ->where('bill.generic_pro_id', $this->performer->pro->id);
         $financialTransactions = $financialTransactions->orderBy('created_at', 'DESC')->paginate(20);
         return view('app.dna.financial-transactions', compact('financialTransactions', 'filters'));
     }

resources/views/app/generic-bills/inline.blade.php

@@ -17,16 +17,14 @@ $genericBills = genericBills($pro, @$patient, @$entityType, @$entityUid);
 @if(!count($genericBills))
     <div class="{{@$class ? $class : ''}} d-flex align-items-center">
         <p class="font-weight-bold mb-0">No {{@$label ? $label : 'Admin.'}} Bills</p>
-        @if($pro->is_arbitrary_generic_bill_enabled)
             <span class="mx-2 text-secondary">|</span>
             @include('app.generic-bills.create_generic-bill')
-        @endif
     </div>
 @else
     <div class="{{@$class ? $class : ''}}">
         <div class="d-flex align-items-center mb-2">
             <p class="font-weight-bold m-0">{{@$label ? $label : 'Admin.'}} Bills</p>
-            @if(!@$noCreate && $pro->is_arbitrary_generic_bill_enabled)
+            @if(!@$noCreate)
                 <span class="mx-2 text-secondary">|</span>
                 @include('app.generic-bills.create_generic-bill')
             @endif
@@ -130,16 +128,16 @@ $genericBills = genericBills($pro, @$patient, @$entityType, @$entityUid);
                                 @if($bill->is_signed_by_generic_pro)
                                     <div class="d-block text-secondary text-nowrap">
                                         <i class="fa fa-check"></i>
-                                        Pro Signed
+                                        Signed
                                     </div>
                                 @else
                                     <div moe
                                           class="d-block {{ $bill->generic_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
                                           title="{{ $bill->generic_pro_id !== $pro->id ? 'Only the bill\'s pro can sign' : '' }}">
-                                        <a class="text-nowrap" href="" show start>Sign As Pro</a>
+                                        <a class="text-nowrap" href="" show start>Sign</a>
                                         <form url="/api/bill/signAsGenericPro">
                                             <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                            <p>Sign this bill as pro?</p>
+                                            <p>Sign this bill?</p>
                                             <div class="mb-0">
                                                 <button class="btn btn-success btn-sm" submit>Sign</button>
                                                 <button class="btn btn-default border btn-sm" cancel>Cancel</button>

resources/views/layouts/template.blade.php

@@ -145,7 +145,6 @@
                             <a class="dropdown-item" href="{{ route('practice-management.myTextShortcuts') }}">My Text Shortcuts</a>
                             <a class="dropdown-item" href="{{ route('practice-management.myFavorites') }}">My Favorites</a>
                             <a class="dropdown-item" href="{{ route('practice-management.my-flyers') }}">My Flyers</a>
-                            <a class="dropdown-item" href="{{ route('practice-management.notes-pending-physician-supervisor-stamping') }}">Notes Pending Physician Supervisor Stamping</a>
                         @else 
                             <a class="dropdown-item" href="{{ route('ps.client-review-requests') }}">My Patient Chart Review Requests</a>
                             <a class="dropdown-item" href="{{ route('practice-management.myTickets') }}">My Bills</a>
@@ -184,6 +183,7 @@
                             <a class="dropdown-item" href="{{ route('dna.myClinicalTeams') }}">My Clinical Teams</a>
                         @endif
                         @if($pro->pro_type === 'ADMIN' || $pro->is_considered_for_supervising_physician)
+                        <a class="dropdown-item" href="{{ route('practice-management.notes-pending-physician-supervisor-stamping') }}">Notes Pending Physician Supervisor Stamping</a>
                         <a class="dropdown-item" href="{{ route('practice-management.client-review-requests') }}">Client Review Requests</a>
                         @endif
                     </div>