moved erhx

resources/views/app/patient/note/custom-visit.blade.php

@@ -90,6 +90,9 @@
                     <?php
                     foreach($secondhalf as $node) renderVisitTemplateNode($note, $node, 0, $segmentMap);
                     ?>
+                    <div class="p-2 border-bottom screen-only" data-non-segment-section="Prescriptions">
+                      @include('app.patient.prescriptions.list', compact('patient', 'note'))
+                    </div>
                 </div>
             </div>
         </div>

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

@@ -615,9 +615,14 @@
 
                 <span class="d-none latest-section-ts">{{ $latestSectionTS }}</span>
 
-                <div class="p-2 border-bottom screen-only" data-non-segment-section="Prescriptions">
+
+                  @if($isVisitTemplateBased && $doesVisitTemplateUiConfigExist)
+
+                  @else
+                  <div class="p-2 border-bottom screen-only" data-non-segment-section="Prescriptions">
                     @include('app.patient.prescriptions.list', compact('patient', 'note'))
-                </div>
+                  </div>
+                  @endif
 
                 <div class="p-3 border-bottom screen-only" data-non-segment-section="CM Setup">
                     <div class="d-flex align-items-center mb-3">

resources/views/app/patient/prescriptions/list.blade.php

@@ -3,27 +3,27 @@
         <h6 class="my-0 font-weight-bold text-secondary font-size-14">ERx &amp; Orders</h6>
         @if(!request()->input('erx_category') || request()->input('erx_category') === 'DRUG')
             <span class="mx-2 text-secondary on-hover-opaque">|</span>
-            <a href="#" v-on:click.prevent="newERx('DRUG')">+ Drug</a>
+            <a href="#" v-on:click.prevent="newERx('DRUG')">Drug</a>
         @endif
         @if(!request()->input('erx_category') || request()->input('erx_category') === 'LAB')
             <span class="mx-2 text-secondary on-hover-opaque">|</span>
-            <a href="#" v-on:click.prevent="newERx('LAB')">+ Lab</a>
+            <a href="#" v-on:click.prevent="newERx('LAB')">Lab</a>
         @endif
         @if(!request()->input('erx_category') || request()->input('erx_category') === 'IMAGING')
             <span class="mx-2 text-secondary on-hover-opaque">|</span>
-            <a href="#" v-on:click.prevent="newERx('IMAGING')">+ Imaging</a>
+            <a href="#" v-on:click.prevent="newERx('IMAGING')">Imaging</a>
         @endif
         @if(!request()->input('erx_category') || request()->input('erx_category') === 'REFERRAL')
             <span class="mx-2 text-secondary on-hover-opaque">|</span>
-            <a href="#" v-on:click.prevent="newERx('REFERRAL')">+ Referral</a>
+            <a href="#" v-on:click.prevent="newERx('REFERRAL')">Referral</a>
         @endif
         @if(!request()->input('erx_category') || request()->input('erx_category') === 'SUPPLY')
             <span class="mx-2 text-secondary on-hover-opaque">|</span>
-            <a href="#" v-on:click.prevent="newERx('SUPPLY')">+ Supply</a>
+            <a href="#" v-on:click.prevent="newERx('SUPPLY')">Supply</a>
         @endif
         @if(!request()->input('erx_category') || request()->input('erx_category') === 'OTHER')
             <span class="mx-2 text-secondary on-hover-opaque">|</span>
-            <a href="#" v-on:click.prevent="newERx('OTHER')">+ Other</a>
+            <a href="#" v-on:click.prevent="newERx('OTHER')">Other</a>
         @endif
     </div>
     <div class="d-flex align-items-start bg-white">
@@ -1452,4 +1452,4 @@ GROUP BY erx_category");
         }
         addMCInitializer('prescriptions-{{$patient->id}}', init, '#prescriptions-{{$patient->id}}')
     }).call(window);
-</script>
+</script>