diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore old mode 100644 new mode 100755 diff --git a/database/seeders/IngredientThresholdSeeder.php b/database/seeders/IngredientThresholdSeeder.php index 63c1fdbe..c9f99396 100644 --- a/database/seeders/IngredientThresholdSeeder.php +++ b/database/seeders/IngredientThresholdSeeder.php @@ -14,7 +14,6 @@ class IngredientThresholdSeeder extends Seeder public function run(): void { $ingredients = Ingredient::query() - ->whereHas('company', fn ($query) => $query->whereNotIn('name', $this->excludedCompanyNames())) ->whereNull('threshold') ->inRandomOrder() ->get(); diff --git a/database/seeders/LossSeeder.php b/database/seeders/LossSeeder.php index ea3d223f..109c9fd2 100644 --- a/database/seeders/LossSeeder.php +++ b/database/seeders/LossSeeder.php @@ -6,19 +6,16 @@ use App\Models\Ingredient; use App\Models\Loss; use App\Models\Preparation; -use Database\Seeders\Concerns\FiltersSeedableCompanies; use Illuminate\Database\Seeder; class LossSeeder extends Seeder { - use FiltersSeedableCompanies; - /** * Génère des pertes factices pour chaque entreprise. */ public function run(): void { - $this->seedableCompanies()->each(function (Company $company) { + Company::all()->each(function (Company $company) { $user = $company->users()->inRandomOrder()->first(); $company->locations->each(function ($location) use ($company, $user) { diff --git a/database/seeders/OrderHistorySeeder.php b/database/seeders/OrderHistorySeeder.php index 602bd811..dd9253ad 100644 --- a/database/seeders/OrderHistorySeeder.php +++ b/database/seeders/OrderHistorySeeder.php @@ -11,20 +11,16 @@ use App\Models\StepMenu; use App\Models\User; use App\Services\OrderHistoryService; -use Database\Seeders\Concerns\FiltersSeedableCompanies; use Illuminate\Database\Seeder; class OrderHistorySeeder extends Seeder { - use FiltersSeedableCompanies; - public function run(): void { /** @var OrderHistoryService $historyService */ $historyService = app(OrderHistoryService::class); $orders = Order::query() - ->whereHas('company', fn ($query) => $query->whereNotIn('name', $this->excludedCompanyNames())) ->with(['user', 'steps.stepMenus']) ->get(); diff --git a/database/seeders/PerishableSeeder.php b/database/seeders/PerishableSeeder.php index 42357561..d7272848 100644 --- a/database/seeders/PerishableSeeder.php +++ b/database/seeders/PerishableSeeder.php @@ -5,14 +5,11 @@ use App\Models\Ingredient; use App\Models\Loss; use App\Services\PerishableService; -use Database\Seeders\Concerns\FiltersSeedableCompanies; use Illuminate\Database\Seeder; use Illuminate\Support\Facades\DB; class PerishableSeeder extends Seeder { - use FiltersSeedableCompanies; - public function run(PerishableService $service): void { $rows = DB::table('ingredient_location')->where('quantity', '>', 0)->get(); @@ -27,10 +24,6 @@ public function run(PerishableService $service): void } $companyId = $ingredient->company_id; - if ($this->isExcludedCompanyId($companyId)) { - continue; - } - $perishable = $service->add($row->ingredient_id, $row->location_id, $companyId, $row->quantity); if (! $perishable) { continue; // not perishable diff --git a/database/seeders/PreparationThresholdSeeder.php b/database/seeders/PreparationThresholdSeeder.php index 11fda03a..a7ac4e53 100644 --- a/database/seeders/PreparationThresholdSeeder.php +++ b/database/seeders/PreparationThresholdSeeder.php @@ -3,18 +3,14 @@ namespace Database\Seeders; use App\Models\Preparation; -use Database\Seeders\Concerns\FiltersSeedableCompanies; use Faker\Generator as FakerGenerator; use Illuminate\Database\Seeder; class PreparationThresholdSeeder extends Seeder { - use FiltersSeedableCompanies; - public function run(): void { $preparations = Preparation::query() - ->whereHas('company', fn ($query) => $query->whereNotIn('name', $this->excludedCompanyNames())) ->whereNull('threshold') ->inRandomOrder() ->get(); diff --git a/database/seeders/QuickAccessSeeder.php b/database/seeders/QuickAccessSeeder.php index 31ff4fb4..8d7bbef9 100644 --- a/database/seeders/QuickAccessSeeder.php +++ b/database/seeders/QuickAccessSeeder.php @@ -4,13 +4,10 @@ use App\Models\Company; use App\Models\QuickAccess; -use Database\Seeders\Concerns\FiltersSeedableCompanies; use Illuminate\Database\Seeder; class QuickAccessSeeder extends Seeder { - use FiltersSeedableCompanies; - /** * Available quick access shortcuts keyed by their url_key. * @@ -67,7 +64,7 @@ public function run(): void $defaults = array_values(self::defaults()); $allowedIndexes = array_column($defaults, 'index'); - $this->seedableCompanies()->each(function (Company $company) use ($defaults, $allowedIndexes) { + Company::all()->each(function (Company $company) use ($defaults, $allowedIndexes) { foreach ($defaults as $row) { QuickAccess::updateOrCreate( [ diff --git a/database/seeders/StockMovementSeeder.php b/database/seeders/StockMovementSeeder.php index 68aa4f81..e175d53a 100644 --- a/database/seeders/StockMovementSeeder.php +++ b/database/seeders/StockMovementSeeder.php @@ -5,13 +5,10 @@ use App\Models\Ingredient; use App\Models\Preparation; use Carbon\Carbon; -use Database\Seeders\Concerns\FiltersSeedableCompanies; use Illuminate\Database\Seeder; class StockMovementSeeder extends Seeder { - use FiltersSeedableCompanies; - public function run(): void { $this->seedIngredientMovements(); @@ -21,7 +18,6 @@ public function run(): void private function seedIngredientMovements(): void { Ingredient::query() - ->whereHas('company', fn ($query) => $query->whereNotIn('name', $this->excludedCompanyNames())) ->whereHas('locations', fn ($q) => $q->where('quantity', '>', 0)) ->get() ->each(function ($ingredient) { @@ -121,7 +117,6 @@ private function seedIngredientMovements(): void private function seedPreparationMovements(): void { Preparation::query() - ->whereHas('company', fn ($query) => $query->whereNotIn('name', $this->excludedCompanyNames())) ->whereHas('locations', fn ($q) => $q->where('quantity', '>', 0)) ->get() ->each(function ($prep) { diff --git a/docker/php/entrypoint.prod.sh b/docker/php/entrypoint.prod.sh index 9242654d..0b71c22c 100644 --- a/docker/php/entrypoint.prod.sh +++ b/docker/php/entrypoint.prod.sh @@ -145,8 +145,9 @@ fi #Temporary create fake data for development purposes (remove in production) (change app_env in secrets) php artisan migrate:fresh php artisan db:seed --class=DemoSeeder --no-interaction --no-ansi -php artisan db:seed --class=DatabaseSeeder --no-interaction --no-ansi php artisan db:seed --class=LyonnaiseCompanySeeder --no-interaction --no-ansi +php artisan db:seed --class=DatabaseSeeder --no-interaction --no-ansi + #=== START SUPERVISORD ========================================= info "Starting supervisord..." diff --git a/storage/app/.gitignore b/storage/app/.gitignore old mode 100644 new mode 100755 diff --git a/storage/app/private/.gitignore b/storage/app/private/.gitignore old mode 100644 new mode 100755 diff --git a/storage/app/private/images/placeholder.svg b/storage/app/private/images/placeholder.svg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/1.jpg b/storage/app/private/seeders/images/1.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/2.jpg b/storage/app/private/seeders/images/2.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/3.webp b/storage/app/private/seeders/images/3.webp old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/4.jpg b/storage/app/private/seeders/images/4.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/5.jpg b/storage/app/private/seeders/images/5.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/6.jpeg b/storage/app/private/seeders/images/6.jpeg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/7.png b/storage/app/private/seeders/images/7.png old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/8.avif b/storage/app/private/seeders/images/8.avif old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/9.webp b/storage/app/private/seeders/images/9.webp old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/Ail.png b/storage/app/private/seeders/images/Ail.png old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/Bananes.jpg b/storage/app/private/seeders/images/Bananes.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/Carottes.png b/storage/app/private/seeders/images/Carottes.png old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/Citron.png b/storage/app/private/seeders/images/Citron.png old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/Courgettes.webp b/storage/app/private/seeders/images/Courgettes.webp old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/Oranges.jpeg b/storage/app/private/seeders/images/Oranges.jpeg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/Poireaux.jpeg b/storage/app/private/seeders/images/Poireaux.jpeg old mode 100644 new mode 100755 diff --git "a/storage/app/private/seeders/images/bananes-caram\303\251lis\303\251es.jpg" "b/storage/app/private/seeders/images/bananes-caram\303\251lis\303\251es.jpg" old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/bobun-hay-mean.jpeg b/storage/app/private/seeders/images/bobun-hay-mean.jpeg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/briocheparisienne.jpg b/storage/app/private/seeders/images/briocheparisienne.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/burger-brioche.avif b/storage/app/private/seeders/images/burger-brioche.avif old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/cassouletartichaut.jpg b/storage/app/private/seeders/images/cassouletartichaut.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/coca-cherry.webp b/storage/app/private/seeders/images/coca-cherry.webp old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/coulisdeframboises.webp b/storage/app/private/seeders/images/coulisdeframboises.webp old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/cremepatissierealavanille.webp b/storage/app/private/seeders/images/cremepatissierealavanille.webp old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/crousty-boursin.avif b/storage/app/private/seeders/images/crousty-boursin.avif old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/crousty-chicken.avif b/storage/app/private/seeders/images/crousty-chicken.avif old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/crousty-cordon.avif b/storage/app/private/seeders/images/crousty-cordon.avif old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/crousty-curry.avif b/storage/app/private/seeders/images/crousty-curry.avif old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/crousty.jpg b/storage/app/private/seeders/images/crousty.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/farcedeporcmaison.jpg b/storage/app/private/seeders/images/farcedeporcmaison.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/gelee.webp b/storage/app/private/seeders/images/gelee.webp old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/gustave.png b/storage/app/private/seeders/images/gustave.png old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/jusdemariniere.jpg b/storage/app/private/seeders/images/jusdemariniere.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/lentilles-au-curry.jpg b/storage/app/private/seeders/images/lentilles-au-curry.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/marinade.jpg b/storage/app/private/seeders/images/marinade.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/millefeuille.jpg b/storage/app/private/seeders/images/millefeuille.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/oignons-jaunes.webp b/storage/app/private/seeders/images/oignons-jaunes.webp old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/patebrisee.jpg b/storage/app/private/seeders/images/patebrisee.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/pateencroute.jpg b/storage/app/private/seeders/images/pateencroute.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/patefeuillete.jpg b/storage/app/private/seeders/images/patefeuillete.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/pechemelba.webp b/storage/app/private/seeders/images/pechemelba.webp old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/pechepochee.jpg b/storage/app/private/seeders/images/pechepochee.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/piclesdelegume.jpg b/storage/app/private/seeders/images/piclesdelegume.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/pommes-de-terre.webp b/storage/app/private/seeders/images/pommes-de-terre.webp old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/pommes.avif b/storage/app/private/seeders/images/pommes.avif old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/poulet-citron-ail.webp b/storage/app/private/seeders/images/poulet-citron-ail.webp old mode 100644 new mode 100755 diff --git "a/storage/app/private/seeders/images/pur\303\251e-de-pommes-de-terre.webp" "b/storage/app/private/seeders/images/pur\303\251e-de-pommes-de-terre.webp" old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/ratatouille-express.jpg b/storage/app/private/seeders/images/ratatouille-express.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/salade-de-tomates-au-basilic.jpg b/storage/app/private/seeders/images/salade-de-tomates-au-basilic.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/salades.jpg b/storage/app/private/seeders/images/salades.jpg old mode 100644 new mode 100755 diff --git "a/storage/app/private/seeders/images/saumon-grill\303\251-au-citron.jpg" "b/storage/app/private/seeders/images/saumon-grill\303\251-au-citron.jpg" old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/solmeuniere.jpg b/storage/app/private/seeders/images/solmeuniere.jpg old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/soupe-poireaux-pommes-de-terre.webp b/storage/app/private/seeders/images/soupe-poireaux-pommes-de-terre.webp old mode 100644 new mode 100755 diff --git a/storage/app/private/seeders/images/spaghetti-tomate-basilic.jpg b/storage/app/private/seeders/images/spaghetti-tomate-basilic.jpg old mode 100644 new mode 100755 diff --git "a/storage/app/private/seeders/images/tomates-fra\303\256ches.png" "b/storage/app/private/seeders/images/tomates-fra\303\256ches.png" old mode 100644 new mode 100755 diff --git "a/storage/app/private/seeders/images/\305\223ufs-brouill\303\251s.jpg" "b/storage/app/private/seeders/images/\305\223ufs-brouill\303\251s.jpg" old mode 100644 new mode 100755 diff --git a/storage/app/public/.gitignore b/storage/app/public/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/.gitignore b/storage/framework/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/data/.gitignore b/storage/framework/cache/data/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/sessions/.gitignore b/storage/framework/sessions/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/testing/.gitignore b/storage/framework/testing/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore old mode 100644 new mode 100755 diff --git a/storage/logs/.gitignore b/storage/logs/.gitignore old mode 100644 new mode 100755