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

resources/views/app/patient/tickets.blade.php

@@ -374,7 +374,10 @@
                                 '/api/ticket/' + (this.erxPopupMode === 'add' ? 'create' : 'updateData'),
                                 payload,
                                 (_data) => {
-                                    console.log(_data);
+                                    if(hasResponseError(_data)) {
+                                        hideMask();
+                                        return;
+                                    }
                                     if(!_autoSave) {
                                         if(_data.data) {
                                             window.localStorage.autoOpen = 'erx|' + _data.data;
@@ -423,11 +426,17 @@
                                 payload.uid = this.labPopupItem.uid;
                                 payload.newData = JSON.stringify(this.labPopupItem.data);
                             }
+                            @if(request()->input('note-uid'))
+                                payload.noteUid = '{{request()->input('note-uid')}}';
+                            @endif
                             $.post(
                                 '/api/ticket/' + (this.labPopupMode === 'add' ? 'create' : 'updateData'),
                                 payload,
                                 (_data) => {
-                                    console.log(_data);
+                                    if(hasResponseError(_data)) {
+                                        hideMask();
+                                        return;
+                                    }
                                     if(!_autoSave) {
                                         if(_data.data) {
                                             window.localStorage.autoOpen = 'lab|' + _data.data;
@@ -478,11 +487,17 @@
                                 payload.uid = this.imagingPopupItem.uid;
                                 payload.newData = JSON.stringify(this.imagingPopupItem.data);
                             }
+                            @if(request()->input('note-uid'))
+                                payload.noteUid = '{{request()->input('note-uid')}}';
+                            @endif
                             $.post(
                                 '/api/ticket/' + (this.imagingPopupMode === 'add' ? 'create' : 'updateData'),
                                 payload,
                                 (_data) => {
-                                    console.log(_data);
+                                    if(hasResponseError(_data)) {
+                                        hideMask();
+                                        return;
+                                    }
                                     if(!_autoSave) {
                                         if(_data.data) {
                                             window.localStorage.autoOpen = 'imaging|' + _data.data;
@@ -533,11 +548,17 @@
                                 payload.uid = this.equipmentPopupItem.uid;
                                 payload.newData = JSON.stringify(this.equipmentPopupItem.data);
                             }
+                            @if(request()->input('note-uid'))
+                                payload.noteUid = '{{request()->input('note-uid')}}';
+                            @endif
                             $.post(
                                 '/api/ticket/' + (this.equipmentPopupMode === 'add' ? 'create' : 'updateData'),
                                 payload,
                                 (_data) => {
-                                    console.log(_data);
+                                    if(hasResponseError(_data)) {
+                                        hideMask();
+                                        return;
+                                    }
                                     if(!_autoSave) {
                                         if(_data.data) {
                                             window.localStorage.autoOpen = 'equipment|' + _data.data;