fix: 🐛 adding a variable declaration in the corresponding scope

.env.example

@@ -7,7 +7,7 @@ APP_URL=http://localhost
 LOG_CHANNEL=stack
 
 DB_CONNECTION=mysql
-DB_HOST=dev-mysql
+DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_DATABASE=homestead
 DB_USERNAME=homestead
@@ -20,8 +20,8 @@ SESSION_DRIVER=file
 SESSION_LIFETIME=120
 
 MAIL_DRIVER=smtp
-MAIL_HOST=dev-mailpit
-MAIL_PORT=1025
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null

.gitignore

@@ -27,11 +27,3 @@ npm-debug.log
 yarn-error.log
 .npmrc
 /tests/coverage
-
-
-
-
-/.npm
-.zshrc
-/.composer
-/public/images/

.gitlab-ci.yml

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

.gitlab/issue_templates/sprint.md

@@ -1,24 +0,0 @@
-👤 **Formulation**
-
-<!-- réferencer des labels avec tilde ~ -->
-**En tant que** ~"persona:: Marie"
-
-**Je veux** <!-- action / fonctionnalité souhaitée en utilisant les objets métier entre backticks (ex: `Brand`, `Campaign`) -->
-
-**Afin de** <!-- bénéfice métier / valeur ajoutée -->
-
-🎯 **Contexte métier & Objectif**
-
-<!-- Préciser le contexte métier, les impacts et les règles de gestion principales -->
-
-🧪 **Critères d'acceptation**
-
-- [ ] **Scénario :** Cas nominal
-    * **Étant donné** <!-- contexte initial -->
-    * **Quand** <!-- action déclenchée -->
-    * **Alors** <!-- résultat attendu et vérifiable -->
-
-- [ ] **Scénario :** Cas d'erreur / alternatif
-    * **Étant donné** <!-- contexte limite ou données erronées -->
-    * **Quand** <!-- action déclenchée -->
-    * **Alors** <!-- comportement attendu / blocage / message d'erreur -->

Dockerfile

@@ -1,5 +1,4 @@
-ARG PHP_8_5_TAG=latest
-FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/uwil-production-8.5:${PHP_8_5_TAG}
+FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/ldcweb-production-7.3:060825-070701
 COPY --chown=www-data:www-data . /app/srcs
 USER root
 RUN chmod -R 755 /app/srcs/storage

README.md

@@ -1,14 +0,0 @@
-# MesBR
-
-## Tests unitaires
-
-```bash
-cp .env .env.testing
-
-// Update db vars
-
-php artisan test
-```
-
-## Gestion du Legacy
-Au moment de la suppression du legacy, ne pas oublier de refaire les factory au propre pour les models

app/Calendrier.php

@@ -1,8 +1,7 @@
 <?php
 
-namespace App\Models;
+namespace App;
 
-use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 
 class Calendrier extends Model
@@ -10,28 +9,23 @@ class Calendrier extends Model
     /**
      * @var string
      */
-
     protected $table = 'calendrier';
 
     /**
      * @var boolean
      */
-
     public $timestamps = false;
 
     /**
      * @var string
      */
-
     protected $primaryKey = 'calendrier_id';
 
-
     protected $dates = ['calendrier_startdate', 'calendrier_enddate'];
 
     /**
      * @var array
      */
-
     protected $fillable = [
         'calendrier_startdate',
         'calendrier_enddate'
@@ -43,21 +37,6 @@ class Calendrier extends Model
      */
     public function coupon()
     {
-        return $this->belongsTo(\App\Models\Coupon::class, 'calendrier_couponId');
-    }
-
-    // * METHODS
-
-    /**
-     * Check if the current date is between the calendar publication dates.
-     *
-     * @return boolean
-     */
-    public function isPublished(): bool
-    {
-        return now()->betweenIncluded(
-            Carbon::parse($this->calendrier_startdate),
-            Carbon::parse($this->calendrier_enddate)->endOfDay()
-        );
+        return $this->belongsTo('App\Coupon', 'calendrier_couponId');
     }
 }

app/Campagne.php

@@ -1,37 +1,13 @@
 <?php
 
-namespace App\Models;
+namespace App;
 
-use App\Enums\CampaignTypes;
-use App\Models\Basket;
-use App\Models\PrintedCoupons;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Kwaadpepper\Enum\Traits\CastsEnums;
 
 class Campagne extends Model
 {
     use SoftDeletes;
-    use CastsEnums;
-    use HasFactory;
-
-    public $enumCasts = [
-        'camp_type' => CampaignTypes::class
-    ];
-
-    /**
-     * @var array
-     */
-
-    protected $fillable = [
-        'camp_siteId',
-        'camp_name',
-        'camp_type',
-        'camp_limitedPrinting',
-        'camp_published'
-    ];
 
     /**
      * @var string
@@ -51,19 +27,16 @@ class Campagne extends Model
     /**
      * @var string
      */
-
     protected $table = 'campagne';
 
     /**
      * @var string
      */
-
     protected $primaryKey = 'camp_id';
 
     /**
      * @var array
      */
-
     protected $dates = ['camp_deleted_at'];
 
 
@@ -74,7 +47,7 @@ class Campagne extends Model
      */
     public function notifications()
     {
-        return $this->hasMany(\App\Models\Notification::class, 'notif_campId', 'camp_id');
+        return $this->hasMany('App\Notification', 'notif_campId', 'camp_id');
     }
 
     /**
@@ -83,7 +56,7 @@ class Campagne extends Model
      */
     public function murs()
     {
-        return $this->hasMany(\App\Models\Mur::class, 'mur_campId', 'camp_id');
+        return $this->hasMany('App\Mur', 'mur_campId', 'camp_id');
     }
 
     /**
@@ -92,7 +65,7 @@ class Campagne extends Model
      */
     public function paniers()
     {
-        return $this->hasMany(\App\Models\Panier::class, 'panier_campId', 'camp_id');
+        return $this->hasMany('App\Panier', 'panier_campId', 'camp_id');
     }
 
     /**
@@ -101,7 +74,7 @@ class Campagne extends Model
      */
     public function site()
     {
-        return $this->belongsTo(\App\Models\Site::class, 'camp_siteId', 'site_id');
+        return $this->belongsTo('App\Site', 'camp_siteId', 'site_id');
     }
 
     /**
@@ -109,24 +82,17 @@ class Campagne extends Model
      */
     public function coupons()
     {
-        return $this->belongsToMany(\App\Models\Coupon::class, 'campagne_coupon', 'campagne_id', 'coup_id');
+        return $this->belongsToMany('App\Coupon', 'campagne_coupon', 'campagne_id', 'coup_id');
     }
 
     /**
-     * printedCoupons relation
-     * @return HasMany
+     * @var array
      */
-    public function printedCoupons()
-    {
-        return $this->hasMany(PrintedCoupons::class, 'camp_id');
-    }
-
-    /**
-     * Basket model relation
-     * @return HasMany
-     */
-    public function baskets()
-    {
-        return $this->hasMany(Basket::class);
-    }
+    protected $fillable = [
+        'camp_siteId',
+        'camp_name',
+        'camp_type',
+        'camp_limitedPrinting',
+        'camp_published'
+    ];
 }

app/Console/Commands/ArchiveStatsCommand.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Jobs\ArchiveStatsJob;
-use App\Models\ArchiveSite;
-use App\Models\ArchiveStat;
-use App\Models\Statistique;
-use Illuminate\Console\Command;
-
-class ArchiveStatsCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-
-    protected $signature = 'uwil:stats:archive';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-
-    protected $description = 'Archives mesbr stats';
-
-    /**
-     * Execute the console command.
-     *
-     * @return void
-     */
-    public function handle(): void
-    {
-        $baseArchiveStatCount = ArchiveStat::count();
-        $baseStatCount        = Statistique::count();
-
-        new ArchiveStatsJob()->handle();
-
-        $this->info(sprintf(
-            '%s archive(s) created',
-            ArchiveStat::count() - $baseArchiveStatCount
-        ));
-        $this->info(sprintf(
-            '%s stat(s) deleted',
-            $baseStatCount - Statistique::count()
-        ));
-        $this->info('Stats archived 👌');
-    }
-}

app/Console/Commands/CustomersClaims.php

@@ -1,123 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\Basket;
-use App\Models\Campagne;
-use App\Models\Contact;
-use App\Models\Coupon;
-use App\Models\Customers;
-use App\Models\Site;
-use Carbon\Carbon;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Validator;
-
-class CustomersClaims extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-
-    protected $signature = 'customers:claims {--siteId=?} {destCampaignId} {destCouponId}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-
-    protected $description = 'Command description';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle()
-    {
-        $destCampaignId = $this->argument('destCampaignId');
-        $destCampaign = Campagne::findOrFail($destCampaignId);
-
-        $destCouponId = $this->argument('destCouponId');
-        $destCoupon = Coupon::findOrFail($destCouponId);
-
-        $siteIdArg = $this->option('siteId');
-        if (is_null($siteIdArg)) {
-            $this->table(
-                ['ID', 'Site ID', 'Label'],
-                Site::all(['id', 'site_id', 'site_nom'])->toArray()
-            );
-
-            $site = $this->validateInput(fn() => $this->ask('Enter site model id'), 'required|numeric|min:1|max:50|exists:site,id');
-
-            $site = Site::find($site);
-        } else {
-            $site = Site::find($siteIdArg);
-        }
-
-        $email = $this->validateInput(fn() => $this->ask('Enter customer email'), 'required|email|min:1|max:255');
-
-        $crmHashcode = $this->validateInput(fn() => $this->ask('Enter customer hashcode'), 'required|string|min:1|max:36');
-
-        $crmCountry = $this->validateInput(fn() => $this->ask('Enter customer country ISO code'), 'required|numeric|in:56,250,442');
-
-        $date = $this->validateInput(fn() => $this->ask('Enter claim date'), 'required|date_format:d/m/Y');
-
-        $contacts = Contact::where('contact_email', $email)
-            ->where('contact_siteId', '=', $site->site_id)
-            ->get();
-
-        $toAdd = 0;
-        foreach ($contacts as $contact) {
-            $claimDate = \Illuminate\Support\Facades\Date::createFromFormat('d/m/Y', $date)->format('Y-m-d');
-            // On vient chercher les paniers dont la date de création est >= à la date de la récla
-            $paniers = $contact->paniers()->where('panier_createdate', '>=', $claimDate)->get();
-            foreach ($paniers as $panier) {
-                foreach ($panier->panierContents as $content) {
-                    $toAdd += $content->panier_content_printed;
-                }
-            }
-        }
-
-        $qty = $this->validateInput(fn() => $this->ask('Enter quantity to add', $toAdd), 'required|numeric|max:20');
-
-        $customer = Customers::firstOrNew([
-            'hashcode' => $crmHashcode,
-            'email'    => $email,
-            'country'  => $crmCountry,
-        ]);
-        $customer->saveOrFail();
-
-        $basket = Basket::updateContent($destCampaign, [$destCoupon->coupon_id => $qty], $customer);
-
-        $this->info(url()->route("fo.basket.show", $basket));
-
-        return 0;
-    }
-
-    private function validateInput($method, $rules)
-    {
-        $value = $method(); // Ask user input
-        $validator = Validator::make(['input' => $value], ['input' => $rules]);
-
-        if ($validator->fails()) {
-            foreach ($validator->errors()->all() as $error) {
-                $this->warn($error);
-            }
-            return $this->validateInput($method, $rules); // Retry
-        }
-        return $value;
-    }
-}

app/Console/Commands/RegenBRBase.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\Coupon;
-use App\Traits\GenerateBR;
-use Illuminate\Console\Command;
-use Illuminate\Http\Request;
-
-class RegenBRBase extends Command
-{
-    use GenerateBR;
-
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-
-    protected $signature = 'coupons:regen-base';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-
-    protected $description = 'Re-generate coupons base image';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle()
-    {
-        $publishedCoupons = Coupon::where('coupon_published', 1)->get();
-
-        foreach ($publishedCoupons as $coupon)
-        {
-            $br_path              = $this->generateBase(new Request(), $coupon);
-            $coupon->coupon_image = $br_path;
-            $coupon->save();
-        }
-
-        return 0;
-    }
-}

app/Console/Kernel.php

@@ -4,12 +4,11 @@ namespace App\Console;
 
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
-use App\Models\Site;
-use App\Models\Campagne;
-use App\Jobs\ArchiveStatsJob;
+use App\Site;
+use App\Campagne;
 use App\Jobs\CleanOldDatasJob;
-use App\Models\User;
-use App\Models\Notification;
+use App\User;
+use App\Notification;
 use App\Mail\AlertBr;
 use App\Mail\AlertBrAdmin;
 use Illuminate\Support\Facades\Mail;
@@ -24,11 +23,7 @@ class Kernel extends ConsoleKernel
      *
      * @var array
      */
-    protected $commands = [
-        \App\Console\Commands\CustomersClaims::class,
-        \App\Console\Commands\ArchiveStatsCommand::class,
-        \App\Console\Commands\RegenBRBase::class,
-    ];
+    protected $commands = [];
 
     /**
      * Define the application's command schedule.
@@ -38,26 +33,23 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        // Archive stats every day at 2:00 AM (to prevent time difference between the server and the reality).
-        $schedule->job(ArchiveStatsJob::class)->dailyAt('2:00');
-
         // Clean datas older than 3 years every day at midnight.
         $schedule->job(CleanOldDatasJob::class)->daily();
 
         // ---- Commande d'alerte appelé tt les jours de la semaine a 7h00
-        $schedule->call(function (): void {
+        $schedule->call(function () {
             $sites                 = Site::all();
-            $couponSeuilGlobal     = [];
-            $couponDiffusionGlobal = [];
+            $couponSeuilGlobal     = array();
+            $couponDiffusionGlobal = array();
             $sendGlobal            = false;
             foreach ($sites as $site) {
                 // ---- Pour chaque site
                 $campagnes = Campagne::where(['camp_siteId' => $site->site_id])->get();
                 foreach ($campagnes as $campagne) {
                     $sendMail        = false;
-                    $users           = [];
-                    $couponSeuil     = [];
-                    $couponDiffusion = [];
+                    $users           = array();
+                    $couponSeuil     = array();
+                    $couponDiffusion = array();
                     $coupons         = $campagne->coupons()->get();
                     foreach ($coupons as $coupon) {
                         $couponAlert = false;
@@ -100,7 +92,7 @@ class Kernel extends ConsoleKernel
                 } //end foreach
             } //end foreach
             if ($sendGlobal) {
-                $superadmins = [];
+                $superadmins = array();
                 $admins      = User::where(['roles' => 'superadmin'])->get();
                 foreach ($admins as $admin) {
                     $adminObject          = [];
@@ -112,4 +104,16 @@ class Kernel extends ConsoleKernel
             }
         })->weekdays()->at('7:00');
     }
+
+    /**
+     * Register the commands for the application.
+     *
+     * @return void
+     */
+    protected function commands()
+    {
+        $this->load(__DIR__ . '/Commands');
+
+        require base_path('routes/console.php');
+    }
 }

app/Contact.php

@@ -1,16 +1,12 @@
 <?php
 
-namespace App\Models;
+namespace App;
 
-use App\Models\Log;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Contact extends Model
 {
-    use HasFactory;
-
     /**
      * @var string
      */
@@ -24,19 +20,16 @@ class Contact extends Model
     /**
      * @var string
      */
-
     protected $table = 'contact';
 
     /**
      * @var string
      */
-
     protected $primaryKey = 'contact_id';
 
     /**
      * @var array
      */
-
     protected $fillable = [
         'contact_ref',
         'contact_prenom',
@@ -53,7 +46,7 @@ class Contact extends Model
      */
     public function murs()
     {
-        return $this->hasMany(\App\Models\Mur::class, 'mur_contactId', 'contact_id');
+        return $this->hasMany('App\Mur', 'mur_contactId', 'contact_id');
     }
 
     /**
@@ -62,7 +55,7 @@ class Contact extends Model
      */
     public function paniers()
     {
-        return $this->hasMany(\App\Models\Panier::class, 'panier_contactId', 'contact_id');
+        return $this->hasMany('App\Panier', 'panier_contactId', 'contact_id');
     }
 
     /**
@@ -71,63 +64,45 @@ class Contact extends Model
      */
     public function site()
     {
-        return $this->belongsTo(\App\Models\Site::class, 'contact_siteId');
+        return $this->belongsTo('App\Site', 'contact_siteId');
     }
 
-    /**
-     * @param \Illuminate\Database\Eloquent\Builder<static> $query
-     */
-    protected function scopeSearchName($query, $name)
+    public function scopeSearchName($query, $name)
     {
         if ($name) {
             $query->where('contact_nom', 'like', '%' . $name . '%');
         }
     }
 
-    /**
-     * @param \Illuminate\Database\Eloquent\Builder<static> $query
-     */
-    protected function scopeSearchFirstname($query, $firstname)
+    public function scopeSearchFirstname($query, $firstname)
     {
         if ($firstname) {
             $query->where('contact_prenom', 'like', '%' . $firstname . '%');
         }
     }
 
-    /**
-     * @param \Illuminate\Database\Eloquent\Builder<static> $query
-     */
-    protected function scopeSearchEmail($query, $email)
+    public function scopeSearchEmail($query, $email)
     {
         if ($email) {
             $query->where('contact_email', 'like', '%' . $email . '%');
         }
     }
 
-    /**
-     * @param \Illuminate\Database\Eloquent\Builder<static> $query
-     */
-    protected function scopeSearchVille($query, $ville)
+    public function scopeSearchVille($query, $ville)
     {
         if ($ville) {
             $query->where('contact_ville', 'like', '%' . $ville . '%');
         }
     }
 
-    /**
-     * @param \Illuminate\Database\Eloquent\Builder<static> $query
-     */
-    protected function scopeSearchCp($query, $cp)
+    public function scopeSearchCp($query, $cp)
     {
         if ($cp) {
             $query->where('contact_cp', 'like', '%' . $cp . '%');
         }
     }
 
-    /**
-     * @param \Illuminate\Database\Eloquent\Builder<static> $query
-     */
-    protected function scopeSearchCountry($query, $country)
+    public function scopeSearchCountry($query, $country)
     {
         if ($country) {
             $query->where('contact_country', $country);

app/Coupon.php

@@ -1,16 +1,13 @@
 <?php
 
-namespace App\Models;
+namespace App;
 
-use App\Models\BasketContent;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Coupon extends Model
 {
     use SoftDeletes;
-    use HasFactory;
 
     /**
      * @var string
@@ -30,19 +27,69 @@ class Coupon extends Model
     /**
      * @var string
      */
-
     protected $table = 'coupon';
 
     /**
      * @var string
      */
-
     protected $primaryKey = 'coupon_id';
 
+    /**
+     * OneToMany
+     * Coupon -> Calendrier
+     */
+    public function calendriers()
+    {
+        return $this->hasMany('App\Calendrier', 'calendrier_couponId', 'coupon_id');
+    }
+
+    /**
+     * OneToMany
+     * Coupon -> PanierContent
+     */
+    public function panierContents()
+    {
+        return $this->hasMany('App\PanierContent', 'panier_content_couponId', 'coupon_id');
+    }
+
+    /**
+     * OneToMany
+     * Coupon -> Mur
+     */
+    public function murs()
+    {
+        return $this->hasMany('App\Mur', 'mur_couponId', 'coupon_id');
+    }
+
+    /**
+     * OneToMany
+     * Coupon -> Mouvement
+     */
+    public function mouvements()
+    {
+        return $this->hasMany('App\Mouvement', 'mouvement_couponId', 'coupon_id');
+    }
+
+    /**
+     * ManyToOne
+     * Coupon -> Site
+     */
+    public function site()
+    {
+        return $this->belongsTo('App\Site', 'coupon_siteId');
+    }
+
+    /**
+     * The campagnes that belong to the coupon.
+     */
+    public function campagnes()
+    {
+        return $this->belongsToMany('App\Campagne', 'campagne_coupon', 'coup_id', 'campagne_id');
+    }
+
     /**
      * @var array
      */
-
     protected $fillable = [
         'coupon_code',
         'coupon_norme',
@@ -73,66 +120,4 @@ class Coupon extends Model
         'coupon_seuil_alert',
         'coupon_treatment_center'
     ];
-
-    /**
-     * OneToMany
-     * Coupon -> Calendrier
-     */
-    public function calendriers()
-    {
-        return $this->hasMany(\App\Models\Calendrier::class, 'calendrier_couponId', 'coupon_id');
-    }
-
-    /**
-     * OneToMany
-     * Coupon -> PanierContent
-     */
-    public function panierContents()
-    {
-        return $this->hasMany(\App\Models\PanierContent::class, 'panier_content_couponId', 'coupon_id');
-    }
-
-    /**
-     * OneToMany
-     * Coupon -> Mur
-     */
-    public function murs()
-    {
-        return $this->hasMany(\App\Models\Mur::class, 'mur_couponId', 'coupon_id');
-    }
-
-    /**
-     * OneToMany
-     * Coupon -> Mouvement
-     */
-    public function mouvements()
-    {
-        return $this->hasMany(\App\Models\Mouvement::class, 'mouvement_couponId', 'coupon_id');
-    }
-
-    /**
-     * ManyToOne
-     * Coupon -> Site
-     */
-    public function site()
-    {
-        return $this->belongsTo(\App\Models\Site::class, 'coupon_siteId');
-    }
-
-    /**
-     * The campagnes that belong to the coupon.
-     */
-    public function campagnes()
-    {
-        return $this->belongsToMany(\App\Models\Campagne::class, 'campagne_coupon', 'coup_id', 'campagne_id');
-    }
-
-    /**
-     * BasketContent model relation
-     * @return HasMany
-     */
-    public function basketContents()
-    {
-        return $this->hasMany(BasketContent::class);
-    }
 }

app/Enums/CampaignTypes.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-use Kwaadpepper\Enum\BaseEnum;
-
-/**
- * @method static self mur()
- * value 0 Mur (POUR LES MURS)
- * @method static self panier()
- * value 1 Panier (POUR LES PANIERS)
- * @method static self murss()
- * value 2 Mur sans sélection (POUR LES MURS SANS SELECTION)
- * @method static self paniers()
- * value 3 Panier Sélectionnable (POUR LES PANIERS AVEC SELECTION)
- */
-
-class CampaignTypes extends BaseEnum
-{
-    protected static function values(): array
-    {
-        return [
-            'mur' => 0,
-            'panier' => 1,
-            'murss' => 2,
-            'paniers' => 3,
-        ];
-    }
-
-    protected static function labels(): array
-    {
-        return [
-            'mur' => trans('Mur'),
-            'panier' => trans('Panier'),
-            'murss' => trans('Mur sans sélection'),
-            'paniers' => trans('Panier Sélectionnable'),
-        ];
-    }
-}

app/Enums/Countries.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-use Kwaadpepper\Enum\BaseEnum;
-
-/**
- * @method static self france()
- * @method static self belgique()
- * @method static self luxembourg()
- */
-
-class Countries extends BaseEnum
-{
-    protected static function values(): array
-    {
-        return [
-            'france' => 250,
-            'belgique' => 56,
-            'luxembourg' => 442,
-        ];
-    }
-
-    protected static function labels(): array
-    {
-        return [
-            'france' => 'France',
-            'belgique' => 'Belgique',
-            'luxembourg' => 'Luxembourg',
-        ];
-    }
-}

app/Enums/LogActions.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-use Kwaadpepper\Enum\BaseEnum;
-
-/**
- * @method static self updatebasket()
- * @method static self impression()
- * @method static self updatecontact()
- */
-
-class LogActions extends BaseEnum
-{
-    protected static function values(): array
-    {
-        return [
-            'updatebasket' => 1,
-            'impression' => 3,
-            'updatecontact' => 4,
-        ];
-    }
-
-    protected static function labels(): array
-    {
-        return [
-            'updatebasket' => 'Mise à jour du panier',
-            'impression' => 'Impression',
-            'updatecontact' => 'Mise à jour du contact',
-        ];
-    }
-}

app/Enums/UserRoles.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-use Kwaadpepper\Enum\BaseEnum;
-
-/**
- * @method static self superadmin()
- * @method static self admin()
- * @method static self marketing()
- */
-
-class UserRoles extends BaseEnum
-{
-    protected static function values(): array
-    {
-        return [
-            'superadmin' => 'superadmin',
-            'admin' => 'admin',
-            'marketing' => 'marketing'
-        ];
-    }
-
-    protected static function labels(): array
-    {
-        return [
-            'superadmin' => trans('Super-Admin'),
-            'admin' => trans('Admin'),
-            'marketing' => trans('Marketing')
-        ];
-    }
-}

app/Exceptions/Handler.php

@@ -21,7 +21,6 @@ class Handler extends ExceptionHandler
      *
      * @var array<int, class-string<\Throwable>>
      */
-
     protected $dontReport = [];
 
     /**
@@ -29,7 +28,6 @@ class Handler extends ExceptionHandler
      *
      * @var array<int, string>
      */
-
     protected $dontFlash = [
         'current_password',
         'password',
@@ -43,9 +41,9 @@ class Handler extends ExceptionHandler
      */
     public function register()
     {
-        $this->reportable(function (Throwable $e): void {
+        $this->reportable(function (Throwable $e) {
             if (app()->bound('sentry')) {
-                resolve('sentry')->captureException($e);
+                app('sentry')->captureException($e);
             }
         });
     }

app/Http/Controllers/AjaxController.php

@@ -2,16 +2,19 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Campagne;
-use App\Models\Coupon;
-use App\Enums\CampaignTypes;
-use App\Models\PanierContent;
-use App\Models\Statistique;
-use App\Models\Mur;
-use App\Models\Log;
+use App\Campagne;
+use App\Coupon;
+use App\Contact;
+use App\Panier;
+use App\PanierContent;
+use App\Statistique;
+use App\Mur;
+use App\Log;
 use Illuminate\Http\Request;
 use App\Traits\GenerateBR;
 use App\Traits\CouponTrait;
+use App\Http\Controllers;
+use Carbon\Carbon;
 
 class AjaxController extends Controller
 {
@@ -45,7 +48,7 @@ class AjaxController extends Controller
     }
 
     // ---- Dépublie un coupon
-    public function unpublishCouponsAjax(Request $request)
+    public function unpublish_coupons_ajax(Request $request)
     {
         $coupon_id                = $request->input('couponid');
         $coupon                   = Coupon::find($coupon_id);
@@ -56,7 +59,7 @@ class AjaxController extends Controller
     }
 
     // ---- Publie un coupon
-    public function publishCouponsAjax(Request $request)
+    public function publish_coupons_ajax(Request $request)
     {
         $coupon_id                = $request->input('couponid');
         $coupon                   = Coupon::find($coupon_id);
@@ -66,8 +69,31 @@ class AjaxController extends Controller
         return json_encode($coupon);
     }
 
+    // ---- Dépublie une campagne
+    public function unpublish_camp_ajax(Request $request)
+    {
+        $campid                   = $request->input('campid');
+        $campagne                 = Campagne::find($campid);
+        $campagne->camp_published = 0;
+        $campagne->save();
+
+        return json_encode($campagne);
+    }
+
+    // ---- Publie une campagne
+    public function publish_camp_ajax(Request $request)
+    {
+        $campid                   = $request->input('campid');
+        $campagne                 = Campagne::find($campid);
+        $campagne->camp_published = 1;
+        $campagne->save();
+
+        return json_encode($campagne);
+    }
+
+
     // ---- Impression des BR
-    public function impressionAjax(Request $request)
+    public function impression_ajax(Request $request)
     {
 
         if ($request->session()->has('coupons')) {
@@ -101,19 +127,19 @@ class AjaxController extends Controller
         $log->log_refsite   = $campagne->camp_siteId;
         $log->log_params    = json_encode(['refcamp' => $campagne->camp_id]);
 
-        $couponsPrinted = [];
+        $couponsPrinted = array();
 
         $coupons  = '<TABLE width="100%" align="center" cellpadding="0" cellspacing="0" border="0">';
         $coupons .= '<TR><TD width="100%" align="center"><div>';
 
-        if ($campagne->camp_type->equals(CampaignTypes::mur())) {
+        if ($campagne->camp_type == 0) {
 // ---- POUR LES MURS
             if (!isset($couponsToPrint)) {
                 die();
             }
             $nbCoupon = 0;
 
-            foreach ($couponsToPrint as $coupon_code) {
+            foreach ($couponsToPrint as $key => $coupon_code) {
                 $cp = Coupon::where(['coupon_code' => $coupon_code])->first();
 
                 if ($this->isAvailable($cp, $campagne, $contact) && $this->isAvailableToPrint($cp, $campagne)) {
@@ -134,10 +160,14 @@ class AjaxController extends Controller
                     $mur->save();
 
                     // Sauvegarde de stat
-                    $this->saveStat($campagne, $cp);
+                    $stat                     = new Statistique();
+                    $stat->stat_campId        = $campagne->camp_id;
+                    $stat->stat_couponId      = $cp->coupon_id;
+                    $stat->stat_couponPrinted = 1;
+                    $stat->save();
                 }//end if
             }//end foreach
-        } elseif ($campagne->camp_type->equals(CampaignTypes::panier())) {
+        } elseif ($campagne->camp_type == 1) {
 // ---- POUR LES PANIERS
             if (!isset($panier)) {
                 die();
@@ -167,7 +197,11 @@ class AjaxController extends Controller
                         array_push($couponsPrinted, ['cp_code' => $cp->coupon_code, 'qty' => $panierContent->panier_content_quantity]);
 
                         // Sauvegarde de stat
-                        $this->saveStat($campagne, $cp);
+                        $stat                     = new Statistique();
+                        $stat->stat_campId        = $campagne->camp_id;
+                        $stat->stat_couponId      = $cp->coupon_id;
+                        $stat->stat_couponPrinted = $panierContent->panier_content_quantity;
+                        $stat->save();
                     } else {
                         if ($panierContent->panier_content_quantity > 0) {
                             $coupons .= '<img src="' . $imgCoupon . '" border="0" style="display:block;width:165mm;"/>';
@@ -180,7 +214,11 @@ class AjaxController extends Controller
                             array_push($couponsPrinted, ['cp_code' => $cp->coupon_code, 'qty' => 1]);
 
                             // Sauvegarde de stat
-                            $this->saveStat($campagne, $cp);
+                            $stat                     = new Statistique();
+                            $stat->stat_campId        = $campagne->camp_id;
+                            $stat->stat_couponId      = $cp->coupon_id;
+                            $stat->stat_couponPrinted = 1;
+                            $stat->save();
                         }
                     }//end if
                     // ---- Mémorise l'impression
@@ -197,7 +235,7 @@ class AjaxController extends Controller
                 $panier->panier_pending = 1;
             }
             $panier->save();
-        } elseif ($campagne->camp_type->equals(CampaignTypes::murss())) {
+        } elseif ($campagne->camp_type == 2) {
 // ---- POUR LES MURS SANS SELECTION
             $nbCoupon = 0;
             $cps      = $campagne->coupons()->get();
@@ -221,10 +259,14 @@ class AjaxController extends Controller
                     $mur->save();
 
                     // Sauvegarde de stat
-                    $this->saveStat($campagne, $cp);
+                    $stat                     = new Statistique();
+                    $stat->stat_campId        = $campagne->camp_id;
+                    $stat->stat_couponId      = $cp->coupon_id;
+                    $stat->stat_couponPrinted = 1;
+                    $stat->save();
                 }//end if
             }//end foreach
-        } elseif ($campagne->camp_type->equals(CampaignTypes::paniers())) {
+        } elseif ($campagne->camp_type == 3) {
 // ---- POUR LES PANIERS AVEC SELECTION
             if (!isset($couponsToPrint)) {
                 die();
@@ -233,10 +275,11 @@ class AjaxController extends Controller
             if (!isset($panier)) {
                 die();
             }
-            foreach ($couponsToPrint as $coupon_code) {
+            foreach ($couponsToPrint as $key => $coupon_code) {
                 $cp = Coupon::where(['coupon_code' => $coupon_code])->first();
 
                 if ($this->isAvailable($cp, $campagne, $contact) && $this->isAvailableToPrint($cp, $campagne)) {
+                    $newQtyAvailable = 0;
                     $imgCoupon     = $this->printCp($cp, $contact);
                     $panierContent = PanierContent::where(['panier_content_couponId' => $cp->coupon_id, 'panier_content_panierId' => $panier->panier_id])->first();
                     if ($panierContent->panier_content_quantity > 0) {
@@ -249,14 +292,17 @@ class AjaxController extends Controller
                         $newQtyPrinted   = $panierContent->panier_content_printed + 1;
 
                         // Sauvegarde de stat
-                        $this->saveStat($campagne, $cp);
-
-                        // ---- Mémorise l'impression
-                        $panierContent->panier_content_quantity = $newQtyAvailable;
-                        $panierContent->panier_content_printed  = $newQtyPrinted;
-                        $panierContent->save();
+                        $stat                     = new Statistique();
+                        $stat->stat_campId        = $campagne->camp_id;
+                        $stat->stat_couponId      = $cp->coupon_id;
+                        $stat->stat_couponPrinted = 1;
+                        $stat->save();
                     }
                     array_push($couponsPrinted, ['cp_code' => $cp->coupon_code, 'qty' => 1]);
+                    // ---- Mémorise l'impression
+                    $panierContent->panier_content_quantity = $newQtyAvailable;
+                    $panierContent->panier_content_printed  = $newQtyPrinted;
+                    $panierContent->save();
                 }//end if
             }//end foreach
             // ---- Update du status du panier
@@ -290,7 +336,16 @@ class AjaxController extends Controller
             die();
         }
 
-        if ($campagne->camp_type->equals(CampaignTypes::panier()) || $campagne->camp_type->equals(CampaignTypes::paniers())) {
+        if ($request->session()->has('contact')) {
+            $contact = $request->session()->get('contact');
+        }
+
+        if ($campagne->camp_type == 0 || $campagne->camp_type == 2) {
+            if (!isset($contact)) {
+                die();
+            }
+            return redirect(url('/') . '/?refsite=' . $campagne->camp_siteId . '&refcamp=' . $campagne->camp_id . '&hash=' . $contact->contact_hash);
+        } elseif ($campagne->camp_type == 1 || $campagne->camp_type == 3) {
             if ($request->session()->has('panier')) {
                 $panier = $request->session()->get('panier');
             } else {
@@ -299,4 +354,289 @@ class AjaxController extends Controller
             return redirect(url('/') . '/?basketid=' . $panier->panier_ref);
         }
     }
+
+    // ---- Charge les widget d'assistance
+    public function load_widget(Request $request)
+    {
+        if (isset($request->camp_id)) {
+            $camp_id = $request->camp_id;
+        } else {
+            die;
+        }
+
+        if (isset($request->contact_hash)) {
+            $contact_hash = $request->contact_hash;
+        } else {
+            die;
+        }
+
+        $campagne = Campagne::where(['camp_id' => $camp_id])->first();
+        $contact  = Contact::where(['contact_hash' => $contact_hash])->first();
+        $coupons  = $campagne->coupons;
+
+        foreach ($coupons as $key => $coupon) {
+            if (!$this->isAvailableToPrint($coupon, $campagne)) {
+                $coupons->forget($key);
+            }
+        }
+
+        $allLogs = Log::where(['log_refsite' => $campagne->camp_siteId, 'log_contactId' => $contact->contact_id, 'log_statut' => 'OK'])->orderBy('created_at', 'DESC')->get();
+        $logs    = array();
+        foreach ($allLogs as &$l) {
+            $params = json_decode($l->log_params);
+            if ($l->log_action == 3 || $l->log_action == 1) {
+                $l->log_message = json_decode($l->log_message, true);
+            }
+            if (intval($params->refcamp) == $camp_id) {
+                array_push($logs, $l);
+            }
+        }
+
+        if ($campagne->camp_type == 0 || $campagne->camp_type == 2) {
+// ---- Pour les types murs
+            foreach ($coupons as &$coupon) {
+                $coupon->isAvailable = $this->isAvailable($coupon, $campagne, $contact);
+            }
+            unset($coupon);
+
+            // Montant total et Nombre réductions disponible
+            $montantDispo = 0;
+            $montantTotal = 0;
+            $nbCoupon     = 0;
+            foreach ($coupons as $coupon) {
+                $montantTotal += $coupon->coupon_value;
+                if ($coupon->isAvailable == true) {
+                    $montantDispo += $coupon->coupon_value;
+                    $nbCoupon++;
+                }
+            }
+
+            if (sizeof($coupons) == $nbCoupon) {
+                $reset = false;
+            } else {
+                $reset = true;
+            }
+
+            $campagne->url = url('/') . "/?refsite=" . $campagne->camp_siteId . "&refcamp=" . $camp_id . "&hash=" . $contact->contact_hash;
+
+            $returnHTML = view('widgets.mur')
+                ->with([
+                    'campagne' => $campagne,
+                    'reset' => $reset,
+                    'montantTotal' => $montantTotal,
+                    'montantDispo' => $montantDispo,
+                    'logs' => $logs,
+                    'contact' => $contact])
+                ->renderSections()['widget'];
+
+            return json_encode(array('success' => true, 'html' => $returnHTML));
+        } else {
+// ---- Pour les types paniers
+            $panier = Panier::where(['panier_campId' => $campagne->camp_id, 'panier_contactId' => $contact->contact_id, 'panier_pending' => 1])->first();
+            if ($panier) {
+                $panier_ref = $panier->panier_ref;
+                foreach ($coupons as &$coupon) {
+                    $paniercontent = PanierContent::where(['panier_content_couponId' => $coupon->coupon_id, 'panier_content_panierId' => $panier->panier_id])->first();
+                    if ($paniercontent) {
+                        $coupon->qty = $paniercontent->panier_content_quantity;
+                    } else {
+                        $coupon->qty = 0;
+                    }
+                }
+                $campagne->url = url('/') . "/?basketid=" . $panier_ref;
+                unset($coupon);
+            } else {
+                $panier_ref = "";
+                foreach ($coupons as &$coupon) {
+                    $coupon->qty = 0;
+                }
+                $campagne->url = "Pas d'url disponible (panier non créé)";
+            }
+
+            $returnHTML = view('widgets.panier')
+                ->with([
+                    'campagne' => $campagne,
+                    'contact' => $contact,
+                    'panier' => $panier_ref,
+                    'logs' => $logs,
+                    'coupons' => $coupons
+                ])
+                ->renderSections()['widget'];
+            return json_encode(array('success' => true, 'html' => $returnHTML));
+        }//end if
+    }
+
+    // ---- Montre les campagnes avec un compte de démo
+    public function show_demo(Request $request)
+    {
+        if (isset($request->camp_id)) {
+            $camp_id = $request->camp_id;
+        } else {
+            die;
+        }
+
+        $campagne    = Campagne::where(['camp_id' => $camp_id])->first();
+        $siteId      = $campagne->camp_siteId;
+        $demoContact = Contact::where(['contact_siteId' => $siteId, 'contact_ref' => 'DEMO'])->first();
+
+        if (!isset($demoContact)) {
+            $req = new \Illuminate\Http\Request();
+            $req->setMethod('POST');
+            $req->request->add([
+                'refsite' => $siteId,
+                'refadherent' => 'DEMO',
+                'prenom' => 'Compte',
+                'nom' => 'Démonstration',
+                'email' => 'demo@demo.fr',
+                'code_postal' => '72000',
+                'commune' => 'Le Mans',
+                'pays' => 250
+            ]);
+
+            $contact     = new Controllers\ContactController();
+            $res         = $contact->updateContact($req);
+            $demoContact = Contact::where(['contact_siteId' => $siteId, 'contact_ref' => 'DEMO'])->first();
+        }
+
+        if ($campagne->camp_type == 0 || $campagne->camp_type == 2) {
+            // ---- DEMONSTRATION POUR LES MURS
+            $myRequest = new \Illuminate\Http\Request();
+            $myRequest->setMethod('POST');
+            $myRequest->request->add(['refcamp' => $camp_id, 'refadherent' => 'DEMO', 'admin' => 1]);
+
+            // ---- EFFACER LES CONTROLES SI EXISTANT
+            $mur = new Controllers\MurController();
+            $res = $mur->deleteControlContact($myRequest);
+
+            // ---- RETOURNE l'URL
+            $url = "/?refsite=" . $siteId . "&refcamp=" . $camp_id . "&hash=" . $demoContact->contact_hash;
+            return json_encode($url);
+        } else {
+            // ---- DEMONSTRATION POUR LES PANIERS
+            $panier = Panier::where(['panier_campId' => $camp_id, 'panier_contactId' => $demoContact->contact_id, 'panier_pending' => 1])->first();
+
+            if ($panier) {
+                $url = "/?basketid=" . $panier->panier_ref;
+            } else {
+                // --- Pas de panier Création d'un nouveau
+                // --- Récuperation des coupons de la campagne
+                $coupons = $campagne->coupons()->get();
+
+                foreach ($coupons as $key => $coupon) {
+                    if (!$this->isAvailableToPrint($coupon, $campagne)) {
+                        $coupons->forget($key);
+                    }
+                }
+
+                $couponsTotal  = sizeof($coupons);
+                $couponsAdded  = 0;
+                $basketContent = "";
+
+                foreach ($coupons as $coupon) {
+                    $basketContent .= "(1)" . $coupon->coupon_code;
+                    $couponsAdded++;
+                    if ($couponsAdded != $couponsTotal) {
+                        $basketContent .= ",";
+                    }
+                }
+                // --- création de l'objet request
+                $req = new \Illuminate\Http\Request();
+                $req->setMethod('POST');
+                $req->request->add([
+                    'refsite' => $siteId,
+                    'refcamp' => $camp_id,
+                    'refadherent' => $demoContact->contact_ref,
+                    'nom' => $demoContact->contact_nom,
+                    'prenom' => $demoContact->contact_prenom,
+                    'email' => $demoContact->contact_email,
+                    'code_postal' => $demoContact->contact_cp,
+                    'commune' => $demoContact->contact_ville,
+                    'pays' => $demoContact->contact_country,
+                    'panier' => $basketContent,
+                    'admin' => 1
+                ]);
+                $panier = new Controllers\PanierController();
+                $res    = $panier->updateBasket($req);
+                $url    = "/?basketid=" . $res->original['Panier']->Panier;
+            }//end if
+            return json_encode($url);
+        }//end if
+    }
+
+    // ---- MAINTENANCE : CLEAN DE LA BDD
+    // ---- Fonction de récap des contacts que l'on va effacer
+    public function get_clean_contacts_detail(Request $request)
+    {
+        $contacts      = Contact::where('contact_updatedate', '<', Carbon::now()->subMonth())->get();
+        $date          = Carbon::now();
+        $contact_count = 0;
+        foreach ($contacts as $contact) {
+            $paniers      = $contact->paniers()->get();
+            $canbeDeleted = true;
+            foreach ($paniers as $panier) {
+                if ($panier->panier_pending == 1) {
+                    $canbeDeleted = false;
+                }
+            }
+            if ($canbeDeleted) {
+                $contact_count++;
+                // $testcontact .= $contact->contact_id.", ";
+            }
+        }
+        return json_encode(['date' => $date, 'contact_count' => $contact_count]);
+    }
+
+    // ---- Fonction de nettoyage de la base contact
+    public function clean_contacts(Request $request)
+    {
+        $contacts    = Contact::where('contact_updatedate', '<', Carbon::now()->subMonth())->get();
+        $testcontact = "";
+        foreach ($contacts as $contact) {
+            $paniers      = $contact->paniers()->get();
+            $canbeDeleted = true;
+            foreach ($paniers as $panier) {
+                if ($panier->panier_pending == 1) {
+                    $canbeDeleted = false;
+                }
+            }
+            $murs = $contact->murs()->get();
+            if (isset($murs) && !empty($murs)) {
+                $canbeDeleted = false;
+            }
+            if ($canbeDeleted) {
+                $contact->delete();
+                $testcontact .= $contact->contact_id . ", ";
+            }
+        }
+        return json_encode($testcontact);
+    }
+
+    // ---- Fonction de nettoyage de la base mur
+    public function clean_walls(Request $request)
+    {
+        $murs    = Mur::where('mur_createdate', '<', Carbon::now()->subYear())->where(['mur_deleted' => 1])->get();
+        $testmur = "";
+        foreach ($murs as $mur) {
+            $mur->delete();
+            $testmur .= $mur->mur_id . ", ";
+        }
+        return json_encode($testmur);
+    }
+
+    // ---- Fonction de nettoyage de la base panier et panierContent
+    public function clean_baskets(Request $request)
+    {
+        $paniers    = Panier::where('panier_createdate', '<', Carbon::now()->subMonth(2))->where(['panier_pending' => 0])->get();
+        $testpanier = "";
+        foreach ($paniers as $panier) {
+            $testpanier    .= $panier->panier_id . ": ";
+            $panierContents = $panier->panierContents()->get();
+            foreach ($panierContents as $panierContent) {
+                $testpanier .= $panierContent->panier_content_id . ', ';
+                $panierContent->delete();
+            }
+            $panier->delete();
+        }
+        return json_encode($testpanier);
+    }
 }

app/Http/Controllers/Api/v0/ContactController.php

@@ -1,114 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api\v0;
-
-use App\Models\Contact;
-use App\Http\Controllers\Controller;
-use App\Models\Site;
-use App\Traits\CouponTrait;
-use Illuminate\Http\Request;
-
-class ContactController extends Controller
-{
-    use CouponTrait;
-    
-    public function updateContact(Request $request)
-    {
-        // Validation des paramètres requis
-        $requiredFields = [
-            'refadherent' => 'string',
-            'nom'         => 'string',
-            'refsite'     => 'string',
-            'prenom'      => 'string',
-            'email'       => 'email',
-            'code_postal' => 'string',
-            'commune'     => 'string',
-        ];
-
-        $validated = [];
-        foreach ($requiredFields as $field => $type) {
-            $value = $request->input($field);
-            if (empty($value)) {
-                return response()->json([
-                    'Statut'  => 'KO',
-                    'Code'    => 101,
-                    'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents'
-                ]);
-            }
-            $validated[$field] = $value;
-        }
-
-        // Validation spécifique pour l'email
-        if (!filter_var($validated['email'], FILTER_VALIDATE_EMAIL)) {
-            return response()->json([
-                'Statut'  => 'KO',
-                'Code'    => 101,
-                'Message' => 'L\'email fourni n\'est pas valide'
-            ]);
-        }
-
-        // Validation du pays (entier ou par défaut)
-        $pays = $request->input('pays');
-        if ($pays !== null && $pays !== '') {
-            if (!filter_var($pays, FILTER_VALIDATE_INT)) {
-                return response()->json([
-                    'Statut'  => 'KO',
-                    'Code'    => 101,
-                    'Message' => 'Le pays doit être un entier'
-                ]);
-            }
-            $validated['pays'] = $pays;
-        } else {
-            $validated['pays'] = 250;
-        }
-
-        // Recherche du contact existant
-        $contact = Contact::where([
-            'contact_siteId' => $validated['refsite'],
-            'contact_ref'    => $validated['refadherent']
-        ])->first();
-
-        // Si le contact n'existe pas, on vérifie le site
-        if (!$contact) {
-            $site = Site::where('site_id', $validated['refsite'])->first();
-            if (!$site) {
-                return response()->json([
-                    'Statut'  => 'KO',
-                    'Code'    => 102,
-                    'Message' => 'Le site spécifié n\'existe pas'
-                ]);
-            }
-            $contact = new Contact();
-            $contact->contact_ref = $validated['refadherent'];
-            $contact->contact_siteId = $validated['refsite'];
-            $contact->contact_hash = $request->input('hashcode') ?: strtoupper(md5(uniqid(time(), true)));
-        }
-
-        // Mise à jour des champs
-        $contact->contact_prenom = $validated['prenom'];
-        $contact->contact_nom = $validated['nom'];
-        $contact->contact_email = $validated['email'];
-        $contact->contact_cp = $validated['code_postal'];
-        $contact->contact_ville = $validated['commune'];
-        $contact->contact_country = $validated['pays'];
-        $contact->contact_updatedate = now();
-
-        if ($request->filled('hashcode')) {
-            $contact->contact_hash = $request->hashcode;
-        }
-
-        // Sauvegarde et réponse
-        if ($contact->save()) {
-            return response()->json([
-                'Statut'    => 'OK',
-                'contact'   => $contact
-            ]);
-        }
-
-        return response()->json([
-            'Statut'  => 'KO',
-            'Code'    => 109,
-            'Message' => 'Une erreur est survenue'
-        ]);
-    }
-}

app/Http/Controllers/Api/v0/PanierController.php

@@ -1,509 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api\v0;
-
-use Illuminate\Http\Request;
-use App\Models\Panier;
-use App\Models\Campagne;
-use App\Models\Coupon;
-use App\Models\Contact;
-use App\Http\Controllers\Controller;
-use App\Models\Site;
-use App\Models\Log;
-use App\Models\PanierContent;
-use App\Traits\CouponTrait;
-use App\Traits\ThanksTrait;
-
-class PanierController extends Controller
-{
-    use ThanksTrait;
-    use CouponTrait;
-
-    public function updateBasket(Request $request)
-    {
-        if (isset($request->admin)) {
-            $source = 'ADMIN';
-        } else {
-            $source = 'API';
-        }
-        // ---- INIT du log
-        $log             = new Log();
-        $log->log_action = config('constants.updatebasket');
-        $log->log_source = $source;
-
-        if (isset($request->basketid)) {
-            $basketid = $request->basketid;
-            if ($basketid != '') {
-                $panier = Panier::where('panier_ref', $basketid)->first();
-                if (!$panier) {
-                    $log->log_params  = json_encode(['basketid' => $basketid]);
-                    $log->log_statut  = 'NOK';
-                    $log->log_message = "Le panier n'existe pas";
-                    $log->save();
-
-                    return response()->json([
-                        'Statut' => 'KO',
-                        'Code' => 106,
-                        'Message' => 'Le panier n\'existe pas'
-                    ]);
-                }
-
-                if (isset($request->panier) && $request->panier != "") {
-                    $panier    = $request->panier;
-                    $panierTab = explode(",", $panier);
-                    $coupons   = [];
-                    foreach ($panierTab as $panier) {
-                        $pos = strpos($panier, ")");
-                        if ($pos === false || substr_count($panier, ")") != 1) {
-                            $log->log_params  = json_encode(['basketid' => $basketid, 'panier' => $panier]);
-                            $log->log_statut  = 'NOK';
-                            $log->log_message = "Des paramètres de la requête sont mal renseignés ou non présents";
-                            $log->save();
-                            return response()->json([
-                                'Statut' => 'KO',
-                                'Code' => 101,
-                                'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents'
-                            ]);
-                        }
-                        $quantity   = substr($panier, 0, $pos);
-                        $quantity   = str_replace("(", "", $quantity);
-                        $couponCode = substr($panier, $pos + 1);
-
-                        if (is_numeric($quantity) && is_numeric($couponCode)) {
-                            if (isset($coupons[$couponCode])) {
-                                $coupons[$couponCode] = $coupons[$couponCode] + $quantity;
-                            } else {
-                                $coupons[$couponCode] = $quantity;
-                            }
-                        } else {
-                            $log->log_params  = json_encode(['basketid' => $basketid, 'panier' => $panier]);
-                            $log->log_statut  = 'NOK';
-                            $log->log_message = "Des paramètres de la requête sont mal renseignés ou non présents";
-                            $log->save();
-                            return response()->json([
-                                'Statut' => 'KO',
-                                'Code' => 101,
-                                'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents'
-                            ]);
-                        }
-                    }//end foreach
-                    // ---- Préparation message de log avec coupons
-                    $panierCoupons = [];
-                    foreach ($coupons as $code => $qty) {
-                        array_push($panierCoupons, ['cp_code' => $code, 'qty' => $qty]);
-                    }
-                    if (count($coupons) == 0) {
-                        die();
-                    }
-                } else {
-                    $log->log_params  = json_encode(['basketid' => $basketid, 'panier' => $panier]);
-                    $log->log_statut  = 'NOK';
-                    $log->log_message = "Des paramètres de la requête sont mal renseignés ou non présents";
-                    $log->save();
-                    return response()->json([
-                        'Statut' => 'KO',
-                        'Code' => 101,
-                        'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents'
-                    ]);
-                }//end if
-
-                // ---- MAJ du panier
-                $panier = Panier::where('panier_ref', $basketid)->first();
-                if ($panier) {
-                    foreach ($coupons as $couponCode => $quantity) {
-                        $cp     = Coupon::where('coupon_code', $couponCode)->first();
-                        $exists = $cp->campagnes->contains($panier->panier_campId);
-                        if ($cp && $exists) {
-                            $site          = $cp->coupon_siteId;
-                            $panierContent = PanierContent::where(['panier_content_panierId' => $panier->panier_id, 'panier_content_couponId' => $cp->coupon_id])->first();
-                            if ($panierContent) {
-                                $quantity += $panierContent->panier_content_quantity;
-                                if ($quantity <= 0) {
-                                    $quantity = 0;
-                                }
-                                // MAJ du contenu
-                                $panierContent->panier_content_quantity = $quantity;
-                                $panierContent->save();
-                            } else {
-                                // Ajout du contenu
-                                if ($quantity > 0) {
-                                    $panierNewContent                          = new PanierContent();
-                                    $panierNewContent->panier_content_panierId = $panier->panier_id;
-                                    $panierNewContent->panier_content_couponId = $cp->coupon_id;
-                                    $panierNewContent->panier_content_quantity = $quantity;
-                                    $panierNewContent->save();
-                                }
-                            }
-                        } else {
-                            $log->log_params  = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent, 'refsite' => $request->refsite, 'nom' => $request->nom, 'prenom' => $request->prenom, 'email' => $request->email, 'code postal' => $request->code_postal, 'commune' => $request->commune, 'panier' => $request->panier]);
-                            $log->log_statut  = 'NOK';
-                            $log->log_message = "Le coupon ne correspond pas aux coupons liés a la campagne";
-                            $log->save();
-
-                            return response()->json([
-                                'Statut' => 'KO',
-                                'Code' => 110,
-                                'Message' => 'Le coupon ne correspond pas aux coupons liés a la campagne'
-                            ]);
-                        }//end if
-                    }//end foreach
-                    // MAJ du status du panier
-                    $qty = $panier->panierContents()->sum('panier_content_quantity');
-                    if ($qty == 0) {
-                        $panier_pending = 0;
-                    } else {
-                        $panier_pending = 1;
-                    }
-                    $panier->panier_pending = $panier_pending;
-                    $panier->save();
-
-                    $campagne = Campagne::where(['camp_id' => $panier->panier_campId])->first();
-                    $log->log_refsite   = $campagne->camp_siteId;
-                    $log->log_contactId = $panier->panier_contactId;
-                    $log->log_params    = json_encode(['refcamp' => $panier->panier_campId, 'basketid' => $basketid, 'panier' => $panier]);
-                    $log->log_statut    = 'OK';
-                    $log->log_message   = json_encode(['Message' => 'Le panier a bien été créé/mis à jour', 'Coupons' => $panierCoupons], JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
-                    $log->save();
-
-                    $contact = Contact::where(['contact_id' => $panier->panier_contactId])->first();
-                    $site    = Site::where(['site_id' => $campagne->camp_siteId])->first();
-
-                    if (isset($contact->contact_nom) && isset($site->site_nom)) {
-                        if ($panier->panier_pending == 1) {
-                            $encours = "oui";
-                        } else {
-                            $encours = "non";
-                        }
-                        $response               = new \stdClass();
-                        $response->Site         = $site->site_nom . " (" . $site->site_id . ")";
-                        $response->Campagne     = $campagne->camp_name . " (" . $campagne->camp_id . ")";
-                        $response->Panier       = $panier->panier_ref;
-                        $response->DateCreation = date("d/m/Y", strtotime($panier->panier_createdate));
-                        $response->EnCours      = $encours;
-                        $response->Nom          = $contact->contact_nom;
-                        $response->Prenom       = $contact->contact_prenom;
-                        $response->Email        = $contact->contact_email;
-                        $response->CodePostal   = $contact->contact_cp;
-                        $response->Commune      = $contact->contact_ville;
-
-                        $allPanierContent = $panier->panierContents()->get();
-                        foreach ($allPanierContent as $panierContent) {
-                            $panCont = [];
-                            $coupon  = Coupon::where(['coupon_id' => $panierContent->panier_content_couponId])->first();
-                            if ($coupon) {
-                                array_push($panCont, $coupon->coupon_code . " - " . $coupon->coupon_name . " (x" . $panierContent->panier_content_quantity . ")");
-                            }
-                        }
-
-                        $response->panierContent = $panCont;
-
-                        return response()->json([
-                            'Statut' => 'OK',
-                            'Panier' => $response
-                        ]);
-                    } else {
-                        return response()->json([
-                            'Statut' => 'OK',
-                            'Panier' => $panier
-                        ]);
-                    }//end if
-                } else {
-                    $log->log_params  = json_encode(['basketid' => $basketid, 'panier' => $panier]);
-                    $log->log_statut  = 'NOK';
-                    $log->log_message = "Le panier n'existe pas";
-                    $log->save();
-                    return response()->json([
-                        'Statut' => 'KO',
-                        'Code' => 106,
-                        'Message' => 'Le panier n\'existe pas'
-                    ]);
-                }//end if
-            } else {
-                $log->log_params  = json_encode(['basketid' => $basketid, 'panier' => $panier]);
-                $log->log_statut  = 'NOK';
-                $log->log_message = "Le panier n'existe pas";
-                $log->save();
-                return response()->json([
-                    'Statut' => 'KO',
-                    'Code' => 106,
-                    'Message' => 'Le panier n\'existe pas'
-                ]);
-            }//end if
-        } else {
-            // ---- Contrôle des paramètres
-            $error = false;
-            if (isset($request->refcamp) && $request->refcamp != "") {
-                $refcamp  = $request->refcamp;
-                $campagne = Campagne::where(['camp_id' => $refcamp])->first();
-                if (!$campagne || $campagne->camp_published == 0 || ($campagne->camp_type->value != 1 && $campagne->camp_type->value != 3)) {
-                    $log->log_params  = json_encode(['refcamp' => $refcamp]);
-                    $log->log_statut  = 'NOK';
-                    $log->log_message = "La campagne n'existe pas ou n'est pas un panier";
-                    $log->save();
-
-                    return response()->json([
-                    'Statut' => 'KO',
-                    'Code' => 103,
-                    'Message' => 'La campagne n\'existe pas ou n\'est pas un panier'
-                    ]);
-                }
-            } else {
-                $error = true;
-            }
-            if (isset($request->refadherent) && $request->refadherent != "") {
-                $refadherent = $request->refadherent;
-            } else {
-                $error = true;
-            }
-            if (isset($request->nom) && $request->nom != "") {
-                $nom = $request->nom;
-            } else {
-                $error = true;
-            }
-            if (isset($request->refsite) && $request->refsite != "") {
-                $refsite = $request->refsite;
-                if ($refsite != $campagne->camp_siteId) {
-                    return response()->json([
-                    'Statut' => 'KO',
-                    'Code' => 103,
-                    'Message' => 'La campagne ne correspond à aucune campagnes du site'
-                    ]);
-                }
-            } else {
-                $error = true;
-            }
-            if (isset($request->prenom) && $request->prenom != "") {
-                $prenom = $request->prenom;
-            } else {
-                $error = true;
-            }
-            if (isset($request->email) && $request->email != "" && filter_var($request->email, FILTER_VALIDATE_EMAIL)) {
-                $email = $request->email;
-            } else {
-                $error = true;
-            }
-
-            if (isset($request->code_postal) && $request->code_postal != "") {
-                $code_postal = $request->code_postal;
-            } else {
-                $error = true;
-            }
-            if (isset($request->commune) && $request->commune != "") {
-                $commune = $request->commune;
-            } else {
-                $error = true;
-            }
-
-            if (isset($request->pays) && $request->pays != "") {
-                if (filter_var($request->pays, FILTER_VALIDATE_INT)) {
-                    $pays = $request->pays;
-                } else {
-                    $error = true;
-                }
-            } else {
-                $pays = 250;
-            }
-            if (isset($request->panier) && $request->panier != "") {
-                $panier    = $request->panier;
-                $panierTab = explode(",", $panier);
-                $coupons   = [];
-                foreach ($panierTab as $panier) {
-                    $pos = strpos($panier, ")");
-                    if ($pos === false) {
-                        $error = true;
-                    }
-                    $quantity   = substr($panier, 0, $pos);
-                    $quantity   = str_replace("(", "", $quantity);
-                    $couponCode = substr($panier, $pos + 1);
-
-                    if (is_numeric($quantity) && is_numeric($couponCode) && $quantity > 0) {
-                        if (isset($coupons[$couponCode])) {
-                            $coupons[$couponCode] = $coupons[$couponCode] + $quantity;
-                        } else {
-                            $coupons[$couponCode] = $quantity;
-                        }
-                    }
-                }
-                if (count($coupons) == 0) {
-                    die();
-                }
-            } else {
-                $error = true;
-            }//end if
-
-        // ---- Préparation message de log avec coupons
-            if (isset($coupons)) {
-                $panierCoupons = [];
-                foreach ($coupons as $code => $qty) {
-                    array_push($panierCoupons, ['cp_code' => $code, 'qty' => $qty]);
-                }
-            }
-
-
-            if ($error) {
-                $log->log_params  = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent, 'refsite' => $request->refsite, 'nom' => $request->nom, 'prenom' => $request->prenom, 'email' => $request->email, 'code postal' => $request->code_postal, 'commune' => $request->commune, 'panier' => $request->panier]);
-                $log->log_statut  = 'NOK';
-                $log->log_message = "Des paramètres de la requête sont mal renseignés ou non présents";
-                $log->save();
-
-                return response()->json([
-                'Statut' => 'KO',
-                'Code' => 101,
-                'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents'
-                ]);
-            }
-
-        // ---- Ajout/MAJ du contact
-            $contact = Contact::where(['contact_siteId' => $refsite, 'contact_ref' => $refadherent])->first();
-            if ($contact) {
-                // ---- Mise à jour du contact
-                $contact->contact_prenom     = $prenom;
-                $contact->contact_nom        = $nom;
-                $contact->contact_email      = $email;
-                $contact->contact_cp         = $code_postal;
-                $contact->contact_ville      = $commune;
-                $contact->contact_country    = $pays;
-                $contact->contact_updatedate = date('Y-m-d H:i:s');
-            } else {
-                // ---- Création du contact
-                $site = Site::where('site_id', $refsite)->first();
-
-                if ($site) {
-                    $contact                  = new Contact();
-                    $contact->contact_nom     = $nom;
-                    $contact->contact_prenom  = $prenom;
-                    $contact->contact_ref     = $refadherent;
-                    $contact->contact_email   = $email;
-                    $contact->contact_cp      = $code_postal;
-                    $contact->contact_ville   = $commune;
-                    $contact->contact_country = $pays;
-                    $contact->contact_siteId  = $refsite;
-                    $contact->contact_hash    = strtoupper(md5(uniqid(time(), true)));
-                } else {
-                    $log->log_params  = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent, 'refsite' => $request->refsite, 'nom' => $request->nom, 'prenom' => $request->prenom, 'email' => $request->email, 'code postal' => $request->code_postal, 'commune' => $request->commune, 'panier' => $request->panier]);
-                    $log->log_statut  = 'NOK';
-                    $log->log_message = "Le site spécifié n'existe pas";
-                    $log->save();
-
-                    return response()->json([
-                    'Statut' => 'KO',
-                    'Code' => 102,
-                    'Message' => 'Le site spécifié n\'existe pas'
-                    ]);
-                }//end if
-            }//end if
-            if (!$contact->save()) {
-                $log->log_params  = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent, 'refsite' => $request->refsite, 'nom' => $request->nom, 'prenom' => $request->prenom, 'email' => $request->email, 'code postal' => $request->code_postal, 'commune' => $request->commune, 'panier' => $request->panier]);
-                $log->log_statut  = 'NOK';
-                $log->log_message = "Une erreur est survenue";
-                $log->save();
-                return response()->json([
-                'Statut' => 'KO',
-                'Code' => 109,
-                'Message' => 'Une erreur est survenue'
-                ]);
-            }
-
-        // ---- Ajout/MAJ du panier
-            $panier = Panier::where(['panier_campId' => $refcamp, 'panier_contactId' => $contact->contact_id, 'panier_pending' => 1])->first();
-            if ($panier) {
-                foreach ($coupons as $couponCode => $quantity) {
-                    $camp = Campagne::where('camp_id', $panier->panier_campId)->first();
-                    $cp   = $camp->coupons()->where('coupon_code', $couponCode)->first();
-                    if ($cp) {
-                        $panierContent = PanierContent::where(['panier_content_panierId' => $panier->panier_id, 'panier_content_couponId' => $cp->coupon_id])->first();
-                        if ($panierContent) {
-                            // $quantity += $panierContent->panier_content_quantity;
-                            $panierContent->panier_content_quantity = $quantity + $panierContent->panier_content_quantity;
-                            // MAJ du contenu
-                            $panierContent->save();
-                            // $panierContent->update(['panier_content_quantity', $quantity]);
-                        } else {
-                            // Ajout du contenu
-                            if ($quantity > 0) {
-                                $panierNewContent                          = new PanierContent();
-                                $panierNewContent->panier_content_panierId = $panier->panier_id;
-                                $panierNewContent->panier_content_couponId = $cp->coupon_id;
-                                $panierNewContent->panier_content_quantity = $quantity;
-                                $panierNewContent->save();
-                            }
-                        }
-                    }
-                }//end foreach
-            } else {
-                // Ajout du panier et du contenu
-                $panierRef                 = strtoupper(md5(uniqid(time(), true)));
-                $panier                    = new Panier();
-                $panier->panier_ref        = $panierRef;
-                $panier->panier_campId     = $refcamp;
-                $panier->panier_contactId  = $contact->contact_id;
-                $panier->panier_createdate = date('Y-m-d H:i:s');
-                $panier->save();
-
-                foreach ($coupons as $couponCode => $quantity) {
-                    $cp = $campagne->coupons()->where('coupon_code', $couponCode)->first();
-                    if ($cp) {
-                        // Ajout du contenu
-                        if ($quantity > 0) {
-                            $panierNewContent                          = new PanierContent();
-                            $panierNewContent->panier_content_panierId = $panier->panier_id;
-                            $panierNewContent->panier_content_couponId = $cp->coupon_id;
-                            $panierNewContent->panier_content_quantity = $quantity;
-                            $panierNewContent->save();
-                        }
-                    }
-                }
-            }//end if
-
-            $log->log_params    = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent, 'refsite' => $request->refsite, 'nom' => $request->nom, 'prenom' => $request->prenom, 'email' => $request->email, 'code postal' => $request->code_postal, 'commune' => $request->commune, 'panier' => $request->panier]);
-            $log->log_contactId = $panier->panier_contactId;
-            $log->log_refsite   = $request->refsite;
-            $log->log_statut    = 'OK';
-            $log->log_message   = json_encode(['Message' => 'Le panier a bien été créé/mis à jour', 'Coupons' => $panierCoupons], JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
-            $log->save();
-
-            $contact = Contact::where(['contact_id' => $panier->panier_contactId])->first();
-            $site    = Site::where(['site_id' => $campagne->camp_siteId])->first();
-
-            if (isset($contact->contact_nom) && isset($site->site_nom)) {
-                if ($panier->panier_pending == 1) {
-                    $encours = "oui";
-                } else {
-                    $encours = "non";
-                }
-                $response               = new \stdClass();
-                $response->Site         = $site->site_nom . " (" . $site->site_id . ")";
-                $response->Campagne     = $campagne->camp_name . " (" . $campagne->camp_id . ")";
-                $response->Panier       = $panier->panier_ref;
-                $response->DateCreation = date("d/m/Y", strtotime($panier->panier_createdate));
-                $response->EnCours      = $encours;
-                $response->Nom          = $contact->contact_nom;
-                $response->Prenom       = $contact->contact_prenom;
-                $response->Email        = $contact->contact_email;
-                $response->CodePostal   = $contact->contact_cp;
-                $response->Commune      = $contact->contact_ville;
-
-                $allPanierContent = $panier->panierContents()->get();
-                $panCont          = [];
-                foreach ($allPanierContent as $panierContent) {
-                    $coupon = Coupon::where(['coupon_id' => $panierContent->panier_content_couponId])->first();
-                    if ($coupon) {
-                        array_push($panCont, $coupon->coupon_code . " - " . $coupon->coupon_name . " (x" . $panierContent->panier_content_quantity . ")");
-                    }
-                }
-
-                $response->panierContent = $panCont;
-
-                return response()->json([
-                    'Statut' => 'OK',
-                    'Panier' => $response
-                ]);
-            } else {
-                return response()->json([
-                    'Statut' => 'OK',
-                    'Panier' => $panier
-                ]);
-            }//end if
-        }//end if
-    }
-}

app/Http/Controllers/Api/v1/BasketController.php

@@ -1,140 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api\v1;
-
-use Illuminate\Http\Request;
-use App\Models\Campagne;
-use App\Enums\LogActions;
-use App\Http\Controllers\Controller;
-use App\Models\Basket;
-use App\Models\Coupon;
-use App\Models\Customers;
-use App\Traits\CouponTrait;
-use App\Traits\ThanksTrait;
-use App\Traits\LogTrait;
-
-class BasketController extends Controller
-{
-    use ThanksTrait, CouponTrait, LogTrait;
-
-    protected $logSource;
-    protected $logAction;
-
-    public function __construct()
-    {
-        $this->logAction = LogActions::updatebasket();
-        $this->logSource = 'API';
-    }
-
-    public function updateBasket(Request $request)
-    {
-        // Validate required parameters
-        $requiredParams = ['customer_hashcode', 'refcamp', 'refsite', 'panier'];
-        $error = array_any($requiredParams, fn($param) => empty($request->{$param}));
-
-        if ($error) {
-            $this->writeLogErrorWrongRequestParameters(
-                $request->refcamp ?? null,
-                $request->customer_hashcode ?? null,
-                $request->refsite ?? null,
-                $request->panier ?? null
-            );
-
-            return response()->json([
-                'Statut' => 'KO',
-                'Code' => 101,
-                'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents'
-            ]);
-        }
-
-        // Validate campaign
-        $refcamp  = $request->refcamp;
-        $campagne = Campagne::where('camp_id', $refcamp)->first();
-
-        if (!$campagne || $campagne->camp_published == 0 || !in_array($campagne->camp_type->value, [1, 3])) {
-            $this->writeLogErrorIncorrectCampaign($refcamp);
-            return response()->json([
-                'Statut' => 'KO',
-                'Code' => 103,
-                'Message' => 'La campagne n\'existe pas ou n\'est pas un panier'
-            ]);
-        }
-
-        $refsite = $request->refsite;
-        if ($refsite != $campagne->camp_siteId) {
-            return response()->json([
-                'Statut' => 'KO',
-                'Code' => 103,
-                'Message' => 'La campagne ne correspond à aucune campagnes du site'
-            ]);
-        }
-
-        // Parse panier
-        $panierTab = explode(",", $request->panier);
-        $coupons = [];
-        foreach ($panierTab as $item) {
-            $pos = strpos($item, ")");
-            if ($pos === false) {
-                $error = true;
-                break;
-            }
-
-            $quantity = str_replace("(", "", substr($item, 0, $pos));
-            $couponCode = substr($item, $pos + 1);
-
-            if (is_numeric($quantity) && is_numeric($couponCode) && $quantity > 0) {
-                $coupon = Coupon::where('coupon_code', $couponCode)->first();
-                if (isset($coupons[$coupon->coupon_id])) {
-                    $coupons[$coupon->coupon_id] += $quantity;
-                } else {
-                    $coupons[$coupon->coupon_id] = $quantity;
-                }
-            }
-        }
-
-        if (empty($coupons)) {
-            die();
-        }
-
-        if ($error) {
-            $this->writeLogErrorWrongRequestParameters(
-                $refcamp,
-                $request->customer_hashcode,
-                $campagne->camp_siteId,
-                $request->panier
-            );
-
-            return response()->json([
-                'Statut' => 'KO',
-                'Code' => 101,
-                'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents'
-            ]);
-        }
-
-        // Prepare panierCoupons for logging
-        $panierCoupons = [];
-        foreach ($coupons as $coupon_id => $qty) {
-            $panierCoupons[] = ['coupon_id' => $coupon_id, 'qty' => $qty];
-        }
-
-        // Retrieve customer
-        $customer = Customers::where('hashcode', $request->customer_hashcode)->first();
-
-        // Retrieve or create basket
-        $basket = Basket::updateContent($campagne, $coupons, $customer);
-
-        // Log success
-        $this->writeLogSuccessBasketCreated(
-            $refcamp,
-            $request->customer_hashcode,
-            $refsite,
-            $request->panier,
-            $panierCoupons
-        );
-
-        return response()->json([
-            'Statut' => 'OK',
-            'Panier' => $basket
-        ]);
-    }
-}

app/Http/Controllers/Api/v1/CouponsController.php

@@ -2,17 +2,18 @@
 
 namespace App\Http\Controllers\Api\v1;
 
-use App\Models\Campagne;
-use App\Models\Coupon;
-use App\Enums\CampaignTypes;
+use App\Campagne;
+use App\Coupon;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Coupons\PrintRequest;
 use App\Http\Resources\StatusResource;
 use App\Models\Customers;
+use App\Models\PrintedWalls;
+use App\Statistique;
 use App\Traits\CouponTrait;
 use App\Traits\GenerateBR;
 use PDF;
-use LDC\LDCCRM\CrmApiV4;
+use LDC\LDCCRM\CrmApiV2;
 
 class CouponsController extends Controller
 {
@@ -25,7 +26,6 @@ class CouponsController extends Controller
         $campagne       = Campagne::find($datas['refcamp']);
         $customer       = Customers::find($datas['hashcode']);
         $couponsToPrint = explode(",", $datas['coupons']);
-        $type           = $request->validated()['type'] ?? 'stream';
 
         if ($campagne->site->crm_token === null) {
             return new StatusResource(['status' => 'KO', 'code' => 500, 'message' => 'CRM Token is missing for site_id : ' . $campagne->site->site_id]);
@@ -39,14 +39,14 @@ class CouponsController extends Controller
             return new StatusResource(['status' => 'KO', 'code' => 422, 'message' => 'Coupons not found.']);
         }
 
-        $crm = new CrmApiV4(config('services.crm.endpoint'), $campagne->site->crm_token, $campagne->site->crm_password);
+        $crm = new CrmApiV2(config('crm.CRM_ENDPOINT'), $campagne->site->crm_token, $campagne->site->crm_password);
 
         try {
             /**
              * @var \LDC\LDCCRM\Models\Customer
              */
             $crmInfos = $crm->getCustomer($customer->hashcode);
-        } catch (\Exception) {
+        } catch (\Exception $e) {
             // TODO : Update error message
             return new StatusResource(['status' => 'KO', 'code' => 422, 'message' => 'Customer not found.']);
         }
@@ -58,22 +58,32 @@ class CouponsController extends Controller
         // TODO : Vérifier si les coupons sont dans la campagne
         // TODO : Logs
         $coupons = [];
-        if ($campagne->camp_type->equals(CampaignTypes::mur())) {
+        if ($campagne->camp_type == 0) {
 // ---- POUR LES MURS
-            foreach ($couponsToPrint as $coupon_code) {
+            foreach ($couponsToPrint as $key => $coupon_code) {
                 $cp = Coupon::where(['coupon_code' => $coupon_code])->first();
 
                 if (!$this->isUsed($cp, $campagne, $customer)) {
-                    $coupons[] = $this->printCoupon($cp, $customer, $crmInfos, $campagne);
+                    $coupons[] = $this->printCoupon($cp, $customer, $crmInfos);
+
+                    // ----- mémorise l'impression
+                    $mur              = new PrintedWalls();
+                    $mur->camp_id     = $campagne->camp_id;
+                    $mur->customer_id = $customer->id;
+                    $mur->coupon_id   = $cp->coupon_id;
+                    $mur->save();
+
+                    // Sauvegarde de stat
+                    $stat                     = new Statistique();
+                    $stat->stat_campId        = $campagne->camp_id;
+                    $stat->stat_couponId      = $cp->coupon_id;
+                    $stat->stat_couponPrinted = 1;
+                    $stat->save();
                 }
             }//end foreach
         }//end if
 
-        // $coupons contains all printed coupons
         $pdf = PDF::loadView('pdf.coupons', ['coupons' => $coupons]);
-        if ($type === 'dl') {
-            return $pdf->download(sprintf("coupons_%s_%s_%s.pdf", $crmInfos->firstname, $crmInfos->lastname, date('d-m-Y')));
-        }
         return new StatusResource(['status' => 'OK', 'pdf' => base64_encode($pdf->stream(sprintf("coupons_%s_%s_%s.pdf", $crmInfos->firstname, $crmInfos->lastname, date('d-m-Y'))))]);
     }
 }

app/Http/Controllers/Api/v1/CustomerController.php

@@ -2,26 +2,22 @@
 
 namespace App\Http\Controllers\Api\v1;
 
-use App\Models\Calendrier;
-use App\Models\Campagne;
-use App\Enums\CampaignTypes;
+use App\Calendrier;
+use App\Campagne;
 use App\Http\Requests\Customers\StoreRequest;
 use App\Http\Resources\CustomersResource;
 use App\Http\Resources\StatusResource;
 use App\Models\Customers;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Customers\BasketRequest;
 use App\Http\Requests\Customers\MurRequest;
 use App\Http\Resources\CouponsResource;
 use App\Traits\CouponTrait;
-use App\Traits\GenerateBR;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Request;
 
 class CustomerController extends Controller
 {
     use CouponTrait;
-    use GenerateBR;
 
     /**
      * Display a listing of the resource.
@@ -111,22 +107,12 @@ class CustomerController extends Controller
         return new StatusResource(['status' => 'KO', 'code' => '501', 'message' => 'Not Implemented']);
     }
 
-    /**
-     * Recupere le contenu d'un mur pour une campagne et un user
-     * @param MurRequest $request
-     * @return StatusResource
-     * @throws ValidationException
-     */
     public function mur(MurRequest $request)
     {
         $datas = $request->validated();
 
         $customer = Customers::where('hashcode', $datas['hashcode'])->first();
         $campagne = Campagne::find($datas['refcamp']);
-
-        if (!$campagne->camp_type->equals(CampaignTypes::mur())) {
-            return new StatusResource(['status' => 'KO', 'code' => 404, 'message' => 'Campaign is not mur.']);
-        }
         if ($campagne->camp_published === 0) {
             return new StatusResource(['status' => 'KO', 'code' => 404, 'message' => 'Campaign not found.']);
         }
@@ -143,7 +129,7 @@ class CustomerController extends Controller
             if (!$calendars->isEmpty()) {
                 $pub = false;
                 foreach ($calendars as $calendar) {
-                    if ($calendar->isPublished()) {
+                    if (strtotime(date('Y-m-d H:i:s')) > strtotime($calendar->calendrier_startdate) && strtotime(date('Y-m-d H:i:s')) < strtotime($calendar->calendrier_enddate)) {
                         $pub = true;
                     }
                 }
@@ -172,79 +158,4 @@ class CustomerController extends Controller
             'coupons' => CouponsResource::collection($coupons)
         ]);
     }
-
-    /**
-     * Recupere le contenu d'un panier pour une campagne et un user
-     * @param BasketRequest $request
-     * @return StatusResource
-     * @throws ValidationException
-     */
-    public function basket(BasketRequest $request)
-    {
-        $montantDispo = 0;
-        $montantTotal = 0;
-        $nbCoupons = 0;
-        $couponTotal = 0;
-        $coupons = [];
-
-        $datas = $request->validated();
-
-        $customer = Customers::where('hashcode', $datas['hashcode'])->first();
-        $campagne = Campagne::find($datas['refcamp']);
-
-        if (!$campagne->camp_type->equals(CampaignTypes::panier())) {
-            return new StatusResource(['status' => 'KO', 'code' => 404, 'message' => 'Campaign is not basket.']);
-        }
-        if ($campagne->camp_published === 0) {
-            return new StatusResource(['status' => 'KO', 'code' => 404, 'message' => 'Campaign not found.']);
-        }
-        $basket = $customer->baskets()->where('campagne_id', $campagne->camp_id)->first();
-        if (is_null($basket)) {
-            return new StatusResource(['status' => 'KO', 'code' => 404, 'message' => 'Basket not found.']);
-        }
-
-        foreach ($basket->contents as $content)
-        {
-            $published = true;
-            $nbCoupons += $content->quantity;
-            $couponTotal += $content->printed;
-            $montantTotal += ($content->coupon->coupon_value * $content->printed);
-            $coupon = $content->coupon()->whereRaw("coupon_published = 1 AND (coupon_mindatediffusion IS NULL  OR coupon_mindatediffusion <= NOW()) AND (coupon_maxdatediffusion IS NULL OR coupon_maxdatediffusion >= NOW()) AND (coupon_maxdatevalidity IS NULL OR coupon_maxdatevalidity >= NOW())")->first();
-            if (!is_null($coupon))
-            {
-                // ---- Contrôle des calendriers de diffusion
-                $calendars = Calendrier::where(['calendrier_couponId' => $coupon->coupon_id])->get();
-                if (!$calendars->isEmpty()) {
-                    $published = false;
-                    foreach ($calendars as $calendar) {
-                        if ($calendar->isPublished()) {
-                            $published = true;
-                        }
-                    }
-                }
-                if ($published){
-                    $montantDispo += ($coupon->coupon_value * $content->quantity);
-                    $montantTotal += ($coupon->coupon_value * $content->quantity);
-                    $couponTotal += $content->quantity;
-                    $coupons[] = [
-                        'quantity' => $content->quantity,
-                        'printed' => $content->printed,
-                        'coupon' => new CouponsResource($coupon)
-                    ];
-                }
-            }
-        }
-
-        return new StatusResource([
-            'status' => "OK",
-            'ref' => $basket->uuid,
-            'name' => $campagne->camp_name,
-            'limited_printing' => $campagne->camp_limitedPrinting,
-            'available_coupon' => $nbCoupons,
-            'available_amount' => $montantDispo,
-            'total_coupon' => $couponTotal,
-            'total_amount' => $montantTotal,
-            'coupons' => $coupons
-        ]);
-    }
 }

app/Http/Controllers/Api/v1/MurController.php

@@ -2,9 +2,8 @@
 
 namespace App\Http\Controllers\Api\v1;
 
-use App\Models\Calendrier;
-use App\Models\Campagne;
-use App\Enums\CampaignTypes;
+use App\Calendrier;
+use App\Campagne;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Murs\MursShowRequest;
 use App\Http\Resources\CouponsResource;
@@ -23,7 +22,7 @@ class MurController extends Controller
         if ($campagne->camp_published === 0) {
             return new StatusResource(['status' => 'KO', 'code' => 404, 'message' => 'Campaign not found.']);
         }
-        if (!$campagne->camp_type->equals(CampaignTypes::mur())) {
+        if ($campagne->camp_type !== 0) {
             return new StatusResource(['status' => 'KO', 'code' => 403, 'message' => 'Campaign type error.']);
         }
 
@@ -39,7 +38,7 @@ class MurController extends Controller
             if (!$calendars->isEmpty()) {
                 $pub = false;
                 foreach ($calendars as $calendar) {
-                    if ($calendar->isPublished()) {
+                    if (strtotime(date('Y-m-d H:i:s')) > strtotime($calendar->calendrier_startdate) && strtotime(date('Y-m-d H:i:s')) < strtotime($calendar->calendrier_enddate)) {
                         $pub = true;
                     }
                 }

app/Http/Controllers/Auth/LoginController.php

@@ -44,6 +44,6 @@ class LoginController extends Controller
      */
     protected function authenticated()
     {
-        return redirect('/');
+        return redirect()->route('home');
     }
 }

app/Http/Controllers/Bo/MaintenanceController.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Bo;
-
-use App\Http\Controllers\Controller;
-use App\Models\Log;
-use Carbon\Carbon;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class MaintenanceController extends Controller
-{
-    public function index(Request $request)
-    {
-        $datas = Log::select(
-            DB::raw("DATE_FORMAT(created_at, '%m/%Y') as month"),
-            DB::raw("COUNT(*) as count")
-        )
-        ->where('log_statut', 'NOK')
-        ->where('created_at', '>=', \Illuminate\Support\Facades\Date::now()->subMonths(5)->startOfMonth())
-        ->groupBy('month')
-        ->orderBy('month', 'asc')
-        ->get();
-
-        $logs = $datas->toArray();
-
-        return view('bo.maintenance.index', compact('logs'));
-    }
-}

app/Http/Controllers/Bo/UserController.php

@@ -1,74 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Bo;
-
-use App\Http\Controllers\Controller;
-use App\Http\Requests\Bo\Users\DestroyUserRequest;
-use App\Http\Requests\Bo\Users\StoreUserRequest;
-use App\Http\Requests\Bo\Users\UpdateUserRequest;
-use Illuminate\Http\Request;
-use App\Models\Site;
-use App\Models\User;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Hash;
-
-class UserController extends Controller
-{
-    public function index(Request $request)
-    {
-        $users = User::all();
-        return view('bo.users.index')->with(['users' => $users, 'logs' => []]);
-    }
-
-    public function create(Request $request)
-    {
-        $sites = Site::all();
-        return view('bo.users.create', compact('sites'));
-    }
-
-    public function store(StoreUserRequest $request)
-    {
-        $user = new User();
-        $user->fill($request->validated());
-        $user->password = Hash::make($request->password);
-        $user->save();
-
-        $sites = Site::whereIn('site_id', $request->site)->get()->pluck('id')->toArray();
-        $user->sites()->sync($sites);
-
-        return to_route('bo.users.edit', $user);
-    }
-
-    public function edit(User $user)
-    {
-        $sites     = Site::all();
-        $usersites = $user->sites()->get()->pluck('site_id')->toArray();
-
-        return view('bo.users.edit', compact('user', 'sites', 'usersites'));
-    }
-
-    public function update(UpdateUserRequest $request, User $user)
-    {
-        $user->fill($request->validated());
-        $user->save();
-
-        $sites = Site::whereIn('site_id', $request->site)->get()->pluck('id')->toArray();
-        $user->sites()->sync($sites);
-
-        $marques = Auth::user()->sites;
-        $submarques = $marques->map(fn($marque) => $marque->only(['id', 'site_nom', 'site_id', 'site_logo']));
-        session()->put('marques', $submarques);
-
-        return to_route('bo.users.edit', $user);
-    }
-
-    public function destroy(DestroyUserRequest $request, User $user)
-    {
-        if ($user->delete()) {
-            return to_route('bo.users.index');
-        } else {
-            session()->flash('delete_nok', 'Erreur lors de la suppression');
-            return view('bo.user.index');
-        }
-    }
-}

app/Http/Controllers/BrandChangeController.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Http\Requests\BrandChange\InvokeBrandChange;
-
-class BrandChangeController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\InvokeBrandChange  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(InvokeBrandChange $request)
-    {
-        // TODO : Revoir le passage du site
-        $site = \App\Models\Site::find($request->site_id);
-        session()->put('site', $site);
-        return back();
-    }
-}

app/Http/Controllers/CampagneController.php

@@ -2,29 +2,21 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Campagne;
-use App\Models\Site;
-use App\Models\Coupon;
-use App\Models\Contact;
-use App\Enums\CampaignTypes;
-use App\Http\Requests\Campaign\AddCouponsCampaign;
-use App\Http\Requests\Campaign\DeleteCampaign;
-use App\Http\Requests\Campaign\RemoveCouponCampaign;
-use App\Http\Requests\Campaign\RemoveNotifCampaign;
-use App\Http\Requests\Campaign\ShowDemoCampaign;
-use App\Http\Requests\Campaign\StoreCampaign;
-use App\Http\Requests\Campaign\StoreNotifCampaign;
-use App\Http\Requests\Campaign\UpdateCampaign;
-use App\Models\Mur;
-use App\Models\PanierContent;
-use App\Models\Notification;
-use App\Models\Panier;
+use App\Campagne;
+use App\Site;
+use App\Coupon;
+use App\Contact;
+use App\Mur;
+use App\PanierContent;
+use App\Notification;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\File;
 use App\Traits\CouponTrait;
+use Response;
 
 class CampagneController extends Controller
 {
+    // use BarcodeGenerator;
     use CouponTrait;
 
     /**
@@ -34,11 +26,8 @@ class CampagneController extends Controller
      */
     public function index()
     {
-        // TODO : Revoir le passage du site id ?
-        $siteId = session()->get('site')->site_id;
-
-        $campagnes = Campagne::where('camp_siteId', $siteId)->get();
-        return view('campagnes.index')->with('campagnes', $campagnes);
+        $campagnes = Campagne::where('camp_siteId', session()->get('site')->site_id)->get();
+        return view('campagne.index')->with('campagnes', $campagnes);
     }
 
     /**
@@ -48,32 +37,38 @@ class CampagneController extends Controller
      */
     public function create()
     {
-        return view('campagnes.create');
+        return view('campagne.create');
     }
 
     /**
      * Store a newly created resource in storage.
      *
-     * @param  StoreCampaign  $request
+     * @param  \Illuminate\Http\Request $request
      * @return \Illuminate\Http\Response
      */
-    public function store(StoreCampaign $request)
+    public function store(Request $request)
     {
-        // TODO : Revoir le passage du site
+
+        $campagne                 = new Campagne();
+        $campagne->camp_name      = $request->input('camp_name');
+        $campagne->camp_type      = $request->input('camp_type');
+        $campagne->camp_published = $request->input('camp_published');
+        if (null !== $request->input('camp_limitedPrinting')) {
+            $campagne->camp_limitedPrinting = $request->input('camp_limitedPrinting');
+        }
+        $campagne->camp_siteId = session()->get('site')->site_id;
+
         $site = session()->get('site');
 
-        $campagne = new Campagne();
-        $campagne->fill(array_merge($request->validated(), ['camp_siteId' => $site->site_id]));
-        $campagne->save();
-
         if ($site->campagnes()->save($campagne)) {
-            if ($campagne->camp_type->equals(CampaignTypes::mur())) {
+            // File::makeDirectory(public_path('/landings/' . $campagne->camp_id));
+            if ($campagne->camp_type == 0) {
                 File::copyDirectory(resource_path('/views/template/mur'), public_path('/landings/' . $campagne->camp_id));
-            } elseif ($campagne->camp_type->equals(CampaignTypes::panier())) {
+            } elseif ($campagne->camp_type == 1) {
                 File::copyDirectory(resource_path('/views/template/panier'), public_path('/landings/' . $campagne->camp_id));
-            } elseif ($campagne->camp_type->equals(CampaignTypes::murss())) {
+            } elseif ($campagne->camp_type == 2) {
                 File::copyDirectory(resource_path('/views/template/murnoselection'), public_path('/landings/' . $campagne->camp_id));
-            } elseif ($campagne->camp_type->equals(CampaignTypes::paniers())) {
+            } elseif ($campagne->camp_type == 3) {
                 File::copyDirectory(resource_path('/views/template/panierselection'), public_path('/landings/' . $campagne->camp_id));
             }
         }
@@ -84,209 +79,120 @@ class CampagneController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  \App\Models\Campagne $campagne
+     * @param  \App\Campagne $campagne
      * @return \Illuminate\Http\Response
      */
     public function edit(Campagne $campagne)
     {
-        // TODO : Revoir le passage du site id
-        $siteId = session()->get('site')->id;
+        $site = Site::findOrFail(session()->get('site')->id)->first();
 
-        $couponsNotLinked = Coupon::whereDoesntHave('campagnes', function (\Illuminate\Contracts\Database\Query\Builder $q) use ($campagne): void {
-            $q->where('campagne_id', $campagne->camp_id);
-        })->where('coupon_siteId', $siteId)->where('coupon_published', 1)->get();
+        $couponsLinked = $campagne->coupons()->get();
+        $campid        = $campagne->camp_id;
 
-        return view('campagnes.edit', ['campagne' => $campagne, 'coupons' => $couponsNotLinked]);
+        $couponsNotLinked = Coupon::whereDoesntHave('campagnes', function ($q) use ($campid) {
+            $q->where('campagne_id', $campid);
+        })->where('coupon_siteId', session()->get('site')->id)->get();
+
+        return view('campagne.edit', ['campagne' => $campagne, 'coupons' => $couponsNotLinked, 'couponsLinked' => $couponsLinked]);
     }
 
     /**
      * Update the specified resource in storage.
      *
-     * @param  UpdateCampaign $request
-     * @param  \App\Models\Campagne            $campagne
+     * @param  \Illuminate\Http\Request $request
+     * @param  \App\Campagne            $campagne
      * @return \Illuminate\Http\Response
      */
-    public function update(UpdateCampaign $request, Campagne $campagne)
+    public function update(Request $request, Campagne $campagne)
     {
-        $campagne->fill($request->validated());
+        $site = Site::findOrFail(session()->get('site')->id)->first();
+
+        $couponsLinked = $campagne->coupons()->get();
+        $campid        = $campagne->camp_id;
+
+        $couponsNotLinked = Coupon::whereDoesntHave('campagnes', function ($q) use ($campid) {
+            $q->where('campagne_id', $campid);
+        })->where('coupon_siteId', session()->get('site')->id)->get();
 
         if (!isset($request->camp_limitedPrinting)) {
             $campagne->camp_limitedPrinting = 0;
+            $campagne->save();
         }
 
-        if ($campagne->save()) {
-            session()->flash('update_ok', __('La campagne a bien été modifiée'));
+        if ($campagne->update($request->all())) {
+            session()->flash('update_ok', 'La campagne a bien été modifiée');
         } else {
-            session()->flash('update_nok', __("Erreur lors de l'enregistrement"));
+            session()->flash('update_nok', 'Erreur lors de l\'enregistrement');
         }
 
-        return to_route('campagne.edit', ['campagne' => $campagne]);
+        return redirect()->route('campagne.edit', ['campagne' => $campagne]);
     }
 
     /**
      * Remove the specified resource from storage.
      *
-     * @param  DeleteCampaign $request
-     * @param  \App\Models\Campagne $campagne
+     * @param  \App\Campagne $campagne
      * @return \Illuminate\Http\Response
      */
-    public function destroy(DeleteCampaign $request, Campagne $campagne)
+    public function destroy(Campagne $campagne)
     {
         $campagne->camp_published = 0;
         $campagne->save();
-
+        // File::deleteDirectory(public_path('/landings/' . $campagne->camp_id));
         if ($campagne->delete()) {
             return redirect(route('campagne.index'));
         } else {
             session()->flash('delete_nok', 'Erreur lors de la suppression');
-            return view('campagnes.edit')->with('campagne', $campagne);
+            return view('campagne.edit')->with('campagne', $campagne);
         }
     }
 
-    // ---- Ajoute des coupons à une campagne
-    public function addCoupons(AddCouponsCampaign $request, Campagne $campaign)
+        /**
+         * @param  \Illuminate\Http\Request $request
+         *
+         * @return array
+         */
+    public function saveNotification(Request $request)
     {
-        $coupons = Coupon::find($request->ids);
-        $campaign->coupons()->attach($coupons);
-        return json_encode($coupons);
-    }
-
-    // ---- Efface des coupons d'une campagne
-    public function removeCoupon(RemoveCouponCampaign $request, Campagne $campaign, Coupon $coupon)
-    {
-        $campaign->coupons()->detach($coupon);
-        return json_encode($coupon);
-    }
-
-    /**
-     * @param  \Illuminate\Http\Request  $request
-     *
-     * @return array
-     */
-    public function saveNotification(StoreNotifCampaign $request, Campagne $campaign)
-    {
-        $notification = new Notification();
-        $notification->fill(array_merge($request->validated(), ['notif_campId' => $campaign->camp_id]));
+        $notification               = new Notification();
+        $notification->notif_name   = $request->input('notif_name');
+        $notification->notif_email  = $request->input('notif_email');
+        $notification->notif_campId = $request->input('notif_campId');
         $notification->save();
-
-        return back();
+        return redirect()->back();
     }
 
     /**
-     * @param RemoveNotifCampaign $request
-     * @param  \App\Models\Notification $notification
+     * @param  \App\Notification $notification
      *
      * @return array
      */
-    public function deleteNotification(RemoveNotifCampaign $request, Notification $notification)
+    public function deleteNotification($id)
     {
+        $notification = Notification::find($id);
         if ($notification->delete()) {
-            return back();
+            return redirect()->back();
         } else {
             session()->flash('delete_nok', 'Erreur lors de la suppression');
-            return back();
+            return redirect()->back();
         }
     }
 
-    // ---- Montre les campagnes avec un compte de démo
-    public function showDemo(ShowDemoCampaign $request, Campagne $campaign)
-    {
-        $siteId = $campaign->camp_siteId;
-        $demoContact = Contact::where(['contact_siteId' => $siteId, 'contact_ref' => 'DEMO'])->first();
-
-        if (!isset($demoContact)) {
-            $req = new \Illuminate\Http\Request();
-            $req->setMethod('POST');
-            $req->request->add([
-                'refsite' => $siteId,
-                'refadherent' => 'DEMO',
-                'prenom' => 'Compte',
-                'nom' => 'Démonstration',
-                'email' => 'demo@demo.fr',
-                'code_postal' => '72000',
-                'commune' => 'Le Mans',
-                'pays' => 250
-            ]);
-
-            $contact = new \App\Http\Controllers\ContactController();
-            $res = $contact->updateContact($req);
-            $demoContact = Contact::where(['contact_siteId' => $siteId, 'contact_ref' => 'DEMO'])->first();
-        }
-
-        if ($campaign->camp_type->equals(CampaignTypes::mur()) || $campaign->camp_type->equals(CampaignTypes::murss())) {
-            // ---- DEMONSTRATION POUR LES MURS
-            $myRequest = new \Illuminate\Http\Request();
-            $myRequest->setMethod('POST');
-            $myRequest->request->add(['refcamp' => $campaign->camp_id, 'refadherent' => 'DEMO', 'admin' => 1]);
-
-            // ---- EFFACER LES CONTROLES SI EXISTANT
-            $mur = new \App\Http\Controllers\MurController();
-            $res = $mur->deleteControlContact($myRequest);
-
-            // ---- RETOURNE l'URL
-            $url = "/?refsite=" . $siteId . "&refcamp=" . $campaign->camp_id . "&hash=" . $demoContact->contact_hash;
-            return json_encode($url);
-        } else {
-            // ---- DEMONSTRATION POUR LES PANIERS
-            $panier = Panier::where(['panier_campId' => $campaign->camp_id, 'panier_contactId' => $demoContact->contact_id, 'panier_pending' => 1])->first();
-
-            if ($panier) {
-                $url = "/?basketid=" . $panier->panier_ref;
-            } else {
-                // --- Pas de panier Création d'un nouveau
-                // --- Récuperation des coupons de la campagne
-                $coupons = $campaign->coupons()->get();
-
-                foreach ($coupons as $key => $coupon) {
-                    if (!$this->isAvailableToPrint($coupon, $campaign)) {
-                        $coupons->forget($key);
-                    }
-                }
-
-                $couponsTotal = count($coupons);
-                $couponsAdded = 0;
-                $basketContent = "";
-
-                foreach ($coupons as $coupon) {
-                    $basketContent .= "(1)" . $coupon->coupon_code;
-                    $couponsAdded++;
-                    if ($couponsAdded != $couponsTotal) {
-                        $basketContent .= ",";
-                    }
-                }
-                // --- création de l'objet request
-                $req = new \Illuminate\Http\Request();
-                $req->setMethod('POST');
-                $req->request->add([
-                    'refsite' => $siteId,
-                    'refcamp' => $campaign->camp_id,
-                    'refadherent' => $demoContact->contact_ref,
-                    'nom' => $demoContact->contact_nom,
-                    'prenom' => $demoContact->contact_prenom,
-                    'email' => $demoContact->contact_email,
-                    'code_postal' => $demoContact->contact_cp,
-                    'commune' => $demoContact->contact_ville,
-                    'pays' => $demoContact->contact_country,
-                    'panier' => $basketContent,
-                    'admin' => 1
-                ]);
-                $panier = new \App\Http\Controllers\PanierController();
-                $res = $panier->updateBasket($req);
-                $url = "/?basketid=" . $res->original['Panier']->Panier;
-            }
-            return json_encode($url);
-        }
-    }
-
-    // ---- Dépublie une campagne
-    public function togglePublish(Request $request, Campagne $campaign, int $state)
-    {
-        $campaign->camp_published = $state;
-        $campaign->save();
-
-        return json_encode($campaign);
-    }
-
+    /**
+     * @param  \App\Coupon  $coupon
+     *
+     * @return array
+     */
+    // public function deleteCoupon($id)
+    // {
+    // $coupon = Coupon::find($id);
+    // if ($notification->delete()) {
+    // return redirect()->back();
+    // } else {
+    // session()->flash('delete_nok', 'Erreur lors de la suppression');
+    // return redirect()->back();
+    // }
+    // }
     public function getDetail(Request $request)
     {
 
@@ -297,7 +203,7 @@ class CampagneController extends Controller
             $refcamp  = $request->refcamp;
             $campagne = Campagne::where(['camp_id' => $refcamp])->first();
             if (!$campagne) {
-                return response()->json([
+                return Response::json([
                     'Statut' => 'KO',
                     'Code' => 103,
                     'Message' => 'La campagne n\'existe pas'
@@ -310,7 +216,7 @@ class CampagneController extends Controller
             $refsite = $request->refsite;
             $site    = Site::where(['site_id' => $refsite])->first();
             if (!$site) {
-                return response()->json([
+                return Response::json([
                     'Statut' => 'KO',
                     'Code' => 102,
                     'Message' => 'Le site n\'existe pas'
@@ -321,7 +227,7 @@ class CampagneController extends Controller
         }
 
         if ($campagne->camp_siteId != $site->site_id) {
-            return response()->json([
+            return Response::json([
                 'Statut' => 'KO',
                 'Code' => 108,
                 'Message' => 'Pas de campagne pour ce site'
@@ -329,7 +235,7 @@ class CampagneController extends Controller
         }
 
         if ($error) {
-            return response()->json([
+            return Response::json([
                 'Statut' => 'KO',
                 'Code' => 101,
                 'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents'
@@ -338,32 +244,33 @@ class CampagneController extends Controller
 
         $enligne = ($campagne->camp_published == 1) ? "oui" : "non";
         switch ($campagne->camp_type) {
-            case CampaignTypes::mur():
+            case 0:
                 $type = "mur";
                 break;
-            case CampaignTypes::panier():
+            case 1:
                 $type = "panier";
                 break;
-            case CampaignTypes::murss():
+            case 2:
                 $type = "mur sans sélection";
                 break;
-            case CampaignTypes::paniers():
+            case 3:
                 $type = "panier avec sélection";
                 break;
         }
-        $data =  [
+        $data = array (
             'Site' => $site->site_nom,
             'Ref campagne' => $campagne->camp_id,
             'Nom campagne' => $campagne->camp_name,
             "En ligne" => $enligne,
             "Type" => $type,
-        ];
+        );
 
 
         $coupons = $campagne->coupons()->get();
 
         if ($coupons->count() > 0) {
             foreach ($coupons as $coupon) {
+                // var_dump($coupon->coupon_id);
                 // ---- Calcul du nombre de BR consommé
                 $diffuseMur = Mur::where(['mur_campId' => $campagne->camp_id, 'mur_couponId' => $coupon->coupon_id])->count();
 
@@ -393,7 +300,7 @@ class CampagneController extends Controller
                     $dateFinValidite = date("d/m/Y", strtotime($coupon->coupon_maxdatevalidity));
                 }
 
-                $codeTraitement    =  [
+                $codeTraitement    = array (
                     "Code traitement" => $coupon->coupon_code,
                     "Nom" => $coupon->coupon_name,
                     "Nb à diffuser" => $this->getFullQuantity($coupon),
@@ -403,13 +310,95 @@ class CampagneController extends Controller
                     "En ligne" => $enligne,
                     "Date de fin de diffusion" => $dateFinDiffusion,
                     "Date de fin de validité" => $dateFinValidite,
-                ];
+                );
                 $data['Coupons'][] = $codeTraitement;
             }//end foreach
         }//end if
-        return response()->json([
+        return Response::json([
             'Statut' => 'OK',
             'Détails Campagne' => $data
         ]);
     }
+
+    public function getDiffCamp(Request $request)
+    {
+        $error = false;
+        // ---- Contrôle des paramètres
+        if (isset($request->refcamp) && $request->refcamp != "") {
+            $refcamp  = $request->refcamp;
+            $campagne = Campagne::where(['camp_id' => $refcamp])->first();
+            if (!$campagne) {
+                return Response::json([
+                    'Statut' => 'KO',
+                    'Code' => 103,
+                    'Message' => 'La campagne n\'existe pas'
+                ]);
+            }
+        } else {
+            $error = true;
+        }
+        if (isset($request->refsite) && $request->refsite != "") {
+            $refsite = $request->refsite;
+            $site    = Site::where(['site_id' => $refsite])->first();
+            if (!$site) {
+                return Response::json([
+                    'Statut' => 'KO',
+                    'Code' => 102,
+                    'Message' => 'Le site n\'existe pas'
+                ]);
+            };
+        } else {
+            $error = true;
+        }
+
+        if (isset($request->refadherent) && $request->refadherent != "") {
+            $refadherent = $request->refadherent;
+            $contact     = Contact::where(['contact_siteId' => $refsite, 'contact_ref' => $refadherent])->first();
+            if (!$contact) {
+                return Response::json([
+                    'Statut' => 'KO',
+                    'Code' => 104,
+                    'Message' => 'Le contact n\'existe pas'
+                ]);
+            }
+        } else {
+            $error = true;
+        }
+
+        if ($error) {
+            return Response::json([
+                'Statut' => 'KO',
+                'Code' => 101,
+                'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents'
+            ]);
+        }
+
+        $data = array (
+            'Statut' => 'OK',
+            'Site' => $site->site_nom,
+            'Ref campagne' => $campagne->camp_id,
+            'Nom campagne' => $campagne->camp_name,
+            "Ref contact" => $refadherent,
+            "Email contact" => $contact->contact_email,
+        );
+
+        $coupons = $campagne->coupons()->get();
+
+        if ($coupons->count() > 0) {
+            foreach ($coupons as &$coupon) {
+                if ($this->isAvailable($coupon, $campagne, $contact)) {
+                    $dispo = 1;
+                } else {
+                    $dispo = 0;
+                }
+                $codeTraitement             = array (
+                    "Code traitement" => $coupon->coupon_code,
+                    "Nom" => $coupon->coupon_name,
+                    "Nb disponible" => $dispo,
+                );
+                $data['Codes traitement'][] = $codeTraitement;
+            }
+        }
+        return Response::json($data);
+    }
 }

app/Http/Controllers/ChangeMarqueController.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class ChangeMarqueController extends Controller
+{
+    /**
+     * Handle the incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\Response
+     */
+    public function __invoke(Request $request)
+    {
+        $siteId       = $request->input('site_id');
+        $currentRoute = $request->input('current_route');
+        $site         = \App\Site::findOrFail($siteId);
+        session()->put('site', $site);
+
+        return redirect('/bo/' . $currentRoute);
+    }
+}

app/Http/Controllers/ContactController.php

@@ -0,0 +1,292 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Contact;
+use App\Site;
+use App\Campagne;
+use Response;
+use Illuminate\Http\Request;
+
+class ContactController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $contacts = Contact::where('contact_siteId', session()->get('site')->site_id)->orderBy('contact_createdate', 'DESC')->take(10)->get();
+
+        return view('contact.index')->with('contacts', $contacts)->with('search', false);
+    }
+
+
+    public function search_contact(Request $request)
+    {
+            session()->put('active_route', 'contact');
+            $page      = $request->input('page');
+            $name      = $request->input('searchName');
+            $firstname = $request->input('searchFirstname');
+            $email     = $request->input('searchEmail');
+            $cp        = $request->input('searchCp');
+            $ville     = $request->input('searchVille');
+            $country   = $request->input('searchCountry');
+
+        if (isset($name) || isset($firstname) || isset($email) || isset($cp) || isset($ville) || isset($country)) {
+            $contacts   = Contact::where('contact_siteId', session()->get('site')->site_id)
+                            ->searchFirstname($firstname)
+                            ->searchName($name)
+                            ->searchEmail($email)
+                            ->searchCp($cp)
+                            ->searchVille($ville)
+                            ->searchCountry($country)
+                            ->paginate(2, ['*'], 'page', $page);
+            $searchData = array(
+                'name' => $name,
+                'firstname' => $firstname,
+                'email' => $email,
+                'cp' => $cp,
+                'ville' => $ville,
+                'pays' => $country
+            );
+            return view('contact.index')->with('contacts', $contacts)->with('search', true)->with('searchData', $searchData);
+        } else {
+            $contacts = Contact::where('contact_siteId', session()->get('site')->site_id)->orderBy('contact_createdate', 'DESC')->take(10)->get();
+
+            return view('contact.index')->with('contacts', $contacts)->with('search', false);
+        }//end if
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        return view('contact.create');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $validatedData = $request->validate([
+            'contact_ref' => 'required|unique:contact',
+            'contact_nom' => 'required',
+            'contact_prenom' => 'required',
+            'contact_email' => 'required',
+            'contact_cp' => 'required',
+            'contact_ville' => 'required',
+            'contact_country' => 'required'
+        ]);
+
+        $contact                  = new Contact();
+        $contact->contact_nom     = $request->input('contact_nom');
+        $contact->contact_prenom  = $request->input('contact_prenom');
+        $contact->contact_ref     = $request->input('contact_ref');
+        $contact->contact_email   = $request->input('contact_email');
+        $contact->contact_cp      = $request->input('contact_cp');
+        $contact->contact_ville   = $request->input('contact_ville');
+        $contact->contact_country = $request->input('contact_country');
+        $contact->contact_hash    = strtoupper(md5(uniqid(time(), true)));
+
+        // $site = Site::findOrFail(session()->get('site')->id)->first();
+        $site = session()->get('site');
+
+        $contact->contact_siteId = $site->site_id;
+
+        $contact->save();
+
+        $contacts  = Contact::where('contact_siteId', session()->get('site')->site_id)->orderBy('contact_createdate', 'DESC')->take(10)->get();
+        $campagnes = Campagne::where(['camp_siteId' => $contact->contact_siteId, 'camp_published' => 1])->get();
+
+        return view('contact.edit', ['contact' => $contact, 'created' => true, 'contacts' => $contacts, 'campagnes' => $campagnes]);
+    }
+
+
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\Campagne $campagne
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(Contact $contact)
+    {
+        $campagnes = Campagne::where(['camp_siteId' => $contact->contact_siteId, 'camp_published' => 1])->get();
+
+        return view('contact.edit', ['contact' => $contact, 'campagnes' => $campagnes]);
+    }
+
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \App\Contact             $contact
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, Contact $contact)
+    {
+        $validatedData = $request->validate([
+            'contact_ref' => 'required',
+            'contact_nom' => 'required',
+            'contact_prenom' => 'required',
+            'contact_email' => 'required',
+            'contact_cp' => 'required',
+            'contact_ville' => 'required',
+            'contact_country' => 'required'
+        ]);
+
+        $campagnes = Campagne::where(['camp_siteId' => $contact->contact_siteId, 'camp_published' => 1])->get();
+        if ($contact->update($request->all())) {
+            session()->flash('update_ok', 'La campagne a bien été modifiée');
+        } else {
+            session()->flash('update_nok', 'Erreur lors de l\'enregistrement');
+        }
+
+        return redirect()->route('contact.edit', ['contact' => $contact]);
+    }
+
+    public function updateContact(Request $request)
+    {
+        if (isset($request->admin)) {
+            $source = 'ADMIN';
+        } else {
+            $source = 'API';
+        }
+        // ---- INIT du log
+        // $log = new Log();
+        // $log->log_action = config('constants.updatecontact');
+        // $log->log_source = $source;
+        $error = false;
+        // ---- Contrôle des paramètres
+        if (isset($request->refadherent) && $request->refadherent != "") {
+            $refadherent = $request->refadherent;
+        } else {
+            $error = true;
+        }
+        if (isset($request->nom) && $request->nom != "") {
+            $nom = $request->nom;
+        } else {
+            $error = true;
+        }
+        if (isset($request->refsite) && $request->refsite != "") {
+            $refsite = $request->refsite;
+        } else {
+            $error = true;
+        }
+
+        if (isset($request->prenom) && $request->prenom != "") {
+            $prenom = $request->prenom;
+        } else {
+            $error = true;
+        }
+        if (isset($request->email) && $request->email != "" && filter_var($request->email, FILTER_VALIDATE_EMAIL)) {
+            $email = $request->email;
+        } else {
+            $error = true;
+        }
+        if (isset($request->code_postal) && $request->code_postal != "") {
+            $code_postal = $request->code_postal;
+        } else {
+            $error = true;
+        }
+        if (isset($request->commune) && $request->commune != "") {
+            $commune = $request->commune;
+        } else {
+            $error = true;
+        }
+        if (isset($request->pays) && $request->pays != "") {
+            if (filter_var($request->pays, FILTER_VALIDATE_INT)) {
+                $pays = $request->pays;
+            } else {
+                $error = true;
+            }
+        } else {
+            $pays = 250;
+        }
+
+        if ($error) {
+            // $log->log_params = json_encode(['refadherent' => $request->refadherent, 'refsite'=>$request->refsite, 'nom' => $request->nom, 'prenom' => $request->prenom, 'email' => $request->email, 'code postal' => $request->code_postal, 'commune' => $request->commune]);
+            // $log->log_statut = 'NOK';
+            // $log->log_message = "Des paramètres de la requête sont mal renseignés ou non présents";
+            // $log->save();
+            return Response::json([
+                'Statut' => 'KO',
+                'Code' => 101,
+                'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents'
+            ]);
+        }
+
+        $contact = Contact::where(['contact_siteId' => $refsite, 'contact_ref' => $refadherent])->first();
+
+        if ($contact) {
+            $contact->contact_prenom     = $prenom;
+            $contact->contact_nom        = $nom;
+            $contact->contact_email      = $email;
+            $contact->contact_cp         = $code_postal;
+            $contact->contact_ville      = $commune;
+            $contact->contact_country    = $pays;
+            $contact->contact_updatedate = date('Y-m-d H:i:s');
+            if (isset($request->hashcode) && $request->hashcode != "") {
+                $contact->contact_hash = $request->hashcode;
+            }
+        } else {
+            $site = Site::where('site_id', $refsite)->first();
+
+            if ($site) {
+                $contact                  = new Contact();
+                $contact->contact_nom     = $nom;
+                $contact->contact_prenom  = $prenom;
+                $contact->contact_ref     = $refadherent;
+                $contact->contact_email   = $email;
+                $contact->contact_cp      = $code_postal;
+                $contact->contact_ville   = $commune;
+                $contact->contact_country = $pays;
+                $contact->contact_siteId  = $refsite;
+                if (isset($request->hashcode) && $request->hashcode != "") {
+                    $contact->contact_hash = $request->hashcode;
+                } else {
+                    $contact->contact_hash = strtoupper(md5(uniqid(time(), true)));
+                }
+            } else {
+                // $log->log_params = json_encode(['refadherent' => $request->refadherent, 'refsite'=>$request->refsite, 'nom' => $request->nom, 'prenom' => $request->prenom, 'email' => $request->email, 'code postal' => $request->code_postal, 'commune' => $request->commune]);
+                // $log->log_refsite = $request->refsite;
+                // $log->log_statut = 'NOK';
+                // $log->log_message = "Le site spécifié n'existe pas";
+                // $log->save();
+                return Response::json([
+                    'Statut' => 'KO',
+                    'Code' => 102,
+                    'Message' => 'Le site spécifié n\'existe pas'
+                ]);
+            }//end if
+        }//end if
+
+        if ($contact->save()) {
+            return Response::json([
+                'Statut' => 'OK',
+                'contact' => $contact
+            ]);
+        } else {
+            // $log->log_params = json_encode(['refadherent' => $request->refadherent, 'refsite'=>$request->refsite, 'nom' => $request->nom, 'prenom' => $request->prenom, 'email' => $request->email, 'code postal' => $request->code_postal, 'commune' => $request->commune]);
+            // $log->log_refsite = $request->refsite;
+            // $log->log_statut = 'NOK';
+            // $log->log_message = "Une erreur est survenue";
+            // $log->save();
+            return Response::json([
+                'Statut' => 'KO',
+                'Code' => 109,
+                'Message' => 'Une erreur est survenue'
+            ]);
+        }
+    }
+}

app/Http/Controllers/CouponController.php

@@ -4,15 +4,14 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
-use App\Models\Coupon;
-use App\Models\Site;
-use App\Models\Campagne;
-use App\Models\Mouvement;
-use App\Models\Calendrier;
-use App\Http\Requests\Coupons\StoreCoupons;
-use App\Http\Requests\Coupons\UpdateCoupons;
+use App\Coupon;
+use App\Site;
+use App\Campagne;
+use App\Mouvement;
+use App\Calendrier;
 use App\Traits\GenerateBR;
 use App\Traits\CouponTrait;
+use Validator;
 
 class CouponController extends Controller
 {
@@ -26,17 +25,23 @@ class CouponController extends Controller
      */
     public function index()
     {
-        // TODO : Revoir le passage du site
-        $site = session()->get('site');
-        $coupons = Coupon::where('coupon_siteId', $site->id)->get();
+        $campIds = Campagne::where('camp_siteId', session()->get('site')->site_id)
+            ->get()
+            ->pluck('camp_id')
+            ->flatten()
+            ->toArray();
+
+        $coupons = Coupon::where('coupon_siteId', session()->get('site')->id)->get();
+
         foreach ($coupons as $coupon) {
             // ---- Calcul de la quantité mise à disposition grace aux fonctions dans CouponTrait.php
             $coupon->coupon_quantity = $this->getFullQuantity($coupon);
             // ---- Calcul de la quantité restante toutes campagnes comprises grace aux fonctions dans CouponTrait.php
             $coupon->coupon_left = 0;
-            // $coupon->coupon_quantity -  $this->getUsedQuantity($coupon);
+// $coupon->coupon_quantity -  $this->getUsedQuantity($coupon);
         }
-        return view('coupon.index', ['coupons' => $coupons]);
+
+        return view('coupon.index', ['coupons' => $coupons, 'camps' => $campIds]);
     }
 
     /**
@@ -46,32 +51,51 @@ class CouponController extends Controller
      */
     public function create()
     {
-        // TODO : Revoir le passage du site
-        $site = session()->get('site');
-
         $campagnes = Campagne::where('camp_siteId', session()->get('site')->site_id)->get()
             ->pluck('camp_name', 'camp_id');
 
-        $site = Site::findOrFail($site->id);
+        $site = Site::where(['id' => session()->get('site')->id])->first();
         return view('coupon.create')->with('campagnes', $campagnes)->with('site', $site);
     }
 
     /**
      * Store a newly created resource in storage.
      *
-     * @param  StoreCoupons $request
+     * @param  \Illuminate\Http\Request $request
      * @return \Illuminate\Http\Response
      */
-    public function store(StoreCoupons $request)
+    public function store(Request $request)
     {
-        $site_id = $request->site_id;
+        $data = $request->all();
+
+        $v = Validator::make($data, [
+            'coupon_validity_text' => 'required',
+            'coupon_legal_mentions' => 'required',
+            'coupon_decoration_image' => 'required|image|mimes:jpeg,png',
+            'coupon_logo_image' => 'required|image|mimes:jpeg,png',
+            'coupon_rcs' => 'required',
+            'coupon_site_contact' => 'required',
+        ]);
+
+        $v->sometimes('coupon_gs1code', 'required|image|mimes:jpeg', function ($input) {
+            return isset($input->coupon_norme);
+        });
+
+        if ($v->fails()) {
+            return redirect('bo/coupon/' . $coupon->coupon_id . '/edit')
+                ->withErrors($v)
+                ->withInput();
+        }
+
+
 
         $datas = $this->saveImg($request);
 
-        $coupon = new Coupon();
-        $coupon->fill($datas);
 
-        // TODO : A revoir au moment ou on enlevera les images mobiles
+        $coupon               = new Coupon();
+        $coupon->coupon_code  = $datas['coupon_code'];
+        $coupon->coupon_name  = $datas['coupon_name'];
+        $coupon->coupon_value = $datas['coupon_value'];
         if (isset($datas['coupon_thumbnail1'])) {
             $coupon->coupon_thumbnail1 = $datas['coupon_thumbnail1'];
         }
@@ -87,21 +111,46 @@ class CouponController extends Controller
         if (isset($datas['coupon_image'])) {
             $coupon->coupon_image = $datas['coupon_image'];
         }
-
-         //TODO : Voir si on peut mettre le set a 0 dans la request
-        if (!isset($datas['coupon_published'])) {
+        if (isset($datas['coupon_norme'])) {
+            $coupon->coupon_norme   = $datas['coupon_norme'];
+            $coupon->coupon_gs1code = $datas['coupon_gs1code'];
+        }
+        if (isset($datas['coupon_enablelimitquantity'])) {
+            $coupon->coupon_enablelimitquantity = $datas['coupon_enablelimitquantity'];
+            $coupon->coupon_limitquantity       = $datas['coupon_limitquantity'];
+        }
+        if (isset($datas['coupon_enablelimitperiod'])) {
+            $coupon->coupon_enablelimitperiod = $datas['coupon_enablelimitperiod'];
+            $coupon->coupon_limitperiod       = $datas['coupon_limitperiod'];
+        }
+        if (isset($datas['coupon_published'])) {
+            $coupon->coupon_published = $datas['coupon_published'];
+        } else {
             $coupon->coupon_published = 0;
         }
-        if (!isset($datas['coupon_legal_mentions_splitted'])) {
+        if (isset($datas['coupon_legal_mentions_splitted'])) {
+            $coupon->coupon_legal_mentions_splitted = $datas['coupon_legal_mentions_splitted'];
+        } else {
             $coupon->coupon_legal_mentions_splitted = 0;
         }
+        $coupon->coupon_validity         = $datas['coupon_validity'];
+        $coupon->coupon_mindatediffusion = $datas['coupon_mindatediffusion'];
+        $coupon->coupon_maxdatediffusion = $datas['coupon_maxdatediffusion'];
+        $coupon->coupon_maxdatevalidity  = $datas['coupon_maxdatevalidity'];
 
-        $br_path = $this->generateBase($request, $coupon);
-        $coupon->coupon_image = $br_path;
-        $coupon->coupon_siteId = $site_id;
-        $coupon->save();
+        $coupon->coupon_validity_text  = $datas['coupon_validity_text'];
+        $coupon->coupon_legal_mentions = $datas['coupon_legal_mentions'];
+        if (isset($datas['coupon_decoration_image'])) {
+            $coupon->coupon_decoration_image = $datas['coupon_decoration_image'];
+        }
+        if (isset($datas['coupon_logo_image'])) {
+            $coupon->coupon_logo_image = $datas['coupon_logo_image'];
+        }
+        $coupon->coupon_rcs          = $datas['coupon_rcs'];
+        $coupon->coupon_site_contact = $datas['coupon_site_contact'];
+        $coupon->coupon_seuil_alert  = $datas['coupon_seuil_alert'];
 
-        $site = Site::findOrFail($site_id);
+        $site = Site::find($request->input('site_id'));
 
         $site->coupons()->save($coupon);
 
@@ -111,6 +160,15 @@ class CouponController extends Controller
             $coupon->mouvements()->save($mouvement);
         }
 
+        if (isset($datas['mouvementNbre'])) {
+            foreach ($datas['mouvementNbre'] as $key => $value) {
+                $mouvement                       = new Mouvement();
+                $mouvement->mouvement_nombre     = $value;
+                $mouvement->mouvement_created_at = $datas['mouvementDate'][$key];
+                $coupon->mouvements()->save($mouvement);
+            }
+        }
+
         if (isset($datas['startdate'])) {
             foreach ($datas['startdate'] as $key => $value) {
                 $calendar                       = new Calendrier();
@@ -120,13 +178,28 @@ class CouponController extends Controller
             }
         }
 
-        return to_route('coupon.edit', ['coupon' => $coupon]);
+        $br_path              = $this->generateBase($request, $coupon);
+        $coupon->coupon_image = $br_path;
+        $coupon->save();
+
+        return view('coupon.edit', ['coupon' => $coupon]);
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\Coupon $coupon
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Coupon $coupon)
+    {
+        return view('coupon.show', ['coupon' => $coupon]);
     }
 
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  \App\Models\Coupon $coupon
+     * @param  \App\Coupon $coupon
      * @return \Illuminate\Http\Response
      */
     public function edit(Coupon $coupon)
@@ -137,13 +210,33 @@ class CouponController extends Controller
     /**
      * Update the specified resource in storage.
      *
-     * @param  UpdateCoupons $request
-     * @param  \App\Models\Coupon              $coupon
+     * @param  \Illuminate\Http\Request $request
+     * @param  \App\Coupon              $coupon
      * @return \Illuminate\Http\Response
      */
-    public function update(UpdateCoupons $request, Coupon $coupon)
+    public function update(Request $request, Coupon $coupon)
     {
-        //TODO : Voir si on peut mettre le set a 0 dans la request
+
+        $data = $request->all();
+
+        $v = Validator::make($data, [
+            'coupon_decoration_image' => 'image|mimes:jpeg,png',
+            'coupon_logo_image' => 'image|mimes:jpeg,png',
+        ]);
+
+        $v->sometimes('coupon_gs1code', 'required|image|mimes:jpeg', function ($input) {
+            if (isset($input->coupon_gs1code_image_hidden)) {
+                return false;
+            }
+            return isset($input->coupon_norme);
+        });
+
+        if ($v->fails()) {
+            return redirect('bo/coupon/' . $coupon->coupon_id . '/edit')
+                ->withErrors($v)
+                ->withInput();
+        }
+
         if (!isset($request->coupon_enablelimitquantity)) {
             $coupon->coupon_enablelimitquantity = 0;
         }
@@ -159,17 +252,11 @@ class CouponController extends Controller
         if (!isset($request->coupon_legal_mentions_splitted)) {
             $coupon->coupon_legal_mentions_splitted = 0;
         }
-
-        $datas = $this->saveImg($request);
-        // On sauvegarde les informations
-        if ($coupon->update($datas)) {
-            // Si l'update est OK on met à jour l'image du BR
+        if ($coupon->update($this->saveImg($request))) {
+            $datas                = $this->saveImg($request);
             $br_path              = $this->generateBase($request, $coupon);
             $coupon->coupon_image = $br_path;
-            $coupon->save();
-
-            // Si on ajoute des BR
-            // TODO : Gestion de l'erreur si on ajoute une ligne vide
+            $coupon->update($this->saveImg($request));
             if (isset($datas['mouvementNbre'])) {
                 foreach ($datas['mouvementNbre'] as $key => $value) {
                     $mouvement                       = new Mouvement();
@@ -178,8 +265,6 @@ class CouponController extends Controller
                     $coupon->mouvements()->save($mouvement);
                 }
             }
-            // Si on ajoute une plage de diffusion
-            // TODO : Gestion de l'erreur si on ajoute une ligne vide
             if (isset($datas['startdate'])) {
                 $coupon->calendriers()->delete();
                 foreach ($datas['startdate'] as $key => $value) {
@@ -191,18 +276,18 @@ class CouponController extends Controller
             }
             session()->flash('update_ok', 'Mise à jour du coupon réussie !');
 
-            return to_route('coupon.edit', ['coupon' => $coupon]);
+            return redirect()->route('coupon.edit', ['coupon' => $coupon]);
         } else {
             return view('holder');
-        } //end if
+        }//end if
 
-        return to_route('coupon.edit', ['coupon' => $coupon]);
+        return redirect()->route('coupon.edit', ['coupon' => $coupon]);
     }
 
     /**
      * Remove the specified resource from storage.
      *
-     * @param  \App\Models\Coupon $coupon
+     * @param  \App\Coupon $coupon
      * @return \Illuminate\Http\Response
      */
     public function destroy(Coupon $coupon)
@@ -210,10 +295,10 @@ class CouponController extends Controller
         $coupon->coupon_published = 0;
         $coupon->save();
         if ($coupon->delete()) {
-            return to_route('coupon.index');
+            return redirect(route('coupon.index'));
         } else {
             session()->flash('delete_nok', 'Erreur lors de la suppression');
-            return back();
+            return view('coupon.edit')->with('coupon', $coupon);
         }
     }
 
@@ -226,6 +311,8 @@ class CouponController extends Controller
     {
         $datas = collect($request->all());
 
+        $imgs = collect(array());
+
         foreach ($datas as $key => $item) {
             if ($key == 'coupon_image' || $key == 'coupon_gs1code' || $key == 'coupon_decoration_image' || $key == 'coupon_logo_image' || (substr($key, 7, 9) == 'thumbnail' && strlen($key) < 18)) {
                 if (isset($item)) {

app/Http/Controllers/ExportController.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App;
+use CpChart\Data;
+use CpChart\Image;
+use App\Traits\CouponTrait;
+use App\Traits\GraphTrait;
+use App\Site;
+use App\Coupon;
+use Datetime;
+use Illuminate\Http\Request;
+
+class ExportController extends Controller
+{
+    use CouponTrait;
+    use GraphTrait;
+
+    /**
+     * Handle the incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Request $request)
+    {
+        $sites     = Site::all();
+        $startdate = new DateTime("first day of last month");
+        $startdate = $startdate->format('Y-m-d');
+        $enddate   = date('Y-m-d');
+
+        return view('export.index')->with(['sites' => $sites, 'startdate' => $startdate, 'enddate' => $enddate]);
+    }
+
+    // ------ AJAX Export
+    public function export_coupons(Request $request)
+    {
+        $ids       = $request->input('ids');
+        $startdate = date('Y-m-d', strtotime($request->input('startdate')));
+        $enddate   = date('Y-m-d', strtotime($request->input('enddate')));
+        $coupons   = Coupon::find($ids);
+
+        $labels = $this->getLabelsForStats($startdate, $enddate);
+
+        $paths = array();
+
+        foreach ($coupons as $coupon) {
+            $cpName                    = str_replace(' ', '', $coupon->coupon_name);
+            $now                       = strtotime(now());
+            $full_path                 = 'export/' . $cpName . '_' . $now . '.pdf';
+            $dataCoupon                = $this->getDataForCouponAllCamp($labels, $coupon);
+            $coupon->couponQuantity    = $this->getFullQuantity($coupon);
+            $coupon->couponFullPrinted = $this->getUsedQuantity($coupon);
+            $coupon->couponPrinted     = $this->getUsedQuantityOnPeriod($coupon, $startdate, $enddate);
+
+            $pdf = App::make('dompdf.wrapper');
+
+            $myData = new Data();
+
+            $myData->addPoints($dataCoupon, "My Serie 1");
+            $myData->addPoints($labels, "My Serie 2");
+            $myData->setAxisName(0, "Coupons Diffusés");
+            $myData->setAbscissa("My Serie 2");
+            $myData->setSerieTicks("My Serie 2", 2);
+            $serieSettings = array("R" => 229,"G" => 11,"B" => 11);
+            $myData->setPalette("My Serie 1", $serieSettings);
+            $myPicture = new Image(700, 230, $myData);
+            $myPicture->setGraphArea(60, 40, 670, 190);
+            $myPicture->setFontProperties(array("FontSize" => 10));
+            $myPicture->drawScale(array("DrawSubTicks" => true, 'LabelSkip' => 1, 'LabelRotation' => 25, "Mode" => SCALE_MODE_START0, "CycleBackground" => true,"GridR" => 102,"GridG" => 102,"GridB" => 102));
+            $myPicture->setShadow(true, array("X" => 1,"Y" => 1,"R" => 0,"G" => 0,"B" => 0,"Alpha" => 10));
+            $myPicture->drawLineChart(array("DisplayColor" => DISPLAY_AUTO));
+            $LabelSettings = array("NoTitle" => true);
+            $myPicture->Render('export/temp.png');
+
+            $view = view('export.template')->with(['src' => 'export/temp.png', 'coupon' => $coupon, 'startdate' => $startdate, 'enddate' => $enddate])->render();
+
+            // var_dump($view);
+            $pdf->loadHTML($view);
+            $pdf->save($full_path);
+            array_push($paths, $full_path);
+        }//end foreach
+
+        return json_encode($paths);
+    }
+}

app/Http/Controllers/Fo/BasketController.php

@@ -1,88 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Fo;
-
-use App\Models\Calendrier;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\Fo\Basket\PrintRequest;
-use App\Models\Basket;
-use App\Traits\GenerateBR;
-use PDF;
-use Illuminate\Http\Request;
-use LDC\LDCCRM\CrmApiV4;
-
-class BasketController extends Controller
-{
-    use GenerateBR;
-
-    // FIXME: Docblock
-    public function show(Request $request, Basket $basket)
-    {
-        $totalQuantity = $basket->contents->sum(fn($content) => $content->quantity - $content->printed);
-
-        if (!$totalQuantity) {
-            return view('fo.basket.empty', compact('basket'));
-        }
-
-        return view('fo.basket.show', compact('basket', 'totalQuantity'));
-    }
-
-    // FIXME: Docblock
-    public function print(PrintRequest $request, Basket $basket)
-    {
-        $campagne = $basket->campagne;
-
-        $crm = new CrmApiV4(config('services.crm.endpoint'), $campagne->site->crm_token, $campagne->site->crm_password);
-
-        /**
-         * @var \LDC\LDCCRM\Models\Customer
-         */
-        $crmInfos = $crm->getCustomer($basket->customer->hashcode);
-
-        throw_if(is_null($crmInfos), \Exception::class, 'Customer not found.');
-
-        $coupons = [];
-        $currentDateTime = date('Y-m-d H:i:s');
-
-        foreach ($basket->contents as $content) {
-            $coupon = $content->coupon()->whereRaw(
-                "coupon_published = 1 AND
-         (coupon_mindatediffusion IS NULL OR coupon_mindatediffusion <= NOW()) AND
-         (coupon_maxdatediffusion IS NULL OR coupon_maxdatediffusion >= NOW()) AND
-         (coupon_maxdatevalidity IS NULL OR coupon_maxdatevalidity >= NOW())"
-            )->first();
-
-            if ($coupon !== null) {
-                $calendars = Calendrier::where('calendrier_couponId', $coupon->coupon_id)->get();
-
-                $published = true;
-                if (!$calendars->isEmpty()) {
-                    $published = false;
-                    foreach ($calendars as $calendar) {
-                        if ($currentDateTime > $calendar->calendrier_startdate && $currentDateTime < $calendar->calendrier_enddate) {
-                            $published = true;
-                            break; // Exit loop early as condition is met
-                        }
-                    }
-                }
-
-                if ($published) {
-                    $qtyToPrint = $content->quantity - $content->printed;
-                    for ($i = 0; $i < $qtyToPrint; $i++) {
-                        $coupons[] = $this->printCoupon($coupon, $basket->customer, $crmInfos, $campagne);
-                    }
-                    $content->printed = $content->quantity;
-                    $content->save();
-                }
-            }
-        }
-
-        if (empty($coupons)) {
-            return to_route('fo.basket.show', $basket);
-        }
-
-        // $coupons contains all printed coupons
-        $pdf = PDF::loadView('pdf.coupons', ['coupons' => $coupons]);
-        return $pdf->download(sprintf("coupons_%s_%s_%s.pdf", $crmInfos->firstname, $crmInfos->lastname, date('d-m-Y_H-i-s')));
-    }
-}

app/Http/Controllers/HomeController.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Campagne;
+use Barryvdh\Debugbar\Facade as Debugbar;
+
+class HomeController extends Controller
+{
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        // $this->middleware('auth');
+    }
+
+    /**
+     * Show the application dashboard.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        $test = Campagne::find(102);
+
+        Debugbar::info($test);
+
+        return view('home')->with([
+            'test' => $test,
+        ]);
+    }
+}

app/Http/Controllers/MaintenanceController.php

@@ -0,0 +1,145 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Site;
+use App\User;
+use App\Log;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
+
+class MaintenanceController extends Controller
+{
+    public function show(Request $request)
+    {
+        $users = User::all();
+
+        foreach ($users as &$user) {
+            $sites             = $user->sites()->get();
+            $user->linkedSites = "";
+            foreach ($sites as $site) {
+                $user->linkedSites .= '<p>' . $site->site_nom . '</p>';
+            }
+        }
+        $dates = array(date('m/Y'));
+        for ($i = 1; $i < 12; $i++) {
+            $datebefore = date("m/Y", strtotime("-" . $i . " months"));
+            array_push($dates, $datebefore);
+        }
+        $count = array();
+        foreach ($dates as $month) {
+            $logs = Log::where(['log_statut' => 'NOK'])->whereMonth('created_at', $month)->count();
+            array_push($count, [$month, $logs]);
+        }
+
+        // $logArray = array();
+        // foreach ($logs as $logMonth) {
+        // $count = count($logMonth);
+        // foreach ($logMonth as $log) {
+        // $date = Carbon::parse($log->created_at)->format('m/Y');
+        // }
+        // array_push($logArray, [$date, $count]);
+        // }
+        return view('maintenance.index')->with(['users' => $users, 'logs' => $count]);
+    }
+
+    public function usercreate(Request $request)
+    {
+        $sites = Site::all();
+        return view('user.create')->with(['sites' => $sites]);
+    }
+
+    public function userstore(Request $request)
+    {
+
+        $validatedData = $request->validate([
+            'email' => 'required|unique:users|email',
+            'name' => 'required',
+            'password' => 'required'
+        ]);
+
+        $nom      = $request->name;
+        $email    = $request->email;
+        $password = $request->password;
+        $role     = $request->roles;
+
+        $user           = new User();
+        $user->name     = $nom;
+        $user->email    = $email;
+        $user->password = Hash::make($password);
+        $user->roles    = $role;
+        $user->save();
+
+        // MAJ des sites liés
+        if (isset($request->site)) {
+            $siteids = $request->site;
+            $sites   = Site::whereIn('site_id', $siteids)->get()->pluck('id')->toArray();
+            $user->sites()->sync($sites);
+        }
+
+
+        $sites     = Site::all();
+        $usersites = $user->sites()->get()->pluck('site_id')->toArray();
+        return view('user.edit')->with(['user' => $user, 'sites' => $sites, 'usersites' => $usersites]);
+    }
+
+    public function useredit(User $user)
+    {
+        $sites     = Site::all();
+        $usersites = $user->sites()->get()->pluck('site_id')->toArray();
+        return view('user.edit')->with(['user' => $user, 'sites' => $sites, 'usersites' => $usersites]);
+    }
+
+    public function userdestroy(User $user)
+    {
+        if ($user->delete()) {
+            return redirect(route('maintenance.show'));
+        } else {
+            session()->flash('delete_nok', 'Erreur lors de la suppression');
+            return view('maintenance.user.edit')->with('user', $user);
+        }
+    }
+
+    public function userupdate(Request $request, User $user)
+    {
+        // MAJ du User
+        $user->name  = $request->name;
+        $user->email = $request->email;
+        $user->roles = $request->roles;
+        $user->save();
+
+        // MAJ des sites liés
+        $siteids = $request->site;
+        $sites   = Site::whereIn('site_id', $siteids)->get()->pluck('id')->toArray();
+        $user->sites()->sync($sites);
+
+        $marques    = Auth::user()->sites;
+        $submarques = $marques->map(function ($marque) {
+            return $marque->only(['id', 'site_nom', 'site_id', 'site_logo']);
+        });
+
+        session()->put('marques', $submarques);
+
+        $users = User::all();
+
+        foreach ($users as &$user) {
+            $sites             = $user->sites()->get();
+            $user->linkedSites = "";
+            foreach ($sites as $site) {
+                $user->linkedSites .= '<p>' . $site->site_nom . '</p>';
+            }
+        }
+        $dates = array('02/2019');
+        for ($i = 1; $i < 12; $i++) {
+            $datebefore = date("m/Y", strtotime("-" . $i . " months"));
+            array_push($dates, $datebefore);
+        }
+        $count = array();
+        foreach ($dates as $month) {
+            $logs = Log::where(['log_statut' => 'NOK'])->whereMonth('created_at', $month)->count();
+            array_push($count, [$month, $logs]);
+        }
+        return view('maintenance.index')->with(['users' => $users, 'logs' => $count]);
+    }
+}

app/Http/Controllers/MouvementController.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Mouvement;
+use App\Coupon;
+use Illuminate\Http\Request;
+
+class MouvementController extends Controller
+{
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $mouvement                        = new Mouvement();
+        $mouvement->mouvement_type        = $request->input('mouvement_type');
+        $mouvement->mouvement_nombre      = $request->input('mouvement_nombre');
+        $mouvement->mouvement_commentaire = $request->input('mouvement_commentaire');
+
+        $coupon = Coupon::find($request->input('coupon_id'));
+
+        $coupon->mouvements()->save($mouvement);
+    }
+}

app/Http/Controllers/MurController.php

@@ -0,0 +1,316 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Campagne;
+use App\Contact;
+use App\Mur;
+use App\Log;
+use App\Traits\CouponTrait;
+use App\Traits\ThanksTrait;
+use Response;
+
+class MurController extends Controller
+{
+    use CouponTrait;
+    use ThanksTrait;
+
+    public function show(Request $request)
+    {
+        $datas = $request->all();
+        if (isset($datas['refcamp'])) {
+            $ref      = intval($datas['refcamp']);
+            $campagne = Campagne::where(['camp_id' => $ref])->first();
+        } else {
+            abort(404);
+        }
+        if (!isset($datas['refsite'])) {
+            abort(404);
+        }
+        if (!isset($campagne) || $campagne->camp_published == 0 || ($campagne->camp_type != 0 && $campagne->camp_type != 2)) {
+            abort(404);
+        }
+
+        if (isset($datas['hash'])) {
+            $contact = Contact::where([
+                'contact_hash' => $datas['hash'], 'contact_siteId' => $campagne->camp_siteId
+                ])->first();
+        } else {
+            abort(404);
+        }
+
+        $coupons = $this->getCouponsPublished($campagne);
+
+        foreach ($coupons as $coupon) {
+            $coupon->isAvailable        = $this->isAvailable($coupon, $campagne, $contact);
+            $coupon->isAvailableToPrint = $this->isAvailableToPrint($coupon, $campagne);
+        }
+        unset($coupon);
+
+        // Montant total et Nombre réductions disponible
+        $montantDispo    = 0;
+        $montantTotal    = 0;
+        $nbCoupon        = 0;
+        $nbCouponToPrint = 0;
+        foreach ($coupons as $coupon) {
+            $montantTotal += $coupon->coupon_value;
+            if ($coupon->isAvailable == true) {
+                $montantDispo += $coupon->coupon_value;
+                $nbCoupon++;
+            }
+            if ($coupon->isAvailableToPrint == true) {
+                $nbCouponToPrint++;
+            }
+        }
+
+        session()->put('campagne', $campagne);
+        session()->put('site', $campagne->site);
+        session()->put('contact', $contact);
+
+        return view('landings::' . $ref . '.index')
+                    ->with(['ref' => $ref, 'coupons' => $coupons, 'contact' => $contact, 'nb' => $nbCoupon, 'nbAvailableToPrint' => $nbCouponToPrint, 'montantDispo' => $montantDispo]);
+    }
+
+    public function printMur(Request $request)
+    {
+        if (isset($request->coupons)) {
+            session()->put('coupons', $request->coupons);
+            $coupons = $request->coupons;
+        }
+
+        if ($request->session()->has('campagne')) {
+            $campagne = $request->session()->get('campagne');
+        } else {
+            abort(419);
+        }
+
+        $ref = $campagne->camp_id;
+
+        return view('landings::' . $ref . '.imprimer')
+                    ->with(['ref' => $ref, 'coupons' => $coupons, 'contact' => $request->session()->get('contact')]);
+    }
+
+    public function deleteControlContact(Request $request)
+    {
+        if (isset($request->admin)) {
+            $source = 'ADMIN';
+        } else {
+            $source = 'API';
+        }
+
+        // ---- INIT du log
+        $log             = new Log();
+        $log->log_action = config('constants.delctrlcontact');
+        $log->log_source = $source;
+
+        $error = false;
+        // ---- Contrôle des paramètres
+        if (isset($request->refcamp) && $request->refcamp != "") {
+            $refcamp = $request->refcamp;
+        } else {
+            $error = true;
+        }
+        if (isset($request->refadherent) && $request->refadherent != "") {
+            $refadherent = $request->refadherent;
+        } else {
+            $error = true;
+        }
+        // Erreur si paramètres mal renseignés
+        if ($error) {
+            $log->log_params  = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent]);
+            $log->log_statut  = 'NOK';
+            $log->log_message = "Des paramètres de la requête sont mal renseignés ou non présents";
+            $log->save();
+
+            return Response::json([
+                'Statut' => 'KO',
+                'Code' => 101,
+                'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents'
+            ]);
+        }
+
+        // Check de la campagne
+        $campagne = Campagne::where('camp_id', $refcamp)->first();
+
+        if (!$campagne) {
+            $log->log_params  = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent]);
+            $log->log_statut  = 'NOK';
+            $log->log_message = "La campagne n'existe pas";
+            $log->save();
+            return Response::json([
+                'Statut' => 'KO',
+                'Code' => 103,
+                'Message' => 'La campagne n\'existe pas'
+            ]);
+        }
+
+
+        // Check du contact
+        $contact = Contact::where(['contact_ref' => $refadherent, 'contact_siteId' => $campagne->camp_siteId])->first();
+
+        if (!$contact) {
+            $log->log_params  = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent]);
+            $log->log_refsite = $campagne->camp_siteId;
+            $log->log_statut  = 'NOK';
+            $log->log_message = "Le contact n'existe pas";
+            $log->save();
+
+            return Response::json([
+                'Statut' => 'KO',
+                'Code' => 104,
+                'Message' => 'Le contact n\'existe pas'
+            ]);
+        }
+
+        if ($campagne) {
+            // Update
+            $mur = Mur::where(['mur_campId' => $refcamp, 'mur_contactId' => $contact->contact_id])->update(['mur_deleted' => '1']);
+            if ($mur != 0) {
+                $log->log_params    = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent]);
+                $log->log_refsite   = $campagne->camp_siteId;
+                $log->log_contactId = $contact->contact_id;
+                $log->log_statut    = 'OK';
+                $log->log_message   = $mur . " enregistrements ont été mis à jour.";
+                $log->save();
+                return Response::json([
+                    'Statut' => 'OK',
+                    'Message' => $mur . " enregistrements ont été mis à jour."
+                ]);
+            } else {
+                $log->log_params    = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent]);
+                $log->log_refsite   = $campagne->camp_siteId;
+                $log->log_contactId = $contact->contact_id;
+                $log->log_statut    = 'OK';
+                $log->log_message   = 'Aucun contrôle à effacer';
+                $log->save();
+                return Response::json([
+                    'Statut' => 'KO',
+                    'Code' => 110,
+                    'Message' => 'Aucun contrôle à effacer'
+                ]);
+            }//end if
+        }//end if
+        return;
+    }
+
+    public function montantDispoCampagne(Request $request)
+    {
+
+        // ---- Contrôle des paramètres
+        if (isset($request->refcamp) && $request->refcamp != "") {
+            $refcamp = $request->refcamp;
+        } else {
+            return Response::json([
+                'Statut' => 'KO',
+                'Code' => 101,
+                'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents'
+            ]);
+        }
+
+        // ------ Recuperation de la campagne
+        $camp = Campagne::where(['camp_id' => $refcamp])->first();
+        if (!$camp) {
+            return Response::json([
+                'Statut' => 'KO',
+                'Code' => 103,
+                'Message' => 'La campagne n\'existe pas'
+            ]);
+        }
+
+        // ------ Récupération des coupons de la campagne
+        $coupons = $camp->coupons()->where(['coupon_published' => 1])->get();
+        if (count($coupons) == 0) {
+            return Response::json([
+                'Statut' => 'KO',
+                'Code' => 105,
+                'Message' => 'La campagne est vide'
+            ]);
+        }
+
+        // ---- Montant total et Nombre réductions disponible
+        $montantTotal = 0;
+        foreach ($coupons as $coupon) {
+            $montantTotal += $coupon->coupon_value;
+        }
+
+        $montantTotal = number_format($montantTotal, 2, ",", " ");
+        $montantTotal = str_pad($montantTotal, 6, "0", STR_PAD_LEFT);
+
+        return Response::json([
+            'Statut' => 'OK',
+            'Message' => $montantTotal
+        ]);
+    }
+
+    public function montantDispoContact(Request $request)
+    {
+        $error = false;
+        if (isset($request->refcamp) && $request->refcamp != "") {
+            $refcamp = $request->refcamp;
+        } else {
+            $error = true;
+        }
+
+        if (isset($request->refsite) && $request->refsite != "") {
+            $refsite = $request->refsite;
+        } else {
+            $error = true;
+        }
+
+        if (isset($request->refadherent) && $request->refadherent != "") {
+            $refadherent = $request->refadherent;
+        } else {
+            $error = true;
+        }
+
+        if ($error) {
+            return Response::json([
+                'Statut' => 'KO',
+                'Code' => 101,
+                'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents'
+            ]);
+        }
+
+        $campagne = Campagne::where(['camp_id' => $refcamp])->where('camp_type', 'IN', array(0,2))->first();
+
+        if (!$campagne) {
+            return Response::json([
+                'Statut' => 'KO',
+                'Code' => 103,
+                'Message' => 'La campagne n\'existe pas'
+            ]);
+        }
+
+        $contact = Contact::where(['contact_siteId' => $refsite, 'contact_ref' => $refadherent])->first();
+        if (!$contact) {
+            return Response::json([
+                'Statut' => 'KO',
+                'Code' => 104,
+                'Message' => 'Le contact n\'existe pas'
+            ]);
+        }
+
+        $coupons = $this->getCouponsPublished($campagne);
+
+        foreach ($coupons as &$coupon) {
+            $coupon->isAvailable = $this->isAvailable($coupon, $campagne, $contact);
+        }
+        unset($coupon);
+
+        $montantDispo = 0;
+        foreach ($coupons as $coupon) {
+            if ($coupon->isAvailable == true) {
+                $montantDispo += $coupon->coupon_value;
+            }
+        }
+
+        $montantDispo = number_format($montantDispo, 2, ",", " ");
+        $montantDispo = str_pad($montantDispo, 6, "0", STR_PAD_LEFT);
+
+        return Response::json([
+            'Statut' => 'OK',
+            'Message' => $montantDispo
+        ]);
+    }
+}

app/Http/Controllers/PanierController.php

@@ -3,13 +3,16 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use App\Models\Panier;
-use App\Models\Campagne;
-use App\Models\Coupon;
-use App\Models\Contact;
-use App\Enums\CampaignTypes;
+use App\Panier;
+use App\Campagne;
+use App\Coupon;
+use App\Contact;
+use App\Site;
+use App\Log;
+use App\PanierContent;
 use App\Traits\CouponTrait;
 use App\Traits\ThanksTrait;
+use Response;
 
 class PanierController extends Controller
 {
@@ -20,22 +23,28 @@ class PanierController extends Controller
     {
         // $panier = Panier::find($request->query('basketid'));
         $panier = Panier::where(['panier_ref' => $request->basketid])->first();
-        abort_unless($panier, 404);
+        if (!$panier) {
+            abort(404);
+        }
         session()->put('panier', $panier);
         $panierCouponsCount = $this->getCountCouponsPanierPublished($panier);
         $contact            = Contact::where(['contact_id' => $panier->panier_contactId])->first();
-        abort_unless($contact, 404);
+        if (!$contact) {
+            abort(404);
+        }
         session()->put('contact', $contact);
 
         $campagne = Campagne::where(['camp_id' => $panier->panier_campId, 'camp_published' => 1])->first();
-        abort_unless($campagne, 404);
+        if (!$campagne) {
+            abort(404);
+        }
         session()->put('campagne', $campagne);
 
-        if ($campagne->camp_type->equals(CampaignTypes::panier())) {
+        if ($campagne->camp_type == 1) {
             $coupons = $this->getCouponsPublished($campagne);
         } else {
             $panierContents = $this->getPanierContentPublished($panier);
-            $coupons        = [];
+            $coupons        = array();
             foreach ($panierContents as $panierContent) {
                 $cp  = Coupon::where(['coupon_id' => $panierContent->panier_content_couponId])->first();
                 $qty = $panierContent->panier_content_quantity;
@@ -53,13 +62,12 @@ class PanierController extends Controller
     {
         if (isset($request->coupons)) {
             session()->put('coupons', $request->coupons);
+            $coupons = $request->coupons;
         }
 
-        $coupons = session('coupons', []);
-
-        abort_unless($request->session()->has('campagne'), 404);
-
-        $campagne = $request->session()->get('campagne');
+        if ($request->session()->has('campagne')) {
+            $campagne = $request->session()->get('campagne');
+        }
 
         $ref = $campagne->camp_id;
 
@@ -67,13 +75,502 @@ class PanierController extends Controller
                     ->with(['ref' => $ref, 'coupons' => $coupons, 'contact' => $request->session()->get('contact')]);
     }
 
+    public function updateBasket(Request $request)
+    {
+        if (isset($request->admin)) {
+            $source = 'ADMIN';
+        } else {
+            $source = 'API';
+        }
+        // ---- INIT du log
+        $log             = new Log();
+        $log->log_action = config('constants.updatebasket');
+        $log->log_source = $source;
+
+        if (isset($request->basketid)) {
+            $basketid = $request->basketid;
+            if ($basketid != '') {
+                $panier = Panier::where('panier_ref', $basketid)->first();
+                if (!$panier) {
+                    $log->log_params  = json_encode(['basketid' => $basketid]);
+                    $log->log_statut  = 'NOK';
+                    $log->log_message = "Le panier n'existe pas";
+                    $log->save();
+
+                    return Response::json([
+                        'Statut' => 'KO',
+                        'Code' => 106,
+                        'Message' => 'Le panier n\'existe pas'
+                    ]);
+                }
+
+                if (isset($request->panier) && $request->panier != "") {
+                    $panier    = $request->panier;
+                    $panierTab = explode(",", $panier);
+                    $coupons   = array();
+                    foreach ($panierTab as $panier) {
+                        $pos = strpos($panier, ")");
+                        if ($pos === false || substr_count($panier, ")") != 1) {
+                            $log->log_params  = json_encode(['basketid' => $basketid, 'panier' => $panier]);
+                            $log->log_statut  = 'NOK';
+                            $log->log_message = "Des paramètres de la requête sont mal renseignés ou non présents";
+                            $log->save();
+                            return Response::json([
+                                'Statut' => 'KO',
+                                'Code' => 101,
+                                'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents'
+                            ]);
+                        }
+                        $quantity   = substr($panier, 0, $pos);
+                        $quantity   = str_replace("(", "", $quantity);
+                        $couponCode = substr($panier, $pos + 1);
+
+                        if (is_numeric($quantity) && is_numeric($couponCode)) {
+                            if (isset($coupons[$couponCode])) {
+                                $coupons[$couponCode] = $coupons[$couponCode] + $quantity;
+                            } else {
+                                $coupons[$couponCode] = $quantity;
+                            }
+                        } else {
+                            $log->log_params  = json_encode(['basketid' => $basketid, 'panier' => $panier]);
+                            $log->log_statut  = 'NOK';
+                            $log->log_message = "Des paramètres de la requête sont mal renseignés ou non présents";
+                            $log->save();
+                            return Response::json([
+                                'Statut' => 'KO',
+                                'Code' => 101,
+                                'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents'
+                            ]);
+                        }
+                    }//end foreach
+                    // ---- Préparation message de log avec coupons
+                    $panierCoupons = array();
+                    foreach ($coupons as $code => $qty) {
+                        array_push($panierCoupons, ['cp_code' => $code, 'qty' => $qty]);
+                    }
+                    if (sizeof($coupons) == 0) {
+                        die();
+                    }
+                } else {
+                    $log->log_params  = json_encode(['basketid' => $basketid, 'panier' => $panier]);
+                    $log->log_statut  = 'NOK';
+                    $log->log_message = "Des paramètres de la requête sont mal renseignés ou non présents";
+                    $log->save();
+                    return Response::json([
+                        'Statut' => 'KO',
+                        'Code' => 101,
+                        'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents'
+                    ]);
+                }//end if
+
+                // ---- MAJ du panier
+                $panier = Panier::where('panier_ref', $basketid)->first();
+                if ($panier) {
+                    foreach ($coupons as $couponCode => $quantity) {
+                        $cp     = Coupon::where('coupon_code', $couponCode)->first();
+                        $exists = $cp->campagnes->contains($panier->panier_campId);
+                        if ($cp && $exists) {
+                            $site          = $cp->coupon_siteId;
+                            $panierContent = PanierContent::where(['panier_content_panierId' => $panier->panier_id, 'panier_content_couponId' => $cp->coupon_id])->first();
+                            if ($panierContent) {
+                                $quantity += $panierContent->panier_content_quantity;
+                                if ($quantity <= 0) {
+                                    $quantity = 0;
+                                }
+                                // MAJ du contenu
+                                $panierContent->panier_content_quantity = $quantity;
+                                $panierContent->save();
+                            } else {
+                                // Ajout du contenu
+                                if ($quantity > 0) {
+                                    $panierNewContent                          = new PanierContent();
+                                    $panierNewContent->panier_content_panierId = $panier->panier_id;
+                                    $panierNewContent->panier_content_couponId = $cp->coupon_id;
+                                    $panierNewContent->panier_content_quantity = $quantity;
+                                    $panierNewContent->save();
+                                }
+                            }
+                        } else {
+                            $log->log_params  = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent, 'refsite' => $request->refsite, 'nom' => $request->nom, 'prenom' => $request->prenom, 'email' => $request->email, 'code postal' => $request->code_postal, 'commune' => $request->commune, 'panier' => $request->panier]);
+                            $log->log_statut  = 'NOK';
+                            $log->log_message = "Le coupon ne correspond pas aux coupons liés a la campagne";
+                            $log->save();
+
+                            return Response::json([
+                                'Statut' => 'KO',
+                                'Code' => 110,
+                                'Message' => 'Le coupon ne correspond pas aux coupons liés a la campagne'
+                            ]);
+                        }//end if
+                    }//end foreach
+                    // MAJ du status du panier
+                    $qty = $panier->panierContents()->sum('panier_content_quantity');
+                    if ($qty == 0) {
+                        $panier_pending = 0;
+                    } else {
+                        $panier_pending = 1;
+                    }
+                    $panier->panier_pending = $panier_pending;
+                    $panier->save();
+
+                    $campagne = Campagne::where(['camp_id' => $panier->panier_campId])->first();
+                    // var_dump($panier->panier_campId);
+                    $log->log_refsite   = $campagne->camp_siteId;
+                    $log->log_contactId = $panier->panier_contactId;
+                    $log->log_params    = json_encode(['refcamp' => $panier->panier_campId, 'basketid' => $basketid, 'panier' => $panier]);
+                    $log->log_statut    = 'OK';
+                    $log->log_message   = json_encode(['Message' => 'Le panier a bien été créé/mis à jour', 'Coupons' => $panierCoupons], JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+                    $log->save();
+
+                    $contact = Contact::where(['contact_id' => $panier->panier_contactId])->first();
+                    $site    = Site::where(['site_id' => $campagne->camp_siteId])->first();
+
+                    if (isset($contact->contact_nom) && isset($site->site_nom)) {
+                        if ($panier->panier_pending == 1) {
+                            $encours = "oui";
+                        } else {
+                            $encours = "non";
+                        }
+                        $response               = new \stdClass();
+                        $response->Site         = $site->site_nom . " (" . $site->site_id . ")";
+                        $response->Campagne     = $campagne->camp_name . " (" . $campagne->camp_id . ")";
+                        $response->Panier       = $panier->panier_ref;
+                        $response->DateCreation = date("d/m/Y", strtotime($panier->panier_createdate));
+                        $response->EnCours      = $encours;
+                        $response->Nom          = $contact->contact_nom;
+                        $response->Prenom       = $contact->contact_prenom;
+                        $response->Email        = $contact->contact_email;
+                        $response->CodePostal   = $contact->contact_cp;
+                        $response->Commune      = $contact->contact_ville;
+
+                        $allPanierContent = $panier->panierContents()->get();
+                        foreach ($allPanierContent as $panierContent) {
+                            $panCont = [];
+                            $coupon  = Coupon::where(['coupon_id' => $panierContent->panier_content_couponId])->first();
+                            if ($coupon) {
+                                array_push($panCont, $coupon->coupon_code . " - " . $coupon->coupon_name . " (x" . $panierContent->panier_content_quantity . ")");
+                            }
+                        }
+
+                        $response->panierContent = $panCont;
+
+                        return Response::json([
+                            'Statut' => 'OK',
+                            'Panier' => $response
+                        ]);
+                    } else {
+                        return Response::json([
+                            'Statut' => 'OK',
+                            'Panier' => $panier
+                        ]);
+                    }//end if
+                } else {
+                    $log->log_params  = json_encode(['basketid' => $basketid, 'panier' => $panier]);
+                    $log->log_statut  = 'NOK';
+                    $log->log_message = "Le panier n'existe pas";
+                    $log->save();
+                    return Response::json([
+                        'Statut' => 'KO',
+                        'Code' => 106,
+                        'Message' => 'Le panier n\'existe pas'
+                    ]);
+                }//end if
+            } else {
+                $log->log_params  = json_encode(['basketid' => $basketid, 'panier' => $panier]);
+                $log->log_statut  = 'NOK';
+                $log->log_message = "Le panier n'existe pas";
+                $log->save();
+                return Response::json([
+                    'Statut' => 'KO',
+                    'Code' => 106,
+                    'Message' => 'Le panier n\'existe pas'
+                ]);
+            }//end if
+        } else {
+            // ---- Contrôle des paramètres
+            $error = false;
+            if (isset($request->refcamp) && $request->refcamp != "") {
+                $refcamp  = $request->refcamp;
+                $campagne = Campagne::where(['camp_id' => $refcamp])->first();
+                if (!$campagne || $campagne->camp_published == 0 || ($campagne->camp_type != 1 && $campagne->camp_type != 3)) {
+                    $log->log_params  = json_encode(['refcamp' => $refcamp]);
+                    $log->log_statut  = 'NOK';
+                    $log->log_message = "La campagne n'existe pas ou n'est pas un panier";
+                    $log->save();
+
+                    return Response::json([
+                    'Statut' => 'KO',
+                    'Code' => 103,
+                    'Message' => 'La campagne n\'existe pas ou n\'est pas un panier'
+                    ]);
+                }
+            } else {
+                $error = true;
+            }
+            if (isset($request->refadherent) && $request->refadherent != "") {
+                $refadherent = $request->refadherent;
+            } else {
+                $error = true;
+            }
+            if (isset($request->nom) && $request->nom != "") {
+                $nom = $request->nom;
+            } else {
+                $error = true;
+            }
+            if (isset($request->refsite) && $request->refsite != "") {
+                $refsite = $request->refsite;
+                if ($refsite != $campagne->camp_siteId) {
+                    return Response::json([
+                    'Statut' => 'KO',
+                    'Code' => 103,
+                    'Message' => 'La campagne ne correspond à aucune campagnes du site'
+                    ]);
+                }
+            } else {
+                $error = true;
+            }
+            if (isset($request->prenom) && $request->prenom != "") {
+                $prenom = $request->prenom;
+            } else {
+                $error = true;
+            }
+            if (isset($request->email) && $request->email != "" && filter_var($request->email, FILTER_VALIDATE_EMAIL)) {
+                $email = $request->email;
+            } else {
+                $error = true;
+            }
+
+            if (isset($request->code_postal) && $request->code_postal != "") {
+                $code_postal = $request->code_postal;
+            } else {
+                $error = true;
+            }
+            if (isset($request->commune) && $request->commune != "") {
+                $commune = $request->commune;
+            } else {
+                $error = true;
+            }
+
+            if (isset($request->pays) && $request->pays != "") {
+                if (filter_var($request->pays, FILTER_VALIDATE_INT)) {
+                    $pays = $request->pays;
+                } else {
+                    $error = true;
+                }
+            } else {
+                $pays = 250;
+            }
+            if (isset($request->panier) && $request->panier != "") {
+                $panier    = $request->panier;
+                $panierTab = explode(",", $panier);
+                $coupons   = array();
+                foreach ($panierTab as $panier) {
+                    $pos = strpos($panier, ")");
+                    if ($pos === false) {
+                        $error = true;
+                    }
+                    $quantity   = substr($panier, 0, $pos);
+                    $quantity   = str_replace("(", "", $quantity);
+                    $couponCode = substr($panier, $pos + 1);
+
+                    if (is_numeric($quantity) && is_numeric($couponCode) && $quantity > 0) {
+                        if (isset($coupons[$couponCode])) {
+                            $coupons[$couponCode] = $coupons[$couponCode] + $quantity;
+                        } else {
+                            $coupons[$couponCode] = $quantity;
+                        }
+                    }
+                }
+                if (sizeof($coupons) == 0) {
+                    die();
+                }
+            } else {
+                $error = true;
+            }//end if
+
+        // ---- Préparation message de log avec coupons
+            if (isset($coupons)) {
+                $panierCoupons = array();
+                foreach ($coupons as $code => $qty) {
+                    array_push($panierCoupons, ['cp_code' => $code, 'qty' => $qty]);
+                }
+            }
+
+
+            if ($error) {
+                $log->log_params  = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent, 'refsite' => $request->refsite, 'nom' => $request->nom, 'prenom' => $request->prenom, 'email' => $request->email, 'code postal' => $request->code_postal, 'commune' => $request->commune, 'panier' => $request->panier]);
+                $log->log_statut  = 'NOK';
+                $log->log_message = "Des paramètres de la requête sont mal renseignés ou non présents";
+                $log->save();
+
+                return Response::json([
+                'Statut' => 'KO',
+                'Code' => 101,
+                'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents'
+                ]);
+            }
+
+        // ---- Ajout/MAJ du contact
+            $contact = Contact::where(['contact_siteId' => $refsite, 'contact_ref' => $refadherent])->first();
+            if ($contact) {
+                // ---- Mise à jour du contact
+                $contact->contact_prenom     = $prenom;
+                $contact->contact_nom        = $nom;
+                $contact->contact_email      = $email;
+                $contact->contact_cp         = $code_postal;
+                $contact->contact_ville      = $commune;
+                $contact->contact_country    = $pays;
+                $contact->contact_updatedate = date('Y-m-d H:i:s');
+            } else {
+                // ---- Création du contact
+                $site = Site::where('site_id', $refsite)->first();
+
+                if ($site) {
+                    $contact                  = new Contact();
+                    $contact->contact_nom     = $nom;
+                    $contact->contact_prenom  = $prenom;
+                    $contact->contact_ref     = $refadherent;
+                    $contact->contact_email   = $email;
+                    $contact->contact_cp      = $code_postal;
+                    $contact->contact_ville   = $commune;
+                    $contact->contact_country = $pays;
+                    $contact->contact_siteId  = $refsite;
+                    $contact->contact_hash    = strtoupper(md5(uniqid(time(), true)));
+                } else {
+                    $log->log_params  = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent, 'refsite' => $request->refsite, 'nom' => $request->nom, 'prenom' => $request->prenom, 'email' => $request->email, 'code postal' => $request->code_postal, 'commune' => $request->commune, 'panier' => $request->panier]);
+                    $log->log_statut  = 'NOK';
+                    $log->log_message = "Le site spécifié n'existe pas";
+                    $log->save();
+
+                    return Response::json([
+                    'Statut' => 'KO',
+                    'Code' => 102,
+                    'Message' => 'Le site spécifié n\'existe pas'
+                    ]);
+                }//end if
+            }//end if
+            if (!$contact->save()) {
+                $log->log_params  = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent, 'refsite' => $request->refsite, 'nom' => $request->nom, 'prenom' => $request->prenom, 'email' => $request->email, 'code postal' => $request->code_postal, 'commune' => $request->commune, 'panier' => $request->panier]);
+                $log->log_statut  = 'NOK';
+                $log->log_message = "Une erreur est survenue";
+                $log->save();
+                return Response::json([
+                'Statut' => 'KO',
+                'Code' => 109,
+                'Message' => 'Une erreur est survenue'
+                ]);
+            }
+
+        // ---- Ajout/MAJ du panier
+            $panier = Panier::where(['panier_campId' => $refcamp, 'panier_contactId' => $contact->contact_id, 'panier_pending' => 1])->first();
+            if ($panier) {
+                foreach ($coupons as $couponCode => $quantity) {
+                    $camp = Campagne::where('camp_id', $panier->panier_campId)->first();
+                    $cp   = $camp->coupons()->where('coupon_code', $couponCode)->first();
+                    if ($cp) {
+                        $panierContent = PanierContent::where(['panier_content_panierId' => $panier->panier_id, 'panier_content_couponId' => $cp->coupon_id])->first();
+                        if ($panierContent) {
+                            // $quantity += $panierContent->panier_content_quantity;
+                            $panierContent->panier_content_quantity = $quantity + $panierContent->panier_content_quantity;
+                            // MAJ du contenu
+                            $panierContent->save();
+                            // $panierContent->update(['panier_content_quantity', $quantity]);
+                        } else {
+                            // Ajout du contenu
+                            if ($quantity > 0) {
+                                $panierNewContent                          = new PanierContent();
+                                $panierNewContent->panier_content_panierId = $panier->panier_id;
+                                $panierNewContent->panier_content_couponId = $cp->coupon_id;
+                                $panierNewContent->panier_content_quantity = $quantity;
+                                $panierNewContent->save();
+                            }
+                        }
+                    }
+                }//end foreach
+            } else {
+                // Ajout du panier et du contenu
+                $panierRef                 = strtoupper(md5(uniqid(time(), true)));
+                $panier                    = new Panier();
+                $panier->panier_ref        = $panierRef;
+                $panier->panier_campId     = $refcamp;
+                $panier->panier_contactId  = $contact->contact_id;
+                $panier->panier_createdate = date('Y-m-d H:i:s');
+                $panier->save();
+
+                foreach ($coupons as $couponCode => $quantity) {
+                    $cp = $campagne->coupons()->where('coupon_code', $couponCode)->first();
+                    if ($cp) {
+                        // Ajout du contenu
+                        if ($quantity > 0) {
+                            $panierNewContent                          = new PanierContent();
+                            $panierNewContent->panier_content_panierId = $panier->panier_id;
+                            $panierNewContent->panier_content_couponId = $cp->coupon_id;
+                            $panierNewContent->panier_content_quantity = $quantity;
+                            $panierNewContent->save();
+                        }
+                    }
+                }
+            }//end if
+
+            $log->log_params    = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent, 'refsite' => $request->refsite, 'nom' => $request->nom, 'prenom' => $request->prenom, 'email' => $request->email, 'code postal' => $request->code_postal, 'commune' => $request->commune, 'panier' => $request->panier]);
+            $log->log_contactId = $panier->panier_contactId;
+            $log->log_refsite   = $request->refsite;
+            $log->log_statut    = 'OK';
+            $log->log_message   = json_encode(['Message' => 'Le panier a bien été créé/mis à jour', 'Coupons' => $panierCoupons], JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+            $log->save();
+
+            $contact = Contact::where(['contact_id' => $panier->panier_contactId])->first();
+            $site    = Site::where(['site_id' => $campagne->camp_siteId])->first();
+
+            if (isset($contact->contact_nom) && isset($site->site_nom)) {
+                if ($panier->panier_pending == 1) {
+                    $encours = "oui";
+                } else {
+                    $encours = "non";
+                }
+                $response               = new \stdClass();
+                $response->Site         = $site->site_nom . " (" . $site->site_id . ")";
+                $response->Campagne     = $campagne->camp_name . " (" . $campagne->camp_id . ")";
+                $response->Panier       = $panier->panier_ref;
+                $response->DateCreation = date("d/m/Y", strtotime($panier->panier_createdate));
+                $response->EnCours      = $encours;
+                $response->Nom          = $contact->contact_nom;
+                $response->Prenom       = $contact->contact_prenom;
+                $response->Email        = $contact->contact_email;
+                $response->CodePostal   = $contact->contact_cp;
+                $response->Commune      = $contact->contact_ville;
+
+                $allPanierContent = $panier->panierContents()->get();
+                $panCont          = [];
+                foreach ($allPanierContent as $panierContent) {
+                    $coupon = Coupon::where(['coupon_id' => $panierContent->panier_content_couponId])->first();
+                    if ($coupon) {
+                        array_push($panCont, $coupon->coupon_code . " - " . $coupon->coupon_name . " (x" . $panierContent->panier_content_quantity . ")");
+                    }
+                }
+
+                $response->panierContent = $panCont;
+
+                return Response::json([
+                    'Statut' => 'OK',
+                    'Panier' => $response
+                ]);
+            } else {
+                return Response::json([
+                    'Statut' => 'OK',
+                    'Panier' => $panier
+                ]);
+            }//end if
+        }//end if
+    }
+
     public function showBasket(Request $request)
     {
         // ---- Contrôle des paramètres
         if (isset($request->basketid) && $request->basketid != "") {
             $basketid = $request->basketid;
         } else {
-            return response()->json([
+            return Response::json([
                 'Statut' => 'KO',
                 'Code' => 106,
                 'Message' => 'Le panier n\'existe pas'
@@ -82,7 +579,7 @@ class PanierController extends Controller
 
             $panier = Panier::where('panier_ref', $basketid)->first();
         if (!$panier) {
-            return response()->json([
+            return Response::json([
                 'Statut' => 'KO',
                 'Code' => 106,
                 'Message' => 'Le panier n\'existe pas'
@@ -97,7 +594,7 @@ class PanierController extends Controller
 
             $contact = $panier->contact()->where(['contact_id' => $panier->panier_contactId])->first();
         if (!$contact) {
-            return response()->json([
+            return Response::json([
                 'Statut' => 'KO',
                 'Code' => 104,
                 'Message' => 'Le contact n\'existe pas'
@@ -106,7 +603,7 @@ class PanierController extends Controller
 
             $campagne = $panier->campagne()->where(['camp_id' => $panier->panier_campId])->first();
         if (!$campagne) {
-            return response()->json([
+            return Response::json([
                 'Statut' => 'KO',
                 'Code' => 103,
                 'Message' => 'La campagne n\'existe pas'
@@ -115,7 +612,7 @@ class PanierController extends Controller
 
             $site = $campagne->site()->first();
         if ($site === null) {
-            return response()->json([
+            return Response::json([
                 'Statut' => 'KO',
                 'Code' => 102,
                 'Message' => 'Le site n\'existe pas'
@@ -124,7 +621,7 @@ class PanierController extends Controller
 
             $allPanierContent = $panier->panierContents()->get();
         if ($allPanierContent->count() == 0) {
-            return response()->json([
+            return Response::json([
                 'Statut' => 'KO',
                 'Code' => 108,
                 'Message' => 'Le panier n\'a pas de coupons liés'
@@ -152,7 +649,7 @@ class PanierController extends Controller
 
             $response->panierContent = $panCont;
 
-            return response()->json([
+            return Response::json([
                 'Statut' => 'OK',
                 'Informations Panier' => $response
             ]);

app/Http/Controllers/RedirectController.php

@@ -15,12 +15,16 @@ class RedirectController extends Controller
      */
     public function __invoke(Request $request)
     {
+        $mur    = new Controllers\MurController();
         $panier = new Controllers\PanierController();
 
         if (isset($request->basketid)) {
             return $panier->showTemplate($request);
+// $this->showTemplate($request);
+        } elseif (isset($request->hash)) {
+            return $mur->show($request);
         } else {
-            return to_route('login');
+            return redirect()->route('home');
         }
     }
 }

app/Http/Controllers/SiteController.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Site;
-use App\Models\User;
+use App\Site;
+use App\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
@@ -66,7 +66,9 @@ class SiteController extends Controller
         }
         // --- MAJ Selecteur marques
         $marques    = Auth::user()->sites;
-        $submarques = $marques->map(fn($marque) => $marque->only(['id', 'site_nom', 'site_id', 'site_logo']));
+        $submarques = $marques->map(function ($marque) {
+            return $marque->only(['id', 'site_nom', 'site_id', 'site_logo']);
+        });
 
         session()->put('marques', $submarques);
 
@@ -76,7 +78,7 @@ class SiteController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  \App\Models\Site $site
+     * @param  \App\Site $site
      * @return \Illuminate\Http\Response
      */
     public function edit(Site $site)
@@ -88,7 +90,7 @@ class SiteController extends Controller
      * Update the specified resource in storage.
      *
      * @param  \Illuminate\Http\Request $request
-     * @param  \App\Models\Site                $site
+     * @param  \App\Site                $site
      * @return \Illuminate\Http\Response
      */
     public function update(Request $request, Site $site)
@@ -99,7 +101,7 @@ class SiteController extends Controller
             session()->flash('update_nok', 'Erreur lors de l\'enregistrement');
         }
 
-        return to_route('site.edit', ['site' => $site]);
+        return redirect()->route('site.edit', ['site' => $site]);
     }
 
     /**

app/Http/Controllers/StatistiqueController.php

@@ -0,0 +1,120 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Campagne;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use App\Traits\CouponTrait;
+use App\Traits\GraphTrait;
+
+class StatistiqueController extends Controller
+{
+    use CouponTrait;
+    use GraphTrait;
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        $sites = Auth::user()->sites()->get();
+        foreach ($sites as $site) {
+            if (isset($site->campagnes)) {
+                $campagnes = $site->campagnes;
+                foreach ($campagnes as $campagne) {
+                    switch ($campagne->camp_type) {
+                        case 0:
+                            $campagne->camp_type = "Mur";
+                            break;
+                        case 1:
+                            $campagne->camp_type = "Panier";
+                            break;
+                        case 2:
+                            $campagne->camp_type = "Mur sans sélection";
+                            break;
+                        case 3:
+                            $campagne->camp_type = "Panier Sélectionnable";
+                            break;
+                    }
+                    $coupons = $campagne->coupons;
+                    foreach ($coupons as $coupon) {
+                        $coupon->quantity    = $this->getFullQuantity($coupon);
+                        $coupon->remain      = $this->getFullQuantity($coupon) - $this->getUsedQuantity($coupon);
+                        $coupon->diffused    = $this->getDiffusedQuantity($coupon);
+                        $coupon->isPrintable = $this->isAvailableToPrint($coupon, $campagne);
+                        $coupon->isPaused    = $this->isPausedToPrint($coupon, $campagne);
+                    }
+                }//end foreach
+            }//end if
+        }//end foreach
+        return view('stats.index')->with(['sites' => $sites]);
+    }
+
+    /**
+     * Show the stat detail of a campaign.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function statdetail(Campagne $campagne)
+    {
+        $count  = 0;
+        $colors = config('constants.colors');
+        switch ($campagne->camp_type) {
+            case 0:
+                $campagne->camp_type = "Mur";
+                break;
+            case 1:
+                $campagne->camp_type = "Panier";
+                break;
+            case 2:
+                $campagne->camp_type = "Mur sans sélection";
+                break;
+            case 3:
+                $campagne->camp_type = "Panier Sélectionnable";
+                break;
+        }
+
+        $coupons = $campagne->coupons;
+        foreach ($coupons as $coupon) {
+            $coupon->quantity    = $this->getFullQuantity($coupon);
+            $coupon->remain      = $coupon->quantity - $this->getUsedQuantity($coupon);
+            $coupon->diffused    = $this->getDiffusedQuantity($coupon);
+            $coupon->isPrintable = $this->isAvailableToPrint($coupon, $campagne);
+            $coupon->isPaused    = $this->isPausedToPrint($coupon, $campagne);
+            $coupon->color       = $coupon->color = "#" . str_pad(dechex(mt_rand(0, 255)), 2, '0', STR_PAD_LEFT) . str_pad(dechex(mt_rand(0, 255)), 2, '0', STR_PAD_LEFT) . str_pad(dechex(mt_rand(0, 255)), 2, '0', STR_PAD_LEFT);
+            $count++;
+        }
+        $enddate   = date('Y-m-d');
+        $startdate = date('Y-m-d', strtotime("-30 days"));
+        return view('stats.detail')->with(['campagne' => $campagne, 'startdate' => $startdate, 'enddate' => $enddate]);
+    }
+
+    public function load_stats(Request $request)
+    {
+        $campid    = $request->campid;
+        $startdate = $request->startdate;
+        $enddate   = $request->enddate;
+
+        // ---- Labels pour la période
+        $labels = $this->getLabelsForStats($startdate, $enddate);
+
+        // ---- Data pour le graphique global
+        $dataGlobal = $this->getDataForCamp($labels, $campid);
+
+        // ---- Data pour le graphique par coupons
+        $campagne = Campagne::where(['camp_id' => $campid])->first();
+        $coupons  = $campagne->coupons;
+        $dataSpec = [];
+        foreach ($coupons as $coupon) {
+            $dataCoupon                     = $this->getDataForCoupon($labels, $campid, $coupon);
+            $dataSpec[$coupon->coupon_code] = $dataCoupon;
+        }
+
+        $data = array('labels' => $labels, 'dataGlobal' => $dataGlobal, 'dataSpec' => $dataSpec);
+
+        return json_encode($data);
+    }
+}

app/Http/Kernel.php

@@ -50,7 +50,7 @@ class Kernel extends HttpKernel
      *
      * @var array
      */
-    protected $middlewareAliases = [
+    protected $routeMiddleware = [
         'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
@@ -60,7 +60,11 @@ class Kernel extends HttpKernel
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
+        'process.url' => \App\Http\Middleware\ProcessSpecificUrl::class,
         'saveroute' => \App\Http\Middleware\SaveCurrentRoute::class,
+        'superadmin' => \App\Http\Middleware\SuperAdmin::class,
+        'admin' => \App\Http\Middleware\Admin::class,
+        'marketing' => \App\Http\Middleware\Marketing::class,
     ];
 
     /**

app/Http/Middleware/Admin.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Auth;
+use Closure;
+
+class Admin
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure                 $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if (Auth::check() && Auth::user()->roles == 'admin') {
+            return $next($request);
+        } elseif (Auth::check() && Auth::user()->roles == 'superadmin') {
+            return $next($request);
+        } else {
+            return redirect('/bo/home');
+        }
+    }
+}

app/Http/Middleware/CheckForMaintenanceMode.php

@@ -11,7 +11,6 @@ class CheckForMaintenanceMode extends Middleware
      *
      * @var array
      */
-
     protected $except = [
             ];
 }

app/Http/Middleware/EncryptCookies.php

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

app/Http/Middleware/Marketing.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class Marketing
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure                 $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        return $next($request);
+    }
+}

app/Http/Middleware/ProcessSpecificUrl.php

@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use App\Http\Controllers;
+
+class ProcessSpecificUrl
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure                 $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        $path        = $request->path();
+        $params      = $request->all();
+        $paramsCount = count($params);
+        $contact     = new Controllers\ContactController();
+        $mur         = new Controllers\MurController();
+        $panier      = new Controllers\PanierController();
+        $campagne    = new Controllers\CampagneController();
+        $ajax        = new Controllers\AjaxController();
+        switch ($path) {
+            case 'updatecontact':
+                $res = $contact->updateContact($request);
+                break;
+            case 'delctrlcontact':
+                $res = $mur->deleteControlContact($request);
+                break;
+            case 'mntdispocampagne':
+                $res = $mur->montantDispoCampagne($request);
+                break;
+            case 'mntdispocontact':
+                $res = $mur->montantDispoContact($request);
+                break;
+            case 'updatebasket':
+                $res = $panier->updateBasket($request);
+                break;
+            case 'showbasket':
+                $res = $panier->showBasket($request);
+                break;
+            case 'getdetailcampaign':
+                $res = $campagne->getDetail($request);
+                break;
+            case 'getdiffctccampaign':
+                $res = $campagne->getDiffCamp($request);
+                break;
+            case 'imprime':
+                $res = $panier->printPanierSelect($request);
+                return $next($request);
+                break;
+            case 'imprimer':
+                $res = $mur->printMur($request);
+                return $next($request);
+                break;
+            case 'merci':
+                $res = $mur->getThanks($request);
+                return $next($request);
+                break;
+            case 'merci-panier':
+                $res = $panier->getThanks($request);
+                return $next($request);
+                break;
+            case 'index':
+                $res = $ajax->backToIndex($request);
+                break;
+            default:
+                switch ($paramsCount) {
+                    case 0:
+                        return redirect('bo/home');
+                        break;
+                    case 1:
+                        $res = $panier->showTemplate($request);
+                        return $next($request);
+                        break;
+                    case 3:
+                        $res = $mur->show($request);
+                        return $next($request);
+                        break;
+                    case 4:
+                        $res = $mur->show($request);
+                        return $next($request);
+                        break;
+                    default:
+                        break;
+                }
+                break;
+        }//end switch
+
+        return $res;
+    }
+}

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -18,7 +18,7 @@ class RedirectIfAuthenticated
     public function handle($request, Closure $next, $guard = null)
     {
         if (Auth::guard($guard)->check()) {
-            return to_route('campagne.index');
+            return redirect()->route('home');
         }
 
         return $next($request);

app/Http/Middleware/SaveCurrentRoute.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Middleware;
 
+use Auth;
 use Closure;
-use Illuminate\Support\Facades\Auth;
 
 class SaveCurrentRoute
 {
@@ -16,20 +16,26 @@ class SaveCurrentRoute
      */
     public function handle($request, Closure $next)
     {
-        $site = session()->get('site');
-        $siteId = session()->get('marques');
+        $routeName = explode('.', \Route::currentRouteName());
 
-        if (!$site) {
-            $site = Auth::user()->sites->first();
-            session()->put('site', $site);
+        session()->put('active_route', $routeName[0]);
+
+        $site = session()->get('site');
+
+        if (!isset($site)) {
+            session()->put('site', Auth::user()->sites->first());
         }
 
-        $currentLogo = $site->only(['site_logo']);
+        $currentLogo = session()->get('site')->only(['site_logo']);
         session()->put('current_logo', $currentLogo);
+        $siteId = session()->get('marques');
+
+        if (!isset($siteId)) {
+            $marques    = Auth::user()->sites;
+            $submarques = $marques->map(function ($marque) {
+                return $marque->only(['id', 'site_nom', 'site_id', 'site_logo']);
+            });
 
-        if (!$siteId) {
-            $marques = Auth::user()->sites;
-            $submarques = $marques->map(fn($marque) => $marque->only(['id', 'site_nom', 'site_id', 'site_logo']));
             session()->put('marques', $submarques);
         }
 

app/Http/Middleware/SuperAdmin.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Auth;
+use Closure;
+
+class SuperAdmin
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure                 $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if (Auth::check() && Auth::user()->roles == 'superadmin') {
+            return $next($request);
+        } else {
+            return redirect('/bo/home');
+        }
+    }
+}

app/Http/Middleware/TrimStrings.php

@@ -11,7 +11,6 @@ class TrimStrings extends Middleware
      *
      * @var array
      */
-
     protected $except = [
         'password',
         'password_confirmation',

app/Http/Middleware/TrustHosts.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Http\Middleware\TrustHosts as Middleware;
-
-class TrustHosts extends Middleware
-{
-    /**
-     * Get the host patterns that should be trusted.
-     *
-     * @return array<int, string|null>
-     */
-    public function hosts()
-    {
-        return [
-            $this->allSubdomainsOfApplicationUrl(),
-            config('app.k8s_internal_host'),
-        ];
-    }
-}

app/Http/Middleware/TrustProxies.php

@@ -3,7 +3,7 @@
 namespace App\Http\Middleware;
 
 use Illuminate\Http\Request;
-use Illuminate\Http\Middleware\TrustProxies as Middleware;
+use Fideloper\Proxy\TrustProxies as Middleware;
 
 class TrustProxies extends Middleware
 {
@@ -19,10 +19,5 @@ class TrustProxies extends Middleware
      *
      * @var integer
      */
-    protected $headers =
-        Request::HEADER_X_FORWARDED_FOR |
-        Request::HEADER_X_FORWARDED_HOST |
-        Request::HEADER_X_FORWARDED_PORT |
-        Request::HEADER_X_FORWARDED_PROTO |
-        Request::HEADER_X_FORWARDED_AWS_ELB;
+    protected $headers = Request::HEADER_X_FORWARDED_ALL;
 }

app/Http/Middleware/VerifyCsrfToken.php

@@ -4,14 +4,13 @@ namespace App\Http\Middleware;
 
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
 
-class VerifyCsrfToken extends \Illuminate\Foundation\Http\Middleware\PreventRequestForgery
+class VerifyCsrfToken extends Middleware
 {
     /**
      * Indicates whether the XSRF-TOKEN cookie should be set on the response.
      *
      * @var boolean
      */
-
     protected $addHttpCookie = true;
 
     /**
@@ -19,10 +18,10 @@ class VerifyCsrfToken extends \Illuminate\Foundation\Http\Middleware\PreventRequ
      *
      * @var array
      */
-
     protected $except = [
         'updatecontact',
         'updatebasket',
         'showbasket',
+        'delctrlcontact'
     ];
 }

app/Http/Requests/Bo/Users/DestroyUserRequest.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Bo\Users;
-
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-
-class DestroyUserRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return Auth::check();
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            //
-        ];
-    }
-}

app/Http/Requests/Bo/Users/StoreUserRequest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Bo\Users;
-
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-
-class StoreUserRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return Auth::check();
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'email' => 'required|unique:users|email',
-            'name' => 'required',
-            'password' => 'min:8|required',
-            'site' => 'required',
-            'roles' => 'required'
-        ];
-    }
-}

app/Http/Requests/Bo/Users/UpdateUserRequest.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Bo\Users;
-
-use Illuminate\Validation\Rule;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-
-class UpdateUserRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return Auth::check();
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'email' => [
-                'required',
-                Rule::unique('users')->ignore($this->user->id)
-            ],
-            'name' => 'required',
-            'site' => 'required',
-            'roles' => 'required'
-        ];
-    }
-}

app/Http/Requests/BrandChange/InvokeBrandChange.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Http\Requests\BrandChange;
-
-use App\Enums\UserRoles;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-
-class InvokeBrandChange extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return Auth::check() && (Auth::user()->roles === UserRoles::superadmin()->value || Auth::user()->roles === UserRoles::admin()->value);
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'site_id' => 'exists:site,id|required'
-        ];
-    }
-}

app/Http/Requests/Campaign/AddCouponsCampaign.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Campaign;
-
-use App\Enums\UserRoles;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-
-class AddCouponsCampaign extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return Auth::check() && (Auth::user()->roles === UserRoles::superadmin()->value || Auth::user()->roles === UserRoles::admin()->value);
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'ids' => 'required'
-        ];
-    }
-}

app/Http/Requests/Campaign/DeleteCampaign.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Campaign;
-
-use App\Enums\UserRoles;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-
-class DeleteCampaign extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return Auth::check() && (Auth::user()->roles === UserRoles::superadmin()->value || Auth::user()->roles === UserRoles::admin()->value);
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            //
-        ];
-    }
-}

app/Http/Requests/Campaign/RemoveCouponCampaign.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Campaign;
-
-use App\Enums\UserRoles;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-
-class RemoveCouponCampaign extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return Auth::check() && (Auth::user()->roles === UserRoles::superadmin()->value || Auth::user()->roles === UserRoles::admin()->value);
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            //
-        ];
-    }
-}

app/Http/Requests/Campaign/RemoveNotifCampaign.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Campaign;
-
-use App\Enums\UserRoles;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-
-class RemoveNotifCampaign extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return Auth::check() && (Auth::user()->roles === UserRoles::superadmin()->value || Auth::user()->roles === UserRoles::admin()->value);
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            //
-        ];
-    }
-}

app/Http/Requests/Campaign/ShowDemoCampaign.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Campaign;
-
-use App\Enums\UserRoles;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-
-class ShowDemoCampaign extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return Auth::check() && (Auth::user()->roles === UserRoles::superadmin()->value || Auth::user()->roles === UserRoles::admin()->value);
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            //
-        ];
-    }
-}

app/Http/Requests/Campaign/StoreCampaign.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Campaign;
-
-use App\Enums\UserRoles;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-
-class StoreCampaign extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return Auth::check() && (Auth::user()->roles === UserRoles::superadmin()->value || Auth::user()->roles === UserRoles::admin()->value);
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'camp_name' => 'min:5|required',
-            'camp_type' => 'integer|required',
-            'camp_published' => 'integer|required',
-            'camp_limitedPrinting' => 'sometimes|integer|required'
-        ];
-    }
-}

app/Http/Requests/Campaign/StoreNotifCampaign.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Campaign;
-
-use App\Enums\UserRoles;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Validation\Rule;
-
-class StoreNotifCampaign extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return Auth::check() && (Auth::user()->roles === UserRoles::superadmin()->value || Auth::user()->roles === UserRoles::admin()->value);
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'notif_name' => 'min:5|required',
-            'notif_email' => [
-                'required',
-                Rule::unique('notification')->where(fn($query) => $query->where('notif_campId', $this->campaign->camp_id)),
-            ]
-        ];
-    }
-}

app/Http/Requests/Campaign/UpdateCampaign.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Campaign;
-
-use App\Enums\UserRoles;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-
-class UpdateCampaign extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return Auth::check() && (Auth::user()->roles === UserRoles::superadmin()->value || Auth::user()->roles === UserRoles::admin()->value);
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'camp_name' => 'min:5|required',
-            'camp_type' => 'integer|required',
-            'camp_published' => 'integer|required',
-            'camp_limitedPrinting' => 'sometimes|integer|required'
-        ];
-    }
-}

app/Http/Requests/Coupons/PrintRequest.php

@@ -30,8 +30,7 @@ class PrintRequest extends FormRequest
         return [
             'refcamp' => 'string|exists:campagne,camp_id|required',
             'hashcode' => 'string|exists:customers,hashcode|required',
-            'coupons' => 'required',
-            'type'    => 'nullable|in:stream,dl'
+            'coupons' => 'required'
         ];
     }
 

app/Http/Requests/Coupons/StoreCoupons.php

@@ -1,69 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Coupons;
-
-use App\Enums\UserRoles;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Validation\Rule;
-
-class StoreCoupons extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return Auth::check() && (Auth::user()->roles === UserRoles::superadmin()->value || Auth::user()->roles === UserRoles::admin()->value);
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'coupon_code' => [
-                'required',
-                Rule::unique('coupon', 'coupon_code')
-            ],
-            'coupon_name' => 'string|required',
-            'coupon_value' => 'numeric|required',
-            'coupon_validity_text' => 'required',
-            'coupon_legal_mentions' => 'required',
-            'coupon_decoration_image' => 'required|image|mimes:jpeg,png',
-            'coupon_logo_image' => 'required|image|mimes:jpeg,png',
-            'coupon_rcs' => 'required',
-            'coupon_site_contact' => 'required',
-            'coupon_seuil_alert' => 'integer|required',
-
-            'coupon_enablelimitperiod' => 'sometimes|integer|required',
-            'coupon_enablelimitquantity' => 'sometimes|integer|required',
-            'coupon_mindatediffusion' => 'nullable',
-            'coupon_maxdatediffusion' => 'nullable',
-            'coupon_validity' => 'integer|required',
-            'coupon_maxdatevalidity' => 'nullable',
-
-            'coupon_legal_mentions_splitted' => 'sometimes|integer|required',
-        ];
-    }
-
-    /**
-     * Configure the validator instance.
-     *
-     * @param \Illuminate\Contracts\Validation\Validator $validator
-     * @return void
-     */
-    public function withValidator($validator)
-    {
-        $validator->sometimes('coupon_gs1code', 'required|image|mimes:jpeg', fn($input) => isset($input->coupon_norme));
-
-        $validator->sometimes('coupon_limitquantity', 'integer|required', fn($input) => !is_null($input->coupon_enablelimitquantity));
-
-        $validator->sometimes('coupon_limitperiod', 'integer|required', fn($input) => !is_null($input->coupon_enablelimitperiod));
-    }
-}

app/Http/Requests/Coupons/UpdateCoupons.php

@@ -1,78 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Coupons;
-
-use App\Enums\UserRoles;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Validation\Rule;
-
-class UpdateCoupons extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return Auth::check() && (Auth::user()->roles === UserRoles::superadmin()->value || Auth::user()->roles === UserRoles::admin()->value);
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'coupon_code' => [
-                'required',
-                Rule::unique('coupon', 'coupon_code')->ignore($this->coupon->coupon_id, 'coupon_id')
-            ],
-            'coupon_name' => 'string|required',
-            'coupon_value' => 'numeric|required',
-            'coupon_seuil_alert' => 'integer|required',
-            'coupon_enablelimitperiod' => 'sometimes|integer|required',
-            'coupon_enablelimitquantity' => 'sometimes|integer|required',
-            'coupon_mindatediffusion' => 'nullable',
-            'coupon_maxdatediffusion' => 'nullable',
-            'coupon_validity' => 'integer|required',
-            'coupon_maxdatevalidity' => 'nullable',
-
-            'coupon_treatment_center' => 'integer|required',
-            'coupon_validity_text' => 'required',
-            'coupon_legal_mentions' => 'required',
-
-            'coupon_rcs' => 'required',
-            'coupon_site_contact' => 'email|required',
-
-            'coupon_norme' => 'sometimes|integer|required',
-            'coupon_published' => 'sometimes|integer|required',
-            'coupon_legal_mentions_splitted' => 'sometimes|integer|required',
-            'coupon_decoration_image' => 'image|mimes:jpeg,png',
-            'coupon_logo_image' => 'image|mimes:jpeg,png',
-        ];
-    }
-
-    /**
-     * Configure the validator instance.
-     *
-     * @param \Illuminate\Contracts\Validation\Validator $validator
-     * @return void
-     */
-    public function withValidator($validator)
-    {
-        $validator->sometimes('coupon_gs1code', 'required|image|mimes:jpeg', function ($input) {
-            if (isset($input->coupon_gs1code_image_hidden)) {
-                return false;
-            }
-            return isset($input->coupon_norme);
-        });
-
-        $validator->sometimes('coupon_limitquantity', 'integer|required', fn($input) => !is_null($input->coupon_enablelimitquantity));
-
-        $validator->sometimes('coupon_limitperiod', 'integer|required', fn($input) => !is_null($input->coupon_enablelimitperiod));
-    }
-}

app/Http/Requests/Customers/BasketRequest.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Customers;
-
-use App\Http\Resources\StatusResource;
-use Illuminate\Contracts\Validation\Validator;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Http\Exceptions\HttpResponseException;
-
-class BasketRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'refcamp' => 'string|exists:campagne,camp_id|required',
-            'hashcode' => 'string|exists:customers,hashcode|required'
-        ];
-    }
-
-    protected function failedValidation(Validator $validator)
-    {
-        if ($this->wantsJson()) {
-            throw new HttpResponseException(response()->json(new StatusResource([
-                'status' => 'KO',
-                'code' => 422,
-                'message' => $validator->errors()->messages()
-            ]), 422));
-        }
-    }
-}

app/Http/Requests/Customers/SearchCustomers.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Customers;
-
-use App\Enums\UserRoles;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-
-class SearchCustomers extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return Auth::check()
-            && in_array(Auth::user()->roles, [UserRoles::superadmin()->value, UserRoles::admin()->value]);
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'email' => 'sometimes|email|required'
-        ];
-    }
-}

app/Http/Requests/Export/PDFExport.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Export;
-
-use App\Enums\UserRoles;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-
-class PDFExport extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return Auth::check() && (Auth::user()->roles === UserRoles::superadmin()->value || Auth::user()->roles === UserRoles::admin()->value);
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'ids' => 'required',
-            'startdate' => 'date|required',
-            'enddate' => 'date|required'
-        ];
-    }
-}

app/Http/Requests/Fo/Basket/PrintRequest.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Fo\Basket;
-
-use App\Enums\CampaignTypes;
-use Illuminate\Foundation\Http\FormRequest;
-
-class PrintRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-    
-    // FIXME: Docblock
-    protected function prepareForValidation()
-    {
-        $campagne = $this->basket->campagne;
-
-        throw_unless($campagne->camp_type->equals(CampaignTypes::panier()), \Exception::class, 'Campaign is not basket.');
-
-        throw_if($campagne->camp_published === 0, \Exception::class, 'Campaign is not published.');
-        throw_if($campagne->site->crm_token === null, \Exception::class, 'CRM Token is missing.');
-        throw_if($campagne->site->crm_password === null, \Exception::class, 'CRM Password is missing.');
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [];
-    }
-}

app/Http/Resources/CouponsResource.php

@@ -14,24 +14,17 @@ class CouponsResource extends JsonResource
      */
     public function toArray($request)
     {
-        $coupon = [
+        return [
             'code' => $this->coupon_code,
             'name' => $this->coupon_name,
             'value' => $this->coupon_value,
-            'used' => $this->isUsed ?? false,
+            'used' => isset($this->isUsed) ? $this->isUsed : false,
             'desktop_image_available' => $this->returnUrl($this->coupon_thumbnail1),
             'desktop_image_unavailable' => $this->returnUrl($this->coupon_thumbnail2),
             'mobile_image_available' => $this->returnUrl($this->coupon_thumbnail3),
             'mobile_image_unavailable' => $this->returnUrl($this->coupon_thumbnail4),
             'validity_text' => $this->coupon_validity_text
         ];
-
-        if (isset($this->isUsed)){
-            return array_merge($coupon, [
-                'used' => $this->isUsed,
-            ]);
-        }
-        return $coupon;
     }
 
     private function returnUrl($assets)

app/Jobs/ArchiveStatsJob.php

@@ -1,67 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Models\ArchiveStat;
-use App\Models\Statistique;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-
-class ArchiveStatsJob implements ShouldQueue
-{
-    use Dispatchable;
-    use InteractsWithQueue;
-    use Queueable;
-    use SerializesModels;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        // Construct method.
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        try {
-            DB::transaction(function (): void {
-                Statistique::query()
-                    ->where('date', '<', now())
-                    ->each(function ($stat): void {
-                        $archiveStat = new ArchiveStat();
-                        $archiveStat->quantity            = $stat->stat_couponPrinted;
-                        $archiveStat->date                = $stat->date;
-                        $archiveStat->archive_coupon_id   = $stat->stat_couponId;
-                        $archiveStat->archive_campaign_id = $stat->stat_campId;
-                        $archiveStat->saveOrFail();
-                    });
-
-                Statistique::query()
-                    ->where('date', '<', now())
-                    ->delete();
-            });
-        } catch (\Exception $e) {
-            Log::error(
-                sprintf(
-                    "ArchiveStatsJob failed - Code : %s - %s",
-                    $e->getCode(),
-                    $e->getMessage(),
-                )
-            );
-            \report($e);
-        } //end try
-    }
-}

app/Jobs/CleanOldDatasJob.php

@@ -2,8 +2,8 @@
 
 namespace App\Jobs;
 
-use App\Models\Contact;
-use App\Models\Log as LogModel;
+use App\Contact;
+use App\Log as LogModel;
 use App\Models\Customers;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -39,7 +39,7 @@ class CleanOldDatasJob implements ShouldQueue
     {
 
         try {
-            DB::transaction(function (): void {
+            DB::transaction(function () {
                 // Delete old contacts.
                 $deletedContact = Contact::query()
                     ->where('contact_updatedate', '<', now()->subYears(3))

app/Jobs/DeleteCrmCustomerJob.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\Models\Contact;
+use App\Contact;
 use App\Models\Customers;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -19,14 +19,20 @@ class DeleteCrmCustomerJob implements ShouldQueue
     use Queueable;
     use SerializesModels;
 
+    /**
+     * @var array $customer
+     */
+    private $customer;
+
     /**
      * Create a new job instance.
      *
      * @param array $customer
      */
-    public function __construct(private $customer)
+    public function __construct($customer)
     {
         $this->onConnection('rabbitmq');
+        $this->customer = $customer;
     }
 
     /**
@@ -40,7 +46,7 @@ class DeleteCrmCustomerJob implements ShouldQueue
         $email     = $this->customer['email'];
 
         try {
-            DB::transaction(function () use ($hashchode, $email): void {
+            DB::transaction(function () use ($hashchode, $email) {
                 // For baskets and old walls.
                 $contact = Contact::query()->where('contact_ref', $hashchode)->first();
                 if ($contact) {
@@ -82,7 +88,7 @@ class DeleteCrmCustomerJob implements ShouldQueue
         $csvPath = \storage_path('/logs/crm.csv');
         if (!\file_exists($csvPath)) {
             $logFile = fopen($csvPath, 'w');
-            \fputcsv($logFile, ['date', 'hashcode', 'email', 'action'], ';', escape: '\\');
+            \fputcsv($logFile, ['date', 'hashcode', 'email', 'action'], ';');
             \fclose($logFile);
         }
 
@@ -95,8 +101,7 @@ class DeleteCrmCustomerJob implements ShouldQueue
                 $this->customer['email'],
                 $message
             ],
-            ';',
-            escape: '\\'
+            ';'
         );
         \fclose($logFile);
     }

app/Lib/Helpers/ExceptionsHelper.php

@@ -170,12 +170,19 @@ class ExceptionsHelper
         $argsCount = count($stack['args']);
         for ($i = 0; $i < $argsCount; $i++) {
             $type = \gettype($stack['args'][$i]);
-            match ($type) {
-                'object' => $traceArgs .= sprintf('Object(%s)', $stack['args'][$i]::class),
-                'array' => $traceArgs .= sprintf('Array(%d)', \count($stack['args'][$i])),
-                'string' => $traceArgs .= sprintf('String(%d)', \strlen($stack['args'][$i])),
-                default => $traceArgs .= \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/Helpers/ToolboxHelper.php

@@ -1,104 +0,0 @@
-<?php
-
-namespace App\Lib\Helpers;
-
-use Carbon\Carbon;
-use Illuminate\Contracts\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Http\Request;
-use Illuminate\Support\Str;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\Rule;
-use Illuminate\Validation\Rules\Enum;
-use Illuminate\Validation\ValidationException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\Finder\SplFileInfo;
-
-class ToolboxHelper
-{
-    /**
-     * Mutltibyte string replace.
-     *
-     * @param array|string $search
-     * @param array|string $replace
-     * @param array|string $subject
-     * @param integer      $count
-     * @return array|string|false
-     */
-    public static function mbReplace(
-        $search,
-        $replace,
-        $subject,
-        int &$count = 0
-    ) {
-        if (!is_array($search) && is_array($replace)) {
-            return false;
-        }
-        if (is_array($subject)) {
-            // Call mb_replace for each single string in $subject .
-            foreach ($subject as &$string) {
-                $string = &self::mbReplace($search, $replace, $string, $count);
-            }
-        } elseif (is_array($search)) {
-            if (!is_array($replace)) {
-                foreach ($search as &$string) {
-                    $subject = self::mbReplace($string, $replace, $subject, $count);
-                }
-            } else {
-                $n = max(count($search), count($replace));
-                while ($n--) {
-                    $subject = self::mbReplace(current($search), current($replace), $subject, $count);
-                    next($search);
-                    next($replace);
-                }
-            }
-        } else {
-            $parts   = mb_split(preg_quote($search), $subject);
-            $count   = count($parts) - 1;
-            $subject = implode($replace, $parts);
-        } //end if
-        return $subject;
-    }
-
-    /**
-     * Asserts that the field is unique.
-     *
-     * @param string                                  $table
-     * @param string                                  $field
-     * @param string|integer|float|boolean|null|array $value
-     * @param integer|null                            $id
-     * @param callable|null                           $query
-     * @return void
-     * @throws \Illuminate\Validation\ValidationException If the field is not unique.
-     */
-    public static function assertFieldIsUnique(
-        string $table,
-        string $field,
-        $value,
-        ?int $id = null,
-        ?callable $query = null
-    ): void {
-        if (!$query) {
-            Validator::make([$field => $value], [
-                self::mbReplace('.', '\.', $field) => Rule::unique($table, $field)->ignore($id),
-            ], [
-                self::mbReplace('.', '\.', "{$field}.unique")
-                => trans('crud.libs.toolbox.assertFieldIsUnique', ['attribute' => $field, 'value' => $value])
-            ])->validate();
-            return;
-        }
-        Validator::make([$field => $value], [
-            $field => Rule::unique($table)->where($query)->ignore($id),
-        ], [
-            $field . '.unique' => trans(
-                'crud.libs.toolbox.assertFieldIsUnique',
-                ['attribute' => $field, 'value' => $value]
-            )
-        ])->validate();
-    }
-}

app/Log.php

@@ -1,24 +1,21 @@
 <?php
 
-namespace App\Models;
+namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
 class Log extends Model
 {
-
     public $timestamps = false;
 
     /**
      * @var string
      */
-
     protected $table = 'logs';
 
     /**
      * @var string
      */
-
     protected $primaryKey = 'id';
     /**
      * @var string
@@ -28,7 +25,6 @@ class Log extends Model
      /**
       * @var array
       */
-
     protected $fillable = [
         'log_action',
         'log_refsite',

app/Mail/AlertBr.php

@@ -11,6 +11,9 @@ class AlertBr extends Mailable
     use Queueable;
     use SerializesModels;
 
+    public $couponSeuil;
+
+    public $couponDiffusion;
 
     public $subject;
 
@@ -20,8 +23,10 @@ class AlertBr extends Mailable
      *
      * @return void
      */
-    public function __construct(public $couponSeuil, public $couponDiffusion, $sitename)
+    public function __construct($couponSeuil, $couponDiffusion, $sitename)
     {
+        $this->couponSeuil     = $couponSeuil;
+        $this->couponDiffusion = $couponDiffusion;
         $this->subject         = 'Notification mes BR : ' . $sitename;
     }
 

app/Mail/AlertBrAdmin.php

@@ -11,6 +11,9 @@ class AlertBrAdmin extends Mailable
     use Queueable;
     use SerializesModels;
 
+    public $couponSeuil;
+
+    public $couponDiffusion;
 
     public $subject;
 
@@ -20,8 +23,10 @@ class AlertBrAdmin extends Mailable
      *
      * @return void
      */
-    public function __construct(public $couponSeuil, public $couponDiffusion)
+    public function __construct($couponSeuil, $couponDiffusion)
     {
+        $this->couponSeuil     = $couponSeuil;
+        $this->couponDiffusion = $couponDiffusion;
         $this->subject         = 'Notification mes BR : Récapitulatif global';
     }
 

app/Models/ArchiveCampaign.php

@@ -1,83 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Models\Site;
-use App\Traits\HasUniqueField;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @property string              $name        Name of the archived campaign.
- * @property string              $campaign_id Id of the archived campaign.
- * @property-read \Carbon\Carbon $created_at  Created date.
- * @property-read \Carbon\Carbon $updated_at  Updated date.
- *
- * @property-read \App\Models\ArchiveStat $archiveStat ArchiveStat Has many relationship.
- * @property-read \App\Models\ArchiveSite $archiveSite ArchiveSite Belongs to relationship.
- */
-class ArchiveCampaign extends Model
-{
-    use HasFactory;
-    use HasUniqueField;
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array<int, string>
-     */
-
-    protected $fillable = [
-        'name',
-        'campaign_id',
-        'archive_site_id'
-    ];
-
-    /**
-     * Perform any actions required after the model boots.
-     *
-     * @return void
-     */
-    protected static function booted(): void
-    {
-        static::creating(function (self $model): void {
-            $model->assertFieldIsUnique('campaign_id', $model->campaign_id);
-            $site = Site::query()->where('site_id', $model->archive_site_id)->firstOrFail();
-            $archiveSite = ArchiveSite::query()->firstOrCreate(
-                [
-                    'site_id' => $model->archive_site_id
-                ],
-                [
-                    'name' => $site->site_nom
-                ]
-                );
-            $model->archiveSite()->associate($archiveSite);
-        });
-        static::updating(function (): void {
-            throw new \RuntimeException('Updating an archived campaign is not authorized');
-        });
-        static::deleting(function (): void {
-            throw new \RuntimeException('Deleting an archived campaign is not authorized');
-        });
-    }
-
-    // * RELATIONS
-
-    /**
-     * ArchiveSite model relation
-     * @return Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function archiveSite()
-    {
-        return $this->belongsTo(ArchiveSite::class);
-    }
-
-    /**
-     * ArchiveSite model relation
-     * @return Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function archiveStat()
-    {
-        return $this->hasMany(ArchiveStat::class);
-    }
-}

app/Models/ArchiveCoupon.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Traits\HasUniqueField;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @property string              $name        Name of the archived coupon.
- * @property string              $coupon_code Treatment code of the archived coupon.
- * @property-read \Carbon\Carbon $created_at  Created date.
- * @property-read \Carbon\Carbon $updated_at  Updated date.
- *
- * @property-read \App\Models\ArchiveStat $archiveStat ArchiveStat Has many relationship.
- */
-class ArchiveCoupon extends Model
-{
-    use HasFactory;
-    use HasUniqueField;
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array<int, string>
-     */
-
-    protected $fillable = [
-        'name',
-        'coupon_code',
-    ];
-
-    /**
-     * Perform any actions required after the model boots.
-     *
-     * @return void
-     */
-    protected static function booted(): void
-    {
-        static::creating(function (self $model): void {
-            $model->assertFieldIsUnique('coupon_code', $model->coupon_code);
-        });
-        static::updating(function (): void {
-            throw new \RuntimeException('Updating an archived coupon is not authorized');
-        });
-        static::deleting(function (): void {
-            throw new \RuntimeException('Deleting an archived coupon is not authorized');
-        });
-    }
-
-    // * RELATIONS
-
-    /**
-     * ArchiveStat model relation
-     * @return Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function archiveStat()
-    {
-        return $this->hasMany(ArchiveStat::class);
-    }
-}

app/Models/ArchiveSite.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Traits\HasUniqueField;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @property string              $name       Name of the archived site.
- * @property string              $site_id    Id of the archived site.
- * @property-read \Carbon\Carbon $created_at Created date.
- * @property-read \Carbon\Carbon $updated_at Updated date.
- *
- * @property-read \App\Models\ArchiveCampaign $archiveCampaign ArchiveCampaign Has many relationship.
- */
-class ArchiveSite extends Model
-{
-    use HasFactory;
-    use HasUniqueField;
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array<int, string>
-     */
-
-    protected $fillable = [
-        'name',
-        'site_id',
-    ];
-
-    /**
-     * Perform any actions required after the model boots.
-     *
-     * @return void
-     */
-    protected static function booted(): void
-    {
-        static::creating(function (self $model): void {
-            $model->assertFieldIsUnique('site_id', $model->site_id);
-        });
-        static::updating(function (self $model): void {
-            throw new \RuntimeException('Updating an archived site is not authorized');
-        });
-        static::deleting(function (): void {
-            throw new \RuntimeException('Deleting an archived site is not authorized');
-        });
-    }
-
-    // * RELATIONS
-
-    /**
-     * ArchiveCampaign model relation
-     * @return Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function archiveCampaign()
-    {
-        return $this->hasMany(ArchiveCampaign::class);
-    }
-}

app/Models/ArchiveStat.php

@@ -1,92 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Models\Campagne;
-use App\Models\Coupon;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @property integer             $quantity   Quantity of distributed coupons.
- * @property \Carbon\Carbon      $date       Date when the coupon has been distributed.
- * @property-read \Carbon\Carbon $created_at Created date.
- * @property-read \Carbon\Carbon $updated_at Updated date.
- *
- * @property-read \App\Models\ArchiveCoupon   $archiveCoupon   ArchiveCoupon Belongs to relationship.
- * @property-read \App\Models\ArchiveCampaign $archiveCampaign ArchiveCampaign Belongs to relationship.
- */
-class ArchiveStat extends Model
-{
-    use HasFactory;
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array<int, string>
-     */
-
-    protected $fillable = [
-        'date',
-        'quantity',
-    ];
-
-    /**
-     * Perform any actions required after the model boots.
-     *
-     * @return void
-     */
-    protected static function booted(): void
-    {
-        static::creating(function (self $model): void {
-            $campaign = Campagne::withTrashed()->where('camp_id', $model->archive_campaign_id)->firstOrFail();
-            $archiveCampaign = ArchiveCampaign::query()->firstOrCreate(
-                [
-                    'campaign_id' => $model->archive_campaign_id
-                ],
-                [
-                    'name' => $campaign->camp_name,
-                    'archive_site_id' => $campaign->camp_siteId,
-                ]
-            );
-            $model->archiveCampaign()->associate($archiveCampaign);
-
-            $coupon = Coupon::withTrashed()->where('coupon_id', $model->archive_coupon_id)->firstOrFail();
-            $archiveCoupon = ArchiveCoupon::query()->firstOrCreate(
-                [
-                    'coupon_code' => $model->archive_coupon_id
-                ],
-                [
-                    'name' => $coupon->coupon_code,
-                ]
-            );
-            $model->archiveCoupon()->associate($archiveCoupon);
-        });
-        static::updating(function (): void {
-            throw new \RuntimeException('Upating an archived stat is not authorized');
-        });
-        static::deleting(function (): void {
-            throw new \RuntimeException('Deleting an archived stat is not authorized');
-        });
-    }
-
-    // * RELATIONS
-
-    /**
-     * ArchiveCoupon model relation
-     * @return Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function archiveCoupon()
-    {
-        return $this->belongsTo(ArchiveCoupon::class);
-    }
-
-    /**
-     * ArchiveCampaign model relation
-     * @return Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function archiveCampaign()
-    {
-        return $this->belongsTo(ArchiveCampaign::class);
-    }
-}

app/Models/Basket.php

@@ -1,83 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Models\Campagne;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Support\Str;
-
-class Basket extends Model
-{
-    use HasFactory;
-
-
-    protected $fillable = [
-        'campagne_id'
-    ];
-
-    /**
-     * Customer model relation
-     * @return BelongsTo
-     */
-    public function customer()
-    {
-        return $this->belongsTo(Customers::class, 'customer_id', 'id');
-    }
-
-    /**
-     * Campagne model relation
-     * @return BelongsTo
-     */
-    public function campagne()
-    {
-        return $this->belongsTo(Campagne::class, 'campagne_id', 'camp_id');
-    }
-
-    /**
-     * BasketContent model relation
-     * @return HasMany
-     */
-    public function contents()
-    {
-        return $this->hasMany(BasketContent::class);
-    }
-
-    public static function updateContent(Campagne $campagne, array $coupons, Customers $customer)
-    {
-        $basket = self::where(['campagne_id' => $campagne->camp_id, 'customer_id' => $customer->id])->first();
-
-        if (!$basket) {
-            $basket = new Basket();
-            $basket->uuid = (string) Str::uuid();
-            $basket->campagne()->associate($campagne);
-            $basket->customer()->associate($customer);
-            $basket->save();
-        }
-
-        foreach ($coupons as $couponId => $quantity) {
-            $associatedCoupon = $campagne->coupons()->where('coupon_id', $couponId)->first();
-
-            if ($associatedCoupon) {
-                $basketContent = BasketContent::where(['basket_id' => $basket->id, 'coupon_id' => $associatedCoupon->coupon_id])->first();
-                if ($basketContent) {
-                    $basketContent->quantity += $quantity;
-                    $basketContent->save();
-                } else {
-                    if ($quantity > 0) {
-                        $newBasketContent = new BasketContent();
-                        $newBasketContent->basket_id = $basket->id;
-                        $newBasketContent->coupon_id = $associatedCoupon->coupon_id;
-                        $newBasketContent->quantity = $quantity;
-                        $newBasketContent->save();
-                    }
-                }
-            }
-
-        }
-
-        return $basket;
-    }
-}

app/Models/BasketContent.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Models\Coupon;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\HasOne;
-
-class BasketContent extends Model
-{
-    use HasFactory;
-
-    /**
-     * booted method
-     *
-     * @return void
-     */
-    protected static function booted()
-    {
-        static::creating(function (self $model): void {
-            $model->printed = 0;
-        });
-    }
-
-    /**
-     * Basket model relation
-     * @return HasOne
-     */
-    public function basket()
-    {
-        return $this->hasOne(Basket::class);
-    }
-
-    /**
-     * Coupon model relation
-     * @return HasOne
-     */
-    public function coupon()
-    {
-        return $this->hasOne(Coupon::class, 'coupon_id', 'coupon_id');
-    }
-}

app/Models/Customers.php

@@ -2,31 +2,24 @@
 
 namespace App\Models;
 
-use App\Models\Panier;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Customers extends Model
 {
-    use HasFactory;
-
     /**
      * @var string $primaryKey
      */
-
     protected $primaryKey = 'hashcode';
 
     /**
      * @var string $keyType
      */
-
     protected $keyType = 'string';
 
     /**
      * @var array $fillable
      */
-
     protected $fillable = ['hashcode', 'email', 'country'];
 
     /**
@@ -36,12 +29,12 @@ class Customers extends Model
      */
     protected static function booted()
     {
-        static::creating(function ($customer): void {
-            $customer->country = new Customers()->getIsoCountry($customer->country);
+        static::creating(function ($customer) {
+            $customer->country = (new Customers())->getIsoCountry($customer->country);
         });
 
-        static::updating(function ($customer): void {
-            $customer->country = new Customers()->getIsoCountry($customer->country);
+        static::updating(function ($customer) {
+            $customer->country = (new Customers())->getIsoCountry($customer->country);
         });
     }
 
@@ -55,39 +48,26 @@ class Customers extends Model
     private function getIsoCountry($country)
     {
         $country = trim(ucfirst(strtolower($country)));
-        $country = match ($country) {
-            'Belgique' => 56,
-            'Luxembourg' => 442,
-            default => 250,
-        };
+        switch ($country) {
+            case 'Belgique':
+                $country = 56;
+                break;
+            case 'Luxembourg':
+                $country = 442;
+                break;
+            default:
+                $country = 250;
+        }
         return $country;
     }
 
     /**
-     * Printed Coupons Relation
+     * Printed Walls Relation
      *
      * @return HasMany
      */
-    public function printedCoupons()
+    public function printedWalls()
     {
-        return $this->hasMany(PrintedCoupons::class, 'customer_id', 'id');
-    }
-
-    /**
-     * Basket model relation
-     * @return HasMany
-     */
-    public function baskets()
-    {
-        return $this->hasMany(Basket::class, 'customer_id', 'id');
-    }
-
-    /**
-     * Panier model relation
-     * @return HasMany
-     */
-    public function paniers()
-    {
-        return $this->hasMany(Panier::class, 'panier_contactId', 'id');
+        return $this->hasMany(PrintedWalls::class, 'customer_id', 'id');
     }
 }

app/Models/PrintedWalls.php

@@ -5,7 +5,7 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
-class PrintedCoupons extends Model
+class PrintedWalls extends Model
 {
     use HasFactory;
 }

app/Models/Statistique.php

@@ -1,78 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Statistique extends Model
-{
-
-    public $timestamps = false;
-
-    /**
-     * @var string
-     */
-
-    protected $table = 'statistiques';
-
-    /**
-     * @var string
-     */
-
-    protected $primaryKey = 'id';
-    /**
-     * @var string
-     */
-    const CREATED_AT = 'created_at';
-
-    /**
-     * @var array
-     */
-
-    protected $fillable = [
-        'stat_campId',
-        'stat_couponId',
-        'stat_couponPrinted',
-        'date'
-    ];
-
-    /**
-     * @var array
-     */
-
-    protected $casts = [
-        'date' => 'date'
-    ];
-
-    /**
-     * Perform any actions required after the model boots.
-     *
-     * @return void
-     */
-    protected static function booted(): void
-    {
-        static::creating(function (self $model): void {
-            $model->date = now()->toDateString();
-        });
-    }
-
-    // * RELATIONS
-
-    /**
-     * ArchiveCoupon model relation
-     * @return Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function campaign()
-    {
-        return $this->belongsTo(Campagne::class, 'stat_campId', 'camp_id');
-    }
-
-    /**
-     * ArchiveCampaign model relation
-     * @return Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function coupon()
-    {
-        return $this->belongsTo(Coupon::class, 'stat_couponId', 'coupon_id');
-    }
-}

app/Mouvement.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -9,28 +9,23 @@ class Mouvement extends Model
     /**
      * @var string
      */
-
     protected $table = 'mouvement';
 
     /**
      * @var string
      */
-
     protected $primaryKey = 'mouvement_id';
 
     /**
      * @var boolean
      */
-
     public $timestamps = false;
 
-
     protected $dates = ['mouvement_created_at'];
 
     /**
      * @var array
      */
-
     protected $fillable = [
         'mouvement_nombre',
         'mouvement_created_at'
@@ -42,6 +37,6 @@ class Mouvement extends Model
      */
     public function coupon()
     {
-        return $this->belongsTo(\App\Models\Coupon::class, 'mouvement_couponId');
+        return $this->belongsTo('App\Coupon', 'mouvement_couponId');
     }
 }

app/Mur.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -9,19 +9,16 @@ class Mur extends Model
     /**
      * @var string
      */
-
     protected $table = 'mur';
 
     /**
      * @var string
      */
-
     protected $primaryKey = 'mur_id';
 
     /**
      * @var boolean
      */
-
     public $timestamps = false;
 
     /**
@@ -30,7 +27,7 @@ class Mur extends Model
      */
     public function campagne()
     {
-        return $this->belongsTo(\App\Models\Campagne::class, 'mur_campId');
+        return $this->belongsTo('App\Campagne', 'mur_campId');
     }
 
     /**
@@ -39,7 +36,7 @@ class Mur extends Model
      */
     public function contact()
     {
-        return $this->belongsTo(\App\Models\Contact::class, 'mur_contactId');
+        return $this->belongsTo('App\Contact', 'mur_contactId');
     }
 
     /**
@@ -48,6 +45,6 @@ class Mur extends Model
      */
     public function coupon()
     {
-        return $this->belongsTo(\App\Models\Coupon::class, 'mur_couponId');
+        return $this->belongsTo('App\Coupon', 'mur_couponId');
     }
 }

app/Notification.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -9,30 +9,24 @@ class Notification extends Model
     /**
      * @var string
      */
-
     protected $table = 'notification';
 
     /**
      * @var string
      */
-
     protected $primaryKey = 'notif_id';
 
     /**
      * @var boolean
      */
-
     public $timestamps = false;
 
-
-    protected $fillable = ['notif_name', 'notif_email', 'notif_campId'];
-
     /**
      * ManyToOne
      * Notification -> Campagne
      */
     public function campagne()
     {
-        return $this->belongsTo(\App\Models\Campagne::class, 'notif_campId');
+        return $this->belongsTo('App\Campagne', 'notif_campId');
     }
 }

app/Notifications/ResetPassword.php

@@ -30,7 +30,7 @@ class ResetPassword extends ResetPasswordNotification
      */
     public function toMail($notifiable)
     {
-        return new MailMessage()
+        return (new MailMessage())
             ->subject('MesBR - Réinitialisation du mot de passe')
             ->line('Vous recevez cet email car nous avons reçu une requête de réinitialisation de mot de passe pour votre compte.')
             ->action('Réinitialiser votre mot de passe', url(config('app.url') . route('password.reset', $this->token, false)))

app/Panier.php

@@ -1,30 +1,24 @@
 <?php
 
-namespace App\Models;
+namespace App;
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Panier extends Model
 {
-    use HasFactory;
-
     /**
      * @var string
      */
-
     protected $table = 'panier';
 
     /**
      * @var string
      */
-
     protected $primaryKey = 'panier_id';
 
     /**
      * @var boolean
      */
-
     public $timestamps = false;
 
     // protected $with = ['panierContents'];
@@ -34,7 +28,7 @@ class Panier extends Model
      */
     public function panierContents()
     {
-        return $this->hasMany(\App\Models\PanierContent::class, 'panier_content_panierId', 'panier_id');
+        return $this->hasMany('App\PanierContent', 'panier_content_panierId', 'panier_id');
     }
 
     /**
@@ -43,7 +37,7 @@ class Panier extends Model
      */
     public function campagne()
     {
-        return $this->belongsTo(\App\Models\Campagne::class, 'panier_campId');
+        return $this->belongsTo('App\Campagne', 'panier_campId');
     }
 
     /**
@@ -52,6 +46,6 @@ class Panier extends Model
      */
     public function contact()
     {
-        return $this->belongsTo(\App\Models\Contact::class, 'panier_contactId');
+        return $this->belongsTo('App\Contact', 'panier_contactId');
     }
 }

app/PanierContent.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -9,19 +9,16 @@ class PanierContent extends Model
     /**
      * @var string
      */
-
     protected $table = 'panier_content';
 
     /**
      * @var string
      */
-
     protected $primaryKey = 'panier_content_id';
 
     /**
      * @var boolean
      */
-
     public $timestamps = false;
 
     /**
@@ -30,7 +27,7 @@ class PanierContent extends Model
      */
     public function panier()
     {
-        return $this->belongsTo(\App\Models\Panier::class, 'panier_content_panierId', 'panier_id');
+        return $this->belongsTo('App\Panier', 'panier_content_panierId', 'panier_id');
     }
 
     /**
@@ -39,13 +36,12 @@ class PanierContent extends Model
      */
     public function coupon()
     {
-        return $this->belongsTo(\App\Models\Coupon::class, 'panier_content_couponId');
+        return $this->belongsTo('App\Coupon', 'panier_content_couponId');
     }
 
     /**
      * @var array
      */
-
     protected $fillable = [
         'panier_content_panierId',
         'panier_content_couponId',