diff --git a/application/controllers/Gestion.php b/application/controllers/Gestion.php
index 648eebce..920bbf7b 100755
--- a/application/controllers/Gestion.php
+++ b/application/controllers/Gestion.php
@@ -2260,14 +2260,21 @@ class Gestion extends CI_Controller
if (isset($_POST)) {
$country_id = $_POST['country_id'];
- $max_day = $_POST['max_day'];
- $max_week = $_POST['max_week'];
- $max_month = $_POST['max_month'];
+ $max_day_national = $_POST['max_day_national'];
+ $max_week_national = $_POST['max_week_national'];
+ $max_month_national = $_POST['max_month_national'];
+
+ $max_day_international = $_POST['max_day_international'];
+ $max_week_international = $_POST['max_week_international'];
+ $max_month_international = $_POST['max_month_international'];
+
$limits = $this->wallet_model->getRegulationsLimits($country_id);
if($limits){
- $this->wallet_model->updateRegulationsLimits($country_id,$max_day,$max_week,$max_month);
+ $this->wallet_model->updateRegulationsLimits($country_id,$max_day_national,$max_week_national,$max_month_national,
+ $max_day_international,$max_week_international,$max_month_international);
}else{
- $this->wallet_model->insertRegulationsLimits($country_id,$max_day,$max_week,$max_month);
+ $this->wallet_model->insertRegulationsLimits($country_id,$max_day_national,$max_week_national,$max_month_national,
+ $max_day_international,$max_week_international,$max_month_international);
}
$res = true;
if ($res) {
diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php
index 28200b88..cfd4e6c2 100755
--- a/application/language/english/message_lang.php
+++ b/application/language/english/message_lang.php
@@ -503,4 +503,7 @@ $lang['regulations_updated'] = 'Regulatory limits updated';
$lang['refunded_amount'] = "Amount refunded";
$lang['remains_to_be_reimbursed'] = "Remainder to reimburse";
$lang['end_date'] = "End date";
+$lang['cash_withdrawal'] = "Withdrawal in cash";
+$lang['validation_date'] = "Date of validation";
+$lang['repayment_date'] = "Repayment date";
?>
diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php
index d3aaec34..3a105f67 100755
--- a/application/language/french/message_lang.php
+++ b/application/language/french/message_lang.php
@@ -515,4 +515,7 @@ $lang['regulations_updated'] = 'Limites réglementaires mis à jour';
$lang['refunded_amount'] = "Montant remboursé";
$lang['remains_to_be_reimbursed'] = "Reste à rembourser";
$lang['end_date'] = "Date de fin";
+$lang['cash_withdrawal'] = "Retrait en cash";
+$lang['validation_date'] = "Date de la validation";
+$lang['repayment_date'] = "Date de remboursement";
?>
diff --git a/application/models/Wallet_model.php b/application/models/Wallet_model.php
index efc0494a..c9f28a4f 100644
--- a/application/models/Wallet_model.php
+++ b/application/models/Wallet_model.php
@@ -829,7 +829,8 @@ class Wallet_model extends CI_Model
// Gestion reglementaire
public function getRegulationsCountries(){
- $query = $this->db->query("SELECT distinct cc.id , cc.name as country , cc.currency_code, r.id_country, r.montant_max_jour, r.montant_max_hebdo, r.montant_max_mensuel FROM networks n
+ $query = $this->db->query("SELECT distinct cc.id , cc.name as country , cc.currency_code, r.id_country, r.montant_max_jour_national, r.montant_max_hebdo_national, r.montant_max_mensuel_national,
+ r.montant_max_jour_international, r.montant_max_hebdo_international, r.montant_max_mensuel_international FROM networks n
INNER JOIN countries_currencies cc ON n.country_id= cc.id INNER JOIN configWallet cw ON cw.id_network = n.id LEFT JOIN regulations r ON r.id_country = cc.id;");
if ($query->num_rows() > 0) {
return $query;
@@ -847,15 +848,17 @@ INNER JOIN countries_currencies cc ON n.country_id= cc.id INNER JOIN configWalle
}
}
- public function insertRegulationsLimits($id_country, $max_day , $max_week , $max_month){
- $sql = "INSERT INTO `regulations` (`id_country`, `montant_max_jour`, `montant_max_hebdo`, `montant_max_mensuel`) VALUES (?,?, ?, ?);";
- $query = $this->db->query($sql , array($id_country,$max_day,$max_week,$max_month));
+ public function insertRegulationsLimits($id_country, $max_day_national , $max_week_national , $max_month_national, $max_day_international , $max_week_international , $max_month_international){
+ $sql = "INSERT INTO `regulations` (`id_country`, `montant_max_jour_national`, `montant_max_hebdo_national`, `montant_max_mensuel_national`,
+ `montant_max_jour_international`, `montant_max_hebdo_international`, `montant_max_mensuel_international`) VALUES (?,?, ?, ?,?,?,?);";
+ $query = $this->db->query($sql , array($id_country,$max_day_national,$max_week_national,$max_month_national,$max_day_international,$max_week_international,$max_month_international));
return $query;
}
- public function updateRegulationsLimits($id_country, $max_day , $max_week , $max_month){
- $sql = "UPDATE `regulations` SET `montant_max_jour` = ? , `montant_max_hebdo` = ? , `montant_max_mensuel` = ? WHERE (`id_country` = ?);";
- $query = $this->db->query($sql , array($max_day,$max_week,$max_month,$id_country));
+ public function updateRegulationsLimits($id_country, $max_day_national , $max_week_national , $max_month_national, $max_day_international , $max_week_international , $max_month_international){
+ $sql = "UPDATE `regulations` SET `montant_max_jour_national` = ? , `montant_max_hebdo_national` = ? , `montant_max_mensuel_national` = ?,
+ `montant_max_jour_international` = ? , `montant_max_hebdo_international` = ? , `montant_max_mensuel_international` = ? WHERE (`id_country` = ?);";
+ $query = $this->db->query($sql , array($max_day_national,$max_week_national,$max_month_national,$max_day_international,$max_week_international,$max_month_international,$id_country));
return $query;
}
}
diff --git a/application/views/gestion_reglementations.php b/application/views/gestion_reglementations.php
index df8a4832..68d2845c 100755
--- a/application/views/gestion_reglementations.php
+++ b/application/views/gestion_reglementations.php
@@ -65,9 +65,12 @@ $context = new \Brick\Money\Context\AutoContext();
| N° |
lang->line('Pays'); ?> |
- lang->line('max_amount_per_day'); ?> |
- lang->line('max_amount_per_week'); ?> |
- lang->line('max_amount_per_month'); ?> |
+ lang->line('max_amount_per_day').' national'; ?> |
+ lang->line('max_amount_per_week').' national'; ?> |
+ lang->line('max_amount_per_month').' national'; ?> |
+ lang->line('max_amount_per_day').' international'; ?> |
+ lang->line('max_amount_per_week').' international'; ?> |
+ lang->line('max_amount_per_month').' international'; ?> |
Action |
@@ -82,10 +85,13 @@ $context = new \Brick\Money\Context\AutoContext();
?>
- id_country) echo Money::of(round($row->montant_max_jour, 2), $row->currency_code, $context)->formatTo('fr_FR') ?> |
- id_country) echo Money::of(round($row->montant_max_hebdo, 2), $row->currency_code, $context)->formatTo('fr_FR') ?> |
- id_country) echo Money::of(round($row->montant_max_mensuel, 2), $row->currency_code, $context)->formatTo('fr_FR'); ?> |
- id_country) echo Money::of(round($row->montant_max_jour_national, 2), $row->currency_code, $context)->formatTo('fr_FR') ?>
+ id_country) echo Money::of(round($row->montant_max_hebdo_national, 2), $row->currency_code, $context)->formatTo('fr_FR') ?> |
+ id_country) echo Money::of(round($row->montant_max_mensuel_national, 2), $row->currency_code, $context)->formatTo('fr_FR'); ?> |
+ id_country) echo Money::of(round($row->montant_max_jour_international, 2), $row->currency_code, $context)->formatTo('fr_FR') ?> |
+ id_country) echo Money::of(round($row->montant_max_hebdo_international, 2), $row->currency_code, $context)->formatTo('fr_FR') ?> |
+ id_country) echo Money::of(round($row->montant_max_mensuel_international, 2), $row->currency_code, $context)->formatTo('fr_FR'); ?> |
+
@@ -97,32 +103,55 @@ $context = new \Brick\Money\Context\AutoContext();
|