From fa58820befcb815955c76efcdf3fd0c9fa797b89 Mon Sep 17 00:00:00 2001 From: DJERY-TOM Date: Mon, 4 May 2020 14:59:07 +0100 Subject: [PATCH] + Fix bug --- application/views/gestion_wallet.php | 36 +++++++++++++++------------ application/views/gestion_wallets.php | 22 ++++++++-------- application/views/wallet_password.php | 7 +++--- 3 files changed, 36 insertions(+), 29 deletions(-) diff --git a/application/views/gestion_wallet.php b/application/views/gestion_wallet.php index c7ef2029..99a6386c 100644 --- a/application/views/gestion_wallet.php +++ b/application/views/gestion_wallet.php @@ -465,7 +465,7 @@ if ($transactions != false) {
- +
$(function () { $('#example1').DataTable(); - anElement = new AutoNumeric('#montant', '', {aSep: ' ', decimalPlaces:'0', vMax: '99999999999999999999999999'}); + anElement = new AutoNumeric('#montant', '', {digitGroupSeparator: ' ', decimalPlaces:'0', maximumValue: '99999999999999999999999999'}); // $('#example1').DataTable({ // "aLengthMenu": [[5, 10, 15, -1], [5, 10, 5, "All"]], // "iDisplayLength": 5 @@ -607,13 +607,13 @@ if ($transactions != false) { var sommeDepot = taux_ag_d + taux_sup_d + taux_bq_d; if((taux_ag_r + taux_sup_r) > 100){ - toastr.error('lang->line('first_rule')?>', 'lang->line('management_rule')?>'); + toastr.error("lang->line('first_rule')?>", "lang->line('management_rule')?>"); }else if((taux_ag_d + taux_sup_d) > 100){ - toastr.error('lang->line('second_rule')?>', 'lang->line('management_rule')?>'); + toastr.error("lang->line('second_rule')?>", "lang->line('management_rule')?>"); }else if(sommeRetrait >= taux_client_r){ - toastr.error('lang->line('third_rule')?>', 'lang->line('management_rule')?>') + toastr.error("lang->line('third_rule')?>", "lang->line('management_rule')?>") }else if(sommeDepot >= 100){ - toastr.error('lang->line('fourth_rule')?>', 'lang->line('management_rule')?>'); + toastr.error("lang->line('fourth_rule')?>", "lang->line('management_rule')?>"); }else{ $.ajax({ url: '', @@ -635,20 +635,21 @@ if ($transactions != false) { if(data=='200'){ Swal.fire({ icon: 'success', - title: 'lang->line('wallet_update')?>', - text:'lang->line('informations_updated')?>', + title: "lang->line('wallet_update')?>", + text:"lang->line('informations_updated')?>", timer: 3000 }).then(()=>{ location.reload(); }); // alert("Les informations ont été mises à jour.") ? "" : }else{ - toastr.error("lang->line('error_message')?>" , 'lang->line('request_error')?>'); + toastr.error("lang->line('error_message')?>" , "lang->line('request_error')?>"); } }, error: function (resultat, statut, error) { console.log(resultat + " " + error); + toastr.error("lang->line('error_message')?>" , "lang->line('request_error')?>"); } }); } @@ -678,20 +679,22 @@ if ($transactions != false) { if(data=='200'){ Swal.fire({ icon: 'success', - title: 'lang->line('password_has_been_reset')?>', - text:'lang->line('informations_updated')?>', + title: "lang->line('password_has_been_reset')?>", + text:"lang->line('informations_updated')?>", timer: 3000 }).then(()=>{ location.reload(); }); // alert("Les informations ont été mises à jour.") ? "" : }else{ - toastr.error("lang->line('error_message')?>" , 'lang->line('request_error')?>'); + toastr.error("lang->line('error_message')?>" , "lang->line('request_error')?>"); } }, error: function (resultat, statut, error) { console.log(resultat + " " + error); + toastr.error("lang->line('error_message')?>" , "lang->line('request_error')?>"); + } }); }); @@ -721,22 +724,23 @@ if ($transactions != false) { if(data=='200'){ Swal.fire({ icon: 'success', - title: 'lang->line('account_recharged')?>', - text:'lang->line('informations_updated')?>', + title: "lang->line('account_recharged')?>", + text: "lang->line('informations_updated')?>", timer: 3000 }).then(()=>{ location.reload(); }); // alert("Les informations ont été mises à jour.") ? "" : }else if(data == '400'){ - toastr.error('lang->line('incorrect_password')?>' , 'lang->line('request_error')?>'); + toastr.error("lang->line('error_message')?>" , "lang->line('request_error')?>"); }else{ - toastr.error("lang->line('error_message')?>" , 'lang->line('request_error')?>'); + toastr.error("lang->line('error_message')?>" , "lang->line('request_error')?>"); } }, error: function (resultat, statut, error) { console.log(resultat + " " + error); + toastr.error("lang->line('error_message')?>" , "lang->line('request_error')?>"); } }); diff --git a/application/views/gestion_wallets.php b/application/views/gestion_wallets.php index 4b621d93..0dfcd6ad 100755 --- a/application/views/gestion_wallets.php +++ b/application/views/gestion_wallets.php @@ -245,13 +245,13 @@ var sommeDepot = taux_ag_d + taux_sup_d + taux_bq_d ; if((taux_ag_r + taux_sup_r) > 100){ - toastr.error('lang->line('first_rule')?>', 'lang->line('management_rule')?>'); + toastr.error("lang->line('first_rule')?>", "lang->line('management_rule')?>"); }else if((taux_ag_d + taux_sup_d) > 100){ - toastr.error('lang->line('second_rule')?>', 'lang->line('management_rule')?>'); + toastr.error("lang->line('second_rule')?>", "lang->line('management_rule')?>"); }else if(sommeRetrait >= taux_client_r){ - toastr.error('lang->line('third_rule')?>', 'lang->line('management_rule')?>') + toastr.error("lang->line('third_rule')?>", "lang->line('management_rule')?>") }else if(sommeDepot >= 100){ - toastr.error('lang->line('fourth_rule')?>', 'lang->line('management_rule')?>'); + toastr.error("lang->line('fourth_rule')?>", "lang->line('management_rule')?>"); }else{ $.ajax({ url : '', @@ -264,19 +264,20 @@ Swal.fire({ icon: 'success', - title: 'lang->line('wallet_created')?>', - text:'lang->line('informations_updated')?>', + title: "lang->line('wallet_created')?>", + text: "lang->line('informations_updated')?>", timer: 3000 }).then(()=>{ location.reload(); }); // alert("Les informations ont été mises à jour.") ? "" : }else{ - toastr.error("lang->line('error_message')?>" , 'lang->line('request_error')?>'); + toastr.error("lang->line('error_message')?>" , "lang->line('request_error')?>"); } }, error : function(resultat, statut, error){ console.log(resultat+" "+error ); + toastr.error("lang->line('error_message')?>" , "lang->line('request_error')?>"); } }).done(function () { $.ajax({ @@ -311,20 +312,21 @@ Swal.fire({ icon: 'success', - title: 'lang->line('wallet_deleted')?>', - text:'lang->line('informations_updated')?>', + title: "lang->line('wallet_deleted')?>", + text: "lang->line('informations_updated')?>", timer: 3000 }).then(()=>{ location.reload(); }); // alert("Les informations ont été mises à jour.") ? "" : location.reload(); }else{ - toastr.error("lang->line('error_message')?>" , 'lang->line('request_error')?>'); + toastr.error("lang->line('error_message')?>" , "lang->line('request_error')?>"); } }, error : function(resultat, statut, erreur){ console.log(resultat+" "+erreur); + toastr.error("lang->line('error_message')?>" , "lang->line('request_error')?>"); } }); diff --git a/application/views/wallet_password.php b/application/views/wallet_password.php index d982915a..fb95ae83 100755 --- a/application/views/wallet_password.php +++ b/application/views/wallet_password.php @@ -193,19 +193,20 @@ if(data=='200'){ Swal.fire({ icon: 'success', - title: 'lang->line('password_generated')?>', - text:'lang->line('informations_updated')?>', + title: "lang->line('password_generated')?>", + text:"lang->line('informations_updated')?>", timer: 3000 }).then(()=>{ location.reload(); }); }else{ - toastr.error("lang->line('error_message')?>" , 'lang->line('request_error')?>'); + toastr.error("lang->line('error_message')?>" , "lang->line('request_error')?>"); } }, error : function(resultat, statut, error){ console.log(resultat+" "+error ); + toastr.error("lang->line('error_message')?>" , "lang->line('request_error')?>"); } });