From a299394c77f515045d0d1df02e2730a4305b4178 Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Wed, 29 Jul 2020 18:50:46 +0100 Subject: [PATCH] + Optimize transactions ilink interface --- application/controllers/Hyperviseur_dash.php | 8 +- application/language/english/message_lang.php | 1 + application/language/french/message_lang.php | 1 + .../views/historique_transactions_ilink.php | 85 +++++++++++-------- 4 files changed, 58 insertions(+), 37 deletions(-) diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php index cbc9c0f4..10eb1001 100755 --- a/application/controllers/Hyperviseur_dash.php +++ b/application/controllers/Hyperviseur_dash.php @@ -451,9 +451,13 @@ class Hyperviseur_dash extends CI_Controller $endDate = Date('Y-m-d', strtotime($endDate . "+1 day")); if ($type == 'transaction') $data['transactions'] = $this->user_model->getTransactions($startDate, $endDate, $network_id); - else if ($type == 'transaction_ilink') + else if ($type == 'transaction_ilink') { + $networkDetails = $this->user_model->getNetworkDetails($network_id); + $data['currency_name_fr'] = $networkDetails->first_row()->currency_name_fr; + $data['currency_name_en'] = $networkDetails->first_row()->currency_name_en; $data['transactions'] = $this->user_model->getIlinkTransactions($startDate, $endDate, $network_id); - else if ($type == 'commission_transfer') + + } else if ($type == 'commission_transfer') $data['transactions'] = $this->user_model->getCommissionTransfers($startDate, $endDate, $this->session->userdata('member_code')); else if ($type == 'balance_statement') $data['wallets'] = $this->user_model->getInfosWalletAgentForHyper($this->session->userdata('network_id')); diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php index 538ef25e..063bf3c1 100755 --- a/application/language/english/message_lang.php +++ b/application/language/english/message_lang.php @@ -439,4 +439,5 @@ $lang ['refund_history'] = 'History of refunds'; $lang ['remaining_amount'] = 'Remaining amount'; $lang ['amount_greater_than_balance'] = 'Amount greater than the compensation balance'; $lang['no_refund'] = 'No refund'; +$lang['final_currency'] = 'Currency of the country of arrival'; ?> diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php index 2a8238a2..5c8507d9 100755 --- a/application/language/french/message_lang.php +++ b/application/language/french/message_lang.php @@ -451,5 +451,6 @@ $lang['refund_history'] = 'Historique des remboursements'; $lang['remaining_amount'] = 'Montant restant'; $lang['amount_greater_than_balance'] = 'Montant supérieur au solde de compensation'; $lang['no_refund'] = 'Aucun remboursement'; +$lang['final_currency'] = 'Monnaie du pays d\'arrivée'; ?> diff --git a/application/views/historique_transactions_ilink.php b/application/views/historique_transactions_ilink.php index a39bbc4e..8c263533 100755 --- a/application/views/historique_transactions_ilink.php +++ b/application/views/historique_transactions_ilink.php @@ -92,12 +92,25 @@ use Brick\Money\Money; lang->line('Période') ?> + style="background: #fff; cursor: pointer; padding: 1px 1px; border: 1px solid #ccc; width: 100%" + data-category="" + type="text" name="daterange" + data-lang="session->userdata('site_lang') ?>" + value=""/> - Format : session->userdata('site_lang') === 'french' ? 'Jour - Mois - Année ' : 'Year - Month - Day'?> + Format : session->userdata('site_lang') === 'french' ? 'Jour - Mois - Année ' : 'Year - Month - Day' ?> + + + + +
+
+
+

+ session->userdata('currency_code') . ' - ' . $currency_name_fr; ?> +

+

lang->line('currency') ?>

@@ -116,27 +129,28 @@ use Brick\Money\Money; $num = 0; if ($numrows > 0) { $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL ); - ?> + ?> - - - - - - - - - - - - - - - - - - - +
IDOperationlang->line('cart_number') ?>lang->line('customer_net_amount_init') ?>lang->line('customer_net_amount_final') ?>lang->line('departure_country') ?>lang->line('country_of_destination') ?>lang->line('fees') ?>lang->line('tax') ?>lang->line('Commission de la banque') ?>lang->line('Commission de l\'hyperviseur') ?>lang->line('commission_paying_network') ?>lang->line('Commission du superviseur') ?>lang->line('Commission de l\'agent') ?>lang->line('agent_name') ?>lang->line('issuer_id') ?>
+ + + + + + + + + + + + + + + + + + + session->userdata('category') != 'super') { ?> @@ -174,17 +188,18 @@ use Brick\Money\Money; $moneyNetFinal =Money::of(round($row->montant_net_final_country,2),$row->final_currency ? $row->final_currency : 'XAF',$context); echo " - - - - + + + + + + - @@ -259,13 +274,13 @@ use Brick\Money\Money;
IDOperationlang->line('cart_number') ?>lang->line('customer_net_amount_init') ?>lang->line('customer_net_amount_final') ?>lang->line('commission_paying_network') ?>lang->line('final_currency') ?>lang->line('departure_country') ?>lang->line('country_of_destination') ?>lang->line('fees') ?>lang->line('tax') ?>lang->line('Commission de la banque') ?>lang->line('Commission de l\'hyperviseur') ?>lang->line('Commission du superviseur') ?>lang->line('Commission de l\'agent') ?>lang->line('agent_name') ?>lang->line('issuer_id') ?> lang->line('recipient_id')?> Date
$row->id_transaction".strtoupper($row->acteur).' - '.$row->operation."".join(" ", str_split($row->numero_carte, 4))."".$moneyNetInit->formatTo('fr_FR')."".$moneyNetFinal->formatTo('fr_FR')."" . strtoupper($row->acteur) . ' - ' . $row->operation . "" . join(" ", str_split($row->numero_carte, 4)) . "" . $moneyNetInit->formatTo('fr_FR') . "" . $moneyNetFinal->formatTo('fr_FR') . "" . Money::of(round($row->part_reseau_payeur_final_country ? $row->part_reseau_payeur_final_country : 0, 2), $row->final_currency ? $row->final_currency : 'XAF', $context)->formatTo('fr_FR') . "" . $row->final_currency . " ".$row->pays_init." ".$row->pays_final." ".Money::of(round($row->frais,2), $row->init_currency,$context)->formatTo('fr_FR')." ".Money::of(round($row->taxe, 2),$row->init_currency,$context)->formatTo('fr_FR')." ".Money::of(round($row->commission_banque ? $row->commission_banque : 0, 2),$row->init_currency,$context)->formatTo('fr_FR')." ".Money::of(round($row->commission_hyp ? $row->commission_hyp : 0, 2),$row->init_currency,$context)->formatTo('fr_FR')."".Money::of(round($row->part_reseau_payeur_final_country ? $row->part_reseau_payeur_final_country : 0, 2),$row->final_currency ? $row->final_currency : 'XAF',$context)->formatTo('fr_FR')." ".Money::of(round($row->commission_sup ? $row->commission_sup : 0 , 2),$row->init_currency,$context)->formatTo('fr_FR')." ".Money::of(round($row->commission_ag ? $row->commission_ag : 0, 2),$row->init_currency,$context)->formatTo('fr_FR')." ".$row->agent."