.env.example

@@ -1,19 +1,19 @@
-APP_NAME="ENV-Boutique LDC"
+APP_NAME=Laravel
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_URL=
+APP_URL=http://localhost
 APP_THEME=basic
 
-LOG_CHANNEL=daily
+LOG_CHANNEL=stack
 LOG_LEVEL=debug
 
 DB_CONNECTION=mysql
-DB_HOST=dev-mariadb
+DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=
+DB_DATABASE=laravel
 DB_USERNAME=root
-DB_PASSWORD=secret
+DB_PASSWORD=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
@@ -21,23 +21,28 @@ QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
 
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
 MAIL_MAILER=smtp
-MAIL_HOST=dev-mailhog
+MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=1025
+MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS=equipe.web@ldc.fr
+MAIL_FROM_ADDRESS=null
 MAIL_FROM_NAME="${APP_NAME}"
 
-MAIL_LIST_SERVICEWEB=equipe.web@ldc.fr
+AWS_ACCESS_KEY_ID=
-MAIL_LIST_INVALIDINCO=equipe.web@ldc.fr,vincent.pierre@ldc.fr,christelle.manceau@ldc.fr
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
 
-# CRM
+PUSHER_APP_ID=
-CRM_ENDPOINT=https://ldcldccrm:K5cJmTsG@dev.ldc-crm.fr
+PUSHER_APP_KEY=
-# Service boutique
+PUSHER_APP_SECRET=
-CRM_TOKEN=
+PUSHER_APP_CLUSTER=mt1
-# LDC Web Status Checker
+
-PROJECT_UUID=
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-# Google Analytics
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-ANALYTICS_GOOGLE_ID=

.gitignore

@@ -5,8 +5,6 @@
 /public/images/gammes
 /public/images/produits
 /public/images/slides
-/public/b-o/
-/public/mix-manifest.json
 /storage/*.key
 /vendor
 .env
@@ -18,5 +16,3 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
-auth.json
-.vscode

.gitlab-ci.yml

@@ -1,46 +0,0 @@
-image: $CI_REGISTRY/service-web-lab/ldc-web-images-docker/ldcweb-qa:php7.3-1.0
-
-stages:
-    - Security
-    - CodingStandards
-
-composer-security:
-    stage: Security
-    script:
-        - local-php-security-checker --format=json --path=./composer.lock > composer-security-checker-report.json
-    artifacts:
-        when: on_failure
-        expose_as: 'composer-security-checker'
-        paths:
-          - composer-security-checker-report.json
-    allow_failure: true
-
-npm-security:
-    stage: Security
-    script:
-        - audit-ci -p npm -o json > npm-security-checker-report.json
-    artifacts:
-        when: on_failure
-        expose_as: 'npm-security-checker'
-        paths:
-          - npm-security-checker-report.json
-    allow_failure: true
-
-phpcs:
-    stage: CodingStandards
-    before_script:
-    - composer config gitlab-token.gitlab.com $CI_DEPLOY_USER $CI_DEPLOY_PASSWORD
-    - composer install
-    cache:
-        paths:
-            - vendor/
-    script:
-        - vendor/bin/phpcs --report=junit --report-file=phpcs-report.xml
-    artifacts:
-      when: on_failure
-      expose_as: 'phpcs'
-      paths:
-          - phpcs-report.xml
-      reports:
-        junit: phpcs-report.xml
-    allow_failure: false

.vscode/settings.json

@@ -16,8 +16,7 @@
         "titleBar.activeBackground": "#630856",
         "titleBar.activeForeground": "#e7e7e7",
         "titleBar.inactiveBackground": "#63085699",
-        "titleBar.inactiveForeground": "#e7e7e799",
+        "titleBar.inactiveForeground": "#e7e7e799"
-        "commandCenter.border": "#e7e7e799"
     },
     "peacock.remoteColor": "#630856"
 }

CHANGELOG.md

@@ -1,18 +1,5 @@
-## 1.0.1
-- Change LDC CRM Client repository
-- composer update
-- Update .gitignore
-- Delete compiled assets
-- Replace informatique.internet -> equipe.web
-- Complete README.md
-- Delete credentials from front folder..
-- Delete tests folder and PHPUnit file
-- Update PHPCS file
-- Add mix() for assets
-- PHPCBF
-## 1.0.0
-Init versioning
 ## 19-03-2022
+
 * legal RGPD routes always accessible
 * privatisable routes
 * quickorder route 

README.md

@@ -1,38 +1,23 @@
-# Boutique Click N Collect
+## Boutique Click N Collect
+
+## Required systems
+
+* supervisor 
+
 ## Installation
 
 ```
 composer install
 php artisan storage:link
-cp .env.example .env
+cd /ressources/views/front/
-php artisan key:generate
+mkdir <theme-folder>
-```
+cd <theme-folder>
-Edit .env file then :
+git clone <theme-repo> .
-```
+cd ../../../.../
-php artisan migrate --seed
+npm install && npm run prod
+
 ```
 
-## Theme
-```
-cd resources/views/front/
-git clone [REPO_URL] --branch=[THEME_BRANCH_NAME] [THEME_NAME]
-```
-Ex:
-```
-git clone [REPO_URL] --branch=develop-mairet mairet
-```
-Update APP_THEME value in .env :
-```
-APP_THEME=[THEME_NAME]
-```
-Ex:
-```
-APP_THEME=mairet
-```
-Project root :
-```
-npm install && npm run prod
-```
 ## Back-Office
 
 Création de compte
@@ -42,6 +27,3 @@ php artisan create:admin
 ```
 
 URL : /bo
-## Required systems
-
-* supervisor

app/Console/Commands/CreateAdmin.php

@@ -23,25 +23,35 @@ class CreateAdmin extends Command
     protected $description = 'creates an admin user upon password entry';
 
     /**
-     * Execute the console command.
+     * Create a new command instance.
      *
      * @return void
      */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
     public function handle()
     {
-        $firstname = $this->ask('What is the firstname?', 'Equipe');
+        $firstname = $this->ask('What is the firstname?','Equipe');
-        $lastname  = $this->ask('What is the lastname?', 'Web');
+        $lastname = $this->ask('What is the lastname?','Web');
-        $email     = $this->ask('What is the email?', 'equipe.web@ldc.fr');
+        $email =  $this->ask('What is the email?', 'equipe.web@ldc.fr');
-        $pwd       = $this->secret('What is the password?');
+        $pwd = $this->secret('What is the password?');
 
-        $user                    = new User();
+        $user = new User();
-        $user->firstname         = $firstname;
+        $user->firstname = $firstname;
-        $user->lastname          = $lastname;
+        $user->lastname = $lastname;
-        $user->date_of_birth     = now();
+        $user->date_of_birth = now();
-        $user->email             = $email;
+        $user->email = $email;
-        $user->password          = Hash::make($pwd);
+        $user->password = Hash::make($pwd);
         $user->email_verified_at = now();
-        $user->role              = 1;
+        $user->role = 1;
         $user->save();
 
         $this->info('User created.');

app/Console/Commands/ImportSalaries.php

@@ -7,6 +7,7 @@ use App\Jobs\CsvSalariesReader as JobCsvSalarieReader;
 
 class ImportSalaries extends Command
 {
+
     /**
      * The name and signature of the console command.
      *
@@ -22,16 +23,28 @@ class ImportSalaries extends Command
     protected $description = 'Import Salaries, pour provision des clients';
 
     /**
-     * Execute the console command.
+     * Create a new command instance.
      *
      * @return void
      */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
     public function handle()
     {
         $this->info('Running the Job, this could take some time.');
-        $job          = new JobCsvSalarieReader();
+        $job = new JobCsvSalarieReader();
         $job->console = $this;
         $job->handle();
         $this->info('Job completed');
     }
+
+
 }

app/Console/Commands/LDCWebStatusChecker.php

@@ -1,12 +1,11 @@
 <?php
-
+/*
-/**
+* Command Name: LDC Web Status Checker
- * Command Name: LDC Web Status Checker
+* Description: Envoi des infos Serveur/Laravel vers LDC Web
- * Description: Envoi des infos Serveur/Laravel vers LDC Web
+* Version: 1.0
- * Version: 1.0
+* Author:  Vincent BRIDIER
- * Author:  Vincent BRIDIER
+* Author URI: vincent.bridier@ldc.fr
- * Author URI: vincent.bridier@ldc.fr
+*/
- */
 
 namespace App\Console\Commands;
 
@@ -28,6 +27,16 @@ class LDCWebStatusChecker extends Command
      */
     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.
      *
@@ -35,28 +44,28 @@ class LDCWebStatusChecker extends Command
      */
     public function handle()
     {
-        $data         = [];
+        $data = [];
         $data['uuid'] = config('ldcweb.project_uuid');
 
         // Sitemap.xml ?
         if (file_exists(public_path() . '/sitemap.xml')) {
             $data['sitemap'] = 'true';
-        } else {
+        }else{
             $data['sitemap'] = 'false';
         }
 
         // Robots.txt ?
         if (file_exists(public_path() . '/robots.txt')) {
             $data['robots'] = 'true';
-        } else {
+        }else{
             $data['robots'] = 'false';
         }
 
-        // Check logs.
+        //Check logs
         $data['logs'] = 0;
-        $patherror    = storage_path('/logs');
+        $patherror = storage_path('/logs');
-        $files        = glob($patherror . '/*.log');
+        $files = glob($patherror.'/*.log');
-        if (count($files) > 0) {
+        if(count($files) > 0){
             foreach ($files as $file) {
                 $data['logs'] = $data['logs'] + filesize($file);
             }
@@ -64,9 +73,9 @@ class LDCWebStatusChecker extends Command
 
         $data['code']['version'] = app()->version();
 
-        // Send by cURL.
+        // Send by cURL
-        $url     = 'https://ldc-web.ldc.fr/api/status-checker';
+        $url = 'https://ldc-web.ldc.fr/api/status-checker';
-        $ch      = curl_init($url);
+        $ch = curl_init($url);
         $payload = ['token' => 'CE8S52Qq7stf5k8frF4T', 'datas' => json_encode($data)];
         curl_setopt($ch, CURLOPT_POSTFIELDS, $payload);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);

app/Console/Commands/RefreshSiteMap.php

@@ -7,6 +7,7 @@ use Illuminate\Console\Command;
 
 class RefreshSiteMap extends Command
 {
+
     /**
      * The name and signature of the console command.
      *
@@ -24,12 +25,12 @@ class RefreshSiteMap extends Command
     /**
      * Execute the console command.
      *
-     * @return void
+     * @return int
      */
     public function handle()
     {
         $this->info('Running the Job, this could take some time.');
-        $job          = new JobsRefreshSiteMap();
+        $job = new JobsRefreshSiteMap();
         $job->console = $this;
         $job->handle();
         $this->info('Job completed');

app/Console/Commands/XmlIncoReader.php

@@ -7,6 +7,7 @@ use Illuminate\Console\Command;
 
 class XmlIncoReader extends Command
 {
+
     /**
      * The name and signature of the console command.
      *
@@ -29,7 +30,7 @@ class XmlIncoReader extends Command
     public function handle()
     {
         $this->info('Running the Job, this could take some time.');
-        $job          = new JobsXmlIncoReader();
+        $job = new JobsXmlIncoReader();
         $job->console = $this;
         $job->handle();
         $this->info('Job completed');

app/Console/Kernel.php

@@ -14,12 +14,13 @@ class Kernel extends ConsoleKernel
      * @var array
      */
     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)
@@ -27,6 +28,7 @@ class Kernel extends ConsoleKernel
         $schedule->command('sitemap:refresh')->dailyAt('16:13');
         $schedule->command('ldcweb:statuschecker')->everyFifteenMinutes();
         $schedule->job(JobsXmlIncoReader::class)->name('xml-inco-reader')->onOneServer()->dailyAt('15:00');
+        //$schedule->job(new XmlIncoReader)->weeklyOn(1, '8:00');
     }
 
     /**
@@ -36,7 +38,7 @@ class Kernel extends ConsoleKernel
      */
     protected function commands()
     {
-        $this->load(__DIR__ . '/Commands');
+        $this->load(__DIR__.'/Commands');
 
         require base_path('routes/console.php');
     }

app/Enums/InvoicingUnit.php

@@ -11,11 +11,6 @@ use Kwaadpepper\Enum\BaseEnum;
  */
 final class InvoicingUnit extends BaseEnum
 {
-    /**
-     * Enum values
-     *
-     * @return array
-     */
     protected static function values(): array
     {
         return [
@@ -25,11 +20,6 @@ final class InvoicingUnit extends BaseEnum
         ];
     }
 
-    /**
-     * Enum labels
-     *
-     * @return array
-     */
     protected static function labels(): array
     {
         return [
@@ -39,10 +29,6 @@ final class InvoicingUnit extends BaseEnum
         ];
     }
 
-    /**
-     * Output the value as a string
-     * @return string
-     */
     public function __toString(): string
     {
         return (string)$this->label;

app/Enums/OrderUnit.php

@@ -11,11 +11,6 @@ use Kwaadpepper\Enum\BaseEnum;
  */
 final class OrderUnit extends BaseEnum
 {
-    /**
-     * Enum values
-     *
-     * @return array
-     */
     protected static function values(): array
     {
         return [
@@ -25,11 +20,6 @@ final class OrderUnit extends BaseEnum
         ];
     }
 
-    /**
-     * Enum labels
-     *
-     * @return array
-     */
     protected static function labels(): array
     {
         return [
@@ -39,10 +29,6 @@ final class OrderUnit extends BaseEnum
         ];
     }
 
-    /**
-     * Output the value as a string
-     * @return string
-     */
     public function __toString(): string
     {
         return (string)$this->label;

app/Enums/PriceShowingMode.php

@@ -14,11 +14,6 @@ use Kwaadpepper\Enum\BaseEnumRoutable;
  */
 class PriceShowingMode extends BaseEnumRoutable
 {
-    /**
-     * Enum values
-     *
-     * @return array
-     */
     protected static function values(): array
     {
         return [
@@ -27,11 +22,6 @@ class PriceShowingMode extends BaseEnumRoutable
         ];
     }
 
-    /**
-     * Enum labels
-     *
-     * @return array
-     */
     protected static function labels(): array
     {
         return [

app/Enums/SellUnit.php

@@ -11,11 +11,6 @@ use Kwaadpepper\Enum\BaseEnum;
  */
 final class SellUnit extends BaseEnum
 {
-    /**
-     * Enum values
-     *
-     * @return array
-     */
     protected static function values(): array
     {
         return [
@@ -25,11 +20,6 @@ final class SellUnit extends BaseEnum
         ];
     }
 
-    /**
-     * Enum labels
-     *
-     * @return array
-     */
     protected static function labels(): array
     {
         return [
@@ -39,10 +29,6 @@ final class SellUnit extends BaseEnum
         ];
     }
 
-    /**
-     * Output the value as a string
-     * @return string
-     */
     public function __toString(): string
     {
         return (string)$this->label;

app/Enums/SettingRegisterMode.php

@@ -10,11 +10,6 @@ use Kwaadpepper\Enum\BaseEnum;
  */
 final class SettingRegisterMode extends BaseEnum
 {
-    /**
-     * Enum values
-     *
-     * @return array
-     */
     protected static function values(): array
     {
         return [
@@ -23,11 +18,6 @@ final class SettingRegisterMode extends BaseEnum
         ];
     }
 
-    /**
-     * Enum labels
-     *
-     * @return array
-     */
     protected static function labels(): array
     {
         return [
@@ -36,10 +26,6 @@ final class SettingRegisterMode extends BaseEnum
         ];
     }
 
-    /**
-     * Output the value as a string
-     * @return string
-     */
     public function __toString(): string
     {
         return (string)$this->label;

app/Enums/WeightUnit.php

@@ -11,11 +11,6 @@ use Kwaadpepper\Enum\BaseEnum;
  */
 final class WeightUnit extends BaseEnum
 {
-    /**
-     * Enum values
-     *
-     * @return array
-     */
     protected static function values(): array
     {
         return [
@@ -25,11 +20,6 @@ final class WeightUnit extends BaseEnum
         ];
     }
 
-    /**
-     * Enum labels
-     *
-     * @return array
-     */
     protected static function labels(): array
     {
         return [
@@ -39,12 +29,6 @@ final class WeightUnit extends BaseEnum
         ];
     }
 
-    /**
-     * conversion values
-     * base kg()
-     *
-     * @return array
-     */
     public static function convert(): array
     {
         return [
@@ -54,10 +38,6 @@ final class WeightUnit extends BaseEnum
         ];
     }
 
-    /**
-     * Output the value as a string
-     * @return string
-     */
     public function __toString(): string
     {
         return (string)$this->label;

app/Exceptions/AbortCsvImportException.php

@@ -6,4 +6,5 @@ use Exception;
 
 class AbortCsvImportException extends Exception
 {
+    //
 }

app/Exceptions/Handler.php

@@ -4,6 +4,10 @@ namespace App\Exceptions;
 
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Auth\AuthenticationException;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Session;
+use RuntimeException;
+use Throwable;
 
 class Handler extends ExceptionHandler
 {
@@ -12,7 +16,9 @@ class Handler extends ExceptionHandler
      *
      * @var array
      */
-    protected $dontReport = [];
+    protected $dontReport = [
+        //
+    ];
 
     /**
      * A list of the inputs that are never flashed for validation exceptions.
@@ -31,21 +37,9 @@ class Handler extends ExceptionHandler
      */
     public function register()
     {
-        $this->reportable(function (\Throwable $e) {
+        //
-            if (app()->bound('sentry')) {
-                app('sentry')->captureException($e);
-            }
-        });
-
     }
 
-    /**
-     * Handle unauthenticated as exception
-     *
-     * @param mixed                   $request
-     * @param AuthenticationException $exception
-     * @return \Illuminate\Http\RedirectResponse
-     */
     protected function unauthenticated($request, AuthenticationException $exception)
     {
         if ($request->expectsJson()) {
@@ -60,9 +54,47 @@ class Handler extends ExceptionHandler
                 $login = 'auth.login';
                 break;
         }
-        // Cf. issue :
+        //cf. issue https://stackoverflow.com/questions/52417438/laravel-unauthenticated-redirect-issue-with-multiple-authentication
-        // Https://stackoverflow.com/questions/52417438/laravel-unauthenticated-redirect-issue-with-multiple-authentication.
+        //Session::forget('url.intented');
-        // Session::forget('url.intented'); .
         return redirect()->guest(route($login));
     }
+
+    /**
+     * Report or log an exception.
+     *
+     * @param  \Throwable  $exception
+     * @return void
+     *
+     * @throws \Exception
+     */
+    public function report(Throwable $e)
+    {
+        if (get_class($e) == RedirectTo::class) {
+            abort(redirect($e->url));
+        }
+        try {
+            if (config('app.debug') === false) {
+                if ($this->shouldntReport($e)) {
+                    return;
+                }
+                Mail::send([
+                    'html' => 'emails.exception',
+                    'text' => 'emails.exception-plain'
+                ], [
+                    'exception' => $e,
+                    'appName' => config('app.name')
+                ], function ($m) {
+                    $m->to(
+                        config('mail.contactsList.serviceweb'),
+                        sprintf('%s Exception Handler', config('app.name'))
+                    )->subject('Need help !, an error occured in your application, please check Logs ASAP');
+                });
+            }
+            // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedCatch
+        } catch (RuntimeException $e) {
+            // do nothing, mail send error, let laravel only handle this
+        } finally {
+            parent::report($e);
+        }
+    }
 }

app/Http/Controllers/Auth/LoginController.php

@@ -8,27 +8,11 @@ use Illuminate\Support\Facades\Auth;
 
 class LoginController extends Controller
 {
-    /**
-     * Display login form
-     *
-     * @param Request $request
-     * @return \Illuminate\Contracts\View\View
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass
-     */
     public function index(Request $request)
     {
-        // @phpcs:enable
         return view('auth.login-bo');
     }
 
-    /**
-     * Compute login form
-     *
-     * @param Request $request
-     * @return \Illuminate\Contracts\View\View
-     *
-     */
     public function login(Request $request)
     {
         $request->validate([
@@ -53,17 +37,8 @@ class LoginController extends Controller
         return view('auth.login')->withErrors('Informations incorrectes.');
     }
 
-    /**
-     * logout
-     *
-     * @param Request $request
-     * @return \Illuminate\Contracts\View\View
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass
-     */
     public function logout(Request $request)
     {
-        // @phpcs:enable
         Auth::logout();
         return redirect()->route('home');
     }

app/Http/Controllers/Auth/RegisterController.php

@@ -10,27 +10,11 @@ use Illuminate\Support\Facades\Hash;
 
 class RegisterController extends Controller
 {
-    /**
-     * Display register form
-     *
-     * @param Request $request
-     * @return \Illuminate\Contracts\View\View
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass
-     */
     public function index(Request $request)
     {
-        // @phpcs:enable
         return view('auth.register');
     }
 
-    /**
-     * Compute regioster form
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     */
     public function register(Request $request)
     {
         $request->validate([
@@ -50,7 +34,8 @@ class RegisterController extends Controller
             'role' => 3
         ]);
 
-        // Envoi mail activation.
+        // Envoi mail activation
+
         return redirect()->route('auth.register')->with('success', 'Mail envoyé pour confirmation');
     }
 }

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -7,17 +7,8 @@ use Illuminate\Http\Request;
 
 class ResetPasswordController extends Controller
 {
-    /**
-     * Display reset password form
-     *
-     * @param Request $request
-     * @return \Illuminate\Contracts\View\View
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass
-     */
     public function index(Request $request)
     {
-        // @phpcs:enable
         return view('auth.reset-password');
     }
 }

app/Http/Controllers/BasketController.php

@@ -12,15 +12,11 @@ class BasketController extends Controller
 {
     /**
      * ajout de produit au panier
-     *
-     * @param \Illuminate\Http\Request $request
-     *
-     * @return array
      */
     public function addToCart(Request $request)
     {
         $instance = $request->instance ?? "panier";
-        $product  = Product::find($request->id);
+        $product = Product::find($request->id);
         Cart::instance($instance);
         Cart::add($product, $request->qty);
         return $this->getCart($instance);
@@ -28,17 +24,13 @@ class BasketController extends Controller
 
     /**
      * ajout de plusieurs produits au panier
-     *
-     * @param \Illuminate\Http\Request $request
-     *
-     * @return array
      */
     public function addToCartLot(Request $request)
     {
         $instance = $request->instance ?? "panier";
         Cart::instance($instance);
         $lot = $request->items;
-        foreach ($lot as $item) {
+        foreach($lot as $item) {
             $product = Product::find($item["cartItem"]["id"]);
             Cart::add($product, $item["cartItem"]["qty"]);
         }
@@ -47,15 +39,11 @@ class BasketController extends Controller
 
     /**
      * suppression de produit du panier
-     *
-     * @param \Illuminate\Http\Request $request
-     *
-     * @return array
      */
     public function removeFromCart(Request $request)
     {
         $instance = $request->instance ?? "panier";
-        $rowId    = $request->rowId;
+        $rowId = $request->rowId;
         Cart::instance($instance);
         Cart::remove($rowId);
         return $this->getCart($instance);
@@ -63,13 +51,8 @@ class BasketController extends Controller
 
     /**
      * vidage de panier
-     *
-     * @param \Illuminate\Http\Request $request
-     *
-     * @return array
      */
-    public function emptyCart(Request $request)
+    public function emptyCart(Request $request) {
-    {
         $instance = $request->instance ?? "panier";
         Cart::instance($instance);
         Cart::destroy();
@@ -78,10 +61,6 @@ class BasketController extends Controller
 
     /**
      * récupération du panier
-     *
-     * @param \Illuminate\Http\Request $request
-     *
-     * @return array
      */
     public function getCartRequest(Request $request)
     {
@@ -90,19 +69,14 @@ class BasketController extends Controller
         return $this->getCart($instance);
     }
 
-    /**
+
-     * return cart data array
+    public function getCart($instance = "panier")
-     *
-     * @param string $instance
-     * @return array
-     */
-    public function getCart(string $instance = "panier")
     {
         Cart::instance($instance);
         $dbpanier = new Collection();
         foreach (Cart::content() as $row) {
             $product = $row->model;
-
+            //$product->additionnalProductInfo = $product->additionnalProductInfo($product->product_type);
             $product->calculatedPrices = $product->getCalcPrices();
 
             $row->setTaxRate($product->tax->rate);
@@ -117,42 +91,30 @@ class BasketController extends Controller
 
         $cartInfos = array(
             "totalTTC" => Cart::total(),
-            // Total des taxes.
+            'totalTVA' => Cart::tax(), //total des taxes
-            'totalTVA' => Cart::tax(),
+            'totalHT' => Cart::subtotal(), //total sans les taxes
-            // Total sans les taxes.
+            'totalweight' => Cart::weight(), //poids total des items
-            'totalHT' => Cart::subtotal(),
+            'totalHTbefore' => Cart::priceTotal(), //total avant taxes et remises
-            // Poids total des items.
+            'totaldiscount' => Cart::discount(), //total des remises
-            'totalweight' => Cart::weight(),
+            'countItems' => Cart::count(), //nb de produits dans le cart
-            // Total avant taxes et remises.
-            'totalHTbefore' => Cart::priceTotal(),
-            // Total des remises.
-            'totaldiscount' => Cart::discount(),
-            // Nb de produits dans le cart.
-            'countItems' => Cart::count(),
         );
 
         $cartInfosNoPrice = array(
             "totalTTC" => "-.--",
-            // Total des taxes.
+            'totalTVA' => "-.--", //total des taxes
-            'totalTVA' => "-.--",
+            'totalHT' => "-.--", //total sans les taxes
-            // Total sans les taxes.
+            'totalweight' => Cart::weight(), //poids total des items
-            'totalHT' => "-.--",
+            'totalHTbefore' => "-.--", //total avant taxes et remises
-            // Poids total des items.
+            'totaldiscount' => "-.--", //total des remises
-            'totalweight' => Cart::weight(),
+            'countItems' => Cart::count(), //nb de produits dans le cart
-            // Total avant taxes et remises.
-            'totalHTbefore' => "-.--",
-            // Total des remises.
-            'totaldiscount' => "-.--",
-            // Nb de produits dans le cart.
-            'countItems' => Cart::count(),
         );
 
         $cartReturn = array($dbpanier,$cartInfosNoPrice);
         if (config('bosettings.show_prices_authenticated') == "authenticated") {
             {
-            if (Auth::guard('customer')->check()) {
+                if (Auth::guard('customer')->check()) {
-                $cartReturn = array($dbpanier,$cartInfos);
+                    $cartReturn = array($dbpanier,$cartInfos);
-            }
+                }
             }
         }
         if (config('bosettings.show_prices_guest') == "guest") {

app/Http/Controllers/Bo/ContentController.php

@@ -8,22 +8,14 @@ use Illuminate\Http\Request;
 
 class ContentController extends Controller
 {
-    /**
+    public function manage(Request $request, $key)
-     * Manage content page
-     *
-     * @param Request $request
-     * @param string  $key
-     * @return \Illuminate\Http\Response
-     *
-     */
-    public function manage(Request $request, string $key)
     {
         $content = Content::where('key', $key)->first();
 
         if ($_SERVER["REQUEST_METHOD"] === "POST") {
-            $banner   = $request->banner;
+            $banner = $request->banner;
-            $title    = $request->title;
+            $title = $request->title;
-            $chapeau  = $request->chapeau;
+            $chapeau = $request->chapeau;
             $maintext = $request->value;
 
             $request->validate([
@@ -42,14 +34,14 @@ class ContentController extends Controller
                 $content->banner = $imageName;
             }
 
-            $content->title   = $title;
+            $content->title = $title;
             $content->chapeau = $chapeau;
-            $content->value   = $maintext;
+            $content->value = $maintext;
             $content->save();
 
             return redirect()->route('bo.content', ['key' => $content->key, 'content' => $content])
                             ->with('success', 'Modifications enregistrés !');
-        }//end if
+        }
 
         return view('bo.content.manage', compact('content'));
     }

app/Http/Controllers/Bo/CreneauxController.php

@@ -9,69 +9,46 @@ use Illuminate\Http\Request;
 
 class CreneauxController extends Controller
 {
-    /**
+    public function settings(Request $request,$id)
-     * Display creneaux settings form
-     *
-     * @param Request $request
-     * @param integer $id
-     * @return \Illuminate\Contracts\View\View
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed
-     */
-    public function settings(Request $request, int $id)
     {
-        // @phpcs:enable
+
-        $magasin          = Magasin::findOrFail($id);
+        $magasin = Magasin::findOrFail($id);
-        $timeslotSettings = $magasin->timeslotSettings;
+        $timeslotSettings   = $magasin->timeslotSettings;
         if ($timeslotSettings->count() === 0) {
-            // Aucun settings pour ce magasin.
+            //Aucun settings pour ce magasin
             $timeslotSettings = $this->makeCreneauxSettings($id);
         }
 
         return view('bo.creneaux.settings', compact('timeslotSettings', 'magasin'));
     }
 
-    /**
+    public function makeCreneauxSettings($id) {
-     * Retrieve creneaux settings
+        for ($i=0;$i<7;$i++) {
-     *
+            $dayset = new TimeslotSetting();
-     * @param integer $id
-     * @return mixed
-     */
-    public function makeCreneauxSettings(int $id)
-    {
-        for ($i = 0; $i < 7; $i++) {
-            $dayset             = new TimeslotSetting();
             $dayset->magasin_id = $id;
-            $dayset->day_index  = '' . $i;
+            $dayset->day_index = ''.$i;
             $dayset->save();
         }
         return Magasin::findOrFail($id)->timeslotSettings;
     }
 
-    /**
+    public function updateSettings(Request $request,$id)
-     * save settings
-     *
-     * @param Request $request
-     * @param integer $id
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function updateSettings(Request $request, int $id)
     {
-        $plage      = $request->plage;
+        $plage = $request->plage;
         $magasin_id = $id;
 
-        foreach ($plage as $index => $day) {
+        foreach($plage as $index => $day) {
-            $setting = TimeslotSetting::where('day_index', '' . $index)
+            $setting = TimeslotSetting::where('day_index', ''.$index)
                             ->where('magasin_id', $magasin_id)
                             ->firstOrFail();
-            // $setting->magasin_id = $magasin_id; ne doit pas changer
+            //$setting->magasin_id = $magasin_id; ne doit pas changer
-            $setting->morning_start           = $day['morning_start'];
+            $setting->morning_start = $day['morning_start'];
-            $setting->morning_end             = $day['morning_end'];
+            $setting->morning_end = $day['morning_end'];
-            $setting->afternoon_start         = $day['afternoon_start'];
+            $setting->afternoon_start = $day['afternoon_start'];
-            $setting->afternoon_end           = $day['afternoon_end'];
+            $setting->afternoon_end = $day['afternoon_end'];
-            $setting->interval                = $day['interval'];
+            $setting->interval = $day['interval'];
             $setting->max_orders_per_interval = $day['max_orders_per_interval'];
-            $setting->min_order_preparation   = $day['min_order_preparation'];
+            $setting->min_order_preparation = $day['min_order_preparation'];
             $setting->save();
         }
 

app/Http/Controllers/Bo/DashboardController.php

@@ -6,11 +6,6 @@ use App\Http\Controllers\Controller;
 
 class DashboardController extends Controller
 {
-    /**
-     * Dashboard Page
-     *
-     * @return \Illuminate\Contracts\View\View
-     */
     public function index()
     {
         return view('bo.dashboard');

app/Http/Controllers/Bo/FaqController.php

@@ -8,41 +8,24 @@ use Illuminate\Http\Request;
 
 class FaqController extends Controller
 {
-    /**
+    public function index() {
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
         $faq = Faq::all();
         return view('bo.faq.index', compact('faq'));
     }
 
-    /**
+    public function saveDatas(Request $request) {
-     * Update faq data.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function saveDatas(Request $request)
-    {
         $faq = $request->faq;
 
-        $looplimit = count($faq);
+        for ($i = 0; $i < count($faq); $i++) {
-        for ($i = 0; $i < $looplimit; $i++) {
             $faqToInsert = !empty($faq[$i]["question"]) && !empty($faq[$i]["answer"]);
             if (isset($faq[$i]["id"]) && $faq[$i]["id"] !== null && $faqToInsert) {
-                $f           = Faq::findOrFail($faq[$i]["id"]);
+                $f = Faq::findOrFail($faq[$i]["id"]);
                 $f->question = $faq[$i]["question"];
-                $f->answer   = $faq[$i]["answer"];
+                $f->answer = $faq[$i]["answer"];
                 $f->save();
             } else {
                 if ($faqToInsert) {
-                    $c             = Faq::updateOrCreate([
+                    $c = Faq::updateOrCreate(['question' => $faq[$i]["question"], 'answer' => $faq[$i]["answer"]]);
-                        'question' => $faq[$i]["question"],
-                        'answer' => $faq[$i]["answer"]
-                    ]);
                     $faq[$i]["id"] = $c->id;
                 } else {
                     unset($faq[$i]);
@@ -54,14 +37,7 @@ class FaqController extends Controller
         return $faq;
     }
 
-    /**
+    public function destroy(Request $request) {
-     * Remove the specified resource from storage.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy(Request $request)
-    {
         $faq = Faq::findOrFail($request->id);
         $faq->delete();
 

app/Http/Controllers/Bo/MagasinsController.php

@@ -33,15 +33,13 @@ class MagasinsController 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)
     {
         $request->validate([
             'name' => 'required|string|max:255',
-            'email_contact' => 'required|email:rfc,dns,spoof|max:255',
-            'email_confirm' => 'nullable|email:rfc,dns,spoof|max:255',
             'address' => 'required|string|max:255',
             'postcode' => 'required',
             'city' => 'required|string|max:255',
@@ -52,14 +50,25 @@ class MagasinsController extends Controller
     }
 
     /**
-     * Show the form for editing the specified resource.
+     * Display the specified resource.
      *
-     * @param  integer $id
+     * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function edit(int $id)
+    public function show($id)
     {
-        $magasin            = Magasin::findOrFail($id);
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        $magasin = Magasin::findOrFail($id);
         $exceptionsCollecte = $magasin->collecteExceptions()->orderBy('date')->get();
         return view('bo.magasins.edit', compact('magasin', 'exceptionsCollecte'));
     }
@@ -67,16 +76,14 @@ class MagasinsController extends Controller
     /**
      * Update the specified resource in storage.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @param  \Illuminate\Http\Request  $request
-     * @param  integer                  $id
+     * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, int $id)
+    public function update(Request $request, $id)
     {
         $request->validate([
             'name' => 'required|string|max:255',
-            'email_contact' => 'required|email:rfc,dns,spoof|max:255',
-            'email_confirm' => 'nullable|email:rfc,dns,spoof|max:255',
             'address' => 'required|string|max:255',
             'postcode' => 'required',
             'city' => 'required|string|max:255',
@@ -90,19 +97,20 @@ class MagasinsController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param  integer $id
+     * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function destroy(int $id)
+    public function destroy($id)
     {
         $shop = Magasin::findOrFail($id);
 
         $count = Magasin::count();
 
         if ($count === 1) {
-            return redirect()->back()
+            return redirect()->back()->withErrors("Suppression impossible : Vous devez conserver au moins 1 point de retrait.");
-                ->withErrors("Suppression impossible : Vous devez conserver au moins 1 point de retrait.");
         }
+        // @todo : controller les crenaux settings liés
+
         $shop->delete();
         return redirect()->route('bo.magasins.index');
     }
@@ -110,19 +118,15 @@ class MagasinsController extends Controller
     /**
      * bo
      * ajx : affichage d'infos sur un magasin
-     *
-     * @param integer     $id
-     * @param string|null $mode
-     * @return \Illuminate\Contracts\View\View
      */
-    public function getMagasinInfo(int $id, string $mode = null)
+    public function getMagasinInfo($id, $mode = null)
     {
         $magasin = Magasin::findOrFail($id);
-        if (!is_null($mode)) {
+        if(!is_null($mode)) {
-            if ($mode == "tippy") {
+            if($mode=="tippy") {
                 return view('bo.magasins.tippy-card', compact('magasin'));
             }
-            if ($mode == "json") {
+            if($mode=="json") {
                 return $magasin;
             }
             return view('bo.magasins.info-card', compact('magasin'));
@@ -130,74 +134,54 @@ class MagasinsController extends Controller
         return view('bo.magasins.info-popup', compact('magasin'));
     }
 
-    /**
-     * Save collect exceptions
-     *
-     * @param Request $request
-     * @return array
-     */
     public function saveExceptions(Request $request)
     {
         $collecteException = $request->collecte_exception;
 
-        $looplimit = count($collecteException);
+        for ($i = 0; $i < count($collecteException); $i++) {
-        for ($i = 0; $i < $looplimit; $i++) {
             $collecteExceptionToInsert = !empty($collecteException[$i]["date"]);
-            if (
+            if (isset($collecteException[$i]["id"]) && $collecteException[$i]["id"] !== null && $collecteExceptionToInsert) {
-                isset($collecteException[$i]["id"]) &&
+                $ce = CollecteException::findOrFail($collecteException[$i]["id"]);
-                $collecteException[$i]["id"] !== null &&
+                $ce->date = $collecteException[$i]["date"];
-                $collecteExceptionToInsert
+                $ce->comment = $collecteException[$i]["comment"];
-            ) {
-                $ce             = CollecteException::findOrFail($collecteException[$i]["id"]);
-                $ce->date       = $collecteException[$i]["date"];
-                $ce->comment    = $collecteException[$i]["comment"];
                 $ce->magasin_id = $collecteException[$i]["magasin_id"];
                 $ce->save();
             } else {
                 if ($collecteExceptionToInsert) {
-                    $ce                          = CollecteException::updateOrCreate([
+                    $ce = CollecteException::updateOrCreate([
                         'date' => $collecteException[$i]["date"],
                         'comment' => $collecteException[$i]["comment"],
                         'magasin_id' => $collecteException[$i]["magasin_id"]
                         ]);
                     $collecteException[$i]["id"] = $ce->id;
+
                 } else {
                     unset($collecteException[$i]);
                     $i--;
                 }
             }
-        }//end for
+        }
 
-        // Remet dans l'ordre avant de renvoyer.
+        //remet dans l'ordre avant de renvoyer
+        //$collecteException = CollecteException::where('magasin_id',)->orderBy('date')->get();
         $this->arraySortByColumn($collecteException, "date");
         return $collecteException;
+
     }
 
     /**
      * helper function
-     *
-     * @param array   $array
-     * @param string  $column
-     * @param integer $direction
-     * @return void
      */
-    public function arraySortByColumn(array &$array, string $column, int $direction = SORT_ASC)
+    public function arraySortByColumn(&$array, $column, $direction = SORT_ASC) {
-    {
         $reference_array = array();
 
-        foreach ($array as $key => $row) {
+        foreach($array as $key => $row) {
             $reference_array[$key] = $row[$column];
         }
 
         array_multisort($reference_array, $direction, $array);
     }
 
-    /**
-     * delete collecte exception
-     *
-     * @param Request $request
-     * @return string
-     */
     public function destroyExceptions(Request $request)
     {
         $collecteException = CollecteException::findOrFail($request->id);

app/Http/Controllers/Bo/OrdersController.php

@@ -16,89 +16,56 @@ use App\Mail\OrderConfirmMail;
 use App\Mail\OrderConfirmAdminMail;
 use App\Jobs\CsvOrderWrite;
 use App\Models\Customers;
-use App\Models\OrdersStatus;
 use App\Models\Setting;
 use Carbon\Carbon;
 use Carbon\CarbonImmutable;
 use Carbon\CarbonInterval;
 use Gloudemans\Shoppingcart\Facades\Cart;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Session;
+use Exception;
 
 class OrdersController extends Controller
 {
     /**
-     * Display a listing of the resource.
+     * index of orders (Bo)
-     *
-     * @param \App\Http\Requests\SortOrders $request
-     * @return \Illuminate\Contracts\View\View
      */
     public function index(SortOrders $request)
     {
+        //$orders = Order::orderBy('date', 'DESC')->get();
+
         $orders = $this->filterOrders($request);
 
-        $status_orders = OrdersStatus::all();
-        $magasins      = Magasin::all();
-
-        $filter_status_order = $request->query('filter_status_order');
-        $filter_magasin      = $request->query('filter_magasin');
-        $filter_reference    = $request->query('filter_reference');
-
-        if (!empty($filter_status_order)) {
-            $orders = $orders->where('status_id', $filter_status_order);
-        }
-        if (!empty($filter_magasin)) {
-            $orders = $orders->whereHas(
-                'timeslot',
-                function (Builder $q) use ($filter_magasin) {
-                    $q->where('timeslots.magasin_id', $filter_magasin);
-                }
-            );
-        }
-        if (!empty($filter_reference)) {
-            $orders = $orders->where('reference', 'like', "%{$filter_reference}%");
-        }
         $orders = $orders->paginate(10);
 
-        return view(
+        return view('bo.orders.index', compact('orders'));
-            'bo.orders.index',
-            compact('orders', 'status_orders', 'magasins', 'filter_status_order', 'filter_magasin', 'filter_reference')
-        );
     }
 
-    /**
-     * orders that ship today
-     *
-     * @param SortOrders $request
-     * @return \Illuminate\Contracts\View\View
-     */
     public function today(SortOrders $request)
     {
+        //$orders = Order::orderBy('date', 'DESC')->get();
+
         $orders = $this->filterOrders($request);
 
-        // Filter today.
+        //filter today
         $today  = CarbonImmutable::now()->startOfDay();
         $orders = $orders->whereHas('timeslot', function ($q) use ($today) {
             $q->where('day', '=', $today->format('d/m/Y'));
         });
 
 
-        $orders = $orders->get();
+        $orders = $orders->get(); //paginate(20);
+
         return view('bo.orders.index', compact('orders', 'today'));
     }
 
-    /**
-     * Filter orders
-     *
-     * @param Request $request
-     * @return \Illuminate\Database\Eloquent\Builder
-     */
     protected function filterOrders(Request $request)
     {
         $orders = Order::query();
 
+
         if ($request->rst) {
             Session::remove('orders.sort_col');
             Session::remove('orders.sort_way');
@@ -135,10 +102,8 @@ class OrdersController extends Controller
                 case 'customer_id':
                     $orders = $orders->orderBy('customer_id', Session::get('orders.sort_way'));
                     break;
-            } //end switch
+            }
-        } else {
+        }
-            $orders->orderByDesc('date');
-        }//end if
 
         return $orders;
     }
@@ -146,47 +111,41 @@ class OrdersController extends Controller
     /**
      * action de changement de statut vers l'avant
      * envoi de mails transctionnels
-     *
+     * @param String $reference reference de la commande
-     * @param string $reference Reference de la commande.
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function changeStatus(string $reference)
+    public function changeStatus($reference)
     {
         $order            = Order::where('reference', $reference)->first();
         $order->status_id = $order->status_id + 1;
         $order->save();
 
-        // Send confirm mail.
+        //send confirm mail
         Mail::to($order->customer->email)->send(new OrderStatusMail($order));
+        Mail::mailer('smtp2')->to($order->customer->email)->send(new OrderStatusMail($order));
 
+        //return redirect()->route('bo.orders')->with('success', "Changement de status enregistré pour la commande " . $order->reference . ".");
         return back()->with('success', "Changement de status enregistré pour la commande " . $order->reference . ".");
     }
 
     /**
      * mise au statut annulé d'une commande
-     *
-     * @param string $reference
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function cancelOrder(string $reference)
+    public function cancelOrder($reference)
     {
         $order            = Order::where('reference', $reference)->first();
         $order->status_id = 7;
         $order->save();
 
+        //return redirect()->route('bo.orders')->with('success', "La commande à été annulée.");
         return back()->with('success', "La commande " . $order->reference . " à été annulée.");
     }
 
     /**
-     * @deprecated Supprimer cette méthode qui repose sur un modèle de donnée osolète.
+     * @deprecated
      * ajout de produits à la commande
-     *
+     * @todo : supprimer cette méthode qui repose sur un modèle de donnée osolète
-     * @param string  $orderReference
-     * @param integer $productId
-     * @param integer $quantity
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function addProduct(string $orderReference, int $productId, int $quantity)
+    public function addProduct($orderReference, $productId, $quantity)
     {
         $product = Product::findOrFail($productId);
         $order   = Order::where('reference', $orderReference)->first();
@@ -205,8 +164,7 @@ class OrdersController extends Controller
     /**
      * front
      * récap panier du tunnel de commande
-     *
+     * @todo : déplacer vers le controller idoine
-     * @return \Illuminate\Contracts\View\View
      */
     public function recapOrder()
     {
@@ -216,18 +174,12 @@ class OrdersController extends Controller
 
         $cartInfos = array(
             "totalTTC" => Cart::total(),
-            // Total des taxes.
+            'totalTVA' => Cart::tax(), //total des taxes
-            'totalTVA' => Cart::tax(),
+            'totalHT' => Cart::subtotal(), //total sans les taxes
-            // Total sans les taxes.
+            'totalweight' => Cart::weight(), //poids total des items
-            'totalHT' => Cart::subtotal(),
+            'totalHTbefore' => Cart::priceTotal(), //total avant taxes et remises
-            // Poids total des items.
+            'totaldiscount' => Cart::discount(), //total des remises
-            'totalweight' => Cart::weight(),
+            'countItems' => Cart::count(), //nb de produits dans le cart
-            // Total avant taxes et remises.
-            'totalHTbefore' => Cart::priceTotal(),
-            // Total des remises.
-            'totaldiscount' => Cart::discount(),
-            // Nb de produits dans le cart.
-            'countItems' => Cart::count(),
         );
 
         return view('sales.recap', compact('activestep', 'cart', 'cartInfos'));
@@ -236,15 +188,13 @@ class OrdersController extends Controller
     /**
      * front
      * Storing order from sales tunnel
-     *
-     * @return \Illuminate\Http\RedirectResponse
      */
     public function store()
     {
-        // Save.
+        //save
         Cart::instance('panier');
         $order = new Order();
-        // Generate order ref.
+        //generate order ref
         $order->reference   = $this->generateOrderRef();
         $order->date        = Carbon::now();
         $order->status_id   = 1;
@@ -253,7 +203,7 @@ class OrdersController extends Controller
 
         $order->save();
 
-        // Order_id.
+        //order_id
         Cart::instance('panier');
         $cart = Cart::content();
         foreach ($cart as $cartItem) {
@@ -261,48 +211,47 @@ class OrdersController extends Controller
             $order_line->order_id   = $order->id;
             $order_line->product_id = $cartItem->model->id;
             $order_line->quantity   = $cartItem->qty;
-            // Gross unit price.
+            //gross unit price
             $order_line->unit_price = $cartItem->model->priceHt;
-            // Discount per unit.
+            //discount per unit
             $order_line->unit_discount = $cartItem->model->discountAmount;
-            // Tax rate for this line.
+            //tax rate for this line
             $order_line->tax_rate = $cartItem->taxRate;
-            // Tax amount par unit.
+            //tax amount par unit
-            $order_line->unit_tax = round(
+            $order_line->unit_tax = round(( ($order_line->unit_price - $order_line->unit_discount) * ($order_line->tax_rate / 100) ) * 100) / 100;
-                (($order_line->unit_price - $order_line->unit_discount) * ($order_line->tax_rate / 100)) * 100
+            //discount amount for the line
-            ) / 100;
-            // Discount amount for the line.
             $order_line->total_discount = $order_line->unit_discount * $order_line->quantity;
-            // Gross amount for the line.
+            //gross amount for the line
             $order_line->total_ht = ($order_line->unit_price - $order_line->unit_discount) * $order_line->quantity;
-            // Tax amount for the line.
+            //tax amount for the line
             $order_line->total_tax = $order_line->unit_tax * $order_line->quantity;
-            // Total TTC avec remises de la ligne.
+            //total TTC avec remises de la ligne
             $order_line->total_ttc = $order_line->total_ht + $order_line->total_tax;
 
             $order_line->save();
-        }//end foreach
+        }
 
-        // Empty cart.
+        //empty cart
         Cart::destroy();
-        // Then redirect.
+        //then redirect
         return redirect()->route('sales.pick-slot', ['reference' => $order->reference]);
     }
 
     /**
      * generate order Reference
      * for a new order
-     *
-     * @return string
      */
     public function generateOrderRef()
     {
 
-        // Format : YYYYMMDDHHMM000.
+        //Avant
+        //Str::uuid();
+        //maintenant
+        //format : YYYYMMDDHHMM000
         $now = Carbon::now();
-        // Count todays orders.
+        //count todays orders
         $countorders = Order::whereDate('created_at', Carbon::today())->count();
-        // Add one.
+        //add one
         $countorders++;
         $ref = $now->isoFormat('YYYYMMDDHHmm') . str_pad($countorders, 3, "0", STR_PAD_LEFT);
         return $ref;
@@ -310,11 +259,8 @@ class OrdersController extends Controller
 
     /**
      * front tunnel de commande étape 3 : choix de créneau
-     *
-     * @param string $reference
-     * @return \Illuminate\Contracts\View\View
      */
-    public function timeSlotPick(string $reference)
+    public function timeSlotPick($reference)
     {
         $activestep = 3;
         if (config('theme.multi_relay')) {
@@ -324,81 +270,26 @@ class OrdersController extends Controller
         }
 
         $availCreneaux = array();
-        $order         = Order::where('reference', '=', $reference)->firstOrFail();
+        //plus besoin car chargé par le composant vue.
+        //$availCreneaux = $this->getAvailableCreneauxByShop($magasin->id);
+
+        $order = Order::where('reference', '=', $reference)->firstOrFail();
 
         return view('sales.pick-slot', compact('activestep', 'availCreneaux', 'order', 'magasin'));
     }
 
     /**
-     * add timeslot by interval between start and end hour
+     * @return mixed
-     *
-     * @param array           $plage
-     * @param integer         $weekDay
-     * @param CarbonImmutable $current
-     * @param Magasin         $magasin
-     * @param CarbonImmutable $now
-     * @param CarbonImmutable $today
-     * @param CarbonInterval  $delaiPrepa
-     * @param CarbonInterval  $interval
-     * @param Carbon          $currentTime
-     * @param Carbon          $endTime
-     * @return array
      */
-    private function addCreneaux(
+    public function getAvailableCreneauxByShop($id)
-        array $plage,
-        int $weekDay,
-        CarbonImmutable $current,
-        Magasin $magasin,
-        CarbonImmutable $now,
-        CarbonImmutable $today,
-        CarbonInterval $delaiPrepa,
-        CarbonInterval $interval,
-        Carbon $currentTime,
-        Carbon $endTime
-    ) {
-        $retArray = array();
-        do {
-            $creneau  = $currentTime->format('H:i');
-            $nbtakens = $magasin->timeslots()
-                ->where('day', $current->format('d/m/Y'))
-                ->where('time', $creneau)->count();
-
-            if ($nbtakens >= $plage[$weekDay]['max_orders_per_interval']) {
-                $isDispo = false;
-            } else {
-                $isDispo = true;
-            }
-
-            if (
-                $current->addHours($currentTime->format('H'))->addMinutes($currentTime->format('i')) <
-                $now->add($delaiPrepa)
-            ) {
-                $isDispo = false;
-            }
-            // Attention si la date est passée (today mais avant maintenant) : pas de créneau.
-            if ($current > $today || $currentTime >= $now) {
-                $retArray[] = array($creneau, $isDispo);
-            }
-            $currentTime->add($interval);
-        } while ($currentTime <= $endTime);
-        return $retArray;
-    }
-
-    /**
-     * give array of available crenaux
-     *
-     * @param integer $id
-     * @return array
-     */
-    public function getAvailableCreneauxByShop(int $id)
     {
-        // Setting à stocker et réutiliser.
+        //setting à stocker et réutiliser
         $plage_days = Setting::where('key', 'order_withdrawal_period')->firstOrFail()->value;
 
         $magasin          = Magasin::findOrFail($id);
         $timeslotSettings = $magasin->timeslotSettings;
-        // $timeslotSettings = TimeslotSetting::all();
+        //$timeslotSettings = TimeslotSetting::all();
-        // Fabriquons un tableau recap.
+        //fabriquons un tableau recap
         $plage = array();
         foreach ($timeslotSettings as $day) {
             $plage[$day->day_index] = array(
@@ -412,14 +303,18 @@ class OrdersController extends Controller
             );
         }
 
-        // Génération des plages.
+        //génération des plages
-        // Start today.
+        //start today
         $today   = CarbonImmutable::now()->startOfDay();
         $weekDay = $today->weekday();
-        // Final boundary (permet de limiter la liste des jours d'exception).
+        //final boundary (permet de limiter la liste des jours d'exception)
         $finalday = $today->add($plage_days, 'day');
         $now      = CarbonImmutable::now();
-        // Jours exceptions.
+        //jours exceptions
+        // $noCollectDays = CollecteException::where('magasin_id',$magasin->id)
+        //                             ->whereDate('date', '>', $now)
+        //                             ->whereDate('date', '<=', $finalday)
+        //                             ->orderBy('date')->get();
         $noCollectDays = $magasin->collecteExceptions()
                                 ->whereDate('date', '>', $now)
                                 ->whereDate('date', '<=', $finalday)
@@ -430,11 +325,12 @@ class OrdersController extends Controller
         $availCreneaux = array();
 
         for ($i = 0; $i < $plage_days; $i++) {
+            /** @var Carbon */
             $current  = $today->add($i, 'day');
             $weekDay  = $current->weekday();
             $interval = CarbonInterval::createFromFormat('h:i', $plage[$weekDay]['interval'] ?? '00:15');
 
-            // Si c'est un jour exception skip.
+            //si c'est un jour exception skip
             $skip = false;
             foreach ($noCollectDays as $not_today) {
                 if ($current->isSameDay($not_today->date)) {
@@ -444,63 +340,64 @@ class OrdersController extends Controller
             if ($skip) {
                 continue;
             }
-            $availCreneaux[$current->format('d/m/Y')] = array();
+            //matinée
-            // Matinée.
             if (!empty($plage[$weekDay]['morning_start'])) {
                 $currentTime = Carbon::createFromTimeString($plage[$weekDay]['morning_start']);
                 $endTime     = Carbon::createFromTimeString($plage[$weekDay]['morning_end']);
+                do {
+                    $creneau  = $currentTime->format('H:i');
+                    $nbtakens = $magasin->timeslots()
+                                        ->where('day', $current->format('d/m/Y'))
+                                        ->where('time', $creneau)->count();
 
-                $morningCreneaux = $this->addCreneaux(
+                    // $nbtakens = Timeslot::where('day', $current->format('d/m/Y'))
-                    $plage,
+                    //                     ->where('time', $creneau)->count();
-                    $weekDay,
-                    $current,
-                    $magasin,
-                    $now,
-                    $today,
-                    $delaiPrepa,
-                    $interval,
-                    $currentTime,
-                    $endTime
-                );
 
-                $availCreneaux[$current->format('d/m/Y')] = array_merge(
+                    if ($nbtakens >= $plage[$weekDay]['max_orders_per_interval']) {
-                    $availCreneaux[$current->format('d/m/Y')],
+                        $isDispo = false;
-                    $morningCreneaux
+                    } else {
-                );
+                        $isDispo = true;
-            } //end if
+                    }
-            // Aprem.
+
+                    if ($current->addHours($currentTime->format('H'))->addMinutes($currentTime->format('i')) < $now->add($delaiPrepa)) {
+                        $isDispo = false;
+                    }
+                    //attention si la date est passée (today mais avant maintenant) : pas de créneau
+                    if ($current > $today || $currentTime >= $now) {
+                        $availCreneaux[$current->format('d/m/Y')][] = array($creneau,$isDispo);
+                    }
+                    $currentTime->add($interval);
+                } while ($currentTime <= $endTime);
+            }
+            //aprem
             if (!empty($plage[$weekDay]['afternoon_start'])) {
                 $currentTime = Carbon::createFromTimeString($plage[$weekDay]['afternoon_start']);
                 $endTime     = Carbon::createFromTimeString($plage[$weekDay]['afternoon_end']);
+                do {
+                    $creneau  = $currentTime->format('H:i');
+                    $nbtakens = Timeslot::where('day', $current->format('d/m/Y'))->where('time', $creneau)->count();
+                    if ($nbtakens >= $plage[$weekDay]['max_orders_per_interval']) {
+                        $isDispo = false;
+                    } else {
+                        $isDispo = true;
+                    }
 
-                $afternoonCreneaux = $this->addCreneaux(
+                    if ($current->addHours($currentTime->format('H'))->addMinutes($currentTime->format('i')) < $now->add($delaiPrepa)) {
-                    $plage,
+                        $isDispo = false;
-                    $weekDay,
+                    }
-                    $current,
-                    $magasin,
-                    $now,
-                    $today,
-                    $delaiPrepa,
-                    $interval,
-                    $currentTime,
-                    $endTime
-                );
 
-                $availCreneaux[$current->format('d/m/Y')] = array_merge(
+                    //attention si la date est passée (today mais avant maintenant) : pas de créneau
-                    $availCreneaux[$current->format('d/m/Y')],
+                    if ($current > $today || $currentTime >= $now) {
-                    $afternoonCreneaux
+                        $availCreneaux[$current->format('d/m/Y')][] = array($creneau,$isDispo);
-                );
+                    }
-            } //end if
+                    $currentTime->add($interval);
-        }//end for
+                } while ($currentTime <= $endTime);
+            }
+        }
         return $availCreneaux;
     }
 
-    /**
+    //call ajax pour le composant vue de timeslots
-     * Call ajax pour le composant vue de timeslots.
-     *
-     * @param Request $request
-     * @return array
-     */
     public function getAvailableCreneaux(Request $request)
     {
         return $this->getAvailableCreneauxByShop($request->id);
@@ -510,10 +407,6 @@ class OrdersController extends Controller
      * front
      * enregistrement du créneau de collect
      * et validation de la commande
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \RuntimeException If email missing.
      */
     public function setTimeSlot(Request $request)
     {
@@ -523,6 +416,7 @@ class OrdersController extends Controller
             'ok_cgv' => 'accepted',
         ]);
 
+        $time_slot  = Carbon::createFromFormat('d/m/Y-H:i', $request->selectedcreneau);
         $tsday      = explode('-', $request->selectedcreneau)[0];
         $tstime     = explode('-', $request->selectedcreneau)[1];
         $magasin_id = $request->selectedmagasin;
@@ -530,8 +424,8 @@ class OrdersController extends Controller
         $order      = Order::where('reference', '=', $reference)->firstOrFail();
 
         if ($order->status_id == 1) {
-            // On ne traite l'enregistrement que pour les commandes en attente venant de l'étape de récap.
+            // on ne traite l'enregistrement que pour les commandes en attente venant de l'étape de récap
-            // Save timeslot.
+            //save timeslot
             $timeslot             = Timeslot::firstOrNew(['order_id' => $order->id]);
             $timeslot->order_id   = $order->id;
             $timeslot->magasin_id = $magasin_id;
@@ -539,53 +433,35 @@ class OrdersController extends Controller
             $timeslot->time       = $tstime;
             $timeslot->save();
 
-            // Save order status.
+            //save order status
             $order->status_id = 3;
             $order->save();
 
-            // Send confirm mail.
+            //send confirm mail
             Mail::to($order->customer->email)->queue(new OrderConfirmMail($order));
+            Mail::mailer('smtp2')->to($order->customer->email)->queue(new OrderConfirmMail($order));
 
-            // Envoi du mail de confirmation aux admins site.
+            //envoi du mail de confirmation aux admins site
-            /** @var \App\Model\Magasin|null */
+            $toMailSetting = Setting::where('key', 'send_order_confirm_mail_to')->first();
-            $shop = Magasin::where('id', $magasin_id)->first();
+            if (empty($toMailSetting->value)) {
-
+                $toMail = config('mail.from.address');
-            if ($shop and $shop->email_confirm) {
-                /** @var string */
-                $toMail = $shop->email_confirm;
             } else {
-                /** @var string|null */
+                $toMail = $toMailSetting->value;
-                $toMail = \optional(Setting::where('key', 'send_order_confirm_mail_to')->first())->value;
-                if (!$toMail) {
-                    /** @var string|null */
-                    $toMail = config('mail.from.address');
-                }
             }
-
-            if (!$toMail) {
-                throw new \RuntimeException('Impossible de trouver un mail');
-            }
-
             Mail::to($toMail)->queue(new OrderConfirmAdminMail($order));
+            Mail::mailer('smtp2')->to($toMail)->queue(new OrderConfirmAdminMail($order));
 
-            // Export commande.
+            //export commande
             if (config('bosettings.regate_orders')) {
                 CsvOrderWrite::dispatch($order);
             }
-        }//end if
+        }
 
-        // Redirect to final confirmation.
+        //redirect to final confirmation
         return redirect()->route('sales.confirm', ['reference' => $order->reference]);
     }
 
-    /**
+    public function generateOrder($reference)
-     * generate Order
-     * Test method
-     *
-     * @param string $reference
-     * @return void
-     */
-    public function generateOrder(string $reference)
     {
         $order = Order::where('reference', '=', $reference)->with('lines')->firstOrFail();
         $job   = new CsvOrderWrite($order);
@@ -596,18 +472,15 @@ class OrdersController extends Controller
     /**
      * front
      * page de confirmation de commande
-     *
-     * @param string $reference
-     * @return \Illuminate\Contracts\View\View
      */
-    public function confirmOrder(string $reference)
+    public function confirmOrder($reference)
     {
         $activestep = 4;
 
         $idcommande = Session::get('idcommande');
         $order      = Order::where('reference', '=', $reference)->firstOrFail();
 
-        // 1 seul magasin en base pour le moment
+        //1 seul magasin en base pour le moment
         $magasin = Magasin::find($order->timeslot->magasin->id);
 
         return view('sales.confirm', compact('activestep', 'order', 'magasin'));
@@ -616,12 +489,9 @@ class OrdersController extends Controller
     /**
      * bo
      * ajx : affichage d'infos sur un client
-     *
+     * @todo : déplacer dans le controller idoine
-     * @param integer     $id
-     * @param string|null $mode
-     * @return \Illuminate\Contracts\View\View
      */
-    public function getCustomerInfo(int $id, string $mode = null)
+    public function getCustomerInfo($id, $mode = null)
     {
         $cust = Customers::findOrFail($id);
         if (!is_null($mode)) {
@@ -629,7 +499,7 @@ class OrdersController extends Controller
                 return view('bo.customer.tippy-card', compact('cust'));
             }
             if ($mode == "json") {
-                return $cust->apiData;
+                return $cust;
             }
             return view('bo.customer.info-card', compact('cust'));
         }
@@ -637,12 +507,9 @@ class OrdersController extends Controller
     }
 
     /**
-     * bo : page détail commande
+     * bo : page détatil commande
-     *
-     * @param string $reference
-     * @return \Illuminate\Contracts\View\View
      */
-    public function orderDetail(string $reference)
+    public function orderDetail($reference)
     {
         $order = Order::where('reference', '=', $reference)->firstOrFail();
         return view('bo.orders.detail', compact('order'));

app/Http/Controllers/Bo/ProductsController.php

@@ -21,10 +21,7 @@ use Illuminate\Support\Facades\File;
 class ProductsController extends Controller
 {
     /**
-     * Display a listing of the resource.
+     * Bo index page for products
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
      */
     public function index(Request $request)
     {
@@ -43,12 +40,13 @@ class ProductsController extends Controller
         }
         $products = $products->paginate(10);
 
-        // Ici récupération des infos additionnelles pour affichage dans la liste.
+        //ici récupération des infos additionnelles pour affichage dans la liste
+        // @todo : parametrer l'occurence de ces affichages car ça n'aura aucun sens selon le type de produit
         foreach ($products as &$product) {
-            if (!empty($product->product_type)) {
+            if(!empty($product->product_type)) {
                 $product->additionnalProductInfo = $product->additionnalProductInfo($product->product_type);
                 if ($product->additionnalProductInfo === null) {
-                    // N'existe pas on renseigne un vide.
+                    //n'existe pas on renseigne un vide
                     $product_type           = $product->product_type;
                     $modelClass             = 'App\Models\\' . ucfirst($product_type);
                     $product->$product_type = new $modelClass();
@@ -60,34 +58,32 @@ class ProductsController extends Controller
     }
 
     /**
-     * Show the form for creating a new resource.
+     * create à product
-     * @param string $product_type
-     * @return \Illuminate\Http\Response
      */
-    public function create(string $product_type = null)
+    public function create($product_type = null)
     {
         if (!empty($product_type) && !array_key_exists($product_type, config('theme.enum_product_types'))) {
             abort(404, "Cette page n'existe pas.");
+            //return redirect()->route('bo.products.index');
         }
-        $modelClass = 'App\Models\\' . ucfirst($product_type);
+        $modelClass             = 'App\Models\\' . ucfirst($product_type);
-        $product    = new Product();
+        $product                = new Product();
-        if (!empty($product_type)) {
+        if(!empty($product_type)) {
             $product->$product_type = new $modelClass();
         }
-        $ranges = Range::all();
+        $ranges                 = Range::all();
-        $taxes  = TaxRate::all();
+        $taxes                  = TaxRate::all();
         return view('bo.products.create', compact('product_type', 'product', 'ranges', 'taxes'));
     }
 
     /**
      * store a new product
-     *
+     * @todo : manage tags and associated products
-     * @param ProductRequest $request
+     * @todo : enregistrer unité de vente, poids et unité de poids
-     * @return \Illuminate\Http\Response
      */
     public function store(ProductRequest $request)
     {
-        // Products fields.
+        //products fields
         $name            = $request->name;
         $description     = $request->description;
         $picture         = $request->picture;
@@ -102,17 +98,15 @@ class ProductsController extends Controller
         $weight          = $request->weight;
         $weight_unit     = $request->weight_unit;
         $status          = $request->status === null ? 0 : 1;
-        $orderable_start = $request->orderable_start_date === null ? null
+        $orderable_start = $request->orderable_start_date === null ? null : $request->orderable_start_date . " " . $request->orderable_start_time;
-        : $request->orderable_start_date . " " . $request->orderable_start_time;
+        $orderable_end   = $request->orderable_end_date === null ? null :  $request->orderable_end_date . " " . $request->orderable_end_time;
-        $orderable_end   = $request->orderable_end_date === null ? null
-        : $request->orderable_end_date . " " . $request->orderable_end_time;
         $star            = $request->star === null ? 0 : 1;
         $slug            = Str::slug($name);
         $rangeId         = $request->range_id;
         $taxRateId       = $request->tax_rate_id;
 
 
-        // Check si le slug existe déjà dans cette gamme de produits.
+        // Check si le slug existe déjà dans cette gamme de produits
         $slugExist = Product::where([
             ['range_id', $rangeId],
             ['slug', $slug]
@@ -146,7 +140,7 @@ class ProductsController extends Controller
         $product->tax_rate_id     = $taxRateId;
         $product->save();
 
-        // Check si le slug existe dans la table old_slugs, auquel cas il est attribué a ce nouveau produit.
+        // Check si le slug existe dans la table old_slugs, auquel cas il est attribué a ce nouveau produit
         $oldSlug = OldSlug::where('slug', $slug)->first();
         if ($oldSlug && $oldSlug->product_id !== $product->id) {
             $oldSlug->product_id = $product->id;
@@ -169,7 +163,7 @@ class ProductsController extends Controller
             $product->save();
         }
 
-        // Ajout des infos additionnelles.
+        //ajout des infos additionnelles
         $product_type = $request->product_type;
 
         if ($product_type !== null) {
@@ -180,27 +174,23 @@ class ProductsController extends Controller
         }
 
 
-        // Additionnal product info (foodProduct).
+        //additionnal product info (foodProduct)
         return redirect()->route('bo.products.index');
     }
 
     /**
-     * Show the form for editing the specified resource.
+     * edit an existing product
-     *
-     * @param  integer $id
-     * @return \Illuminate\Http\Response
      */
-    public function edit(int $id)
+    public function edit($id)
     {
         $product = Product::findOrFail($id);
-        if (!empty($product->product_type)) {
+        if(!empty($product->product_type)) {
             $product->additionnalProductInfo = $product->additionnalProductInfo($product->product_type);
-            /**
+            //above lines equivalent to :
-             * Above lines equivalent to
+            //$product = Product::with('additionnalProductInfo')->findOrFail($id);
-             * $product = Product::with('additionnalProductInfo')->findOrFail($id);
+
-             */
             if ($product->additionnalProductInfo === null) {
-                // N'existe pas on renseigne un vide.
+                //n'existe pas on renseigne un vide
                 $product_type           = $product->product_type;
                 $modelClass             = 'App\Models\\' . ucfirst($product_type);
                 $product->$product_type = new $modelClass();
@@ -216,30 +206,23 @@ class ProductsController extends Controller
         $selectedProds = $product->products;
         $existingProds = $existingProds->diff($selectedProds);
 
-        return view('bo.products.edit', compact(
+        return view('bo.products.edit', compact('product', 'ranges', 'taxes', 'existingTags', 'selectedtags', 'existingProds', 'selectedProds'));
-            'product',
-            'ranges',
-            'taxes',
-            'existingTags',
-            'selectedtags',
-            'existingProds',
-            'selectedProds'
-        ));
     }
 
     /**
-     * Update the specified resource.
+     * update an existing product
-     *
-     * @param \App\Models\Product $product
-     * @param ProductRequest      $request
-     * @return \Illuminate\Http\Response
      */
     public function update(Product $product, ProductRequest $request)
     {
+
+        //$product = Product::findOrFail($id);
+
         $orderable_end_time = $request->orderable_end_time === null ? "23:59" : $request->orderable_end_time;
 
         $name            = $request->name;
         $description     = $request->description;
+        $picture         = $request->picture;
+        $picture_large   = $request->picture_large;
         $price           = $request->price;
         $invoicing_unit  = $request->invoicing_unit;
         $priceBuy        = $request->price_buy;
@@ -250,22 +233,59 @@ class ProductsController extends Controller
         $weight          = $request->weight;
         $weight_unit     = $request->weight_unit;
         $status          = $request->status === null ? 0 : 1;
-        $orderable_start = $request->orderable_start_date === null ? null
+        $orderable_start = $request->orderable_start_date === null ? null : $request->orderable_start_date . " " . $request->orderable_start_time;
-            : $request->orderable_start_date . " " . $request->orderable_start_time;
+        $orderable_end   = $request->orderable_end_date === null ? null :  $request->orderable_end_date . " " . $orderable_end_time;
-        $orderable_end   = $request->orderable_end_date === null ? null
-            : $request->orderable_end_date . " " . $orderable_end_time;
         $star            = $request->star === null ? 0 : 1;
         $slug            = Str::slug($name);
         $rangeId         = $request->range_id;
         $taxRateId       = $request->tax_rate_id;
+        $tags            = $request->tags;
 
-        $this->checkSlugExistsWithinRange($request, $rangeId, $slug, $product->id);
+        // Check si le slug existe déjà dans cette gamme de produits
+        $slugExist = Product::where([
+            ['range_id', $rangeId],
+            ['slug', $slug],
+            ['id', '<>', $product->id]
+        ])->first();
 
-        $this->manageProductImages($request->picture, $product, $request->picture_large);
+        if ($slugExist) {
+            return redirect()->back()
+                ->withInput($request->input())
+                ->withErrors("Erreur : un produit avec le slug d'accès \"" . $slug .
+                "\" éxiste déjà. Veuillez changer le nom du produit.");
+        }
+
+        $str_random = Str::random(5);
+
+        if ($picture !== null) {
+            if ($product->picture !== null && file_exists(public_path('images/produits/') . $product->picture)) {
+                unlink(public_path('images/produits/') . $product->picture);
+            }
+            $imageName = $product->id . '_' . $str_random . '.' . $picture->extension();
+            $picture->move(public_path('images/produits'), $imageName);
+            $product->picture = $imageName;
+        }
+
+        if ($picture_large !== null) {
+            if ($product->picture_large !== null && file_exists(public_path('images/produits/') . $product->picture_large)) {
+                unlink(public_path('images/produits/') . $product->picture_large);
+            }
+            $imageName = $product->id . '_' . $str_random . '_large.' . $picture_large->extension();
+            $picture_large->move(public_path('images/produits'), $imageName);
+            $product->picture_large = $imageName;
+        }
 
         $product->name = $name;
 
-        $this->saveNewSlugForProduct($product, $slug);
+        if ($product->slug != $slug) {
+            $exist = OldSlug::where('slug', $product->slug)->first();
+            if ($exist === null) {
+                $oldSlug             = new OldSlug();
+                $oldSlug->product_id = $product->id;
+                $oldSlug->slug       = $product->slug;
+                $oldSlug->save();
+            }
+        }
 
         $product->description     = $description;
         $product->price           = $price;
@@ -286,189 +306,65 @@ class ProductsController extends Controller
         $product->tax_rate_id     = $taxRateId;
         $product->save();
 
-        // Check si le slug existe dans la table old_slug, auquel cas il est attribué a ce nouveau produit.
+        // Check si le slug existe dans la table old_slug, auquel cas il est attribué a ce nouveau produit
-        $this->cleanOldSlug($slug);
+        $oldSlug = OldSlug::where('slug', $slug)->first();
+        if ($oldSlug) {
+            $oldSlug->delete();
+        }
 
-        // Ajout des infos additionnelles.
+        //ajout des infos additionnelles
         $product_type = $request->product_type;
 
-        // Save additionnal.
+        //save additionnal
         if ($product_type !== null) {
             $methodName = "save" . ucfirst($product_type);
             $this->$methodName($request, $product->id);
         }
 
-        // Tags associés.
+        //tags associés
-        $this->syncTags($request->tags, $product);
-
-        // Produits associés.
-        $this->syncProduitsAssocies($request->prods, $product);
-
-        return redirect()->route('bo.products.edit', $product->id)->with('success', 'Modifications enregistrés !');
-    }
-
-    /**
-     * Check if slug already exists, if so redirect
-     *
-     * @param Request      $request
-     * @param integer      $rangeId
-     * @param string       $slug
-     * @param integer|null $productId
-     * @return \Illuminate\Http\RedirectResponse|void
-     */
-    private function checkSlugExistsWithinRange(Request $request, int $rangeId, string $slug, int $productId = null)
-    {
-        // Check si le slug existe déjà dans cette gamme de produits.
-        $slugExist = Product::where([
-            ['range_id', $rangeId],
-            ['slug', $slug],
-            ['id', '<>', $productId]
-        ])->first();
-
-        if ($slugExist) {
-            return redirect()->back()
-                ->withInput($request->input())
-                ->withErrors("Erreur : un produit avec le slug d'accès \"" . $slug .
-                    "\" éxiste déjà. Veuillez changer le nom du produit.");
-        }
-    }
-
-    /**
-     * If new slug for product then save oldslug
-     *
-     * @param Product $product
-     * @param string  $slug
-     * @return void
-     */
-    private function saveNewSlugForProduct(Product $product, string $slug)
-    {
-        if ($product->slug != $slug) {
-            $exist = OldSlug::where('slug', $product->slug)->first();
-            if ($exist === null) {
-                $oldSlug             = new OldSlug();
-                $oldSlug->product_id = $product->id;
-                $oldSlug->slug       = $product->slug;
-                $oldSlug->save();
-            }
-        }
-    }
-
-    /**
-     * clean oldslug if exists
-     *
-     * @param string $slug
-     * @return void
-     */
-    private function cleanOldSlug(string $slug)
-    {
-        // Check si le slug existe dans la table old_slug, auquel cas il est attribué a ce nouveau produit.
-        $oldSlug = OldSlug::where('slug', $slug)->first();
-        if ($oldSlug) {
-            $oldSlug->delete();
-        }
-    }
-
-    /**
-     * Store and update saved images on product
-     *
-     * @param UploadedFile|null $picture
-     * @param Product           $product
-     * @param UploadedFile|null $picture_large
-     * @return void
-     */
-    private function manageProductImages($picture, Product &$product, $picture_large)
-    {
-
-        $str_random = Str::random(5);
-
-        if ($picture !== null) {
-            if (
-                $product->picture !== null &&
-                file_exists(public_path('images/produits/') . $product->picture)
-            ) {
-                unlink(public_path('images/produits/') . $product->picture);
-            }
-            $imageName = $product->id . '_' . $str_random . '.' . $picture->extension();
-            $picture->move(public_path('images/produits'), $imageName);
-            $product->picture = $imageName;
-        }
-
-        if ($picture_large !== null) {
-            if (
-                $product->picture_large !== null &&
-                file_exists(public_path('images/produits/') . $product->picture_large)
-            ) {
-                unlink(public_path('images/produits/') . $product->picture_large);
-            }
-            $imageName = $product->id . '_' . $str_random . '_large.' . $picture_large->extension();
-            $picture_large->move(public_path('images/produits'), $imageName);
-            $product->picture_large = $imageName;
-        }
-    }
-
-    /**
-     * sync tags to product
-     *
-     * @param array|null $tags
-     * @param Product    $product
-     * @return void
-     */
-    private function syncTags(array $tags = null, Product &$product)
-    {
         if (!empty($tags)) {
             $arTagIds = array();
             foreach ($tags as $tag) {
                 $oTag = json_decode($tag);
                 if (empty($oTag->id)) {
-                    // We need a new tag.
+                    //we need a new tag
                     $arTagIds[] = $this->storeTag($oTag);
                 } else {
                     $arTagIds[] = $oTag->id;
                 }
             }
-            // Prise en charge de la liaison avec les produits.
+            //prise en charge de la liaison avec les produits
             $product->tags()->sync($arTagIds);
         } else {
             $product->tags()->sync(array());
         }
-    }
 
-    /**
+        //produits associés
-     * sync associated products to product
+        if (!empty($request->prods)) {
-     *
+            $productIds = explode(",", $request->prods);
-     * @param string|null $prods
+            //prise en charge de la liaison avec les produits
-     * @param Product     $product
-     * @return void
-     */
-    private function syncProduitsAssocies(string $prods = null, Product $product)
-    {
-        if (!empty($prods)) {
-            $productIds = explode(",", $prods);
-            // Prise en charge de la liaison avec les produits.
             $product->products()->sync($productIds);
         } else {
             $product->products()->sync(array());
         }
+
+        return redirect()->route('bo.products.edit', $product->id)->with('success', 'Modifications enregistrés !');
     }
 
     /**
      * Helper method to store a new tag if necessary
      * Otherwise retreive an existing tag to associate its id
-     *
-     * @param \App\Models\Tag $oTag
-     * @return integer
      */
-    public function storeTag(Tag $oTag)
+    public function storeTag($oTag)
     {
         $slug = Str::slug($oTag->label);
         $tag  = Tag::where('slug', $slug)->first();
         if ($tag === null) {
-            // Si on pas encore ce tag on le crée.
+            //si on pas encore ce tag on le crée
-            $tag        = new Tag();
+            $tag         = new Tag();
-            $tag->label = $oTag->label;
+            $tag->label  = $oTag->label;
-            $tag->slug  = Str::slug($oTag->label);
+            $tag->slug   = Str::slug($oTag->label);
-            // A new tag is published by default.
+            $tag->status = 1; //a new tag is published by default
-            $tag->status = 1;
             $tag->order  = TagsController::getLastOrder();
             $tag->save();
         }
@@ -477,21 +373,16 @@ class ProductsController extends Controller
 
     /**
      * destroy a product (soft delete)
-     *
+     * @todo : manage liaisons
-     * @param integer $id
-     * @return \Illuminate\Http\Response
      */
-    public function destroy(int $id)
+    public function destroy($id)
     {
         $product = Product::findOrFail($id);
 
         if ($product->picture !== null && file_exists(public_path('images/produits/') . $product->picture)) {
             unlink(public_path('images/produits/') . $product->picture);
         }
-        if (
+        if ($product->picture_large !== null && file_exists(public_path('images/produits/') . $product->picture_large)) {
-            $product->picture_large !== null &&
-            file_exists(public_path('images/produits/') . $product->picture_large)
-        ) {
             unlink(public_path('images/produits/') . $product->picture_large);
         }
 
@@ -503,55 +394,41 @@ class ProductsController extends Controller
 
     /**
      * check if inco data exists
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return mixed
      */
-    public function checkIncoData(Request $request)
+    public function checkIncoData(Request $request) {
-    {
+        $id = $request->id;
-        $id      = $request->id;
         $xmlInco = XmlInco::find($id);
 
-        if (!empty($xmlInco)) {
+        if(!empty($xmlInco)) {
-            // We have data.
+            //we have data
-            $hasInco        = __("Des données Inco sont disponibles, souhaitez vous les associer à ce produit ?");
+            $hasInco = __("Des données Inco sont disponibles, souhaitez vous les associer à ce produit ?");
             $preparedImages = $this->prepareIncoImages($xmlInco->picture);
-            return view('bo.products.load-inco', compact('hasInco', 'xmlInco', 'preparedImages'));
+            return view('bo.products.load-inco',compact('hasInco','xmlInco','preparedImages'));
         } else {
-            return array("data" => array());
+            return array("data"=> array());
         }
     }
 
-    /**
+    public function getPrepareIncoImages(Request $request) {
-     * Show prepared images
+        $picture = $request->picture;
-     *
-     * @param Request $request
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function getPrepareIncoImages(Request $request)
-    {
-        $picture        = $request->picture;
         $preparedImages = $this->prepareIncoImages($picture);
         return view('bo.products.inco-images', compact('preparedImages'));
     }
 
     /**
-     * prepared images
+     * prepare Inco Images
-     *
-     * @param array $picture
-     * @return \Illuminate\Contracts\View\View
      */
-    public function prepareIncoImages(array $picture)
+    public function prepareIncoImages($picture) {
-    {
+
         $preparedImages = array();
 
         foreach ($picture as $incoImage) {
-            // Charge.
+            //charge
-            if (File::exists(storage_path($incoImage))) {
+            if(File::exists(storage_path($incoImage))) {
                 $imagePath = storage_path($incoImage);
-                // Redimensionne.
+                //redimensionne
-                    // Create mask.
+                    //create mask
-                    // Resize original image into mask.
+                    //Resize original image into mask
                     $this->resizeImg(
                         $imagePath,
                         config('theme.product_image_large_maxwidth'),
@@ -568,24 +445,15 @@ class ProductsController extends Controller
 
 
                     $preparedImages[] = "inco/images/" . File::name($incoImage) . "_large.png";
-            }//end if
+            }
-        }//end foreach
+        }
         return $preparedImages;
     }
 
     /**
      * redimensionne une image dans un masque
      */
-    /**
+    private function resizeImg($imagePath, $maskWidth, $maskHeight, $resizedName)
-     * redimensionne une image dans un masque
-     *
-     * @param string  $imagePath
-     * @param integer $maskWidth
-     * @param integer $maskHeight
-     * @param string  $resizedName
-     * @return boolean|void
-     */
-    private function resizeImg(string $imagePath, int $maskWidth, int $maskHeight, string $resizedName)
     {
         // ---- création du masque
         $mask = imagecreatetruecolor($maskWidth, $maskHeight);
@@ -611,43 +479,34 @@ class ProductsController extends Controller
         }
 
         // ---- Chargement de l'image source
-        $img                        = $image_create_func($imagePath);
+        $img = $image_create_func($imagePath);
         list($imgWidth, $imgHeight) = getimagesize($imagePath);
 
         // ---- Calcul les nouvelles dimensions de l'image
-        if ($imgWidth > $imgHeight) {
+        if($imgWidth > $imgHeight){
-            $finalWidth  = $maskWidth;
+            $finalWidth = $maskWidth;
-            $finalHeight = ($finalWidth * $imgHeight) / $imgWidth;
+            $finalHeight = ($finalWidth*$imgHeight)/$imgWidth;
-        } else {
+        }else{
             $finalHeight = $maskHeight;
-            $finalWidth  = ($finalHeight * $imgWidth) / $imgHeight;
+            $finalWidth = ($finalHeight*$imgWidth)/$imgHeight;
         }
 
         // ---- Redimensionne l'image source
         $resizeImg = imagecreatetruecolor($finalWidth, $finalHeight);
-        imagealphablending($resizeImg, false);
+        imagealphablending( $resizeImg, false );
-        imagesavealpha($resizeImg, true);
+        imagesavealpha( $resizeImg, true );
         imagecopyresampled($resizeImg, $img, 0, 0, 0, 0, $finalWidth, $finalHeight, $imgWidth, $imgHeight);
 
-        // Copie l'image redimensionnée dans le mask.
+        // ---- Copie l'image redimensionnée dans le mask
-        imagecopy(
+        imagecopy($mask, $resizeImg, ($maskWidth-$finalWidth)/2, ($maskHeight-$finalHeight)/2, 0, 0, imagesx($resizeImg), imagesy($resizeImg));
-            $mask,
+        imagealphablending( $mask, false );
-            $resizeImg,
+        imagesavealpha( $mask, true );
-            ($maskWidth - $finalWidth) / 2,
-            ($maskHeight - $finalHeight) / 2,
-            0,
-            0,
-            imagesx($resizeImg),
-            imagesy($resizeImg)
-        );
-        imagealphablending($mask, false);
-        imagesavealpha($mask, true);
 
-        // Ecrit dans storage/app/public.
+        //écrit dans storage/app/public
-        // Créer le fichier final.
+        // ---- Créer le fichier final
         imagepng($mask, storage_path('app/public/inco/images/' . $resizedName), 5);
 
-        // Libère la mémoire associée aux images manipulées.
+        // ---- Libère la mémoire associée aux images manipulées
         imagedestroy($img);
         imagedestroy($resizeImg);
         imagedestroy($mask);
@@ -656,12 +515,6 @@ class ProductsController extends Controller
     /**
      * set une image préparée comme image du produit
      */
-    /**
-     * set une image préparée comme image du produit
-     *
-     * @param Request $request
-     * @return \App\Models\Product
-     */
     public function setIncoImage(Request $request)
     {
         $imagePath = $request->picture;
@@ -669,37 +522,34 @@ class ProductsController extends Controller
         $imagePath = storage_path("app/public/" . $imagePath);
 
         $product_id = $request->product;
-        $product    = Product::findOrFail($product_id);
+        $product = Product::findOrFail($product_id);
 
         $str_random = Str::random(5);
-        // Default is large image.
+        //default is large image
         $finalImageName = $product->id . '_' . $str_random . '_large.' . File::extension($imagePath);
 
         $productimagespath = public_path('images/produits');
 
-        if (!File::isDirectory($productimagespath)) {
+        if(!File::isDirectory($productimagespath)) {
             File::makeDirectory($productimagespath, 0644, true);
         }
 
         File::copy($imagePath, $productimagespath . "/" . $finalImageName);
 
-        // Suppression de l'ancien fichier.
+        //suppression de l'ancien fichier
-        if (
+        if ($product->picture_large !== null && file_exists(public_path('images/produits/') . $product->picture_large)) {
-            $product->picture_large !== null &&
-            file_exists(public_path('images/produits/') . $product->picture_large)
-        ) {
             unlink(public_path('images/produits/') . $product->picture_large);
         }
 
         $product->picture_large = $finalImageName;
 
 
-        // Now set small image.
+        //now set small image
-        $imagePath      = str_replace("_large", "_small", $imagePath);
+        $imagePath = str_replace("_large", "_small", $imagePath);
         $finalImageName = $product->id . '_' . $str_random . '.' . File::extension($imagePath);
         File::copy($imagePath, $productimagespath . "/" . $finalImageName);
 
-        // Suppression de l'ancien fichier.
+        //suppression de l'ancien fichier
         if ($product->picture !== null && file_exists(public_path('images/produits/') . $product->picture)) {
             unlink(public_path('images/produits/') . $product->picture);
         }
@@ -708,17 +558,15 @@ class ProductsController extends Controller
 
         $product->save();
 
+        //@TODO : envoyer une réponse pour maj de l'interface
         return $product;
     }
 
     /**
      * helper method to update additionnal product info
-     *
+     * foodProduct
-     * @param Request $request
-     * @param integer $product_id
-     * @return void
      */
-    public function saveFoodProduct(Request $request, int $product_id)
+    public function saveFoodProduct(Request $request, $product_id)
     {
         $foodProduct = FoodProduct::firstOrNew([
             'product_id' => $product_id,
@@ -770,17 +618,11 @@ class ProductsController extends Controller
     }
 
     /**
-     * helper method to update toolproduct info
+     * helper method to update additionnal product info
-     *
+     * toolProduct
-     * @param Request $request
-     * @param integer $product_id
-     * @return void
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed
      */
-    public function saveToolProduct(Request $request, int $product_id)
+    public function saveToolProduct(Request $request, $product_id)
     {
-        // phpcs:enable
         $toolProduct = ToolProduct::firstOrNew([
             'product_id' => $product_id,
         ]);
@@ -789,50 +631,58 @@ class ProductsController extends Controller
     }
 
     /**
-     * helper method to update anifoodProduct info
+     * helper method to update additionnal product info
-     *
+     * anifoodProduct
-     * @param Request $request
-     * @param integer $product_id
-     * @return void
      */
-    public function saveAnifoodProduct(Request $request, int $product_id)
+    public function saveAnifoodProduct(Request $request, $product_id)
     {
         $anifoodProduct = AnifoodProduct::firstOrNew([
             'product_id' => $product_id,
         ]);
 
         $anifoodProduct->composition = $request->composition;
-        $anifoodProduct->servings    = $request->servings;
+        $anifoodProduct->servings = $request->servings;
         $anifoodProduct->save();
     }
 
     /**
-     * helper method to update garmentProduct info
+     * helper method to update additionnal product info
-     *
+     * garmentProduct
-     * @param Request $request
-     * @param integer $product_id
-     * @return void
      */
-    public function saveGarmentProduct(Request $request, int $product_id)
+    public function saveGarmentProduct(Request $request, $product_id)
     {
         $garmentProduct = GarmentProduct::firstOrNew([
             'product_id' => $product_id,
         ]);
 
-        $garmentProduct->size     = $request->size;
+        $garmentProduct->size = $request->size;
-        $garmentProduct->color    = $request->color;
+        $garmentProduct->color = $request->color;
         $garmentProduct->material = $request->material;
         $garmentProduct->save();
     }
 
+    /**
+     * product detail intended for Bo
+     */
+    public function show()
+    {
+        //not in use
+    }
+
     /**
      * index des produits mis en avant
-     *
-     * @return * @return \Illuminate\Contracts\View\View
      */
     public function starred()
     {
         $products = Product::where('star', 1)->paginate(10);
         return view('bo.products.starred', compact('products'));
     }
+
+    /**
+     * working method to start the mapping of inco fields into foodproduct
+     */
+    /*
+    public function mapIncoFieldsToFoodProduct () {
+
+    }*/
 }

app/Http/Controllers/Bo/PromotionsController.php

@@ -31,15 +31,17 @@ class PromotionsController extends Controller
         $discTypes = DiscountType::all();
 
         $existingProds = Product::all();
-        $promotion     = new Promotion();
+        $promotion = new Promotion();
         $selectedProds = $promotion->products;
+        //$existingProds = $existingProds->diff($selectedProds);
+
         return view('bo.promotions.create', compact('discTypes', 'existingProds', 'selectedProds'));
     }
 
     /**
      * 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)
@@ -50,31 +52,42 @@ class PromotionsController extends Controller
         ]);
 
         $productIds = explode(",", $request->product_id);
-        $discType   = $request->discount_type_id;
+        $discType = $request->discount_type_id;
-        $value      = $request->discount_value;
+        $value = $request->discount_value;
         $date_start = $request->date_start_date . " " . $request->date_start_time;
-        $date_end   = $request->date_end_date . " " . $request->date_end_time;
+        $date_end = $request->date_end_date . " " . $request->date_end_time;
 
-        $promotion                   = new Promotion();
+        $promotion = new Promotion();
         $promotion->discount_type_id = $discType;
-        $promotion->discount_value   = $value;
+        $promotion->discount_value = $value;
-        $promotion->date_start       = $date_start;
+        $promotion->date_start = $date_start;
-        $promotion->date_end         = $date_end;
+        $promotion->date_end = $date_end;
         $promotion->save();
 
-        // Prise en charge de la liaison avec les produits.
+        //prise en charge de la liaison avec les produits
         $promotion->products()->sync($productIds);
 
         return redirect()->route('bo.promotions.index');
     }
 
     /**
-     * Show the form for editing the specified resource.
+     * Display the specified resource.
      *
-     * @param  integer $id
+     * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function edit(int $id)
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
     {
         $promotion = Promotion::findOrFail($id);
         $discTypes = DiscountType::all();
@@ -89,11 +102,11 @@ class PromotionsController extends Controller
     /**
      * Update the specified resource in storage.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @param  \Illuminate\Http\Request  $request
-     * @param  integer                  $id
+     * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, int $id)
+    public function update(Request $request, $id)
     {
         $promotion = Promotion::findOrFail($id);
 
@@ -102,34 +115,35 @@ class PromotionsController extends Controller
         ]);
 
         $productIds = explode(",", $request->product_id);
-        $discType   = $request->discount_type_id;
+        $discType = $request->discount_type_id;
-        $value      = $request->discount_value;
+        $value = $request->discount_value;
         $date_start = $request->date_start_date . " " . $request->date_start_time;
-        $date_end   = $request->date_end_date . " " . $request->date_end_time;
+        $date_end = $request->date_end_date . " " . $request->date_end_time;
 
         $promotion->discount_type_id = $discType;
-        $promotion->discount_value   = $value;
+        $promotion->discount_value = $value;
-        $promotion->date_start       = $date_start;
+        $promotion->date_start = $date_start;
-        $promotion->date_end         = $date_end;
+        $promotion->date_end = $date_end;
         $promotion->save();
 
-        // Prise en charge de la liaison avec les produits.
+        //prise en charge de la liaison avec les produits
         $promotion->products()->sync($productIds);
 
         return redirect()->route('bo.promotions.edit', $promotion->id)->with('success', 'Modifications enregistrés !');
+
     }
 
     /**
      * Remove the specified resource from storage.
      *
-     * @param  integer $id
+     * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function destroy(int $id)
+    public function destroy($id)
     {
         $p = Promotion::findOrFail($id);
 
-        // Prise en charge de la liaison avec les produits.
+        //prise en charge de la liaison avec les produits
         $p->products()->detach();
 
         $p->delete();

app/Http/Controllers/Bo/RangesController.php

@@ -11,40 +11,24 @@ use Illuminate\Support\Str;
 
 class RangesController extends Controller
 {
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
     public function index()
     {
         $ranges = Range::all();
         return view('bo.ranges.index', compact('ranges'));
     }
 
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
     public function create()
     {
         return view('bo.ranges.create');
     }
 
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
-     */
     public function store(Request $request)
     {
-        $name        = $request->name;
+        $name = $request->name;
-        $slug        = Str::slug($name);
+        $slug = Str::slug($name);
         $description = $request->description;
-        $picture     = $request->picture;
+        $picture = $request->picture;
-        $status      = $request->status === null ? 0 : 1;
+        $status = $request->status === null ? 0 : 1;
 
         $request->validate([
             'name' => 'required|string|max:255',
@@ -54,11 +38,11 @@ class RangesController extends Controller
                             config('theme.range_image_maxheight'),
         ]);
 
-        $range              = new Range();
+        $range = new Range();
-        $range->name        = $name;
+        $range->name = $name;
-        $range->slug        = $slug;
+        $range->slug = $slug;
         $range->description = $description;
-        $range->status      = $status;
+        $range->status = $status;
         $range->save();
 
         if ($picture !== null) {
@@ -71,32 +55,19 @@ class RangesController extends Controller
         return redirect()->route('bo.ranges.index');
     }
 
-    /**
+    public function edit($id)
-     * Show the form for editing the specified resource.
-     *
-     * @param  integer $id
-     * @return \Illuminate\Http\Response
-     */
-    public function edit(int $id)
     {
         $range = Range::findOrFail($id);
         return view('bo.ranges.edit', compact('range'));
     }
 
-    /**
+    public function update(Request $request, $id)
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @param  integer                  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, int $id)
     {
-        $name        = $request->name;
+        $name = $request->name;
-        $slug        = Str::slug($name);
+        $slug = Str::slug($name);
         $description = $request->description;
-        $picture     = $request->picture;
+        $picture = $request->picture;
-        $status      = $request->status === null ? 0 : 1;
+        $status = $request->status === null ? 0 : 1;
 
         $request->validate([
             'name' => 'required|string|max:255',
@@ -109,9 +80,8 @@ class RangesController extends Controller
         $range = Range::findOrFail($id);
 
         if ($picture !== null) {
-            if ($range->picture !== null && file_exists(public_path('images/gammes/') . $range->picture)) {
+            if ($range->picture !== null && file_exists(public_path('images/gammes/') . $range->picture))
                 unlink(public_path('images/gammes/') . $range->picture);
-            }
             $imageName = $range->id . '_' . $slug . '_' . Str::random(5) . '.' . $picture->extension();
             $picture->move(public_path('images/gammes'), $imageName);
         }
@@ -121,38 +91,30 @@ class RangesController extends Controller
         if ($range->slug != $slug) {
             $exist = OldSlug::where('slug', $range->slug)->first();
             if ($exist === null) {
-                $oldSlug           = new OldSlug();
+                $oldSlug = new OldSlug();
                 $oldSlug->range_id = $range->id;
-                $oldSlug->slug     = $range->slug;
+                $oldSlug->slug = $range->slug;
                 $oldSlug->save();
             }
         }
 
-        $range->slug        = $slug;
+        $range->slug = $slug;
         $range->description = $description;
-        if ($picture !== null) {
+        if ($picture !== null)
             $range->picture = $imageName;
-        }
         $range->status = $status;
         $range->save();
 
         return redirect()->route('bo.ranges.edit', $range->id)->with('success', 'Modifications enregistrés !');
     }
 
-    /**
+    public function destroy($id)
-     * Remove the specified resource from storage.
-     *
-     * @param  integer $id
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy(int $id)
     {
         $range = Range::findOrFail($id);
 
         $product = Product::where('range_id', $range->id)->count();
         if ($product !== 0) {
-            return redirect()->back()
+            return redirect()->back()->withErrors("Suppression impossible : \"" . $range->name . "\" contient encore des produits.");
-                ->withErrors("Suppression impossible : \"" . $range->name . "\" contient encore des produits.");
         }
 
         if ($range->picture !== null) {

app/Http/Controllers/Bo/SettingsController.php

@@ -10,16 +10,9 @@ use Illuminate\Support\Facades\Config;
 
 class SettingsController extends Controller
 {
-    /**
+    public function manage(Request $request) {
-     * Manage settings page
+
-     *
+        $settings = Setting::all();
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     *
-     */
-    public function manage(Request $request)
-    {
-        $settings        = Setting::all();
         $settingsToPrint = [];
         foreach ($settings as $setting) {
             $settingsToPrint[$setting->key] = $setting->value;
@@ -28,55 +21,47 @@ class SettingsController extends Controller
         if ($_SERVER["REQUEST_METHOD"] === "POST") {
             $input = $request->all();
 
-            // Comparer les settingsToPrint (en base) avec les inputs (pour trouver un nouveau).
+            //comparer les settingsToPrint (en base) avec les inputs (pour trouver un nouveau)
-            foreach ($input as $key => $value) {
+            foreach($input as $key=>$value) {
-                if (
+                if(!isset($settingsToPrint[$key])
-                    !isset($settingsToPrint[$key])
                     && $key != "_method"
-                    && $key != "_token"
+                    && $key != "_token")
-                ) {
+                    {
-                        // New setting.
+                        //new setting
-                        $setting        = new Setting();
+                        $setting = new Setting();
-                        $setting->key   = $key;
+                        $setting->key = $key;
                         $setting->value = $value ?? 0;
                         $setting->save();
-                }
+                    }
             }
 
-            $looplimit = count($settings);
+            for($i = 0; $i < count($settings); $i++) {
-            for ($i = 0; $i < $looplimit; $i++) {
+                if(is_array($request->input($settings[$i]->key))) {
-                if (is_array($request->input($settings[$i]->key))) {
                     $settings[$i]->value = implode(',', $request->input($settings[$i]->key));
                 } else {
-                    $settings[$i]->value = $request->input($settings[$i]->key) === null ? 0
+                    $settings[$i]->value = $request->input($settings[$i]->key) === null ? 0 : $request->input($settings[$i]->key);
-                        : $request->input($settings[$i]->key);
                 }
                 $settings[$i]->save();
             }
 
-            // Store redirector to keep flash message from being wipe pby artisan call below.
+            //store redirector to keep flash message from being wipe pby artisan call below
             $redirector = redirect()->route('bo.settings')->with('success', 'Modifications enregistrés !');
 
-            // All settings saved : cache routes.
+            //all settings saved : cache routes
             Artisan::call('route:clear');
-            // Programmer un php artisan optimize ? (une fois par jour la nuit par exemple).
+            //programmer un php artisan optimize ? (une fois par jour la nuit par exemple)
+
             return $redirector;
-        }//end if
+        }
 
         return view('bo.settings', compact('settingsToPrint'));
     }
 
     /**
-     * Manage Theme settings page
      * Management des settings dont la clé est préfixée theme_
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     *
      */
-    public function manageTheme(Request $request)
+    public function manageTheme(Request $request) {
-    {
+        $settings = Setting::where('key', 'LIKE', 'theme_%')->get();
-        $settings        = Setting::where('key', 'LIKE', 'theme_%')->get();
         $settingsToPrint = [];
         foreach ($settings as $setting) {
             $settingsToPrint[$setting->key] = $setting->value;
@@ -84,24 +69,22 @@ class SettingsController extends Controller
 
         $config_settings = Config::get(('theme.bo_theme_settings'));
 
-        // Check if, for each of the theme defined settings we have a database setting.
+        //check if, for each of the theme defined settings we have a database setting
         foreach ($config_settings as $onekey => $params) {
             if (!isset($settingsToPrint['theme_' . $onekey])) {
-                $dbsetting        = new Setting();
+                $dbsetting = new Setting();
-                $dbsetting->key   = 'theme_' . $onekey;
+                $dbsetting->key = 'theme_' . $onekey;
                 $dbsetting->value = $params['default_value'];
                 $dbsetting->save();
-                // Injection dans settings to print.
+                //injection dans settings to print
                 $settingsToPrint[$dbsetting->key] = $dbsetting->value;
             }
         }
 
         if ($_SERVER["REQUEST_METHOD"] === "POST") {
-            $looplimit = count($settings);
+            for($i = 0; $i < count($settings); $i++) {
-            for ($i = 0; $i < $looplimit; $i++) {
+                //attention pour les booléens/checkbox on enregistre 'on'
-                // Attention pour les booléens/checkbox on enregistre 'on'.
+                $settings[$i]->value = $request->input($settings[$i]->key) === null ? 0 : $request->input($settings[$i]->key);
-                $settings[$i]->value = $request->input($settings[$i]->key) === null ? 0
-                    : $request->input($settings[$i]->key);
                 $settings[$i]->save();
             }
             return redirect()->route('bo.themesettings')->with('success', 'Modifications enregistrés !');

app/Http/Controllers/Bo/SlidersController.php

@@ -33,7 +33,7 @@ class SlidersController 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)
@@ -60,12 +60,23 @@ class SlidersController extends Controller
     }
 
     /**
-     * Show the form for editing the specified resource.
+     * Display the specified resource.
      *
-     * @param  integer $id
+     * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function edit(int $id)
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
     {
         $slider = Slider::findOrFail($id);
         return view('bo.sliders.edit', compact('slider'));
@@ -74,11 +85,11 @@ class SlidersController extends Controller
     /**
      * Update the specified resource in storage.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @param  \Illuminate\Http\Request  $request
-     * @param  integer                  $id
+     * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, int $id)
+    public function update(Request $request, $id)
     {
         $slider      = Slider::findOrFail($id);
         $label       = $request->label;
@@ -102,10 +113,10 @@ class SlidersController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param  integer $id
+     * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function destroy(int $id)
+    public function destroy($id)
     {
         $slider = Slider::findOrFail($id);
 
@@ -114,6 +125,8 @@ class SlidersController extends Controller
         if ($count === 1) {
             return redirect()->back()->withErrors("Suppression impossible : Vous devez conserver au moins 1 Slider");
         }
+        // @todo : controller les slides liés
+
         $slider->delete();
         return redirect()->route('bo.sliders.index');
     }

app/Http/Controllers/Bo/SlidesController.php

@@ -35,7 +35,9 @@ class SlidesController extends Controller
     /**
      * Store a newly created resource in storage.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @todo : validation des dates
+     *
+     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
     public function store(Request $request)
@@ -100,12 +102,23 @@ class SlidesController extends Controller
     }
 
     /**
-     * Show the form for editing the specified resource.
+     * Display the specified resource.
      *
-     * @param  integer $id
+     * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function edit(int $id)
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
     {
         $slide   = Slide::findOrFail($id);
         $sliders = Slider::all();
@@ -115,11 +128,11 @@ class SlidesController extends Controller
     /**
      * Update the specified resource in storage.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @param  \Illuminate\Http\Request  $request
-     * @param  integer                  $id
+     * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, int $id)
+    public function update(Request $request, $id)
     {
         $title     = $request->title;
         $picture   = $request->picture;
@@ -185,10 +198,10 @@ class SlidesController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param  integer $id
+     * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function destroy(int $id)
+    public function destroy($id)
     {
         $s = Slide::findOrFail($id);
 
@@ -197,14 +210,8 @@ class SlidesController extends Controller
         return redirect()->route('bo.slides.index');
     }
 
-    /**
+
-     * Change Slide Order
+    public function changeOrder($id, $action)
-     *
-     * @param integer $id
-     * @param string  $action
-     * @return \Illuminate\Http\Response
-     */
-    public function changeOrder(int $id, string $action)
     {
         $current = Slide::findOrFail($id);
 
@@ -223,12 +230,11 @@ class SlidesController extends Controller
         $current->save();
 
         return back();
+        //return redirect()->route('bo.slides.index');
     }
 
     /**
      * retreive order position to put a new slide to
-     *
-     * @return integer
      */
     private function getLastOrder()
     {

app/Http/Controllers/Bo/TagsController.php

@@ -33,20 +33,20 @@ class TagsController 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)
     {
-        $label  = $request->label;
+        $label = $request->label;
-        $slug   = Str::slug($label);
+        $slug = Str::slug($label);
         $status = $request->status === null ? 0 : 1;
 
         $request->validate([
             'label' => 'required|string|max:255',
         ]);
 
-        $tag         = new Tag();
+        $tag = new Tag();
         $tag->label  = $label;
         $tag->slug   = $slug;
         $tag->status = $status;
@@ -57,12 +57,23 @@ class TagsController extends Controller
     }
 
     /**
-     * Show the form for editing the specified resource.
+     * Display the specified resource.
      *
-     * @param  integer $id
+     * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function edit(int $id)
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
     {
         $tag = Tag::findOrFail($id);
         return view('bo.tags.edit', compact('tag'));
@@ -71,14 +82,14 @@ class TagsController extends Controller
     /**
      * Update the specified resource in storage.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @param  \Illuminate\Http\Request  $request
-     * @param  integer                  $id
+     * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, int $id)
+    public function update(Request $request, $id)
     {
-        $label  = $request->label;
+        $label = $request->label;
-        $slug   = Str::slug($label);
+        $slug = Str::slug($label);
         $status = $request->status === null ? 0 : 1;
 
         $request->validate([
@@ -87,8 +98,8 @@ class TagsController extends Controller
 
         $tag = Tag::findOrFail($id);
 
-        $tag->label  = $label;
+        $tag->label = $label;
-        $tag->slug   = $slug;
+        $tag->slug = $slug;
         $tag->status = $status;
         $tag->save();
 
@@ -98,31 +109,24 @@ class TagsController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param  integer $id
+     * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function destroy(int $id)
+    public function destroy($id)
     {
         $tag = Tag::findOrFail($id);
 
         $products = $tag->products()->count();
         if ($products !== 0) {
-            return redirect()->back()
+            return redirect()->back()->withErrors("Suppression impossible : \"" . $tag->label . "\" est associé à des produits.");
-                ->withErrors("Suppression impossible : \"" . $tag->label . "\" est associé à des produits.");
         }
 
         $tag->delete();
         return redirect()->route('bo.tags.index');
     }
 
-    /**
+
-     * Change Tag Order
+    public function changeOrder($id, $action)
-     *
-     * @param integer $id
-     * @param string  $action
-     * @return \Illuminate\Http\Response
-     */
-    public function changeOrder(int $id, string $action)
     {
         $current = Tag::findOrFail($id);
 
@@ -141,17 +145,11 @@ class TagsController extends Controller
         $current->save();
 
         return back();
+        //return redirect()->route('bo.slides.index');
     }
 
-    /**
+    public function toggleStatus($id) {
-     * Toggle tag status
+        $tag = Tag::findOrFail($id);
-     *
-     * @param integer $id
-     * @return \Illuminate\Http\Response
-     */
-    public function toggleStatus(int $id)
-    {
-        $tag         = Tag::findOrFail($id);
         $tag->status = !($tag->status);
         $tag->save();
         return back();
@@ -160,8 +158,6 @@ class TagsController extends Controller
 
     /**
      * retreive order position to put a new slide to
-     *
-     * @return integer
      */
     public static function getLastOrder()
     {

app/Http/Controllers/ContactController.php

@@ -12,57 +12,30 @@ use Illuminate\Http\Request;
 
 class ContactController extends Controller
 {
-    /**
-     * legal notice page
-     *
-     * @param Request $request
-     * @return \Illuminate\Contracts\View\View
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass
-     */
     public function contact(Request $request)
     {
-        // @phpcs:enable
         $status = $request->session()->get('status');
 
-        $magasin  = Magasin::first();
+        //1er magasin en base pour le moment
-        $magasins = Magasin::all();
+        $magasin = Magasin::first();
-
         $content = Content::where('key', 'contact')->first();
 
-        return view('contact', compact('status', 'magasins', 'magasin', 'content'));
+        return view('contact', compact('status', 'magasin', 'content'));
     }
 
-    /**
-     * submit contact form
-     *
-     * @param ContactFormRequest $request
-     * @return \Illuminate\Http\Response
-     * @throws \RuntimeException If email missing.
-     */
     public function contactSubmit(ContactFormRequest $request)
     {
-        /** @var \App\Model\Magasin|null */
+        $data = $request->all();
-        $shop = Magasin::where('name', $request->shop)->first();
 
-        if ($shop and $shop->email_contact) {
+        $toMailSetting = Setting::where('key', 'send_contact_mail_to')->first();
-            /** @var string */
+        if(empty($toMailSetting->value)) {
-            $toMail = $shop->email_contact;
+            $toMail = config('mail.from.address');
         } else {
-            /** @var string|null */
+            $toMail = $toMailSetting->value;
-            $toMail = \optional(Setting::where('key', 'send_contact_mail_to')->first())->value;
-            if (!$toMail) {
-                /** @var string|null */
-                $toMail = config('mail.from.address');
-            }
         }
-
+        //envoi du mail d'alerte
-        if (!$toMail) {
-            throw new \RuntimeException('Impossible de trouver un mail');
-        }
-
-        // Envoi du mail d'alerte.
         Mail::to($toMail)->send(new SendContactMail($request));
+        Mail::mailer('smtp2')->to($toMail)->send(new SendContactMail($request));
 
         return back()->with('status', true);
     }

app/Http/Controllers/Controller.php

@@ -9,7 +9,5 @@ use Illuminate\Routing\Controller as BaseController;
 
 class Controller extends BaseController
 {
-    use AuthorizesRequests;
+    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
-    use DispatchesJobs;
-    use ValidatesRequests;
 }

app/Http/Controllers/CustomerController.php

@@ -5,7 +5,6 @@ namespace App\Http\Controllers;
 use App\Http\Requests\CustomerRegisterRequest;
 use App\Http\Requests\LoginRequest;
 use App\Http\Requests\UpdateInfosRequest;
-use App\Mail\OrderCanceledConfirmMail;
 use App\Mail\PasswordResetMail;
 use App\Mail\RegisterConfirmMail;
 use App\Models\Customers;
@@ -13,7 +12,6 @@ use App\Models\Magasin;
 use App\Models\Order;
 use App\Models\PasswordReset;
 use App\Models\Salarie;
-use App\Models\Setting;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -33,8 +31,6 @@ class CustomerController extends Controller
 {
     /**
      * Affiche la page d'inscription
-     *
-     * @return \Illuminate\Http\Response
      */
     public function registerForm()
     {
@@ -81,14 +77,13 @@ class CustomerController extends Controller
                 $crmCustomer->country = Country::france();
                 $crmCustomer->save();
 
-                // * Enrregistrement du Hashcode
-                /** @var \App\Models\Customers $customer */
-                $customer           = new Customers($request->all());
-                $customer->hashcode = $crmCustomer->hashcode;
-                $customer->saveOrFail();
-
                 // * liaison éventuelle avec la table salaries
                 if ($request->matricule && $request->code) {
+                    /** @var \App\Models\Customers $customer */
+                    $customer           = new Customers($request->all());
+                    $customer->hashcode = $crmCustomer->hashcode;
+                    $customer->saveOrFail();
+
                     /** @var \App\Models\Salarie $salarie */
                     $salarie = Salarie::where('matricule', '=', $request->matricule)
                         ->where('code', '=', $request->code)
@@ -98,6 +93,8 @@ class CustomerController extends Controller
                 }
 
                 Mail::to($request->email)->send(new RegisterConfirmMail($customer, $request->firstname));
+                Mail::mailer('smtp2')->to($request->email)
+                ->send(new RegisterConfirmMail($customer, $request->firstname));
 
                 return view('auth.register-success', ['mail' => $request->email]);
             });
@@ -124,9 +121,6 @@ class CustomerController extends Controller
 
     /**
      * Retourne la page de connexion
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
      */
     public function authenticateForm(Request $request)
     {
@@ -196,31 +190,29 @@ class CustomerController extends Controller
             $crmCustomer = $customer->apiData;
             if ($crmCustomer->activate()) {
                 return view('auth.activate')
-                    ->with('message', 'Votre compte a bien été activé, vous pouvez désormais vous connecter.');
+                ->with('message', 'Votre compte a bien été activé, vous pouvez désormais vous connecter.');
             }
         } catch (ApiErrorException $e) {
             if ($e->getApiError()->equals(ApiError::customerAlreadyActive())) {
                 // phpcs:disable Generic.Files.LineLength.TooLong
                 return view('auth.activate')
-                    ->with('message', 'Votre compte est déjà activé, vous pouvez dès à présent vous connecter avec celui-ci.');
+                ->with('message', 'Votre compte est déjà activé, vous pouvez dès à présent vous connecter avec celui-ci.');
             }
             report($e);
             // Une erreur critique est survenue avec la CRM.
             return view('auth.activate')
-                ->with('message', 'Une erreur est survenue, merci de réessayer ultérieurement.');
+            ->with('message', 'Une erreur est survenue, merci de réessayer ultérieurement.');
         } catch (CrmException $e) {
             report($e);
             // Une erreur critique est survenue avec la CRM.
             return view('auth.activate')
-                ->with('message', 'Une erreur est survenue, merci de réessayer ultérieurement.');
+            ->with('message', 'Une erreur est survenue, merci de réessayer ultérieurement.');
         } //end try
         return view('auth.activate')->with('message', 'Ce lien d\'activation n\'est pas valide.');
     }
 
     /**
      * deconnexion customer
-     *
-     * @return \Illuminate\Http\RedirectResponse
      */
     public function logout()
     {
@@ -232,23 +224,14 @@ class CustomerController extends Controller
 
     /**
      * page d'accès à la procédure mdp oublié
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Contracts\View\View
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass
      */
     public function forgotPasswordForm(Request $request)
     {
-        // @phpcs:enable
         return view('auth.passwords.forgot');
     }
 
     /**
      * initialisation de la procédure de mdp oublié
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse
      */
     public function passwordReset(Request $request)
     {
@@ -261,7 +244,7 @@ class CustomerController extends Controller
         $customerExist = Customers::where('email', $email)->count() === 0 ? false : true;
 
         if ($customerExist) {
-            // Suppression des anciens tokens.
+            // Suppression des anciens tokens
             PasswordReset::where('email', $email)->delete();
 
             $token = Str::random(80);
@@ -273,10 +256,9 @@ class CustomerController extends Controller
             $passwordReset->save();
 
             Mail::to($email)->send(new PasswordResetMail($token));
-            return back()->with(
+            Mail::mailer('smtp2')->to($email)->send(new PasswordResetMail($token));
-                'success',
+            // @phpcs:ignore Generic.Files.LineLength
-                __("La procédure pour changer votre mot de passe a été envoyé sur votre email.")
+            return back()->with('success', __("La procédure pour changer votre mot de passe a été envoyé sur votre email."));
-            );
         } else {
             return back()->withErrors(__("Cette adresse email n'est pas enregistrée dans nos services."));
         }
@@ -284,10 +266,10 @@ class CustomerController extends Controller
 
     /**
      * Print the view used to change the password of a user when he required it
-     * @param string $token Token used to identificate the user to change the password.
+     * @param $token Token used to identificate the user to change the password of
-     * @return \Illuminate\Contracts\View\View The view to print
+     * @return View The view to print
      */
-    public function viewChangePassword(string $token)
+    public function viewChangePassword($token)
     {
         $pwdReset = PasswordReset::where('token', $token)->first();
         if (!$pwdReset) {
@@ -353,16 +335,11 @@ class CustomerController extends Controller
 
     /**
      * profil client (mon compte)
-     *
-     * @param Request $request
-     * @return \Illuminate\Contracts\View\View
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass
      */
     public function dashboard(Request $request)
     {
-        // @phpcs:enable
+
-        // Show Profile.
+        //show Profile
         /** @var \App\Models\Customers|null $customer */
         $customer = Auth::guard('customer')->user();
         if (!$customer) {
@@ -401,9 +378,6 @@ class CustomerController extends Controller
 
     /**
      * changement de mot de passe depuis le profil
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse
      */
     public function changePasswordWhenAuthenticated(Request $request)
     {
@@ -423,30 +397,18 @@ class CustomerController extends Controller
 
     /**
      * affichage des commandes du customer connecté
-     *
-     * @param Request $request
-     * @return \Illuminate\Contracts\View\View
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass
      */
     public function myOrders(Request $request)
     {
-        // @phpcs:enable
         $orders = Order::where('customer_id', Auth::guard('customer')->user()->id)->orderBy('date', 'DESC')->get();
         return view('customer.my-orders', compact('orders'));
     }
 
-    /**
+    public function orderDetail($reference)
-     * Show detail commande
-     *
-     * @param string $reference
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function orderDetail(string $reference)
     {
-        $order = Order::where('reference', '=', $reference)
+        $order   = Order::where('reference', '=', $reference)
-            ->where('customer_id', Auth::guard('customer')->user()->id)
+                    ->where('customer_id', Auth::guard('customer')->user()->id)
-            ->firstOrFail();
+                    ->firstOrFail();
 
         if ($order->status_id == 1) {
             $magasin = null;
@@ -457,50 +419,25 @@ class CustomerController extends Controller
         return view('customer.order-detail', compact('order', 'magasin'));
     }
 
-    /**
+    public function delete($id)
-     * mise au statut annulé d'une commande
-     *
-     * @param string $reference
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \RuntimeException If email missing.
-     */
-    public function cancelOrder(string $reference)
     {
-        /** @var \App\Models\Order|null */
+        // TODO : Implémenter la suppression lorsque la CRM sera prête pour le faire aussi
-        $order = Order::where('reference', $reference)->first();
-        if (!$order) {
-            throw new \RuntimeException('Impossible de trouver un enregistrement Order');
-        }
-        $order->status_id = 7;
-        $order->save();
-
-        // Envoi du mail d'annulation aux admins site.
-        /** @var string|null */
-        $toMail = \optional(Setting::where('key', 'send_order_confirm_mail_to')->first())->value;
-        if (!$toMail) {
-            /** @var string|null */
-            $toMail = config('mail.from.address');
-        }
-
-        if (!$toMail) {
-            throw new \RuntimeException('Impossible de trouver un mail');
-        }
-
-        Mail::to($toMail)->queue(new OrderCanceledConfirmMail($order));
-
-        return back()->with('success', "La commande " . $order->reference . " à été annulée.");
-    }
-
-    /**
-     * delete customers
-     *
-     * @param integer $id
-     * @return void
-     */
-    public function delete(int $id)
-    {
-        dump('deleting' . $id);
         die('Not implemented yet');
+        // Suppression d'un compte client
+        $customer = Customers::findOrFail($id);
+        $customer->recipes()->delete();
+        $customer->products()->delete();
+        $customer->answers()->delete();
+        $customer->forums()->delete();
+
+        // TODO : Suppression via la CRM
+
+        if (Auth::guard('customer')->user()->id === $customer->id) {
+            Auth::guard('customer')->logout();
+        }
+        $customer->delete();
+
+        return redirect()->route('home');
     }
 
     /**
@@ -558,6 +495,7 @@ class CustomerController extends Controller
                     }
                 }
                 Mail::to($request->email)->send(new RegisterConfirmMail($customer, null));
+                Mail::mailer('smtp2')->to($request->email)->send(new RegisterConfirmMail($customer, null));
                 return back()
                     ->withErrors(
                         trans('Votre compte n\'est pas activé, vérifiez dans vos emails pour y trouver
@@ -603,6 +541,7 @@ class CustomerController extends Controller
             return \redirect()->back();
         }
 
+        // TODO: Activer le changement d'email quand ce sera possible dans la CRM.
         /** @var \LDC\LDCCRM\Models\Customer */
         $crmCustomer = $customer->apiData;
 

app/Http/Controllers/HomeController.php

@@ -7,6 +7,7 @@ use App\Models\Product;
 use App\Models\Slider;
 use App\Models\Range;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
 use LDC\LDCCRM\Enums\ApiError;
 use LDC\LDCCRM\Exceptions\ApiErrorException;
@@ -15,19 +16,10 @@ use LDC\LDCCRM\Models\SingleOptin;
 
 class HomeController extends Controller
 {
-    /**
-     * Display homepage
-     *
-     * @param Request $request
-     * @return \Illuminate\Contracts\View\View
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass
-     */
     public function index(Request $request)
     {
-        // @phpcs:enable
         $content = Content::where('key', 'accueil')->first();
-        // Star products.
+        //star products
         $products = Product::where('status', 1)->where('star', 1)->get();
 
         $slider = Slider::where('slug', 'home')->first();
@@ -45,10 +37,8 @@ class HomeController extends Controller
 
     /**
      * Call the CRM to add a single optin
-     *
+     * @param String $email Email to add as a single optin
-     * @param Request $request
+     * @return String Message to print to the customer
-     * @return \Illuminate\Contracts\View\View
-     *
      */
     public function addOptIn(Request $request)
     {

app/Http/Controllers/IndexController.php

@@ -8,64 +8,38 @@ use Illuminate\Http\Request;
 
 class IndexController extends Controller
 {
+
     /**
-     * legal notice page
+     * deprecated
-     *
-     * @param Request $request
-     * @return \Illuminate\Contracts\View\View
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass
      */
+    public function contact(Request $request)
+    {
+        $content = Content::where('key', 'contact')->first();
+        return view('contact', compact('content'));
+    }
+
     public function legalNotice(Request $request)
     {
-        // @phpcs:enable
         $content = Content::where('key', 'legals')->first();
         return view('legal-notice', compact('content'));
     }
 
-    /**
-     * terms and conditions page
-     *
-     * @param Request $request
-     * @return \Illuminate\Contracts\View\View
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass
-     */
     public function terms(Request $request)
     {
-        // @phpcs:enable
         $content = Content::where('key', 'cgv')->first();
         return view('terms', compact('content'));
     }
 
-    /**
-     * privacy page
-     *
-     * @param Request $request
-     * @return \Illuminate\Contracts\View\View
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass
-     */
     public function privacy(Request $request)
     {
-        // @phpcs:enable
         $content = Content::where('key', 'confidentialite')->first();
         return view('privacy', compact('content'));
     }
 
-    /**
-     * faq page
-     *
-     * @param Request $request
-     * @return \Illuminate\Contracts\View\View
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass
-     */
     public function faq(Request $request)
     {
-        // @phpcs:enable
         $content = Content::where('key', 'faq')->first();
-        $faq     = Faq::all();
+        $faq = Faq::all();
-        return view('faq', compact('faq', 'content'));
+        return view('faq', compact('faq','content'));
     }
 }

app/Http/Controllers/ProductsController.php

@@ -6,68 +6,49 @@ use App\Models\Product;
 use App\Models\Range;
 use App\Models\Tag;
 use Illuminate\Http\Request;
+use Illuminate\Support\Str;
 
 class ProductsController extends Controller
 {
+
     /**
-     * Ranges page
+     * page des gammes
-     *
-     * @param Request $request
-     * @return \Illuminate\Contracts\View\View
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass
      */
     public function ranges(Request $request)
     {
-        // @phpcs:enable
+        //now in AppServiceProvider
-        // $ranges shared in AppServiceProvider.
+        //$ranges = Range::all();
+        //return view('ranges', compact('ranges'));
         return view('ranges');
     }
 
     /**
-     * One Range page
+     * page une gamme
-     *
-     * @param Request $request
-     * @param string  $range_slug
-     * @return \Illuminate\Contracts\View\View
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed
      */
-    public function range(Request $request, string $range_slug)
+    public function range(Request $request, $range_slug)
     {
-        // @phpcs:enable
         $range = Range::where('slug', $range_slug)->first();
         if (!$range || !$range->status) {
             abort(404);
         }
         $products = Product::where('range_id', $range->id)->where('status', 1)->paginate(9);
-        // Find promo within range.
+        //find promo within range
-        $offres = Product::where('range_id', $range->id)
+        $offres = Product::where('range_id', $range->id)->where('status', 1)->has('promotions')->with('promotions')->get();
-        ->where('status', 1)
-            ->has('promotions')
-            ->with('promotions')->get();
         return view('range', compact('range', 'products', 'offres'));
     }
 
     /**
-     * One product page
+     * page produit
-     *
-     * @param Request $request
-     * @param string  $product_slug
-     * @return \Illuminate\Contracts\View\View
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed
      */
-    public function product(Request $request, string $product_slug)
+    public function product(Request $request, $product_slug)
     {
-        // @phpcs:enable
         $product = Product::where('slug', $product_slug)->first();
         if (!$product || !$product->status) {
             abort(404);
         }
         $product->additionnalProductInfo = $product->additionnalProductInfo($product->product_type);
         if ($product->additionnalProductInfo === null && !empty($product_type)) {
-            // N'existe pas on renseigne un vide.
+            //n'existe pas on renseigne un vide
             $product_type           = $product->product_type;
             $modelClass             = 'App\Models\\' . ucfirst($product_type);
             $product->$product_type = new $modelClass();
@@ -81,10 +62,6 @@ class ProductsController extends Controller
     /**
      * tous les produits
      * recherche par nom de produit
-     *
-     * @param Request $request
-     * @return \Illuminate\Contracts\View\View
-     *
      */
     public function allProducts(Request $request)
     {
@@ -105,18 +82,10 @@ class ProductsController extends Controller
     }
 
     /**
-     * tous les produits
+     * produits filtrés par tag (1 tag)
-     * filtrage par tag
-     *
-     * @param Request $request
-     * @param string  $tag_slug
-     * @return \Illuminate\Contracts\View\View
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed
      */
-    public function tagFiltered(Request $request, string $tag_slug)
+    public function tagFiltered(Request $request, $tag_slug)
     {
-        // @phpcs:enable
         $products = Product::where('status', 1)
             ->whereHas('tags', function ($q) use ($tag_slug) {
                 $q->where('slug', '=', $tag_slug);

app/Http/Controllers/QuickOrderController.php

@@ -7,17 +7,8 @@ use Illuminate\Http\Request;
 
 class QuickOrderController extends Controller
 {
-    /**
-     * Quickorder page
-     *
-     * @param Request $request
-     * @return \Illuminate\Contracts\View\View
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass
-     */
     public function index(Request $request)
     {
-        // @phpcs:enable
         $quickorder_ranges = Range::with('products')->get();
         foreach ($quickorder_ranges as $range) {
             foreach ($range->products as $product) {

app/Http/Kernel.php

@@ -2,7 +2,7 @@
 
 namespace App\Http;
 
-use App\Http\Middleware\IsAdmin;
+use App\Http\Middleware\isAdmin;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
 class Kernel extends HttpKernel
@@ -15,6 +15,7 @@ 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,6 +34,7 @@ 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,
@@ -62,6 +64,6 @@ class Kernel extends HttpKernel
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
-        'is-admin' => IsAdmin::class,
+        'is-admin' => isAdmin::class,
     ];
 }

app/Http/Middleware/Authenticate.php

@@ -9,7 +9,7 @@ class Authenticate extends Middleware
     /**
      * Get the path the user should be redirected to when they are not authenticated.
      *
-     * @param  mixed $request
+     * @param  \Illuminate\Http\Request  $request
      * @return string|null
      */
     protected function redirectTo($request)

app/Http/Middleware/EncryptCookies.php

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

app/Http/Middleware/PreventRequestsDuringMaintenance.php

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

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -12,9 +12,9 @@ class RedirectIfAuthenticated
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure                 $next
+     * @param  \Closure  $next
-     * @param  string|null              ...$guards
+     * @param  string|null  ...$guards
      * @return mixed
      */
     public function handle(Request $request, Closure $next, ...$guards)

app/Http/Middleware/RedirectOldSlugs.php

@@ -6,21 +6,20 @@ use App\Models\OldSlug;
 use App\Models\Product;
 use App\Models\Range;
 use Closure;
-use Illuminate\Http\Request;
 
 class RedirectOldSlugs
 {
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure                 $next
+     * @param  \Closure  $next
      * @return mixed
      */
-    public function handle(Request $request, Closure $next)
+    public function handle($request, Closure $next)
     {
         $productSlug = $request->route('productSlug');
-        $rangeSlug   = $request->route('rangeSlug');
+        $rangeSlug = $request->route('rangeSlug');
 
         if ($productSlug !== null) {
             $product = Product::where('slug', $productSlug)->first();

app/Http/Middleware/TrustProxies.php

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

app/Http/Middleware/VerifyCsrfToken.php

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

app/Http/Middleware/isAdmin.php

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

app/Http/Requests/ContactFormRequest.php

@@ -2,6 +2,8 @@
 
 namespace App\Http\Requests;
 
+use App\Enums\ContactFormCivility;
+use App\Enums\ContactFormType;
 use Illuminate\Foundation\Http\FormRequest;
 
 class ContactFormRequest extends FormRequest
@@ -9,7 +11,7 @@ class ContactFormRequest extends FormRequest
     /**
      * Determine if the user is authorized to make this request.
      *
-     * @return boolean
+     * @return bool
      */
     public function authorize()
     {
@@ -26,8 +28,8 @@ class ContactFormRequest extends FormRequest
         return [
             'last_name' => 'required|min:2',
             'first_name' => 'required|min:2',
+            // TODO: The dns and spoof validators require the PHP intl extension. (présent sur prod ?)
             'email' => 'required|email:rfc,dns,spoof',
-            'shop' => 'present|nullable|string|exists:magasins,name',
             'subject' => 'required|min:2',
             'order_ref' => 'sometimes',
             'message' => 'required|min:20|max:1900',
@@ -47,7 +49,6 @@ class ContactFormRequest extends FormRequest
             'ok_cgv.accepted' => __('You must accept the terms and conditions and the privacy policy'),
             'file.max' => __('La taille du fichier ne peut pas dépasser :max kilo-octets.'),
             'file.mimes' => __('Le fichier doit être de type : :values.'),
-            'shop.exists' => __('Le magasin :exists est introuvable.')
         ];
     }
 }

app/Http/Requests/ProductRequest.php

@@ -10,7 +10,7 @@ class ProductRequest extends FormRequest
     /**
      * Determine if the user is authorized to make this request.
      *
-     * @return boolean
+     * @return bool
      */
     public function authorize()
     {

app/Http/Requests/SortOrders.php

@@ -9,7 +9,7 @@ class SortOrders extends FormRequest
     /**
      * Determine if the user is authorized to make this request.
      *
-     * @return boolean
+     * @return bool
      */
     public function authorize()
     {

app/Jobs/CsvJobs.php

@@ -4,20 +4,16 @@ namespace App\Jobs;
 
 abstract class CsvJobs extends XArcadiaFlux
 {
+
     /**
      * parse csv file
-     *
-     * @param string $csvFile
-     *
-     * @return array
      */
-    protected function parseCsv(string $csvFile)
+    protected function parseCsv($csvFile) {
-    {
         $file_handle = fopen($csvFile, 'r');
         while (!feof($file_handle)) {
             $line_of_text[] = fgetcsv($file_handle, 0, ";");
-            if (!end($line_of_text)) {
+            if(!end($line_of_text)) {
-                // Supprime les lignes vides du csv.
+                //supprime les lignes vides du csv
                 array_pop($line_of_text);
             }
         }
@@ -40,19 +36,10 @@ abstract class CsvJobs extends XArcadiaFlux
     /**
      * converts an array to a csv stream
      *
-     * @param array  $data
-     * @param string $delimiter
-     * @param string $enclosure
-     * @param string $escape_char
-     *
      * @return string
      */
-    protected function array2csv(
+    protected function array2csv($data, $delimiter = ',', $enclosure = '"', $escape_char = "\\")
-        array $data,
+    {
-        string $delimiter = ',',
-        string $enclosure = '"',
-        string $escape_char = "\\"
-    ) {
         $f = fopen('php://memory', 'r+');
         foreach ($data as $item) {
             fputcsv($f, $item, $delimiter, $enclosure, $escape_char);

app/Jobs/CsvOrderWrite.php

@@ -4,27 +4,20 @@ namespace App\Jobs;
 
 use Illuminate\Support\Carbon;
 use App\Models\Order;
+use App\Models\OrderLine;
+use App\Models\Customers;
+use App\Models\Timeslot;
 
 class CsvOrderWrite extends CsvJobs
 {
-    /**
+
-     * The Laravel disk name
-     *
-     * @var string
-     */
     protected $disk = 'orders';
 
-    /**
+    /** @var Order */
-     * The Order to be exported
-     *
-     * @var Order
-     * */
     private $order;
 
     /**
-     * CSV File headers
+     * en-têtes
-     *
-     * @var array
      */
     private $header = [
         "CodeArt",
@@ -41,8 +34,6 @@ class CsvOrderWrite extends CsvJobs
 
     /**
      * correspondance unité d'appro/mode de commande
-     *
-     * @var array
      */
     private $mode_commande = [
         "COLIS" => "UEA",
@@ -53,8 +44,6 @@ class CsvOrderWrite extends CsvJobs
     /**
      * Create a new job instance.
      *
-     * @param Order $order
-     *
      * @return void
      */
     public function __construct(Order $order)
@@ -81,48 +70,44 @@ class CsvOrderWrite extends CsvJobs
         /** @var Timeslot */
         $timeslot = $this->order->timeslot;
 
-        // Insertion de la ligne d'en-têtes.
+        //insertion de la ligne d'en-têtes
         $csvlines[] = $this->header;
 
         foreach ($orderlines as $orderline) {
             $product = $orderline->product;
-            // COLIS, KGM, PCE (faut il introduire un nouveau champs type unité de commande).
+
-            $unité_commande = $product->order_unit ?? 'PCE';
+            $unité_commande = $product->order_unit ?? 'PCE'; //COLIS, KGM, PCE (faut il introduire un nouveau champs type unité de commande)
-            // Matricule rh transmis sans les lettres de l'identifiant windows.
+            $code_client    = preg_replace('/[^\d]/', '', $customer->salarie->matricule); //matricule rh transmis sans les lettres de l'identifiant windows
-            $code_client = preg_replace('/[^\d]/', '', $customer->salarie->matricule);
+
-            // Convert to date object.
+            //convert to date object
             $datLivraison = Carbon::createFromFormat('d/m/Y H:i', $timeslot->day . " " . $timeslot->time);
 
+            //on enleve un jour pour avoir le produit la veille
+            $datLivraison = $datLivraison->subDay();
+
             $oneline = [
-                $product->foodProduct->no_art,
+                $product->foodProduct->no_art, //21/01/2022 : suppression du pcb ici
-                // 21/01/2022 : suppression du pcb ici
                 $code_client,
                 $product->reference,
                 "commande ferme",
                 $unité_commande,
-                // UEA,KGM,UB (respectivement selon le champ précédent).
+                $this->mode_commande[$unité_commande], //UEA,KGM,UB (respectivement selon le champ précédent)
-                $this->mode_commande[$unité_commande],
+                "", //on vide la colonne pcb comme demandé
-                // On vide la colonne pcb comme demandé.
+                $datLivraison->format('d/m/Y'), //dd/mm/yyyy
-                "",
-                $datLivraison->format('d/m/Y'),
                 $orderline->quantity,
                 $this->order->reference,
             ];
 
             $csvlines[] = $oneline;
-        }//end foreach
+        }
 
         $data = $this->array2csv($csvlines, ";");
 
-        $outputfilename = "BTQ_" .
+        //$outputfilename = date("Ymd_His") . microtime(true) . ".csv";
-            $this->order->reference . "_" .
+        $outputfilename = "BTQ_" . $this->order->reference . "_" . $code_client . "_" . $customer->salarie->nom . "_" . $customer->salarie->prenom . "_" . str_pad($customer->salarie->code_societe, 3, "0", STR_PAD_LEFT) . ".csv";
-            $code_client . "_" .
-            $customer->salarie->nom . "_" .
-            $customer->salarie->prenom . "_" .
-            str_pad($customer->salarie->code_societe, 3, "0", STR_PAD_LEFT) . ".csv";
 
         $disk->put($outputfilename, $data);
 
-        // Send this file by mail.
+        //send this file by mail
     }
 }

app/Jobs/CsvSalariesReader.php

@@ -8,21 +8,17 @@ use ErrorException;
 use TypeError;
 use Illuminate\Database\QueryException;
 use App\Exceptions\AbortCsvImportException;
+use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Support\Str;
 
 class CsvSalariesReader extends CsvJobs
 {
+
     /**
      * This is for Laravel Console usage
-     * @var \Illuminate\Console\Command|null
      */
     public $console = null;
 
-    /**
-     * The Laravel disk name
-     *
-     * @var string
-     */
     protected $disk = 'salaries';
 
     /**
@@ -32,6 +28,7 @@ class CsvSalariesReader extends CsvJobs
      */
     public function __construct()
     {
+        //
     }
 
     /**
@@ -47,7 +44,7 @@ class CsvSalariesReader extends CsvJobs
         $files = $disk->files();
 
         $progress = 1;
-        $total    = count(array_filter($files, function ($filename) {
+        $total = count(array_filter($files, function ($filename) {
             if ($this->fileHasToBeIgnored($filename)) {
                 return false;
             }
@@ -66,17 +63,17 @@ class CsvSalariesReader extends CsvJobs
 
             try {
                 $data = $this->parseCsv($filepath);
-                // First line is header (mandatory).
+                //first line is header (mandatory)
                 $header = array_flip(array_shift($data));
                 foreach ($data as $line) {
-                    $matricule          = $line[$header['matricule']];
+                    $matricule = $line[$header['matricule']];
-                    $prenom             = $line[$header['prenom']];
+                    $prenom = $line[$header['prenom']];
-                    $nom                = $line[$header['nom']];
+                    $nom = $line[$header['nom']];
-                    $salarie            = Salarie::firstOrNew(['matricule' => $matricule ]);
+                    $salarie = Salarie::firstOrNew(['matricule' => $matricule ]);
                     $salarie->matricule = $matricule;
-                    $salarie->nom       = $nom;
+                    $salarie->nom = $nom;
-                    $salarie->prenom    = $prenom;
+                    $salarie->prenom = $prenom;
-                    $salarie->code      = $salarie->code ?? $this->generateCode();
+                    $salarie->code = $salarie->code ?? $this->generateCode();
                     $salarie->save();
                 }
             } catch (ErrorException | TypeError | QueryException $e) {
@@ -93,8 +90,7 @@ class CsvSalariesReader extends CsvJobs
                     ),
                     LogType::critical()
                 );
-                continue;
+                continue; // ignore the file
-// Ignore the file.
             } catch (AbortCsvImportException $e) {
                 $this->log(
                     sprintf(
@@ -105,23 +101,19 @@ class CsvSalariesReader extends CsvJobs
                     ),
                     LogType::error()
                 );
-                continue;
+                continue; // ignore the file
-// Ignore the file.
+            }
-            }//end try
             $this->moveToArchives($filename);
-        }//end foreach
+        }
 
-        // Clear old archives.
+        // Clear old archives
         $this->clearOldArchives();
     }
 
     /**
      * Génère un code d'inscription
-     *
-     * @return string
      */
-    protected function generateCode()
+    protected function generateCode() {
-    {
         return Str::random(5);
     }
 }

app/Jobs/RefreshSiteMap.php

@@ -38,15 +38,19 @@ class RefreshSiteMap implements ShouldQueue
         '/login',
         '/bo',
         '/activer',
+        // '/deconnexion',
         '/reinitialiser-mdp',
-// Hack ignore laravel debug bar.
+        // '/le-club-des-gaulois/la-boutique',
-        '/_debugbar',
+        // '/password/confirm',
-// Ignore ignition route.
+        // '/produit/from-menus',
-        '_ignition/health-check',
+        // '/cote-cuisine/sante-et-nutrition/menu-equilibre-j',
-// Ignore ignition route.
+        // '/la-marque/tracabilite/search',
-        '_ignition/scripts/{script}',
+        // '/frame',
-        // Ignore ignition route.
+        // '/map',
-        '_ignition/styles/{style}'
+        '/_debugbar', // Hack ignore laravel debug bar
+        '_ignition/health-check', //ignore ignition route
+        '_ignition/scripts/{script}', //ignore ignition route
+        '_ignition/styles/{style}' //ignore ignition route
     ];
 
     /**
@@ -69,12 +73,13 @@ class RefreshSiteMap implements ShouldQueue
     /**
      * Execute the job.
      *
+     *! Ici c'est du sale !!
+     * TODO: mettre tout ça dans un package pour le rendre plus générique
+     *
      * @return void
-     * @phpcs:disable Generic.Metrics.CyclomaticComplexity.TooHigh
      */
     public function handle()
     {
-        // @phpcs:enable
         $this->assertRouteBinderIsCorrect();
 
         $siteMap = [];
@@ -110,20 +115,20 @@ class RefreshSiteMap implements ShouldQueue
                 /** @var string $pName $parameter name on route uri */
                 $pName = '';
 
-                // If the route has parameters and the controller accepts it.
+                // 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.
+                    // Get the controller parameter name for the route
                     $pName = $pNames[$param->getPosition()];
                 }
 
-                // If We have a custom binder for this route.
+                // 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 This route takes a model as param
                 if ($name and $name->isSubclassOf(Model::class)) {
                     $hasModels = true;
                     /** @var \string */
@@ -131,20 +136,19 @@ class RefreshSiteMap implements ShouldQueue
                     $this->setParamsForModel($rParams, $modelClassName, $pName);
                     continue;
                 }
-            }//end foreach
+            }
 
-            // If the route has no dynamic models as parameters.
+            // 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 {
+            } else { // If the route has dynamic models as parameters
-// If the route has dynamic models as parameters.
                 $this->genRoute($route, $siteMap, $rParams);
             }
-        }//end foreach
+        }
 
         $sm = Sitemap::create();
         foreach ($siteMap as $smRules) {
@@ -159,11 +163,9 @@ class RefreshSiteMap implements ShouldQueue
     /**
      * Process route with binderParam
      *
-     * @param array        $rParams
      * @param RoutingRoute $route
-     * @param string       $pName
+     * @param string $pName
      * @return void
-     * @throws Exception When unhandled class.
      */
     private function processWithRouteBinderParam(array &$rParams, RoutingRoute $route, string $pName)
     {
@@ -173,7 +175,7 @@ class RefreshSiteMap implements ShouldQueue
         $modelClassName = $o[0];
         /** @var \string  */
         $routeParamName = $o[1];
-        $rfLCls         = (new ReflectionClass($modelClassName));
+        $rfLCls = (new ReflectionClass($modelClassName));
 
         switch (true) {
             case $rfLCls->isSubclassOf(Model::class):
@@ -190,7 +192,7 @@ class RefreshSiteMap implements ShouldQueue
     /**
      * Set route param Array for Enums
      *
-     * @param array  $rParams
+     * @param array $rParams
      * @param string $enumClassName
      * @param string $pName
      * @return void
@@ -208,7 +210,7 @@ class RefreshSiteMap implements ShouldQueue
     /**
      * Set route param Array for Models
      *
-     * @param array  $rParams
+     * @param array $rParams
      * @param string $modelClassName
      * @param string $pName
      * @param string $routeParamName
@@ -220,15 +222,16 @@ class RefreshSiteMap implements ShouldQueue
         string $pName,
         string $routeParamName = null
     ) {
-        $i          = 0;
+        $i = 0;
-        $limit      = 10;
+        $limit = 10;
         $modelTable = (new ReflectionClass($modelClassName))->newInstanceWithoutConstructor()->getTable();
-        $q          = $modelClassName::query();
+        $q = $modelClassName::query();
-        $q          = Schema::hasColumn($modelTable, 'status') ? $q->where('status', true) : $q;
+        $q = Schema::hasColumn($modelTable, 'status') ? $q->where('status', true) : $q;
-        $q          = Schema::hasColumn($modelTable, 'star_moment') ? $q->where('star_moment', true) : $q;
+        $q = Schema::hasColumn($modelTable, 'ocbStatus') ? $q->where('ocbStatus', EleveurOcbStatus::yes()->value) : $q;
+        $q = Schema::hasColumn($modelTable, 'star_moment') ? $q->where('star_moment', true) : $q;
         do {
             $results = $q->offset($i * $limit)->limit($limit)->get();
-            $length  = count($results);
+            $length = count($results);
             $results->map(function (Model $model) use (&$rParams, $pName, $routeParamName) {
                 if (!array_key_exists($pName, $rParams)) {
                     $rParams[$pName] = [];
@@ -247,8 +250,8 @@ class RefreshSiteMap implements ShouldQueue
      * Recursively generate routes for all params
      *
      * @param RoutingRoute $route
-     * @param array        $siteMap
+     * @param array $siteMap
-     * @param array        $params
+     * @param array $params
      * @return void
      */
     private function genRoute(RoutingRoute $route, array &$siteMap, array $params)
@@ -287,7 +290,7 @@ class RefreshSiteMap implements ShouldQueue
      * Check if $route exists in routesBinder and has $param
      *
      * @param RoutingRoute $route
-     * @param string       $param
+     * @param string $param
      * @return boolean
      */
     private function hasRouteBinderParam(RoutingRoute $route, string $param): bool
@@ -313,7 +316,7 @@ class RefreshSiteMap implements ShouldQueue
      * Get the routeBinder param
      *
      * @param RoutingRoute $route
-     * @param string       $param
+     * @param string $param
      * @return array
      */
     private function getRouteBinderParam(RoutingRoute $route, string $param): array
@@ -324,7 +327,7 @@ class RefreshSiteMap implements ShouldQueue
     /**
      * Assert that routeBinder is correct
      *
-     * @throws Exception When route does not exist | incomplrte parameters | parameter is not a model class.
+     * @throws Exception
      * @return void
      */
     private function assertRouteBinderIsCorrect()
@@ -364,8 +367,8 @@ class RefreshSiteMap implements ShouldQueue
                         $p[0]
                     ));
                 }
-            }//end foreach
+            }
-        }//end foreach
+        }
     }
 
     /**

app/Jobs/XArcadiaFlux.php

@@ -3,6 +3,7 @@
 namespace App\Jobs;
 
 use App\Enums\LogType;
+use Exception;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -29,7 +30,6 @@ abstract class XArcadiaFlux implements ShouldQueue
 
     /**
      * This is for Laravel Console usage
-     * @var \Illuminate\Console\Command|null
      */
     public $console = null;
 
@@ -53,7 +53,6 @@ abstract class XArcadiaFlux implements ShouldQueue
      * Check if the file extension
      *
      * @param string $filename
-     * @param string $extension
      * @return boolean
      */
     protected function checkExtension(string $filename, string $extension): bool
@@ -111,7 +110,7 @@ abstract class XArcadiaFlux implements ShouldQueue
      */
     protected function clearOldArchives(): void
     {
-        $disk     = $this->getDisk();
+        $disk = $this->getDisk();
         $archives = $disk->files($this->archiveFolderName);
 
         // /** @var File */
@@ -142,10 +141,9 @@ abstract class XArcadiaFlux implements ShouldQueue
     /**
      * Logs data
      *
-     * @param string  $message
+     * @param string $message
      * @param LogType $logtype
      * @return void
-     * @throws \ErrorException If logtype is not handled.
      */
     protected function log(string $message, LogType $logtype = null): void
     {
@@ -173,18 +171,17 @@ abstract class XArcadiaFlux implements ShouldQueue
                 Log::critical($message);
                 break;
             default:
-                throw new \ErrorException(sprintf('%s : unhandled log type %s', get_class($this), $logtype->label));
+                throw new Exception(sprintf('%s : unhandled log type %s', get_class($this), $logtype->label));
-        }//end switch
+        }
         $this->consolePrint($message, $logtype);
     }
 
     /**
      * Prints to the console
      *
-     * @param string  $message
+     * @param string $message
      * @param LogType $logtype
      * @return void
-     * @throws \ErrorException If logtype is not handled.
      */
     protected function consolePrint(string $message, LogType $logtype): void
     {
@@ -203,7 +200,7 @@ abstract class XArcadiaFlux implements ShouldQueue
                     $this->console->error($message);
                     break;
                 default:
-                    throw new \ErrorException(sprintf('%s : unhandled log type %s', get_class($this), $logtype->label));
+                    throw new Exception(sprintf('%s : unhandled log type %s', get_class($this), $logtype->label));
             }
         }
     }

app/Jobs/XmlIncoReader.php

@@ -8,26 +8,12 @@ use SimpleXMLElement;
 
 class XmlIncoReader extends XmlJobs
 {
-    /**
+
-     * The Laravel disk name
-     *
-     * @var string
-     */
     protected $disk = 'inco';
 
-    /**
-     * Storage path
-     *
-     * @var string
-     */
     protected $imagesPath = 'images';
 
     /**
-     * The columns to take from the XML
-     * subcolumns can be added with a dot
-     *
-     * @var array
-     *
      * éléments à la racine : nom du noeud
      * sous éléments d'un noeud PARENT :
      * d'abord:
@@ -43,47 +29,42 @@ class XmlIncoReader extends XmlJobs
      *  'EXPLOITANT.NOM_SOCIETE' => 'nom_societe',
      */
     protected $takeColumns = [
-        'NO_ART' => 'id',
+        'NO_ART' => 'id', // primary key on model
-        // Primary key on model.
+
-        // This wil not return anything cf doc above.
+        //this wil not return anything cf doc above
         'ID_SOCIETE' => 'id_societe',
         'NOM_SOCIETE' => 'nom_societe',
 
         'PROD_SAISON' => 'prod_saison',
         'NOM' => 'nom',
         'NUMERO' => 'numero',
-        'TAILLE_REF' => 'taille_ref',
+        'TAILLE_REF' => 'taille_ref', //$poidsRef censé être dans INCO_COMPO (et généralement 100g)
-// $poidsRef censé être dans INCO_COMPO (et généralement 100g)
         'ALLEGATIONS' => 'allegations',
         'CONSEIL_PREPA' => 'conseil_prepa',
         'ASTUCES' => 'astuces',
-        'DESCRIPTIF' => 'descriptif',
+        'DESCRIPTIF' => 'descriptif', //$descriptif
-// $descriptif
         'ARG_VENTE' => 'arg_vente',
         'NB_PORTION' => 'nb_portion',
         'TYP_PORTION' => 'typ_portion',
         'PDS_MOY_THEO' => 'pds_moy_theo',
         'LIB_CONSO' => 'lib_conso',
-        'LST_ING' => 'lst_ing',
+        'LST_ING' => 'lst_ing', //$ingredients
-// $ingredients
+
-        // List alergene.
+        // list alergene
-        'LST_ALLERGENE' => 'lst_allergene',
+        'LST_ALLERGENE' => 'lst_allergene', // Consider this sub array
-// Consider this sub array.
         'LST_ALLERGENE.LIB_ALLERGENE' => 'lib_allergene',
 
-        // Allegations.
+        // Allegations
         'ALLEGAT_SANTE' => 'allegat_sante',
         'ALLEGAT_NUTRIT' => 'allegat_nutrit',
         'ALLEGAT_AUTRE' => 'allegat_autre',
 
 
-        'INCO_COMPO' => 'inco_compo',
+        'INCO_COMPO' => 'inco_compo', // Consider this sub array
-// Consider this sub array.
         'INCO_COMPO.NOM' => 'nom',
         'INCO_COMPO.TAILLE_REF' => 'taille_ref',
         'INCO_COMPO.VAL_ENERG_KJ_NUT' => 'val_energ_kj_nut',
-        'INCO_COMPO.VAL_ENERG_KJ_R' => 'val_energ_kj_r',
+        'INCO_COMPO.VAL_ENERG_KJ_R' => 'val_energ_kj_r',  //_R apports de la taille_ref
-// _R apports de la taille_ref
         'INCO_COMPO.VAL_ENERG_KCAL_R' => 'val_energ_kcal_r',
         'INCO_COMPO.VAL_ENERG_KCAL_NUT' => 'val_energ_kcal_nut',
         'INCO_COMPO.MAT_GRASS_R' => 'mat_grass_r',
@@ -104,8 +85,7 @@ class XmlIncoReader extends XmlJobs
         'INCO_COMPO.ENER_E14_R' => 'ener_e14_r',
         'INCO_COMPO.FRUITS_R' => 'fruits_r',
         'INCO_COMPO.FRUITS_COQUE_SECH_R' => 'fruits_coque_sech_r',
-        'INCO_COMPO.POURCENT_APPORT_REF_E14_R' => 'pourcent_apport_ref_e14_r',
+        'INCO_COMPO.POURCENT_APPORT_REF_E14_R' => 'pourcent_apport_ref_e14_r', //POURCENT_*_P apports journaliers par portion
-// POURCENT_*_P apports journaliers par portion.
         'INCO_COMPO.ENER_KJO_R' => 'ener_kjo_r',
         'INCO_COMPO.POURCENT_APPORT_REF_KJO_R' => 'pourcent_apport_ref_kjo_r',
         'INCO_COMPO.POURCENT_APPORT_REF_FAT_R' => 'pourcent_apport_ref_fat_r',
@@ -122,10 +102,8 @@ class XmlIncoReader extends XmlJobs
         'INCO_COMPO.SALTEQ_R' => 'salteq_r',
         'INCO_COMPO.POURCENT_APPORT_REF_SALTEQ_R' => 'pourcent_apport_ref_salteq_r',
         'INCO_COMPO.APPORT_REF' => 'apport_ref',
-        'INCO_COMPO.TAILLE_PORT' => 'taille_port',
+        'INCO_COMPO.TAILLE_PORT' => 'taille_port', //$poidsPortion
-// $poidsPortion
+        'INCO_COMPO.VAL_ENERG_KJ_P' => 'val_energ_kj_p', //_P apports par portion
-        'INCO_COMPO.VAL_ENERG_KJ_P' => 'val_energ_kj_p',
-// _P apports par portion
         'INCO_COMPO.VAL_ENERG_KCAL_P' => 'val_energ_kcal_p',
         'INCO_COMPO.MAT_GRASS_P' => 'mat_grass_p',
         'INCO_COMPO.AGS_P' => 'ags_p',
@@ -167,10 +145,8 @@ class XmlIncoReader extends XmlJobs
         'INCO_COMPO.COMPOSANTE_N' => 'composante_n',
         'INCO_COMPO.COMPOSANTE_P' => 'composante_p',
         'INCO_COMPO.POURCENT_FRUITS' => 'pourcent_fruits',
-        'INCO_COMPO.SCORE_NUTRI' => 'score_nutri',
+        'INCO_COMPO.SCORE_NUTRI' => 'score_nutri', //du coup nutriscore ?
-        // Du coup nutriscore ?.
+        'INCO_COMPO.CLASSEMENT' => 'classement', //$nutriscore mais pas censé être dans INCO_COMPO
-        'INCO_COMPO.CLASSEMENT' => 'classement',
-        // $nutriscore mais pas censé être dans INCO_COMPO
         'INCO_COMPO.MAT_GRASS_R_PREC' => 'mat_grass_r_prec',
         'INCO_COMPO.AGS_R_PREC' => 'ags_r_prec',
         'INCO_COMPO.GLUCIDES_R_PREC' => 'glucides_r_prec',
@@ -183,11 +159,6 @@ class XmlIncoReader extends XmlJobs
         'INCO_COMPO.FRUITS_COQUE_SECH_R_PREC' => 'fruits_coque_sech_r_prec',
     ];
 
-    /**
-     * The columns allowed to be null
-     *
-     * @var array
-     */
     protected $nullableFields = [
         'taille_ref',
         'conseil_prepa',
@@ -301,18 +272,8 @@ class XmlIncoReader extends XmlJobs
         'inco_compo.fruits_coque_sech_r_prec'
     ];
 
-    /**
-     * Unique keys for updating rows
-     *
-     * @var array
-     */
     protected $uniqueKeyField = ['id'];
 
-    /**
-     * Columns to merge in
-     *
-     * @var array
-     */
     protected $mergeColumns = [
         'allegations' => [
             'allegat_sante',
@@ -418,20 +379,15 @@ class XmlIncoReader extends XmlJobs
         ]
     ];
 
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
     public function handle()
     {
 
         $this->parseData('INCO', XmlInco::class, function (SimpleXMLElement $xmlData, array &$line) {
 
-            // Merge columns.
+            // merge columns
             foreach ($this->mergeColumns as $key => $values) {
                 $line[$key] = [];
-                // Merge columns and remove merged columns from line.
+                // merge columns and remove merged columns from line
                 array_map(function ($kValue) use (&$line, $key) {
                     if (array_key_exists($kValue, $line)) {
                         $line[$key][$kValue] = $line[$kValue];
@@ -442,9 +398,13 @@ class XmlIncoReader extends XmlJobs
                     $line[$key] = implode(',', array_filter($line[$key]));
                     $line[$key] = strlen($line[$key]) ? $line[$key] : null;
                 }
+                //json column cast into array in model => no need for encode
+                // if ($key == 'nutritional_values') {
+                //     $line[$key] = json_encode($line[$key], \JSON_FORCE_OBJECT);
+                // }
             }
 
-            // Boolean cast prod_saison.
+            // Boolean cast prod_saison
             $line['prod_saison'] = isset($line['prod_saison']) ?
             (strtolower($line['prod_saison']) == 'non' ? false : true) : false;
 
@@ -453,118 +413,52 @@ class XmlIncoReader extends XmlJobs
         });
     }
 
-    /**
-     * Extract Image form XML file
-     *
-     * @param SimpleXMLElement $xmlData
-     * @return array
-     * @throws AbortXmlImportException When media tag does not contain an image.
-     */
     private function parseImage(SimpleXMLElement $xmlData)
     {
-        $list_media = $xmlData->INCO->MEDIA_VISUEL_EAI->MEDIA_VISUEL_EAI;
+        $images     = $xmlData->INCO->MEDIA_VISUEL_EAI->MEDIA_VISUEL_EAI;
         $arImgPaths = array();
         $index      = 1;
 
-        foreach ($list_media as $media) {
+        foreach ($images as $image) {
-            $image     = $media->img;
             $imageData = trim((string)$image);
             if (strlen($imageData)) {
                 $imageData = base64_decode($imageData);
-                $imgName   = strval($xmlData->INCO->INCO_COMPO->TBL_INCO_COMPO->ID_INCO);
+                $imgName = strval($xmlData->INCO->INCO_COMPO->TBL_INCO_COMPO->ID_INCO);
-                if (empty($imgName)) {
+                if(empty($imgName)) {
                     $imgName = strval($xmlData->INCO->NO_ART);
                 }
-                $imgName     = $imgName . "_" . $index;
+                $imgName = $imgName."_".$index;
                 $imgNamePath = sprintf('%s/%s', rtrim($this->imagesPath, '/'), $imgName);
 
                 $disk = $this->getDisk();
 
                 $info = getimagesizefromstring($imageData);
-                if ($info !== false) {
+                $mime = $info['mime'];
-                    $mime = $info['mime'];
+                switch ($mime) {
-                    switch ($mime) {
+                    case 'image/jpeg':
-                        case 'image/jpeg':
+                        $imgExtension = 'jpg';
-                            $imgExtension = 'jpg';
+                        break;
-                            break;
+                    case 'image/png':
-                        case 'image/png':
+                        $imgExtension = 'png';
-                            $imgExtension = 'png';
+                        break;
-                            break;
+                    case 'image/gif':
-                        case 'image/gif':
+                        $imgExtension = 'gif';
-                            $imgExtension = 'gif';
+                        break;
-                            break;
+                    default:
-                        default:
+                        throw new AbortXmlImportException(sprintf('Unknown image type %s', $imgName));
-                            throw new AbortXmlImportException(sprintf('Unknown image type %s', $imgName));
+                }
-                    }
 
-                    $imgNamePath = sprintf('%s.%s', $imgNamePath, $imgExtension);
+                $imgNamePath = sprintf('%s.%s', $imgNamePath, $imgExtension);
 
-                    if (!$disk->put($imgNamePath, $imageData)) {
+                if (!$disk->put($imgNamePath, $imageData)) {
-                        throw new AbortXmlImportException(sprintf('The image %s could not be saved', $imgNamePath));
+                    throw new AbortXmlImportException(sprintf('The image %s could not be saved', $imgNamePath));
-                    }
+                }
 
-                    $arImgPaths[$index] = sprintf('%s/%s', $this->disk, $imgNamePath);
+                $arImgPaths[$index] = sprintf('%s/%s', $this->disk, $imgNamePath);
-                    $index++;
+                $index++;
-                }//end if
+            }
-            }//end if
+        }
-        }//end foreach
 
         return $arImgPaths;
     }
-
-
-    /**
-     * Recursive extract to array
-     * introduce sort of Hook to transform
-     *           <TYP_PORTION>
-     *           <code><![CDATA[2]]></code>
-     *           <libelle><![CDATA[Approximatif]]></libelle>
-     *           </TYP_PORTION>
-     *           extracted as "TYP_PORTION" => array:1 [
-     *           0 => array:2 [
-     *               "code" => "2"
-     *               "libelle" => "Approximatif"
-     *             ]
-     *           ]
-     *           into this
-     *           <TYP_PORTION><![CDATA[Approximatif]]></TYP_PORTION>
-     *           extracted as "TYP_PORTION" => "Approximatif"
-     *
-     *
-     * @param \SimpleXMLElement|false $sxe
-     * @return array
-     */
-    protected function extract($sxe = null): array
-    {
-
-        if (!$sxe instanceof SimpleXMLElement) {
-            return array();
-        }
-        $extract = array();
-        foreach ($sxe->children() as $key => $value) {
-            if ($value->count()) {
-                $extraction = $this->extract($value);
-
-                if (
-                    count($extraction)
-                    && array_key_exists("code", $extraction)
-                    && array_key_exists("libelle", $extraction)
-                ) {
-                    $val           = strval($extraction['libelle']);
-                    $extract[$key] = strlen($val) ? $val : null;
-                    continue;
-                }
-
-                $extract[$key][] = $extraction;
-                continue;
-            }
-            $value = strval($value);
-            if (array_key_exists($key, $extract) and is_array($extract[$key])) {
-                $extract[$key][] = strlen($value) ? $value : null;
-            } else {
-                $extract[$key] = strlen($value) ? $value : null;
-            }
-        }//end foreach
-        return $extract;
-    }
 }

app/Jobs/XmlJobs.php

@@ -7,6 +7,7 @@ use App\Exceptions\AbortXmlImportException;
 use App\Exceptions\InvalidXmlException;
 use ErrorException;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
+use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
@@ -19,6 +20,7 @@ use TypeError;
 
 abstract class XmlJobs extends XArcadiaFlux
 {
+
     /**
      * invalid xml folder
      *
@@ -52,24 +54,20 @@ abstract class XmlJobs extends XArcadiaFlux
     /**
      * Parse Data from the XML and gives it to the callback
      *
-     * @param string   $entityName
+     * @param string $entityName
-     * @param string   $modelClass
+     * @param string $modelClass
-     * @param callable $callback
-     * @throws InvalidXmlException When xml is invalid.
      * @return void
-     *
-     * @phpcs:disable Generic.Metrics.CyclomaticComplexity.TooHigh
      */
+    // phpcs:ignore Generic.Metrics.CyclomaticComplexity.TooHigh
     protected function parseData(string $entityName, string $modelClass, callable $callback = null): void
     {
-        // @phpcs:enable
         /** @var Filesystem */
         $disk = $this->getDisk();
         $this->log('Démarrage du traitement');
         $files = $disk->files();
 
         $progress = 1;
-        $total    = count(array_filter($files, function ($filename) {
+        $total = count(array_filter($files, function ($filename) {
             if ($this->fileHasToBeIgnored($filename)) {
                 return false;
             }
@@ -98,10 +96,15 @@ abstract class XmlJobs extends XArcadiaFlux
 
                     if ($xmlContent === false) {
                         throw new InvalidXmlException('XML is Invalid (simplexml_load_string returned false)');
+                        // $this->log(
+                        //     sprintf('File %s could not be parsed (simplexml_load_string)', $filename),
+                        //     LogType::critical()
+                        // );
+                        // continue; // ignore the file
                     }
                 } catch (ErrorException $e) {
                     throw new InvalidXmlException('XML is Invalid', 0, $e);
-                }//end try
+                }
 
                 $data = $this->extract($xmlContent);
 
@@ -114,7 +117,7 @@ abstract class XmlJobs extends XArcadiaFlux
                     $lines[] = $line;
                 }
 
-                // Mise en base des données.
+                // Mise en base des données
                 foreach ($lines as $line) {
                     /** @var array Unique Key columns */
                     $uniqueColumnsKey = [];
@@ -125,6 +128,7 @@ abstract class XmlJobs extends XArcadiaFlux
                         [$modelClass, 'updateOrCreate'],
                         [$uniqueColumnsKey, $line]
                     );
+                    // @todo : should we put that method in a interface ?
                     $savedData->updateLocalProductInfo();
                 }
             } catch (InvalidXmlException $e) {
@@ -155,8 +159,7 @@ abstract class XmlJobs extends XArcadiaFlux
                     LogType::critical()
                 );
                 $this->sendErrorParseEmailToServiceWeb($e);
-                continue;
+                continue; // ignore the file
-// Ignore the file.
             } catch (AbortXmlImportException $e) {
                 $this->log(
                     sprintf(
@@ -169,10 +172,9 @@ abstract class XmlJobs extends XArcadiaFlux
                 );
                 $this->sendErrorParseEmailToServiceWeb($e);
                 $this->moveToInvalid($filename);
-                continue;
+                continue; // ignore the file
-// Ignore the file.
             } catch (FileNotFoundException | QueryException $e) {
-                // This happens because of concurent xml jobs read.
+                // This happens because of concurent xml jobs read
                 $message = $e->getMessage();
                 if (get_class($e) === QueryException::class) {
                     $message = implode(' ', $e->errorInfo);
@@ -186,13 +188,12 @@ abstract class XmlJobs extends XArcadiaFlux
                     ),
                     LogType::debug()
                 );
-                continue;
+                continue; // ignore the file
-// Ignore the file.
+            }
-            }//end try
             $this->moveToArchives($filename);
-        }//end foreach
+        }
 
-        // Clear old archives.
+        // Clear old archives
         $this->clearOldArchives();
     }
 
@@ -228,7 +229,7 @@ abstract class XmlJobs extends XArcadiaFlux
      *
      * @param array $fields
      * @return array
-     * @throws AbortXmlImportException When field should not be null.
+     * @throws AbortXmlImportException
      */
     protected function processFields(array $fields): array
     {
@@ -241,7 +242,7 @@ abstract class XmlJobs extends XArcadiaFlux
                 throw new AbortXmlImportException(sprintf('The field %s is not allowed to be null', $key));
             }
             if (is_array($field)) {
-                // Flatten data.
+                // Flatten data
                 $it = new RecursiveIteratorIterator(new RecursiveArrayIterator($field));
                 foreach ($it as $k => $f) {
                     $ko = strtolower(sprintf('%s.%s', $key, $k));
@@ -260,7 +261,7 @@ abstract class XmlJobs extends XArcadiaFlux
             } else {
                 $result[$key] = $field;
             }
-        }//end foreach
+        }
         return $result;
     }
 
@@ -323,12 +324,6 @@ abstract class XmlJobs extends XArcadiaFlux
         return $isXml;
     }
 
-    /**
-     * Send Error Mail
-     *
-     * @param Throwable $e
-     * @return void
-     */
     protected function sendErrorParseEmailToServiceWeb(Throwable $e)
     {
         Mail::send('emails.exception', [
@@ -342,13 +337,6 @@ abstract class XmlJobs extends XArcadiaFlux
         });
     }
 
-    /**
-     * Send Mail Invalid XML
-     *
-     * @param string    $filename
-     * @param Throwable $e
-     * @return void
-     */
     protected function sendInvalidXmlEmail(string $filename, Throwable $e)
     {
         $message = $e->getPrevious()->getMessage();

app/Lib/ExceptionsHelper.php

@@ -1,190 +0,0 @@
-<?php
-
-namespace App\Lib;
-
-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;
-    }
-}

app/Lib/LDC/CartCalculator.php

@@ -7,22 +7,13 @@ use Gloudemans\Shoppingcart\Contracts\Calculator;
 
 class CartCalculator implements Calculator
 {
-    /**
-     * All purpose getter
-     *
-     * @param string   $attribute
-     * @param CartItem $cartItem
-     * @return float|void
-     * @phpcs:disable Generic.Metrics.CyclomaticComplexity.TooHigh
-     */
     public static function getAttribute(string $attribute, CartItem $cartItem)
     {
-        // @phpcs:enable
         $decimals = config('cart.format.decimals', 2);
 
         switch ($attribute) {
             case 'discount':
-                return round($cartItem->price * ($cartItem->getDiscountRate() / 100) * 100) / 100;
+                return round($cartItem->price * ($cartItem->getDiscountRate() / 100)*100)/100;
             case 'tax':
                 return round($cartItem->priceTarget * ($cartItem->taxRate / 100), $decimals);
             case 'priceTax':
@@ -36,15 +27,16 @@ class CartCalculator implements Calculator
             case 'priceTarget':
                 return round(($cartItem->priceTotal - $cartItem->discountTotal) / $cartItem->qty, $decimals);
             case 'taxTotal':
-                // Taxe pour un item multiplié par la quantité.
+                //taxe pour un item multiplié par la quantité
-                $unit_price = max($cartItem->price - $cartItem->discount, 0);
+                $unit_price = max($cartItem->price - $cartItem->discount,0);
-                $unit_tax   = round($unit_price * ($cartItem->taxRate / 100), $decimals);
+                $unit_tax = round($unit_price * ($cartItem->taxRate / 100), $decimals);
-                $taxTotal   = round($unit_tax * $cartItem->qty, $decimals);
+                $taxTotal = round($unit_tax * $cartItem->qty, $decimals);
+                //return round($cartItem->subtotal * ($cartItem->taxRate / 100), $decimals);
                 return $taxTotal;
             case 'total':
                 return round($cartItem->subtotal + $cartItem->taxTotal, $decimals);
             default:
                 return;
-        }//end switch
+        }
     }
 }

app/Mail/OrderCanceledConfirmMail.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use App\Models\Order;
-use Illuminate\Bus\Queueable;
-use Illuminate\Mail\Mailable;
-use Illuminate\Queue\SerializesModels;
-
-class OrderCanceledConfirmMail extends Mailable
-{
-    use Queueable;
-    use SerializesModels;
-
-    /**
-     * The Order
-     *
-     * @var \App\Models\Order
-     */
-    private $order;
-
-    /**
-     * Create a new message instance.
-     *
-     * @param \App\Models\Order $order
-     *
-     * @return void
-     */
-    public function __construct(Order $order)
-    {
-        $this->order = $order;
-    }
-
-    /**
-     * Build the message.
-     *
-     * @return $this
-     */
-    public function build()
-    {
-        $order = $this->order;
-
-        return $this->subject(
-            "Commande " . config('theme.site_name') . " n°" . $order->reference . " a été annulée."
-        )->view('mails.order-canceled-confirm', compact('order'));
-    }
-}

app/Mail/OrderConfirmAdminMail.php

@@ -3,31 +3,23 @@
 namespace App\Mail;
 
 use App\Models\Magasin;
-use App\Models\Order;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 
 class OrderConfirmAdminMail extends Mailable
 {
-    use Queueable;
+    use Queueable, SerializesModels;
-    use SerializesModels;
 
-    /**
-     * The Order
-     *
-     * @var \App\Models\Order
-     */
     private $order;
 
     /**
      * Create a new message instance.
      *
-     * @param \App\Models\Order $order
-     *
      * @return void
      */
-    public function __construct(Order $order)
+    public function __construct($order)
     {
         $this->order = $order;
     }
@@ -42,8 +34,6 @@ class OrderConfirmAdminMail extends Mailable
         $order   = $this->order;
         $magasin = Magasin::find($order->timeslot->magasin->id);
 
-        return $this->subject(
+        return $this->subject("Nouvelle Commande - " . config('theme.site_name'))->view('emails.order-confirm-admin', compact('order', 'magasin'));
-            "Nouvelle Commande - " . config('theme.site_name')
-        )->view('emails.order-confirm-admin', compact('order', 'magasin'));
     }
 }

app/Mail/OrderConfirmMail.php

@@ -3,31 +3,23 @@
 namespace App\Mail;
 
 use App\Models\Magasin;
-use App\Models\Order;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 
 class OrderConfirmMail extends Mailable
 {
-    use Queueable;
+    use Queueable, SerializesModels;
-    use SerializesModels;
 
-    /**
-     * The Order
-     *
-     * @var \App\Models\Order
-     */
     private $order;
 
     /**
      * Create a new message instance.
      *
-     * @param \App\Models\Order $order
-     *
      * @return void
      */
-    public function __construct(Order $order)
+    public function __construct($order)
     {
         $this->order = $order;
     }
@@ -42,8 +34,6 @@ class OrderConfirmMail extends Mailable
         $order   = $this->order;
         $magasin = Magasin::find($order->timeslot->magasin->id);
 
-        return $this->subject(
+        return $this->subject("Votre commande - " . config('theme.site_name'))->view('mails.order-confirm', compact('order', 'magasin'));
-            "Votre commande - " . config('theme.site_name')
-        )->view('mails.order-confirm', compact('order', 'magasin'));
     }
 }

app/Mail/OrderStatusMail.php

@@ -3,30 +3,23 @@
 namespace App\Mail;
 
 use App\Models\Magasin;
-use App\Models\Order;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 
 class OrderStatusMail extends Mailable
 {
-    use Queueable;
+    use Queueable, SerializesModels;
-    use SerializesModels;
 
-    /**
-     * The Order
-     *
-     * @var \App\Models\Order
-     */
     private $order;
 
     /**
      * Create a new message instance.
      *
-     * @param \App\Models\Order $order
      * @return void
      */
-    public function __construct(Order $order)
+    public function __construct($order)
     {
         $this->order = $order;
     }
@@ -38,11 +31,9 @@ class OrderStatusMail extends Mailable
      */
     public function build()
     {
-        $order   = $this->order;
+        $order = $this->order;
         $magasin = Magasin::find($order->timeslot->magasin->id);
 
-        return $this->subject(
+        return $this->subject("Votre commande - " . config('theme.site_name'))->view('mails.order-status', compact('order', 'magasin'));
-            "Votre commande - " . config('theme.site_name')
-        )->view('mails.order-status', compact('order', 'magasin'));
     }
 }

app/Mail/PasswordResetMail.php

@@ -2,6 +2,7 @@
 
 namespace App\Mail;
 
+use App\Models\Moments;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
@@ -9,23 +10,16 @@ use Illuminate\Queue\SerializesModels;
 
 class PasswordResetMail extends Mailable implements ShouldQueue
 {
-    use Queueable;
+    use Queueable, SerializesModels;
-    use SerializesModels;
 
-    /**
-     * Reset token
-     *
-     * @var string
-     */
     private $token;
 
     /**
      * Create a new message instance.
      *
-     * @param string $token
      * @return void
      */
-    public function __construct(string $token)
+    public function __construct($token)
     {
         $this->token = $token;
     }
@@ -38,8 +32,6 @@ class PasswordResetMail extends Mailable implements ShouldQueue
     public function build()
     {
         $token = $this->token;
-        return $this->subject(
+        return $this->subject("Réinitialiser votre accès - " . config('theme.site_name'))->view('mails.password-reset', compact('token'));
-            "Réinitialiser votre accès - " . config('theme.site_name')
-        )->view('mails.password-reset', compact('token'));
     }
 }

app/Mail/RegisterConfirmMail.php

@@ -2,7 +2,6 @@
 
 namespace App\Mail;
 
-use App\Models\Customers;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
@@ -10,34 +9,19 @@ use Illuminate\Queue\SerializesModels;
 
 class RegisterConfirmMail extends Mailable implements ShouldQueue
 {
-    use Queueable;
+    use Queueable, SerializesModels;
-    use SerializesModels;
 
-    /**
+    private $customer, $firstname;
-     * target Customer
-     *
-     * @var \App\Models\Customers
-     */
-    private $customer;
-
-    /**
-     * Customer's firstname
-     *
-     * @var string
-     */
-    private $firstname;
 
     /**
      * Create a new message instance.
      *
-     * @param \App\Models\Customers $customer
-     * @param string|null           $firstname
      * @return void
      */
-    public function __construct(Customers $customer, string $firstname = null)
+    public function __construct($customer, $firstname)
     {
         $this->firstname = $firstname;
-        $this->customer  = $customer;
+        $this->customer = $customer;
     }
 
     /**
@@ -47,7 +31,7 @@ class RegisterConfirmMail extends Mailable implements ShouldQueue
      */
     public function build()
     {
-        $customer  = $this->customer;
+        $customer = $this->customer;
         $firstname = $this->firstname;
         return $this->subject("Confirmation d'inscription " . config('theme.site_name'))
             ->view('mails.register-ok', compact('customer', 'firstname'));

app/Mail/SendContactMail.php

@@ -2,8 +2,8 @@
 
 namespace App\Mail;
 
-use App\Http\Requests\ContactFormRequest;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 
@@ -15,7 +15,6 @@ class SendContactMail extends Mailable
     /**
      * The form data.
      *
-     * @var \App\Http\Requests\ContactFormRequest
      */
     protected $data;
 
@@ -30,10 +29,9 @@ class SendContactMail extends Mailable
     /**
      * Create a new message instance.
      *
-     * @param \App\Http\Requests\ContactFormRequest $data
      * @return void
      */
-    public function __construct(ContactFormRequest $data)
+    public function __construct($data)
     {
         $this->data = $data;
     }

app/Models/CollecteException.php

@@ -10,11 +10,6 @@ class CollecteException extends Model
 {
     use HasFactory;
 
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array
-     */
     protected $fillable = ['date', 'comment', 'magasin_id'];
 
     /**
@@ -26,22 +21,11 @@ class CollecteException extends Model
         'date' => 'date',
     ];
 
-    /**
-     * Format a date
-     *
-     * @param DateTimeInterface $date
-     * @return string
-     */
     protected function serializeDate(DateTimeInterface $date)
     {
         return $date->format('Y-m-d');
     }
 
-    /**
-     * BelongsTo magasin relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
     public function magasin()
     {
         return $this->belongsTo(Magasin::class);

app/Models/Content.php

@@ -8,4 +8,5 @@ use Illuminate\Database\Eloquent\Model;
 class Content extends Model
 {
     use HasFactory;
+
 }

app/Models/Customers.php

@@ -27,11 +27,7 @@ class Customers extends Authenticatable
     protected $guard = 'customer';
 
 
-    /**
+    //possible additionnals
-     * hasOne salarie relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     */
     public function salarie()
     {
         return $this->hasOne(Salarie::class, 'customer_id');

app/Models/DiscountType.php

@@ -9,20 +9,9 @@ class DiscountType extends Model
 {
     use HasFactory;
 
-    /**
-     * Indicates if the model should be timestamped.
-     *
-     * @var boolean
-     */
     public $timestamps = false;
 
-    /**
+    public function promotions() {
-     * hasMany promotions relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function promotions()
-    {
         return $this->hasMany(Promotion::class, 'discount_type_id');
     }
 }

app/Models/Faq.php

@@ -9,10 +9,5 @@ class Faq extends Model
 {
     use HasFactory;
 
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array
-     */
     protected $fillable = ['question', 'answer'];
 }

app/Models/FoodProduct.php

@@ -18,23 +18,11 @@ class FoodProduct extends Model
         'product_id',
     ];
 
-    /**
+    public function product() {
-     * BelongsTo product relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function product()
-    {
         return $this->belongsTo(Product::class);
     }
 
-    /**
+    public function xmlInco() {
-     * hasOne product relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     */
-    public function xmlInco()
-    {
         return $this->hasOne(XmlInco::class, 'id', 'no_art');
     }
 }

app/Models/Magasin.php

@@ -9,44 +9,21 @@ class Magasin extends Model
 {
     use HasFactory;
 
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array
-     */
     protected $fillable = [
-        'name', 'email_contact', 'email_confirm', 'address', 'postcode', 'city', 'phone',
+        'name', 'address', 'postcode', 'city', 'phone',
         'latitude', 'longitude',
         'gmaps_placeid', 'gmaps_embed_href', 'gmaps_link_href',
     ];
 
-    /**
+    public function timeslotSettings() {
-     * hasMany timeslot settings relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function timeslotSettings()
-    {
         return $this->hasMany(TimeslotSetting::class);
     }
 
-    /**
+    public function collecteExceptions() {
-     * hasMany collecte exceptions relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function collecteExceptions()
-    {
         return $this->hasMany(CollecteException::class);
     }
 
-    /**
+    public function timeslots() {
-     * hasMany timeslots relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function timeslots()
-    {
         return $this->hasMany(Timeslot::class);
     }
 }

app/Models/OldSlug.php

@@ -9,23 +9,11 @@ class OldSlug extends Model
 {
     use HasFactory;
 
-    /**
+    public function product() {
-     * BelongsTo product relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function product()
-    {
         return $this->belongsTo('App\Model\Product', 'product_id');
     }
 
-    /**
+    public function range() {
-     * BelongsTo range relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function range()
-    {
         return $this->belongsTo('App\Model\Range', 'range_id');
     }
 }

app/Models/Order.php

@@ -10,66 +10,34 @@ class Order extends Model
     use HasFactory;
 
     /**
-     * BelongsToMany products relation
+     * use carefully
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
-    public function products()
+    public function products() {
-    {
         return $this->belongsToMany(Product::class, 'order_lines', 'order_id', 'product_id');
     }
 
-    /**
+    //Relations
-     * hasMany lines relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
     public function lines()
     {
         return $this->hasMany(OrderLine::class);
     }
 
-    /**
+    public function status() {
-     * BelongsTo order_status relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function status()
-    {
         return $this->belongsTo('App\Models\OrdersStatus', 'status_id');
     }
 
-    /**
+    public function customer() {
-     * BelongsTo customer relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function customer()
-    {
         return $this->belongsTo(Customers::class);
     }
 
-    /**
-     * hasOne timeslot relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     */
     public function timeslot()
     {
         return $this->hasOne(Timeslot::class);
     }
 
-    /**
+    //Formattages
-     * Custom Attribute
-     *
-     * @return string
-     */
     public function getFormattedTotalTtcAttribute()
     {
-        $this->attributes['formattedTotalTtc'] = sprintf(
+        return $this->attributes['formattedTotalTtc'] = sprintf('%s €', number_format($this->attributes['total'], 2, ',', ' '));
-            '%s €',
-            number_format($this->attributes['total'], 2, ',', ' ')
-        );
-        return $this->attributes['formattedTotalTtc'];
     }
 }

app/Models/OrderLine.php

@@ -9,37 +9,20 @@ class OrderLine extends Model
 {
     use HasFactory;
 
-    /**
+    //Relations
-     * BelongsTo order relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
     public function order()
     {
         return $this->belongsTo(Order::class);
     }
 
-    /**
-     * BelongsTo product relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
     public function product()
     {
         return $this->belongsTo(Product::class);
     }
 
-    /**
+    //Formattages
-     * Getter for formattedTotalTtc
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
     public function getFormattedTotalTtcAttribute()
     {
-        $this->attributes['formattedTotalTtc'] = sprintf(
+        return $this->attributes['formattedTotalTtc'] = sprintf('%s €', number_format($this->attributes['total_ttc'], 2, ',', ' '));
-            '%s €',
-            number_format($this->attributes['total_ttc'], 2, ',', ' ')
-        );
-        return $this->attributes['formattedTotalTtc'];
     }
 }

app/Models/OrdersStatus.php

@@ -9,27 +9,10 @@ class OrdersStatus extends Model
 {
     use HasFactory;
 
-    /**
-     * The table associated with the model
-     *
-     * @var string
-     */
     protected $table = "orders_status";
-
-    /**
-     * Indicates if the model should be timestamped.
-     *
-     * @var boolean
-     */
     public $timestamps = false;
 
-    /**
+    public function orders() {
-     * hasMany orders relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function orders()
-    {
         return $this->hasMany('App\Models\Order', 'status_id');
     }
 }

app/Models/PasswordReset.php

@@ -6,17 +6,6 @@ use Illuminate\Database\Eloquent\Model;
 
 class PasswordReset extends Model
 {
-    /**
-     * The table associated with the model
-     *
-     * @var string
-     */
     protected $table = "password_resets";
-
-    /**
-     * Indicates if the model should be timestamped.
-     *
-     * @var boolean
-     */
     public $timestamps = false;
 }

app/Models/Product.php

@@ -13,6 +13,9 @@ use Gloudemans\Shoppingcart\Contracts\Buyable;
 use Gloudemans\Shoppingcart\CanBeBought;
 use Illuminate\Support\Facades\Auth;
 
+/**
+ * @todo : unité de vente/unité de poids devrait être des énums (via table liée ou package enum)
+ */
 class Product extends Model implements Buyable
 {
     use HasFactory;
@@ -33,67 +36,35 @@ class Product extends Model implements Buyable
      * Store in protected variables instead of attributes
      * Because those are not set in attributes, Laravel will not try to save it to database
      */
-
-    /**
-     * Base Price
-     *
-     * @var float
-     */
     protected $priceHt;
 
-    /**
-     * Base Price after discount
-     *
-     * @var float
-     */
     protected $discountedPriceHt;
 
-    /**
-     * Price VAT included
-     *
-     * @var float
-     */
     protected $priceTtc;
 
-    /**
-     * Price after discount VAT included
-     *
-     * @var float
-     */
     protected $discountedPriceTtc;
 
-    /**
-     * Discount amount
-     *
-     * @var float
-     */
     protected $discountAmount;
 
-    /**
-     * Dsicount rate
-     *
-     * @var float
-     */
     protected $discountRate;
 
     /**
-     * Bootstrap the model and its traits.
+     * init prices on boot
-     *
-     * @return void
      */
     protected static function boot()
     {
         parent::boot();
 
-        // On data retrived from DB.
+        //on data retrived from DB
         static::retrieved(function ($model) {
-            $model->priceHt            = $model->getPriceHtAttribute();
+            $model->priceHt = $model->getPriceHtAttribute();
-            $model->priceTtc           = $model->getPriceTtcAttribute();
+            $model->priceTtc = $model->getPriceTtcAttribute();
-            $model->discountAmount     = $model->getDiscountAmountAttribute();
+            $model->discountAmount = $model->getDiscountAmountAttribute();
-            $model->discountRate       = $model->getDiscountRateAttribute();
+            $model->discountRate = $model->getDiscountRateAttribute();
-            $model->discountedPriceHt  = $model->getDiscountedPriceHtAttribute();
+            $model->discountedPriceHt = $model->getDiscountedPriceHtAttribute();
             $model->discountedPriceTtc = $model->getDiscountedPriceTtcAttribute();
         });
+
     }
 
 
@@ -105,13 +76,10 @@ class Product extends Model implements Buyable
      * net discounted proice (prix avec taxe et remises)
      */
 
-    /**
+    //Utility to bring prices as a pseudo relation
-     * Utility to bring prices as a pseudo relation
-     *
-     * @return array
-     */
     public function getCalcPrices()
     {
+        //$prices = new Collection();
         $prices = array(
             'priceHt' => $this->priceHt,
             'discountAmount' => $this->discountAmount,
@@ -120,16 +88,15 @@ class Product extends Model implements Buyable
             'priceTtc' => $this->priceTtc,
             'discountedPriceTtc' => $this->discountedPriceTtc,
         );
+        //$prices->add($cartextendedItem);
         return $prices;
     }
 
+    //gross price
     /**
-     * Mutator method to set priceHt's value gross price
+     * Mutator method to set priceHt's value
-     *
-     * @param float $value
-     * @return void
      */
-    public function setPriceHtAttribute(float $value)
+    public function setPriceHtAttribute($value)
     {
         $this->priceHt = $value;
     }
@@ -139,135 +106,93 @@ class Product extends Model implements Buyable
      * Accessor method for priceHt
      *
      * @author Olivier Legat <olivier.legat@ldc.fr>
-     *
-     * @return float
      */
     public function getPriceHtAttribute()
     {
-        if (isset($this->priceHt)) {
+        if(isset($this->priceHt)) {
             return $this->priceHt;
         } else {
-            /** Tenir compte de l'unité de facturation et de l'unité de vente (qui doit être stricte)
+            //tenir compte de l'unité de facturation et de l'unité de vente (qui doit être stricte)
-             * si facturation KG et vente piece
+            //si facturation KG et vente piece
-             * prendre le poids, convertir en KG => pre-requis l'unité de poids doit être un enum
+            //  prendre le poids, convertir en KG => pre-requis l'unité de poids doit être un enum
-             * multiplier le $this->attributes['price'] par les KG
+            //  multiplier le $this->attributes['price'] par les KG
-             * sinon
+            //sinon
-             * value => value
+            //  value => value
-             */
             if (config('bosettings.sell_unit_management') == "strict") {
-                $calculate = ($this->invoicing_unit == InvoicingUnit::kgm()->value
+                $calculate = ($this->invoicing_unit == InvoicingUnit::kgm()->value && $this->sell_unit == SellUnit::pce()->value);
-                    && $this->sell_unit == SellUnit::pce()->value);
             } else {
                 $calculate = false;
             }
 
             if ($calculate) {
-                // Weight converter.
+                //weight converter
-                $weighted_price = $this->attributes['price']
+                $weighted_price = $this->attributes['price'] * ($this->weight * WeightUnit::convert()[$this->weight_unit]);
-                    * ($this->weight * WeightUnit::convert()[$this->weight_unit]);
+                return $this->priceHt = round($weighted_price * 1000) / 1000;
-                $this->priceHt  = round($weighted_price * 1000) / 1000;
-                return $this->priceHt;
             } else {
-                // No calculations, alias of db property.
+                //no calculations, alias of db property
-                $this->priceHt = $this->attributes['price'];
+                return $this->priceHt = $this->attributes['price'];
-                return $this->priceHt;
             }
-        }//end if
+        }
     }
 
-    /**
+    //discounted price
-     * setter for dicounted price
+    public function setDiscountedPriceHtAttribute($value)
-     *
-     * @param float $value
-     * @return void
-     */
-    public function setDiscountedPriceHtAttribute(float $value)
     {
         $this->discountedPriceHt = $value;
     }
 
-    /**
-     * getter for discounted price
-     *
-     * @return float
-     */
     public function getDiscountedPriceHtAttribute()
     {
         if (isset($this->discountedPriceHt)) {
             return $this->discountedPriceHt;
         } else {
-            $discountedPriceHt         = $this->priceHt - $this->discountAmount;
+            $discountedPriceHt = $this->priceHt - $this->discountAmount;
             $roundingdiscountedPriceHt = round($discountedPriceHt * 1000) / 1000;
-            $this->discountedPriceHt   = $roundingdiscountedPriceHt;
+            return $this->discountedPriceHt = $roundingdiscountedPriceHt;
-            return $this->discountedPriceHt;
         }
     }
 
-    /**
+    //net price
-     * setter for net price
+    public function setPriceTtcAttribute($value)
-     *
-     * @param float $value
-     * @return void
-     */
-    public function setPriceTtcAttribute(float $value)
     {
         $this->priceTtc = $value;
     }
 
-    /**
-     * getter for net price
-     *
-     * @return float
-     */
     public function getPriceTtcAttribute()
     {
         if (isset($this->priceTtc)) {
             return $this->priceTtc;
         } else {
             $priceTtc = $this->priceHt * ( 1 + ( $this->tax->rate / 100));
-            /**
+            //on travaille avec des centimes puis on redivise par 100 pour avoir des unités monetaires
-             * On travaille avec des centimes puis on redivise par 100 pour avoir des unités monetaires
+            //on augmente la précision à 3 digits, l'affichage formate les prix sur 2 décimales
-             * on augmente la précision à 3 digits, l'affichage formate les prix sur 2 décimales
-             */
             $roundingPriceTtc = round($priceTtc * 1000) / 1000;
-            $this->priceTtc   = $roundingPriceTtc;
+            return $this->priceTtc = $roundingPriceTtc;
-            return $this->priceTtc;
         }
     }
 
-    /**
+    //net discounted price
-     * setter for net dscounted price
+    public function setDiscountedPriceTtcAttribute($value)
-     *
-     * @param float $value
-     * @return void
-     */
-    public function setDiscountedPriceTtcAttribute(float $value)
     {
         $this->discountedPriceTtc = $value;
     }
 
-    /**
-     * getter for net dscounted price
-     *
-     * @return float
-     */
     public function getDiscountedPriceTtcAttribute()
     {
         if (isset($this->discountedPriceTtc)) {
             $showPrice = $this->discountedPriceTtc;
         } else {
             $discountedPriceTtc = $this->discountedPriceHt * ( 1 + ( $this->tax->rate / 100));
-            // On travaille avec des centimes puis on redivise par 100 pour avoir des unités monetaires.
+            //on travaille avec des centimes puis on redivise par 100 pour avoir des unités monetaires
             $roundingDiscountedPriceTTC = round($discountedPriceTtc * 1000) / 1000;
-            $this->discountedPriceTtc   = $roundingDiscountedPriceTTC;
+            $showPrice = $this->discountedPriceTtc = $roundingDiscountedPriceTTC;
-            $showPrice                  = $this->discountedPriceTtc;
         }
-        // Prix transmis en fonction du setting show_prices.
+        //prix transmis en fonction du setting show_prices
         if (config('bosettings.show_prices_authenticated') == "authenticated") {
             {
-            if (Auth::guard('customer')->check()) {
+                if (Auth::guard('customer')->check()) {
-                return $showPrice;
+                    return $showPrice;
-            }
+                }
             }
         }
         if (config('bosettings.show_prices_guest') == "guest") {
@@ -277,25 +202,15 @@ class Product extends Model implements Buyable
     }
 
     /**
-     * Discount calculators
+     * Discount calc
      */
 
-    /**
+    //montant de remise
-     * set discoutn amount
+    public function setDiscountAmountAttribute($value)
-     *
-     * @param float $value
-     * @return void
-     */
-    public function setDiscountAmountAttribute(float $value)
     {
         $this->discountAmount = $value;
     }
 
-    /**
-     * Getter for discount amount
-     *
-     * @return float
-     */
     public function getDiscountAmountAttribute()
     {
         if (isset($this->discountAmount)) {
@@ -307,34 +222,23 @@ class Product extends Model implements Buyable
                 if ($promo_type == 1) {
                     $discountAmount = $applicablePromotion->discount_value;
                 } else {
-                    // On augmente la précision à 3 digits, l'affichage formate les prix sur 2 décimales.
+                    //on augmente la précision à 3 digits, l'affichage formate les prix sur 2 décimales
                     $discountAmount = $this->priceHt * ($applicablePromotion->discount_value / 100);
                     $discountAmount = round($discountAmount * 1000) / 1000;
                 }
             } else {
                 $discountAmount = 0;
             }
-            $this->discountAmount = $discountAmount;
+            return $this->discountAmount = $discountAmount;
-            return $this->discountAmount;
         }
     }
 
-    /**
+    //taux de remise
-     * set discount rate
+    public function setDiscountRateAttribute($value)
-     *
-     * @param float $value
-     * @return void
-     */
-    public function setDiscountRateAttribute(float $value)
     {
         $this->discountRate = $value;
     }
 
-    /**
-     * get discount rate
-     *
-     * @return float
-     */
     public function getDiscountRateAttribute()
     {
         if (isset($this->discountRate)) {
@@ -344,7 +248,7 @@ class Product extends Model implements Buyable
             if (null !== $applicablePromotion) {
                 $promo_type = $applicablePromotion->discount_type_id;
                 if ($promo_type == 1) {
-                    // On veut un pourcentage.
+                    //on veut un pourcentage
                     $discountRate = ($applicablePromotion->discount_value / $this->priceHt) * 100;
                 } else {
                     $discountRate = $applicablePromotion->discount_value;
@@ -352,113 +256,61 @@ class Product extends Model implements Buyable
             } else {
                 $discountRate = 0;
             }
-            $this->discountRate = $discountRate;
+            return $this->discountRate = $discountRate;
-            return $this->discountRate;
         }
     }
 
 
-    /**
+    // //Buyable interface
-     * buyablePrice attribute alias
-     *
-     * @param mixed $options
-     * @return float
-     *
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass
-     */
     public function getBuyablePrice($options = null)
     {
-        // @phpcs:enable
         return $this->priceHt;
     }
 
-    /**
+    //Relations
-     * BelongsTo range relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
     public function range()
     {
         return $this->belongsTo('App\Models\Range', 'range_id');
     }
 
-    /**
+    public function old_slugs()
-     * hasMany old_slugs relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function oldSlugs()
     {
         return $this->hasMany('App\Model\OldSlug', 'product_id');
     }
 
-    /**
-     * hasMany stats relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
     public function stats()
     {
         return $this->hasMany('App\Models\Stat', 'product_id');
     }
 
-    /**
-     * belongsToMany orders relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
-     */
     public function orders()
     {
         return $this->belongsToMany('App\Models\Order', 'orders_products', 'product_id', 'order_id')
                     ->withPivot('quantity');
     }
 
-    /**
+    //relationship to additionnal product info
-     * Pseudo relationship to additionnal product info
+    public function additionnalProductInfo($productType)
-     *
-     * @param string $productType
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     */
-    public function additionnalProductInfo(string $productType)
     {
         return $this->$productType;
     }
 
-    /**
+    //possible additionnals
-     * hasOne foodProduct relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     */
     public function foodProduct()
     {
         return $this->hasOne(FoodProduct::class, 'product_id');
     }
 
-    /**
-     * hasOne anifoodProduct relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     */
     public function anifoodProduct()
     {
         return $this->hasOne(AnifoodProduct::class, 'product_id');
     }
 
-    /**
-     * hasOne toolProduct relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     */
     public function toolProduct()
     {
         return $this->hasOne(ToolProduct::class, 'product_id');
     }
 
-    /**
-     * hasOne garmentProduct relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     */
     public function garmentProduct()
     {
         return $this->hasOne(GarmentProduct::class, 'product_id');
@@ -466,21 +318,13 @@ class Product extends Model implements Buyable
 
 
 
-    /**
+    //relationship to associated products
-     * belongsToMany products relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
-     */
     public function products()
     {
         return $this->belongsToMany(Product::class, 'products_products', 'product_id', 'associated_id');
     }
 
-    /**
+    //offres speciales
-     * belongsToMany promotions relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
-     */
     public function promotions()
     {
         $now = Carbon::now();
@@ -489,21 +333,13 @@ class Product extends Model implements Buyable
                     ->whereDate('date_end', '>=', $now);
     }
 
-    /**
+    //taxe
-     * belongsTo tax relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
     public function tax()
     {
         return $this->belongsTo(TaxRate::class, 'tax_rate_id');
     }
 
-    /**
+    //tags
-     * belongsToMany tags relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
-     */
     public function tags()
     {
         return $this->belongsToMany(Tag::class);

app/Models/ProductType.php

@@ -18,13 +18,7 @@ class ProductType extends Model
         'product_id',
     ];
 
-    /**
+    public function product() {
-     * BelongsTo product relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function product()
-    {
         return $this->belongsTo(Product::class);
     }
 }

app/Models/ProductsProducts.php

@@ -8,6 +8,5 @@ use Illuminate\Database\Eloquent\Model;
 class ProductsProducts extends Model
 {
     use HasFactory;
-
+    //useless model it seems
-    // Useless model it seems.
 }

app/Models/Promotion.php

@@ -19,21 +19,11 @@ class Promotion extends Model
         'date_end' => 'datetime',
     ];
 
-    /**
-     * BelongsToMany products relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
-     */
     public function products()
     {
         return $this->belongsToMany(Product::class);
     }
 
-    /**
-     * BelongsTo discountType relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
     public function discountType()
     {
         return $this->belongsTo(DiscountType::class, 'discount_type_id');

app/Models/Range.php

@@ -9,23 +9,11 @@ class Range extends Model
 {
     use HasFactory;
 
-    /**
+    public function products() {
-     * hasMany customer relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function products()
-    {
         return $this->hasMany('App\Models\Product', 'range_id');
     }
 
-    /**
+    public function old_slugs() {
-     * hasMany old_slugs relation
+        return $this->hasMany('App\Model\OldSlug', 'ranges');
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function oldSlugs()
-    {
-        return $this->hasMany('App\Model\OldSlug', 'range_id');
     }
 }

app/Models/Salarie.php

@@ -22,13 +22,8 @@ class Salarie extends Model
         'code'
     ];
 
-    /**
+
-     * BelongsTo customer relation
+    public function customer() {
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function customer()
-    {
         return $this->belongsTo(Customers::class);
     }
 }

app/Models/Slide.php

@@ -19,13 +19,7 @@ class Slide extends Model
         'date_end' => 'datetime',
     ];
 
-    /**
+    public function slider() {
-     * BelongsTo slider relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function slider()
-    {
         return $this->belongsTo(Slider::class);
     }
 }

app/Models/Slider.php

@@ -10,21 +10,11 @@ class Slider extends Model
 {
     use HasFactory;
 
-    /**
-     * hasMany slides relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
     public function slides()
     {
         return $this->hasMany(Slide::class, 'slider_id')->orderBy('order', 'ASC');
     }
 
-    /**
-     * filtered slides relation by showable date
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
     public function showableSlides()
     {
         $now = Carbon::now();
@@ -36,5 +26,6 @@ class Slider extends Model
                 $q->whereDate('date_end', '>=', $now)
                     ->orWhereNull('date_end');
             });
+
     }
 }

app/Models/Stat.php

@@ -9,13 +9,7 @@ class Stat extends Model
 {
     use HasFactory;
 
-    /**
+    public function product() {
-     * BelongsTo product relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function product()
-    {
         return $this->belongsTo('App\Models\Product', 'product_id');
     }
 }

app/Models/Tag.php

@@ -9,18 +9,8 @@ class Tag extends Model
 {
     use HasFactory;
 
-    /**
-     * Indicates if the model should be timestamped.
-     *
-     * @var boolean
-     */
     public $timestamps = false;
 
-    /**
-     * belongsToMany products relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
-     */
     public function products()
     {
         return $this->belongsToMany(Product::class);

app/Models/TaxRate.php

@@ -9,20 +9,9 @@ class TaxRate extends Model
 {
     use HasFactory;
 
-    /**
-     * Indicates if the model should be timestamped.
-     *
-     * @var boolean
-     */
     public $timestamps = false;
 
-    /**
+    public function products() {
-     * hasMany products relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function products()
-    {
         return $this->hasMany(Product::class, 'tax_rate_id');
     }
 }

app/Models/Timeslot.php

@@ -9,30 +9,15 @@ class Timeslot extends Model
 {
     use HasFactory;
 
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array
-     */
     protected $fillable = [
         'order_id', 'magasin_id'
     ];
 
-    /**
-     * BelongsTo order relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
     public function order()
     {
         return $this->belongsTo(Order::class);
     }
 
-    /**
-     * BelongsTo magasin relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
     public function magasin()
     {
         return $this->belongsTo(Magasin::class);

app/Models/TimeslotSetting.php

@@ -9,11 +9,6 @@ class TimeslotSetting extends Model
 {
     use HasFactory;
 
-    /**
-     * BelongsTo magasin relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
     public function magasin()
     {
         return $this->belongsTo(Magasin::class);

app/Models/User.php

@@ -2,14 +2,14 @@
 
 namespace App\Models;
 
+use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 
 class User extends Authenticatable
 {
-    use HasFactory;
+    use HasFactory, Notifiable;
-    use Notifiable;
 
     /**
      * The attributes that are mass assignable.
@@ -44,13 +44,7 @@ class User extends Authenticatable
         'email_verified_at' => 'datetime',
     ];
 
-    /**
+    public function orders() {
-     * hasMany order relation
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function orders()
-    {
         return $this->hasMany('App\Models\Order', 'user_id');
     }
 }

app/Models/XmlInco.php

@@ -6,17 +6,13 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Contracts\Filesystem\Filesystem;
+use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Collection;
 
 class XmlInco extends Model
 {
     use HasFactory;
 
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array
-     */
     protected $fillable = [
         'id',
         'no_art',
@@ -37,11 +33,6 @@ class XmlInco extends Model
         'picture',
     ];
 
-    /**
-     * The attributes that should be cast to native types.
-     *
-     * @var array
-     */
     protected $casts = [
         'picture' => 'array',
         'nutritional_values' => 'array',
@@ -54,11 +45,6 @@ class XmlInco extends Model
      */
     protected $disk = 'inco';
 
-    /**
-     * Storage path
-     *
-     * @var string
-     */
     protected $imagesPath = 'images';
 
     /**
@@ -72,13 +58,10 @@ class XmlInco extends Model
 
     /**
      * retrieve a collection of medias
-     *
-     * @return Collection
      */
-    public function getMediasAttribute()
+    public function getMediasAttribute() {
-    {
         /** @var Filesystem */
-        $disk  = $this->getDisk();
+        $disk = $this->getDisk();
         $files = $disk->files($this->imagesPath);
 
         $collFiles = new Collection();
@@ -91,7 +74,7 @@ class XmlInco extends Model
             if (!in_array($pi, array($this->id))) {
                 continue;
             }
-            $image   = base64_encode($disk->get($file));
+            $image = base64_encode($disk->get($file));
             $element = array(
                 "filename" => $pi,
                 "imgdata" => $image
@@ -111,183 +94,143 @@ class XmlInco extends Model
         return Storage::disk($this->disk);
     }
 
-    /**
-     * getter
-     *
-     * @return string
-     */
     public function getNiceStringAttribute()
     {
         return sprintf('%s - %s', $this->id, $this->descriptif);
     }
 
-    /**
-     * update local info
-     *
-     * @return void
-     */
     public function updateLocalProductInfo()
     {
         $foodProduct = FoodProduct::where('no_art', $this->id)->first();
 
         if (!empty($foodProduct)) {
-            /** Info produits à suggerer lors de l'édition
+            //info produits à suggerer lors de l'édition
-             * this->descriptif (doit aller dans la table products)
+            // this->descriptif (doit aller dans la table products)
-             * $table->text('preparation')->nullable(); => $this->conseil_prepa
+            // $table->text('preparation')->nullable(); => $this->conseil_prepa
-             * $table->text('selling_argument')->nullable(); => $this->arg_vente
+            // $table->text('selling_argument')->nullable(); => $this->arg_vente
-             * infos produit maj automatique
+
-             */
+            //infos produit maj automatique
             $foodProduct->ingredients = $this->lst_ing;
             $foodProduct->allergens   = $this->lib_allergene;
-            /** Les types de correspondent pas
+            //$foodProduct->servings    = $this->nb_portion; // problem les types de correspondent pas numeric = string (exemple this->nb_portion = '1/2')
-             * numeric ($foodProduct->servings) = string (exemple this->nb_portion = '1/2').
+
-             */
             $nutri_values = $this->nutritional_values;
             if (!empty($nutri_values)) {
-                // Maj des info nutri locales.
+                //maj des info nutri locales
-                // Pour la ref.
+                //pour la ref
                 $foodProduct->nv_ref_weight_g = $nutri_values["taille_ref"];
-                // Energie Kj.
+                $foodProduct->nv_kj           = $nutri_values["val_energ_kj_r"]; //Energie Kj
-                $foodProduct->nv_kj = $nutri_values["val_energ_kj_r"];
+                $foodProduct->nv_kcal         = $nutri_values["val_energ_kcal_r"]; //Energie Kcal
-                // Energie Kcal.
+                $foodProduct->nv_fat_g        = $nutri_values["mat_grass_r"]; //graisses
-                $foodProduct->nv_kcal = $nutri_values["val_energ_kcal_r"];
+                $foodProduct->nv_sat_fat_g    = $nutri_values["ags_r"]; //dont acides gras saturés
-                // Graisses.
+                $foodProduct->nv_carb_g       = $nutri_values["glucides_r"]; //Glucides
-                $foodProduct->nv_fat_g = $nutri_values["mat_grass_r"];
+                $foodProduct->nv_sugar_g      = $nutri_values["sucre_r"]; //dont sucres
-                // Dont acides gras saturés.
+                $foodProduct->nv_fiber_g      = $nutri_values["fib_alim_r"]; //fibres alimentaires
-                $foodProduct->nv_sat_fat_g = $nutri_values["ags_r"];
+                $foodProduct->nv_protein_g    = $nutri_values["proteine_r"]; //protéines
-                // Glucides.
+                $foodProduct->nv_salt_g       = $nutri_values["sel_r"]; //sel
-                $foodProduct->nv_carb_g = $nutri_values["glucides_r"];
-                // Dont sucres.
-                $foodProduct->nv_sugar_g = $nutri_values["sucre_r"];
-                // Fibres alimentaires.
-                $foodProduct->nv_fiber_g = $nutri_values["fib_alim_r"];
-                // Protéines.
-                $foodProduct->nv_protein_g = $nutri_values["proteine_r"];
-                // Sel.
-                $foodProduct->nv_salt_g = $nutri_values["sel_r"];
 
-                /** Autres valeurs dispos
+                // $foodProduct-> = $nutri_values["sodium_r"];
-                 * $nutri_values["sodium_r"];
+                // $foodProduct-> = $nutri_values["ener_e14_r"];
-                 * $nutri_values["ener_e14_r"];
+                // $foodProduct-> = $nutri_values["fruits_r"];
-                 * $nutri_values["fruits_r"];
+                // $foodProduct-> = $nutri_values["fruits_coque_sech_r"];
-                 * $nutri_values["fruits_coque_sech_r"];
+                // $foodProduct-> = $nutri_values["ener_kjo_r"];
-                 * $nutri_values["ener_kjo_r"];
+                // $foodProduct-> = $nutri_values["fatsat_r"];
-                 * $nutri_values["fatsat_r"];
+                // $foodProduct-> = $nutri_values["choval_r"];
-                 * $nutri_values["choval_r"];
+                // $foodProduct-> = $nutri_values["sugar_r"];
-                 * $nutri_values["sugar_r"];
+                // $foodProduct-> = $nutri_values["fibtg_r"];
-                 * $nutri_values["fibtg_r"];
+                // $foodProduct-> = $nutri_values["pro_r"];
-                 * $nutri_values["pro_r"];
+                // $foodProduct-> = $nutri_values["salteq_r"];
-                 * $nutri_values["salteq_r"];
-                 */
-                // Valeurs nutritionnelles par portion.
-                // Taille portion en grammes.
-                $foodProduct->nv_serving_size_g = $nutri_values["taille_port"];
-                // Energie Kj.
-                $foodProduct->nv_serving_kj = $nutri_values["val_energ_kj_p"];
-                // Energie Kcal.
-                $foodProduct->nv_serving_kcal = $nutri_values["val_energ_kcal_p"];
-                // Graisses.
-                $foodProduct->nv_serving_fat_g = $nutri_values["mat_grass_p"];
-                // Dont acides gras saturés.
-                $foodProduct->nv_serving_sat_fat_g = $nutri_values["ags_p"];
-                // Glucides.
-                $foodProduct->nv_serving_carb_g = $nutri_values["glucides_p"];
-                // Dont sucres.
-                $foodProduct->nv_serving_sugar_g = $nutri_values["sucre_p"];
-                // Fibres alimentaires.
-                $foodProduct->nv_serving_fiber_g = $nutri_values["fib_alim_p"];
-                // Protéines.
-                $foodProduct->nv_serving_protein_g = $nutri_values["proteine_p"];
-                // Sel.
-                $foodProduct->nv_serving_salt_g = $nutri_values["sel_p"];
 
-                /**
-                 * autres valeurs disponibles
-                 * $nutri_values["sodium_p"];
-                 * $nutri_values["fruits_p"];
-                 */
 
-                // Apports journaliers.
+                //valeurs nutritionnelles par portion
-                // Energie % recommandé.
+                $foodProduct->nv_serving_size_g    = $nutri_values["taille_port"]; //taille portion en grammes
-                $foodProduct->nv_daily_energy = $nutri_values["pourcent_apport_ref_kjo_r"];
+                $foodProduct->nv_serving_kj        = $nutri_values["val_energ_kj_p"]; //Energie Kj
-                // Graisses.
+                $foodProduct->nv_serving_kcal      = $nutri_values["val_energ_kcal_p"]; //Energie Kcal
-                $foodProduct->nv_daily_fat = $nutri_values["pourcent_apport_ref_fat_r"];
+                $foodProduct->nv_serving_fat_g     = $nutri_values["mat_grass_p"]; //graisses
-                // Dont acides gras saturés.
+                $foodProduct->nv_serving_sat_fat_g = $nutri_values["ags_p"]; //dont acides gras saturés
-                $foodProduct->nv_daily_sat_fat = $nutri_values["pourcent_apport_ref_fatsat_r"];
+                $foodProduct->nv_serving_carb_g    = $nutri_values["glucides_p"]; //Glucides
-                // Glucides.
+                $foodProduct->nv_serving_sugar_g   = $nutri_values["sucre_p"]; //dont sucres
-                $foodProduct->nv_daily_carb = $nutri_values["pourcent_apport_ref_choval_r"];
+                $foodProduct->nv_serving_fiber_g   = $nutri_values["fib_alim_p"]; //fibres alimentaires
-                // Dont sucres.
+                $foodProduct->nv_serving_protein_g = $nutri_values["proteine_p"]; //protéines
-                $foodProduct->nv_daily_sugar = $nutri_values["pourcent_apport_ref_sugar_r"];
+                $foodProduct->nv_serving_salt_g    = $nutri_values["sel_p"]; //sel
-                // Fibres alimentaires.
-                $foodProduct->nv_daily_fiber = $nutri_values["pourcent_apport_ref_fibtg_r"];
-                // Protéines.
-                $foodProduct->nv_daily_protein = $nutri_values["pourcent_apport_ref_pro_r"];
-                // Sel.
-                $foodProduct->nv_daily_salt = $nutri_values["pourcent_apport_ref_salteq_r"];
 
-                // Autre valeur dispo $nutri_values["pourcent_apport_ref_e14_r"] .
+                // $foodProduct-> = $nutri_values["sodium_p"];
-                // Nutriscore.
+                // $foodProduct-> = $nutri_values["fruits_p"];
+
+
+                //apports journaliers
+                $foodProduct->nv_daily_energy  = $nutri_values["pourcent_apport_ref_kjo_r"]; //Energie % recommandé
+                $foodProduct->nv_daily_fat     = $nutri_values["pourcent_apport_ref_fat_r"]; //graisses
+                $foodProduct->nv_daily_sat_fat = $nutri_values["pourcent_apport_ref_fatsat_r"]; //dont acides gras saturés
+                $foodProduct->nv_daily_carb    = $nutri_values["pourcent_apport_ref_choval_r"]; //Glucides
+                $foodProduct->nv_daily_sugar   = $nutri_values["pourcent_apport_ref_sugar_r"]; //dont sucres
+                $foodProduct->nv_daily_fiber   = $nutri_values["pourcent_apport_ref_fibtg_r"]; //fibres alimentaires
+                $foodProduct->nv_daily_protein = $nutri_values["pourcent_apport_ref_pro_r"]; //protéines
+                $foodProduct->nv_daily_salt    = $nutri_values["pourcent_apport_ref_salteq_r"]; //sel
+
+                //$foodProduct-> = $nutri_values["pourcent_apport_ref_e14_r"];
+
+                //nutriscore
                 $foodProduct->nutriscore = $nutri_values["classement"];
 
-                /**
+
-                 * Infos n'ayant pas de mapping
+                //Infos n'ayant pas de mapping
-                 *
+                // $foodProduct-> = $nutri_values["val_energ_kj_nut"];
-                 * $nutri_values["val_energ_kj_nut"];
+                // $foodProduct-> = $nutri_values["val_energ_kcal_nut"];
-                 * $nutri_values["val_energ_kcal_nut"];
+                // $foodProduct-> = $nutri_values["mat_grass_nut"];
-                 * $nutri_values["mat_grass_nut"];
+                // $foodProduct-> = $nutri_values["ags_nut"];
-                 * $nutri_values["ags_nut"];
+                // $foodProduct-> = $nutri_values["glucides_nut"];
-                 * $nutri_values["glucides_nut"];
+                // $foodProduct-> = $nutri_values["sucre_nut"];
-                 * $nutri_values["sucre_nut"];
+                // $foodProduct-> = $nutri_values["sucre_r"];
-                 * $nutri_values["sucre_r"];
+                // $foodProduct-> = $nutri_values["fib_alim_nut"];
-                 * $nutri_values["fib_alim_nut"];
+                // $foodProduct-> = $nutri_values["proteine_nut"];
-                 * $nutri_values["proteine_nut"];
+                // $foodProduct-> = $nutri_values["sel_nut"];
-                 * $nutri_values["sel_nut"];
+                // $foodProduct-> = $nutri_values["apport_ref"];
-                 * $nutri_values["apport_ref"];
+                // $foodProduct-> = $nutri_values["fruits_coque_sech_p"];
-                 * $nutri_values["fruits_coque_sech_p"];
+                // $foodProduct-> = $nutri_values["ener_e14_p"];
-                 * $nutri_values["ener_e14_p"];
+                // $foodProduct-> = $nutri_values["pourcent_apport_ref_e14_p"];
-                 * $nutri_values["pourcent_apport_ref_e14_p"];
+                // $foodProduct-> = $nutri_values["ener_kjo_p"];
-                 * $nutri_values["ener_kjo_p"];
+                // $foodProduct-> = $nutri_values["pourcent_apport_ref_kjo_p"];
-                 * $nutri_values["pourcent_apport_ref_kjo_p"];
+                // $foodProduct-> = $nutri_values["fat_p"];
-                 * $nutri_values["fat_p"];
+                // $foodProduct-> = $nutri_values["pourcent_apport_ref_fat_p"];
-                 * $nutri_values["pourcent_apport_ref_fat_p"];
+                // $foodProduct-> = $nutri_values["fatsat_p"];
-                 * $nutri_values["fatsat_p"];
+                // $foodProduct-> = $nutri_values["pourcent_apport_ref_fatsat_p"];
-                 * $nutri_values["pourcent_apport_ref_fatsat_p"];
+                // $foodProduct-> = $nutri_values["choval_p"];
-                 * $nutri_values["choval_p"];
+                // $foodProduct-> = $nutri_values["pourcent_apport_ref_choval_p"];
-                 * $nutri_values["pourcent_apport_ref_choval_p"];
+                // $foodProduct-> = $nutri_values["sugar_p"];
-                 * $nutri_values["sugar_p"];
+                // $foodProduct-> = $nutri_values["pourcent_apport_ref_sugar_p"];
-                 * $nutri_values["pourcent_apport_ref_sugar_p"];
+                // $foodProduct-> = $nutri_values["fibtg_p"];
-                 * $nutri_values["fibtg_p"];
+                // $foodProduct-> = $nutri_values["pourcent_apport_ref_fibtg_p"];
-                 * $nutri_values["pourcent_apport_ref_fibtg_p"];
+                // $foodProduct-> = $nutri_values["pro_p"];
-                 * $nutri_values["pro_p"];
+                // $foodProduct-> = $nutri_values["pourcent_apport_ref_pro_p"];
-                 * $nutri_values["pourcent_apport_ref_pro_p"];
+                // $foodProduct-> = $nutri_values["salteq_p"];
-                 * $nutri_values["salteq_p"];
+                // $foodProduct-> = $nutri_values["pourcent_apport_ref_salteq_p"];
-                 * $nutri_values["pourcent_apport_ref_salteq_p"];
+                // $foodProduct-> = $nutri_values["apport_port"];
-                 * $nutri_values["apport_port"];
+                // $foodProduct-> = $nutri_values["part_p"];
-                 * $nutri_values["part_p"];
+                // $foodProduct-> = $nutri_values["part_g"];
-                 * $nutri_values["part_g"];
+                // $foodProduct-> = $nutri_values["part_l"];
-                 * $nutri_values["part_l"];
+                // $foodProduct-> = $nutri_values["p_sur_l"];
-                 * $nutri_values["p_sur_l"];
+                // $foodProduct-> = $nutri_values["pourcent_ags"];
-                 * $nutri_values["pourcent_ags"];
+                // $foodProduct-> = $nutri_values["pourcent_agi"];
-                 * $nutri_values["pourcent_agi"];
+                // $foodProduct-> = $nutri_values["pourcent_ss"];
-                 * $nutri_values["pourcent_ss"];
+                // $foodProduct-> = $nutri_values["pourcent_amidon"];
-                 * $nutri_values["pourcent_amidon"];
+                // $foodProduct-> = $nutri_values["composante_n"];
-                 * $nutri_values["composante_n"];
+                // $foodProduct-> = $nutri_values["composante_p"];
-                 * $nutri_values["composante_p"];
+                // $foodProduct-> = $nutri_values["pourcent_fruits"];
-                 * $nutri_values["pourcent_fruits"];
+                // $foodProduct-> = $nutri_values["mat_grass_r_prec"];
-                 * $nutri_values["mat_grass_r_prec"];
+                // $foodProduct-> = $nutri_values["ags_r_prec"];
-                 * $nutri_values["ags_r_prec"];
+                // $foodProduct-> = $nutri_values["glucides_r_prec"];
-                 * $nutri_values["glucides_r_prec"];
+                // $foodProduct-> = $nutri_values["sucre_r_prec"];
-                 * $nutri_values["sucre_r_prec"];
+                // $foodProduct-> = $nutri_values["fib_alim_r_prec"];
-                 * $nutri_values["fib_alim_r_prec"];
+                // $foodProduct-> = $nutri_values["proteine_r_prec"];
-                 * $nutri_values["proteine_r_prec"];
+                // $foodProduct-> = $nutri_values["sel_r_prec"];
-                 * $nutri_values["sel_r_prec"];
+                // $foodProduct-> = $nutri_values["sodium_r_prec"];
-                 * $nutri_values["sodium_r_prec"];
+                // $foodProduct-> = $nutri_values["fruits_r_prec"];
-                 * $nutri_values["fruits_r_prec"];
+                // $foodProduct-> = $nutri_values["fruits_coque_sech_r_prec"];
-                 * $nutri_values["fruits_coque_sech_r_prec"];
+                // $foodProduct-> = $nutri_values["score_nutri"];
-                 * $nutri_values["score_nutri"];
+            }
-                 */
+
-            }//end if
             $foodProduct->save();
-        }//end if
+        }
     }
 }

app/Policies/ProductPolicy.php

@@ -2,6 +2,8 @@
 
 namespace App\Policies;
 
+use App\Models\Customers;
+use App\Models\User;
 use App\Models\Product;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Illuminate\Auth\Access\Response;
@@ -18,23 +20,18 @@ class ProductPolicy
      */
     public function __construct()
     {
+        //
     }
 
     /**
-     * @param App\Models\User|App\Models\Customers $user
+     * $user is a App\Models\User or a App\Models\Customers
-     * @param \App\Models\Product                  $product
-     *
-     * @return \Illuminate\Auth\Access\Response
-     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
      */
-    public function addToCart($user, Product $product)
+    public function addToCart($user = null, Product $product) {
-    {
-        // phpcs:enable
         $now = Carbon::now();
-        if ($product->orderable_start === null or $product->orderable_start <= $now) {
+        if($product->orderable_start === null or $product->orderable_start <= $now) {
-            // On est entré dans la période commandable ou c'est commandable depuis toujours.
+            //on est entré dans la période commandable ou c'est commandable depuis toujours
-            if ($product->orderable_end === null or $product->orderable_end >= $now) {
+            if($product->orderable_end === null or $product->orderable_end >= $now) {
-                // Il n'y a pas de limite dans le temps ou elle n'est pas encore passée.
+                //il n'y a pas de limite dans le temps ou elle n'est pas encore passée
                 return Response::allow();
             }
             return Response::deny('Ce produit n\'est pas disponible pour le moment');