fix onfilixt

backend/app/Admin/Controllers/AuthController.php

@@ -16,6 +16,19 @@ class AuthController extends Controller
 {
     use ApiResponse;
 
+    public function register(RegisterRequest $request): JsonResponse
+    {
+        Expert::query()->create([
+            'username' => $request->username,
+            'email' => $request->email,
+            'password' => Hash::make($request->password),
+        ]);
+
+        $request->session()->regenerate();
+
+        return $this->successResponse();
+    }
+
     public function login(LoginRequest $request): JsonResponse
     {
         $credentials = ['password' => $request->password];
@@ -26,7 +39,8 @@ class AuthController extends Controller
             $credentials['username'] = $request->login;
         }
 
-        if (Auth::guard('expert')->attempt($credentials)) {
+        if (Auth::attempt($credentials))
+        {
             $request->session()->regenerate();
 
             return $this->successResponse();

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

@@ -53,4 +53,5 @@ class ProfileController extends Controller
 
         return $this->successResponse();
     }
+
 }

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

@@ -4,8 +4,6 @@ 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
 {
@@ -26,10 +24,10 @@ class EditRequest extends FormRequest
     {
         return [
             'username' => 'string|max:255',
-            'first_name' => 'required|string',
-            'last_name' => 'required|string',
-            'national_id' => 'required',
+            'first_name' => 'string',
+            'last_name' => 'string',
             'email' => 'string|email|max:255',
+            'national_id' => 'string',
             'phone_number' => 'string',
             'province_id' => 'string',
             'city_id' => 'string',

backend/app/Enums/BusinessTypeEnum.php

@@ -1,66 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-enum BusinessTypeEnum: int
-{
-    case MEDICAL = 1;
-    case LEGAL = 2;
-    case ENGINEERING = 3;
-    case EDUCATION = 4;
-    case CONSULTING = 5;
-    case BEAUTY = 6;
-    case TECHNICAL_SERVICES = 7;
-    case FINANCIAL = 8;
-    case REAL_ESTATE = 9;
-    case RESTAURANT = 10;
-    case SHOP = 11;
-    case TRANSPORTATION = 12;
-    case ART = 13;
-    case SPORT = 14;
-    case OTHER = 15;
-
-    public function label(): string
-    {
-        return match ($this) {
-            self::MEDICAL => 'medical',
-            self::LEGAL => 'legal',
-            self::ENGINEERING => 'engineering',
-            self::EDUCATION => 'education',
-            self::CONSULTING => 'consulting',
-            self::BEAUTY => 'beauty',
-            self::TECHNICAL_SERVICES => 'technical_services',
-            self::FINANCIAL => 'financial',
-            self::REAL_ESTATE => 'real_estate',
-            self::RESTAURANT => 'restaurant',
-            self::SHOP => 'shop',
-            self::TRANSPORTATION => 'transportation',
-            self::ART => 'art',
-            self::SPORT => 'sport',
-            self::OTHER => 'other',
-        };
-    }
-
-    public static 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/Enums/PaymentStatusEnum.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-enum PaymentStatusEnum:int
-{
-    case Unpaid = 0;
-    case Cancelled = 1;
-    case Expired = 2;
-    case Paid = 3;
-    case Refunded = 4;
-
-    public function label(): string
-    {
-        return match ($this) {
-            self::Unpaid => 'unpaid',
-            self::Cancelled => 'cancelled',
-            self::Expired => 'expired',
-            self::Paid => 'paid',
-            self::Refunded => 'refunded',
-        };
-    }
-}

backend/app/Models/BusinessType.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Database\Factories\BusinessTypeFactory;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class BusinessType extends Model
-{
-    /** @use HasFactory<BusinessTypeFactory> */
-    use HasFactory;
-
-    protected $guarded = ['id'];
-}

backend/app/Models/Expert.php

@@ -5,19 +5,17 @@ namespace App\Models;
 use Database\Factories\ExpertFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Notifications\Notifiable;
-use Illuminate\Foundation\Auth\User as Authenticatable;
 use Spatie\Permission\Traits\HasRoles;
 
 /**
  * @method roles()
  * @method permissions()
  */
-class Expert extends Authenticatable
+class Expert extends Model
 {
     /** @use HasFactory<ExpertFactory> */
-
-    use Notifiable,HasFactory,HasRoles;
+    use HasFactory;
+    use HasRoles;
 
     protected $guarded = ['id'];
     protected string $guard_name = 'web';

backend/app/Models/FibTransaction.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class FibTransaction extends Model
-{
-    /** @use HasFactory<\Database\Factories\FibTransactionFactory> */
-    use HasFactory;
-}

backend/app/Models/FibTransactionStatus.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class FibTransactionStatus extends Model
-{
-    /** @use HasFactory<\Database\Factories\FibTransactionStatusFactory> */
-    use HasFactory;
-}

backend/app/Models/Gateway.php

@@ -2,13 +2,13 @@
 
 namespace App\Models;
 
-use Database\Factories\UserGatewayFactory;
+use Database\Factories\GatewayFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
-class UserGateway extends Model
+class Gateway extends Model
 {
-    /** @use HasFactory<UserGatewayFactory> */
+    /** @use HasFactory<GatewayFactory> */
     use HasFactory;
 
     protected $guarded = ['id'];

backend/app/Models/GatewayCategory.php

@@ -2,13 +2,13 @@
 
 namespace App\Models;
 
-use Database\Factories\TransactionFactory;
+use Database\Factories\GatewayCategoryFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
-class Transaction extends Model
+class GatewayCategory extends Model
 {
-    /** @use HasFactory<TransactionFactory> */
+    /** @use HasFactory<GatewayCategoryFactory> */
     use HasFactory;
 
     protected $guarded = ['id'];

backend/app/Models/User.php

@@ -10,8 +10,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
-use Illuminate\Support\Facades\Hash;
-use Laravel\Passport\Bridge\Client;
 use Laravel\Passport\HasApiTokens;
 
 #[Guarded(['id'])]
@@ -26,14 +24,4 @@ class User extends Authenticatable
     {
         return $this->morphToMany(Document::class, 'documentable');
     }
-
-    public function validateForPassportPasswordGrant(string $password): bool
-    {
-        return Hash::check($password, $this->password);
-    }
-
-    public function findForPassport(string $username, Client $client): User
-    {
-        return $this->where('username', $username)->first();
-    }
 }

backend/app/Providers/AppServiceProvider.php

@@ -22,8 +22,6 @@ class AppServiceProvider extends ServiceProvider
     public function boot(): void
     {
         Passport::enablePasswordGrant();
-        Passport::tokensExpireIn(CarbonInterval::minutes(1));
-        Passport::refreshTokensExpireIn(CarbonInterval::minutes(5));
         Passport::personalAccessTokensExpireIn(CarbonInterval::minutes(1));
     }
 }

backend/app/User/Controllers/CityController.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\User\Controllers;
-
-use App\Http\Controllers\Controller;
-use App\Models\City;
-use App\Models\Province;
-use App\Traits\ApiResponse;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class CityController extends Controller
-{
-    use ApiResponse;
-
-    public function list(Request $request): JsonResponse
-    {
-        $cities = City::query()
-            ->where('province_id', '=', $request->query('province_id'))
-            ->get(['id', 'name']);
-
-        return $this->successResponse($cities);
-    }
-}

backend/app/User/Controllers/Dashboard/ConfirmController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\User\Controllers\Dashboard;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+class ConfirmController extends Controller
+{
+    public function index()
+    {
+        //
+    }
+}

backend/app/User/Controllers/Dashboard/DocumentationController.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\User\Controller\Dashboard;
+
+use App\Http\Controllers\Controller;
+use App\Traits\ApiResponse;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DocumentationController extends Controller
+{
+    use ApiResponse;
+
+    public function store(StoreRequest $request): jsonResponse
+    {
+        //
+    }
+
+    public function update(UpdateRequest $request): JsonResponse
+    {
+        //
+    }
+
+}

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) {
-            if ($user->kyc_status == 0)
-            {
-                $user->documents()->create([
-                    'title' => 'id_card',
-                    'url' => FileFacade::save($request->file('id_card'), "{$user->id}/"),
-                ]);
-            }
-
-            $user->update([
-                'first_name' => $request->first_name,
-                'last_name' => $request->last_name,
-                'national_id' => $user->kyc_status == 0 ? $request->national_id : $user->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,
-            ]);
-        });
+        $user->update([
+            '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' => $request->province_id,
+            'city_id' => $request->city_id,
+            'status' => 1
+        ]);
 
         return $this->successResponse();
     }

backend/app/User/Controllers/ProvinceController.php

@@ -1,17 +0,0 @@
-<?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 $this->successResponse(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',
-            'last_name' => 'required|string|max:255',
-            'national_id' => [Rule::prohibitedIf($user->kyc_status == 1), 'string',],
-            'email' => 'required|email|max:255',
-            'address' => 'required|string',
-            'postal_code' => 'required|string',
-            'phone_number' => 'required|string',
-            'province_id' => 'required|exists:provinces,id',
-            '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']
+            'first_name' => 'required|string',
+            'last_name' => 'required|string',
+            'national_id' => 'required',
+            'address' => 'required',
+            'postal_code' => 'required',
+            'phone_number' => 'required',
+            'province_id' => 'required',
+            'city_id' => 'required',
         ];
     }
 }

backend/app/User/Resources/UserResource.php

@@ -18,19 +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->province_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,
-            'authority_level' => $this->authority_level,
         ];
     }
 }

backend/app/User/Services/FIB/AuthorizationService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\FIB;
+namespace App\User\Services\FIB;
 
 use Exception;
 use Illuminate\Http\Client\ConnectionException;
@@ -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/Services/FIB/CancelPaymentService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\FIB;
+namespace App\User\Services\FIB;
 
 use Exception;
 use Illuminate\Http\Client\ConnectionException;

backend/app/User/Services/FIB/CheckPaymentStatusService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\FIB;
+namespace App\User\Services\FIB;
 
 use Exception;
 use Illuminate\Http\Client\ConnectionException;

backend/app/User/Services/FIB/CreatePaymentService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\FIB;
+namespace App\User\Services\FIB;
 
 use Exception;
 use Illuminate\Http\Client\ConnectionException;

backend/app/User/Services/FIB/RefundService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\FIB;
+namespace App\User\Services\FIB;
 
 use Exception;
 use Illuminate\Http\Client\ConnectionException;

backend/config/auth.php

@@ -1,6 +1,5 @@
 <?php
 
-use App\Models\Expert;
 use App\Models\User;
 
 return [