diff --git a/application/controllers/Agent.php b/application/controllers/Agent.php index e310ed5c..e61e523d 100755 --- a/application/controllers/Agent.php +++ b/application/controllers/Agent.php @@ -44,7 +44,7 @@ class Agent extends CI_Controller $data['prescriptions'] = $this->nano_health_model->getHealthCareSheetPrescriptions($data['health_care_sheet']->id ?? null); // Calcul par assuré et assurance - $data['amounts'] = $this->nano_health_model->calculateSheetAmountsParts($data['health_care_sheet']->id ?? null, $data['health_care_sheet']->type ?? null); +// $data['amounts'] = $this->nano_health_model->calculateSheetAmountsParts($data['health_care_sheet']->id ?? null, $data['health_care_sheet']->type ?? null); $this->load->view('header_agent', $data); $this->load->view('nano_health/hyper/infos_health_care_sheet'); diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php index f06c8899..7eb63dea 100755 --- a/application/controllers/Hyperviseur_dash.php +++ b/application/controllers/Hyperviseur_dash.php @@ -426,7 +426,7 @@ class Hyperviseur_dash extends CI_Controller $data['exams'] = $this->nano_health_model->getHealthCareSheetExams($data['health_care_sheet']->id ?? null); $data['prescriptions'] = $this->nano_health_model->getHealthCareSheetPrescriptions($data['health_care_sheet']->id ?? null); // Calcul par assuré et assurance - $data['amounts'] = $this->nano_health_model->calculateSheetAmountsParts($data['health_care_sheet']->id ?? null, $data['health_care_sheet']->type ?? null); +// $data['amounts'] = $this->nano_health_model->calculateSheetAmountsParts($data['health_care_sheet']->id ?? null, $data['health_care_sheet']->type ?? null); $this->load->view('header_hyp', $data); $this->load->view('nano_health/hyper/infos_health_care_sheet'); @@ -666,7 +666,7 @@ class Hyperviseur_dash extends CI_Controller $oldAgent = ''; foreach ($query->result() as $r){ if($oldAgent != $r->agent) - array_push($data,[]); + $data[] = []; $row = []; @@ -688,11 +688,11 @@ class Hyperviseur_dash extends CI_Controller foreach ($r as $k => $val){ if($k == 'type_transac'){ - array_push($row,$val =='credit' ? $this->lang->line('DEPOT') : $this->lang->line('RETRAIT')); + $row[] = $val == 'credit' ? $this->lang->line('DEPOT') : $this->lang->line('RETRAIT'); } else - array_push($row,$val); + $row[] = $val; } - array_push($data,$row); + $data[] = $row; $oldAgent = $r->agent; } echo json_encode($data); diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php index cddf6f44..afe8c3a8 100755 --- a/application/language/english/message_lang.php +++ b/application/language/english/message_lang.php @@ -867,4 +867,5 @@ $lang['deletion_date'] = "Date of deletion"; $lang['STOP_INSURANCE'] = "Stopping insurance"; $lang['RENEWAL'] = "Insurance renewal"; $lang['expired_insurance'] = "Insurance expired"; +$lang['family_coverage_sharing'] = "Mutualisation de la couverture familiale" ?> diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php index d9f2fd31..63632144 100755 --- a/application/language/french/message_lang.php +++ b/application/language/french/message_lang.php @@ -878,4 +878,5 @@ $lang['deletion_date'] = "Date de suppression"; $lang['STOP_INSURANCE'] = "Arrêt de l'assurance"; $lang['RENEWAL'] = "Renouvellement de l'assurance"; $lang['expired_insurance'] = "Assurances arrivées à échéance"; +$lang['family_coverage_sharing'] = "Mutualisation de la couverture familiale" ?> diff --git a/application/views/nano_health/hyper/gestion_wallet.php b/application/views/nano_health/hyper/gestion_wallet.php index 2abab45d..47bccee8 100755 --- a/application/views/nano_health/hyper/gestion_wallet.php +++ b/application/views/nano_health/hyper/gestion_wallet.php @@ -104,7 +104,7 @@ $careRequests = [];
= $this->lang->line('family_coverage_sharing') ?>
+= $this->lang->line('percentage_insured') ?>
= $this->lang->line('percentage_insurer') ?>