adminnistrateur
/
walletservice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

+ Fix fetchIdentification bug

This commit is contained in:
Djery-Tom 2020-06-19 20:31:32 +01:00
parent c6ae0cb47a
commit f2e8318347
5 changed files with 159 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/Http/Controllers/UserController.php
View File

@ -82,26 +82,36 @@ class UserController extends Controller
public function fetchIdentification($user_phone) public function fetchIdentification($user_phone)
{ {
// return Identification::where('id_user', $id_user)->firstOrFail(); // return Identification::where('id_user', $id_user)->firstOrFail();
$user = User::where('phone', $user_phone)->firstOrFail(); $user = User::where('phone', $user_phone)->first();
$identification = Identification::where('id_user', $user->id)->first(); if($user){
$data['isIdentified'] = false; $identification = Identification::where('id_user', $user->id)->first();
$data['isIdentifiedValidated'] = false; $data['isIdentified'] = false;
$data['data'] = $identification; $data['isIdentifiedValidated'] = false;
if($identification){ $data['data'] = $identification;
$data['isIdentified'] = true; if($identification){
$data['isIdentifiedValidated'] = $identification->status == 1 ; $data['isIdentified'] = true;
$data['isIdentifiedValidated'] = $identification->status == 1 ;
}
return $this->successResponse($data);
}else{
return $this->errorResponse(trans('errors.user_phone_not_exist'),Response::HTTP_NOT_FOUND);
} }
return $this->successResponse($data);
} }
public function verifyIdentification($user_phone) public function verifyIdentification($user_phone)
{ {
$user = User::where('phone', $user_phone)->firstOrFail(); $user = User::where('phone', $user_phone)->first();
$identification = Identification::where('id_user', $user->id)->first(); if($user){
if($identification){ $identification = Identification::where('id_user', $user->id)->first();
return $this->errorResponse(trans('messages.user_identificated')); if($identification){
}else return $this->errorResponse(trans('messages.user_identificated'));
return $this->successResponse($user); }else
return $this->successResponse($user);
}else{
return $this->errorResponse(trans('errors.user_phone_not_exist'),Response::HTTP_NOT_FOUND);
}
} }
private function generateRandomString($length = 10) private function generateRandomString($length = 10)

207
app/Http/Controllers/iLinkTransactionController.php
View File

@ -43,6 +43,7 @@ class iLinkTransactionController extends Controller
'type' => 'required|integer|min:0|not_in:0', 'type' => 'required|integer|min:0|not_in:0',
'id_wallet_agent' => 'integer|min:0|not_in:0', 'id_wallet_agent' => 'integer|min:0|not_in:0',
'id_wallet_user' => 'integer|min:0|not_in:0', 'id_wallet_user' => 'integer|min:0|not_in:0',
'password'=>'required'
]); ]);
$type = TypeIlinkTransaction::findOrFail($request->type); $type = TypeIlinkTransaction::findOrFail($request->type);
@ -133,13 +134,15 @@ class iLinkTransactionController extends Controller
break; break;
case 14: // Agent - Envoi de cash vers wallet iLink case 14: // Agent - Envoi de cash vers wallet iLink
$this->validate($request, $transaction->first_rules()); $this->validate($request, $transaction->first_rules());
$user = User::where('user_code', $request->user_code)->firstOrFail(); $agent = AgentPlus::findOrFail($network_agent->agent_id);
if($this->checkPassword($request->password,$user->encrypted_password,$user->salt)){ if($this->checkPassword($request->password,$agent->encrypted_password,$agent->salt)){
$user = User::where('user_code', $request->user_code)->firstOrFail();
$walletUser = WalletsUser::where('idUser', $user->id)->firstOrFail(); $walletUser = WalletsUser::where('idUser', $user->id)->firstOrFail();
$frais = ($request->init_country != $request->final_country) ? $this->calculateFees($plr_agent_depot_wallet_ilink, $request->montant) : $this->calculateFees($plr_agent_depot_wallet_ilink_national, $request->montant); $frais = ($request->init_country != $request->final_country) ? $this->calculateFees($plr_agent_depot_wallet_ilink, $request->montant) : $this->calculateFees($plr_agent_depot_wallet_ilink_national, $request->montant);
$taxe = ($request->init_country != $request->final_country) ? $this->calculateTax($taxesInternationales, $frais) : $this->calculateTax($taxesNationales, $frais); $taxe = ($request->init_country != $request->final_country) ? $this->calculateTax($taxesInternationales, $frais) : $this->calculateTax($taxesNationales, $frais);
$montantDepot = $request->montant - $frais - $taxe; $montantDepot = $request->montant - $frais - $taxe;
$transaction->montant_depot = $montantDepot;
$walletUser->balance += $montantDepot; $walletUser->balance += $montantDepot;
$commisionAgent = floatval($frais * $config->taux_com_ag_envoi_cash / 100); $commisionAgent = floatval($frais * $config->taux_com_ag_envoi_cash / 100);
$commisionSuper = floatval($frais * $config->taux_com_sup_envoi_cash / 100); $commisionSuper = floatval($frais * $config->taux_com_sup_envoi_cash / 100);
@ -170,100 +173,142 @@ class iLinkTransactionController extends Controller
} }
break; break;
case 15: // Agent - Envoi de cash vers autre wallet case 15: // Agent - Envoi de cash vers autre wallet
// $this->validate($request, $transaction->first_rules());
break; $agent = AgentPlus::findOrFail($network_agent->agent_id);
case 16: // Agent - Envoi de cash vers une carte visa if($this->checkPassword($request->password,$agent->encrypted_password,$agent->salt)){
$this->validate($request, $transaction->card_rules()); $frais = ($request->init_country != $request->final_country) ? $this->calculateFees($plr_agent_depot_autre_wallet, $request->montant) : $this->calculateFees($plr_agent_depot_autre_wallet_national, $request->montant);
$expiration_date = \DateTime::createFromFormat('m/y', $request->expiration_date); $taxe = ($request->init_country != $request->final_country) ? $this->calculateTax($taxesInternationales, $frais) : $this->calculateTax($taxesNationales, $frais);
if (!$expiration_date) $montantDepot = $request->montant - $frais - $taxe;
$expiration_date = new \DateTime(); $transaction->montant_depot = $montantDepot;
$transaction->expiration_date = $expiration_date; //Emettre une trame securise pour crediter le wallet utilisateur
// $walletUser->balance += $montantDepot;
$frais = $request->montant * $config->taux_com_wallet_ag_envoi_cash_carte / 100; // $transaction->id_destinataire = r
$montantDepot = $transaction->montant - $frais; $commisionAgent = floatval($frais * $config->taux_com_ag_envoi_cash / 100);
$commisionSuper = floatval($frais * $config->taux_com_sup_envoi_cash / 100);
$body['amount'] = $montantDepot; $commisionHyper = floatval($frais * $config->taux_com_hyp_envoi_cash / 100);
$body['card_number'] = $request->numero_carte;
$body['cvv'] = $request->cvv;
$body['expiry_date'] = $expiration_date->format('Y-m');
$response = $client->post('fund-transfer-api/v1/transaction/push', ['json' => $body]);
$code = $response->getStatusCode();
if ($code == 200) {
$banqueCommission = floatval($frais * $config->taux_com_banque_depot_cash_carte / 100);
$transaction->commission_banque = $banqueCommission;
// 2---> Emmètre via API sécurisé SSL une requête de débit de notre
//compte marchand du (Part de la banque partenaire en %
//pour le dépôtqui s’applique sur les frais minimum) et créditer
//le compte des opérations défini avec notre banque
//partenaire
$walletAgent->balance_princ -= $transaction->montant; $walletAgent->balance_princ -= $transaction->montant;
$walletAgent->balance_com += $commisionAgent;
$agentCommission = floatval($frais * $config->taux_com_ag_depot_cash_carte / 100); $transaction->commission_ag = $commisionAgent;
$superviseurCommission = floatval($frais * $config->taux_com_sup_depot_cash_carte / 100); $walletSuperviseur->balance_com += $commisionSuper;
$hyperviseurCommission = floatval($frais * $config->taux_com_hyp_depot_cash_carte / 100); $transaction->commission_sup = $commisionSuper;
$walletHyperviseur->balance_com += $commisionHyper;
$walletAgent->balance_com += $agentCommission; $transaction->commission_hyp = $commisionHyper;
$transaction->commission_ag = $agentCommission; $transaction->taxe = $taxe;
$walletSuperviseur->balance_com += $superviseurCommission;
$transaction->commission_sup = $superviseurCommission;
$walletHyperviseur->balance_com += $hyperviseurCommission;
$transaction->commission_hyp = $hyperviseurCommission;
$transaction->id_wallet_ag = $walletAgent->id;
$transaction->id_wallet_sup = $walletSuperviseur->id;
$transaction->id_wallet_hyp = $walletHyperviseur->id;
$transaction->frais = $frais; $transaction->frais = $frais;
$transaction->date = new \DateTime(); $transaction->date = new \DateTime();
$walletAgent->save(); $walletAgent->save();
$walletSuperviseur->save(); $walletSuperviseur->save();
$walletHyperviseur->save(); $walletHyperviseur->save();
$transaction->id_wallet_ag = $walletAgent->id;
$transaction->id_wallet_sup = $walletSuperviseur->id;
$transaction->id_wallet_hyp = $walletHyperviseur->id;
$transaction->save(); $transaction->save();
return $this->successResponse(trans('messages.successful_transaction')); }else{
return $this->errorResponse(trans('messages.incorrect_user_password'));
}
break;
case 16: // Agent - Envoi de cash vers une carte visa
$this->validate($request, $transaction->card_rules());
$agent = AgentPlus::findOrFail($network_agent->agent_id);
if($this->checkPassword($request->password,$agent->encrypted_password,$agent->salt)){
$expiration_date = \DateTime::createFromFormat('m/y', $request->expiration_date);
if (!$expiration_date)
$expiration_date = new \DateTime();
$transaction->expiration_date = $expiration_date;
} else { $frais = $request->montant * $config->taux_com_wallet_ag_envoi_cash_carte / 100;
return $this->errorResponse(trans('errors.visa_api_failed'), Response::HTTP_INTERNAL_SERVER_ERROR); $montantDepot = $transaction->montant - $frais;
$transaction->montant_depot = $montantDepot;
$body['amount'] = $montantDepot;
$body['card_number'] = $request->numero_carte;
$body['cvv'] = $request->cvv;
$body['expiry_date'] = $expiration_date->format('Y-m');
$response = $client->post('fund-transfer-api/v1/transaction/push', ['json' => $body]);
$code = $response->getStatusCode();
if ($code == 200) {
$banqueCommission = floatval($frais * $config->taux_com_banque_depot_cash_carte / 100);
$transaction->commission_banque = $banqueCommission;
// 2---> Emmètre via API sécurisé SSL une requête de débit de notre
//compte marchand du (Part de la banque partenaire en %
//pour le dépôtqui s’applique sur les frais minimum) et créditer
//le compte des opérations défini avec notre banque
//partenaire
$walletAgent->balance_princ -= $transaction->montant;
$agentCommission = floatval($frais * $config->taux_com_ag_depot_cash_carte / 100);
$superviseurCommission = floatval($frais * $config->taux_com_sup_depot_cash_carte / 100);
$hyperviseurCommission = floatval($frais * $config->taux_com_hyp_depot_cash_carte / 100);
$walletAgent->balance_com += $agentCommission;
$transaction->commission_ag = $agentCommission;
$walletSuperviseur->balance_com += $superviseurCommission;
$transaction->commission_sup = $superviseurCommission;
$walletHyperviseur->balance_com += $hyperviseurCommission;
$transaction->commission_hyp = $hyperviseurCommission;
$transaction->id_wallet_ag = $walletAgent->id;
$transaction->id_wallet_sup = $walletSuperviseur->id;
$transaction->id_wallet_hyp = $walletHyperviseur->id;
$transaction->frais = $frais;
$transaction->date = new \DateTime();
$walletAgent->save();
$walletSuperviseur->save();
$walletHyperviseur->save();
$transaction->save();
return $this->successResponse(trans('messages.successful_transaction'));
} else {
return $this->errorResponse(trans('errors.visa_api_failed'), Response::HTTP_INTERNAL_SERVER_ERROR);
}
}else{
return $this->errorResponse(trans('messages.incorrect_user_password'));
} }
break; break;
case 17: // Agent - Envoi de cash vers cash case 17: // Agent - Envoi de cash vers cash
$this->validate($request, $transaction->cash_cash_rules()); $this->validate($request, $transaction->cash_cash_rules());
$agent = AgentPlus::findOrFail($network_agent->agent_id);
if($this->checkPassword($request->password,$agent->encrypted_password,$agent->salt)){
$frais = ($request->init_country != $request->final_country)? $this->calculateFees($plr_agent_cash_cash, $request->montant) : $this->calculateFees($plr_agent_cash_cash_national, $request->montant);
$taxe = ($request->init_country != $request->final_country) ? $this->calculateTax($taxesInternationales , $frais) : $this->calculateTax($taxesNationales ,$frais);
$montantRetrait = $request->montant - $frais - $taxe;
$commisionAgent = floatval( $frais * $config->taux_com_ag_envoi_cash / 100) ;
$commisionSuper = floatval( $frais * $config->taux_com_sup_envoi_cash / 100) ;
$commisionHyper = floatval( $frais * $config->taux_com_hyp_envoi_cash / 100);
$frais = ($request->init_country != $request->final_country)? $this->calculateFees($plr_agent_cash_cash, $request->montant) : $this->calculateFees($plr_agent_cash_cash_national, $request->montant); $transaction->montant_retrait = $montantRetrait;
$taxe = ($request->init_country != $request->final_country) ? $this->calculateTax($taxesInternationales , $frais) : $this->calculateTax($taxesNationales ,$frais); $walletAgent->balance_com += $commisionAgent;
$montantRetrait = $request->montant - $frais - $taxe; $transaction->commission_ag = $commisionAgent;
$commisionAgent = floatval( $frais * $config->taux_com_ag_envoi_cash / 100) ; $walletSuperviseur->balance_com += $commisionSuper;
$commisionSuper = floatval( $frais * $config->taux_com_sup_envoi_cash / 100) ; $transaction->commission_sup = $commisionSuper;
$commisionHyper = floatval( $frais * $config->taux_com_hyp_envoi_cash / 100); $walletHyperviseur->balance_com += $commisionHyper;
$transaction->commission_hyp = $commisionHyper;
$transaction->id_wallet_ag = $walletAgent->id;
$transaction->id_wallet_sup = $walletSuperviseur->id;
$transaction->id_wallet_hyp = $walletHyperviseur->id;
$transaction->montant_retrait = $montantRetrait; $code_retrait = $this->random_string();
$walletAgent->balance_com += $commisionAgent; $hash = $this->hashSSHA($code_retrait);
$transaction->commission_ag = $commisionAgent; $transaction->encrypted_code_retrait = $hash['encrypted'];
$walletSuperviseur->balance_com += $commisionSuper; $transaction->code_retrait_salt = $hash['salt'];
$transaction->commission_sup = $commisionSuper;
$walletHyperviseur->balance_com += $commisionHyper;
$transaction->commission_hyp = $commisionHyper;
$transaction->id_wallet_ag = $walletAgent->id;
$transaction->id_wallet_sup = $walletSuperviseur->id;
$transaction->id_wallet_hyp = $walletHyperviseur->id;
$code_retrait = $this->random_string(); $walletAgent->balance_princ -= $transaction->montant;
$hash = $this->hashSSHA($code_retrait); $transaction->frais = $frais;
$transaction->encrypted_code_retrait = $hash['encrypted']; $transaction->taxe = $taxe;
$transaction->code_retrait_salt = $hash['salt']; $transaction->date = new \DateTime();
$transaction->status_retrait = 0;
$walletAgent->balance_princ -= $transaction->montant; $walletAgent->save();
$transaction->frais = $frais; $walletSuperviseur->save();
$transaction->taxe = $taxe; $walletHyperviseur->save();
$transaction->date = new \DateTime(); $transaction->save();
$transaction->status_retrait = 0; $this->sendMail($request->email_emetteur, trans('messages.successful_transaction'), trans('messages.successful_send_cash',['montant'=> $montantRetrait,
$walletAgent->save(); 'code'=> $code_retrait]));
$walletSuperviseur->save(); return $this->successResponse(trans('messages.successful_transaction'));
$walletHyperviseur->save(); }else{
$transaction->save(); return $this->errorResponse(trans('messages.incorrect_user_password'));
$this->sendMail($request->email_emetteur, trans('messages.successful_transaction'), trans('messages.successful_send_cash',['montant'=> $montantRetrait, }
'code'=> $code_retrait]));
return $this->successResponse(trans('messages.successful_transaction'));
break; break;
case 18: // Agent - Envoi de cash vers banque case 18: // Agent - Envoi de cash vers banque
// Indisponible // Indisponible

10
app/Models/WalletIlinkTransaction.php
View File

@ -14,6 +14,7 @@ use Illuminate\Database\Eloquent\Model;
* *
* @property int $id * @property int $id
* @property float $montant * @property float $montant
* @property float $montant_depot
* @property float $montant_retrait * @property float $montant_retrait
* @property string $encrypted_code_retrait * @property string $encrypted_code_retrait
* @property string $code_retrait_salt * @property string $code_retrait_salt
@ -29,7 +30,7 @@ use Illuminate\Database\Eloquent\Model;
* @property string $prenom_emetteur * @property string $prenom_emetteur
* @property string $email_emetteur * @property string $email_emetteur
* @property string $type_document_emetteur * @property string $type_document_emetteur
* @property string $id_type_document_emetteur * @property string $id_document_emetteur
* @property float $frais * @property float $frais
* @property float $taxe * @property float $taxe
* @property string $numero_carte * @property string $numero_carte
@ -63,6 +64,7 @@ class WalletIlinkTransaction extends Model
protected $casts = [ protected $casts = [
'montant' => 'float', 'montant' => 'float',
'montant_depot' => 'float',
'montant_retrait' => 'float', 'montant_retrait' => 'float',
'status_retrait' => 'int', 'status_retrait' => 'int',
'network_destinataire' => 'int', 'network_destinataire' => 'int',
@ -89,6 +91,7 @@ class WalletIlinkTransaction extends Model
protected $fillable = [ protected $fillable = [
'montant', 'montant',
'montant_depot',
'montant_retrait', 'montant_retrait',
'encrypted_code_retrait', 'encrypted_code_retrait',
'code_retrait_salt', 'code_retrait_salt',
@ -104,7 +107,7 @@ class WalletIlinkTransaction extends Model
'prenom_emetteur', 'prenom_emetteur',
'email_emetteur', 'email_emetteur',
'type_document_emetteur', 'type_document_emetteur',
'id_type_document_emetteur', 'id_document_emetteur',
'frais', 'frais',
'taxe', 'taxe',
'numero_carte', 'numero_carte',
@ -149,7 +152,7 @@ class WalletIlinkTransaction extends Model
return $this->belongsTo(Network::class, 'network_destinataire'); return $this->belongsTo(Network::class, 'network_destinataire');
} }
// Regles de validation // Regles de validation
//Envoi de cash vers wallet iLink //Envoi de cash vers wallet iLink
public function first_rules() public function first_rules()
{ {
@ -158,7 +161,6 @@ class WalletIlinkTransaction extends Model
'init_country' =>'required|integer|min:0|not_in:0', 'init_country' =>'required|integer|min:0|not_in:0',
'final_country' =>'required|integer|min:0|not_in:0', 'final_country' =>'required|integer|min:0|not_in:0',
'montant'=> 'required|numeric|min:0|not_in:0', 'montant'=> 'required|numeric|min:0|not_in:0',
'password'=>'required'
]; ];
} }

1
resources/lang/en/errors.php
View File

@ -8,4 +8,5 @@ return [
'identification_carried_out' => 'Identification already carried out', 'identification_carried_out' => 'Identification already carried out',
'visa_api_failed'=> 'Request to API visa failed', 'visa_api_failed'=> 'Request to API visa failed',
'failed_transaction' => 'Failed transaction', 'failed_transaction' => 'Failed transaction',
'user_phone_not_exist' => 'This customer number does not exist',
]; ];

1
resources/lang/fr/errors.php
View File

@ -8,4 +8,5 @@ return [
'identification_carried_out' => 'Identification déjà éffectuée', 'identification_carried_out' => 'Identification déjà éffectuée',
'visa_api_failed'=> 'La requete vers l\'api visa a échouée', 'visa_api_failed'=> 'La requete vers l\'api visa a échouée',
'failed_transaction' => 'Transaction échouée', 'failed_transaction' => 'Transaction échouée',
'user_phone_not_exist' => 'Ce numéro client n\'existe pas',
]; ];