From a8bd92bd489267f934ad23c6c81786fbcf8170e0 Mon Sep 17 00:00:00 2001
From: Djery-Tom <dietchidjery@gmail.com>
Date: Wed, 2 Feb 2022 17:08:44 +0100
Subject: [PATCH] Update insurance subscription details view

---
 .../controllers/pagination/CareRequests.php       |  4 ++--
 application/models/Nano_health_model.php          |  2 ++
 .../hyper/infos_insurance_subscription.php        | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/application/controllers/pagination/CareRequests.php b/application/controllers/pagination/CareRequests.php
index e245de96..7ed7d361 100755
--- a/application/controllers/pagination/CareRequests.php
+++ b/application/controllers/pagination/CareRequests.php
@@ -33,8 +33,8 @@ class CareRequests  extends CI_Controller
 		$i = $_POST['start'];
 		$current_url = $_POST['currentURL'];
 		foreach ($witData as $row) {
-			$buttons = "<button class='btn btn-success treat-demand' style='margin-right: 10px;' data-id='$row->id' data-action='ACCEPT'>".$this->lang->line('accept')."</button>".
-						"<button class='btn btn-danger treat-demand' data-id='$row->id' data-action='REJECT'>".$this->lang->line('reject')."</button>";
+			$buttons = "<button class='btn btn-success btn-block treat-demand' data-id='$row->id' data-action='ACCEPT'>".$this->lang->line('accept')."</button>".
+						"<button class='btn btn-danger btn-block treat-demand' data-id='$row->id' data-action='REJECT'>".$this->lang->line('reject')."</button>";
 
 			$data[] = array($row->request_id , $row->user_lastname.' '.$row->user_firstname , $row->user_phone,  $row->act_code , $row->act_name,
 				mb_strtoupper($this->lang->line($row->state),'UTF-8'), $row->created_at , $row->state === 'UNDER_VALIDATION' ? $buttons : null);
diff --git a/application/models/Nano_health_model.php b/application/models/Nano_health_model.php
index 7658158b..48c601b8 100644
--- a/application/models/Nano_health_model.php
+++ b/application/models/Nano_health_model.php
@@ -68,12 +68,14 @@ class Nano_health_model extends CI_Model
 	public function getSubscriptionBeneficiaries($subscriptionId){
 		return  $this->db->select('b.*')
 			->from('nh_having_rights b')->join('nh_insurances_having_rights i', 'b.id = i.having_right_id')
+			->where('i.deleted_at IS NULL')
 			->where('i.insurance_subscription_id',$subscriptionId)->order_by('i.created_at','asc')->get();
 	}
 
 	public function getInsuranceBeneficiaries($insuranceId){
 		return  $this->db->select('b.*')
 			->from('nh_having_rights b')->join('nh_insurances_having_rights i', 'b.id = i.having_right_id')
+			->where('i.deleted_at IS NULL')
 			->where('i.insurance_id',$insuranceId)->order_by('i.created_at','asc')->get();
 	}
 
diff --git a/application/views/nano_health/hyper/infos_insurance_subscription.php b/application/views/nano_health/hyper/infos_insurance_subscription.php
index 62f272b2..a40b3b53 100755
--- a/application/views/nano_health/hyper/infos_insurance_subscription.php
+++ b/application/views/nano_health/hyper/infos_insurance_subscription.php
@@ -176,6 +176,21 @@
 
 		</div>
 
+
+		<div class="row">
+			<div class="col-lg-6 col-xs-6">
+				<div class="small-box bg-aqua-active">
+					<div class="inner">
+						<h3 style="white-space: pre-wrap; font-size: 1.9em;"><?= $this->lang->line($subscription->insurance_action) ?></h3>
+						<p><?= $this->lang->line('reason') ?></p>
+					</div>
+					<div class="icon">
+						<i class="fa fa-info"></i>
+					</div>
+				</div>
+			</div>
+		</div>
+
 		<div class="box box-primary">
 			<div class="box-header with-border">
 				<h3 class="box-title"><?= $this->lang->line('beneficiaries') ?></h3>