diff --git a/database/factories/InvoiceFactory.php b/database/factories/InvoiceFactory.php index 334c6b4..3b3d491 100644 --- a/database/factories/InvoiceFactory.php +++ b/database/factories/InvoiceFactory.php @@ -19,11 +19,12 @@ class InvoiceFactory extends Factory public function definition(): array { $date = $this->faker->dateTimeBetween('-1 months', 'now'); + $c = Customer::inRandomOrder()->first(); return [ - 'customer_id' => Customer::inRandomOrder()->first()->id, + 'customer_id' => $c->id, 'status' => Invoice::$invoiceStatus[rand(0,count(Invoice::$invoiceStatus)-1)], 'desc' => $this->faker->realText(), - 'address_id' => null, + 'address_id' => $c->addresses()->inRandomOrder()->first()->id, 'transport_id' => null, 'transport_price' => 0, 'created_at' => $date, diff --git a/database/migrations/2024_07_04_050212_create_areas_table.php b/database/migrations/2024_07_04_050212_create_areas_table.php index 191b562..2677a58 100644 --- a/database/migrations/2024_07_04_050212_create_areas_table.php +++ b/database/migrations/2024_07_04_050212_create_areas_table.php @@ -17,6 +17,7 @@ return new class extends Migration $table->tinyInteger('max')->default(1); $table->string('icon')->nullable(); $table->json('valid_segments'); + $table->string('preview')->nullable(); $table->timestamps(); }); } diff --git a/database/seeders/AreaSeeder.php b/database/seeders/AreaSeeder.php index 22999a5..818e259 100644 --- a/database/seeders/AreaSeeder.php +++ b/database/seeders/AreaSeeder.php @@ -21,6 +21,7 @@ class AreaSeeder extends Seeder ["preloader"] ), 'max' => 1, + 'preview' => null, 'icon' => 'ri-loader-2-line', ], [ @@ -31,6 +32,7 @@ class AreaSeeder extends Seeder ,"groups","categories","category","group","index"] ), 'max' => 10, + 'preview' => 'welcome', 'icon' => 'ri-layout-top-2-line', ], ]; @@ -40,6 +42,7 @@ class AreaSeeder extends Seeder $a->max = $area['max']; $a->valid_segments = $area['valid_segments']; $a->icon = $area['icon']; + $a->preview = $area['preview']; $a->save(); } } diff --git a/database/seeders/CustomerSeeder.php b/database/seeders/CustomerSeeder.php index 00ecd18..93a4e73 100644 --- a/database/seeders/CustomerSeeder.php +++ b/database/seeders/CustomerSeeder.php @@ -3,6 +3,7 @@ namespace Database\Seeders; use App\Models\Customer; +use App\Models\State; use Illuminate\Database\Console\Seeds\WithoutModelEvents; use Illuminate\Database\Seeder; @@ -15,5 +16,17 @@ class CustomerSeeder extends Seeder { // Customer::factory(35)->create(); + foreach (Customer::all() as $customer) { + $s = State::inRandomOrder()->first(); + $c = $s->cities()->inRandomOrder()->first(); + $customer->addresses()->create([ + 'state_id' => $s->id, + 'city_id' => $c->id, + 'zip' => rand(12345, 54321), + 'lat' => $c->lat, + 'lng' => $c->lng, + 'address' => 'some address', + ]); + } } } diff --git a/database/seeders/PostSeeder.php b/database/seeders/PostSeeder.php index e07726c..8d2774e 100644 --- a/database/seeders/PostSeeder.php +++ b/database/seeders/PostSeeder.php @@ -2,6 +2,7 @@ namespace Database\Seeders; +use App\Models\Group; use App\Models\Post; use Illuminate\Database\Console\Seeds\WithoutModelEvents; use Illuminate\Database\Seeder; @@ -15,5 +16,9 @@ class PostSeeder extends Seeder { // Post::factory(55)->create(); + + foreach (Post::inRandomOrder()->limit(10)->get() as $post) { + $post->groups()->sync(Group::all()->pluck('id')->toArray()); + } } } diff --git a/resources/views/admin/commons/gfx.blade.php b/resources/views/admin/commons/gfx.blade.php index 88abd3d..277a220 100644 --- a/resources/views/admin/commons/gfx.blade.php +++ b/resources/views/admin/commons/gfx.blade.php @@ -1,5 +1,7 @@ @extends('layouts.app') - +@section('title') + {{__("GFX")}} - +@endsection @section('content')
@csrf