Parcourir la source

Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2 into dev

= il y a 3 ans
Parent
commit
9ab03763a4

+ 1 - 1
resources/views/app/admin/patients-table.blade.php

@@ -93,7 +93,7 @@
 				</td>
 				<td>{{$patient->getMcpAssignedOn()}}</td>
 				@if($pro->pro_type == 'ADMIN')
-				<td>{{$patient->mcp->display_name ?? '--'}}</td>
+				<td>{{@$patient->mcp ? $patient->mcp->displayName() : '--'}}</td>
 				<td>{{$patient->initiative}}</td>
 				@endif
 			</tr>

+ 1 - 1
resources/views/app/patient/care-month/_create-bill.blade.php

@@ -17,7 +17,7 @@
             </div>
 
             <div class="my-3">
-                <input type="checkbox" name="signAndMarkBillingDone" checked>&nbsp;Sign and Mark Billing Done
+                <input type="checkbox" name="signAndMarkBillingDone">&nbsp;Sign and Mark Billing Done
             </div>
 
             <div class="">

+ 2 - 1
resources/views/app/patient/note/_create-bill-only.blade.php

@@ -71,7 +71,7 @@
 
                     @if(@$note && $note->hcpPro->id === $pro->id)
                     <div class="my-3">
-                        <input type="checkbox" name="signAndMarkBillingDone" checked>&nbsp;Sign and Mark Billing Done
+                        <input type="checkbox" name="signAndMarkBillingDone">&nbsp;Sign and Mark Billing Done
                     </div>
                     @endif
 
@@ -129,6 +129,7 @@
                 }
                 clone.appendTo(container)
                 clone.focus();
+                $('[name="numberOfUnits"]').trigger('change');
             }
             window.calculateCoBillAmount = function(_trigger) {
                 let amountTarget = $('[calculated-co-amount]');

+ 2 - 1
resources/views/app/patient/note/_create-bill.blade.php

@@ -66,7 +66,7 @@
 
                 @if(@$note && $note->hcpPro->id === $pro->id)
                 <div class="my-3">
-                    <input type="checkbox" name="signAndMarkBillingDone" checked>&nbsp;Sign and Mark Billing Done
+                    <input type="checkbox" name="signAndMarkBillingDone">&nbsp;Sign and Mark Billing Done
                 </div>
                 @endif
 
@@ -185,6 +185,7 @@
             }
             clone.appendTo(container)
             clone.focus();
+            $('[name="numberOfUnits"]').trigger('change');
         }
         window.calculateBillAmount = function(_trigger) {
             let amountTarget = $('[calculated-amount]');