diff --git a/app/Modules/BaseAuth/Middleware/RedirectIfUserPhoneIsVerfied.php b/app/Modules/BaseAuth/Middleware/RedirectIfUserPhoneIsVerfied.php index fa0e2b3..c8d9642 100644 --- a/app/Modules/BaseAuth/Middleware/RedirectIfUserPhoneIsVerfied.php +++ b/app/Modules/BaseAuth/Middleware/RedirectIfUserPhoneIsVerfied.php @@ -17,7 +17,7 @@ class RedirectIfUserPhoneIsVerfied public function handle(Request $request, Closure $next): Response { if (Auth::check() && ! is_null($request->user()?->phone_verified_at)) { - return redirect()->route(config()->string('module.base-auth.redirect_path')); + return redirect(config()->string('module.base-auth.redirect_path')); } return $next($request); diff --git a/app/Modules/CardOrder/Database/Migrations/2025_10_23_012416_create_card_orders_table.php b/app/Modules/CardOrder/Database/Migrations/2025_10_23_012416_create_card_orders_table.php index 36463ca..72e8831 100644 --- a/app/Modules/CardOrder/Database/Migrations/2025_10_23_012416_create_card_orders_table.php +++ b/app/Modules/CardOrder/Database/Migrations/2025_10_23_012416_create_card_orders_table.php @@ -53,7 +53,7 @@ return new class extends Migration $table->text('notes')->nullable(); - $table->foreignId('user_id')->constrained('users')->restrictOnDelete(); + $table->foreignId('user_id')->nullable()->constrained('users')->nullOnDelete(); $table->boolean('paid')->default(false); diff --git a/app/Modules/UserAdjustments/Database/Migrations/2025_11_03_173856_add_active_to_users_table.php b/app/Modules/UserAdjustments/Database/Migrations/2025_11_03_173856_add_active_to_users_table.php new file mode 100644 index 0000000..5d8ffde --- /dev/null +++ b/app/Modules/UserAdjustments/Database/Migrations/2025_11_03_173856_add_active_to_users_table.php @@ -0,0 +1,28 @@ +boolean('active')->default(true); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('users', function (Blueprint $table) { + $table->dropColumn('active'); + }); + } +}; diff --git a/database/seeders/FillJsonData.php b/database/seeders/FillJsonData.php index fe164cc..f21c264 100644 --- a/database/seeders/FillJsonData.php +++ b/database/seeders/FillJsonData.php @@ -16,18 +16,6 @@ class FillJsonData extends Seeder */ public function run(): void { - - } - - public function insertByFiles(): void - { - $files = glob(database_path('data').'/*'); - - foreach ($files as $file) { - $table_data = File::json($file); - $table_name = Str::afterLast(Str::before($file, '.json'), '/'); - - DB::table($table_name)->insert($table_data); - } + // provinces } } diff --git a/database/seeders/ShieldSeeder.php b/database/seeders/ShieldSeeder.php index c929018..64c5fd0 100644 --- a/database/seeders/ShieldSeeder.php +++ b/database/seeders/ShieldSeeder.php @@ -35,14 +35,6 @@ class ShieldSeeder extends Seeder 'name' => 'admin', 'guard_name' => 'web', ], - [ - 'name' => 'operator', - 'guard_name' => 'web', - ], - [ - 'name' => 'currency_maintainer', - 'guard_name' => 'web', - ], ])->map(fn ($role) => [ ...$role, 'created_at' => now(),