Merge remote-tracking branch 'origin/staging' into origin/production

Modules/HospitalPortal/Http/Controllers/Api/MemberController.php

@@ -78,6 +78,7 @@ class MemberController extends Controller
                 ->leftJoin('plans', 'plans.id', '=', 'member_plans.plan_id')
                 ->leftJoin('services', 'services.code', '=', 'plans.service_code')
                 ->where('member_plans.member_id', $members->id)
+                ->whereNull('member_plans.deleted_at')
                 ->select('plans.service_code', 'services.name')
                 ->get();
                 $res_data['services'] = $services;

Modules/HospitalPortal/Http/Controllers/Api/NotificationController.php

@@ -13,12 +13,12 @@ use Illuminate\Support\Facades\DB;
 
 class NotificationController extends Controller
 {
-    public function getNotifications(Request $request, $hospital_id)
+    public function getNotifications(Request $request, $user_id)
     {
         $data = [
-            'hospital_id' => $hospital_id,
+            'user_id' => $user_id,
         ];
-        if (!$hospital_id)
+        if (!$user_id)
         {
             return ApiResponse::apiResponse('Not Found', $data, trans('Message.not_found'), 404);
         }
@@ -36,7 +36,8 @@ class NotificationController extends Controller
                     DB::raw('DATE_FORMAT(notifications.created_at, "%Y-%m-%dT%H:%i:%s.000+07:00") as createdAt'),
                     'notifications.isUnRead',
                 )
-                ->where('hospital_id', '=', $hospital_id)
+                ->where('user_id', '=', $user_id)
+                ->orderBy('id', 'DESC')
                 ->get();
                 $res_data['notifications'] = $notifications;
                 return ApiResponse::apiResponse("Success", $res_data, trans('Message.success'), 200);
@@ -50,15 +51,15 @@ class NotificationController extends Controller
     public function setReadNotification(Request $request)
     {
         $data = [
-            'hospital_id' => $request->hospital_id,
+            'user_id' => $request->user_id,
             'id' => $request->id,
             'isUnRead'=> 0,
         ];
         $validator = Validator::make($request->all(), [
-            'hospital_id' => 'required',
+            'user_id' => 'required',
             'id' => 'required'
         ], [
-            'hospital_id.required' => trans('Validation.required',['attribute' => 'Hospital ID']),
+            'user_id.required' => trans('Validation.required',['attribute' => 'Hospital ID']),
             'id.required' => trans('Validation.required',['attribute' => 'ID']),
         ]);
         if ($validator->fails())

Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php

@@ -12,6 +12,7 @@ use App\Helpers\Helper;
 use App\Models\File;
 use Dompdf\Dompdf;
 use Dompdf\Options;
+use Illuminate\Support\Facades\View;
 
 class RequestLogController extends Controller
 {
@@ -107,6 +108,33 @@ class RequestLogController extends Controller
 
                 if($response->original['statusCode'] == 200)
                 {
+                    //send email
+                    // Insert data notifications
+                    $emailTo = 'alarm.center@linksehat.com';
+                    $dataNotif = [
+                        'email' => $emailTo,
+                        'title' => 'Request LOG',
+                        'description' => 'Request LOG from Hospital Portal',
+                        'type' => 1,
+                        'isUnRead' => true,
+                        'created_by' => auth()->user()->id,
+                        'created_at' => date('Y-m-d H:i:s'),
+                        'updated_at' => date('Y-m-d H:i:s'),
+                    ];
+                    $sendNotif = Helper::insertNotification($dataNotif);
+                    // Send Email after insert notifications
+                    if($sendNotif)
+                    {
+                        //send to alarm
+                        $nameTo = 'Admin LinkSehat';
+                        $dataEmail = [
+                            'email' => $emailTo,
+                            'name' => $nameTo,
+                            'subject' => 'Request LOG from Hospital Portal'. ' '.date('Y-m-d H:i:s'),
+                            'body' => View::make('email/notif_email', ['name' => $nameTo, 'link' => 'https://primecenter.linksehat.com/'])->render(),
+                        ];
+                        Helper::sendEmail($dataEmail);
+                    }
                     return ApiResponse::apiResponse("Success", $data, trans('Message.success'), 200);
                 }
                 else
@@ -352,6 +380,33 @@ class RequestLogController extends Controller
                     }
                 }
                 DB::commit();
+                //send email
+                // Insert data notifications
+                $emailTo = 'alarm.center@linksehat.com';
+                $dataNotif = [
+                    'email' => $emailTo,
+                    'title' => 'Request Final LOG',
+                    'description' => 'Request Final LOG from Hospital Portal',
+                    'type' => 1,
+                    'isUnRead' => true,
+                    'created_by' => auth()->user()->id,
+                    'created_at' => date('Y-m-d H:i:s'),
+                    'updated_at' => date('Y-m-d H:i:s'),
+                ];
+                $sendNotif = Helper::insertNotification($dataNotif);
+                // Send Email after insert notifications
+                if($sendNotif)
+                {
+                    //send to alarm
+                    $nameTo = 'Admin LinkSehat';
+                    $dataEmail = [
+                        'email' => $emailTo,
+                        'name' => $nameTo,
+                        'subject' => 'Request Final LOG from Hospital Portal'. ' '.date('Y-m-d H:i:s'),
+                        'body' => View::make('email/notif_email', ['name' => $nameTo, 'link' => 'https://primecenter.linksehat.com/'])->render(),
+                    ];
+                    Helper::sendEmail($dataEmail);
+                }
                 return ApiResponse::apiResponse('Success', $data, trans('Message.success'), 200);
             }
             catch (\Exception $e) {
@@ -370,6 +425,7 @@ class RequestLogController extends Controller
         $dataMember = DB::table('members')
         ->where('members.id', '=', $dataRequestLog->member_id)
         ->select(
+            'members.nric',
             'members.id',
             'members.principal_id',
             'members.name', 
@@ -517,6 +573,7 @@ class RequestLogController extends Controller
         $dataMember = DB::table('members')
         ->where('members.id', '=', $dataRequestLog->member_id)
         ->select(
+            'members.nric',
             'members.id',
             'members.principal_id',
             'members.name', 

Modules/HospitalPortal/Routes/api.php

@@ -60,7 +60,7 @@ Route::prefix('v1')->group(function() {
                 //Notification
                 Route::controller(NotificationController::class)->group(function() {
                     //get notifications
-                    Route::get('notifications/{hospital_id}', 'getNotifications');
+                    Route::get('notifications/{user_id}', 'getNotifications');
                     //Set read notification
                     Route::post('set-read-notification', 'setReadNotification');
                 });

Modules/Internal/Http/Controllers/Api/ClaimController.php

@@ -977,8 +977,9 @@ class ClaimController extends Controller
     public function sendNotif($description)
     {
         // Insert data notifications
+        $emailTo = 'hospitaladmin@linksehat.com';
         $dataNotif = [
-            'hospital_id' => 1,
+            'email' => $emailTo,
             'title' => 'Request Document',
             'description' => 'Please enter the document '.$description,
             'type' => 1,
@@ -991,12 +992,12 @@ class ClaimController extends Controller
         // Send Email after insert notifications
         if($sendNotif)
         {
-            //Beluma ada Data Users
+            $nameTo = 'Hospital Admin';
             $dataEmail = [
-                'email' => 'akun.kerja.ivan@gmail.com',
-                'name' => 'Ivan Julian',
+                'email' => $emailTo,
+                'name' => $nameTo,
                 'subject' => 'Enter Document '.$description,
-                'body' => View::make('email/notif_email', ['name' => 'Ivan Julian', 'link' => 'https://linkmedis.com/chat'])->render(),
+                'body' => View::make('email/notif_email', ['name' => $nameTo, 'link' => 'https://hospitalportal.linksehat.com/dashboard'])->render(),
             ];
             Helper::sendEmail($dataEmail);
         }