瀏覽代碼

Modal generic-bills framework

Vijayakrishnan 4 年之前
父節點
當前提交
2e4ac9394f

+ 2 - 2
app/Helpers/helpers.php

@@ -14,7 +14,7 @@ use App\Models\Bill;
 use Soundasleep\Html2Text as Html2Text;
 
 if(!function_exists('genericBills')) {
-    function genericBills(Pro $performerPro, Client $patient, $entityType, $entityUid) {
+    function genericBills(Pro $performerPro, $patient, $entityType, $entityUid) {
         $genericBills = Bill::where('bill_service_type', 'GENERIC');
         if($performerPro->pro_type !== 'ADMIN') {
             $genericBills = $genericBills->where('generic_pro_id', $performerPro->id);
@@ -32,7 +32,7 @@ if(!function_exists('genericBills')) {
 }
 
 if(!function_exists('hasActiveGenericBill')) {
-    function hasActiveGenericBill(Pro $performerPro, Client $patient, $entityType, $entityUid) {
+    function hasActiveGenericBill(Pro $performerPro, $patient, $entityType, $entityUid) {
         $genericBills = Bill::where('bill_service_type', 'GENERIC')->where('is_cancelled', false);
         if($performerPro->pro_type !== 'ADMIN') {
             $genericBills = $genericBills->where('generic_pro_id', $performerPro->id);

+ 4 - 0
app/Http/Controllers/HomeController.php

@@ -859,4 +859,8 @@ WHERE measurement.label NOT IN ('SBP', 'DBP')
         $ticket->initiatingPro;
         return json_encode($ticket);
     }
+
+    public function genericBill(Request $request, $entityType, $entityUid) {
+        return view('app.generic-bills.inline', ['class' => 'p-3 border-top mt-3', 'entityType' => $entityType, 'entityUid' => $entityUid]);
+    }
 }

+ 4 - 0
public/css/style.css

@@ -1009,10 +1009,14 @@ body .node input[type="number"] {
     box-shadow: 0 0 5px #ddd;
     margin: 0 auto;
     padding: 0.75rem;
+    min-height: 220px;
 }
 .stag-popup.wide>form, .stag-popup.wide>.stag-popup-content {
     width: calc(100% - 4rem);
 }
+.stag-popup.tall>form, .stag-popup.tall>.stag-popup-content {
+    min-height: 100%;
+}
 .stag-popup.narrow>form, .stag-popup.narrow>.stag-popup-content {
     max-width: 500px;
 }

+ 0 - 1
resources/views/app/generic-bills/add-bill-form/_default-script.blade.php

@@ -9,7 +9,6 @@
             calculateGenericBillAmount($(_trigger).closest('form').find('[name="numberOfUnits"]'));
         };
         window.calculateGenericBillAmount = function(_trigger) {
-            debugger
             _trigger = $(_trigger);
             let amountTarget = _trigger.closest('form').find('[calculated-generic-amount]');
             if(!_trigger.find('option:selected').length) {

+ 7 - 0
resources/views/app/generic-bills/modal.blade.php

@@ -0,0 +1,7 @@
+<a native target="_blank"
+   open-in-stag-popup
+   popup-style="tall"
+   title="{{@$label ? $label : 'Generic'}} bills"
+   href="{{route('generic-bill-view', ['entityType' => @$entityType, 'entityUid' => @$entityUid])}}">
+    {{@$label ? $label : 'Generic'}} bills
+</a>

+ 2 - 0
routes/web.php

@@ -303,6 +303,8 @@ Route::middleware('pro.auth')->group(function () {
     Route::get('/section_create_form/{note_uid}/{section_template_uid}', 'NoteController@sectionCreateForm')->name('section_create_form');
     Route::get('/section_update_form/{section_uid}', 'NoteController@sectionUpdateForm')->name('section_update_form');
 
+    // generic bills modal
+    Route::get('/generic-bill-view/{entityType}/{entityUid}', 'HomeController@genericBill')->name('generic-bill-view');
 
     Route::get("/log_in_as", 'HomeController@logInAs')->name('log-in-as');
     Route::post("/process-log_in_as", 'HomeController@processLogInAs')->name('process-log-in-as');