Procházet zdrojové kódy

Note NA bill create logic update

Vijayakrishnan před 3 roky
rodič
revize
44116871a9

+ 1 - 1
resources/views/app/generic-bills/add-bill-form/Note.blade.php

@@ -3,7 +3,7 @@
 <?php $genericCompanyPro = $genericPro->defaultCompanyPro; ?>
 
 {{-- if no defaultCompanyPro on this pro, STOP --}}
-@if(!$genericPro->defaultCompanyPro)
+@if(!$genericCompanyPro)
     <form url="/api/bill/createForGeneric">
         <div class="border rounded bg-aliceblue p-2 text-nowrap">
             <div class="mb-2 font-weight-bold">

+ 11 - 2
resources/views/app/generic-bills/add-bill-form/_default-fields.blade.php

@@ -1,10 +1,19 @@
 @if($pro && $pro->pro_type === 'ADMIN')
     <div class="mb-2 min-width-300px">
         <label for="" class="text-secondary text-sm">Company Pro</label>
-        <div class="p-2 border bg-light rounded">{{$genericCompanyPro->pro->displayName()}} / {{$genericCompanyPro->company->name}}</div>
+        <div class="p-2 border bg-light rounded">
+            @if(@$genericCompanyPro)
+                {{$genericCompanyPro->pro->displayName()}} / {{$genericCompanyPro->company->name}}
+            @else
+                <span class="text-danger">(not set)</span>
+            @endif
+        </div>
     </div>
 @endif
-<input type="hidden" name="genericCompanyProUid" value="{{$genericCompanyPro->uid}}">
+<input type="hidden" name="genericProUid" value="{{$genericPro->uid}}">
+@if(@$genericCompanyPro)
+    <input type="hidden" name="genericCompanyProUid" value="{{$genericCompanyPro->uid}}">
+@endif
 @if(@$note)
     <input type="hidden" name="optionalNoteUid" value="{{$note->uid}}">
 @endif

+ 1 - 1
resources/views/app/patient/note/dashboard.blade.php

@@ -745,7 +745,7 @@ use App\Models\Handout;
                 @if(!$note->is_signed_by_ally)
                     <span class="ml-1">
                         Please review and
-                        <span moe class="d-inline">
+                        <span moe relative class="d-inline-block">
                             <a class="font-weight-bold" href="" show start>sign</a>
                             <form url="/api/note/signAsAlly">
                                 <input type="hidden" name="uid" value="{{$note->uid}}">