From ea2ce38a13d126d974f362e1da42d692409b162d Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Tue, 26 Apr 2022 10:35:34 +0100 Subject: [PATCH] Add note for wallet config agent remove --- application/controllers/Gestion.php | 4 - application/controllers/Hyperviseur_dash.php | 3 - application/language/english/message_lang.php | 1 + application/language/french/message_lang.php | 1 + .../agent_remove_cash.php | 344 +----------------- .../agent_send_cash_canal.php | 6 +- .../controller_doctor/infos_invoice.php | 4 +- 7 files changed, 13 insertions(+), 350 deletions(-) diff --git a/application/controllers/Gestion.php b/application/controllers/Gestion.php index 8e134fdc..071f438a 100755 --- a/application/controllers/Gestion.php +++ b/application/controllers/Gestion.php @@ -1592,16 +1592,12 @@ class Gestion extends CI_Controller case 'agent_remove_cash': $plr_agent_wallet_cash_national = $_POST['plr_agent_wallet_cash_national'] ?? null; $plr_sup_wallet_cash_national = $_POST['plr_sup_wallet_cash_national'] ?? null; - $plr_customer_wallet_cash_national = $_POST['plr_customer_wallet_cash_national'] ?? null; $plr_agent_wallet_cash_international = $_POST['plr_agent_wallet_cash_international'] ?? null; $plr_sup_wallet_cash_international = $_POST['plr_sup_wallet_cash_international'] ?? null; - $plr_customer_wallet_cash_international = $_POST['plr_customer_wallet_cash_international'] ?? null; $this->insertPalier($plr_agent_wallet_cash_national, "agent_wallet_cash_national", $idConfig,'paliers_commissions_wallet'); $this->insertPalier($plr_sup_wallet_cash_national, "sup_wallet_cash_national", $idConfig ,'paliers_commissions_wallet'); - $this->insertPalier($plr_customer_wallet_cash_national, "customer_wallet_cash_national", $idConfig,'paliers_commissions_wallet'); $this->insertPalier($plr_agent_wallet_cash_international, "agent_wallet_cash_international", $idConfig,'paliers_commissions_wallet'); $this->insertPalier($plr_sup_wallet_cash_international, "sup_wallet_cash_international", $idConfig ,'paliers_commissions_wallet'); - $this->insertPalier($plr_customer_wallet_cash_international, "customer_wallet_cash_international", $idConfig,'paliers_commissions_wallet'); break; case 'agent_remove_carte_cash': // $plr_customer_cart_cash_international = $_POST['plr_customer_cart_cash_international'] ?? null; diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php index 270f8e34..ae7672ed 100755 --- a/application/controllers/Hyperviseur_dash.php +++ b/application/controllers/Hyperviseur_dash.php @@ -1450,9 +1450,6 @@ class Hyperviseur_dash extends CI_Controller $data['plr_sup_wallet_cash_national'] = $this->wallet_model->getPalierCommissionsWallet("sup_wallet_cash_national", $data['idConfig']); $data['plr_sup_wallet_cash_international'] = $this->wallet_model->getPalierCommissionsWallet("sup_wallet_cash_international", $data['idConfig']); - $data['plr_customer_wallet_cash_national'] = $this->wallet_model->getPalierCommissionsWallet("customer_wallet_cash_national", $data['idConfig']); - $data['plr_customer_wallet_cash_international'] = $this->wallet_model->getPalierCommissionsWallet("customer_wallet_cash_international", $data['idConfig']); - $this->load->view('header_hyp', $data); $this->load->view('config_wallet_ilink_hyp/agent_remove_cash'); break; diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php index dc00f367..15e7d2c0 100755 --- a/application/language/english/message_lang.php +++ b/application/language/english/message_lang.php @@ -940,4 +940,5 @@ $lang['EXPIRED'] = 'EXPIRED'; $lang['SUSPENDED'] = "SUSPENDED"; $lang['billed_quantity'] = "Billed quantity"; $lang['ceiling'] = "Ceiling"; +$lang['note_config_wallet_agent_remove_cash'] = "The hypervisor's commission is the amount remaining in the client's commission once the agent's and supervisor's commissions are removed" ?> diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php index 696fc6d0..705b5c2f 100755 --- a/application/language/french/message_lang.php +++ b/application/language/french/message_lang.php @@ -949,4 +949,5 @@ $lang['SUSPENDED'] = "SUSPENDU"; $lang['EXPIRED'] = 'EXPIRÉE'; $lang['billed_quantity'] = "Quantité facturée"; $lang['ceiling'] = "Plafond"; +$lang['note_config_wallet_agent_remove_cash'] = "La commission de l'hyperviseur est le montant restant de la commission client une fois qu'on a retiré les commissions de l'agent et du superviseur" ?> diff --git a/application/views/config_wallet_ilink_hyp/agent_remove_cash.php b/application/views/config_wallet_ilink_hyp/agent_remove_cash.php index 61db7e66..3198989c 100755 --- a/application/views/config_wallet_ilink_hyp/agent_remove_cash.php +++ b/application/views/config_wallet_ilink_hyp/agent_remove_cash.php @@ -26,7 +26,7 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); lang->line('config_agent').' - '.$this->lang->line('config_ilink_agent_remove_cash'); ?> -
-
-
-
-

lang->line('rate_com_customer_remove_cash_international'); ?>

-
- -
- - - - - - - - - result() as $row) { - echo " - - - - " . ' - '; - } - } - ?> - -
MinMaxTaux (%)lang->line('ceiling')?>
" . $fmt->format($row->min) . "" . $fmt->format($row->max) . "" . $row->taux . "" . (isset($row->plafond) ? floatval($row->plafond) : '') . "
-
- -
-
-
-

lang->line('rate_com_customer_remove_cash_national'); ?>

-
- -
- - - - - - - - - result() as $row) { - echo " - - - - " . ' - '; - } - } - ?> - -
MinMaxTaux (%)lang->line('ceiling')?>
" . $fmt->format($row->min) . "" . $fmt->format($row->max) . "" . $row->taux . "" . (isset($row->plafond) ? floatval($row->plafond) : '') . "
-
- -
-
+
+

Note

+

lang->line('note_config_wallet_agent_remove_cash') ?>

@@ -270,100 +208,6 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL);
-
-
-
-
-
-
- -
-
- -
-
-
- - - - - - - - - - - - result() as $row) { - echo " - - - - " . ' - - '; - } - } - ?> - -
MinMaxlang->line('rate'); ?> (%)lang->line('ceiling')?>Actions
" . $row->min . "" . $row->max . "" . $row->taux . "" . (isset($row->plafond) ? floatval($row->plafond) : '') . " - - - -
-
-
-
-
-
- -
-
- -
-
-
- - - - - - - - - - - - result() as $row) { - echo " - - - - " . ' - - '; - } - } - ?> - -
MinMaxlang->line('rate'); ?> (%)lang->line('ceiling')?>Actions
" . $row->min . "" . $row->max . "" . $row->taux . "" . (isset($row->plafond) ? floatval($row->plafond) : '') . " - - - -
-
-
-
@@ -603,11 +447,9 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); // Paliers let plr_agent_wallet_cash_national = getPaliersTable('agent_wallet_cash_national'); let plr_sup_wallet_cash_national = getPaliersTable('sup_wallet_cash_national'); - let plr_customer_wallet_cash_national = getPaliersTable('customer_wallet_cash_national'); let plr_agent_wallet_cash_international = getPaliersTable('agent_wallet_cash_international'); let plr_sup_wallet_cash_international = getPaliersTable('sup_wallet_cash_international'); - let plr_customer_wallet_cash_international = getPaliersTable('customer_wallet_cash_international'); $.ajax({ url: '', @@ -619,10 +461,8 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); "network_id": network_id, "id_config": id_config, "plr_agent_wallet_cash_national": plr_agent_wallet_cash_national, "plr_sup_wallet_cash_national": plr_sup_wallet_cash_national, - "plr_customer_wallet_cash_national": plr_customer_wallet_cash_national, "plr_agent_wallet_cash_international": plr_agent_wallet_cash_international, "plr_sup_wallet_cash_international": plr_sup_wallet_cash_international, - "plr_customer_wallet_cash_international": plr_customer_wallet_cash_international, }, success: function (data) { if (data == '200') { @@ -836,93 +676,6 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); // Paliers nationaux - -// Table 7 - var actions7 = $("#customer_wallet_cash_national td:last-child").html(); -// Append table with add row form on add new button click - $(".new7").click(function () { - if (!actions7) { - actions7 = '\n' + - ' \n' + - ' '; - } - $(this).attr("disabled", "disabled"); - var index = $("#customer_wallet_cash_national tbody tr:last-child").index(); - var row = '' + - '' + - '' + - '' + - '' + - ' ' + actions7 + '' + - ''; - $("#customer_wallet_cash_national").append(row); - $("#customer_wallet_cash_national tbody tr").eq(index + 1).find(".add7, .edit7").toggle(); - $('[data-toggle="tooltip"]').tooltip(); - }); -// Add row on add button click - $(document).on("click", ".add7", function () { - var empty = false; - var input = $(this).parents("tr").find('input[type="number"]'); - var min = parseFloat($(this).parents("tr").find('input[id="min"]').first().val()); - var max = parseFloat($(this).parents("tr").find('input[id="max"]').first().val()); - - input.each(function () { - if ($(this).attr('id') == 'min') { - if (min >= max) { - $(this).addClass("error"); - $(this)[0].reportValidity(); - empty = true; - } else { - $(this).removeClass("error"); - } - } else if ($(this).attr('id') == 'max') { - if (max <= min) { - $(this).addClass("error"); - $(this)[0].reportValidity(); - empty = true; - } else { - $(this).removeClass("error"); - } - } else { - if (!$(this)[0].checkValidity()) { - $(this).addClass("error"); - $(this)[0].reportValidity(); - empty = true; - } else { - $(this).removeClass("error"); - } - } - }); - $(this).parents("tr").find(".error").first().focus(); - if (!empty) { - input.each(function () { - $(this).parent("td").html($(this).val()); - }); - $(this).parents("tr").find(".add7, .edit7").toggle(); - $(".new7").removeAttr("disabled"); - } - }); -// Edit row on edit button click - $(document).on("click", ".edit7", function () { - $(this).parents("tr").find("td:not(:last-child)").each(function (index) { - if (index == 0) - $(this).html(''); - if (index == 1) - $(this).html(''); - if (index == 2) - $(this).html(''); - if (index == 3) - $(this).html(''); - }); - $(this).parents("tr").find(".add7, .edit7").toggle(); - $(".new7").attr("disabled", "disabled"); - }); -// Delete row on delete button click - $(document).on("click", ".delete7", function () { - $(this).parents("tr").remove(); - $(".new7").removeAttr("disabled"); - }); - /** * INTERNATIONAUX */ @@ -1099,94 +852,5 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); $(this).parents("tr").remove(); $(".new12").removeAttr("disabled"); }); - - - // Paliers nationaux - -// Table 7 - var actions72 = $("#customer_wallet_cash_international td:last-child").html(); -// Append table with add row form on add new button click - $(".new72").click(function () { - if (!actions72) { - actions72 = '\n' + - ' \n' + - ' '; - } - $(this).attr("disabled", "disabled"); - var index = $("#customer_wallet_cash_international tbody tr:last-child").index(); - var row = '' + - '' + - '' + - '' + - '' + - ' ' + actions72 + '' + - ''; - $("#customer_wallet_cash_international").append(row); - $("#customer_wallet_cash_international tbody tr").eq(index + 1).find(".add72, .edit72").toggle(); - $('[data-toggle="tooltip"]').tooltip(); - }); -// Add row on add button click - $(document).on("click", ".add72", function () { - var empty = false; - var input = $(this).parents("tr").find('input[type="number"]'); - var min = parseFloat($(this).parents("tr").find('input[id="min"]').first().val()); - var max = parseFloat($(this).parents("tr").find('input[id="max"]').first().val()); - - input.each(function () { - if ($(this).attr('id') == 'min') { - if (min >= max) { - $(this).addClass("error"); - $(this)[0].reportValidity(); - empty = true; - } else { - $(this).removeClass("error"); - } - } else if ($(this).attr('id') == 'max') { - if (max <= min) { - $(this).addClass("error"); - $(this)[0].reportValidity(); - empty = true; - } else { - $(this).removeClass("error"); - } - } else { - if (!$(this)[0].checkValidity()) { - $(this).addClass("error"); - $(this)[0].reportValidity(); - empty = true; - } else { - $(this).removeClass("error"); - } - } - }); - $(this).parents("tr").find(".error").first().focus(); - if (!empty) { - input.each(function () { - $(this).parent("td").html($(this).val()); - }); - $(this).parents("tr").find(".add72, .edit72").toggle(); - $(".new72").removeAttr("disabled"); - } - }); -// Edit row on edit button click - $(document).on("click", ".edit72", function () { - $(this).parents("tr").find("td:not(:last-child)").each(function (index) { - if (index == 0) - $(this).html(''); - if (index == 1) - $(this).html(''); - if (index == 2) - $(this).html(''); - if (index == 3) - $(this).html(''); - }); - $(this).parents("tr").find(".add7, .edit7").toggle(); - $(".new72").attr("disabled", "disabled"); - }); -// Delete row on delete button click - $(document).on("click", ".delete72", function () { - $(this).parents("tr").remove(); - $(".new72").removeAttr("disabled"); - }); }); diff --git a/application/views/config_wallet_ilink_hyp/agent_send_cash_canal.php b/application/views/config_wallet_ilink_hyp/agent_send_cash_canal.php index a67c0381..10afa13d 100755 --- a/application/views/config_wallet_ilink_hyp/agent_send_cash_canal.php +++ b/application/views/config_wallet_ilink_hyp/agent_send_cash_canal.php @@ -25,7 +25,7 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); lang->line('config_agent').' - '.$this->lang->line('config_ilink_agent_send_cash_canal'); ?>
+
+

Note

+

lang->line('note_config_wallet_agent_remove_cash') ?>

+
diff --git a/application/views/nano_health/controller_doctor/infos_invoice.php b/application/views/nano_health/controller_doctor/infos_invoice.php index 896089c3..384dfc79 100755 --- a/application/views/nano_health/controller_doctor/infos_invoice.php +++ b/application/views/nano_health/controller_doctor/infos_invoice.php @@ -928,7 +928,7 @@ ''+(it.description || '')+'' + ''+(it.quantity || '')+'' + ''+(parseFloat(it.unit_price) || '')+'' + - ''+actions2+'' + + (showActionsButtons ? ''+actions2+'' : '' ) + '') }); @@ -948,7 +948,7 @@ ''+(it.dosage || '')+'' + ''+(it.quantity || '')+'' + ''+(parseFloat(it.unit_price) || '')+'' + - ''+actions3+'' + + (showActionsButtons ? ''+actions3+'' : '' ) + '') });