From 126239ff8f71a7aee62f32508f83fc914accc57a Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Fri, 26 Jun 2020 17:55:56 +0100 Subject: [PATCH] =?UTF-8?q?+=20Add=20User=20-=20Envoi=20de=20wallet=20?= =?UTF-8?q?=C3=A0=20carte?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iLinkTransactionController.php | 5 +- app/Traits/Helper.php | 2 +- resources/lang/en/messages.php | 47 ++++++++++++------- resources/lang/fr/messages.php | 23 ++++++--- 4 files changed, 50 insertions(+), 27 deletions(-) diff --git a/app/Http/Controllers/iLinkTransactionController.php b/app/Http/Controllers/iLinkTransactionController.php index c3aadd7..50a0b17 100755 --- a/app/Http/Controllers/iLinkTransactionController.php +++ b/app/Http/Controllers/iLinkTransactionController.php @@ -233,7 +233,10 @@ class iLinkTransactionController extends Controller ['id_transaction' => $transaction->id_transaction, 'amount' => $this->toMoney($transaction->montant, $init_country), 'net' => $this->toMoney($montantDepot, $init_country), 'fees' => $this->toMoney($frais, $init_country), 'sender_code' => $user->user_code, 'cart_number' => wordwrap($request->numero_carte, 4, ' ', true)])); - return $this->successResponse(trans('messages.successful_transaction')); + return $this->successResponse(trans('messages.successful_user_send_to_cart_2', + ['amount' => $this->toMoney($transaction->montant, $init_country), + 'net' => $this->toMoney($montantDepot, $init_country), 'fees' => $this->toMoney($frais, $init_country), + 'sender_code' => $user->user_code, 'cart_number' => wordwrap($request->numero_carte, 4, ' ', true)])); } else { return $this->errorResponse(trans('errors.visa_api_failed'), Response::HTTP_INTERNAL_SERVER_ERROR); diff --git a/app/Traits/Helper.php b/app/Traits/Helper.php index 00431cb..57fb8ac 100644 --- a/app/Traits/Helper.php +++ b/app/Traits/Helper.php @@ -91,7 +91,7 @@ trait Helper $converter = new CurrencyConverter($provider); $init_country = Country::findOrFail($init_country); $final_country = Country::findOrFail($final_country); - $init_money = Money::of(round(str_replace(',' , '',number_format($amount,2)), 2),$init_country->currency->code,new AutoContext()); + $init_money = Money::of(round($amount, 2),$init_country->currency->code,new AutoContext()); return $converter->convert($init_money, $final_country->currency->code, RoundingMode::DOWN); } diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php index 4313e4a..f9adcac 100755 --- a/resources/lang/en/messages.php +++ b/resources/lang/en/messages.php @@ -46,32 +46,43 @@ Transaction information: - Tax : :tax - Withdrawal code : :code', 'successful_user_send_to_wallet' => 'Money sent to a wallet. -Transaction information: +Transaction information : - Transaction ID : :id_transaction - Amount of the transaction : :amount - - Country of departure: :init_country + - Fees + Taxes : :fees + - Country of departure : :init_country - Net amount of the country of departure : :net_init - - Country of destination: :final_country + - Country of destination : :final_country - Net amount of the destination country : :net_final - - Fees + Tax : :fees - - Number of the sending wallet: :sender_code - - Number of the recipient wallet: :receiver_code', + - Issuer account : :sender_code + - Recipient account : :receiver_code', 'successful_user_send_to_wallet_2' => 'Money sent to a wallet. -Transaction information: +Transaction information : - Amount of the transaction : :amount - - Country of departure: :init_country + - Fees + Taxes : :fees + - Country of departure: :init_country - Net amount of the country of departure : :net_init - - Country of destination: :final_country + - Country of destination : :final_country - Net amount of the destination country : :net_final - - Fees + Tax : :fees - - Number of the sending wallet: :sender_code - - Number of the recipient wallet: :receiver_code', + - Issuer account : :sender_code + - Recipient account : :receiver_code + +This message was sent to the sender\'s email', 'successful_user_send_to_cart' => 'Sending money to a visa card made. -Transaction information: - - Transaction ID: :id_transaction - - Amount of the transaction: :amount - - Net shipping amount: :net - - Fees: :fees - - Number of the sending wallet: :sender_code +Transaction information : + - Transaction ID : :id_transaction + - Amount of the transaction : :amount + - Fees : :fees + - Net shipping amount : :net + - Issuer account :sender_code - Recipient\'s card number: :cart_number', + 'successful_user_send_to_cart_2' => 'Sending money to a visa card made. +Transaction information : + - Amount of the transaction : :amount + - Fees : :fees + - Net shipping amount : :net + - Issuer account :sender_code + - Recipient\'s card number: :cart_number + +This message was sent to the sender\'s email', ]; diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php index c6eaf42..59eb045 100755 --- a/resources/lang/fr/messages.php +++ b/resources/lang/fr/messages.php @@ -49,29 +49,38 @@ Informations de la transaction : Informations de la transaction : - Transaction ID : :id_transaction - Montant de la transaction : :amount + - Frais et Taxes : :fees - Pays de départ : :init_country - Montant net du pays de départ : :net_init - Pays de destination : :final_country - Montant net du pays de destination : :net_final - - Frais et Taxe : :fees - - Numero du wallet émetteur : :sender_code - - Numero du wallet destinataire : :receiver_code', + - Compte émetteur : :sender_code + - Compte destinataire : :receiver_code', 'successful_user_send_to_wallet_2' => 'Envoi d\'argent vers un wallet effectué. Informations de la transaction : - Montant de la transaction : :amount + - Frais et Taxes : :fees - Pays de départ : :init_country - Montant net du pays de départ : :net_init - Pays de destination : :final_country - Montant net du pays de destination : :net_final - - Frais et Taxe : :fees - - Numero du wallet émetteur : :sender_code - - Numero du wallet destinataire : :receiver_code', + - Compte émetteur : :sender_code + - Compte destinataire : :receiver_code + +Ce message a été envoyé dans le mail de l\'émetteur', 'successful_user_send_to_cart' => 'Envoi d\'argent vers une carte visa effectué. Informations de la transaction : - Transaction ID : :id_transaction - Montant de la transaction : :amount - - Montant net d\'envoi: :net - Frais : :fees + - Montant net d\'envoi: :net + - Compte émetteur : :sender_code + - Numero de la carte du destinataire : :cart_number', + 'successful_user_send_to_cart_2' => 'Envoi d\'argent vers une carte visa effectué. +Informations de la transaction : + - Montant de la transaction : :amount + - Frais : :fees + - Montant net d\'envoi: :net - Numero du wallet émetteur : :sender_code - Numero de la carte du destinataire : :cart_number', ];