From 98545f1319d192347ebdabf5b0e886feabef8e67 Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Thu, 3 Dec 2020 20:01:09 +0100 Subject: [PATCH] + Fix bug --- .../iLinkTransactionController.php | 4 +-- app/Models/WalletIlinkTransaction.php | 18 ++++++------ app/Models/WalletTransaction.php | 29 ++++++++++--------- resources/lang/en/messages.php | 3 ++ resources/lang/fr/messages.php | 3 ++ 5 files changed, 32 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/iLinkTransactionController.php b/app/Http/Controllers/iLinkTransactionController.php index 5941444..e383e35 100755 --- a/app/Http/Controllers/iLinkTransactionController.php +++ b/app/Http/Controllers/iLinkTransactionController.php @@ -968,7 +968,7 @@ class iLinkTransactionController extends Controller 'net_final' => $this->toMoneyWithCurrency($montantDepot, $init_country, $final_country), 'fees' => $this->toMoney($frais + $taxe, $init_country), 'init_country' => $this->getCountryName($init_country), 'final_country' => $this->getCountryName($final_country), 'user_code' => $request->user_code]); $this->sendMail($user->email, trans('messages.successful_transaction'), $message); - return $this->successResponse($message . trans('messages.sent_by_mail')); + return $this->successResponse($message . trans('messages.sent_by_mail_to_recipient')); } else { return $this->errorResponse(trans('messages.incorrect_user_password')); } @@ -1294,7 +1294,7 @@ class iLinkTransactionController extends Controller 'prenom_emetteur' => 'required', 'type_document_emetteur' => 'required', 'id_document_emetteur' => 'required', - 'email_emetteur' => 'required', + 'email_emetteur' => 'required|email:rfc', 'nom_destinataire' => 'required', 'prenom_destinataire' => 'required', ]); diff --git a/app/Models/WalletIlinkTransaction.php b/app/Models/WalletIlinkTransaction.php index 7c3769e..4af1bb3 100644 --- a/app/Models/WalletIlinkTransaction.php +++ b/app/Models/WalletIlinkTransaction.php @@ -217,16 +217,16 @@ class WalletIlinkTransaction extends Model public function cash_cash_rules() { return [ - 'final_country' =>'required|integer|min:0|not_in:0', + 'final_country' => 'required|integer|min:0|not_in:0', 'network_destinataire' => 'required|integer|min:0|not_in:0', - 'nom_emetteur'=>'required', - 'prenom_emetteur'=>'required', - 'type_document_emetteur'=>'required', - 'id_document_emetteur'=>'required', - 'email_emetteur' => 'required', - 'nom_destinataire'=>'required', - 'prenom_destinataire'=>'required', - 'type_document_destinataire'=>'required', + 'nom_emetteur' => 'required', + 'prenom_emetteur' => 'required', + 'type_document_emetteur' => 'required', + 'id_document_emetteur' => 'required', + 'email_emetteur' => 'required|email:rfc', + 'nom_destinataire' => 'required', + 'prenom_destinataire' => 'required', + 'type_document_destinataire' => 'required', // 'id_document_destinataire'=>'required' ]; } diff --git a/app/Models/WalletTransaction.php b/app/Models/WalletTransaction.php index 7393499..007ef9e 100755 --- a/app/Models/WalletTransaction.php +++ b/app/Models/WalletTransaction.php @@ -8,7 +8,6 @@ namespace App\Models; use Carbon\Carbon; use Illuminate\Database\Eloquent\Model; -use phpDocumentor\Reflection\Types\Integer; /** * Class WalletTransaction @@ -16,6 +15,7 @@ use phpDocumentor\Reflection\Types\Integer; * @property int $id * @property float $montant * @property string $numCarte + * @property string $facade * @property Carbon $expiration_date * @property float $commission_banque * @property float $commission_ag @@ -58,18 +58,19 @@ class WalletTransaction extends Model ]; protected $fillable = [ - 'montant', - 'numCarte', + 'montant', + 'numCarte', + 'facade', 'expiration_date', 'commission_banque', 'commission_ag', 'commission_sup', 'commission_hyp', - 'type', - 'date', - 'statut', - 'result', - 'id_wallet', + 'type', + 'date', + 'statut', + 'result', + 'id_wallet', 'id_wallet_sup', 'id_wallet_hyp', 'canceled' @@ -106,12 +107,12 @@ class WalletTransaction extends Model // front -> Face avant : Numero de carte , cvv , etc... // back -> Face arriere : Numero de serie return [ - 'facade'=>'required|in:front,back', - 'montant'=> 'required|numeric|min:0|not_in:0', - 'numCarte'=>'required', - 'cvv'=>'required_if:facade,front|size:3', - 'expiration_date'=>'required_if:facade,front|date_format:m/y|after_or_equal:today', - 'type' =>'required|in:credit,debit', + 'facade' => 'required_if:type,credit|in:front,back', + 'montant' => 'required|numeric|min:0|not_in:0', + 'numCarte' => 'required', + 'cvv' => 'required_if:facade,front|size:3', + 'expiration_date' => 'required_if:facade,front|date_format:m/y|after_or_equal:today', + 'type' => 'required|in:credit,debit', 'id_wallet' => 'required|integer|min:0|not_in:0' ]; } diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php index 42ab8e4..fe4b946 100755 --- a/resources/lang/en/messages.php +++ b/resources/lang/en/messages.php @@ -80,6 +80,9 @@ Transaction information : 'sent_by_mail' => ' This message was sent to the sender\'s email', + 'sent_by_mail_to_recipient' => " + +This message was sent to the recipient's email", 'successful_user_send_to_cart' => 'Sending money to a visa card made. Transaction information : - ID : :id_transaction diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php index 5f68a29..4d08ff0 100755 --- a/resources/lang/fr/messages.php +++ b/resources/lang/fr/messages.php @@ -80,6 +80,9 @@ Informations de la transaction : 'sent_by_mail' => ' Ce message a été envoyé dans le mail de l\'émetteur', + 'sent_by_mail_to_recipient' => " + +Ce message a été envoyé dans le mail du destinataire", 'successful_user_send_to_cart' => 'Envoi d\'argent de votre compte vers votre carte visa Informations de la transaction : - Numéro : :id_transaction