Compare commits
4 Commits
feature/Pr
...
5c757e1823
| Author | SHA1 | Date | |
|---|---|---|---|
| 5c757e1823 | |||
| 9ad3d6cea0 | |||
| 8554f4cc55 | |||
| 5e48777e1c |
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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',
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -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];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
18
backend/app/User/Controllers/CityController.php
Executable file
18
backend/app/User/Controllers/CityController.php
Executable file
@@ -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']));
|
||||
}
|
||||
}
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -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' => $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,
|
||||
]);
|
||||
});
|
||||
$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();
|
||||
}
|
||||
|
||||
17
backend/app/User/Controllers/ProvinceController.php
Executable file
17
backend/app/User/Controllers/ProvinceController.php
Executable file
@@ -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']));
|
||||
}
|
||||
}
|
||||
@@ -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',
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -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',
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -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',
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,12 +127,6 @@ return [
|
||||
'path' => storage_path('logs/laravel.log'),
|
||||
],
|
||||
|
||||
'fib_authorization' => [
|
||||
'driver' => 'single',
|
||||
'path' => storage_path('logs/fib/authorization.log'),
|
||||
'level' => 'error',
|
||||
],
|
||||
|
||||
],
|
||||
|
||||
];
|
||||
|
||||
@@ -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');
|
||||
|
||||
@@ -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();
|
||||
});
|
||||
|
||||
@@ -4,7 +4,6 @@ namespace Database\Seeders;
|
||||
|
||||
use Illuminate\Database\Console\Seeds\WithoutModelEvents;
|
||||
use Illuminate\Database\Seeder;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class CitySeeder extends Seeder
|
||||
{
|
||||
@@ -13,125 +12,6 @@ class CitySeeder extends Seeder
|
||||
*/
|
||||
public function run(): void
|
||||
{
|
||||
DB::table('cities')->insert([
|
||||
// Baghdad
|
||||
['province_id' => 1, 'name' => 'Baghdad', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 1, 'name' => 'Sadr City', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 1, 'name' => 'Kadhimiya', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 1, 'name' => 'Adhamiyah', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 1, 'name' => 'Abu Ghraib', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 1, 'name' => 'Mahmudiya', 'created_at' => now(), 'updated_at' => now()],
|
||||
|
||||
// Basra
|
||||
['province_id' => 2, 'name' => 'Basra', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 2, 'name' => 'Al-Zubair', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 2, 'name' => 'Umm Qasr', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 2, 'name' => 'Al-Qurnah', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 2, 'name' => 'Shatt Al-Arab', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 2, 'name' => 'Abu Al-Khaseeb', 'created_at' => now(), 'updated_at' => now()],
|
||||
|
||||
// Nineveh
|
||||
['province_id' => 3, 'name' => 'Mosul', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 3, 'name' => 'Tal Afar', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 3, 'name' => 'Sinjar', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 3, 'name' => 'Al-Hamdaniya', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 3, 'name' => 'Bashiqa', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 3, 'name' => 'Qayyarah', 'created_at' => now(), 'updated_at' => now()],
|
||||
|
||||
// Erbil
|
||||
['province_id' => 4, 'name' => 'Erbil', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 4, 'name' => 'Shaqlawa', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 4, 'name' => 'Soran', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 4, 'name' => 'Koya', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 4, 'name' => 'Makhmur', 'created_at' => now(), 'updated_at' => now()],
|
||||
|
||||
// Sulaymaniyah
|
||||
['province_id' => 5, 'name' => 'Sulaymaniyah', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 5, 'name' => 'Halabja', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 5, 'name' => 'Ranya', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 5, 'name' => 'Kalar', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 5, 'name' => 'Chamchamal', 'created_at' => now(), 'updated_at' => now()],
|
||||
|
||||
// Duhok
|
||||
['province_id' => 6, 'name' => 'Duhok', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 6, 'name' => 'Zakho', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 6, 'name' => 'Amedi', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 6, 'name' => 'Akre', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 6, 'name' => 'Semel', 'created_at' => now(), 'updated_at' => now()],
|
||||
|
||||
// Kirkuk
|
||||
['province_id' => 7, 'name' => 'Kirkuk', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 7, 'name' => 'Hawija', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 7, 'name' => 'Dibis', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 7, 'name' => 'Daquq', 'created_at' => now(), 'updated_at' => now()],
|
||||
|
||||
// Diyala
|
||||
['province_id' => 8, 'name' => 'Baqubah', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 8, 'name' => 'Khanaqin', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 8, 'name' => 'Muqdadiyah', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 8, 'name' => 'Balad Ruz', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 8, 'name' => 'Jalawla', 'created_at' => now(), 'updated_at' => now()],
|
||||
|
||||
// Anbar
|
||||
['province_id' => 9, 'name' => 'Ramadi', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 9, 'name' => 'Fallujah', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 9, 'name' => 'Haditha', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 9, 'name' => 'Hit', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 9, 'name' => 'Al-Qaim', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 9, 'name' => 'Rutba', 'created_at' => now(), 'updated_at' => now()],
|
||||
|
||||
// Salah al-Din
|
||||
['province_id' => 10, 'name' => 'Tikrit', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 10, 'name' => 'Samarra', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 10, 'name' => 'Balad', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 10, 'name' => 'Baiji', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 10, 'name' => 'Tuz Khurmatu', 'created_at' => now(), 'updated_at' => now()],
|
||||
|
||||
// Karbala
|
||||
['province_id' => 11, 'name' => 'Karbala', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 11, 'name' => 'Al-Hindiya', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 11, 'name' => 'Ain Al-Tamur', 'created_at' => now(), 'updated_at' => now()],
|
||||
|
||||
// Najaf
|
||||
['province_id' => 12, 'name' => 'Najaf', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 12, 'name' => 'Kufa', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 12, 'name' => 'Al-Manathera', 'created_at' => now(), 'updated_at' => now()],
|
||||
|
||||
// Babil
|
||||
['province_id' => 13, 'name' => 'Hillah', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 13, 'name' => 'Al-Mahawil', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 13, 'name' => 'Al-Musayyib', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 13, 'name' => 'Hashimiya', 'created_at' => now(), 'updated_at' => now()],
|
||||
|
||||
// Wasit
|
||||
['province_id' => 14, 'name' => 'Kut', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 14, 'name' => 'Al-Hayy', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 14, 'name' => 'Al-Numaniyah', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 14, 'name' => 'Badra', 'created_at' => now(), 'updated_at' => now()],
|
||||
|
||||
// Maysan
|
||||
['province_id' => 15, 'name' => 'Amarah', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 15, 'name' => 'Ali Al-Sharqi', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 15, 'name' => 'Al-Majarr Al-Kabir', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 15, 'name' => 'Qalat Saleh', 'created_at' => now(), 'updated_at' => now()],
|
||||
|
||||
// Dhi Qar
|
||||
['province_id' => 16, 'name' => 'Nasiriyah', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 16, 'name' => 'Al-Shatrah', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 16, 'name' => 'Suq Al-Shuyukh', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 16, 'name' => 'Rifai', 'created_at' => now(), 'updated_at' => now()],
|
||||
|
||||
// Muthanna
|
||||
['province_id' => 17, 'name' => 'Samawah', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 17, 'name' => 'Rumaitha', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 17, 'name' => 'Al-Khidhir', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 17, 'name' => 'Salman', 'created_at' => now(), 'updated_at' => now()],
|
||||
|
||||
// Al-Qadisiyyah
|
||||
['province_id' => 18, 'name' => 'Diwaniyah', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 18, 'name' => 'Afak', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 18, 'name' => 'Al-Shamiya', 'created_at' => now(), 'updated_at' => now()],
|
||||
['province_id' => 18, 'name' => 'Hamza', 'created_at' => now(), 'updated_at' => now()],
|
||||
]);
|
||||
//
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,9 +22,5 @@ class DatabaseSeeder extends Seeder
|
||||
'email' => 'test@example.com',
|
||||
'password' => 'password123@',
|
||||
]);
|
||||
$this->call([
|
||||
ProvinceSeeder::class,
|
||||
CitySeeder::class,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@ namespace Database\Seeders;
|
||||
|
||||
use Illuminate\Database\Console\Seeds\WithoutModelEvents;
|
||||
use Illuminate\Database\Seeder;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class ProvinceSeeder extends Seeder
|
||||
{
|
||||
@@ -13,25 +12,6 @@ class ProvinceSeeder extends Seeder
|
||||
*/
|
||||
public function run(): void
|
||||
{
|
||||
DB::table('provinces')->insert([
|
||||
['id' => 1, 'name' => 'Baghdad', 'created_at' => now(), 'updated_at' => now()],
|
||||
['id' => 2, 'name' => 'Basra', 'created_at' => now(), 'updated_at' => now()],
|
||||
['id' => 3, 'name' => 'Nineveh', 'created_at' => now(), 'updated_at' => now()],
|
||||
['id' => 4, 'name' => 'Erbil', 'created_at' => now(), 'updated_at' => now()],
|
||||
['id' => 5, 'name' => 'Sulaymaniyah', 'created_at' => now(), 'updated_at' => now()],
|
||||
['id' => 6, 'name' => 'Duhok', 'created_at' => now(), 'updated_at' => now()],
|
||||
['id' => 7, 'name' => 'Kirkuk', 'created_at' => now(), 'updated_at' => now()],
|
||||
['id' => 8, 'name' => 'Diyala', 'created_at' => now(), 'updated_at' => now()],
|
||||
['id' => 9, 'name' => 'Anbar', 'created_at' => now(), 'updated_at' => now()],
|
||||
['id' => 10, 'name' => 'Salah al-Din', 'created_at' => now(), 'updated_at' => now()],
|
||||
['id' => 11, 'name' => 'Karbala', 'created_at' => now(), 'updated_at' => now()],
|
||||
['id' => 12, 'name' => 'Najaf', 'created_at' => now(), 'updated_at' => now()],
|
||||
['id' => 13, 'name' => 'Babil', 'created_at' => now(), 'updated_at' => now()],
|
||||
['id' => 14, 'name' => 'Wasit', 'created_at' => now(), 'updated_at' => now()],
|
||||
['id' => 15, 'name' => 'Maysan', 'created_at' => now(), 'updated_at' => now()],
|
||||
['id' => 16, 'name' => 'Dhi Qar', 'created_at' => now(), 'updated_at' => now()],
|
||||
['id' => 17, 'name' => 'Muthanna', 'created_at' => now(), 'updated_at' => now()],
|
||||
['id' => 18, 'name' => 'Al-Qadisiyyah', 'created_at' => now(), 'updated_at' => now()],
|
||||
]);
|
||||
//
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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');
|
||||
});
|
||||
|
||||
@@ -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')
|
||||
->name('userGateway.')
|
||||
->middleware(['auth'])
|
||||
->controller(GatewayManagementController::class)
|
||||
Route::prefix('province')
|
||||
->name('province.')
|
||||
->controller(ProvinceController::class)
|
||||
->group(function () {
|
||||
Route::get('/', 'index')->name('index');
|
||||
Route::post('/', 'store')->name('store');
|
||||
Route::get('/{gateway}', 'show')->name('show');
|
||||
Route::post('/{gateway}', 'update')->name('update');
|
||||
Route::delete('/{gateway}', 'destroy')->name('destroy');
|
||||
Route::get('list', 'list')->name('list');
|
||||
});
|
||||
|
||||
Route::prefix('city')
|
||||
->name('city.')
|
||||
->controller(CityController::class)
|
||||
->group(function () {
|
||||
Route::get('list', 'list')->name('list');
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user