From 69b294c8c763cda33550b1664a83381ab1bf0845 Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Thu, 27 Aug 2020 18:29:25 +0100 Subject: [PATCH] + Add list of users nano credit demands --- app/Http/Controllers/NanoCreditController.php | 6 ++++++ app/Http/Controllers/UserGroupController.php | 2 ++ resources/lang/en/errors.php | 1 + resources/lang/fr/errors.php | 1 + routes/web.php | 13 +++++++++---- 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/NanoCreditController.php b/app/Http/Controllers/NanoCreditController.php index dc639b4..afc4ffb 100755 --- a/app/Http/Controllers/NanoCreditController.php +++ b/app/Http/Controllers/NanoCreditController.php @@ -185,6 +185,12 @@ class NanoCreditController extends Controller } + public function getNanoCreditsDemands($id_user) + { + $demandes = DB::select('SELECT * FROM infos_users_demandes_credits WHERE id_user = :id;', ['id' => $id_user]); + return $this->successResponse($demandes); + } + public function cautionnerCredit(Request $request) { $this->validate($request, [ diff --git a/app/Http/Controllers/UserGroupController.php b/app/Http/Controllers/UserGroupController.php index e96db2d..41a57b1 100755 --- a/app/Http/Controllers/UserGroupController.php +++ b/app/Http/Controllers/UserGroupController.php @@ -457,6 +457,8 @@ ug.date_creation as date_creation_groupe , ug.createur , ug.sponsor1 , ug.sponso return $this->errorResponse(trans('errors.not_group_sponsor')); $user = User::findOrFail($demande->id_user); + if ($user->group_id) + return $this->errorResponse(trans('errors.user_already_member_of_group')); $user->group_id = $group->id; $user->date_adhesion = new \DateTime(); $user->save(); diff --git a/resources/lang/en/errors.php b/resources/lang/en/errors.php index 8156c0d..397692e 100755 --- a/resources/lang/en/errors.php +++ b/resources/lang/en/errors.php @@ -54,4 +54,5 @@ Paying network : :network :country', "last_nano_credit_not_refunded" => "Your last nano credit request was not refunded", "nano_credit_already_refunded" => "Repayment of credit already made", "sponsor_code_not_match" => "This sponsor code does not match to this group", + "user_already_member_of_group" => "This user is already a member of a group", ]; diff --git a/resources/lang/fr/errors.php b/resources/lang/fr/errors.php index 29fad00..1d503a2 100755 --- a/resources/lang/fr/errors.php +++ b/resources/lang/fr/errors.php @@ -54,4 +54,5 @@ Réseau payeur : :network :country', "last_nano_credit_not_refunded" => "Votre derniere demande de nano crédit n'a pas été remboursée", "nano_credit_already_refunded" => "Remboursement de crédit deja effectué", "sponsor_code_not_match" => "Ce code sponsor ne correspond pas à ce groupe", + "user_already_member_of_group" => "Cet utilisateur est déjà membre d'un groupe", ]; diff --git a/routes/web.php b/routes/web.php index 2733c18..3c330f2 100755 --- a/routes/web.php +++ b/routes/web.php @@ -78,15 +78,20 @@ $router->group(['prefix' => '/groups'], function () use ($router) { $router->get('my/{code_user}', 'UserGroupController@myGroup'); $router->get('limits/{code_user}', 'UserGroupController@myGroupLimits'); - // Demandes de validation + // Demandes de groupes $router->group(['prefix' => '/demands'], function () use ($router) { $router->get('{id_demand}', 'UserGroupController@getGroupDemand'); $router->get('all/{id_user}', 'UserGroupController@getAllGroupDemand'); $router->post('validate', 'UserGroupController@validateGroupDemand'); $router->post('cancel', 'UserGroupController@cancelGroupDemand'); - $router->post('askNanoCredit', 'NanoCreditController@askNanoCredit'); - $router->post('guaranteeNanoCredit', 'NanoCreditController@cautionnerCredit'); - $router->post('refundNanoCredit', 'NanoCreditController@rembourserCredit'); + }); + + //Nano credit + $router->group(['prefix' => '/nanoCredit'], function () use ($router) { + $router->post('ask', 'NanoCreditController@askNanoCredit'); + $router->post('guarantee', 'NanoCreditController@cautionnerCredit'); + $router->post('refund', 'NanoCreditController@rembourserCredit'); $router->get('durations/{id_user}', 'NanoCreditController@getDureeMois'); + $router->get('demands/{id_user}', 'NanoCreditController@getNanoCreditsDemands'); }); });