diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 4533dac..7d7d19a 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -68,7 +68,7 @@ class Handler extends ExceptionHandler { $model = strtolower(class_basename($exception->getModel())); - return $this->errorResponse("Does not exist any instance of {$model} with given id", + return $this->errorResponse(trans('errors.model_not_found',['model'=>$model]), Response::HTTP_NOT_FOUND); } @@ -105,7 +105,7 @@ class Handler extends ExceptionHandler return parent::render($request,$exception); } - return $this->errorResponse('Unexcepted error. Try later', + return $this->errorResponse(trans('errors.unexpected_error'), Response::HTTP_INTERNAL_SERVER_ERROR); } } diff --git a/app/Http/Controllers/CommissionController.php b/app/Http/Controllers/CommissionController.php index 27759c5..5f784a7 100644 --- a/app/Http/Controllers/CommissionController.php +++ b/app/Http/Controllers/CommissionController.php @@ -29,7 +29,7 @@ class CommissionController extends Controller $wallet = Wallet::findOrFail($id_wallet); if($wallet->balance_com <=0 ) - return $this->errorResponse('Solde de comission est vide' , Response::HTTP_BAD_REQUEST); + return $this->errorResponse(trans('messages.empty_com_balance') , Response::HTTP_BAD_REQUEST); $wallet->balance_princ += $wallet->balance_com; $wallet->balance_com = 0; diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php index 3123d92..0314051 100644 --- a/app/Http/Controllers/CreditController.php +++ b/app/Http/Controllers/CreditController.php @@ -29,7 +29,7 @@ class CreditController extends Controller public function treatDemand($id_demand,Twilio $twilio){ $demand = DemandeCredit::where('id',$id_demand)->firstOrFail(); if($demand->status == 1) - return $this->errorResponse('Demande deja traitée',Response::HTTP_BAD_REQUEST); + return $this->errorResponse(trans('messages.treated_demand'),Response::HTTP_BAD_REQUEST); $agent = AgentPlus::where('code_membre',$demand->code_membre)->firstOrFail(); $parrain = AgentPlus::where('code_membre',$demand->code_parrain)->firstOrFail(); @@ -40,7 +40,7 @@ class CreditController extends Controller $walletParrain = Wallet::findOrFail($walletAgentParrain->wallet_id); if($walletParrain->balance_princ < $demand->montant) - return $this->errorResponse('Solde principal du parrain inférieur au montant de la demande',Response::HTTP_BAD_REQUEST); + return $this->errorResponse(trans('messages.princ_balance_inf_to_demand_amount'),Response::HTTP_BAD_REQUEST); $walletAgent->balance_princ += $demand->montant; $walletParrain->balance_princ -= $demand->montant; @@ -65,6 +65,6 @@ class CreditController extends Controller // }catch (\Exception $e){ // echo "Error: " . $e->getMessage(); // } - return $this->successResponse('Demande de credit annullée'); + return $this->successResponse(trans('messages.canceled_demand')); } } diff --git a/app/Http/Controllers/WalletController.php b/app/Http/Controllers/WalletController.php index b0fe7a6..b654855 100644 --- a/app/Http/Controllers/WalletController.php +++ b/app/Http/Controllers/WalletController.php @@ -48,7 +48,7 @@ class WalletController extends Controller $this->validate($request,$rules); DB::insert('INSERT INTO wallets (id_networkAgent) VALUES (?);', [$request->id_networkAgent]); - return $this->successResponse('Nouveau wallet ajoute'); + return $this->successResponse(trans('messages.new_wallet_added')); } } diff --git a/app/Http/Middleware/Localization.php b/app/Http/Middleware/Localization.php new file mode 100644 index 0000000..24f09a8 --- /dev/null +++ b/app/Http/Middleware/Localization.php @@ -0,0 +1,37 @@ +hasHeader('X-localization')){ + $local = $request->header('X-localization'); + $pos=strpos($local,"-"); + if($pos!=false){ + $local=strtolower(explode("-",$local)[0]); + } + $local= in_array($local, $enLangs) ? 'en' : 'fr'; + }else{ + $local ='fr'; + } + // set laravel localization + app()->setLocale($local); + // continue request + return $next($request); + } +} diff --git a/bootstrap/app.php b/bootstrap/app.php index eac240e..0a1b5ee 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -73,6 +73,7 @@ $app->configure('app'); */ $app->middleware([ + App\Http\Middleware\Localization::class, App\Http\Middleware\AuthenticateAccess::class ]); diff --git a/resources/lang/en/errors.php b/resources/lang/en/errors.php new file mode 100644 index 0000000..c7e2131 --- /dev/null +++ b/resources/lang/en/errors.php @@ -0,0 +1,5 @@ + 'Does not exist any instance of :model with given id', + 'unexpected_error'=> 'Unexpected error. Try later' +]; diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php new file mode 100644 index 0000000..7dc3fce --- /dev/null +++ b/resources/lang/en/messages.php @@ -0,0 +1,8 @@ + 'Commission balance is empty', + 'treated_demand' => 'Credit request already processed', + 'canceled_demand' => 'Canceled credit request', + 'princ_balance_inf_to_demand_amount' => 'Sponsor\'s principal balance less than the claim amount', + 'new_wallet_added' => 'New wallet added' +]; diff --git a/resources/lang/fr/errors.php b/resources/lang/fr/errors.php new file mode 100644 index 0000000..52e681c --- /dev/null +++ b/resources/lang/fr/errors.php @@ -0,0 +1,5 @@ + 'Il n\'existe aucune instance de :model avec l\'id donné', + 'unexpected_error'=> 'Erreur inattendue. Essayer plus tard' +]; diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php new file mode 100644 index 0000000..fe41b7f --- /dev/null +++ b/resources/lang/fr/messages.php @@ -0,0 +1,8 @@ + 'Solde de commission est vide', + 'treated_demand' => 'Demande de crédit deja traitée', + 'canceled_demand' => 'Demande de credit annullée', + 'princ_balance_inf_to_demand_amount' => 'Solde principal du parrain inférieur au montant de la demande', + 'new_wallet_added' => 'Nouveau wallet ajouté' +];