+ Fix bug
This commit is contained in:
parent
2993889e6d
commit
98545f1319
|
@ -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),
|
'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]);
|
'final_country' => $this->getCountryName($final_country), 'user_code' => $request->user_code]);
|
||||||
$this->sendMail($user->email, trans('messages.successful_transaction'), $message);
|
$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 {
|
} else {
|
||||||
return $this->errorResponse(trans('messages.incorrect_user_password'));
|
return $this->errorResponse(trans('messages.incorrect_user_password'));
|
||||||
}
|
}
|
||||||
|
@ -1294,7 +1294,7 @@ class iLinkTransactionController extends Controller
|
||||||
'prenom_emetteur' => 'required',
|
'prenom_emetteur' => 'required',
|
||||||
'type_document_emetteur' => 'required',
|
'type_document_emetteur' => 'required',
|
||||||
'id_document_emetteur' => 'required',
|
'id_document_emetteur' => 'required',
|
||||||
'email_emetteur' => 'required',
|
'email_emetteur' => 'required|email:rfc',
|
||||||
'nom_destinataire' => 'required',
|
'nom_destinataire' => 'required',
|
||||||
'prenom_destinataire' => 'required',
|
'prenom_destinataire' => 'required',
|
||||||
]);
|
]);
|
||||||
|
|
|
@ -217,16 +217,16 @@ class WalletIlinkTransaction extends Model
|
||||||
public function cash_cash_rules()
|
public function cash_cash_rules()
|
||||||
{
|
{
|
||||||
return [
|
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',
|
'network_destinataire' => 'required|integer|min:0|not_in:0',
|
||||||
'nom_emetteur'=>'required',
|
'nom_emetteur' => 'required',
|
||||||
'prenom_emetteur'=>'required',
|
'prenom_emetteur' => 'required',
|
||||||
'type_document_emetteur'=>'required',
|
'type_document_emetteur' => 'required',
|
||||||
'id_document_emetteur'=>'required',
|
'id_document_emetteur' => 'required',
|
||||||
'email_emetteur' => 'required',
|
'email_emetteur' => 'required|email:rfc',
|
||||||
'nom_destinataire'=>'required',
|
'nom_destinataire' => 'required',
|
||||||
'prenom_destinataire'=>'required',
|
'prenom_destinataire' => 'required',
|
||||||
'type_document_destinataire'=>'required',
|
'type_document_destinataire' => 'required',
|
||||||
// 'id_document_destinataire'=>'required'
|
// 'id_document_destinataire'=>'required'
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,6 @@ namespace App\Models;
|
||||||
|
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use phpDocumentor\Reflection\Types\Integer;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class WalletTransaction
|
* Class WalletTransaction
|
||||||
|
@ -16,6 +15,7 @@ use phpDocumentor\Reflection\Types\Integer;
|
||||||
* @property int $id
|
* @property int $id
|
||||||
* @property float $montant
|
* @property float $montant
|
||||||
* @property string $numCarte
|
* @property string $numCarte
|
||||||
|
* @property string $facade
|
||||||
* @property Carbon $expiration_date
|
* @property Carbon $expiration_date
|
||||||
* @property float $commission_banque
|
* @property float $commission_banque
|
||||||
* @property float $commission_ag
|
* @property float $commission_ag
|
||||||
|
@ -58,18 +58,19 @@ class WalletTransaction extends Model
|
||||||
];
|
];
|
||||||
|
|
||||||
protected $fillable = [
|
protected $fillable = [
|
||||||
'montant',
|
'montant',
|
||||||
'numCarte',
|
'numCarte',
|
||||||
|
'facade',
|
||||||
'expiration_date',
|
'expiration_date',
|
||||||
'commission_banque',
|
'commission_banque',
|
||||||
'commission_ag',
|
'commission_ag',
|
||||||
'commission_sup',
|
'commission_sup',
|
||||||
'commission_hyp',
|
'commission_hyp',
|
||||||
'type',
|
'type',
|
||||||
'date',
|
'date',
|
||||||
'statut',
|
'statut',
|
||||||
'result',
|
'result',
|
||||||
'id_wallet',
|
'id_wallet',
|
||||||
'id_wallet_sup',
|
'id_wallet_sup',
|
||||||
'id_wallet_hyp',
|
'id_wallet_hyp',
|
||||||
'canceled'
|
'canceled'
|
||||||
|
@ -106,12 +107,12 @@ class WalletTransaction extends Model
|
||||||
// front -> Face avant : Numero de carte , cvv , etc...
|
// front -> Face avant : Numero de carte , cvv , etc...
|
||||||
// back -> Face arriere : Numero de serie
|
// back -> Face arriere : Numero de serie
|
||||||
return [
|
return [
|
||||||
'facade'=>'required|in:front,back',
|
'facade' => 'required_if:type,credit|in:front,back',
|
||||||
'montant'=> 'required|numeric|min:0|not_in:0',
|
'montant' => 'required|numeric|min:0|not_in:0',
|
||||||
'numCarte'=>'required',
|
'numCarte' => 'required',
|
||||||
'cvv'=>'required_if:facade,front|size:3',
|
'cvv' => 'required_if:facade,front|size:3',
|
||||||
'expiration_date'=>'required_if:facade,front|date_format:m/y|after_or_equal:today',
|
'expiration_date' => 'required_if:facade,front|date_format:m/y|after_or_equal:today',
|
||||||
'type' =>'required|in:credit,debit',
|
'type' => 'required|in:credit,debit',
|
||||||
'id_wallet' => 'required|integer|min:0|not_in:0'
|
'id_wallet' => 'required|integer|min:0|not_in:0'
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -80,6 +80,9 @@ Transaction information :
|
||||||
'sent_by_mail' => '
|
'sent_by_mail' => '
|
||||||
|
|
||||||
This message was sent to the sender\'s email',
|
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.
|
'successful_user_send_to_cart' => 'Sending money to a visa card made.
|
||||||
Transaction information :
|
Transaction information :
|
||||||
- ID : :id_transaction
|
- ID : :id_transaction
|
||||||
|
|
|
@ -80,6 +80,9 @@ Informations de la transaction :
|
||||||
'sent_by_mail' => '
|
'sent_by_mail' => '
|
||||||
|
|
||||||
Ce message a été envoyé dans le mail de l\'émetteur',
|
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
|
'successful_user_send_to_cart' => 'Envoi d\'argent de votre compte vers votre carte visa
|
||||||
Informations de la transaction :
|
Informations de la transaction :
|
||||||
- Numéro : :id_transaction
|
- Numéro : :id_transaction
|
||||||
|
|
Loading…
Reference in New Issue