+ Multi language
This commit is contained in:
parent
04a6cb08e9
commit
143e527863
|
@ -68,7 +68,7 @@ class Handler extends ExceptionHandler
|
||||||
{
|
{
|
||||||
$model = strtolower(class_basename($exception->getModel()));
|
$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);
|
Response::HTTP_NOT_FOUND);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -105,7 +105,7 @@ class Handler extends ExceptionHandler
|
||||||
return parent::render($request,$exception);
|
return parent::render($request,$exception);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->errorResponse('Unexcepted error. Try later',
|
return $this->errorResponse(trans('errors.unexpected_error'),
|
||||||
Response::HTTP_INTERNAL_SERVER_ERROR);
|
Response::HTTP_INTERNAL_SERVER_ERROR);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CommissionController extends Controller
|
||||||
$wallet = Wallet::findOrFail($id_wallet);
|
$wallet = Wallet::findOrFail($id_wallet);
|
||||||
|
|
||||||
if($wallet->balance_com <=0 )
|
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_princ += $wallet->balance_com;
|
||||||
$wallet->balance_com = 0;
|
$wallet->balance_com = 0;
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CreditController extends Controller
|
||||||
public function treatDemand($id_demand,Twilio $twilio){
|
public function treatDemand($id_demand,Twilio $twilio){
|
||||||
$demand = DemandeCredit::where('id',$id_demand)->firstOrFail();
|
$demand = DemandeCredit::where('id',$id_demand)->firstOrFail();
|
||||||
if($demand->status == 1)
|
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();
|
$agent = AgentPlus::where('code_membre',$demand->code_membre)->firstOrFail();
|
||||||
$parrain = AgentPlus::where('code_membre',$demand->code_parrain)->firstOrFail();
|
$parrain = AgentPlus::where('code_membre',$demand->code_parrain)->firstOrFail();
|
||||||
|
@ -40,7 +40,7 @@ class CreditController extends Controller
|
||||||
$walletParrain = Wallet::findOrFail($walletAgentParrain->wallet_id);
|
$walletParrain = Wallet::findOrFail($walletAgentParrain->wallet_id);
|
||||||
|
|
||||||
if($walletParrain->balance_princ < $demand->montant)
|
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;
|
$walletAgent->balance_princ += $demand->montant;
|
||||||
$walletParrain->balance_princ -= $demand->montant;
|
$walletParrain->balance_princ -= $demand->montant;
|
||||||
|
@ -65,6 +65,6 @@ class CreditController extends Controller
|
||||||
// }catch (\Exception $e){
|
// }catch (\Exception $e){
|
||||||
// echo "Error: " . $e->getMessage();
|
// echo "Error: " . $e->getMessage();
|
||||||
// }
|
// }
|
||||||
return $this->successResponse('Demande de credit annullée');
|
return $this->successResponse(trans('messages.canceled_demand'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,7 +48,7 @@ class WalletController extends Controller
|
||||||
$this->validate($request,$rules);
|
$this->validate($request,$rules);
|
||||||
|
|
||||||
DB::insert('INSERT INTO wallets (id_networkAgent) VALUES (?);', [$request->id_networkAgent]);
|
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'));
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,37 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Http\Middleware;
|
||||||
|
|
||||||
|
use Closure;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class Localization
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Handle an incoming request.
|
||||||
|
*
|
||||||
|
* @param Request $request
|
||||||
|
* @param \Closure $next
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
public function handle($request, Closure $next)
|
||||||
|
{
|
||||||
|
$enLangs=["en","en-US","en_US","ca","in","gb","GB","us","en-029","en-AU","en-BZ","en-CA","en-GB","en-IE","en-IN","en-JM","en-MY","en-NZ","en-PH","en-SG","en-TT","en-US","en-ZA","en-ZW","au","bz","ie","in","jm","my","nz","ph","sg","tt","za"];
|
||||||
|
|
||||||
|
// Check header request and determine localizaton
|
||||||
|
if ($request->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);
|
||||||
|
}
|
||||||
|
}
|
|
@ -73,6 +73,7 @@ $app->configure('app');
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$app->middleware([
|
$app->middleware([
|
||||||
|
App\Http\Middleware\Localization::class,
|
||||||
App\Http\Middleware\AuthenticateAccess::class
|
App\Http\Middleware\AuthenticateAccess::class
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
<?php
|
||||||
|
return [
|
||||||
|
'model_not_found' => 'Does not exist any instance of :model with given id',
|
||||||
|
'unexpected_error'=> 'Unexpected error. Try later'
|
||||||
|
];
|
|
@ -0,0 +1,8 @@
|
||||||
|
<?php
|
||||||
|
return [
|
||||||
|
'empty_com_balance' => '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'
|
||||||
|
];
|
|
@ -0,0 +1,5 @@
|
||||||
|
<?php
|
||||||
|
return [
|
||||||
|
'model_not_found' => 'Il n\'existe aucune instance de :model avec l\'id donné',
|
||||||
|
'unexpected_error'=> 'Erreur inattendue. Essayer plus tard'
|
||||||
|
];
|
|
@ -0,0 +1,8 @@
|
||||||
|
<?php
|
||||||
|
return [
|
||||||
|
'empty_com_balance' => '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é'
|
||||||
|
];
|
Loading…
Reference in New Issue