From d6ac8c0e5e9ceafbd88c0b81502ebae2eaf79386 Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Tue, 16 Jun 2020 06:49:49 +0100 Subject: [PATCH] + Remove user_code during user's identification --- app/Http/Controllers/UserController.php | 6 +++--- app/Http/Controllers/WalletController.php | 12 +++++++----- app/Models/Identification.php | 2 -- app/Models/User.php | 6 ++++-- resources/lang/en/messages.php | 5 ++--- resources/lang/fr/messages.php | 5 ++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index ca0bcb4..9700efa 100755 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -47,7 +47,7 @@ class UserController extends Controller $identification->save(); $this->sendMail($user->email,trans('messages.successful_identification'), trans('messages.successful_identification_message',['name'=>$identification->lastname.' '.$identification->firstname])); - return $this->successResponse(trans('messages.successful_identification')); + return $this->successResponse(trans('messages.successful_identification',['name'=>$identification->lastname.' '.$identification->firstname])); } public function validateIdentification(Request $request, $id_identification) @@ -70,11 +70,11 @@ class UserController extends Controller $identification->document_image_front = $this->uploadImage($request,'document_image_front','D-F',"documents"); $identification->document_image_back = $this->uploadImage($request,'document_image_back','D-B',"documents"); $identification->user_image = $this->uploadImage($request,'user_image','U',"photos"); - $identification->user_code = $this->generateRandomString(); + $identification->status = 1; $identification->save(); - $this->sendMail($identification->user->email,trans('messages.validated_identification'),trans('messages.validated_identification_message',['user_code'=>$identification->user_code])); + $this->sendMail($identification->user->email,trans('messages.validated_identification'),trans('messages.validated_identification_message')); return $this->successResponse(trans('messages.validated_identification')); } diff --git a/app/Http/Controllers/WalletController.php b/app/Http/Controllers/WalletController.php index 68f7dbe..1ca68b8 100755 --- a/app/Http/Controllers/WalletController.php +++ b/app/Http/Controllers/WalletController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Models\Wallet; +use App\Models\User; use App\Models\WalletsUser; use App\Traits\ApiResponser; use Illuminate\Http\Request; @@ -98,12 +99,13 @@ class WalletController extends Controller // Wallets users iLink public function showWalletUser($id_user){ - $wallet = collect(DB::select('SELECT wu.* , c.name as country , i.user_code , n.name as network from wallets_users wu - INNER JOIN identifications i ON i.idUser = wu.idUser INNER JOIN networks n ON i.idNetwork = n.id INNER JOIN countries c ON n.country_id = c.id - WHERE wu.idUser = :idUser',['idUser' => $id_user]))->first(); - if($wallet) + $wallet = collect(DB::select('SELECT wu.* , u.user_code from wallets_users wu + INNER JOIN users u ON u.id = wu.idUser WHERE wu.idUser = :id_user',['id_user' => $id_user]))->first(); + if($wallet){ + $wallet->country = 'Gabon'; + $wallet->network = 'iLink World'; return $this->successResponse($wallet); - else + } else return $this->errorResponse(trans('errors.model_not_found',['model'=>'wallet']),Response::HTTP_BAD_REQUEST); } diff --git a/app/Models/Identification.php b/app/Models/Identification.php index 8f54109..622af15 100644 --- a/app/Models/Identification.php +++ b/app/Models/Identification.php @@ -27,7 +27,6 @@ use Illuminate\Database\Eloquent\Model; * @property string $user_image * @property string $document_image_front * @property string $document_image_back - * @property string $user_code * @property int $idNetwork * @property int $country_id * @@ -69,7 +68,6 @@ class Identification extends Model 'user_image', 'document_image_front', 'document_image_back', - 'user_code', 'idNetwork', 'country_id' ]; diff --git a/app/Models/User.php b/app/Models/User.php index e2b56fe..41919db 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -12,13 +12,14 @@ use Illuminate\Database\Eloquent\Model; /** * Class User - * + * * @property int $id * @property string $uid * @property string $firstname * @property string $lastname * @property string $phone * @property string $email + * @property string $user_code * @property string $adresse * @property float $solde * @property string $encrypted_password @@ -28,7 +29,7 @@ use Illuminate\Database\Eloquent\Model; * @property Carbon $date_modified * @property Carbon $date_created * @property int $network_id - * + * * @property Collection|Identification[] $identifications * @property Collection|WalletsUser[] $wallets_users * @@ -60,6 +61,7 @@ class User extends Model 'lastname', 'phone', 'email', + 'user_code', 'adresse', 'solde', 'encrypted_password', diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php index 6740292..6b3f181 100755 --- a/resources/lang/en/messages.php +++ b/resources/lang/en/messages.php @@ -8,7 +8,7 @@ return [ 'success_treated_demand' => 'Request successfully processed', 'canceled_credit_request' => 'Canceled credit request', 'canceled_transaction' => 'Canceled transaction', - 'successful_identification'=>'Successful identification', + 'successful_identification'=>'User :name has been successfully identified.', 'user_identificated' => 'User already identificated', 'validated_identification'=>'Validated identification', 'identification_already_validated'=>'Identification already validated', @@ -20,8 +20,7 @@ Regards, iLinkWorld team.', 'validated_identification_message' => 'Your identification is confirmed! -Your username: :user_code -You can now use the services of iLink World. +You can now use all iLink World services. Welcome to the iLink World family !!! Regards, diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php index 88bff9c..5fcb27b 100755 --- a/resources/lang/fr/messages.php +++ b/resources/lang/fr/messages.php @@ -8,7 +8,7 @@ return [ 'success_treated_demand' => 'Demande traitée avec succès', 'canceled_credit_request' => 'Demande de crédit annulée', 'canceled_transaction' => 'Transaction annulée', - 'successful_identification' => 'Identification réussie', + 'successful_identification' => 'L\'utilisateur :name a été identifié avec succes', 'validated_identification' => 'Identification validée', 'user_identificated' => 'Utilisateur déjà identifié', 'identification_already_validated' => 'Identification deja validée', @@ -20,8 +20,7 @@ Cordialement, Equipe iLinkWorld.', 'validated_identification_message' => 'Votre identification est confirmée ! -Votre identifiant : :user_code -Vous pouvez desormais utiliser les services de iLink World. +Vous pouvez desormais utiliser tous les services de iLink World. Bienvenue dans la famille iLink World !!! Cordialement,