Merge branch 'develop' into trunk

This commit is contained in:
Jérémy Munsch 2024-01-29 10:39:08 +01:00
commit df4db5fb5a
No known key found for this signature in database
GPG key ID: 18361AF3BFEC0FEC
352 changed files with 13396 additions and 166922 deletions

2
.dockerignore Normal file
View file

@ -0,0 +1,2 @@
.git
*.md

View file

@ -35,15 +35,24 @@ MAIL_ENCRYPTION=null
MAIL_FROM_ADDRESS=null
MAIL_FROM_NAME="${APP_NAME}"
AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
AWS_DEFAULT_REGION=us-east-1
AWS_BUCKET=
#LDCWEB
LDC_WEB_API_KEY=
PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=mt1
# CRM
CRM_ENDPOINT=https://ldcldccrm:K5cJmTsG@dev.ldc-crm.fr
CRM_TOKEN=c6ca980833ff7a096d696cad6ba5a207a7423b08
CRM_PASSWORD=e06bf377ec8cf6815ae1f19500b25e4a9cc7f72991a5b65fb46898a4c13edb4c
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
# SENTRY
SENTRY_LARAVEL_DSN=
# GOOGLE
# - ANALYTICS
ANALYTICS_GOOGLE_ID=
##MAILJET CLE API PRINCIPALE
MAILJET_APIKEY=88c459052d3e55f37eb4155d585c9169
MAILJET_APISECRET=6d152edfd8409b0d1fad76fe8cdb111f
MAILJET_SMSTOKEN=7e148a5252304f0d93fe0c908ef7d68d
#MAILJET_SMSENDPOINT=
#MAILJET_SMSFROM=

22
.gitignore vendored
View file

@ -1,10 +1,19 @@
/node_modules
/integration
/public/hot
public/uploads/*
!public/uploads/.gitkeep
/public/storage
/public/assets/*
/public/js/*
/public/css/*
/public/fonts/*
/public/build
/public/content/*
/public/images/*
/public/cache/*
/public/uploads/*
/public/sitemap.xml
mix-manifest.json
/storage/*.key
/storage/framework/laravel-excel/*
/vendor
.env
.env.backup
@ -16,3 +25,10 @@ Homestead.json
Homestead.yaml
npm-debug.log
yarn-error.log
workspace.code-workspace
.vscode
# IGNORE THEME SUBMODULES CHANGES
resources/theme
# Ignore compiled mail theme
resource/vendor/mail/html/themes/default.css
auth.json

23
.gitlab-ci.yml Normal file
View file

@ -0,0 +1,23 @@
include:
- project: "ldc-web/shared-ci"
ref: "main"
file: "lint/lint7.3.yml"
- project: "ldc-web/shared-ci"
ref: "main"
file: "security/security7.3.yml"
- project: "ldc-web/shared-ci"
ref: "main"
file: "build/build7.3.yml"
- project: "ldc-web/shared-ci"
ref: "main"
file: "test/test.yml"
- project: "ldc-web/shared-ci"
ref: "main"
file: "deploy/deploy.yml"
stages:
- lint
- security
- build
- test
- deploy

22
.vscode/settings.json vendored Normal file
View file

@ -0,0 +1,22 @@
{
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#f1deae",
"activityBar.background": "#f1deae",
"activityBar.foreground": "#15202b",
"activityBar.inactiveForeground": "#15202b99",
"activityBarBadge.background": "#1ca37d",
"activityBarBadge.foreground": "#e7e7e7",
"commandCenter.border": "#15202b99",
"sash.hoverBorder": "#f1deae",
"statusBar.background": "#e9cc83",
"statusBar.foreground": "#15202b",
"statusBarItem.hoverBackground": "#e1ba58",
"statusBarItem.remoteBackground": "#e9cc83",
"statusBarItem.remoteForeground": "#15202b",
"titleBar.activeBackground": "#e9cc83",
"titleBar.activeForeground": "#15202b",
"titleBar.inactiveBackground": "#e9cc8399",
"titleBar.inactiveForeground": "#15202b99"
},
"peacock.remoteColor": "#e9cc83"
}

5
Dockerfile Normal file
View file

@ -0,0 +1,5 @@
FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/ldcweb-production-7.3:latest
COPY --chown=www-data:www-data . /app/srcs
USER root
RUN chmod -R 755 /app/srcs/storage
USER www-data

View file

@ -0,0 +1,145 @@
<?php
namespace App\Auth;
use App\Models\Customer;
use Illuminate\Auth\EloquentUserProvider;
use Illuminate\Contracts\Auth\Authenticatable as UserContract;
use Illuminate\Contracts\Auth\UserProvider as UserProviderContract;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Session;
use LDC\LDCCRM\Enums\ApiError;
use LDC\LDCCRM\Exceptions\ApiErrorException;
use LDC\LDCCRM\Exceptions\CrmException;
use LDC\LDCCRM\Models\Customer as CrmCustomer;
/**
* Crm user provider to integrate nicely with Laravel
*/
class CrmUserProvider extends EloquentUserProvider implements UserProviderContract
{
/**
* The model to use, specified in auth config guard.
* @var string
*/
private $usedModel = Customer::class;
/**
* Retrieve a user by the given credentials.
*
* @param array $credentials
* @return \Illuminate\Contracts\Auth\Authenticatable|null
*/
public function retrieveByCredentials(array $credentials)
{
// * Let laravel find a model
$model = parent::retrieveByCredentials($credentials);
try {
/** @var \LDC\LDCCRM\CrmApiV2 */
$crm = app('crmAPI');
// Si pas de compte local.
if (!$model) {
$crmCustomer = $crm->getCustomer($credentials['email']);
if (!$crmCustomer) {
// * Customer is not found on CRM.
return null;
}
$model = $this->createLocalCustomer($crmCustomer);
}
return $model;
} catch (ApiErrorException $e) {
// * Customer is not found.
if ($e->getApiError()->equals(ApiError::modelNotFound())) {
return null;
}
report($e);
Log::error('Unhandled response ', $e->getApiError()->label);
} catch (CrmException | \Exception $e) {
report($e);
// Une erreur critique est survenue avec la CRM.
return null;
} //end try
Log::error(__CLASS__ . '::retrieveByCredentials reached end of possibilities.');
return null;
}
/**
* Validate a user against the given credentials.
*
* @param UserContract $model
* @param array $credentials
* @return boolean
* @throws \RuntimeException If model provided is not a Customer or connection to server fails.
* @throws \LDC\LDCCRM\Exceptions\CrmException On CRM call error.
* @throws \Exception On CRM call error.
*/
public function validateCredentials(UserContract $model, array $credentials)
{
/** @var \Illuminate\Database\Eloquent\Model $model */
if (\get_class($model) !== $this->usedModel) {
throw new \RuntimeException('Cannot authenticate any thing else than ' . $this->usedModel);
}
try {
/** @var \LDC\LDCCRM\CrmApiV2 */
$crm = app('crmAPI');
// * If has trait soft delete and customer trashed, then restore customer.
if (
\in_array(\Illuminate\Database\Eloquent\SoftDeletes::class, \class_uses_recursive($model)) and
$model->trashed()
) {
$model->restore();
}
// * Ne devrait pas survenir, $crm->login throws ApiError::authFailed()
return $crm->login($credentials['email'], $credentials['password']);
} catch (ApiErrorException $e) {
if (!$model->hashcode or !CrmCustomer::find($model->hashcode)) {
$model->forceDelete();
return false;
}
if ($e->getApiError()->equals(ApiError::authFailed())) {
return false;
}
// ! Assert Authenticable model must be valided (MustValidate trait).
if ($e->getApiError()->equals(ApiError::customerNotActivated())) {
Session::flash('warning', \trans('vous devez activer votre compte'));
return true;
}
} catch (CrmException | \Exception $e) {
report($e);
if (config('app.debug')) {
throw $e;
}
return false;
} //end try
Log::error(__CLASS__ . '::validateCredentials reached end of possibilities.');
return null;
}
/**
* Create a local customer
*
* @param \LDC\LDCCRM\Models\Customer $crmCustomer
* @return \Illuminate\Database\Eloquent\Model
* @throws \Throwable If saving to DB failed.
*/
private function createLocalCustomer(\LDC\LDCCRM\Models\Customer $crmCustomer): Model
{
/** @var \Illuminate\Database\Eloquent\Model $model */
$model = $this->usedModel::firstOrNew([
'email' => $crmCustomer->email
]);
$model->hashcode = $crmCustomer->hashcode;
$model->saveOrFail();
return $model;
}
}

View file

@ -2,9 +2,11 @@
namespace App\Console\Commands;
use App\Enums\UserRoleEnum;
use App\Models\User;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\ValidationException;
class CreateAdmin extends Command
{
@ -13,43 +15,92 @@ class CreateAdmin extends Command
*
* @var string
*/
protected $signature = 'create:admin';
protected $signature = 'user:create';
/**
* The console command description.
*
* @var string
*/
protected $description = 'creates an admin user upon password entry';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
protected $description = 'Create a backend admin user';
/**
* Execute the console command.
*
* @return int
* @return void
*/
public function handle()
{
$pwd = $this->secret('What is the password?');
$email = null;
while (is_null($email)) {
try {
$tmp = $this->ask('Type the wanted user email', 'equipe.web@ldc.fr');
$validator = Validator::make(['email' => $tmp], [
'email' => 'required|unique:users,email|email:rfc,spoof'
]);
$validator->validate();
$email = $tmp;
} catch (ValidationException $e) {
$this->error(sprintf(
'Please provide a valid email %s',
\implode(',', collect($e->errors())->flatten()->all())
));
continue;
}
}
$firstname = null;
while (is_null($firstname)) {
try {
$tmp = $this->ask('Type the wanted user firstname', 'Admin');
$validator = Validator::make(['firstname' => $tmp], [
'firstname' => 'required|min:5,max:255'
]);
$validator->validate();
$firstname = $tmp;
} catch (ValidationException $e) {
$this->error(sprintf(
'Please provide a valid firstname %s',
\implode(',', collect($e->errors())->flatten()->all())
));
continue;
}
}
$user = new User();
$user->firstname = "Informatique";
$user->lastname = "Internet";
$user->email = "informatique.internet@ldc.fr";
$user->password = Hash::make($pwd);
$user->email_verify_token = "-";
$user->email_verified = 1;
$user->role = 1;
$user->save();
$lastname = null;
while (is_null($lastname)) {
try {
$tmp = $this->ask('Type the wanted user lastname', 'Saïtama');
$validator = Validator::make(['lastname' => $tmp], [
'lastname' => 'required|min:5,max:255'
]);
$validator->validate();
$lastname = $tmp;
} catch (ValidationException $e) {
$this->error(sprintf(
'Please provide a valid lastname %s',
\implode(',', collect($e->errors())->flatten()->all())
));
continue;
}
}
$password = null;
while (
($password = $this->secret(
(!\is_null($password) ? 'Failed to confirm, ' : '') . 'Type the wanted user password'
)) !== $this->secret('Confirm the password')
) {
continue;
}; //end while
$user = new User();
$user->firstname = $firstname;
$user->lastname = $lastname;
$user->email = $email;
$user->password = $password;
$user->role = $this->confirm('Is the user a super admin?') ?
UserRoleEnum::superAdmin() : UserRoleEnum::user();
$user->saveOrFail();
$this->info('User created.');
}

View file

@ -1,85 +0,0 @@
<?php
/*
* Command Name: LDC Web Status Checker
* Description: Envoi des infos Serveur/Laravel vers LDC Web
* Version: 1.0
* Author: Vincent BRIDIER
* Author URI: vincent.bridier@ldc.fr
*/
namespace App\Console\Commands;
use Illuminate\Console\Command;
class LDCWebStatusChecker extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'ldcweb:statuschecker';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Envoi des infos Serveur/Laravel vers LDC Web';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return mixed
*/
public function handle()
{
$data = [];
$data['uuid'] = env('PROJECT_UUID');
// Sitemap.xml ?
if (file_exists(public_path() . '/sitemap.xml')) {
$data['sitemap'] = 'true';
}else{
$data['sitemap'] = 'false';
}
// Robots.txt ?
if (file_exists(public_path() . '/robots.txt')) {
$data['robots'] = 'true';
}else{
$data['robots'] = 'false';
}
//Check logs
$data['logs'] = 0;
$patherror = storage_path('/logs');
$files = glob($patherror.'/*.log');
if(count($files) > 0){
foreach ($files as $file) {
$data['logs'] = $data['logs'] + filesize($file);
}
}
$data['code']['version'] = app()->version();
// Send by cURL
$url = 'https://ldc-web.ldc.fr/api/status-checker';
$ch = curl_init($url);
$payload = ['token' => 'CE8S52Qq7stf5k8frF4T', 'datas' => json_encode($data)];
curl_setopt($ch, CURLOPT_POSTFIELDS, $payload);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
$result = curl_exec($ch);
curl_close($ch);
}
}

View file

@ -1,38 +0,0 @@
<?php
namespace App\Console\Commands;
use App\Jobs\RefreshSiteMap as JobsRefreshSiteMap;
use Illuminate\Console\Command;
class RefreshSiteMap extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'sitemap:refresh';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Run the RefreshSiteMapJob manually';
/**
* Execute the console command.
*
* @return int
*/
public function handle()
{
$this->info('Running the Job, this could take some time.');
$job = new JobsRefreshSiteMap();
$job->console = $this;
$job->handle();
$this->info('Job completed');
}
}

View file

@ -12,19 +12,16 @@ class Kernel extends ConsoleKernel
*
* @var array
*/
protected $commands = [
//
];
protected $commands = [];
/**
* Define the application's command schedule.
*
* @param \Illuminate\Console\Scheduling\Schedule $schedule
* @param \Illuminate\Console\Scheduling\Schedule $schedule
* @return void
*/
protected function schedule(Schedule $schedule)
{
// $schedule->command('inspire')->hourly();
}
/**
@ -34,7 +31,7 @@ class Kernel extends ConsoleKernel
*/
protected function commands()
{
$this->load(__DIR__.'/Commands');
$this->load(__DIR__ . '/Commands');
require base_path('routes/console.php');
}

View file

@ -0,0 +1,38 @@
<?php
namespace App\Enums;
use Kwaadpepper\Enum\BaseEnumRoutable;
/**
* @method static self professional()
* @method static self individual()
*/
final class CustomerTypeEnum extends BaseEnumRoutable
{
/**
* Enum values
*
* @return array<string,int>
*/
protected static function values(): array
{
return [
'professional' => 3,
'individual' => 4
];
}
/**
* Enum values
*
* @return array<string,string>
*/
protected static function labels(): array
{
return [
'professional' => __('Professionnel'),
'individual' => __('Particulier'),
];
}
}

View file

@ -14,6 +14,11 @@ use Kwaadpepper\Enum\BaseEnum;
*/
final class ProduitEnum extends BaseEnum
{
/**
* Enum values
*
* @return array<string,int>
*/
protected static function values(): array
{
return [
@ -26,6 +31,11 @@ final class ProduitEnum extends BaseEnum
];
}
/**
* Enum values
*
* @return array<string,string>
*/
protected static function labels(): array
{
return [
@ -38,8 +48,13 @@ final class ProduitEnum extends BaseEnum
];
}
/**
* To string
*
* @return string
*/
public function __toString(): string
{
return (string) $this->label;
return (string)$this->label;
}
}

View file

@ -0,0 +1,38 @@
<?php
namespace App\Enums;
use Kwaadpepper\Enum\BaseEnumRoutable;
/**
* @method static self superAdmin()
* @method static self admin()
*/
final class UserRoleEnum extends BaseEnumRoutable
{
/**
* Enum values
*
* @return array<string,int>
*/
protected static function values(): array
{
return [
'superAdmin' => 1,
'admin' => 2
];
}
/**
* Enum values
*
* @return array<string,string>
*/
protected static function labels(): array
{
return [
'superAdmin' => __('Super-Administrateur'),
'admin' => __('Administrateur'),
];
}
}

View file

@ -1,10 +0,0 @@
<?php
namespace App\Exceptions;
use Exception;
class CrmException extends Exception
{
//
}

View file

@ -3,23 +3,20 @@
namespace App\Exceptions;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Throwable;
class Handler extends ExceptionHandler
{
/**
* A list of the exception types that are not reported.
*
* @var array
* @var array<int,class-string<\Throwable>>
*/
protected $dontReport = [
//
];
protected $dontReport = [];
/**
* A list of the inputs that are never flashed for validation exceptions.
*
* @var array
* @var array<int,string>
*/
protected $dontFlash = [
'password',
@ -33,8 +30,10 @@ class Handler extends ExceptionHandler
*/
public function register()
{
$this->reportable(function (Throwable $e) {
//
$this->reportable(function (\Throwable $e) {
if (app()->bound('sentry')) {
app('sentry')->captureException($e);
}
});
}
}

View file

@ -1,13 +0,0 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
class AboutUsController extends Controller
{
public function index(Request $request)
{
return view('front.aboutus');
}
}

View file

@ -1,40 +0,0 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\ConfirmsPasswords;
class ConfirmPasswordController extends Controller
{
/*
|--------------------------------------------------------------------------
| Confirm Password Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling password confirmations and
| uses a simple trait to include the behavior. You're free to explore
| this trait and override any functions that require customization.
|
*/
use ConfirmsPasswords;
/**
* Where to redirect users when the intended url fails.
*
* @var string
*/
protected $redirectTo = RouteServiceProvider::HOME;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('auth');
}
}

View file

@ -1,22 +0,0 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
class ForgotPasswordController extends Controller
{
/*
|--------------------------------------------------------------------------
| Password Reset Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling password reset emails and
| includes a trait which assists in sending these notifications from
| your application to your users. Feel free to explore this trait.
|
*/
use SendsPasswordResetEmails;
}

View file

@ -1,271 +0,0 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Mail\VerifyEmail;
use App\Mail\PasswordReset;
use App\Mail\InformProVerified;
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Str;
use Illuminate\Support\Facades\Hash;
class LoginController extends Controller
{
/*
|--------------------------------------------------------------------------
| Login Controller
|--------------------------------------------------------------------------
|
| This controller handles authenticating users for the application and
| redirecting them to your home screen. The controller uses a trait
| to conveniently provide its functionality to your applications.
|
*/
use AuthenticatesUsers;
private $apiCrm;
/**
* Where to redirect users after login.
*
* @var string
*/
public function redirectTo() {
$role = Auth::user()->role;
switch ($role) {
case '1':
case '2':
return '/bo';
case '3':
return '/pro';
default:
return '/home';
}
}
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest')->except('logout');
$this->apiCrm = new \LDCCRM\ApiV1(config('crm.endpoint'), config('crm.token'));
}
public function authenticate(Request $request)
{
$request->validate([
'email' => 'required|email',
'password' => 'required',
]);
$email = filter_var($request->email, FILTER_SANITIZE_EMAIL);
$password = $request->password;
$remember = $request->remember !== null ? true : false;
$userLocal = User::where('email', $email)->first();
if ($userLocal) {
if ($userLocal->email_verified === 1) {
if ($userLocal->role !== 1 && $userLocal->role !== 2) {
$connect = $this->apiCrm->loginCustomer($email, $password);
if ($connect->status === 'OK') {
/** @var \Illuminate\Auth\SessionGuard */
$guard = Auth::guard('web');
$guard->login($userLocal, $remember);
$url = $this->redirectTo();
return redirect()->to($url);
} else {
if ($connect->code === 500) {
return back()->withInput($request->except("password"))
->withErrors("La connexion est impossible pour le moment, veuillez réessayer plus tard.");
} else {
return back()->withInput($request->except("password"))
->withErrors("Email ou mot de passe incorrect.");
}
}
}
} else {
$userLocal->email_verify_token = Str::uuid();
$userLocal->save();
Mail::to($email)->send(new VerifyEmail($userLocal));
return back()->withInput($request->except("password"))
->withErrors("Votre compte existe mais votre email n'est pas confirmé, merci de vérifier vos emails.");
}
} else {
//création d'un compte local car il existe en crm
$connect = $this->apiCrm->loginCustomer($email, $password);
if ($connect->status === 'OK') {
$userLocal = User::create([
'crm_id' => $connect->user->crm_id,
'crm_hashcode' => $connect->user->hashcode,
'firstname' => $connect->user->firstname,
'lastname' => $connect->user->lastname,
'email' => $email,
'password' => Hash::make("MOTDEPASSE"), // Quelle infamie!!!
'email_verified' => 1
]);
} else {
if ($connect->code === 116) { // Compte existant mais non activé
$userLocal = User::create([
'crm_id' => $connect->user->crm_id,
'crm_hashcode' => $connect->user->hashcode,
'firstname' => $connect->user->firstname,
'lastname' => $connect->user->lastname,
'email' => $email,
'password' => Hash::make("MOTDEPASSE"), // Quelle infamie!!!
]);
$userLocal->email_verify_token = Str::uuid();
$userLocal->save();
Mail::to($email)->send(new VerifyEmail($userLocal));
return back()->withInput($request->except("password"))
->withErrors("Votre compte existe mais votre email n'est pas confirmé, merci de vérifier vos emails.");
} elseif ($connect->code === 500) {
return back()->withInput($request->except("password"))
->withErrors("La connexion est impossible pour le moment, veuillez réessayer plus tard.");
} else {
return back()->withInput($request->except("password"))
->withErrors("Email ou mot de passe incorrect.");
}
}
}
if ($userLocal->role === 1 || $userLocal->role === 2) {
if (Auth::attempt(["email" => $email, "password" => $password], $remember)) {
return redirect()->route('bo.dashboard');
} else {
return back()->withInput($request->except('password'))->withErrors('Les identifiants entrés sont incorrects.');
}
}
}
public function confirmEmail($verifyToken)
{
$result = false;
$user = User::where('email_verify_token', $verifyToken)->first();
if (!$user) {
return view('front.confirm-email', compact('result'));
}
$activation = $this->apiCrm->activateCustomer($user->crm_id);
if ($activation->status === 'OK') {
$user->email_verified = 1;
$user->email_verify_token = null;
$user->save();
$result = true;
} else {
if ($activation->code === 110) { // User already active
$user->email_verified = 1;
$user->email_verify_token = null;
$user->save();
$result = true;
}
}
//envoi de mail à contact.jeusselin@jeusselin.fr
$email = "contact.jeusselin@jeusselin.fr";
Mail::to($email)->send(new InformProVerified($user));
return view('front.confirm-email', compact('result'));
}
public function forgotPassword(Request $request)
{
if ($request->tokenValid && $request->token) {
$tokenValid = $request->tokenValid;
$token = $request->token;
return view('front.forgot-password', compact('tokenValid', 'token'));
}
return view('front.forgot-password');
}
public function forgotPasswordReset(Request $request, $token)
{
if (!$request->hasValidSignature(false)) {
return redirect()->route('login')->withErrors("Le lien de changement de votre mot de passe n'est plus valide, veuillez réessayer.");
}
$tokenValid = false;
$user = User::where('password_token', $token)->first();
if (!$user) {
return redirect()->route('forgot-password', compact('tokenValid'))->withErrors('Le lien de changement du mot de passe est incorrect.');
}
$tokenValid = true;
return redirect()->route('forgot-password', compact('tokenValid', 'token'));
}
public function mailPassword(Request $request)
{
$email = filter_var($request->email, FILTER_SANITIZE_STRING);
$user = User::where('email', $email)->first();
if (!$user) {
$userCrm = $this->apiCrm->getCustomerByEmail($email);
if ($userCrm->status === 'OK') {
$user = User::create([
'crm_id' => $userCrm->user->crm_id,
'crm_hashcode' => $userCrm->user->hashcode,
'firstname' => $userCrm->user->firstname,
'lastname' => $userCrm->user->lastname,
'email' => $email,
'password' => Hash::make("MOTDEPASSE"), // TODO : ???
'email_verified' => 1
]);
if ($userCrm->user->status === 0){
$user->email_verified = 0;
$user->email_verify_token = Str::uuid();
$user->save();
Mail::to($email)->send(new VerifyEmail($user));
return back()->withInput($request->except( "password"))->withErrors("Votre compte existe mais votre email n'est pas confirmé, merci de vérifier vos emails.");
}
}else{
if ($userCrm->code === 101) {
return back()->withInput($request->only('email'))->withErrors("Le mail que vous avez entré n'est pas enregistré dans nos services.");
}else{
return back()->withErrors("Une erreur est survenue, veuillez réessayer plus tard.");
}
}
}
$user->password_token = Str::uuid();
$user->save();
Mail::to($email)->send(new PasswordReset($user));
return redirect()->route('login')->with('success', 'Un mail de réinitialisation de votre mot de passe vous a été envoyé(e).');
}
public function changePassword(Request $request) {
$request->validate([
'password' => 'required|min:8|confirmed',
]);
$user = User::where('password_token', filter_var($request->token, FILTER_SANITIZE_STRING))->first();
if (!$user)
return back()->withErrors('Le lien de changement de votre mot de passe est incorrect, veuillez réessayer.');
// TODO : Ajouter controle du contenu du mot de passe
$newPassword = $request->password;
$update = $this->apiCrm->changePwdCustomer($user->crm_id, $newPassword);
if ($update->status === 'OK'){
return redirect()->route('login')->with('success', 'Vous pouvez désormais vous connecter avec votre nouveau mot de passe.');
}else{
return back()->withErrors("Une erreur est survenue, veuillez réessayer plus tard.");
}
}
}

View file

@ -1,228 +0,0 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Mail\VerifyEmail;
use Illuminate\Support\Facades\Mail;
use App\Providers\RouteServiceProvider;
use App\Models\User;
use Carbon\Carbon;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
class RegisterController extends Controller
{
/*
|--------------------------------------------------------------------------
| Register Controller
|--------------------------------------------------------------------------
|
| This controller handles the registration of new users as well as their
| validation and creation. By default this controller uses a trait to
| provide this functionality without requiring any additional code.
|
*/
use RegistersUsers;
/**
* Where to redirect users after registration.
*
* @var string
*/
protected $redirectTo = RouteServiceProvider::HOME;
private $apiCrm;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
$this->apiCrm = new \LDCCRM\ApiV1(config('crm.endpoint'), config('crm.token'));
}
/**
* Get a validator for an incoming registration request.
*
* @param array $data
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function validator(array $data)
{
return Validator::make($data, [
'lastname' => 'required|string|max:255',
'firstname' => 'required|string|max:255',
'phone' => 'required|max:50',
'adress' => 'required|string|max:255',
'postal_code' => 'required|string|max:50',
'town' => 'required|string|max:255',
'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
'password' => ['required', 'string', 'min:8', 'confirmed'],
'ok_cgv' => 'accepted',
]);
}
/**
* Create a new user instance after a valid registration.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
*/
public function create(Request $request)
{
$data = $request->all();
$this->validator($data)->validate();
$lastname = filter_var($request->lastname, FILTER_SANITIZE_STRING);
$firstname = filter_var($request->firstname, FILTER_SANITIZE_STRING);
$birthdate = $request->birth_date;
$phone = filter_var($request->phone, FILTER_SANITIZE_STRING);
$email = filter_var($request->email, FILTER_SANITIZE_EMAIL);
$address = filter_var($request->adress, FILTER_SANITIZE_STRING);
//$address2 = $request->address2 !== null ? filter_var($request->address2, FILTER_SANITIZE_STRING) : null;
$postal_code = filter_var($request->postal_code, FILTER_SANITIZE_STRING);
$town = filter_var($request->town, FILTER_SANITIZE_STRING);
//$country = filter_var($request->country, FILTER_SANITIZE_STRING);
$password = $request->password;
$optin = $request->news !== null ? 1 : 0;
$user_cat = $request->user_cat;
$social_denomination = filter_var($request->social_denomination, FILTER_SANITIZE_STRING);
$tech_commercial = filter_var($request->tech_commercial, FILTER_SANITIZE_STRING);
$siret =$request->siret;
$numtva = $request->numtva;
$certiphyto = $request->certiphyto;
$certiphyto_date = $request->certiphyto_date;
$eleveur_volailles = isset($request->eleveur_volailles) ? true : false;
$eleveur_porcs = isset($request->eleveur_porcs) ? true : false;
$eleveur_bovins = isset($request->eleveur_bovins) ? true : false;
$capacite_stockage = filter_var($request->capacite_stockage, FILTER_SANITIZE_STRING);
$temps_chargement = filter_var($request->temps_chargement, FILTER_SANITIZE_STRING);
$stockage_aplat = isset($request->stockage_aplat) ? true : false;
$stockage_cellule = isset($request->stockage_cellule) ? true : false;
$adress_chargement = filter_var($request->adress_chargement, FILTER_SANITIZE_STRING);
$optional_contact = filter_var($request->optional_contact, FILTER_SANITIZE_STRING);
$ok_cgv = \Carbon\Carbon::now();
$tokenMail = Str::uuid();
$MJ = Carbon::now()->subYears(18);
if ($this->isSQLDate($birthdate)) {
$d = Carbon::createFromFormat('Y-m-d', $birthdate);
if (!$d->lessThanOrEqualTo($MJ))
return back()
->withInput($request->except('password'))
->withErrors("Vous devez être majeur pour vous inscrire.");
} elseif ($this->isFormDate($birthdate)) {
$d = Carbon::createFromFormat('d/m/Y', $birthdate);
if (!$d->lessThanOrEqualTo($MJ)) {
return back()
->withInput($request->except('password'))
->withErrors("Vous devez être majeur pour vous inscrire.");
}
$birthdate = $d->toDateString();
} else {
return back()
->withInput($request->except('password'))
->withErrors("Erreur sur le champs : date de naissance.");
}
if ($user_cat == "professionnel") {
$role = 3;
} else {
$role = 4;
}
//on inscrit que des pros dans cette phase
$role = 3;
$userData = [
'lastname' => $lastname,
'firstname' => $firstname,
'phone' => $phone,
'birth_date' => $birthdate,
'email' => $email,
'adress' => $address,
'postal_code' => $postal_code,
'town' => $town,
'password' => Hash::make($password),
'role' => $role,
'email_verify_token' => $tokenMail,
'ok_cgv' => $ok_cgv,
];
if ($role == 3) {
$proData = [
'social_denomination' => $social_denomination,
'tech_commercial' => $tech_commercial,
'siret' => $siret,
'numtva' => $numtva,
'certiphyto' => $certiphyto,
'certiphyto_date' => $certiphyto_date,
'eleveur_volailles' => $eleveur_volailles,
'eleveur_porcs' => $eleveur_porcs,
'eleveur_bovins' => $eleveur_bovins,
'capacite_stockage' => $capacite_stockage,
'temps_chargement' => $temps_chargement,
'stockage_aplat' => $stockage_aplat,
'stockage_cellule' => $stockage_cellule,
'adress_chargement' => $adress_chargement,
'optional_contact' => $optional_contact,
];
$userData = array_merge($userData, $proData);
}
//création dans la CRM
$crmUser = $this->apiCrm->createCustomer($email, $password, $firstname, $lastname, $optin, $birthdate, $phone, $address, null, $town, $postal_code, null);
//création OK
if ($crmUser->status === 'OK') {
//enregistrement local du user
$userData['crm_id'] = $crmUser->user->crm_id;
$userData['crm_hashcode'] = $crmUser->user->hashcode;
$user = User::create($userData);
//envoi du mail de vérification
Mail::to($email)->send(new VerifyEmail($user));
return redirect()->route('login')
->with('success', "Pour finaliser votre inscription, merci de cliquer sur le lien qui vient de vous être envoyé par email<br>" .
"Informations complémentaires :<br>" .
"- Vérifiez vos spams : l'email de confirmation s'y trouve peut-être<br>" .
"- Attention : le mail peut parfois mettre quelques minutes à vous parvenir<br>" .
"- L'activation de votre compte doit se faire dans les 24 heures qui suivent la demande de création.");
} else {
if ($crmUser->code === 103) {
return back()
->withInput($request->except('password') )
->withErrors("Un compte utilisateur est déjà associé à votre email.");
} else {
return back()
->withInput($request->except('password') )
->withErrors("Une erreur est survenue, merci de recommencer." . $crmUser->code. " " . $crmUser->message . " " . print_r($crmUser->errors));
}
}
}
private function isSQLDate($date)
{
if (preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $date))
return true;
return false;
}
private function isFormDate($date)
{
if (preg_match("/^(0[1-9]|[1-2][0-9]|3[0-1])\/(0[1-9]|1[0-2])\/[0-9]{4}$/", $date))
return true;
return false;
}
}

View file

@ -1,30 +0,0 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\ResetsPasswords;
class ResetPasswordController extends Controller
{
/*
|--------------------------------------------------------------------------
| Password Reset Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling password reset requests
| and uses a simple trait to include this behavior. You're free to
| explore this trait and override any methods you wish to tweak.
|
*/
use ResetsPasswords;
/**
* Where to redirect users after resetting their password.
*
* @var string
*/
protected $redirectTo = RouteServiceProvider::HOME;
}

View file

@ -1,42 +0,0 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\VerifiesEmails;
class VerificationController extends Controller
{
/*
|--------------------------------------------------------------------------
| Email Verification Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling email verification for any
| user that recently registered with the application. Emails may also
| be re-sent if the user didn't receive the original email message.
|
*/
use VerifiesEmails;
/**
* Where to redirect users after verification.
*
* @var string
*/
protected $redirectTo = RouteServiceProvider::HOME;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('auth');
$this->middleware('signed')->only('verify');
$this->middleware('throttle:6,1')->only('verify', 'resend');
}
}

View file

@ -14,16 +14,17 @@ class ArticlesController extends Controller
{
public function index(Request $request)
{
//$a = Articles::with('category')->get();
// $a = Articles::with('category')->get();
$a = $this->filterArticles($request);
$a->with('category');
$a = $a->paginate(10);
return view('bo.articles.index', compact('a'));
}
protected function filterArticles(Request $request) {
protected function filterArticles(Request $request)
{
$articles = Articles::query();
if ($request->rst) {
@ -68,40 +69,46 @@ class ArticlesController extends Controller
'content' => 'required',
]);
$title = $request->title;
$slug = Str::slug($title);
$picture = $request->picture;
$picture_r = $request->picture_r;
$content = $request->content;
$title = $request->title;
$slug = Str::slug($title);
$picture = $request->picture;
$picture_r = $request->picture_r;
$content = $request->content;
$categoryId = $request->category;
$status = 0;
$status = 0;
$imageName = Str::slug($title) .'-jeusselin-' . date('d-m-Y') . '.' . $picture->extension();
$imageName = Str::slug($title) . '-jeusselin-' . date('d-m-Y') . '.' . $picture->extension();
$picture->move(public_path('uploads/images/articles/' . date('Y') . '/' . date('m')), $imageName);
$imageName_r = Str::slug($title) .'-jeusselin-' . date('d-m-Y') . '_r.' . $picture_r->extension();
$imageName_r = Str::slug($title) . '-jeusselin-' . date('d-m-Y') . '_r.' . $picture_r->extension();
$picture_r->move(public_path('uploads/images/articles/' . date('Y') . '/' . date('m')), $imageName_r);
$a = new Articles();
$a->title = $title;
$a->slug = $slug;
$a->picture = 'uploads/images/articles/' . date('Y') . '/' . date('m') . '/' . $imageName;
$a->picture_r = 'uploads/images/articles/' . date('Y') . '/' . date('m') . '/' . $imageName_r;
$a->content = $content;
$a = new Articles();
$a->title = $title;
$a->slug = $slug;
$a->picture = 'uploads/images/articles/' . date('Y') . '/' . date('m') . '/' . $imageName;
$a->picture_r = 'uploads/images/articles/' . date('Y') . '/' . date('m') . '/' . $imageName_r;
$a->content = $content;
$a->category_id = $categoryId;
$a->status = $status;
$a->save();
$a->status = $status;
return redirect()->route('bo.articles.index');
if ($a->saveOrFail()) {
return redirect()
->route('bo.articles.index')
->with('success', trans(
':model a été crée',
['model' => 'Article']
));
}
return back();
}
public function edit($id)
{
$a = Articles::findOrFail($id);
$a = Articles::findOrFail($id);
$ac = ArticlesCategories::all();
return view('bo.articles.edit')
->with('a', $a)
->with('ac', $ac)
;
->with('ac', $ac);
}
public function update(Request $request, $id)
@ -111,24 +118,24 @@ class ArticlesController extends Controller
'content' => 'required',
]);
$title = $request->title;
$slug = Str::slug($title);
$picture = $request->picture;
$picture_r = $request->picture_r;
$content = $request->content;
$title = $request->title;
$slug = Str::slug($title);
$picture = $request->picture;
$picture_r = $request->picture_r;
$content = $request->content;
$categoryId = $request->category;
$status = $request->status === null ? 0 : 1;
$status = $request->status === null ? 0 : 1;
if ($picture !== NULL && $picture_r !== NULL){
if ($picture !== null && $picture_r !== null) {
$request->validate([
'picture' => 'image|mimes:jpeg,png,jpg|max:2048|dimensions:width=340,height=340',
'picture_r' => 'image|mimes:jpeg,png,jpg|max:2048|dimensions:width=780,height=508',
]);
}elseif ($picture !== NULL && $picture_r === NULL){
} elseif ($picture !== null && $picture_r === null) {
$request->validate([
'picture' => 'required|image|mimes:jpeg,png,jpg|max:2048|dimensions:width=340,height=340'
]);
}elseif ($picture === NULL && $picture_r !== NULL){
} elseif ($picture === null && $picture_r !== null) {
$request->validate([
'picture_r' => 'required|image|mimes:jpeg,png,jpg|max:2048|dimensions:width=780,height=508'
]);
@ -136,28 +143,32 @@ class ArticlesController extends Controller
$a = Articles::findOrFail($id);
if ($picture !== NULL){
if(file_exists(public_path() . '/' . $a->picture))
if ($picture !== null) {
if (file_exists(public_path() . '/' . $a->picture)) {
unlink(public_path() . '/' . $a->picture);
$imageName = Str::slug($title) .'.'.$picture->extension();
}
$imageName = Str::slug($title) . '.' . $picture->extension();
$picture->move(public_path('uploads/images/articles/' . date('Y') . '/' . date('m') . '/'), $imageName);
}
if ($picture_r !== NULL) {
if(file_exists(public_path() . '/' . $a->picture_r))
if ($picture_r !== null) {
if (file_exists(public_path() . '/' . $a->picture_r)) {
unlink(public_path() . '/' . $a->picture_r);
}
$imageName_r = Str::slug($title) . '_r.' . $picture_r->extension();
$picture_r->move(public_path('uploads/images/articles/' . date('Y') . '/' . date('m') . '/'), $imageName_r);
}
$a->title = $title;
$a->slug = $slug;
if ($picture !== null)
$a->slug = $slug;
if ($picture !== null) {
$a->picture = 'uploads/images/articles/' . date('Y') . '/' . date('m') . '/' . $imageName;
if ($picture_r !== null)
}
if ($picture_r !== null) {
$a->picture_r = 'uploads/images/articles/' . date('Y') . '/' . date('m') . '/' . $imageName_r;
$a->content = $content;
}
$a->content = $content;
$a->category_id = $categoryId;
$a->status = $status;
$a->status = $status;
$a->save();
if ($a->category_id == 1 && $a->status === 1) {
@ -165,20 +176,36 @@ class ArticlesController extends Controller
Cache::put('actusGlobal', $actus);
}
return redirect()->route('bo.articles.edit', $a->id)->with('success', 'Enregistré !');
if ($a->saveOrFail()) {
return redirect()
->route('bo.articles.index')
->with('success', trans(
':model a été mis à jour',
['model' => 'Article']
));
}
return back();
}
public function destroy($id)
{
$a = Articles::findOrFail($id);
if (file_exists(public_path() . '/' . $a->picture))
if (file_exists(public_path() . '/' . $a->picture)) {
unlink(public_path() . '/' . $a->picture);
if (file_exists(public_path() . '/' . $a->picture_r))
}
if (file_exists(public_path() . '/' . $a->picture_r)) {
unlink(public_path() . '/' . $a->picture_r);
}
$a->delete();
return redirect()->route('bo.articles.index');
if ($a->deleteOrFail()) {
return redirect()
->route('bo.articles.index')
->with('warning', trans(
':model a bien été supprimé',
['model' => 'Article']
));
}
return back();
}
}

View file

@ -0,0 +1,87 @@
<?php
namespace App\Http\Controllers\Bo\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Password;
class ForgotPasswordController extends Controller
{
use SendsPasswordResetEmails;
/**
* Message to user
*
* @var string
*/
private $message =
'Si votre compte existe vous devriez recevoir un message avec un lien pour réinitialiser votre mot de passe';
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest:backend');
$this->middleware('throttle', [
'maxAttempts' => 15,
'decayMinutes' => 2
]);
}
/**
* Display the form to request a password reset link.
*
* @return \Illuminate\View\View
*/
public function showLinkRequestForm()
{
return view('bo.auth.passwords.email');
}
/**
* Get the broker to be used during password reset.
*
* @return \Illuminate\Contracts\Auth\PasswordBroker
*/
public function broker()
{
return Password::broker('users');
}
/**
* Get the response for a successful password reset link.
* ! Dans les deux cas on ne divulgue pas si un user existe.
*
* @return \Illuminate\Http\RedirectResponse
*/
protected function sendResetLinkResponse()
{
return back()->with('info', trans($this->message));
}
/**
* Get the response for a failed password reset link.
* ! Dans les deux cas on ne divulgue pas si un user existe.
*
* @param \Illuminate\Http\Request $request
* @param string $response
* @return \Illuminate\Http\RedirectResponse
*/
protected function sendResetLinkFailedResponse(Request $request, string $response)
{
// ! Ne pas notifier que l'utilisateur n'existe pas.
if ($response === 'passwords.user') {
return back()->with('info', trans($this->message));
}
// * Renvoyer les autres message d'erreur style throttle.
return back()
->withInput($request->only('email'))
->withErrors(['email' => trans($response)]);
}
}

View file

@ -0,0 +1,57 @@
<?php
namespace App\Http\Controllers\Bo\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class LoginController extends Controller
{
use AuthenticatesUsers;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest:backend')->except('logout');
$this->middleware('throttle:15,2')->except('logout');
}
/**
* Get the guard to be used during authentication.
*
* @return \Illuminate\Contracts\Auth\StatefulGuard
*/
protected function guard()
{
return Auth::guard('backend');
}
/**
* Show the application's login form.
*
* @return \Illuminate\View\View
*/
public function showLoginForm()
{
return view('bo.auth.login');
}
/**
* Where to redirect users after login.
* @return string
*/
protected function redirectTo(): string
{
$intendedUrl = response()->redirectToIntended()->getTargetUrl();
$intendedRequest = Request::create($intendedUrl);
return \strpos($intendedRequest->path(), '/ bo') === 0 ?
response()->redirectToIntended()->getTargetUrl() :
\route('bo.dashboard');
}
}

View file

@ -0,0 +1,59 @@
<?php
namespace App\Http\Controllers\Bo\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ResetsPasswords;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class ResetPasswordController extends Controller
{
use ResetsPasswords;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest:backend');
$this->middleware('throttle:15,2');
}
/**
* Get the guard to be used during authentication.
*
* @return \Illuminate\Contracts\Auth\StatefulGuard
*/
protected function guard()
{
return Auth::guard('backend');
}
/**
* Where to redirect users after login.
* @return string
*/
protected function redirectTo(): string
{
return \route('bo.dashboard');
}
/**
* Display the password reset view for the given token.
*
* If no token is present, display the link request form.
*
* @param \Illuminate\Http\Request $request
* @param string|null $token
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function showResetForm(Request $request, $token = null)
{
return view('bo.auth.passwords.reset')->with(
['token' => $token, 'email' => $request->email]
);
}
}

View file

@ -15,24 +15,24 @@ class BusinessSectorsController extends Controller
*/
public function index()
{
$sector = BusinessSector::orderBy('order', 'ASC')->get();
$sector = BusinessSector::orderBy('order', 'ASC')->get();
$psectors = BusinessSector::orderBy('order', 'ASC')->get();
return view('bo.business-sector.index', compact('sector','psectors'));
return view('bo.business-sector.index', compact('sector', 'psectors'));
}
public function saveDatas(Request $request) {
public function saveDatas(Request $request)
{
$sector = $request->sectors;
for ($i = 0; $i < count($sector); $i++) {
if (isset($sector[$i]["id"])) {
$s = BusinessSector::findOrFail($sector[$i]["id"]);
$s->name = $sector[$i]["name"];
$s->order = $sector[$i]["order"];
$s = BusinessSector::findOrFail($sector[$i]["id"]);
$s->name = $sector[$i]["name"];
$s->order = $sector[$i]["order"];
$s->parent_id = $sector[$i]["parent_id"];
$s->save();
}
else {
$s = BusinessSector::updateOrCreate([
} else {
$s = BusinessSector::updateOrCreate([
'name' => $sector[$i]["name"],
'order' => $sector[$i]["order"],
'parent_id' => $sector[$i]["parent_id"],
@ -51,68 +51,63 @@ class BusinessSectorsController extends Controller
*/
public function create()
{
//
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
//
}
/**
* Display the specified resource.
*
* @param int $id
* @param integer $id
* @return \Illuminate\Http\Response
*/
public function show($id)
{
//
}
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @param integer $id
* @return \Illuminate\Http\Response
*/
public function edit($id)
{
//
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @param \Illuminate\Http\Request $request
* @param integer $id
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
//
}
/**
* Remove the specified resource from storage.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function destroy(Request $request)
{
$deleteOk = 0;
//check if there are Employees associated before deleting
//if (FaqQuestions::where('theme_id', $request->id)->count() > 0) {
// $deleteOk = 1;
//} else
// check if there are Employees associated before deleting
// if (FaqQuestions::where('theme_id', $request->id)->count() > 0) {
// $deleteOk = 1;
// } else
if ($request->id !== null) {
$sector = BusinessSector::findOrFail($request->id);
$sector->delete();

View file

@ -17,8 +17,8 @@ class CotationsController extends Controller
{
public function index(Request $request)
{
$cotations = Cotations::all();
return view('bo.cotations.index',compact('cotations'));
$cotations = Cotations::all()->sortBy('updated_at', \SORT_REGULAR, 'DESC');
return view('bo.cotations.index', compact('cotations'));
}
public function create()
@ -29,35 +29,35 @@ class CotationsController extends Controller
public function store(Request $request)
{
$request->validate([
'xmlfile' => ['required','mimes:application/xml,xml','max:2048',new Cotationsxml],
'xmlfile' => ['required','mimes:application/xml,xml','max:2048',new Cotationsxml()],
]);
$is_published = isset($request->is_published) ? true : false;
$xmlfile = $request->xmlfile;
$xmlfile = $request->xmlfile;
$path = $xmlfile->store('/cotations/' . date('Y') . '/' . date('m') . '/' . date("d"));
//save data to show in pro view
$xml = simplexml_load_string(Storage::get($path));
$json = json_encode($xml);
$data = json_decode($json,TRUE);
// save data to show in pro view
$xml = simplexml_load_string(Storage::get($path));
$json = json_encode($xml);
$data = json_decode($json, true);
$cotations = $data['enregistrement'];
//first truncate
// first truncate
CotationsData::truncate();
foreach($cotations as $cotation) {
$enreg = new CotationsData();
$enreg->produit = $cotation['Produit'];
$enreg->qualite = $cotation['Qualité'];
$enreg->recolte = $cotation['Récolte'];
foreach ($cotations as $cotation) {
$enreg = new CotationsData();
$enreg->produit = $cotation['Produit'];
$enreg->qualite = $cotation['Qualité'];
$enreg->recolte = $cotation['Récolte'];
$enreg->echeance = $cotation['Échéance'];
$enreg->prix = isset($cotation['Prix']) ? $cotation['Prix'] : null;
$enreg->prix = isset($cotation['Prix']) ? $cotation['Prix'] : null;
$enreg->save();
}
$c = new Cotations();
$c->file_path = $path;
$c = new Cotations();
$c->file_path = $path;
$c->is_published = $is_published;
$c->save();
@ -67,10 +67,10 @@ class CotationsController extends Controller
public function checkObjectives()
{
$counter = 0;
//get all cotations
// get all cotations
$cotations = CotationsData::all();
foreach ($cotations as $cotation) {
//get relevant objectives
// get relevant objectives
$objectives = Objectives::where([
['status_id', 1],
['produit', $cotation->produit],
@ -80,72 +80,75 @@ class CotationsController extends Controller
])->orderBy('updated_at', 'DESC')->get();
foreach ($objectives as $objectif) {
//check la hausse pour avertir le vendeur (agri) de l'atteinte de son objectif
if($cotation->prix >= $objectif->prix) {
//objectif atteint
// check la hausse pour avertir le vendeur (agri) de l'atteinte de son objectif
if ($cotation->prix >= $objectif->prix) {
// objectif atteint
$objectif->status_id = 2;
$objectif->goal_at = Carbon::now();
$objectif->goal_at = Carbon::now();
$objectif->save();
//envoi de message a l'agri
// envoi de message a l'agri
$this->sendMessageObjectif($objectif);
$counter += 1;
}
}
}
}//end foreach
return view('bo.cotations.checkgoals', compact('counter'));
}
protected function sendMessageObjectif($objectif)
{
//par défaut on va envoyer un mail, car on peut toujours
//envoi du mail d'alerte
Mail::to($objectif->user->email)->send(new AlertGoalAchieved($objectif));
// par défaut on va envoyer un mail, car on peut toujours
// envoi du mail d'alerte
Mail::to($objectif->customer->email)->send(new AlertGoalAchieved($objectif));
//pour le moment on est pas sur de pouvoir envoyer un sms
// pour le moment on est pas sur de pouvoir envoyer un sms
$sendSms = false;
//il va nous falloir le num de téléphone
$toPhone = $objectif->user->apiData->phone;
// il va nous falloir le num de téléphone
$toPhone = $objectif->customer->apiData->phone;
//on ne garde que les numériques
// on ne garde que les numériques
$toPhone = preg_replace('/[^0-9+]/', '', $toPhone);
//on internationalise
// on internationalise
$toPhone = preg_replace('/^0/', '+33', $toPhone);
//vérification de format de téléphone français et mobile
// vérification de format de téléphone français et mobile
if (preg_match('/^\+33[67][0-9]{8}$/', $toPhone)) {
$sendSms = true;
}
//check si ce numéro est valide pour l'envoi de SMS
// check si ce numéro est valide pour l'envoi de SMS
if ($sendSms) {
$message = "Objectif " . $objectif->produit . " " . $objectif->echeance . " atteint. Contacter votre TC avant 17h45.";
/** @var \App\Lib\LDC\MailjetSms */
$mj = app('MailjetSms');
$mj = app('MailjetSms');
$mjResponse = $mj->send($message, $toPhone);
/** @var \GuzzleHttp\Psr7\Response $mjResponse */
$responseStatus = $mjResponse->getStatusCode(); //"200"
$responsePhrase = $mjResponse->getReasonPhrase(); //"OK"
$responseStatus = $mjResponse->getStatusCode();
// "200"
$responsePhrase = $mjResponse->getReasonPhrase();
// "OK"
if ($responseStatus == 200) {
$mjSmsResponse = $mjResponse->getBody()->getContents();
}
/* $format de la $mjSmsResponse
{"ID":"6302d3eb-b135-45ff-9aca-71513cf3d5a2",
"From":"Jeusselin",
"To":"+33682398703",
"Status":{
/*
$format de la $mjSmsResponse
{"ID":"6302d3eb-b135-45ff-9aca-71513cf3d5a2",
"From":"Jeusselin",
"To":"+33682398703",
"Status":{
"Code":1,
"Name":"sent_pending",
"Description":"Message is being sent"},
"Cost":{
"Cost":{
"Value":0.04,
"Currency":"EUR"},
"CreationTS":1617289400,
"Text":"Objectif Blé Avril 21 atteint. Contacter votre TC avant 17h45.",
"SmsCount":1}
"CreationTS":1617289400,
"Text":"Objectif Blé Avril 21 atteint. Contacter votre TC avant 17h45.",
"SmsCount":1}
*/
}
}//end if
}
}

View file

@ -0,0 +1,120 @@
<?php
namespace App\Http\Controllers\Bo;
use App\Enums\CustomerTypeEnum;
use App\Http\Controllers\Controller;
use App\Http\Requests\Bo\UpdateCustomerRequest;
use App\Http\Resources\CustomerCrmResource;
use App\Mail\InformProOpenAcess;
use App\Models\Customer;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Mail;
class CustomerController extends Controller
{
/**
* Display a listing of the resource.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function index(Request $request)
{
$query = Customer::where('role', '>=', Auth::user()->role);
if ($request->search) {
$this->searchQuery(
$query,
$request->search,
null,
'firstname',
'lastname',
'email',
);
} //end if
$this->sortQuery($query);
$customers = $query->paginate(25);
$searchFields = trans('Prénom,Nom,Email');
return view('bo.customers.index', compact('customers', 'searchFields'));
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
return view('bo.users.create');
}
/**
* Show the form for editing the specified resource.
*
* @param \App\Models\Customer $customer
* @return \Illuminate\Http\Response
*/
public function edit(Customer $customer)
{
return view('bo.customers.edit', [
'customer' => $customer
]);
}
/**
* Update the specified resource in storage.
*
* @param \App\Http\Requests\Bo\UpdateCustomerRequest $request
* @param \App\Models\Customer $customer
* @return \Illuminate\Http\RedirectResponse
*/
public function update(UpdateCustomerRequest $request, Customer $customer)
{
return DB::transaction(function () use ($request, $customer) {
$customer->api_data->fill($request->validated());
$customer->fill(\array_intersect_key(
$request->validated(),
\array_flip($customer->getFillable()),
));
// * Theses props arent fillable
$customer->tc_id = \intval($request->post('tc_id'));
$customer->role = CustomerTypeEnum::make(\intval($request->post('role')));
$send_openaccess_mail = false;
if ($customer->role->equals(CustomerTypeEnum::professional())) {
// * if num client has been filled then il va falloir envoyer un mail d'information d'accès
$send_openaccess_mail = empty($customer->getOriginal('client_number')) &&
!empty($customer->client_number);
}
$customer->updateApiData(new CustomerCrmResource($customer));
$customer->saveOrFail();
// * envoi du mail d'ouverture.
if ($send_openaccess_mail) {
Mail::to($customer->email)->send(new InformProOpenAcess($customer));
}
if ($customer->saveOrFail()) {
return redirect()
->route(
'bo.customers.edit',
$customer
)
->with('success', trans(
':model a été mis à jour',
['model' => 'Client']
));
}
return back();
});
}
}

View file

@ -3,11 +3,14 @@
namespace App\Http\Controllers\Bo;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
class DashboardController extends Controller
{
public function index(Request $request)
/**
*
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function index()
{
return view('bo.dashboard.index');
}

View file

@ -18,8 +18,8 @@ class EmployeesController extends Controller
public function index()
{
$employees = Employees::orderBy('order', 'ASC')->get();
$sectors = BusinessSector::orderBy('order', 'ASC')->get();
return view('bo.employees.index',compact('employees','sectors'));
$sectors = BusinessSector::orderBy('order', 'ASC')->get();
return view('bo.employees.index', compact('employees', 'sectors'));
}
/**
@ -36,15 +36,15 @@ class EmployeesController extends Controller
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
$lastname = $request->lastname;
$lastname = $request->lastname;
$firstname = $request->firstname;
$video = $request->video;
$photo = $request->photo;
$video = $request->video;
$photo = $request->photo;
$request->validate([
'lastname' => 'required|string|max:255',
@ -54,41 +54,35 @@ class EmployeesController extends Controller
'photo' => 'required|image|mimes:jpeg,png,jpg|max:2048|dimensions:width=100,height=100',
]);
$imageName = Str::slug($firstname."-".$lastname) . '-jeusselin.' . $photo->extension();
$imageName = Str::slug($firstname . "-" . $lastname) . '-jeusselin.' . $photo->extension();
$photo->move(public_path('uploads/images/profiles/' . date('Y') . '/' . date('m')), $imageName);
$e = new Employees();
$e->civility = $request->civility;
$e->lastname = $lastname;
$e = new Employees();
$e->civility = $request->civility;
$e->lastname = $lastname;
$e->firstname = $firstname;
$e->job_title = $request->job_title;
$e->video = $video;
$e->photo = 'uploads/images/profiles/' . date('Y') . '/' . date('m') . '/' . $imageName;
$e->order = $this->getLastOrder();
$e->video = $video;
$e->photo = 'uploads/images/profiles/' . date('Y') . '/' . date('m') . '/' . $imageName;
$e->order = $this->getLastOrder();
$e->save();
//prise en charge de la liaison avec les secteurs
// prise en charge de la liaison avec les secteurs
$associatedSectors = $request->associated_sectors;
$e->businessSectors()->sync($associatedSectors);
return redirect()->route('bo.employees.index');
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id)
{
//
return redirect()
->route('bo.employees.index')
->with('success', trans(
':model a été crée',
['model' => 'Employe']
));
}
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @param integer $id
* @return \Illuminate\Http\Response
*/
public function edit($id)
@ -101,22 +95,22 @@ class EmployeesController extends Controller
$seIds[] = $sector_employee->id;
}
return view('bo.employees.edit', compact('e','s'))->with('seIds', $seIds);
return view('bo.employees.edit', compact('e', 's'))->with('seIds', $seIds);
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @param \Illuminate\Http\Request $request
* @param integer $id
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
$lastname = $request->lastname;
$lastname = $request->lastname;
$firstname = $request->firstname;
$video = $request->video;
$photo = $request->file('photo');
$video = $request->video;
$photo = $request->file('photo');
$request->validate([
'lastname' => 'required|string|max:255',
@ -125,7 +119,7 @@ class EmployeesController extends Controller
'video' => 'max:255',
]);
if($photo !== NULL) {
if ($photo !== null) {
$request->validate([
'photo' => 'image|mimes:jpeg,png,jpg|max:2048|dimensions:width=100,height=100',
]);
@ -133,63 +127,75 @@ class EmployeesController extends Controller
$e = Employees::findOrFail($id);
if($photo !== NULL) {
if(file_exists(public_path() . '/' . $e->photo))
if ($photo !== null) {
if (file_exists(public_path() . '/' . $e->photo)) {
unlink(public_path() . '/' . $e->photo);
$imageName = Str::slug($firstname."-".$lastname) . '-jeusselin.' . $photo->extension();
}
$imageName = Str::slug($firstname . "-" . $lastname) . '-jeusselin.' . $photo->extension();
$photo->move(public_path('uploads/images/profiles/' . date('Y') . '/' . date('m')), $imageName);
}
$e->civility = $request->civility;
$e->lastname = $lastname;
$e->civility = $request->civility;
$e->lastname = $lastname;
$e->firstname = $firstname;
$e->job_title = $request->job_title;
$e->video = $video;
if($photo !== NULL) {
$e->video = $video;
if ($photo !== null) {
$e->photo = 'uploads/images/profiles/' . date('Y') . '/' . date('m') . '/' . $imageName;
}
$e->save();
$e->saveOrFail();
//prise en charge de la liaison avec les secteurs
// prise en charge de la liaison avec les secteurs
$associatedSectors = $request->associated_sectors;
$e->businessSectors()->sync($associatedSectors);
return redirect()->route('bo.employees.index');
return redirect()
->route('bo.employees.index')
->with('success', trans(
':model a été mis à jour',
['model' => 'Employee']
));
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @param integer $id
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
$e = Employees::findOrFail($id);
if(file_exists(public_path() . '/' . $e->photo))
if (file_exists(public_path() . '/' . $e->photo)) {
unlink(public_path() . '/' . $e->photo);
}
//prise en charge de la liaison avec les secteurs
$e->delete();
return redirect()->route('bo.employees.index');
// prise en charge de la liaison avec les secteurs
if ($e->deleteOrFail()) {
return redirect()
->route('bo.employees.index')
->with('warning', trans(
':model a bien été supprimé',
['model' => 'Employe']
));
}
return back();
}
public function changeOrder($id, $action)
{
$current = Employees::findOrFail($id);
if ($action === 'up'){
$tmp = Employees::where('order', '<', $current->order)->orderBy('order', 'DESC')->first();
$newOrder = $tmp->order;
$tmp->order = $current->order;
if ($action === 'up') {
$tmp = Employees::where('order', '<', $current->order)->orderBy('order', 'DESC')->first();
$newOrder = $tmp->order;
$tmp->order = $current->order;
$current->order = $newOrder;
}else{
$tmp = Employees::where('order', '>', $current->order)->orderBy('order', 'ASC')->first();
$newOrder = $tmp->order;
$tmp->order = $current->order;
} else {
$tmp = Employees::where('order', '>', $current->order)->orderBy('order', 'ASC')->first();
$newOrder = $tmp->order;
$tmp->order = $current->order;
$current->order = $newOrder;
}
$tmp->save();
@ -201,8 +207,9 @@ class EmployeesController extends Controller
private function getLastOrder()
{
$order = Employees::select('order')->orderBy('order', 'DESC')->first();
if ($order === NULL)
if ($order === null) {
return 1;
}
return $order->order + 1;
}
}

View file

@ -17,7 +17,7 @@ class HomeSlidersController extends Controller
public function index()
{
$slides = HomeSliders::orderBy('order', 'ASC')->get();
return view('bo.home-sliders.index',compact('slides'));
return view('bo.home-sliders.index', compact('slides'));
}
/**
@ -33,18 +33,18 @@ class HomeSlidersController extends Controller
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
$title = $request->title;
$picture = $request->picture;
$text = $request->text;
$title = $request->title;
$picture = $request->picture;
$text = $request->text;
$linkLabel = $request->link_label;
$link = $request->link;
$newTab = $request->link_new_tab === null ? 0 : 1;
$status = 0;
$link = $request->link;
$newTab = $request->link_new_tab === null ? 0 : 1;
$status = 0;
$request->validate([
'title' => 'required|max:255',
@ -53,41 +53,37 @@ class HomeSlidersController extends Controller
'link' => 'sometimes|max:255',
]);
$imageName = Str::slug($title) .'-jeusselin.'.$picture->extension();
$imageName = Str::slug($title) . '-jeusselin.' . $picture->extension();
$picture->move(public_path('uploads/images/slider_accueil/' . date('Y') . '/' . date('m') . '/'), $imageName);
// $imageName_r = Str::slug($title) .'-jeusselin_r.'.$picture_r->extension();
// $picture_r->move(public_path('uploads/images/slider_accueil/' . date('Y') . '/' . date('m') . '/'), $imageName_r);
$hsp = new HomeSliders();
$hsp->title = $title;
$hsp = new HomeSliders();
$hsp->title = $title;
$hsp->picture = 'uploads/images/slider_accueil/' . date('Y') . '/' . date('m') . '/' . $imageName;
//$hsp->picture_r = 'uploads/images/slider_accueil/' . date('Y') . '/' . date('m') . '/' . $imageName_r;
$hsp->text = $text;
$hsp->link_label = $linkLabel;
$hsp->link = $link;
// $hsp->picture_r = 'uploads/images/slider_accueil/' . date('Y') . '/' . date('m') . '/' . $imageName_r;
$hsp->text = $text;
$hsp->link_label = $linkLabel;
$hsp->link = $link;
$hsp->link_new_tab = $newTab;
$hsp->status = $status;
$hsp->order = $this->getLastOrder();
$hsp->status = $status;
$hsp->order = $this->getLastOrder();
$hsp->save();
return redirect()->route('bo.home-sliders.index');
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id)
{
//
if ($hsp->saveOrFail()) {
return redirect()
->route('bo.home-sliders.index')
->with('success', trans(
':model a été crée',
['model' => 'Slide']
));
}
return back();
}
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @param integer $id
* @return \Illuminate\Http\Response
*/
public function edit($id)
@ -99,20 +95,21 @@ class HomeSlidersController extends Controller
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @param \Illuminate\Http\Request $request
* @param integer $id
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
$title = $request->title;
$picture = $request->picture;
$picture_r = null; //$request->picture_r;
$text = $request->text;
$title = $request->title;
$picture = $request->picture;
$picture_r = null;
// $request->picture_r;
$text = $request->text;
$linkLabel = $request->link_label;
$link = $request->link;
$newTab = $request->link_new_tab === null ? 0 : 1;
$status = $request->status === null ? 0 : 1;
$link = $request->link;
$newTab = $request->link_new_tab === null ? 0 : 1;
$status = $request->status === null ? 0 : 1;
$request->validate([
'title' => 'required|max:255',
@ -120,16 +117,16 @@ class HomeSlidersController extends Controller
'link' => 'sometimes|max:255',
]);
if ($picture !== NULL && $picture_r !== NULL){
if ($picture !== null && $picture_r !== null) {
$request->validate([
'picture' => 'image|mimes:jpeg,png,jpg|max:2048|dimensions:max-width=300,max-height=300',
'picture_r' => 'image|mimes:jpeg,png,jpg|max:2048|dimensions:width=500,height=671',
]);
}elseif ($picture !== NULL && $picture_r === NULL){
} elseif ($picture !== null && $picture_r === null) {
$request->validate([
'picture' => 'required|image|mimes:jpeg,png,jpg|max:2048|dimensions:max-width=300,max-height=300'
]);
}elseif ($picture === NULL && $picture_r !== NULL){
} elseif ($picture === null && $picture_r !== null) {
$request->validate([
'picture_r' => 'required|image|mimes:jpeg,png,jpg|max:2048|dimensions:width=500,height=671'
]);
@ -137,70 +134,89 @@ class HomeSlidersController extends Controller
$hsp = HomeSliders::findOrFail($id);
if ($picture !== NULL){
if(file_exists(public_path() . '/' . $hsp->picture))
if ($picture !== null) {
if (file_exists(public_path() . '/' . $hsp->picture)) {
unlink(public_path() . '/' . $hsp->picture);
$imageName = Str::slug($title) .'-jeusselin.'.$picture->extension();
}
$imageName = Str::slug($title) . '-jeusselin.' . $picture->extension();
$picture->move(public_path('uploads/images/slider_accueil/' . date('Y') . '/' . date('m') . '/'), $imageName);
}
if ($picture_r !== NULL) {
if(file_exists(public_path() . '/' . $hsp->picture_r))
if ($picture_r !== null) {
if (file_exists(public_path() . '/' . $hsp->picture_r)) {
unlink(public_path() . '/' . $hsp->picture_r);
}
$imageName_r = Str::slug($title) . '-jeusselin_r.' . $picture_r->extension();
$picture_r->move(public_path('uploads/images/slider_accueil/' . date('Y') . '/' . date('m') . '/'), $imageName_r);
}
$hsp->title = $title;
if ($picture !== null)
if ($picture !== null) {
$hsp->picture = 'uploads/images/slider_accueil/' . date('Y') . '/' . date('m') . '/' . $imageName;
if ($picture_r !== null)
}
if ($picture_r !== null) {
$hsp->picture_r = 'uploads/images/slider_accueil/' . date('Y') . '/' . date('m') . '/' . $imageName_r;
$hsp->text = $text;
$hsp->link_label = $linkLabel;
$hsp->link = $link;
}
$hsp->text = $text;
$hsp->link_label = $linkLabel;
$hsp->link = $link;
$hsp->link_new_tab = $newTab;
$hsp->status = $status;
$hsp->save();
return redirect()->route('bo.home-sliders.edit', $hsp->id)->with('success', 'Enregistré !');
if ($hsp->saveOrFail()) {
return redirect()
->route('bo.home-sliders.index')
->with('success', trans(
':model a été mis à jour',
['model' => 'Slide']
));
}
return back();
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @param integer $id
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
$h = HomeSliders::findOrFail($id);
if(file_exists(public_path() . '/' . $h->picture))
if (file_exists(public_path() . '/' . $h->picture)) {
unlink(public_path() . '/' . $h->picture);
if(!is_null($h->picture_r)) {
if(file_exists(public_path() . '/' . $h->picture_r))
unlink(public_path() . '/' . $h->picture_r);
}
if (!is_null($h->picture_r)) {
if (file_exists(public_path() . '/' . $h->picture_r)) {
unlink(public_path() . '/' . $h->picture_r);
}
}
$h->delete();
return redirect()->route('bo.home-sliders.index');
if ($h->deleteOrFail()) {
return redirect()
->route('bo.home-sliders.index')
->with('warning', trans(
':model a bien été supprimé',
['model' => 'Slide']
));
}
return back();
}
public function changeOrder($id, $action)
{
$current = HomeSliders::findOrFail($id);
if ($action === 'up'){
$tmp = HomeSliders::where('order', '<', $current->order)->orderBy('order', 'DESC')->first();
$newOrder = $tmp->order;
$tmp->order = $current->order;
if ($action === 'up') {
$tmp = HomeSliders::where('order', '<', $current->order)->orderBy('order', 'DESC')->first();
$newOrder = $tmp->order;
$tmp->order = $current->order;
$current->order = $newOrder;
}else{
$tmp = HomeSliders::where('order', '>', $current->order)->orderBy('order', 'ASC')->first();
$newOrder = $tmp->order;
$tmp->order = $current->order;
} else {
$tmp = HomeSliders::where('order', '>', $current->order)->orderBy('order', 'ASC')->first();
$newOrder = $tmp->order;
$tmp->order = $current->order;
$current->order = $newOrder;
}
$tmp->save();
@ -212,8 +228,9 @@ class HomeSlidersController extends Controller
private function getLastOrder()
{
$order = HomeSliders::select('order')->orderBy('order', 'DESC')->first();
if ($order === NULL)
if ($order === null) {
return 1;
}
return $order->order + 1;
}
}

View file

@ -10,7 +10,6 @@ use Illuminate\Support\Facades\Session;
class ObjectivesController extends Controller
{
/**
* Display a listing of the resource.
*
@ -18,16 +17,18 @@ class ObjectivesController extends Controller
*/
public function index(Request $request)
{
$filter_tc_id = $request->query('filter_tc_id');
$filter_tc_id = $request->query('filter_tc_id');
$objectives = $this->filterObjectives($request);
$objectives->with(['customer', 'status']);
$objectives = $objectives->paginate(10);
return view('bo.objectives.index', compact('objectives','filter_tc_id'));
return view('bo.objectives.index', compact('objectives', 'filter_tc_id'));
}
protected function filterObjectives(Request $request) {
protected function filterObjectives(Request $request)
{
$objectives = Objectives::query();
@ -47,7 +48,7 @@ class ObjectivesController extends Controller
Session::put('objectives.sort_way', $request->sort_way);
Session::save();
}
if($request->filter_tc_id) {
if ($request->filter_tc_id) {
Session::put('objectives.filter_tc_id', $request->filter_tc_id);
Session::save();
}
@ -75,28 +76,30 @@ class ObjectivesController extends Controller
case 'status_id':
$objectives = $objectives->orderBy('status_id', Session::get('objectives.sort_way'));
break;
case 'user_id':
$objectives = $objectives->orderBy('user_id', Session::get('objectives.sort_way'));
case 'customer_id':
$objectives = $objectives->orderBy('customer_id', Session::get('objectives.sort_way'));
break;
case 'tc_id':
$objectives = $objectives->select('objectives.*');
$objectives = $objectives->leftJoin('users', 'users.id', '=', 'objectives.user_id');
$objectives = $objectives->orderBy('users.tc_id', Session::get('objectives.sort_way'));
$objectives = $objectives->leftJoin('customers', 'customers.id', '=', 'objectives.customer_id');
$objectives = $objectives->orderBy('customers.tc_id', Session::get('objectives.sort_way'));
break;
}
}//end switch
if (Session::has('objectives.filter_tc_id')) {
if (Session::has('objectives.sort_col')
if (
Session::has('objectives.sort_col')
and Session::has('objectives.sort_way')
and Session::get('objectives.sort_col') == 'tc_id') {
$objectives = $objectives->where('users.tc_id', '=', Session::get('objectives.filter_tc_id'));
} else {
$objectives = $objectives->select('objectives.*');
$objectives = $objectives->leftJoin('users', 'users.id', '=', 'objectives.user_id');
$objectives = $objectives->where('users.tc_id', '=', Session::get('objectives.filter_tc_id'));
}
and Session::get('objectives.sort_col') == 'tc_id'
) {
$objectives = $objectives->where('customers.tc_id', '=', Session::get('objectives.filter_tc_id'));
} else {
$objectives = $objectives->select('objectives.*');
$objectives = $objectives->leftJoin('customers', 'customers.id', '=', 'objectives.customer_id');
$objectives = $objectives->where('customers.tc_id', '=', Session::get('objectives.filter_tc_id'));
}
}
}
}//end if
return $objectives;
}
@ -114,7 +117,7 @@ class ObjectivesController extends Controller
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
@ -125,31 +128,21 @@ class ObjectivesController extends Controller
/**
* Display the specified resource.
*
* @param int $id
* @param integer $id
* @return \Illuminate\Http\Response
*/
public function show($id)
{
$objectif = Objectives::findOrFail($id);
$objectif->load(['customer', 'status']);
return view('bo.objectives.show', compact('objectif'));
}
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function edit($id)
{
return view('bo.objectives.edit');
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @param \Illuminate\Http\Request $request
* @param integer $id
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
@ -160,7 +153,7 @@ class ObjectivesController extends Controller
/**
* Remove the specified resource from storage.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function destroy(Request $request)
@ -169,7 +162,7 @@ class ObjectivesController extends Controller
if ($request->id !== null) {
$objectif = Objectives::findOrFail($request->id);
if ($objectif->user_id == Auth::user()->id) {
if ($objectif->customer_id == Auth::guard('frontend')->user()->id) {
$objectif->delete();
} else {
$deleteOk = 3;
@ -180,52 +173,4 @@ class ObjectivesController extends Controller
return $deleteOk;
}
/**
* Store a newly created resource or update an existing one
* @param \Illuminate\Http\Request $request
* @return array $objectif
*/
public function saveProDatas(Request $request) {
//save data from Pro dashboard
$objectif = $request->objectif;
if (isset($objectif["id"])) {
$o = Objectives::findOrFail($objectif["id"]);
$o->produit = $objectif["produit"];
$o->qualite = $objectif["qualite"];
$o->quantite = $objectif["quantite"];
$o->campagne = $objectif["campagne"];
$o->prix = $objectif["prix"];
$o->echeance = $objectif["echeance"];
$o->volume_restant = $objectif["volume_restant"];
$o->observations = $objectif["observations"];
$o->save();
$objectif["status_id"] = $o->status_id;
$objectif["status"] = $o->status;
}
else {
$o = Objectives::updateOrCreate([
'produit' => $objectif["produit"],
'qualite' => $objectif["qualite"],
'quantite' => $objectif["quantite"],
'campagne' => $objectif["campagne"],
'prix' => $objectif["prix"],
'echeance' => $objectif["echeance"],
'volume_restant' => $objectif["volume_restant"],
'observations' => $objectif["observations"],
'user_id' => Auth::user()->id,
'status_id' => 1,
]);
$objectif["id"] = $o->id;
$objectif["status_id"] = $o->status_id;
$objectif["status"] = $o->status;
unset($objectif["user_id"]);
}
return $objectif;
}
}

View file

@ -13,7 +13,7 @@ class PublicPdfsController extends Controller
public function index(Request $request)
{
$publicpdfs = PublicPdfs::with('category')->get();
return view('bo.public-pdfs.index',compact('publicpdfs'));
return view('bo.public-pdfs.index', compact('publicpdfs'));
}
public function create()
@ -31,32 +31,38 @@ class PublicPdfsController extends Controller
$is_published = isset($request->is_published) ? true : false;
$pdffile = $request->pdffile;
$categoryId = $request->category;
$category = PdfCategories::findOrFail($categoryId);
$pdffile = $request->pdffile;
$categoryId = $request->category;
$category = PdfCategories::findOrFail($categoryId);
$fileName = Str::slug(pathinfo($pdffile->getClientOriginalName(),PATHINFO_FILENAME)).'.'.pathinfo($pdffile->getClientOriginalName(),PATHINFO_EXTENSION);
$pdffile->move(public_path('uploads/pdf/'. Str::slug($category->name) .'/' . date('Y') . '/' . date('m')), $fileName);
$fileName = Str::slug(pathinfo($pdffile->getClientOriginalName(), PATHINFO_FILENAME)) . '.' . pathinfo($pdffile->getClientOriginalName(), PATHINFO_EXTENSION);
$pdffile->move(public_path('uploads/pdf/' . Str::slug($category->name) . '/' . date('Y') . '/' . date('m')), $fileName);
$pdf = new PublicPdfs();
$pdf->file_name = $pdffile->getClientOriginalName();
$pdf->file_path = 'uploads/pdf/'. Str::slug($category->name) .'/' . date('Y') . '/' . date('m') . '/' . $fileName;
$pdf = new PublicPdfs();
$pdf->file_name = $pdffile->getClientOriginalName();
$pdf->file_path = 'uploads/pdf/' . Str::slug($category->name) . '/' . date('Y') . '/' . date('m') . '/' . $fileName;
$pdf->is_published = $is_published;
$pdf->category_id = $categoryId;
$pdf->save();
$pdf->category_id = $categoryId;
return redirect()->route('bo.public-pdfs.index');
if ($pdf->saveOrFail()) {
return redirect()
->route('bo.public-pdfs.index')
->with('success', trans(
':model a été crée',
['model' => 'PDF']
));
}
return back();
}
public function edit($id)
{
$pdf = PublicPdfs::findOrFail($id);
$pc = PdfCategories::all();
$pc = PdfCategories::all();
return view('bo.public-pdfs.edit')
->with('pdf', $pdf)
->with('pc', $pc)
;
->with('pc', $pc);
}
@ -67,39 +73,54 @@ class PublicPdfsController extends Controller
]);
$is_published = isset($request->is_published) ? true : false;
$pdffile = $request->pdffile;
$categoryId = $request->category;
$category = PdfCategories::findOrFail($categoryId);
$pdffile = $request->pdffile;
$categoryId = $request->category;
$category = PdfCategories::findOrFail($categoryId);
$pdf = PublicPdfs::findOrFail($id);
if ($pdffile !== NULL){
if(file_exists(public_path() . '/' . $pdf->file_path))
if ($pdffile !== null) {
if (file_exists(public_path() . '/' . $pdf->file_path)) {
unlink(public_path() . '/' . $pdf->file_path);
$fileName = Str::slug(pathinfo($pdffile->getClientOriginalName(),PATHINFO_FILENAME)).'.'.pathinfo($pdffile->getClientOriginalName(),PATHINFO_EXTENSION);
$pdffile->move(public_path('uploads/pdf/'. Str::slug($category->name) .'/' . date('Y') . '/' . date('m')), $fileName);
}
$fileName = Str::slug(pathinfo($pdffile->getClientOriginalName(), PATHINFO_FILENAME)) . '.' . pathinfo($pdffile->getClientOriginalName(), PATHINFO_EXTENSION);
$pdffile->move(public_path('uploads/pdf/' . Str::slug($category->name) . '/' . date('Y') . '/' . date('m')), $fileName);
$pdf->file_name = $pdffile->getClientOriginalName();
$pdf->file_path = 'uploads/pdf/'. Str::slug($category->name) .'/' . date('Y') . '/' . date('m') . '/' . $fileName;
$pdf->file_path = 'uploads/pdf/' . Str::slug($category->name) . '/' . date('Y') . '/' . date('m') . '/' . $fileName;
}
$pdf->is_published = $is_published;
$pdf->category_id = $categoryId;
$pdf->save();
$pdf->category_id = $categoryId;
return redirect()->route('bo.public-pdfs.edit', $pdf->id)->with('success', 'Enregistré !');
if ($pdf->saveOrFail()) {
return redirect()
->route('bo.public-pdfs.index')
->with('success', trans(
':model a été mis à jour',
['model' => 'PDF']
));
}
return back();
}
public function destroy($id)
{
$pdf = PublicPdfs::findOrFail($id);
if (file_exists(public_path() . '/' . $pdf->file_path))
if (file_exists(public_path() . '/' . $pdf->file_path)) {
unlink(public_path() . '/' . $pdf->file_path);
}
$pdf->delete();
return redirect()->route('bo.public-pdfs.index');
if ($pdf->deleteOrFail()) {
return redirect()
->route('bo.public-pdfs.index')
->with('warning', trans(
':model a bien été supprimé',
['model' => 'PDF']
));
}
return back();
}
}

View file

@ -2,19 +2,25 @@
namespace App\Http\Controllers\Bo;
use App\Enums\UserRoleEnum;
use App\Http\Controllers\Controller;
use App\Http\Resources\UserCrmResource;
use App\Http\Requests\Bo\StoreUserRequest;
use App\Http\Requests\Bo\UpdateUserRequest;
use App\Models\User;
use App\Mail\InformProOpenAcess;
use Illuminate\Support\Facades\Mail;
use Carbon\Carbon;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Auth;
class UsersController extends Controller
{
/**
* UsersController
*
* @return void
*/
public function __construct()
{
$this->authorizeResource(User::class);
}
/**
* Display a listing of the resource.
*
@ -22,7 +28,10 @@ class UsersController extends Controller
*/
public function index()
{
$users = User::where('role', '>=', Auth::user()->role)->get();
/** @var \App\Models\User */
$loggedUser = Auth::guard('backend')->user();
$users = User::query()->where('role', '>=', $loggedUser->role->value)->paginate(20);
return view('bo.users.index', compact('users'));
}
@ -39,214 +48,83 @@ class UsersController extends Controller
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\Http\Requests\Bo\StoreUserRequest $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
public function store(StoreUserRequest $request)
{
$request->validate([
'lastname' => 'required|string|max:255',
'firstname' => 'required|string|max:255',
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:8',
]);
/** @var \App\Models\User */
$loggedUser = Auth::guard('backend')->user();
$lastname = filter_var($request->lastname, FILTER_SANITIZE_STRING);
$firstname = filter_var($request->firstname, FILTER_SANITIZE_STRING);
$email = filter_var($request->email, FILTER_SANITIZE_EMAIL);
$password = $request->password;
$tokenMail = Str::uuid();
$role = $request->role;
$user = new User($request->validated());
$user->role = $loggedUser->role->equals(UserRoleEnum::superAdmin()) ?
UserRoleEnum::make(\intval($request->role)) : $loggedUser->role;
$crmId = null;
$user = new User();
$user->crm_id = $crmId;
$user->firstname = $firstname;
$user->lastname = $lastname;
$user->email = $email;
$user->password = Hash::make($password);
$user->email_verify_token = $tokenMail;
$user->email_verified = 1;
if (Auth::user()->role < $role) {
$user->role = $role;
} else {
$user->role = Auth::user()->role;
if ($user->saveOrFail()) {
return redirect()
->route('bo.users.index')
->with('success', trans(
':model a été crée',
['model' => 'Utilisateur']
));
}
$user->save();
return redirect()->route('bo.users.index')
->with('success', "utilisateur créé.");
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id)
{
//
return back();
}
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @param \App\Models\User $user
* @return \Illuminate\Http\Response
*/
public function edit($id)
public function edit(User $user)
{
$user = User::findOrFail($id);
if ($user->role < Auth::user()->role) {
return redirect()->route('bo.users.index');
}
//infos CRM
if ($user->role >= 3) {
// on utilisera les apiData
return view('bo.users.edit_pro', compact('user'));
} else {
return view('bo.users.edit', compact('user'));
}
return view('bo.users.edit', ['user' => $user]);
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Http\Response
* @param \App\Http\Requests\Bo\UpdateUserRequest $request
* @param \App\Models\User $user
* @return \Illuminate\Http\RedirectResponse
*/
public function update(Request $request, $id)
public function update(UpdateUserRequest $request, User $user)
{
//basic information
$lastname = $request->lastname;
$firstname = $request->firstname;
$email = $request->email;
$password = $request->password;
$role = $request->role;
/** @var \App\Models\User */
$loggedUser = Auth::guard('backend')->user();
$request->validate([
'lastname' => 'required|string|max:255',
'firstname' => 'required|string|max:255',
]);
$user->fill($request->validated());
$user->role = $loggedUser->role->equals(UserRoleEnum::superAdmin()) ?
UserRoleEnum::make(\intval($request->role)) : $loggedUser->role;
if (!empty($password)) {
$request->validate([
'password' => 'required|string|min:8'
]);
if ($user->saveOrFail()) {
return redirect()
->route('bo.users.index')
->with('success', trans(
':model a été mis à jour',
['model' => 'Utilisateur']
));
}
$user = User::findOrFail($id);
$user->lastname = $lastname;
$user->firstname = $firstname;
//check if mail has changed
if ($user->email != $email) {
//then validate
$request->validate([
'email' => 'required|string|email|max:255|unique:users',
]);
//and replace
$user->email = $email;
}
if (!empty($password)) {
$user->password = Hash::make($password);
}
if (Auth::user()->role < $role) {
$user->role = $role;
} else {
$user->role = Auth::user()->role;
}
$send_openaccess_mail = false;
if ($role == 3) {
//infos pro
$social_denomination = filter_var($request->social_denomination, FILTER_SANITIZE_STRING);
$tech_commercial = filter_var($request->tech_commercial, FILTER_SANITIZE_STRING);
$eleveur_volailles = isset($request->eleveur_volailles) ? true : false;
$eleveur_porcs = isset($request->eleveur_porcs) ? true : false;
$eleveur_bovins = isset($request->eleveur_bovins) ? true : false;
$capacite_stockage = filter_var($request->capacite_stockage, FILTER_SANITIZE_STRING);
$temps_chargement = filter_var($request->temps_chargement, FILTER_SANITIZE_STRING);
$stockage_aplat = isset($request->stockage_aplat) ? true : false;
$stockage_cellule = isset($request->stockage_cellule) ? true : false;
$adress_chargement = filter_var($request->adress_chargement, FILTER_SANITIZE_STRING);
$optional_contact = filter_var($request->optional_contact, FILTER_SANITIZE_STRING);
$num_client = filter_var($request->client_number, FILTER_SANITIZE_STRING);
$tc_id = $request->tc_id;
//check if num client has been filled
if (empty($user->client_number) && !empty($num_client)) {
//il va falloir envoyer un mail d'information d'accès
$send_openaccess_mail = true;
}
$user->social_denomination = $social_denomination;
$user->tech_commercial = $tech_commercial;
$user->eleveur_volailles = $eleveur_volailles;
$user->eleveur_porcs = $eleveur_porcs;
$user->eleveur_bovins = $eleveur_bovins;
$user->capacite_stockage = $capacite_stockage;
$user->temps_chargement = $temps_chargement;
$user->stockage_aplat = $stockage_aplat;
$user->stockage_cellule = $stockage_cellule;
$user->adress_chargement = $adress_chargement;
$user->optional_contact = $optional_contact;
$user->client_number = $num_client;
$user->tc_id = $tc_id;
$phone = $request->phone;
$user->apiData->phone = $phone;
$user->updateApiData(new UserCrmResource($user));
}
$user->save();
//envoi du mail d'ouverture
if ($send_openaccess_mail) {
Mail::to($email)->send(new InformProOpenAcess($user));
}
return redirect()->route('bo.users.edit', ['user' => $user->id])->with('success', 'Enregistré !');
return back();
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @param \App\Models\User $user
* @return \Illuminate\Http\Response
*/
public function destroy($id)
public function destroy(User $user)
{
$u = User::findOrFail($id);
//cannot delete self :
if (Auth::user()->id == $id) {
return redirect()
->route('bo.users.edit', ['user' => $id])
->withErrors('For security reasons you cannot delete yourself!');
}
if ($u->role < Auth::user()->role) {
//in theory you should never be here
if ($user->deleteOrFail()) {
return redirect()
->route('bo.users.index')
->withErrors('For security reasons you cannot delete this account!');
->with('warning', trans(
':model a bien été supprimé',
['model' => 'Utilisateur']
));
}
$u->delete();
return redirect()->route('bo.users.index');
return back();
}
}

View file

@ -1,13 +0,0 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
class CSRController extends Controller
{
public function index(Request $request)
{
return view('front.csr');
}
}

View file

@ -1,13 +0,0 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
class ContactUsController extends Controller
{
public function index(Request $request)
{
return view('front.contactus');
}
}

View file

@ -2,12 +2,124 @@
namespace App\Http\Controllers;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Facades\Session;
class Controller extends BaseController
{
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
use AuthorizesRequests;
use DispatchesJobs;
use ValidatesRequests;
/**
* Build Search query on specified fields
* splitting search into words or using whole sentence
*
* @param \Illuminate\Database\Eloquent\Builder $query The eloquent query builder.
* @param string $search The query string.
* @param callable $searchQuery The query string.
* @param string ...$fields Either a simple array or a string
* in case of a string the two fields
* would be concatenate to make the search.
* @return \Illuminate\Database\Eloquent\Builder
*/
protected function searchQuery(
Builder $query,
string $search,
callable $searchQuery = null,
string ...$fields
): Builder {
if (count($fields)) {
// Search using words.
$words = explode(' ', $search);
$query->where(function ($query) use ($searchQuery, $words, $search, $fields) {
foreach ($words as $word) {
if (!strlen($word)) {
continue;
}
$this->searchOnFields($query, $word, $fields);
} //end foreach
// Search whole using whole sentence.
$this->searchOnFields($query, $search, $fields);
if ($searchQuery) {
$searchQuery($query);
}
});
} //end if
return $query;
}
/**
* Build query search on all fields
*
* @param \Illuminate\Database\Eloquent\Builder $query
* @param string $search
* @param array $fields
* @return \Illuminate\Database\Eloquent\Builder
*/
private function searchOnFields(Builder $query, string $search, array $fields): Builder
{
$table = $query->getModel()->getTable();
foreach ($fields as $f) {
$f = str_replace('?', '\?', $f);
if (is_array($f)) {
$query->orWhereRaw(
sprintf("UPPER(CONCAT(%s)) LIKE UPPER(?)", collect($f)->map(function ($q) use ($table) {
return "`$table`.`$q`";
})->implode(', \' \', ')),
['%' . filter_var($search, FILTER_SANITIZE_STRING) . '%']
);
} else {
$query->orWhereRaw(
"UPPER(`$table`.`$f`) LIKE UPPER(?)",
['%' . filter_var($search, FILTER_SANITIZE_STRING) . '%']
);
}
}
return $query;
}
/**
* Sort columns with a query
*
* @param \Illuminate\Database\Eloquent\Builder $query
* @param array $ignore
* @return \Illuminate\Database\Eloquent\Builder
*/
protected function sortQuery(Builder $query, array $ignore = []): Builder
{
$rName = request()->route()->getName();
$table = $query->getModel()->getTable();
if (request()->sort_col) {
Session::put("$rName.sort_col", request()->sort_col);
Session::put("$rName.sorted", true);
}
if (request()->sort_way) {
Session::put("$rName.sort_way", request()->sort_way);
Session::put("$rName.sorted", true);
}
if (request()->rst) {
Session::remove("$rName.sorted");
Session::remove("$rName.sort_col");
Session::remove("$rName.sort_way");
}
if (request()->sort_col and request()->sort_way and Schema::hasColumn($table, request()->sort_col)) {
if (
!isset($ignore) or
(isset($ignore) and !in_array(request()->sort_col, $ignore))
) {
$query = $query->orderBy(\sprintf("$table.%s", request()->sort_col), request()->sort_way);
}
} elseif (Schema::hasColumn($table, 'order')) {
$query = $query->orderBy('order', 'ASC');
Session::put("$rName.sort_col", 'order');
Session::put("$rName.sort_way", 'asc');
}
return $query;
}
}

View file

@ -0,0 +1,17 @@
<?php
namespace App\Http\Controllers\Fo;
use App\Http\Controllers\Controller;
class AboutUsController extends Controller
{
/**
*
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function index()
{
return view('fo.aboutus');
}
}

View file

@ -0,0 +1,35 @@
<?php
namespace App\Http\Controllers\Fo\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ConfirmsPasswords;
use Illuminate\Support\Facades\Auth;
class ConfirmPasswordController extends Controller
{
use ConfirmsPasswords;
/**
* Display the password confirmation view.
*
* @return \Illuminate\View\View
*/
public function showConfirmForm()
{
if (Auth::guard('frontend')->check()) {
return \response()->redirectToRoute('home');
}
return view('fo.auth.passwords.confirm');
}
/**
* Get the post register / login redirect path.
*
* @return string
*/
public function redirectPath()
{
return response()->redirectToRoute('fo.customer.dashboard')->getTargetUrl();
}
}

View file

@ -0,0 +1,83 @@
<?php
namespace App\Http\Controllers\Fo\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Password;
class ForgotPasswordController extends Controller
{
use SendsPasswordResetEmails;
/**
* Message to user
*
* @var string
*/
private $message =
'Si votre compte existe vous devriez recevoir un message avec un lien pour réinitialiser votre mot de passe';
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest:frontend');
$this->middleware('throttle:3,1')->only('sendResetLinkEmail');
}
/**
* Display the form to request a password reset link.
*
* @return \Illuminate\View\View
*/
public function showLinkRequestForm()
{
return view('fo.auth.passwords.email');
}
/**
* Get the broker to be used during password reset.
*
* @return \Illuminate\Contracts\Auth\PasswordBroker
*/
public function broker()
{
return Password::broker('customers');
}
/**
* Get the response for a successful password reset link.
* ! Dans les deux cas on ne divulgue pas si un user existe.
*
* @return \Illuminate\Http\RedirectResponse
*/
protected function sendResetLinkResponse()
{
return back()->with('info', trans($this->message));
}
/**
* Get the response for a failed password reset link.
* ! Dans les deux cas on ne divulgue pas si un user existe.
*
* @param \Illuminate\Http\Request $request
* @param string $response
* @return \Illuminate\Http\RedirectResponse
*/
protected function sendResetLinkFailedResponse(Request $request, string $response)
{
// ! Ne pas notifier que l'utilisateur n'existe pas.
if ($response === 'passwords.user') {
return back()->with('info', trans($this->message));
}
// * Renvoyer les autres message d'erreur style throttle.
return back()
->withInput($request->only('email'))
->withErrors(['email' => trans($response)]);
}
}

View file

@ -0,0 +1,92 @@
<?php
namespace App\Http\Controllers\Fo\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Foundation\Auth\ThrottlesLogins;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Session;
class LoginController extends Controller
{
use AuthenticatesUsers;
use ThrottlesLogins;
/**
* Where to redirect users after login.
*
* @var string
*/
protected $redirectTo = RouteServiceProvider::HOME;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest:frontend')->except('logout');
}
/**
* Get the guard to be used during authentication.
*
* @return \Illuminate\Contracts\Auth\StatefulGuard
*/
protected function guard()
{
return Auth::guard('frontend');
}
/**
* Show the application's login form.
*
* @return \Illuminate\View\View
*/
public function showLoginForm()
{
return view('fo.auth.login');
}
/**
* The user has been authenticated.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Database\Eloquent\Model $user
* @return mixed
* @phpcs:disable Squiz.Commenting.FunctionComment.TypeHintMissing, Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed
*/
protected function authenticated(Request $request, Model $user)
{
$user->last_connection = \now();
$user->saveOrFail();
Session::flash('info', trans('Vous êtes à présent connecté'));
}
/**
* The user has logged out of the application.
*
* @param \Illuminate\Http\Request $request
* @return mixed
* @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass
*/
protected function loggedOut(Request $request)
{
Session::flash('info', trans('Vous êtes à présent déconnecté'));
}
/**
* Get the post register / login redirect path.
*
* @return string
*/
public function redirectPath()
{
return response()->redirectToIntended()->getTargetUrl();
}
}

View file

@ -0,0 +1,175 @@
<?php
namespace App\Http\Controllers\Fo\Auth;
use App\Http\Controllers\Controller;
use App\Http\Requests\Fo\Customers\CreateAccountRequest;
use App\Models\Customer;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Session;
use Illuminate\Validation\ValidationException;
use LDC\LDCCRM\Enums\ApiError;
use LDC\LDCCRM\Enums\Country;
use LDC\LDCCRM\Exceptions\ApiErrorException;
use LDC\LDCCRM\Exceptions\ValidationException as ExceptionsValidationException;
use LDC\LDCCRM\Models\Customer as CrmCustomer;
class RegisterController extends Controller
{
use RegistersUsers;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest:frontend');
}
/**
* Get the guard to be used during authentication.
*
* @return \Illuminate\Contracts\Auth\StatefulGuard
*/
protected function guard()
{
return Auth::guard('frontend');
}
/**
* Show the application registration form.
*
* @return \Illuminate\View\View
*/
public function showRegistrationForm()
{
return view('fo.auth.register');
}
/**
* Get a validator for an incoming registration request.
*
* @param array $data
* @return \Illuminate\Contracts\Validation\Validator
* @throws \Illuminate\Validation\ValidationException If data is incorrect.
*/
protected function validator(array $data)
{
$data['ok_cgv'] = \request()->boolean('ok_cgv');
$data['phone'] = $data['phone'] ?? null;
$data['opt_in'] = ($data['opt_in'] ?? false) ? true : false;
return CreateAccountRequest::capture()->setContainer(app())->getValidator();
}
/**
* Create a new user instance after a valid registration.
*
* @param array $data
* @return \App\Models\Customer
* @throws \Illuminate\Validation\ValidationException If there are validation errors.
* @throws \RuntimeException On unhandled api Error.
*/
protected function create(array $data)
{
// * OK CGV has to be validated as true.
$data['country'] = Country::france();
$data['ok_cgv'] = \now();
$data['phone'] = Arr::get($data, 'phone');
$data['role'] = intval(Arr::get($data, 'user_cat'));
\collect([
'opt_in', 'eleveur.eleveur_porcs',
'eleveur.eleveur_volailles', 'stockage.stockage_aplat',
'eleveur.eleveur_bovins', 'stockage.stockage_cellule'
])->each(function (string $fieldName) use (&$data) {
$data[Arr::last(\explode('.', $fieldName))] = Arr::get($data, $fieldName) ? true : false;
});
try {
return DB::transaction(function () use ($data) {
$crmCustomer = new CrmCustomer($this->getOnlyCrmData($data));
// * Country Is forced to france
$crmCustomer->country = Country::france();
$crmCustomer->save();
// * Enregistrement du Hashcode
/** @var \App\Models\Customer $customer */
$customer = new Customer($data);
$customer->hashcode = $crmCustomer->hashcode;
$customer->role = $data['role'];
// * Customer will be logged in.
$customer->last_connection = \now();
$customer->saveOrFail();
if ($customer->saveOrFail()) {
// phpcs:ignore Generic.Files.LineLength.TooLong
Session::flash('success', trans('Votre compte à bien été crée, vous devez valider votre adresse email, un email de confirmation vous à été envoyé.'));
}
return $customer;
});
} catch (ApiErrorException $e) {
if ($e->getApiError()->equals(ApiError::customerExists())) {
throw ValidationException::withMessages([
'error' => 'Un compte est déjà associé à cette adresse email.'
]);
}
if ($e->getApiError()->equals(ApiError::validationFailed())) {
throw ValidationException::withMessages([
'error' => $e->getMessage()
]);
}
report($e);
Log::error(__CLASS__ . '::create reached end of possibilities.');
throw new \RuntimeException(__CLASS__ . '::create reached end of possibilities.');
} catch (ExceptionsValidationException $e) {
throw ValidationException::withMessages([
'error' => $e->getMessage()
]);
} //end try
}
/**
* Get the post register / login redirect path.
*
* @return string
*/
public function redirectPath()
{
return response()->redirectToRoute('fo.customer.dashboard')->getTargetUrl();
}
/**
* Get only data used in crm
*
* @param array $data
* @return array
*/
private function getOnlyCrmData(array $data): array
{
return \array_intersect_key(
$data,
[
'firstname' => '',
'lastname' => '',
'birth_date' => '',
'address' => '',
'postcode' => '',
'country' => '',
'city' => '',
'phone' => '',
'email' => '',
'password' => '',
'opt_in' => '',
]
);
}
}

View file

@ -0,0 +1,121 @@
<?php
namespace App\Http\Controllers\Fo\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Auth\Events\PasswordReset;
use Illuminate\Foundation\Auth\ResetsPasswords;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Password;
use Illuminate\Support\Str;
use Illuminate\Validation\ValidationException;
use LDC\LDCCRM\Exceptions\ApiErrorException;
use LDC\LDCCRM\Exceptions\CrmException;
use LDC\LDCCRM\Exceptions\ValidationException as ExceptionsValidationException;
class ResetPasswordController extends Controller
{
use ResetsPasswords;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest:frontend');
}
/**
* Get the guard to be used during authentication.
*
* @return \Illuminate\Contracts\Auth\StatefulGuard
*/
protected function guard()
{
return Auth::guard('frontend');
}
/**
* Display the password reset view for the given token.
*
* If no token is present, display the link request form.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function showResetForm(Request $request)
{
$token = $request->route()->parameter('token');
return view('fo.auth.passwords.reset')->with(
['token' => $token, 'email' => $request->email]
);
}
/**
* Reset the given user's password.
*
* @param mixed $customer
* @param mixed $password
* @return void
* @throws \Illuminate\Validation\ValidationException If something goes wrong.
*/
protected function resetPassword($customer, $password)
{
/** @var \App\Models\Customer\Customer $user */
/** @var string $password */
/** @var \LDC\LDCCRM\CrmApiV2 */
$crm = app('crmAPI');
try {
if (!($crmCustomer = $crm->getCustomer($customer->hashcode))) {
throw ValidationException::withMessages([
'error' => 'Changement impossible, compte inexistant.'
]);
}
$crmCustomer->password = $password;
$crmCustomer->save();
} catch (\TypeError | CrmException | ApiErrorException $e) {
report($e);
throw ValidationException::withMessages([
'error' => 'Une erreur est survenue, merci de réessayer ultérieurement.'
]);
} catch (ExceptionsValidationException $e) {
throw ValidationException::withMessages([
'error' => $e->getMessage()
]);
}
$customer->setRememberToken(Str::random(60));
$customer->save();
event(new PasswordReset($customer));
$this->guard()->login($customer);
}
/**
* Get the post register / login redirect path.
*
* @return string
*/
public function redirectPath()
{
return response()->redirectToRoute('fo.customer.dashboard')->getTargetUrl();
}
/**
* Get the broker to be used during password reset.
*
* @return \Illuminate\Contracts\Auth\PasswordBroker
*/
public function broker()
{
return Password::broker('customers');
}
}

View file

@ -0,0 +1,47 @@
<?php
namespace App\Http\Controllers\Fo\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\VerifiesEmails;
use Illuminate\Http\Request;
class VerificationController extends Controller
{
use VerifiesEmails;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('auth:frontend');
$this->middleware('signed:relative')->only('verify');
$this->middleware('throttle:6,1')->only('verify', 'resend');
}
/**
* Show the email verification notice.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
*/
public function show(Request $request)
{
return $request->user()->hasVerifiedEmail()
? redirect($this->redirectPath())
: view('fo.auth.verify');
}
/**
* Get the post register / login redirect path.
*
* @return string
*/
public function redirectPath()
{
return response()->redirectToRoute('fo.customer.dashboard')->getTargetUrl();
}
}

View file

@ -0,0 +1,17 @@
<?php
namespace App\Http\Controllers\Fo;
use App\Http\Controllers\Controller;
class CSRController extends Controller
{
/**
*
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function index()
{
return view('fo.csr');
}
}

View file

@ -0,0 +1,17 @@
<?php
namespace App\Http\Controllers\Fo;
use App\Http\Controllers\Controller;
class ContactUsController extends Controller
{
/**
*
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function index()
{
return view('fo.contactus');
}
}

View file

@ -0,0 +1,22 @@
<?php
namespace App\Http\Controllers\Fo;
use App\Http\Controllers\Controller;
use App\Models\HomeSliders;
class HomeController extends Controller
{
/**
*
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function index()
{
$slides = HomeSliders::where([
['status', 1]
])->orderBy('order', 'ASC')->get();
return view('fo.home', compact('slides'));
}
}

View file

@ -0,0 +1,17 @@
<?php
namespace App\Http\Controllers\Fo;
use App\Http\Controllers\Controller;
class LegalNoticeController extends Controller
{
/**
*
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function index()
{
return view('fo.legalnotice');
}
}

View file

@ -0,0 +1,35 @@
<?php
namespace App\Http\Controllers\Fo;
use App\Http\Controllers\Controller;
use App\Models\Articles;
class NewsController extends Controller
{
/**
*
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function index()
{
$articles = Articles::where([
['status', 1],
['category_id', 1]
])->orderBy('created_at', 'ASC')->paginate(4);
return view('fo.news.index', compact('articles'));
}
/**
*
* @param string $slug
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function show(string $slug)
{
$article = Articles::where('slug', $slug)->firstOrFail();
return view('fo.news.article', compact('article'));
}
}

View file

@ -0,0 +1,29 @@
<?php
namespace App\Http\Controllers\Fo;
use App\Http\Controllers\Controller;
use App\Models\BusinessSector;
use App\Models\Employees;
class OurTradeController extends Controller
{
/**
*
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function index()
{
$secteurs_simples = BusinessSector::query()->orderBy('order', 'ASC')
->where('parent_id', null)->doesnthave('children')
->with('employees')->orderBy('order', 'ASC')->get();
$secteurs_complexes = BusinessSector::query()->orderBy('order', 'ASC')
->where('parent_id', null)->has('children')
->with('employees', 'children.employees')->orderBy('order', 'ASC')->get();
$nine_videos = Employees::query()->select('video', 'photo', 'firstname', 'lastname', 'job_title')
->whereNotNull('video')->inRandomOrder()->limit(9)->get();
return view('fo.ourtrade', compact('secteurs_simples', 'secteurs_complexes', 'nine_videos'));
}
}

View file

@ -0,0 +1,17 @@
<?php
namespace App\Http\Controllers\Fo;
use App\Http\Controllers\Controller;
class PrivacyPolicyController extends Controller
{
/**
*
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function index()
{
return view('fo.privacypolicy');
}
}

View file

@ -0,0 +1,164 @@
<?php
namespace App\Http\Controllers\Fo\Pro;
use App\Http\Controllers\Controller;
use App\Http\Requests\Fo\Customers\UpdateInfosRequest;
use App\Http\Requests\Fo\Customers\UpdatePasswordRequest;
use App\Http\Resources\CustomerCrmResource;
use App\Mail\InformProChangeInfos;
use App\Models\Customer;
use Illuminate\Auth\Events\PasswordReset;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Mail;
use Illuminate\Validation\ValidationException;
use LDC\LDCCRM\Enums\ApiError;
use LDC\LDCCRM\Exceptions\ApiErrorException;
use LDC\LDCCRM\Exceptions\CrmException;
use LDC\LDCCRM\Exceptions\ValidationException as CrmValidationException;
class CustomerController extends Controller
{
/**
* CustomerController
*
* @return void
*/
public function __construct()
{
$this->authorizeResource(Customer::class);
}
/**
* Display a listing of the resource.
*
* @param \App\Models\Customer $customer
* @return \Illuminate\Http\Response
*/
public function edit(Customer $customer)
{
return view('fo.pro.customer.edit', [
'customer' => $customer
]);
}
/**
* Update the specified resource in storage.
*
* @param \App\Http\Requests\Fo\Customers\UpdateInfosRequest $request
* @param \App\Models\Customer $customer
* @return \Illuminate\Http\Response
*/
public function update(UpdateInfosRequest $request, Customer $customer)
{
return DB::transaction(function () use ($request, $customer) {
$data = \array_merge($request->validated(), ['tc_id' => $request->post('tc_id')]);
if ($this->updateCrmCustomerInfo($customer, $data)) {
// * envoi du mail de modification
$email = "contact.jeusselin@jeusselin.fr";
// TODO : should be an app setting.
Mail::to($email)->send(new InformProChangeInfos($customer));
return back()->with('success', trans('Vos informations ont bien été enregistrées.'));
}
return back()->withInput()->with(
'faillure',
trans(
'Une erreur est survenue, merci de réessayer ultérieurement.'
)
);
});
}
/**
* Customer change password view
*
* @param \App\Models\Customer $customer
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function password(Customer $customer)
{
$this->authorize('updatePassword', $customer);
return view('fo.pro.customer.change-mdp', ['customer' => $customer]);
}
/**
* Changement de mot de passe depuis le profil
*
* @param \App\Http\Requests\Fo\Customers\UpdatePasswordRequest $request
* @param \App\Models\Customer $customer
* @return \Illuminate\Http\RedirectResponse
*/
public function updatePassword(UpdatePasswordRequest $request, Customer $customer)
{
$this->authorize('updatePassword', $customer);
if ($this->updateCrmCustomerInfo($customer, ['password' => $request->post('password')])) {
event(new PasswordReset($customer));
return back()->with('success', trans('Vos informations ont bien été enregistrées.'));
}
return back()->withInput()->with(
'faillure',
trans('Une erreur est survenue, merci de réessayer ultérieurement.')
);
}
/**
* Updates user info
*
* @param \App\Models\Customer $customer
* @param array $data
* @return boolean
* @throws \Illuminate\Validation\ValidationException If something failed.
*/
private function updateCrmCustomerInfo(Customer $customer, array $data)
{
return DB::transaction(function () use ($customer, $data) {
try {
/** @var \LDC\LDCCRM\Models\Customer */
$crmCustomer = $customer->apiData;
if (\array_key_exists('email', $data)) {
$customer->email = $data['email'];
$customer->saveOrFail();
}
$crmCustomer->fill($data);
$saved = $crmCustomer->save();
$customer->api_data->fill($data);
$customer->fill(\array_intersect_key(
$data,
\array_flip($customer->getFillable()),
));
if (Arr::has($data, 'tc_id')) {
// * Theses props arent fillable
$customer->tc_id = \intval(Arr::get($data, 'tc_id'));
}
$customer->updateApiData(new CustomerCrmResource($customer));
$customer->saveOrFail();
return $saved;
} catch (CrmValidationException $e) {
throw ValidationException::withMessages([
'error' => $e->getMessage()
]);
} catch (CrmException $e) {
return false;
} catch (ApiErrorException $e) {
if ($e->getApiError()->equals(ApiError::validationFailed())) {
throw ValidationException::withMessages([
'error' => $e->getMessage()
]);
}
report($e);
return false;
} //end try
});
}
}

View file

@ -0,0 +1,159 @@
<?php
namespace App\Http\Controllers\Fo\Pro;
use App\Http\Controllers\Controller;
use App\Models\CotationsData;
use App\Models\Objectives;
use App\Models\PublicPdfs;
use App\Models\Articles;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Carbon;
class DashboardController extends Controller
{
/**
* AGRISPECTIVES
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function index(Request $request)
{
// $cotations = CotationsData::whereNotNull('prix')->orderBy('produit')->orderBy('qualite')->orderBy('recolte')
$cotations = CotationsData::query()
->select('produit', 'qualite', 'recolte', DB::raw("GROUP_CONCAT(echeance,'::',COALESCE(prix,'--') SEPARATOR '|@|') AS prices"))
->whereNotNull('prix')
->groupBy('produit')
->groupBy('qualite')
->groupBy('recolte')
->orderBy('produit')
->get();
$mps = CotationsData::query()->select('produit')->distinct()->orderBy('produit')->get();
$dateMajCotations = CotationsData::query()->select('updated_at')->orderBy('id', 'DESC')->first();
$dbobjectif = new Objectives();
// * capte les nouvelles colonnes éventuelles
$nullData = array_combine(
$dbobjectif->getFillable(),
array_fill(0, count($dbobjectif->getFillable()), null)
);
$dbobjectif->fill($nullData);
$dbobjectif->produit = '--';
$dbobjectif->qualite = '--';
$dbobjectif->campagne = '--';
$dbobjectif->quantite = 0;
// $dbobjectif->prix = 0;
$dbobjectif->echeance = '--';
$dbobjectif->volume_restant = 0;
// $dbobjectif->observations = '';
$dbmyObjectives = Objectives::query()->with('status')->whereHas('customer', function (Builder $q) {
$q->where('id', Auth::guard('frontend')->user()->id);
})->orderBy('updated_at', 'DESC')->get();
$formEnums = $this->getObjectivesFormEnums();
$pdfsAnalyse = PublicPdfs::query()->where('category_id', 1)
->where('is_published', true)->orderBy('created_at', 'DESC')->get();
$pdfsMarches = PublicPdfs::query()->where('category_id', 2)
->where('is_published', true)->orderBy('created_at', 'DESC')->get();
// * par défaut le marché est fermé
// * si on est (un jour de semaine) après 11h ou avant 17h45 alors ouvert
$market_closed = true;
// * Current time
$time = Carbon::now();
// * set time to 11:00
$start = Carbon::create($time->year, $time->month, $time->day, 11, 0, 0);
// * set time to 17:45
$end = Carbon::create($time->year, $time->month, $time->day, 17, 45, 0);
if ($time->isWeekday()) {
if ($time->between($start, $end, true)) {
$market_closed = false;
}
}
$dayMaj = Carbon::createFromFormat('Y-m-d H:i:s', $dateMajCotations->updated_at)->startOfDay();
$today = Carbon::now()->startOfDay();
// * we suppose we have cotations today
$noCotationsYet = false;
if ($today > $dayMaj) {
// * we don't have the cotations yet
$noCotationsYet = true;
}
$articles = Articles::where([
['status', 1],
['category_id', 2]
])->orderBy('created_at', 'ASC')->paginate(4);
return view(
'fo.pro.dashboard.index',
compact(
'cotations',
'mps',
'dbobjectif',
'dbmyObjectives',
'formEnums',
'pdfsAnalyse',
'pdfsMarches',
'dateMajCotations',
'market_closed',
'noCotationsYet',
'articles'
)
);
}
public function waiting(Request $request)
{
/** @var \App\Models\Customer */
$customer = Auth::guard('frontend')->user();
if ($customer->is_validated_pro) {
return \response()->redirectToRoute('fo.pro.dashboard');
}
return view('fo.pro.dashboard.waiting');
}
private function getObjectivesFormEnums()
{
$enums = array();
/** @var \Illuminate\Database\Eloquent\Collection<integer,\App\Models\CotationsData> */
$produitEnum = CotationsData::query()->select('produit AS value')->distinct()->get();
$enums['produit'] = $produitEnum;
$qualiteEnum = array();
foreach ($produitEnum as $produit) {
$qualiteEnum[$produit->value] = CotationsData::query()
->select('qualite AS value')->distinct()->where('produit', $produit->value)->get();
}
$enums['qualite'] = $qualiteEnum;
$campagneEnum = array();
foreach ($produitEnum as $produit) {
$campagneEnum[$produit->value] = CotationsData::query()
->select('recolte AS value')->distinct()->where('produit', $produit->value)->get();
}
$enums['campagne'] = $campagneEnum;
$echeanceEnum = array();
foreach ($produitEnum as $produit) {
foreach ($campagneEnum[$produit->value] as $campagne) {
$echeanceEnum[$produit->value][$campagne->value] = CotationsData::query()
->select('echeance AS value')->distinct()
->where('produit', $produit->value)
->where('recolte', $campagne->value)
->whereNotNull('prix')
->get();
}
}
$enums['echeance'] = $echeanceEnum;
return $enums;
}
}

View file

@ -0,0 +1,82 @@
<?php
namespace App\Http\Controllers\Fo\Pro;
use App\Http\Controllers\Controller;
use App\Models\Objectives;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class ObjectivesController extends Controller
{
/**
* Remove the specified resource from storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function destroy(Request $request)
{
$deleteOk = 0;
if ($request->id !== null) {
$objectif = Objectives::findOrFail($request->id);
if ($objectif->customer_id == Auth::guard('frontend')->user()->id) {
$objectif->delete();
} else {
$deleteOk = 3;
}
} else {
$deleteOk = 2;
}
return $deleteOk;
}
/**
* Store a newly created resource or update an existing one
* @param \Illuminate\Http\Request $request
* @return array $objectif
*/
public function saveProDatas(Request $request)
{
// save data from Pro dashboard
$objectif = $request->objectif;
if (isset($objectif["id"])) {
$o = Objectives::findOrFail($objectif["id"]);
$o->produit = $objectif["produit"];
$o->qualite = $objectif["qualite"];
$o->quantite = $objectif["quantite"];
$o->campagne = $objectif["campagne"];
$o->prix = $objectif["prix"];
$o->echeance = $objectif["echeance"];
$o->volume_restant = $objectif["volume_restant"];
$o->observations = $objectif["observations"];
$o->save();
$objectif["status_id"] = $o->status_id;
$objectif["status"] = $o->status;
} else {
$o = Objectives::updateOrCreate([
'produit' => $objectif["produit"],
'qualite' => $objectif["qualite"],
'quantite' => $objectif["quantite"],
'campagne' => $objectif["campagne"],
'prix' => $objectif["prix"],
'echeance' => $objectif["echeance"],
'volume_restant' => $objectif["volume_restant"],
'observations' => $objectif["observations"],
'customer_id' => Auth::guard('frontend')->user()->id,
'status_id' => 1,
]);
$objectif["id"] = $o->id;
$objectif["status_id"] = $o->status_id;
$objectif["status"] = $o->status;
unset($objectif["customer_id"]);
} //end if
return $objectif;
}
}

View file

@ -0,0 +1,17 @@
<?php
namespace App\Http\Controllers\Fo;
use App\Http\Controllers\Controller;
class SearchController extends Controller
{
/**
*
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function index()
{
return view('fo.search');
}
}

View file

@ -1,18 +0,0 @@
<?php
namespace App\Http\Controllers;
use App\Models\HomeSliders;
use Illuminate\Http\Request;
class HomeController extends Controller
{
public function index(Request $request)
{
$slides = HomeSliders::where([
['status', 1]
])->orderBy('order', 'ASC')->get();
return view('home', compact('slides'));
}
}

View file

@ -1,13 +0,0 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
class LegalNoticeController extends Controller
{
public function index(Request $request)
{
return view('front.legalnotice');
}
}

View file

@ -1,28 +0,0 @@
<?php
namespace App\Http\Controllers;
use App\Models\Articles;
use Illuminate\Http\Request;
class NewsController extends Controller
{
public function index(Request $request)
{
$articles = Articles::where([
['status', 1],
['category_id', 1]
])->orderBy('created_at', 'ASC')->paginate(4);
//$articles = $articles->paginate();
return view('front.news.index', compact('articles'));
}
public function show($slug)
{
$article = Articles::where('slug', $slug)->first();
return view('front.news.article', compact('article'));
}
}

View file

@ -1,21 +0,0 @@
<?php
namespace App\Http\Controllers;
use App\Models\BusinessSector;
use App\Models\Employees;
use Illuminate\Http\Request;
class OurTradeController extends Controller
{
public function index(Request $request)
{
$secteurs_simples = BusinessSector::orderBy('order', 'ASC')->where('parent_id', null)->doesnthave('children')->with('employees')->orderBy('order', 'ASC')->get();
$secteurs_complexes = BusinessSector::orderBy('order', 'ASC')->where('parent_id', null)->has('children')->with('employees','children.employees')->orderBy('order', 'ASC')->get();
//$secteurs->employees->sortBy('order');
$nine_videos = Employees::select('video','photo','firstname','lastname','job_title')->whereNotNull('video')->inRandomOrder()->limit(9)->get();
return view('front.ourtrade', compact('secteurs_simples','secteurs_complexes','nine_videos'));
}
}

View file

@ -1,13 +0,0 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
class PrivacyPolicyController extends Controller
{
public function index(Request $request)
{
return view('front.privacypolicy');
}
}

View file

@ -1,140 +0,0 @@
<?php
namespace App\Http\Controllers\Pro;
use App\Http\Controllers\Controller;
use App\Models\User;
use Illuminate\Support\Facades\Auth;
use App\Http\Requests\UpdateInfosRequest;
use App\Http\Resources\UserCrmResource;
use Illuminate\Support\Facades\Mail;
use App\Mail\InformProChangeInfos;
use Illuminate\Http\Request;
class CustomerController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function mesInfos()
{
//récupérer les infos
$user = User::findOrFail(Auth::user()->id);
return view('pro.customer.infos', compact('user'));
}
/**
* Update the specified resource in storage.
*
* @param UpdateInfosRequest $request
* @return \Illuminate\Http\Response
*/
public function updateInfos(UpdateInfosRequest $request)
{
//basic information
$lastname = $request->lastname;
$firstname = $request->firstname;
$email = $request->email;
$password = $request->password;
$role = $request->role;
$user = User::findOrFail(Auth::user()->id);
$user->lastname = $lastname;
$user->firstname = $firstname;
//check if mail has changed
if ($user->email != $email) {
//then validate
$request->validate([
'email' => 'required|string|email|max:255|unique:users',
]);
//and replace
$user->email = $email;
}
if ($user->role == 3) {
//infos pro
$social_denomination = filter_var($request->social_denomination, FILTER_SANITIZE_STRING);
$tech_commercial = filter_var($request->tech_commercial, FILTER_SANITIZE_STRING);
$eleveur_volailles = isset($request->eleveur_volailles) ? true : false;
$eleveur_porcs = isset($request->eleveur_porcs) ? true : false;
$eleveur_bovins = isset($request->eleveur_bovins) ? true : false;
$capacite_stockage = filter_var($request->capacite_stockage, FILTER_SANITIZE_STRING);
$temps_chargement = filter_var($request->temps_chargement, FILTER_SANITIZE_STRING);
$stockage_aplat = isset($request->stockage_aplat) ? true : false;
$stockage_cellule = isset($request->stockage_cellule) ? true : false;
$adress_chargement = filter_var($request->adress_chargement, FILTER_SANITIZE_STRING);
$optional_contact = filter_var($request->optional_contact, FILTER_SANITIZE_STRING);
$user->social_denomination = $social_denomination;
$user->tech_commercial = $tech_commercial;
$user->eleveur_volailles = $eleveur_volailles;
$user->eleveur_porcs = $eleveur_porcs;
$user->eleveur_bovins = $eleveur_bovins;
$user->capacite_stockage = $capacite_stockage;
$user->temps_chargement = $temps_chargement;
$user->stockage_aplat = $stockage_aplat;
$user->stockage_cellule = $stockage_cellule;
$user->adress_chargement = $adress_chargement;
$user->optional_contact = $optional_contact;
$phone = $request->phone;
$birth_date = $request->birth_date;
$address = $request->address;
$city = $request->city;
$postcode = $request->postcode;
$optin = $request->news !== null ? 1 : 0;
$user->apiData->firstname = $firstname;
$user->apiData->lastname = $lastname;
$user->apiData->email = $email;
$user->apiData->birth_date = $birth_date;
$user->apiData->phone = $phone;
$user->apiData->address = $address;
$user->apiData->city = $city;
$user->apiData->postcode = $postcode;
$user->apiData->opt_in = $optin;
$user->updateApiData(new UserCrmResource($user));
}
$user->save();
//envoi du mail de modification
$email = "contact.jeusselin@jeusselin.fr"; // TODO : should be an app setting
Mail::to($email)->send(new InformProChangeInfos($user));
return redirect()->route('pro.mes-infos')->with('success', 'Enregistré !');
}
public function changePassword() {
return view('pro.customer.change-mdp');
}
/**
* changement de mot de passe depuis le profil
*/
public function changePasswordWhenAuthenticated(Request $request)
{
$request->validate([
'password' => 'required|min:8|confirmed|max:255'
]);
$crm = app('crmApi');
$customer = $crm->changePwdCustomer(Auth::guard('web')->user()->crm_id, $request->password);
if ($customer->status === "OK") {
return back()->with('success', __("Modifications enregistrées !"));
} else {
return back()->withErrors(__("Une erreur est survenue, merci de réessayer ultérieurement."));
}
}
}

View file

@ -1,120 +0,0 @@
<?php
namespace App\Http\Controllers\Pro;
use App\Http\Controllers\Controller;
use App\Models\Cotations;
use App\Models\CotationsData;
use App\Models\Objectives;
use App\Models\PublicPdfs;
use App\Models\Articles;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Carbon;
class DashboardController extends Controller
{
public function index(Request $request)
{
//$cotations = CotationsData::whereNotNull('prix')->orderBy('produit')->orderBy('qualite')->orderBy('recolte')
$cotations = CotationsData::select('produit','qualite','recolte', DB::raw("GROUP_CONCAT(echeance,'::',COALESCE(prix,'--') SEPARATOR '|@|') AS prices"))
->whereNotNull('prix')
->groupBy('produit')
->groupBy('qualite')
->groupBy('recolte')
->orderBy('produit')
->get();
$mps = CotationsData::select('produit')->distinct()->orderBy('produit')->get();
setlocale(LC_TIME, config('app.locale'));
$dateMajCotations = CotationsData::select('updated_at')->orderBy('id','DESC')->first();
$dbobjectif = new Objectives();
//capte les nouvelles colonnes éventuelles
$nullData= array_combine(
$dbobjectif->getFillable(),
array_fill(0, count($dbobjectif->getFillable()), null)
);
$dbobjectif->fill($nullData);
$dbobjectif->produit = '--';
$dbobjectif->qualite = '--';
$dbobjectif->campagne = '--';
$dbobjectif->quantite = 0;
//$dbobjectif->prix = 0;
$dbobjectif->echeance = '--';
$dbobjectif->volume_restant = 0;
//$dbobjectif->observations = '';
$dbmyObjectives = Objectives::with('status')->where('user_id',Auth::user()->id)->orderBy('updated_at','DESC')->get();
$formEnums = $this->getObjectivesFormEnums();
$pdfsAnalyse = PublicPdfs::where('category_id',1)->where('is_published',1)->orderBy('created_at','DESC')->get();
$pdfsMarches = PublicPdfs::where('category_id',2)->where('is_published',1)->orderBy('created_at','DESC')->get();
//par défaut le marché est fermé
$market_closed = true;
//si on est (un jour de semaine) après 11h ou avant 17h45 alors ouvert
$time = Carbon::now(); // Current time
$start = Carbon::create($time->year, $time->month, $time->day, 11, 0, 0); //set time to 11:00
$end = Carbon::create($time->year, $time->month, $time->day, 17, 45, 0); //set time to 17:45
if ($time->isWeekday()) {
if ($time->between($start, $end, true)) {
$market_closed = false;
}
}
$dayMaj = Carbon::createFromFormat('Y-m-d H:i:s', $dateMajCotations->updated_at)->startOfDay();
$today = Carbon::now()->startOfDay();
$noCotationsYet = false; //we suppose we have cotations today
if ($today > $dayMaj) {
$noCotationsYet = true; //we don't have the cotations yet
}
$articles = Articles::where([
['status', 1],
['category_id', 2]
])->orderBy('created_at', 'ASC')->paginate(4);
return view('pro.dashboard.index', compact('cotations', 'mps', 'dbobjectif', 'dbmyObjectives', 'formEnums', 'pdfsAnalyse', 'pdfsMarches', 'dateMajCotations', 'market_closed', 'noCotationsYet' ,'articles'));
}
public function waiting(Request $request)
{
return view('pro.dashboard.waiting');
}
private function getObjectivesFormEnums() {
$enums = array();
$produitEnum = CotationsData::select('produit AS value')->distinct()->get();
$enums['produit'] = $produitEnum;
$qualiteEnum = array();
foreach ($produitEnum as $produit) {
$qualiteEnum[$produit->value] = CotationsData::select('qualite AS value')->distinct()->where('produit',$produit->value)->get();
}
$enums['qualite'] = $qualiteEnum;
$campagneEnum = array();
foreach ($produitEnum as $produit) {
$campagneEnum[$produit->value] = CotationsData::select('recolte AS value')->distinct()->where('produit',$produit->value)->get();
}
$enums['campagne'] = $campagneEnum;
$echeanceEnum = array();
foreach ($produitEnum as $produit) {
foreach($campagneEnum[$produit->value] as $campagne) {
$echeanceEnum[$produit->value][$campagne->value] = CotationsData::select('echeance AS value')->distinct()
->where('produit',$produit->value)
->where('recolte',$campagne->value)
->whereNotNull('prix')
->get();
}
}
$enums['echeance'] = $echeanceEnum;
return $enums;
}
}

View file

@ -1,13 +0,0 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
class SearchController extends Controller
{
public function index(Request $request)
{
return view('front.search');
}
}

View file

@ -14,7 +14,6 @@ class Kernel extends HttpKernel
* @var array
*/
protected $middleware = [
// \App\Http\Middleware\TrustHosts::class,
\App\Http\Middleware\TrustProxies::class,
\Fruitcake\Cors\HandleCors::class,
\App\Http\Middleware\PreventRequestsDuringMaintenance::class,
@ -33,7 +32,6 @@ class Kernel extends HttpKernel
\App\Http\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
// \Illuminate\Session\Middleware\AuthenticateSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
@ -58,10 +56,10 @@ class Kernel extends HttpKernel
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'admin' => \App\Http\Middleware\Admin::class,
// * Filter only role CustomerTypeEnum::professional()
'pro' => \App\Http\Middleware\Pro::class,
// * Filter has client_number
'valid-pro' => \App\Http\Middleware\ValidPro::class,
'secu-bo' => \App\Http\Middleware\LdcSecureBo::class,
'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,

View file

@ -1,25 +0,0 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class Admin
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle(Request $request, Closure $next)
{
$role = Auth::user()->role;
if ($role <= 2)
return $next($request);
abort(404, "Cette page n'existe pas.");
}
}

View file

@ -3,19 +3,36 @@
namespace App\Http\Middleware;
use Illuminate\Auth\Middleware\Authenticate as Middleware;
use Illuminate\Support\Facades\Session;
class Authenticate extends Middleware
{
/**
* Get the path the user should be redirected to when they are not authenticated.
*
* @param \Illuminate\Http\Request $request
* @param mixed $request
* @return string|null
*/
protected function redirectTo($request)
{
if (! $request->expectsJson()) {
$logins = [
'frontend' => route('login'),
'backend' => route('bo.login')
];
if (!$request->expectsJson()) {
// * Notify must login
Session::flash('warning', trans('Veuillez vous connecter pour continuer'));
foreach ($request->route()->gatherMiddleware() as $middleware) {
if (\is_string($middleware) and strpos($middleware, 'auth:') !== false) {
$route = $logins[str_replace('auth:', '', $middleware)] ?? null;
if ($route) {
return $route;
}
}
}
return route('login');
}
abort(401);
}
}

View file

@ -12,6 +12,5 @@ class EncryptCookies extends Middleware
* @var array
*/
protected $except = [
//
];
];
}

View file

@ -1,22 +0,0 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Illuminate\Http\Request;
class LdcSecureBo
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle(Request $request, Closure $next)
{
//check if user for bo is within trusted network
return $next($request);
}
}

View file

@ -12,6 +12,5 @@ class PreventRequestsDuringMaintenance extends Middleware
* @var array
*/
protected $except = [
//
];
];
}

View file

@ -2,7 +2,7 @@
namespace App\Http\Middleware;
use Closure;
use App\Enums\CustomerTypeEnum;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
@ -11,14 +11,15 @@ class Pro
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle(Request $request, Closure $next)
public function handle(Request $request, \Closure $next)
{
$role = Auth::user()->role;
if ($role == 3) {
/** @var \App\Models\Customer|null */
$customer = Auth::guard('frontend')->user();
if ($customer and $customer->role->equals(CustomerTypeEnum::professional())) {
return $next($request);
}

View file

@ -2,8 +2,6 @@
namespace App\Http\Middleware;
use App\Providers\RouteServiceProvider;
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
@ -12,18 +10,28 @@ class RedirectIfAuthenticated
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string|null ...$guards
* @return mixed
* @phpcs:disable Generic.Files.LineLength.TooLong
* @param \Illuminate\Http\Request $request
* @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
* @param string|null ...$guards
* @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
* @throws \RuntimeException If guard is unhandled.
* @phpcs:enable
*/
public function handle(Request $request, Closure $next, ...$guards)
public function handle(Request $request, \Closure $next, ...$guards)
{
$guards = empty($guards) ? [null] : $guards;
foreach ($guards as $guard) {
if (Auth::guard($guard)->check()) {
return redirect(RouteServiceProvider::HOME);
switch ($guard) {
case 'frontend':
return \redirect()->route('fo.home');
case 'backend':
return \redirect()->route('bo.dashboard');
default:
throw new \RuntimeException("Unhandled guard `{$guard}` .");
}
}
}

View file

@ -17,7 +17,7 @@ class TrustProxies extends Middleware
/**
* The headers that should be used to detect proxies.
*
* @var int
* @var integer
*/
protected $headers = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB;
}

View file

@ -2,7 +2,6 @@
namespace App\Http\Middleware;
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
@ -11,16 +10,17 @@ class ValidPro
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle(Request $request, Closure $next)
public function handle(Request $request, \Closure $next)
{
$client_num = Auth::user()->client_number;
if (!empty($client_num)) {
/** @var \App\Models\Customer|null */
$customer = Auth::guard('frontend')->user();
if ($customer and $customer->is_validated_pro) {
return $next($request);
}
return redirect()->route('pro.pending-validation');
return redirect()->route('fo.pro.pending-validation');
}
}

View file

@ -12,6 +12,5 @@ class VerifyCsrfToken extends Middleware
* @var array
*/
protected $except = [
//
];
];
}

View file

@ -0,0 +1,36 @@
<?php
namespace App\Http\Requests\Bo;
use App\Enums\UserRoleEnum;
use Illuminate\Foundation\Http\FormRequest;
use Kwaadpepper\Enum\Rules\EnumIsValidRule;
class StoreUserRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return boolean
*/
public function authorize()
{
return \auth('backend')->check();
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'lastname' => 'required|string|max:255',
'firstname' => 'required|string|max:255',
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:8',
'role' => new EnumIsValidRule(UserRoleEnum::class)
];
}
}

View file

@ -0,0 +1,38 @@
<?php
namespace App\Http\Requests\Bo;
use App\Enums\CustomerTypeEnum;
use Illuminate\Foundation\Http\FormRequest;
use Kwaadpepper\Enum\Rules\EnumIsValidRule;
class UpdateCustomerRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return boolean
*/
public function authorize()
{
return auth('backend')->check();
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'tc_id' => 'nullable|digits_between:1,16',
'client_number' => [
!empty($this->customer->client_number) ? 'required' : 'nullable',
'digits_between:1,16'
],
'phone' => 'nullable|string|max:15',
'role' => ['required', new EnumIsValidRule(CustomerTypeEnum::class)]
];
}
}

View file

@ -0,0 +1,42 @@
<?php
namespace App\Http\Requests\Bo;
use Illuminate\Validation\Rule;
class UpdateUserRequest extends StoreUserRequest
{
/**
* Prepare the data for validation.
*
* @return void
*/
public function prepareForValidation()
{
if (empty($this->post('password'))) {
$this->offsetUnset('password');
}
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return \array_merge(
parent::rules(),
[
'password' => 'sometimes|string|min:8',
'email' => [
'required',
'string',
'email',
'max:255',
(new Rule())->unique('users')->ignore($this->user->id)
]
]
);
}
}

View file

@ -0,0 +1,168 @@
<?php
namespace App\Http\Requests\Fo\Customers;
use App\Enums\CustomerTypeEnum;
use App\Rules\Adult;
use BadMethodCallException;
use Illuminate\Contracts\Validation\Validator;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rules\Password;
use Kwaadpepper\Enum\Exceptions\EnumNotRoutableException;
use Kwaadpepper\Enum\Rules\EnumIsValidRule;
use LDC\LDCCRM\Enums\Country;
class CreateAccountRequest extends FormRequest
{
/**
* Get the validator
*
* @return \Illuminate\Contracts\Validation\Validator
*/
public function getValidator(): Validator
{
$this->prepareForValidation();
return $this->getValidatorInstance();
}
/**
* Determine if the user is authorized to make this request.
*
* @return boolean
*/
public function authorize()
{
return true;
}
/**
* Prepare the data for validation.
*
* @return void
*/
protected function prepareForValidation()
{
$this->merge([
'phone' => $this->phone,
'opt_in' => $this->opt_in ? true : false,
'eleveur_porcs' => $this->boolean('eleveur.eleveur_porcs') ? true : false,
'eleveur_volailles' => $this->boolean('eleveur.eleveur_volailles') ? true : false,
'eleveur_bovins' => $this->boolean('eleveur.eleveur_bovins') ? true : false,
'stockage_aplat' => $this->boolean('stockage.stockage_aplat') ? true : false,
'stockage_cellule' => $this->boolean('stockage.stockage_cellule') ? true : false,
'role' => \ctype_digit($this->user_cat) ? \intval($this->user_cat) : $this->user_cat,
]);
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
$requiredIfRoleIsPro = 'sometimes';
try {
$role = $this->customer ? $this->customer->role : CustomerTypeEnum::make($this->role);
if ($role->equals(CustomerTypeEnum::professional())) {
$requiredIfRoleIsPro = 'required';
}
} catch (BadMethodCallException | EnumNotRoutableException | \TypeError $e) {
$requiredIfRoleIsPro = 'sometimes';
}
return [
'lastname' => 'required|string|max:255',
'firstname' => 'required|string|max:255',
'phone' => 'nullable|max:255',
'address' => 'required|string|min:1|max:255',
'postcode' => 'required|string|min:1',
'city' => 'required|string|min:1|max:255',
'birth_date' => ['required', new Adult(trans('Vous devez être majeur pour vous inscrire.'))],
'email' => [
'required', 'email:rfc,dns,spoof', 'max:255',
'unique:customers,email',
],
'password' => [
'required', 'confirmed', Password::min(8)->mixedCase()->numbers()->symbols()
],
'ok_cgv' => 'accepted',
'opt_in' => 'required|boolean',
// * Spécific jeusselin
'role' => ['required', new EnumIsValidRule(CustomerTypeEnum::class)],
'social_denomination' => "{$requiredIfRoleIsPro}|max:255",
'tech_commercial' => "{$requiredIfRoleIsPro}|string|max:255",
'siret' => "{$requiredIfRoleIsPro}|string|max:255",
'numtva' => "{$requiredIfRoleIsPro}|string|max:255",
'certiphyto' => "{$requiredIfRoleIsPro}|string|max:255",
'certiphyto_date' => "{$requiredIfRoleIsPro}|string|max:255",
'eleveur' => "{$requiredIfRoleIsPro}|array|min:1",
'eleveur_porcs' => "required_with:eleveur|boolean",
'eleveur_volailles' => "required_with:eleveur|boolean",
'eleveur_bovins' => "required_with:eleveur|boolean",
'capacite_stockage' => "{$requiredIfRoleIsPro}|string|max:255",
'temps_chargement' => "{$requiredIfRoleIsPro}|string|max:255",
'stockage' => "{$requiredIfRoleIsPro}|array|min:1",
'stockage_aplat' => "required_with:stockage|boolean",
'stockage_cellule' => "required_with:stockage|boolean",
'adress_chargement' => "present|nullable|string|max:255",
'optional_contact' => "present|nullable|string|max:255",
];
}
/**
* Get custom attributes for validator errors.
* @return array
*/
public function attributes()
{
return [
'lastname' => trans('nom'),
'firstname' => trans('prénom'),
'phone' => trans('téléphone'),
'address' => trans('adresse'),
'postcode' => trans('code postal'),
'city' => trans('ville'),
'birth_date' => trans('date de naissance'),
'email' => trans('email'),
'password' => trans('mot de passe'),
'ok_cgv' => trans('conditions d\'utilisation'),
'opt_in' => trans('newsletter'),
'role' => trans('êtes-vous un agriculteur'),
'social_denomination' => trans('dénomination sociale'),
'tech_commercial' => trans('technico commercial'),
'siret' => trans('siret'),
'certiphyto_date' => trans('date de validité'),
'numtva' => trans('numéro de tva'),
'certiphyto' => trans('numéro de certiphyto'),
'certiphyto_date' => trans('numéro de certiphyto'),
'eleveur' => trans('éleveur de'),
'capacite_stockage' => trans('capacité de stockage'),
'temps_chargement' => trans('temps de chargement'),
'stockage' => trans('type de stockage'),
'adress_chargement' => trans('adresse de chargement'),
'optional_contact' => trans('contact à joindre'),
];
}
/**
* Get custom messages for validator errors.
*
* @return array
*/
public function messages()
{
return [
'phone.phone' => trans('Le champ :attribute est invalide, il accepte les numéros des
pays suivants :countries.', ['countries' => Country::france()->label]),
'country.in' => trans('Le champ :attribute est invalide, il accepte les pays
suivants :countries.', ['countries' => Country::france()->label]),
'email.unique' => trans('Un compte existe déjà avec cette adresse.'),
'ok_cgv.accepted' => trans('Vous devez accepter les conditions d\'utilisation du site pour continuer.')
];
}
}

View file

@ -0,0 +1,33 @@
<?php
namespace App\Http\Requests\Fo\Customers;
use Illuminate\Support\Facades\Auth;
class UpdateInfosRequest extends CreateAccountRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return boolean
*/
public function authorize()
{
return Auth::guard('frontend')->check();
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
$rules = parent::rules();
unset($rules['email']);
unset($rules['password']);
unset($rules['role']);
unset($rules['ok_cgv']);
return $rules;
}
}

View file

@ -0,0 +1,54 @@
<?php
namespace App\Http\Requests\Fo\Customers;
use App\Rules\CrmCustomerPassword;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rules\Password;
class UpdatePasswordRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return boolean
*/
public function authorize()
{
return auth('frontend')->check();
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
/** @var \Ldc\LDCCRM\Models\Customer */
$crmCustomer = \auth('frontend')->user()->api_data;
return [
'old_password' => [
'required',
new CrmCustomerPassword($crmCustomer)
],
'password' => [
'required', 'string', 'max:255', 'confirmed',
Password::min(8)->mixedCase()->letters()->numbers()->uncompromised()
]
];
}
/**
* Get custom attributes for validator errors.
*
* @return array
*/
public function attributes()
{
return [
'old_password' => trans('ancien mot de passe'),
'password' => trans('mot de passe'),
];
}
}

View file

@ -1,42 +0,0 @@
<?php
namespace App\Http\Requests;
use Carbon\Carbon;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
class UpdateInfosRequest extends FormRequest
{
public function __construct()
{
}
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return Auth::guard('web')->check();
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'firstname' => 'required|string|max:255',
'lastname' => 'required|string|max:255',
'birth_date' => 'required|date|before_or_equal:' . Carbon::now()->subYears(18)->toDateString(),
'address' => 'max:255',
'phone' => 'max:255',
'city' => 'required|string|max:255',
'postcode' => 'required'
];
}
}

View file

@ -0,0 +1,46 @@
<?php
namespace App\Http\Resources;
use App\Models\Customer;
use Illuminate\Http\Resources\Json\JsonResource;
class CustomerCrmResource extends JsonResource
{
/** @var \App\Models\Customer */
private $customer;
/**
* CustomerCrmResource
*
* @param \App\Models\Customer $customer
*/
public function __construct(Customer $customer)
{
$this->customer = $customer;
}
/**
* Transform the resource into an array.
*
* @param mixed $request
* @return array
* @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass
*/
public function toArray($request)
{
/** @var \LDC\LDCCRM\Models\Customer */
$crmCustomer = $this->customer->api_data;
return [
'hashcode' => $this->customer->hashcode,
'firstname' => $crmCustomer->firstname,
'lastname' => $crmCustomer->lastname,
'opt_in' => $crmCustomer->opt_in,
'birthdate' => $crmCustomer->birth_date,
'phone' => $crmCustomer->phone,
'address' => $crmCustomer->address,
'address2' => $crmCustomer->address2,
'city' => $crmCustomer->city,
'postcode' => $crmCustomer->postcode
];
}
}

View file

@ -1,40 +0,0 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
use App\Models\User;
class UserCrmResource extends JsonResource
{
/** @var User */
private $user;
public function __construct(User $user)
{
$this->user = $user;
}
/**
* Transform the resource into an array.
*
* @param \Illuminate\Http\Request $request
* @return array
*/
public function toArray($request)
{
$crmUser = (object)$this->user->apiData;
return [
'crm_id' => $this->user->crm_id,
'firstname' => $crmUser->firstname,
'lastname' => $crmUser->lastname,
'optin' => $crmUser->opt_in,
'birthdate' => $crmUser->birth_date,
'phone' => $crmUser->phone,
'address' => $crmUser->address,
'address2' => null,
'city' => $crmUser->city,
'postcode' => $crmUser->postcode
];
}
}

View file

@ -1,387 +0,0 @@
<?php
namespace App\Jobs;
use App\Models\Articles;
use Exception;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Routing\Route as RoutingRoute;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Route;
use Illuminate\Support\Facades\Schema;
use Kwaadpepper\Enum\BaseEnum;
use ReflectionClass;
use Spatie\Sitemap\Sitemap;
use Spatie\Sitemap\Tags\Url;
class RefreshSiteMap implements ShouldQueue
{
use Dispatchable;
use InteractsWithQueue;
use Queueable;
use SerializesModels;
/**
* Uri that start with something in
* this table will be ignored
*
* @var array
*/
protected $ignoreRoutes = [
'/login',
'/confirmation-email',
'/mot-de-passe-oublie',
'/home',
'/_debugbar' // Hack ignore laravel debug bar
];
/**
* liste des routes à binder
*
* @var array
*/
protected $routesBinder = [
'news.show' => [
'slug' => [Articles::class, 'slug']
],
];
/**
* Execute the job.
*
*! Ici c'est du sale !!
* TODO: mettre tout ça dans un package pour le rendre plus générique
*
* @return void
*/
public function handle()
{
$this->assertRouteBinderIsCorrect();
$siteMap = [];
$routeCollection = Route::getRoutes();
/** @var \Illuminate\Routing\Route $route */
foreach ($routeCollection as $route) {
if ($this->routeShouldBeIgnored($route)) {
continue;
}
if (!$this->routeHandlesGetMethod($route)) {
continue;
}
/** @var array to be populated with models from DB to generate a route */
$rParams = [];
/** @var \array [lluminate\Routing\Route::signatureParameters] parameters signature from the controller */
$params = $route->signatureParameters();
/** @var \array [Illuminate\Routing\Route::parameterNames] parameters name from the registered route */
$pNames = $route->parameterNames();
$hasModels = false;
foreach ($params as $param) {
/** @var ReflectionClass|null $name */
$name = $param->getType() && !$param->getType()->isBuiltin()
? new ReflectionClass($param->getType()->getName())
: null;
/** @var string $pName $parameter name on route uri */
$pName = '';
// If the route has parameters and the controller accepts it
if (count($pNames) and \array_key_exists($param->getPosition(), $pNames)) {
// Get the controller parameter name for the route
$pName = $pNames[$param->getPosition()];
}
// If We have a custom binder for this route
if ($this->hasRouteBinderParam($route, $pName)) {
$hasModels = true;
$this->processWithRouteBinderParam($rParams, $route, $pName);
continue;
}
// If This route takes a model as param
if ($name and $name->isSubclassOf(Model::class)) {
$hasModels = true;
/** @var \string */
$modelClassName = $name->getName();
$this->setParamsForModel($rParams, $modelClassName, $pName);
continue;
}
}
// If the route has no dynamic models as parameters
if (!count($params) or !$hasModels) {
$siteMap[] = [
route($route->getName()),
Url::CHANGE_FREQUENCY_MONTHLY,
0.1
];
} else { // If the route has dynamic models as parameters
$this->genRoute($route, $siteMap, $rParams);
}
}
$sm = Sitemap::create();
foreach ($siteMap as $smRules) {
$sm->add(Url::create($smRules[0])
->setLastModificationDate(Carbon::yesterday())
->setChangeFrequency($smRules[1])
->setPriority($smRules[2]));
}
$sm->writeToFile(\public_path('sitemap.xml'));
}
/**
* Process route with binderParam
*
* @param RoutingRoute $route
* @param string $pName
* @return void
*/
private function processWithRouteBinderParam(array &$rParams, RoutingRoute $route, string $pName)
{
$o = $this->getRouteBinderParam($route, $pName);
/** @var \string */
$modelClassName = $o[0];
/** @var \string */
$routeParamName = $o[1];
$rfLCls = (new ReflectionClass($modelClassName));
switch (true) {
case $rfLCls->isSubclassOf(Model::class):
$this->setParamsForModel($rParams, $modelClassName, $pName, $routeParamName);
break;
case $rfLCls->isSubclassOf(BaseEnum::class):
$this->setParamForEnum($rParams, $rfLCls->getName(), $pName);
break;
default:
throw new Exception(sprintf('Unhandled class type %s', $rfLCls->getName()));
}
}
/**
* Set route param Array for Enums
*
* @param array $rParams
* @param string $enumClassName
* @param string $pName
* @return void
*/
private function setParamForEnum(array &$rParams, string $enumClassName, string $pName)
{
foreach (forward_static_call(sprintf('%s::toArray', $enumClassName)) as $enum) {
if (!array_key_exists($pName, $rParams)) {
$rParams[$pName] = [];
}
$rParams[$pName][] = $enum->value;
}
}
/**
* Set route param Array for Models
*
* @param array $rParams
* @param string $modelClassName
* @param string $pName
* @param string $routeParamName
* @return void
*/
private function setParamsForModel(
array &$rParams,
string $modelClassName,
string $pName,
string $routeParamName = null
) {
$i = 0;
$limit = 10;
$modelTable = (new ReflectionClass($modelClassName))->newInstanceWithoutConstructor()->getTable();
$q = $modelClassName::query();
$q = Schema::hasColumn($modelTable, 'status') ? $q->where('status', true) : $q; //to get models with a active status
$q = Schema::hasColumn($modelTable, 'category_id') ? $q->where('category_id', 1) : $q; //to not include only public Actus
do {
$results = $q->offset($i * $limit)->limit($limit)->get();
$length = count($results);
$results->map(function (Model $model) use (&$rParams, $pName, $routeParamName) {
if (!array_key_exists($pName, $rParams)) {
$rParams[$pName] = [];
}
if ($routeParamName) {
$rParams[$pName][] = $model[$routeParamName];
} else {
$rParams[$pName][] = $model;
}
});
$i++;
} while ($length);
}
/**
* Recursively generate routes for all params
*
* @param RoutingRoute $route
* @param array $siteMap
* @param array $params
* @return void
*/
private function genRoute(RoutingRoute $route, array &$siteMap, array $params)
{
$filtered = false;
foreach ($params as $pName => $param) {
if (is_array($param)) {
collect($param)->map(function ($p) use ($route, &$siteMap, $params, $pName) {
$this->genRoute($route, $siteMap, array_merge($params, [$pName => $p]));
});
return;
}
$filtered = array_key_last($params) === $pName ? true : false;
}
if ($filtered) {
$siteMap[] = [
route($route->getName(), $params),
Url::CHANGE_FREQUENCY_DAILY,
0.1
];
}
}
/**
* Check if $route exists in routesBinder
*
* @param RoutingRoute $route
* @return boolean
*/
private function hasRouteBinder(RoutingRoute $route): bool
{
return array_key_exists($route->getName(), $this->routesBinder);
}
/**
* Check if $route exists in routesBinder and has $param
*
* @param RoutingRoute $route
* @param string $param
* @return boolean
*/
private function hasRouteBinderParam(RoutingRoute $route, string $param): bool
{
if ($this->hasRouteBinder($route)) {
return array_key_exists($param, $this->getRouteBinder($route));
}
return false;
}
/**
* Get the routeBinder
*
* @param RoutingRoute $route
* @return array
*/
private function getRouteBinder(RoutingRoute $route): array
{
return $this->routesBinder[$route->getName()];
}
/**
* Get the routeBinder param
*
* @param RoutingRoute $route
* @param string $param
* @return array
*/
private function getRouteBinderParam(RoutingRoute $route, string $param): array
{
return $this->routesBinder[$route->getName()][$param];
}
/**
* Assert that routeBinder is correct
*
* @throws Exception
* @return void
*/
private function assertRouteBinderIsCorrect()
{
/** @var \Illuminate\Routing\RouteCollection */
$routeCollection = Route::getRoutes();
foreach ($this->routesBinder as $routeName => $params) {
if (!$routeCollection->hasNamedRoute($routeName)) {
throw new Exception(sprintf('Route %s does not exists', $routeName));
}
foreach ($params as $pName => $p) {
if (count($p) != 2) {
throw new Exception(sprintf(
'Route %s parameter %s does not have Model classname and parameter name',
$routeName,
$pName
));
}
$rfCls = (new ReflectionClass($p[0]))->newInstanceWithoutConstructor();
if (is_subclass_of($rfCls, BaseEnum::class)) {
return;
}
if (!is_subclass_of($rfCls, Model::class)) {
throw new Exception(sprintf(
'Route "%s" parameter "%s" first element must be a child of "%s"',
$routeName,
$pName,
Model::class
));
}
if (!Schema::hasColumn($rfCls->getTable(), $p[1])) {
throw new Exception(sprintf(
'"%s" parameter "%s" second element "%s" must refer to and existing database column of "%s"',
$routeName,
$pName,
$p[1],
$p[0]
));
}
}
}
}
/**
* Check if the route handles the HTTP GET method
*
* @param RoutingRoute $route
* @return boolean
*/
private function routeHandlesGetMethod(RoutingRoute $route): bool
{
return in_array('GET', $route->methods());
}
/**
* Check if the actual route uri start with
* a partial uri from the table
* Check also if it uses middleware auth
*
* @param RoutingRoute $route
* @return boolean
*/
private function routeShouldBeIgnored(RoutingRoute $route): bool
{
foreach ($this->ignoreRoutes as $iRoute) {
if (strpos($route->uri(), ltrim($iRoute, '/')) === 0) {
return true;
}
}
foreach ($route->middleware() as $middleware) {
if (strpos($middleware, 'auth') === 0) {
return true;
}
}
return false;
}
}

View file

@ -0,0 +1,190 @@
<?php
namespace App\Lib\Helpers;
class ExceptionsHelper
{
/**
* Handle sentry event
*
* @param \Sentry\Event $event
* @return null|\Sentry\Event
*/
public static function sentryEventHandler(\Sentry\Event $event): ?\Sentry\Event
{
// Remove unwanted reports.
$event->setModules([]);
$event->setOsContext(null);
/** @var \Sentry\ExceptionDataBag[] */
$exceptionBag = [];
foreach ($event->getExceptions() as $exceptionDataBag) {
$exceptionBag[] = self::getAnonymizedSentryException($exceptionDataBag);
}
$event->setExceptions($exceptionBag);
return $event;
}
/**
* Anonimize Sentry Exception bag
*
* @param \Sentry\ExceptionDataBag $exceptionDataBag
* @return \Sentry\ExceptionDataBag
*/
private static function getAnonymizedSentryException(
\Sentry\ExceptionDataBag $exceptionDataBag
): \Sentry\ExceptionDataBag {
$exceptionDataBag->setValue(self::getAnonymizedMessage($exceptionDataBag->getValue()));
if ($stackTrace = $exceptionDataBag->getStacktrace()) {
$exceptionDataBag->setStacktrace(self::getAnonymizedSentryStackTrace($stackTrace));
}
return $exceptionDataBag;
}
/**
* Anonymise sentry stacktrace
*
* @param \Sentry\Stacktrace $stackTrace
* @return \Sentry\Stacktrace
*/
private static function getAnonymizedSentryStackTrace(\Sentry\Stacktrace $stackTrace): \Sentry\Stacktrace
{
/** @var \Sentry\Frame[] */
$frames = \array_reverse($stackTrace->getFrames(), true);
$i = \count($frames) - 1;
// * Remove all but keep first (index.php).
while ($i-- > 0) {
$stackTrace->removeFrame(count($stackTrace->getFrames()) - 1);
}
foreach ($frames as $index => $frame) {
$frame->setPostContext([]);
$frame->setPreContext([]);
$frame->setContextLine('');
$frame->setVars(self::getAnonymizedSentryParams($frame->getVars()));
$stackTrace->addFrame($frame);
if ($index === 0) {
$stackTrace->removeFrame(count($stackTrace->getFrames()) - 1);
}
}
return $stackTrace;
}
/**
* Get anonymized sentry params
*
* @param mixed[] $params
* @return string[]
*/
private static function getAnonymizedSentryParams(array $params): array
{
foreach ($params as &$param) {
$type = \strtolower(\gettype($param));
if (\is_string($param)) {
$type = \explode(' ', \trim($param))[0] ?? null;
}
switch ($type) {
case 'Lambda':
case 'Object':
continue 2;
case 'array':
$param = sprintf('Array(%d)', \count($param));
continue 2;
default:
if (\is_numeric($param)) {
$param = \ucfirst($type);
continue 2;
}
if (\is_string($param)) {
$param = sprintf('String(%d)', \strlen($param));
continue 2;
}
} //end switch
} //end foreach
return $params;
}
/**
* Anonymize at least Sql queries
*
* @param string $message
* @return string
*/
public static function getAnonymizedMessage(string $message): string
{
$message = \preg_replace('/^(.*)( \(SQL:.*\))$/', '$1', $message) ?? $message;
if ($sqlPos = \strpos($message, 'to use near')) {
$message = \mb_strcut($message, 0, $sqlPos);
}
return $message;
}
/**
* Anonymize stack trace
*
* @param \Throwable $e
* @return string
*/
public static function getAnonymizedStackTrace(\Throwable $e): string
{
$projectPath = \realpath(\sprintf('%s/../', \app_path()));
$traceStack = $e->getTrace();
$traceStr = '';
$maxStackStage = 0;
foreach ($traceStack as $stackStage => $stack) {
$maxStackStage = $stackStage;
$traceStr .= \sprintf(
'#%s %s(%d): ',
$stackStage,
str_replace($projectPath, '', $stack['file'] ?? ''),
$stack['line'] ?? ''
);
if (isset($stack['class'])) {
$traceStr .= "{$stack['class']}->{$stack['function']}(";
if (isset($stack['args'])) {
$traceStr .= self::handleArgs($stack);
}
$traceStr .= ")\n";
} elseif (isset($stack['function'])) {
$traceStr .= "{$stack['function']}(";
if (isset($stack['args'])) {
$traceStr .= self::handleArgs($stack);
}
$traceStr .= ")\n";
}
} //end foreach
$maxStackStage++;
$traceStr .= "#$maxStackStage {main}";
return $traceStr;
}
/**
* Handle Args
*
* @param array $stack
* @return string
*/
public static function handleArgs(array $stack): string
{
$traceArgs = '';
$argsCount = count($stack['args']);
for ($i = 0; $i < $argsCount; $i++) {
$type = \gettype($stack['args'][$i]);
switch ($type) {
case 'object':
$traceArgs .= sprintf('Object(%s)', \get_class($stack['args'][$i]));
break;
case 'array':
$traceArgs .= sprintf('Array(%d)', \count($stack['args'][$i]));
break;
case 'string':
$traceArgs .= sprintf('String(%d)', \strlen($stack['args'][$i]));
break;
default:
$traceArgs .= \gettype($stack['args'][$i]);
}
$traceArgs .= ($i !== ($argsCount - 1) ? ',' : '');
}
return $traceArgs;
}
}

View file

@ -10,6 +10,7 @@ class MailjetSms
{
/** @var Application $app */
protected $app;
/** @var array $config */
protected $config = [];
@ -43,7 +44,7 @@ class MailjetSms
public function send(string $message, string $to, $from = null): ResponseInterface
{
$from = $from ?? $this->config['sms_from'];
$from = $from ?? $this->config['sms_from'];
$client = $this->buildHttpClient();
try {
@ -56,7 +57,7 @@ class MailjetSms
]);
} catch (\GuzzleHttp\Exception\RequestException $ex) {
\Log::debug('error');
\Log::debug((string) $ex->getResponse()->getBody());
\Log::debug((string)$ex->getResponse()->getBody());
throw $ex;
}

View file

@ -3,14 +3,13 @@
namespace App\Mail;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
use App\Models\Objectives;
class AlertGoalAchieved extends Mailable
{
use Queueable, SerializesModels;
use Queueable;
use SerializesModels;
protected $objectif;
@ -32,6 +31,6 @@ class AlertGoalAchieved extends Mailable
public function build()
{
/** @var App\Models\Objectives $this->objectif */
return $this->subject("Objectif Atteint! - ". config('app.name', 'Jeusselin'))->view('front.mail.alertgoalachieved')->with('objectif', $this->objectif);
return $this->subject("Objectif Atteint! - " . config('app.name', 'Jeusselin'))->view('fo.mail.alertgoalachieved')->with('objectif', $this->objectif);
}
}

View file

@ -3,13 +3,13 @@
namespace App\Mail;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
class InformProChangeInfos extends Mailable
{
use Queueable, SerializesModels;
use Queueable;
use SerializesModels;
/**
* Create a new message instance.
@ -28,6 +28,6 @@ class InformProChangeInfos extends Mailable
*/
public function build()
{
return $this->subject("L'utilisateur à modifié ses informations")->view('front.mail.pro-infos-change')->with('user', $this->user);
return $this->subject("L'utilisateur à modifié ses informations")->view('fo.mail.pro-infos-change')->with('user', $this->user);
}
}

View file

@ -3,13 +3,13 @@
namespace App\Mail;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
class InformProOpenAcess extends Mailable
{
use Queueable, SerializesModels;
use Queueable;
use SerializesModels;
/**
* Create a new message instance.
@ -28,6 +28,6 @@ class InformProOpenAcess extends Mailable
*/
public function build()
{
return $this->subject("Ouverture de votre accès")->view('front.mail.openpro')->with('user', $this->user);
return $this->subject("Ouverture de votre accès")->view('fo.mail.openpro')->with('user', $this->user);
}
}

View file

@ -3,14 +3,13 @@
namespace App\Mail;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
use App\Models\User;
class InformProVerified extends Mailable
{
use Queueable, SerializesModels;
use Queueable;
use SerializesModels;
protected $user;
@ -32,6 +31,6 @@ class InformProVerified extends Mailable
public function build()
{
/** @var App\Models\User $this->user */
return $this->subject("Professionnel inscrit! - ". config('app.name', 'Jeusselin'))->view('front.mail.proverified')->with('user', $this->user);
return $this->subject("Professionnel inscrit! - " . config('app.name', 'Jeusselin'))->view('fo.mail.proverified')->with('user', $this->user);
}
}

View file

@ -9,7 +9,8 @@ use Illuminate\Queue\SerializesModels;
class PasswordReset extends Mailable implements ShouldQueue
{
use Queueable, SerializesModels;
use Queueable;
use SerializesModels;
protected $user, $settings;
@ -30,6 +31,6 @@ class PasswordReset extends Mailable implements ShouldQueue
*/
public function build()
{
return $this->subject('Changement de votre mot de passe')->view('front.mail.password-email')->with(['user' => $this->user]);
return $this->subject('Changement de votre mot de passe')->view('fo.mail.password-email')->with(['user' => $this->user]);
}
}

View file

@ -2,16 +2,15 @@
namespace App\Mail;
use App\User;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Auth;
class VerifyEmail extends Mailable implements ShouldQueue
{
use Queueable, SerializesModels;
use Queueable;
use SerializesModels;
protected $user;
@ -30,7 +29,8 @@ class VerifyEmail extends Mailable implements ShouldQueue
*
* @return $this
*/
public function build() {
return $this->subject("Activation du compte")->view('front.mail.verifyemail')->with('user', $this->user);
public function build()
{
return $this->subject("Activation du compte")->view('fo.mail.verifyemail')->with('user', $this->user);
}
}

View file

@ -8,7 +8,6 @@ use Illuminate\Support\Facades\App;
class Articles extends Model
{
protected $contentRender;
public function category()
@ -24,34 +23,34 @@ class Articles extends Model
$this->contentRender = $value;
}
public function getContentRenderAttribute() {
if(isset($this->contentRender)) {
public function getContentRenderAttribute()
{
if (isset($this->contentRender)) {
return $this->contentRender;
} else {
//youtube
$content = preg_replace('/<oembed.+?url="https?:\/\/www\.youtube\.com\/watch\?v=([a-zA-Z0-9_-]{11})"><\/oembed>/','<iframe width="560" height="315" src="https://www.youtube.com/embed/${1}" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>',$this->content);
//vimeo
$content = preg_replace('/<oembed.+?url="https?:\/\/vimeo\.com\/([a-zA-Z0-9_-]{9})"><\/oembed>/','<iframe src="https://player.vimeo.com/video/${1}" width="640" height="480" frameborder="0" allow="autoplay; fullscreen; picture-in-picture" allowfullscreen></iframe>',$content);
//twitter
//tweet oembed
//match '/<figure class="media"><oembed.+?url="https?:\/\/twitter\.com\/([a-zA-Z0-9_-].*)\?.*"><\/oembed><\/figure>/'
//generate 'https://publish.twitter.com/oembed?url=https://twitter.com/${1}
// youtube
$content = preg_replace('/<oembed.+?url="https?:\/\/www\.youtube\.com\/watch\?v=([a-zA-Z0-9_-]{11})"><\/oembed>/', '<iframe width="560" height="315" src="https://www.youtube.com/embed/${1}" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>', $this->content);
// vimeo
$content = preg_replace('/<oembed.+?url="https?:\/\/vimeo\.com\/([a-zA-Z0-9_-]{9})"><\/oembed>/', '<iframe src="https://player.vimeo.com/video/${1}" width="640" height="480" frameborder="0" allow="autoplay; fullscreen; picture-in-picture" allowfullscreen></iframe>', $content);
// twitter
// tweet oembed
// match '/<figure class="media"><oembed.+?url="https?:\/\/twitter\.com\/([a-zA-Z0-9_-].*)\?.*"><\/oembed><\/figure>/'
// generate 'https://publish.twitter.com/oembed?url=https://twitter.com/${1}
if (!App::environment("local")) {
$tweets = preg_match_all('/<figure class="media"><oembed.+?url="https?:\/\/twitter\.com\/([a-zA-Z0-9\/_-]*)(?:\?[^"])*"><\/oembed><\/figure>/',$content,$tweet_urls);
$tweets = preg_match_all('/<figure class="media"><oembed.+?url="https?:\/\/twitter\.com\/([a-zA-Z0-9\/_-]*)(?:\?[^"])*"><\/oembed><\/figure>/', $content, $tweet_urls);
foreach ($tweet_urls[1] as $onetweet) {
$oembed = 'https://publish.twitter.com/oembed?url=https://twitter.com/' . $onetweet;
$response = Http::get($oembed);
$oembed = 'https://publish.twitter.com/oembed?url=https://twitter.com/' . $onetweet;
$response = Http::get($oembed);
$html_for_tweet = $response->json()['html'];
$pattern = '/<figure class="media"><oembed.+?url="https?:\/\/twitter\.com\/'.preg_quote($onetweet,'/').'(?:\?[^"])*"><\/oembed><\/figure>/';
$content = preg_replace($pattern,$html_for_tweet,$content);
$pattern = '/<figure class="media"><oembed.+?url="https?:\/\/twitter\.com\/' . preg_quote($onetweet, '/') . '(?:\?[^"])*"><\/oembed><\/figure>/';
$content = preg_replace($pattern, $html_for_tweet, $content);
}
} else {
$content = preg_replace('/<figure class="media"><oembed.+?url="https?:\/\/twitter\.com\/([a-zA-Z0-9\/_-]*)(?:\?[^"])*"><\/oembed><\/figure>/','<a href="https://twitter.com/${1}" target="_twitter">BEHIND PROXY RENDER : Tweet</a>',$content);
$content = preg_replace('/<figure class="media"><oembed.+?url="https?:\/\/twitter\.com\/([a-zA-Z0-9\/_-]*)(?:\?[^"])*"><\/oembed><\/figure>/', '<a href="https://twitter.com/${1}" target="_twitter">BEHIND PROXY RENDER : Tweet</a>', $content);
}
//$this->contentRender = $content;
// $this->contentRender = $content;
return $this->contentRender = $content;
}
}//end if
}
}

View file

@ -27,11 +27,11 @@ class BusinessSector extends Model
public function parent()
{
return $this->hasOne(self::class,'id','parent_id');
return $this->hasOne(self::class, 'id', 'parent_id');
}
public function children()
{
return $this->hasMany(self::class,'parent_id','id');
return $this->hasMany(self::class, 'parent_id', 'id');
}
}

313
app/Models/Customer.php Normal file
View file

@ -0,0 +1,313 @@
<?php
namespace App\Models;
use App\Enums\CustomerTypeEnum;
use App\Http\Resources\CustomerCrmResource;
use App\Notifications\Customer\ResetPassword as NotificationResetPassword;
use App\Notifications\Customer\VerifyEmail as NotificationVerifyEmail;
use Illuminate\Contracts\Auth\CanResetPassword;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Illuminate\Validation\ValidationException;
use Kwaadpepper\Enum\Traits\CastsEnums;
use LDC\LDCCRM\Enums\ApiError;
use LDC\LDCCRM\Exceptions\ApiErrorException;
use LDC\LDCCRM\Exceptions\CrmException;
use LDC\LDCCRM\Models\Customer as CrmCustomer;
/**
* @property string $crm_hashcode
* @property string $firstname
* @property string $lastname
* @property string $email
* @property string $client_number
* @property string $social_denomination
* @property string $tech_commercial
* @property integer $tc_id
* @property string $siret
* @property string $numtva
* @property string $certiphyto
* @property \Carbon\Carbon $certiphyto_date
* @property boolean $eleveur_volailles
* @property boolean $eleveur_porcs
* @property boolean $eleveur_bovins
* @property string $capacite_stockage
* @property string $temps_chargement
* @property boolean $stockage_aplat
* @property boolean $stockage_cellule
* @property string $adress_chargement
* @property string $optional_contact
* @property \Carbon\Carbon $ok_cgv
* @property string $email_verify_token
* @property boolean $email_verified
* @property string $password_token
* @property \App\Enums\CustomerTypeEnum $role
* @property string $remember_token
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
*
* @property-read \LDC\LDCCRM\Models\Customer $api_data
* @property-read boolean $is_validated_pro
*
* @package App\Models
*/
class Customer extends Authenticatable implements MustVerifyEmail, CanResetPassword
{
use CastsEnums;
use HasFactory;
use Notifiable;
/** @var \LDC\LDCCRM\Models\Customer|null */
private $crmCustomer;
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'hashcode',
'firstname',
'lastname',
'email',
'client_number',
'social_denomination',
'tech_commercial',
'siret',
'numtva',
'certiphyto',
'certiphyto_date',
'eleveur_volailles',
'eleveur_porcs',
'eleveur_bovins',
'capacite_stockage',
'temps_chargement',
'stockage_aplat',
'stockage_cellule',
'adress_chargement',
'optional_contact',
'ok_cgv',
'email_verify_token',
'email_verified',
];
/**
* The attributes that should be hidden for arrays.
*
* @var array
*/
protected $hidden = [
'password',
'remember_token',
];
/**
* The attributes that should be cast to native types.
*
* @var array
*/
protected $casts = [
'certiphyto_date' => 'datetime',
'ok_cgv' => 'boolean',
'last_connection' => 'datetime',
'email_verified_at' => 'datetime',
];
/**
* Map attribute names to enum classes.
*
* @var array<string,string>
*/
protected $enumCasts = [
'role' => CustomerTypeEnum::class
];
// * --- AUTH ---
/**
* Send the email verification notification.
*
* @return void
*/
public function sendEmailVerificationNotification()
{
$this->deleteIfDoesNotExistsInCrm();
$this->notify(new NotificationVerifyEmail());
}
/**
* Mark the given user's email as verified.
*
* @return boolean
* @throws \LDC\LDCCRM\Exceptions\CrmException If an error occurs on server side or on getting response.
* @throws \LDC\LDCCRM\Exceptions\ApiErrorException If any error or \LDC\LDCCRM\Enums\ApiError occurs.
* @phpcs:ignore Squiz.Commenting.FunctionCommentThrowTag.WrongNumber
*/
public function markEmailAsVerified()
{
$this->deleteIfDoesNotExistsInCrm();
try {
$result = $this->api_data->activate() && parent::markEmailAsVerified();
if ($result) {
\session()->flash('success', \trans('Votre compe est activé'));
}
return $result;
} catch (ApiErrorException $e) {
if ($e->getApiError()->equals(ApiError::customerAlreadyActive())) {
return true && parent::markEmailAsVerified();
}
throw $e;
}
}
/**
* Send the password reset notification.
*
* @param mixed $token
* @return void
*/
public function sendPasswordResetNotification($token)
{
$this->deleteIfDoesNotExistsInCrm();
/** @var string $token */
$this->notify(new NotificationResetPassword($token));
}
/**
* Check if the customer exists in CRM.
*
* @return boolean
*/
public function existsInCrm(): bool
{
return $this->hashcode and CrmCustomer::find($this->hashcode);
}
/**
* Force delete and logout if is logged in case the customer
* does not exists in CRM.
*
* @return void
* @throws \Illuminate\Validation\ValidationException If the account is deleted because does not exists in CRM.
*/
private function deleteIfDoesNotExistsInCrm(): void
{
if ($this->existsInCrm()) {
return;
}
/** @var static|null $loggedCustomer */
$loggedCustomer = \auth('frontend')->user();
$isLogged = \optional($loggedCustomer)->id === $this->id and !\is_null($this->id);
if ($isLogged) {
\auth('frontend')->logout();
}
$this->forceDelete();
throw ValidationException::withMessages([
'error' => trans('Le compte \'existe pas.')
]);
}
// * --- END AUTH ---
/**
* Getter is_validated_pro attribute
*
* @return boolean
*/
public function getIsValidatedProAttribute(): bool
{
return $this->role->equals(CustomerTypeEnum::professional()) and !empty($this->client_number);
}
/**
* Get the crm Data of a customer
*
* @return \LDC\LDCCRM\Models\Customer
* @author Jérémy Munsch <jeremy.munsch@ldc.fr>
* @throws \LDC\LDCCRM\Exceptions\CrmException If cannot fetch data from crm.
* @throws \LDC\LDCCRM\Exceptions\ApiErrorException If any error or \LDC\LDCCRM\Enums\ApiError occurs.
* Possibles are :
* - modelNotFound, If this customer hashcode could not be found.
* @phpcs:disable Squiz.Commenting.FunctionCommentThrowTag.WrongNumber
*/
public function getApiDataAttribute(): CrmCustomer
{
// phpcs:enable
if (!$this->crmCustomer) {
/** @var \LDC\LDCCRM\CrmApiV2 */
$crm = app('crmAPI');
$this->crmCustomer = $crm->getCustomer(\strval($this->hashcode));
if (!$this->crmCustomer) {
throw new CrmException('CRM get Customer returned null');
}
}
return $this->crmCustomer;
}
/**
* Set the crm Data of a customer
*
* @param \App\Http\Resources\CustomerCrmResource $resource
* @return \LDC\LDCCRM\Models\Customer crm user
*
* @throws \LDC\LDCCRM\Exceptions\CrmException If an error occurs on server side or on getting response.
* @throws \LDC\LDCCRM\Exceptions\ApiErrorException If any error or \LDC\LDCCRM\Enums\ApiError occurs.
* @author Jérémy Munsch <jeremy.munsch@ldc.fr>
* @phpcs:disable Squiz.Commenting.FunctionCommentThrowTag.WrongNumber
*/
public function updateApiData(CustomerCrmResource $resource): CrmCustomer
{
// phpcs:enable
$data = $resource->toArray(null);
if (!$this->crmCustomer) {
/** @var \LDC\LDCCRM\CrmApiV2 */
$crm = app('crmAPI');
$this->crmCustomer = $crm->getCustomer(\strval($this->hashcode));
if (!$this->crmCustomer) {
throw new CrmException('CRM get Customer returned null');
}
}
$this->crmCustomer->fill($data);
$this->crmCustomer->save();
return $this->crmCustomer;
}
/**
* This mutate Customer attributes to array
* including only non critical properties and crm values
* (One that can be send to front office without security breach)
*
* @return array
*/
public function toArray()
{
if ($this->hashcode) {
return collect(array_merge(
parent::toArray(),
(array)$this->apiData
))->intersectByKeys([
'email' => '',
'firstname' => '',
'lastname' => '',
'address' => '',
'address2' => '',
'postcode' => '',
'birth_date' => '',
'city' => '',
'country' => '',
'opt_in' => '',
'phone' => ''
])->toArray();
} else {
return parent::toArray();
}
}
}

View file

@ -11,9 +11,11 @@ class ObjectiveStatus extends Model
use HasFactory;
protected $table = "objective_status";
public $timestamps = false;
public function objectives() {
public function objectives()
{
return $this->hasMany(Objectives::class, 'status_id');
}
}

View file

@ -25,7 +25,7 @@ class Objectives extends Model
'echeance',
'volume_restant',
'observations',
'user_id',
'customer_id',
'status_id',
'goal_at',
];
@ -39,9 +39,9 @@ class Objectives extends Model
'goal_at' => 'datetime',
];
public function user()
public function customer()
{
return $this->hasOne(User::class, 'id', 'user_id');
return $this->hasOne(Customer::class, 'id', 'customer_id');
}
public function status()

View file

@ -2,7 +2,6 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class PdfCategories extends Model

Some files were not shown because too many files have changed in this diff Show more