diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php index afe8c3a8..c46545cf 100755 --- a/application/language/english/message_lang.php +++ b/application/language/english/message_lang.php @@ -693,7 +693,7 @@ $lang['add_provider_class'] = "Add a provider class"; $lang['edit_provider_class'] = "Edit a class"; $lang['delete_provider_class'] = "Delete a provider class"; $lang['provider_class_deleted'] = "Deleted provider class"; -$lang['first_rule_months_price_grid'] = "The minimum amount must not exceed the coverage limit per year"; +$lang['first_rule_months_price_grid'] = "The minimum amount must not exceed the insurance coverage limit amount"; $lang['subscriptions_history'] = "Subscription history"; $lang['bonus_amount'] = "Bonus amount"; $lang['number_of_beneficiaries'] = "Number of beneficiaries"; @@ -867,5 +867,6 @@ $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" +$lang['family_coverage_sharing'] = "Family coverage pooling"; +$lang['max_insurance_coverage_amount'] = "Insurance coverage limit amount"; ?> diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php index 63632144..403b9edf 100755 --- a/application/language/french/message_lang.php +++ b/application/language/french/message_lang.php @@ -705,7 +705,7 @@ $lang['add_provider_class'] = "Ajouter une classe de prestataire"; $lang['edit_provider_class'] = "Modifier une classe"; $lang['delete_provider_class'] = "Suppression d'une classe de prestataire"; $lang['provider_class_deleted'] = "Classe de prestataire supprimée"; -$lang['first_rule_months_price_grid'] = "Le montant minimal ne doit pas être supérieur à la limite de couverture par an"; +$lang['first_rule_months_price_grid'] = "Le montant minimal ne doit pas être supérieur à la limite de couverture d'assurance"; $lang['subscriptions_history'] = "Historique des souscriptions"; $lang['bonus_amount'] = "Montant de la prime"; $lang['number_of_beneficiaries'] = "Nombre d’ayants droit"; @@ -878,5 +878,6 @@ $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" +$lang['family_coverage_sharing'] = "Mutualisation de la couverture familiale"; +$lang['max_insurance_coverage_amount'] = "Montant limite de couverture d'assurance"; ?> diff --git a/application/models/Wallet_model.php b/application/models/Wallet_model.php index 0175fc96..0926be7f 100644 --- a/application/models/Wallet_model.php +++ b/application/models/Wallet_model.php @@ -279,7 +279,7 @@ class Wallet_model extends CI_Model } public function disableConfigWallet($network_id){ - $query = $this->db->query("UPDATE `configWallet` SET enabled = 0 WHERE `configWallet`.`id_network` = '".$network_id."'"); + $query = $this->db->query("UPDATE `configWallet` SET enabled = 0 AND type = null WHERE `configWallet`.`id_network` = '".$network_id."'"); return $query; } diff --git a/application/views/nano_health/hyper/gestion_wallet.php b/application/views/nano_health/hyper/gestion_wallet.php index 47bccee8..29ad4c26 100755 --- a/application/views/nano_health/hyper/gestion_wallet.php +++ b/application/views/nano_health/hyper/gestion_wallet.php @@ -104,7 +104,7 @@ $careRequests = [];
-
+

lang->line($nh_config->provider_billing_period ?? ''); ?>

@@ -115,18 +115,7 @@ $careRequests = [];
-
-
-
-

coverage_limit_per_insured_per_year ?? 0, 2), $curreny_code, $context)->formatTo('fr_FR'); ?>

-

lang->line('coverage_limit_per_insured_per_year') ?>

-
-
- -
-
-
-
+

lang->line($nh_config->family_coverage_sharing ? 'Oui' : 'Non'); ?>

@@ -137,9 +126,7 @@ $careRequests = [];
-
-
-
+

max_number_of_beneficiaries ?? ''; ?>

@@ -150,7 +137,7 @@ $careRequests = [];
-
+

age_limit_of_insured_and_spouse ?? ''; ?>

@@ -161,7 +148,7 @@ $careRequests = [];
-
+

age_limit_of_child_beneficiary ?? ''; ?>

@@ -289,8 +276,9 @@ $careRequests = []; - + + @@ -300,6 +288,8 @@ $careRequests = []; + + -
- - -
@@ -627,6 +612,7 @@ $careRequests = [];
+ @@ -637,6 +623,7 @@ $careRequests = []; + ' + '' + '' + + '' + '' + ''; $("#months_prices_grid").append(row); @@ -1301,10 +1288,11 @@ $careRequests = []; var empty = false; var input = $(this).parents("tr").find('input[type="number"]'); var minAmount = parseFloat($(this).parents("tr").find('input[name="min_amount"]').first().val()); + var maxAmount = parseFloat($(this).parents("tr").find('input[name="max_insurance_coverage_amount"]').first().val()); input.each(function () { if ($(this).attr('name') == 'min_amount') { - if (minAmount > limitAmount) { + if (minAmount > maxAmount) { $(this).addClass("error"); $(this)[0].reportValidity(); empty = true; @@ -1338,6 +1326,8 @@ $careRequests = []; $(this).html(''); if (index == 1) $(this).html(''); + if (index == 2) + $(this).html(''); }); $(this).parents("tr").find(".add, .edit").toggle(); $(".new2").attr("disabled", "disabled");
lang->line('number_of_months') ?> lang->line('number_of_months') ?> lang->line('min_amount') ?> lang->line('max_insurance_coverage_amount') ?>
number_of_months ?> min_amount, 2), $curreny_code, $context)->formatTo('fr_FR'); ?>max_insurance_coverage_amount, 2), $curreny_code, $context)->formatTo('fr_FR'); ?>
lang->line('number_of_months') ?> lang->line('min_amount') ?> lang->line('max_insurance_coverage_amount') ?> Actions
number_of_months ?> min_amount ?>max_insurance_coverage_amount ?> @@ -853,7 +840,6 @@ $careRequests = []; "max_number_of_beneficiaries": $("input[name=max_number_of_beneficiaries]").val(), "age_limit_of_insured_and_spouse": $("input[name=age_limit_of_insured_and_spouse]").val(), "age_limit_of_child_beneficiary": $("input[name=age_limit_of_child_beneficiary]").val(), - "coverage_limit_per_insured_per_year": $("input[name=coverage_limit_per_insured_per_year]").val(), "family_coverage_sharing" : family_coverage_sharing, "current_affection_percentage_insurer": current_affection_percentage_insurer, "current_affection_percentage_insured": current_affection_percentage_insured, @@ -958,8 +944,9 @@ $careRequests = []; row.push(parseFloat($(item).html())); }); arrayItem.nh_network_config_id = config_id - arrayItem.number_of_months = row[0]; - arrayItem.min_amount = row[1]; + arrayItem.number_of_months = row[0]; + arrayItem.min_amount = row[1]; + arrayItem.max_insurance_coverage_amount = row[2]; grid.push(arrayItem); }); @@ -1276,7 +1263,6 @@ $careRequests = []; //Months Grid var actions2 = $("#months_prices_grid td:last-child").html(); - let limitAmount = coverage_limit_per_insured_per_year ?? 0 ?>; // Append table with add row form on add new button click $(".new2").click(function () { @@ -1290,6 +1276,7 @@ $careRequests = []; var row = '
' + actions2 + '