create seeder for city and province

backend/app/Admin/Controllers/ExpertManagementController.php

@@ -4,6 +4,7 @@ namespace App\Admin\Controllers;
 
 use App\Admin\Requests\ExpertManagement\StoreRequest;
 use App\Admin\Requests\ExpertManagement\UpdateRequest;
+use App\Admin\Resources\ExpertManagementResource;
 use App\Facades\DataTable\DataTableFacade;
 use App\Http\Controllers\Controller;
 use App\Models\City;

backend/app/Admin/Controllers/ProfileController.php

@@ -3,7 +3,6 @@
 namespace App\Admin\Controllers;
 
 use App\Admin\Requests\Profile\ChangePasswordRequest;
-use App\Admin\Requests\Profile\EditRequest;
 use App\Admin\Resources\ExpertResource;
 use App\Http\Controllers\Controller;
 use App\Traits\ApiResponse;
@@ -20,24 +19,6 @@ class ProfileController extends Controller
         return $this->successResponse(new ExpertResource(Auth::guard('expert')->user()));
     }
 
-    public function edit(EditRequest $request): JsonResponse
-    {
-        $expert = $request->user('expert');
-
-        $expert->update([
-            'username' => $request->username,
-            'first_name' => $request->first_name,
-            'last_name' => $request->last_name,
-            'email' => $expert->email,
-            'national_id' => $request->national_id,
-            'phone_number' => $request->phone_number,
-            'province_id' => $request->province_id,
-            'city_id' => $request->city_id,
-        ]);
-
-        return $this->successResponse();
-    }
-
     public function changePassword(ChangePasswordRequest $request): JsonResponse
     {
         $expert = Auth::guard('expert')->user();

backend/app/Admin/Requests/Profile/EditRequest.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Admin\Requests\Profile;
-
-use Illuminate\Contracts\Validation\ValidationRule;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-use Illuminate\Validation\Validator;
-
-class EditRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     */
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, ValidationRule|array|string>
-     */
-    public function rules(): array
-    {
-        return [
-            'username' => 'string|max:255',
-            'first_name' => 'required|string',
-            'last_name' => 'required|string',
-            'national_id' => 'required',
-            'email' => 'string|email|max:255',
-            'phone_number' => 'string',
-            'province_id' => 'string',
-            'city_id' => 'string',
-        ];
-    }
-}

backend/app/Enums/BusinessTypeEnum.php

@@ -40,27 +40,4 @@ enum BusinessTypeEnum: int
             self::OTHER => 'other',
         };
     }
-
-    public function name($id): string
-    {
-        $mapArray = [
-            1 => 'medical',
-            2 => 'legal',
-            3 => 'engineering',
-            4 => 'education',
-            5 => 'consulting',
-            6 => 'beauty',
-            7 => 'technical_services',
-            8 => 'financial',
-            9 => 'real_estate',
-            10 => 'restaurant',
-            11 => 'shop',
-            12 => 'transportation',
-            13 => 'art',
-            14 => 'sport',
-            15 => 'other',
-        ];
-
-        return $mapArray[$id];
-    }
 }

backend/app/Services/FIB/AuthorizationService.php

@@ -16,7 +16,7 @@ class AuthorizationService
     public function __construct()
     {
         $this->url = config('fib.authorization.url');
-        $this->channelName = 'fib_authorization';
+        $this->channelName = '';
         $this->inputParameters = [
             'client_id' => config('fib.authorization.client_id'),
             'client_secret' => config('fib.authorization.client_secret'),
@@ -51,6 +51,7 @@ class AuthorizationService
     {
         return Http::asForm()
             ->throw()
+            ->withoutVerifying()
             ->post($this->url, $this->inputParameters)
             ->json();
     }

backend/app/User/Controllers/CityController.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\User\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Models\City;
+use App\Traits\ApiResponse;
+use Illuminate\Http\JsonResponse;
+
+class CityController extends Controller
+{
+    use ApiResponse;
+
+    public function list(): JsonResponse
+    {
+        return response()->json(City::all(['id', 'name']));
+    }
+}

backend/app/User/Controllers/GatewayManagementController.php

@@ -1,97 +0,0 @@
-<?php
-
-namespace App\User\Controllers;
-
-use App\Enums\BusinessTypeEnum;
-use App\Facades\DataTable\DataTableFacade;
-use App\Facades\File\FileFacade;
-use App\Http\Controllers\Controller;
-use App\Models\UserGateway;
-use App\Traits\ApiResponse;
-use App\User\Requests\Gateway\StoreRequest;
-use App\User\Requests\Gateway\UpdateRequest;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Throwable;
-
-class GatewayManagementController extends Controller
-{
-    use ApiResponse;
-
-    public function index(Request $request)
-    {
-        return DataTableFacade::run(
-            UserGateway::query()->where('user_id', '=', Auth::guard('web')->id()),
-            $request,
-            allowedFilters: ['*'],
-            allowedSortings: ['*'],
-            allowedSelects: ['id', 'name', 'domain', 'tax_id', 'bank_name', 'account_holder', 'iban', 'business_type_id', 'business_type_name'],
-        );
-    }
-
-    /**
-     * @throws Throwable
-     */
-    public function store(StoreRequest $request): JsonResponse
-    {
-        $user = Auth::guard('web')->user();
-
-        $logo = $request->has('logo') ? FileFacade::save($request->file('logo'), "{$user->id}") : null;
-
-        DB::transaction(function () use ($user, $logo, $request) {
-            UserGateway::query()->create([
-                'user_id' => $user->id,
-                'username' => $user->username,
-                'name' => $request->name,
-                'domain' => $request->domain,
-                'tax_id' => $request->tax_id,
-                'bank_name' => $request->bank_name,
-                'account_holder' => $request->account_holder,
-                'iban' => $request->iban,
-                'business_type_id' => $request->business_type_id,
-                'business_type_name' => BusinessTypeEnum::name($request->business_type_id),
-                'logo' => $logo,
-            ]);
-
-            $user->update(['authority_level' => 1]);
-        });
-
-
-        return $this->successResponse();
-    }
-
-    public function show(UserGateway $gateway): JsonResponse
-    {
-        return $this->successResponse($gateway);
-    }
-
-    public function update(UpdateRequest $request, UserGateway $gateway): JsonResponse
-    {
-        $logo = null;
-        $user = Auth::guard('web')->user();
-
-        if ($request->has('logo'))
-        {
-            FileFacade::delete($gateway->logo, true);
-            $logo = FileFacade::save(request()->file('logo'), "{$user->id}");
-        }
-
-        $gateway->update([
-            'name' => $request->name,
-            'domain' => $request->domain,
-            'business_type_id' => $request->business_type_id,
-            'business_type_name' => BusinessTypeEnum::name($request->business_type_id),
-            'logo' => $logo,
-        ]);
-
-        return $this->successResponse();
-    }
-
-    public function destroy(UserGateway $gateway): JsonResponse
-    {
-        $gateway->delete();
-        return $this->successResponse();
-    }
-}

backend/app/User/Controllers/ProfileController.php

@@ -2,19 +2,14 @@
 
 namespace App\User\Controllers;
 
-use App\Facades\File\FileFacade;
 use App\Http\Controllers\Controller;
-use App\Models\City;
-use App\Models\Province;
 use App\Traits\ApiResponse;
 use App\User\Requests\Profile\ChangePasswordRequest;
 use App\User\Requests\Profile\EditRequest;
 use App\User\Resources\UserResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
-use Throwable;
 
 class ProfileController extends Controller
 {
@@ -25,40 +20,21 @@ class ProfileController extends Controller
         return $this->successResponse(new UserResource(Auth::user()));
     }
 
-    /**
-     * @throws Throwable
-     */
     public function edit(EditRequest $request): JsonResponse
     {
         $user = Auth::user();
-        $province = Province::query()->find($request->province_id);
-        $city = City::query()->find($request->city_id);
 
-        DB::transaction(function () use ($user, $province, $city, $request) {
+        $user->update([
-            if ($user->kyc_status == 0)
+            'first_name' => $request->first_name,
-            {
+            'last_name' => $request->last_name,
-                $user->documents()->create([
+            'national_id' => $request->national_id,
-                    'title' => 'id_card',
+            'address' => $request->address,
-                    'url' => FileFacade::save($request->file('id_card'), "{$user->id}/"),
+            'postal_code' => $request->postal_code,
-                ]);
+            'phone_number' => $request->phone_number,
-            }
+            'province_id' => $request->province_id,
-
+            'city_id' => $request->city_id,
-            $user->update([
+            'status' => 1
-                'first_name' => $request->first_name,
+        ]);
-                'last_name' => $request->last_name,
-                'national_id' => $request->national_id,
-                'address' => $request->address,
-                'postal_code' => $request->postal_code,
-                'phone_number' => $request->phone_number,
-                'province_id' => $province->id,
-                'province_name' => $province->name,
-                'city_id' => $city->id,
-                'city_name' => $city->name,
-                'birth_date' => $request->birth_date,
-                'email' => $request->email,
-                'kyc_status' => 1,
-            ]);
-        });
 
         return $this->successResponse();
     }

backend/app/User/Controllers/ProvinceController.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\User\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Models\Province;
+use App\Traits\ApiResponse;
+use Illuminate\Http\JsonResponse;
+
+class ProvinceController extends Controller
+{
+    use ApiResponse;
+    public function list(): JsonResponse
+    {
+        return response()->json(Province::all(['id', 'name']));
+    }
+}

backend/app/User/Requests/Gateway/StoreRequest.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\User\Requests\Gateway;
-
-use Illuminate\Contracts\Validation\ValidationRule;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-
-class StoreRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     */
-    public function authorize(): bool
-    {
-        return Auth::guard('web')->user()->kyc_status;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, ValidationRule|array|string>
-     */
-    public function rules(): array
-    {
-        return [
-            'name' => 'required|string|max:255',
-            'domain' => 'required|string|max:255',
-            'tax_id' => 'required|string',
-            'bank_name' => 'required|string|max:255',
-            'account_holder' => 'required|string',
-            'iban' => 'required|string|max:255',
-            'logo' => 'image|mimes:jpeg,png,jpg,gif,svg|max:2048',
-            'business_type_id' => 'required|string|exists:business_types,id',
-        ];
-    }
-}

backend/app/User/Requests/Gateway/UpdateRequest.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\User\Requests\Gateway;
-
-use Illuminate\Contracts\Validation\ValidationRule;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-
-class UpdateRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     */
-    public function authorize(): bool
-    {
-        return Auth::guard('web')->user()->kyc_status;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, ValidationRule|array|string>
-     */
-    public function rules(): array
-    {
-        return [
-            'name' => 'required|string|max:255',
-            'domain' => 'required|string|max:255',
-            'business_type_id' => 'required|string|exists:business_types,id',
-            'logo' => 'image|mimes:jpeg,png,jpg,gif,svg|max:2048',
-        ];
-    }
-}

backend/app/User/Requests/Profile/EditRequest.php

@@ -4,9 +4,6 @@ namespace App\User\Requests\Profile;
 
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Validation\Rule;
-use Illuminate\Validation\Validator;
 
 class EditRequest extends FormRequest
 {
@@ -25,20 +22,15 @@ class EditRequest extends FormRequest
      */
     public function rules(): array
     {
-        $user = Auth::guard('web')->user();
-
         return [
-            'first_name' => 'required|string|max:255',
+            'first_name' => 'required|string',
-            'last_name' => 'required|string|max:255',
+            'last_name' => 'required|string',
-            'national_id' => [Rule::prohibitedIf($user->kyc_status == 1), 'string',],
+            'national_id' => 'required',
-            'email' => 'required|email|max:255',
+            'address' => 'required',
-            'address' => 'required|string',
+            'postal_code' => 'required',
-            'postal_code' => 'required|string',
+            'phone_number' => 'required',
-            'phone_number' => 'required|string',
+            'province_id' => 'required',
-            'province_id' => 'required|exists:provinces,id',
+            'city_id' => 'required',
-            'city_id' => 'required|exists:cities,id',
-            'birth_date' => 'required|date',
-            'id_card' => [Rule::prohibitedIf($user->kyc_status == 1), 'image', 'mimes:jpeg,png,jpg,gif,svg', 'max:2048']
         ];
     }
 }

backend/app/User/Resources/UserResource.php

@@ -18,18 +18,6 @@ class UserResource extends JsonResource
             'id' => $this->id,
             'username' => $this->username,
             'email' => $this->email,
-            'first_name' => $this->first_name,
-            'last_name' => $this->last_name,
-            'national_id' => $this->national_id,
-            'address' => $this->address,
-            'postal_code' => $this->postal_code,
-            'phone_number' => $this->phone_number,
-            'province_id' => $this->provonce_id,
-            'province_name' => $this->province_name,
-            'city_id' => $this->city_id,
-            'city_name' => $this->city_name,
-            'birth_date' => $this->birth_date,
-            'kyc_status' => $this->kyc_status,
         ];
     }
 }

backend/config/logging.php

@@ -127,12 +127,6 @@ return [
             'path' => storage_path('logs/laravel.log'),
         ],
 
-        'fib_authorization' => [
-            'driver' => 'single',
-            'path' => storage_path('logs/fib/authorization.log'),
-            'level' => 'error',
-        ],
-
     ],
 
 ];

backend/database/migrations/0001_01_01_000000_create_users_table.php

@@ -22,6 +22,7 @@ return new class extends Migration
             $table->string('national_id')->nullable();
             $table->string('address')->nullable();
             $table->string('postal_code')->nullable();
+            $table->string('tax_id')->nullable();
             $table->string('phone_number')->nullable();
             $table->date('birth_date')->nullable();
             $table->foreignId('province_id')->nullable()->constrained('provinces');

backend/database/migrations/2026_05_18_095610_create_transactions_table.php

@@ -21,7 +21,7 @@ return new class extends Migration
             $table->dateTime('expires_in');
             $table->foreignId('payment_id')->constrained('payments');
             $table->string('payment_track_id');
-            $table->foreignId('user_gateway_id')->constrained('user_gateways');
+            $table->foreignId('gateway_id')->constrained('gateways');
             $table->integer('status');
             $table->timestamps();
         });

backend/routes/expert.php

@@ -4,7 +4,6 @@ use App\Admin\Controllers\AuthController;
 use App\Admin\Controllers\DocumentationController;
 use App\Admin\Controllers\ExpertManagementController;
 use App\Admin\Controllers\PermissionManagementController;
-use App\Admin\Controllers\ProfileController;
 use App\Admin\Controllers\RoleManagementController;
 use App\Admin\Controllers\UserManagementController;
 
@@ -39,7 +38,6 @@ Route::prefix('user_management')
         Route::post('/{user}', 'update')->name('update');
         Route::delete('/{user}', 'destroy')->name('destroy');
     });
-
 Route::prefix('roles')
     ->name('roles.')
     ->middleware(['auth:expert', 'permission:role-management'])
@@ -51,7 +49,6 @@ Route::prefix('roles')
         Route::post('/{role}', 'update')->name('update');
         Route::delete('/{role}', 'destroy')->name('destroy');
     });
-
 Route::prefix('permissions')
     ->name('permissions.')
     ->middleware(['auth:expert', 'permission:permission-management'])
@@ -63,7 +60,6 @@ Route::prefix('permissions')
         Route::post('/{permission}', 'update')->name('update');
         Route::delete('/{permission}', 'destroy')->name('destroy');
     });
-
 Route::prefix('expert')
     ->name('expert.')
     ->middleware(['auth:expert', 'permission:expert-management'])
@@ -75,13 +71,3 @@ Route::prefix('expert')
         Route::post('/{expert}', 'update')->name('update');
         Route::delete('/{expert}', 'destroy')->name('destroy');
     });
-
-Route::prefix('profile')
-    ->name('profile.')
-    ->middleware('auth')
-    ->controller(ProfileController::class)
-    ->group(function () {
-        Route::get('info', 'info')->name('info');
-        Route::post('edit', 'edit')->name('edit');
-        Route::post('change_password', 'changePassword')->name('changePassword');
-    });

backend/routes/web.php

@@ -5,8 +5,9 @@ use App\Admin\Controllers\PermissionManagementController;
 use App\Admin\Controllers\RoleManagementController;
 use App\Admin\Controllers\UserManagementController;
 use App\User\Controllers\AuthController;
-use App\User\Controllers\GatewayManagementController;
+use App\User\Controllers\CityController;
 use App\User\Controllers\ProfileController;
+use App\User\Controllers\ProvinceController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('auth')
@@ -28,14 +29,16 @@ Route::prefix('profile')
         Route::post('change_password', 'changePassword')->name('changePassword');
     });
 
-Route::prefix('user_gateway')
+Route::prefix('province')
-    ->name('userGateway.')
+    ->name('province.')
-    ->middleware(['auth'])
+    ->controller(ProvinceController::class)
-    ->controller(GatewayManagementController::class)
     ->group(function () {
-        Route::get('/', 'index')->name('index');
+        Route::get('list', 'list')->name('list');
-        Route::post('/', 'store')->name('store');
+    });
-        Route::get('/{gateway}', 'show')->name('show');
+
-        Route::post('/{gateway}', 'update')->name('update');
+Route::prefix('city')
-        Route::delete('/{gateway}', 'destroy')->name('destroy');
+    ->name('city.')
+    ->controller(CityController::class)
+    ->group(function () {
+        Route::get('list', 'list')->name('list');
     });