Compare commits
28 Commits
feature/Ed
...
1f8bd224a3
| Author | SHA1 | Date | |
|---|---|---|---|
| 1f8bd224a3 | |||
| 08b0cd4cca | |||
| 6db74f557b | |||
| 4eec548b83 | |||
| 675d2bdbad | |||
| 69ffe322ce | |||
| a1466d8f57 | |||
| 392fca8635 | |||
| 9a01a83370 | |||
| 8438655f8c | |||
| 5040299efc | |||
| 26a0f79a6d | |||
| 1b5d339a53 | |||
| c73d50d096 | |||
| 8be89d350f | |||
| d31c641216 | |||
| aa363d1695 | |||
| ca2ec66fb5 | |||
| 5c757e1823 | |||
| d9f895c382 | |||
| 9ad3d6cea0 | |||
| 8554f4cc55 | |||
| 5e48777e1c | |||
| 738b21e182 | |||
| 77a4e98058 | |||
| 01bae8474b | |||
| 463ca3f006 | |||
| 1ba141e715 |
@@ -16,19 +16,6 @@ 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];
|
||||
@@ -39,8 +26,7 @@ class AuthController extends Controller
|
||||
$credentials['username'] = $request->login;
|
||||
}
|
||||
|
||||
if (Auth::attempt($credentials))
|
||||
{
|
||||
if (Auth::guard('expert')->attempt($credentials)) {
|
||||
$request->session()->regenerate();
|
||||
|
||||
return $this->successResponse();
|
||||
|
||||
@@ -41,7 +41,7 @@ enum BusinessTypeEnum: int
|
||||
};
|
||||
}
|
||||
|
||||
public function name($id): string
|
||||
public static function name($id): string
|
||||
{
|
||||
$mapArray = [
|
||||
1 => 'medical',
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
namespace App\Enums;
|
||||
|
||||
enum PaymentStatusEnum:int
|
||||
enum PaymentStatusEnum: int
|
||||
{
|
||||
case Unpaid = 0;
|
||||
case Cancelled = 1;
|
||||
@@ -10,6 +10,8 @@ enum PaymentStatusEnum:int
|
||||
case Paid = 3;
|
||||
case Refunded = 4;
|
||||
|
||||
case PendingVerification = 5;
|
||||
|
||||
public function label(): string
|
||||
{
|
||||
return match ($this) {
|
||||
@@ -18,6 +20,7 @@ enum PaymentStatusEnum:int
|
||||
self::Expired => 'expired',
|
||||
self::Paid => 'paid',
|
||||
self::Refunded => 'refunded',
|
||||
self::PendingVerification => 'pending_verification',
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,17 +5,19 @@ 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 Model
|
||||
class Expert extends Authenticatable
|
||||
{
|
||||
/** @use HasFactory<ExpertFactory> */
|
||||
use HasFactory;
|
||||
use HasRoles;
|
||||
|
||||
use Notifiable,HasFactory,HasRoles;
|
||||
|
||||
protected $guarded = ['id'];
|
||||
protected string $guard_name = 'web';
|
||||
|
||||
@@ -9,4 +9,6 @@ class FibTransaction extends Model
|
||||
{
|
||||
/** @use HasFactory<\Database\Factories\FibTransactionFactory> */
|
||||
use HasFactory;
|
||||
|
||||
protected $guarded = ['id'];
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ class User extends Authenticatable
|
||||
|
||||
public function documents(): MorphToMany
|
||||
{
|
||||
return $this->morphToMany(Document::class, 'documentable');
|
||||
return $this->morphToMany(Document::class, 'documents');
|
||||
}
|
||||
|
||||
public function validateForPassportPasswordGrant(string $password): bool
|
||||
|
||||
@@ -16,7 +16,7 @@ class AuthorizationService
|
||||
public function __construct()
|
||||
{
|
||||
$this->url = config('fib.authorization.url');
|
||||
$this->channelName = '';
|
||||
$this->channelName = 'fib_authorization';
|
||||
$this->inputParameters = [
|
||||
'client_id' => config('fib.authorization.client_id'),
|
||||
'client_secret' => config('fib.authorization.client_secret'),
|
||||
@@ -51,7 +51,6 @@ class AuthorizationService
|
||||
{
|
||||
return Http::asForm()
|
||||
->throw()
|
||||
->withoutVerifying()
|
||||
->post($this->url, $this->inputParameters)
|
||||
->json();
|
||||
}
|
||||
|
||||
@@ -11,21 +11,13 @@ class CancelPaymentService
|
||||
{
|
||||
protected string $url;
|
||||
protected string $channelName;
|
||||
protected string $accessToken;
|
||||
protected array $headers;
|
||||
protected AuthorizationService $authorizationService;
|
||||
|
||||
public function __construct()
|
||||
public function __construct(AuthorizationService $authorizationService)
|
||||
{
|
||||
$this->url = config('fib.cancelPayment.url');
|
||||
$this->channelName = '';
|
||||
}
|
||||
|
||||
public function setHeaders(): void
|
||||
{
|
||||
$this->headers = [
|
||||
'Authorization' => 'Bearer ' . $this->accessToken,
|
||||
'Content-Type' => 'application/json',
|
||||
];
|
||||
$this->authorizationService = $authorizationService;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -50,13 +42,26 @@ class CancelPaymentService
|
||||
|
||||
/**
|
||||
* @throws ConnectionException
|
||||
* @throws Exception
|
||||
*/
|
||||
public function sendRequest(): array
|
||||
{
|
||||
return Http::withHeaders($this->headers)
|
||||
return Http::withHeaders([
|
||||
'Authorization' => 'Bearer ' . $this->getToken(),
|
||||
'Content-Type' => 'application/json',
|
||||
])
|
||||
->throw()
|
||||
->withoutVerifying()
|
||||
->post($this->url)
|
||||
->json();
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getToken(): string
|
||||
{
|
||||
$data = $this->authorizationService->run();
|
||||
return $data['access_token'];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,11 +11,13 @@ class CheckPaymentStatusService
|
||||
{
|
||||
protected string $url;
|
||||
protected string $channelName;
|
||||
protected AuthorizationService $authorizationService;
|
||||
|
||||
public function __construct()
|
||||
public function __construct(AuthorizationService $authorizationService)
|
||||
{
|
||||
$this->url = config('fib.checkPaymentStatus.url');
|
||||
$this->channelName = '';
|
||||
$this->channelName = 'fib_status';
|
||||
$this->authorizationService = $authorizationService;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -40,12 +42,26 @@ class CheckPaymentStatusService
|
||||
|
||||
/**
|
||||
* @throws ConnectionException
|
||||
* @throws Exception
|
||||
*/
|
||||
public function sendRequest(): array
|
||||
{
|
||||
return Http::throw()
|
||||
return Http::withHeaders([
|
||||
'Authorization' => 'Bearer ' . $this->getToken(),
|
||||
'Content-Type' => 'application/json',
|
||||
])
|
||||
->throw()
|
||||
->withoutVerifying()
|
||||
->post($this->url)
|
||||
->json();
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getToken(): string
|
||||
{
|
||||
$data = $this->authorizationService->run();
|
||||
return $data['access_token'];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,27 +11,14 @@ class CreatePaymentService
|
||||
{
|
||||
protected string $url;
|
||||
protected string $channelName;
|
||||
protected string $accessToken;
|
||||
protected array $headers;
|
||||
protected array $inputParameters;
|
||||
protected AuthorizationService $authorizationService;
|
||||
|
||||
public function __construct()
|
||||
public function __construct(AuthorizationService $authorizationService)
|
||||
{
|
||||
$this->url = config('fib.createPayment.url');
|
||||
$this->channelName = '';
|
||||
}
|
||||
|
||||
public function setAccessToken(string $accessToken): void
|
||||
{
|
||||
$this->accessToken = $accessToken;
|
||||
}
|
||||
|
||||
public function setHeaders(): void
|
||||
{
|
||||
$this->headers = [
|
||||
'Authorization' => 'Bearer ' . $this->accessToken,
|
||||
'Content-Type' => 'application/json',
|
||||
];
|
||||
$this->channelName = 'fib_create_payment';
|
||||
$this->authorizationService = $authorizationService;
|
||||
}
|
||||
|
||||
public function setInputParameters(array $inputParameters): void
|
||||
@@ -61,13 +48,26 @@ class CreatePaymentService
|
||||
|
||||
/**
|
||||
* @throws ConnectionException
|
||||
* @throws Exception
|
||||
*/
|
||||
public function sendRequest(): array
|
||||
{
|
||||
return Http::withHeaders($this->headers)
|
||||
return Http::withHeaders([
|
||||
'Authorization' => 'Bearer ' . $this->getToken(),
|
||||
'Content-Type' => 'application/json',
|
||||
])
|
||||
->throw()
|
||||
->withoutVerifying()
|
||||
->post($this->url, $this->inputParameters)
|
||||
->json();
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getToken(): string
|
||||
{
|
||||
$data = $this->authorizationService->run();
|
||||
return $data['access_token'];
|
||||
}
|
||||
}
|
||||
|
||||
38
backend/app/Services/FIB/DTO/FIBPaymentCreateDTO.php
Normal file
38
backend/app/Services/FIB/DTO/FIBPaymentCreateDTO.php
Normal file
@@ -0,0 +1,38 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\FIB\DTO;
|
||||
|
||||
class FIBPaymentCreateDTO
|
||||
{
|
||||
public string $paymentId;
|
||||
public string $readableCode;
|
||||
public string $qrCode;
|
||||
public string $validUntil;
|
||||
public string $personalAppLink;
|
||||
public string $businessAppLink;
|
||||
public string $corporateAppLink;
|
||||
|
||||
public function __construct(array $data)
|
||||
{
|
||||
$this->paymentId = $data['paymentId'];
|
||||
$this->readableCode = $data['readableCode'];
|
||||
$this->qrCode = $data['qrCode'];
|
||||
$this->validUntil = $data['validUntil'];
|
||||
$this->personalAppLink = $data['personalAppLink'];
|
||||
$this->businessAppLink = $data['businessAppLink'];
|
||||
$this->corporateAppLink = $data['corporateAppLink'];
|
||||
}
|
||||
|
||||
public static function fromResponse($data): FIBPaymentCreateDTO
|
||||
{
|
||||
return new self([
|
||||
'paymentId' => $data['paymentId'],
|
||||
'readableCode' => $data['readableCode'],
|
||||
'qrCode' => $data['qrCode'],
|
||||
'validUntil' => $data['validUntil'],
|
||||
'personalAppLink' => $data['personalAppLink'],
|
||||
'businessAppLink' => $data['businessAppLink'],
|
||||
'corporateAppLink' => $data['corporateAppLink'],
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -11,21 +11,13 @@ class RefundService
|
||||
{
|
||||
protected string $url;
|
||||
protected string $channelName;
|
||||
protected string $accessToken;
|
||||
protected array $headers;
|
||||
protected AuthorizationService $authorizationService;
|
||||
|
||||
public function __construct()
|
||||
public function __construct(AuthorizationService $authorizationService)
|
||||
{
|
||||
$this->url = config('fib.refund.url');
|
||||
$this->channelName = '';
|
||||
}
|
||||
|
||||
public function setHeaders(): void
|
||||
{
|
||||
$this->headers = [
|
||||
'Authorization' => 'Bearer ' . $this->accessToken,
|
||||
'Content-Type' => 'application/json',
|
||||
];
|
||||
$this->channelName = 'fib_refund';
|
||||
$this->authorizationService = $authorizationService;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -50,13 +42,26 @@ class RefundService
|
||||
|
||||
/**
|
||||
* @throws ConnectionException
|
||||
* @throws Exception
|
||||
*/
|
||||
public function sendRequest(): array
|
||||
{
|
||||
return Http::withHeaders($this->headers)
|
||||
return Http::withHeaders([
|
||||
'Authorization' => 'Bearer ' . $this->getToken(),
|
||||
'Content-Type' => 'application/json',
|
||||
])
|
||||
->throw()
|
||||
->withoutVerifying()
|
||||
->post($this->url)
|
||||
->json();
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getToken(): string
|
||||
{
|
||||
$data = $this->authorizationService->run();
|
||||
return $data['access_token'];
|
||||
}
|
||||
}
|
||||
|
||||
43
backend/app/Services/Payments/DTO/PaymentCreateDTO.php
Normal file
43
backend/app/Services/Payments/DTO/PaymentCreateDTO.php
Normal file
@@ -0,0 +1,43 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\Payments\DTO;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class PaymentCreateDTO
|
||||
{
|
||||
|
||||
public string $username;
|
||||
public int $user_id;
|
||||
public string $amount;
|
||||
public string $currency;
|
||||
public string $callback_url;
|
||||
public string $ip;
|
||||
public int $user_gateway_id;
|
||||
|
||||
|
||||
public function __construct(array $data)
|
||||
{
|
||||
$this->username = $data['username'];
|
||||
$this->user_id = $data['user_id'];
|
||||
$this->amount = $data['amount'];
|
||||
$this->currency = $data['currency'];
|
||||
$this->callback_url = $data['callback_url'];
|
||||
$this->ip = $data['ip'];
|
||||
$this->user_gateway_id = $data['user_gateway_id'];
|
||||
|
||||
}
|
||||
|
||||
public static function fromRequest(Request $request): PaymentCreateDTO
|
||||
{
|
||||
return new self([
|
||||
'username' => $request->username,
|
||||
'user_id' => '2',
|
||||
'amount' => $request->amount,
|
||||
'currency' => $request->currency,
|
||||
'callback_url' => $request->callback_url,
|
||||
'ip' => $request->getClientIp(),
|
||||
'user_gateway_id' => $request->user_gateway_id,
|
||||
]);
|
||||
}
|
||||
}
|
||||
37
backend/app/Services/Payments/FibAdapter.php
Normal file
37
backend/app/Services/Payments/FibAdapter.php
Normal file
@@ -0,0 +1,37 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\Payments;
|
||||
|
||||
use App\Models\Payment;
|
||||
use App\Services\FIB\CreatePaymentService;
|
||||
use App\Services\FIB\FIBClient;
|
||||
|
||||
class FibAdapter
|
||||
{
|
||||
public function __construct(
|
||||
private CreatePaymentService $create_payment_service,
|
||||
private FIBClient $fib_client
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public function createPayment(array $data)
|
||||
{
|
||||
Payment::query()->create([
|
||||
'user_id' => auth()->id(),
|
||||
'username' => $data['username'],
|
||||
'track_id' => $data['track_id'],
|
||||
'amount' => $data['amount'],
|
||||
'currency' => $data['currency'],
|
||||
'callback_url' => $data['callback_url'],
|
||||
'expires_at' => $data['expires_at'],
|
||||
'status_id' => $data['status_id'],
|
||||
'status_name' => $data['status_name'],
|
||||
'ip' => $data['ip'],
|
||||
'user_gateway_id' => $data['user_gateway_id'],
|
||||
'created_at' => $data['created_at'],
|
||||
'updated_at' => $data['updated_at'],
|
||||
]);
|
||||
$this->fib_client->client();
|
||||
}
|
||||
}
|
||||
176
backend/app/Services/Payments/PaymentService.php
Normal file
176
backend/app/Services/Payments/PaymentService.php
Normal file
@@ -0,0 +1,176 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\Payments;
|
||||
|
||||
use App\Enums\PaymentStatusEnum;
|
||||
use App\Models\FibTransaction;
|
||||
use App\Models\Payment;
|
||||
use App\Models\Transaction;
|
||||
use App\Models\UserGateway;
|
||||
use App\Services\FIB\CheckPaymentStatusService;
|
||||
use App\Services\FIB\CreatePaymentService;
|
||||
use App\Services\FIB\DTO\FIBPaymentCreateDTO;
|
||||
use App\Services\Payments\DTO\PaymentCreateDTO;
|
||||
use Exception;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Throwable;
|
||||
|
||||
class PaymentService
|
||||
{
|
||||
protected CreatePaymentService $create_payment_service;
|
||||
protected CheckPaymentStatusService $check_payment_status_service;
|
||||
|
||||
|
||||
public function __construct(
|
||||
CreatePaymentService $create_payment_service,
|
||||
CheckPaymentStatusService $check_payment_status_service
|
||||
)
|
||||
{
|
||||
$this->create_payment_service = $create_payment_service;
|
||||
$this->check_payment_status_service = $check_payment_status_service;
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
* @throws Throwable
|
||||
*/
|
||||
public function createPayment(PaymentCreateDTO $dto)
|
||||
{
|
||||
$gateway = UserGateway::query()
|
||||
->where('id', $dto->user_gateway_id)
|
||||
->where('user_id', $dto->user_id)
|
||||
->firstOrFail();
|
||||
|
||||
return DB::transaction(function () use ($dto, $gateway) {
|
||||
|
||||
$payment = Payment::query()->create([
|
||||
'user_id' => $dto->user_id,
|
||||
'username' => $dto->username,
|
||||
'track_id' => $this->generateTrackId(),
|
||||
'amount' => $dto->amount,
|
||||
'currency' => $dto->currency,
|
||||
'callback_url' => 'https://user_callback',
|
||||
'status_id' => PaymentStatusEnum::Unpaid->value,
|
||||
'status_name' => PaymentStatusEnum::Unpaid->name,
|
||||
'ip' => $dto->ip,
|
||||
'user_gateway_id' => $gateway->id,
|
||||
]);
|
||||
|
||||
$this->create_payment_service->setInputParameters([
|
||||
'monetaryValue' => [
|
||||
'amount' => $dto->amount,
|
||||
'currency' => $dto->currency,
|
||||
],
|
||||
'statusCallbackUrl' => 'https://ipay/api/fib_callback',
|
||||
'description' => $dto->description ?? "Payment #{$payment->track_id}",
|
||||
]);
|
||||
|
||||
$response = $this->create_payment_service->run();
|
||||
$fib_response_dto = FIBPaymentCreateDTO::fromResponse($response);
|
||||
|
||||
$transaction = Transaction::query()->create([
|
||||
'user_id' => $payment->user_id,
|
||||
'amount' => $payment->amount,
|
||||
'currency' => $payment->currency,
|
||||
'callback_url' => $payment->callback_url,
|
||||
// 'description' => '',
|
||||
// 'expires_in' => '',
|
||||
'payment_id' => $payment->id,
|
||||
'payment_track_id' => $payment->track_id,
|
||||
'user_gateway_id' => $payment->user_gateway_id,
|
||||
// 'status' => '',
|
||||
]);
|
||||
|
||||
FibTransaction::query()->create([
|
||||
'transaction_id' => $transaction->id,
|
||||
'qrcode' => $fib_response_dto->qrCode,
|
||||
'readable_code' => $fib_response_dto->readableCode,
|
||||
'personalAppLink' => $fib_response_dto->personalAppLink,
|
||||
'businessAppLink' => $fib_response_dto->businessAppLink,
|
||||
'corporateAppLink' => $fib_response_dto->corporateAppLink,
|
||||
'paymentId' => $fib_response_dto->paymentId,
|
||||
'paymentMethod' => 'fib',
|
||||
'validUntil' => $fib_response_dto->validUntil,
|
||||
'status_id' => PaymentStatusEnum::Unpaid->value,
|
||||
'status_name' => PaymentStatusEnum::Unpaid->name,
|
||||
]);
|
||||
|
||||
return [
|
||||
'payment_id' => $payment->id,
|
||||
'track_id' => $payment->track_id,
|
||||
'qr_code' => $fib_response_dto->qrCode,
|
||||
'readable_code' => $fib_response_dto->readableCode,
|
||||
'personal_app_link' => $fib_response_dto->personalAppLink,
|
||||
'business_app_link' => $fib_response_dto->businessAppLink,
|
||||
'corporate_app_link' => $fib_response_dto->corporateAppLink,
|
||||
'valid_until' => $fib_response_dto->validUntil,
|
||||
'status' => PaymentStatusEnum::Unpaid->name,
|
||||
];
|
||||
});
|
||||
}
|
||||
|
||||
private function generateTrackId(): string
|
||||
{
|
||||
do {
|
||||
$id = uuid_create();
|
||||
} while (Payment::query()->where('track_id', $id)->exists());
|
||||
|
||||
return $id;
|
||||
}
|
||||
|
||||
public function checkPaymentStatus($track_id)
|
||||
{
|
||||
$user_id = auth()->id();
|
||||
return Payment::query()->where('track_id', $track_id)
|
||||
->where('user_id', 2)
|
||||
->firstOrFail();
|
||||
}
|
||||
|
||||
public function verifyPayment($track_id)
|
||||
{
|
||||
$user_id = auth()->id();
|
||||
return DB::transaction(function () use ($track_id, $user_id) {
|
||||
|
||||
$payment = Payment::query()
|
||||
->where('track_id', $track_id)
|
||||
->where('user_id', $user_id)
|
||||
->lockForUpdate()
|
||||
->firstOrFail();
|
||||
|
||||
if ($payment->status_id === PaymentStatusEnum::Paid->value) {
|
||||
return [
|
||||
'status' => 'already_verified',
|
||||
'paid' => true,
|
||||
];
|
||||
}
|
||||
|
||||
if ($payment->status_id !== PaymentStatusEnum::PendingVerification->value) {
|
||||
return [
|
||||
'status' => $payment->status_name,
|
||||
'paid' => false,
|
||||
];
|
||||
}
|
||||
|
||||
$payment->update([
|
||||
'status_id' => PaymentStatusEnum::Paid->value,
|
||||
'status_name' => PaymentStatusEnum::Paid->name,
|
||||
]);
|
||||
|
||||
Transaction::query()
|
||||
->where('payment_id', $payment->id)
|
||||
->update([
|
||||
'status_id' => PaymentStatusEnum::Paid->value,
|
||||
'status_name' => PaymentStatusEnum::Paid->name,
|
||||
]);
|
||||
|
||||
return [
|
||||
'status' => 'verified',
|
||||
'paid' => true,
|
||||
'track_id' => $payment->track_id,
|
||||
'amount' => $payment->amount,
|
||||
'currency' => $payment->currency,
|
||||
];
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
24
backend/app/User/Controllers/CityController.php
Executable file
24
backend/app/User/Controllers/CityController.php
Executable file
@@ -0,0 +1,24 @@
|
||||
<?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);
|
||||
}
|
||||
}
|
||||
@@ -14,6 +14,7 @@ use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Laravel\Passport\ClientRepository;
|
||||
use Throwable;
|
||||
|
||||
class GatewayManagementController extends Controller
|
||||
@@ -23,11 +24,11 @@ class GatewayManagementController extends Controller
|
||||
public function index(Request $request)
|
||||
{
|
||||
return DataTableFacade::run(
|
||||
UserGateway::query()->where('user_id', '=', Auth::guard('web')->id()),
|
||||
UserGateway::query()->where('user_id', '=', Auth::guard('web')->user()->id),
|
||||
$request,
|
||||
allowedFilters: ['*'],
|
||||
allowedSortings: ['*'],
|
||||
allowedSelects: ['id', 'name', 'domain', 'tax_id', 'bank_name', 'account_holder', 'iban', 'business_type_id', 'business_type_name'],
|
||||
allowedSelects: ['*'],
|
||||
);
|
||||
}
|
||||
|
||||
@@ -38,9 +39,15 @@ class GatewayManagementController extends Controller
|
||||
{
|
||||
$user = Auth::guard('web')->user();
|
||||
|
||||
$logo = $request->has('logo') ? FileFacade::save($request->file('logo'), "{$user->id}") : null;
|
||||
$logo = $request->hasFile('logo')
|
||||
? FileFacade::save($request->file('logo'), "{$user->id}")
|
||||
: null;
|
||||
|
||||
$passportClient = DB::transaction(function () use ($user, $logo, $request) {
|
||||
|
||||
$clientName = "Gateway {$request->name} - User {$user->id}";
|
||||
$client = app(ClientRepository::class)->createPasswordGrantClient($clientName, 'users');
|
||||
|
||||
DB::transaction(function () use ($user, $logo, $request) {
|
||||
UserGateway::query()->create([
|
||||
'user_id' => $user->id,
|
||||
'username' => $user->username,
|
||||
@@ -53,15 +60,20 @@ class GatewayManagementController extends Controller
|
||||
'business_type_id' => $request->business_type_id,
|
||||
'business_type_name' => BusinessTypeEnum::name($request->business_type_id),
|
||||
'logo' => $logo,
|
||||
'client_id' => $client->id,
|
||||
'client_secret' => $client->secret,
|
||||
]);
|
||||
|
||||
$user->update(['authority_level' => 1]);
|
||||
|
||||
return $client;
|
||||
});
|
||||
|
||||
|
||||
return $this->successResponse();
|
||||
return $this->successResponse([
|
||||
'client_id' => $passportClient->id,
|
||||
'client_secret' => $passportClient->secret,
|
||||
]);
|
||||
}
|
||||
|
||||
public function show(UserGateway $gateway): JsonResponse
|
||||
{
|
||||
return $this->successResponse($gateway);
|
||||
|
||||
54
backend/app/User/Controllers/Payment/PaymentController.php
Normal file
54
backend/app/User/Controllers/Payment/PaymentController.php
Normal file
@@ -0,0 +1,54 @@
|
||||
<?php
|
||||
|
||||
namespace App\User\Controllers\Payment;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Services\Payments\DTO\PaymentCreateDTO;
|
||||
use App\Services\Payments\PaymentService;
|
||||
use App\Traits\ApiResponse;
|
||||
use App\User\Requests\Payment\FIB\InquiryRequest;
|
||||
use App\User\Requests\Payment\FIB\StoreRequest;
|
||||
use App\User\Resources\Payment\InquiryResource;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Js;
|
||||
|
||||
|
||||
class PaymentController extends Controller
|
||||
{
|
||||
use ApiResponse;
|
||||
|
||||
public $payment_service;
|
||||
|
||||
public function __construct(PaymentService $payment_service)
|
||||
{
|
||||
$this->payment_service = $payment_service;
|
||||
}
|
||||
|
||||
public function createPayment(StoreRequest $request): JsonResponse
|
||||
{
|
||||
try {
|
||||
$dto = PaymentCreateDTO::fromRequest($request);
|
||||
$result = $this->payment_service->createPayment($dto);
|
||||
return $this->successResponse($result);
|
||||
} catch (\Exception $exception) {
|
||||
throw $exception;
|
||||
}
|
||||
}
|
||||
|
||||
public function checkPaymentStatus(InquiryRequest $request): JsonResponse
|
||||
{
|
||||
try {
|
||||
$result = $this->payment_service->checkPaymentStatus($request->track_id);
|
||||
return $this->successResponse(new InquiryResource($result));
|
||||
} catch (\Exception $exception) {
|
||||
throw $exception;
|
||||
}
|
||||
}
|
||||
|
||||
public function verify()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\User\Controllers;
|
||||
|
||||
use App\Facades\File\FileFacade;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\City;
|
||||
use App\Models\Province;
|
||||
@@ -11,7 +12,9 @@ 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
|
||||
{
|
||||
@@ -22,27 +25,40 @@ 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);
|
||||
|
||||
$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,
|
||||
]);
|
||||
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,
|
||||
]);
|
||||
});
|
||||
|
||||
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 $this->successResponse(Province::all(['id', 'name']));
|
||||
}
|
||||
}
|
||||
30
backend/app/User/Requests/Payment/FIB/InquiryRequest.php
Normal file
30
backend/app/User/Requests/Payment/FIB/InquiryRequest.php
Normal file
@@ -0,0 +1,30 @@
|
||||
<?php
|
||||
|
||||
namespace App\User\Requests\Payment\FIB;
|
||||
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
class InquiryRequest 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 [
|
||||
'track_id' => ['required', 'uuid'],
|
||||
];
|
||||
}
|
||||
}
|
||||
36
backend/app/User/Requests/Payment/FIB/StoreRequest.php
Normal file
36
backend/app/User/Requests/Payment/FIB/StoreRequest.php
Normal file
@@ -0,0 +1,36 @@
|
||||
<?php
|
||||
|
||||
namespace App\User\Requests\Payment\FIB;
|
||||
|
||||
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 true;
|
||||
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 [
|
||||
'username' => ['required', 'string'],
|
||||
'amount' => ['required'],
|
||||
'currency' => ['required', 'string'],
|
||||
'callback_url' => ['required'],
|
||||
'user_gateway_id' => ['required', 'integer', 'exists:user_gateways,id'],
|
||||
'description' => ['nullable', 'string', 'max:500'],
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -30,9 +30,7 @@ class EditRequest extends FormRequest
|
||||
return [
|
||||
'first_name' => 'required|string|max:255',
|
||||
'last_name' => 'required|string|max:255',
|
||||
'national_id' => [
|
||||
Rule::prohibitedIf($user->kyc_status == 1), 'string',
|
||||
],
|
||||
'national_id' => [Rule::prohibitedIf($user->kyc_status == 1), 'string',],
|
||||
'email' => 'required|email|max:255',
|
||||
'address' => 'required|string',
|
||||
'postal_code' => 'required|string',
|
||||
@@ -40,6 +38,7 @@ class EditRequest extends FormRequest
|
||||
'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']
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
30
backend/app/User/Resources/Payment/InquiryResource.php
Executable file
30
backend/app/User/Resources/Payment/InquiryResource.php
Executable file
@@ -0,0 +1,30 @@
|
||||
<?php
|
||||
|
||||
namespace App\User\Resources\Payment;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
||||
class InquiryResource extends JsonResource
|
||||
{
|
||||
/**
|
||||
* Transform the resource into an array.
|
||||
*
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
public function toArray(Request $request): array
|
||||
{
|
||||
return [
|
||||
"track_id" => $this->track_id,
|
||||
"amount" => $this->amount,
|
||||
"currency" => $this->currency,
|
||||
"status_id" => $this->status_id,
|
||||
"status_name" => $this->status_name,
|
||||
'payment_method' => $this->payment_method,
|
||||
'paid_currency' => $this->paid_currency,
|
||||
'paid_amount' => $this->paid_amount,
|
||||
'paid_at' => $this->paid_at,
|
||||
'verified_at' => $this->verified_at,
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -18,6 +18,19 @@ 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,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<?php
|
||||
|
||||
use App\Models\Expert;
|
||||
use App\Models\User;
|
||||
|
||||
return [
|
||||
|
||||
@@ -127,6 +127,30 @@ return [
|
||||
'path' => storage_path('logs/laravel.log'),
|
||||
],
|
||||
|
||||
'fib_authorization' => [
|
||||
'driver' => 'single',
|
||||
'path' => storage_path('logs/fib/authorization.log'),
|
||||
'level' => 'error',
|
||||
],
|
||||
|
||||
'fib_create_payment' => [
|
||||
'driver' => 'single',
|
||||
'path' => storage_path('logs/fib/createPayment.log'),
|
||||
'level' => 'error',
|
||||
],
|
||||
|
||||
'fib_status' => [
|
||||
'driver' => 'single',
|
||||
'path' => storage_path('logs/fib/status.log'),
|
||||
'level' => 'error',
|
||||
],
|
||||
|
||||
'fib_refund' => [
|
||||
'driver' => 'single',
|
||||
'path' => storage_path('logs/fib/refund.log'),
|
||||
'level' => 'error',
|
||||
],
|
||||
|
||||
],
|
||||
|
||||
];
|
||||
|
||||
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
return new class extends Migration {
|
||||
/**
|
||||
* Run the migrations.
|
||||
*/
|
||||
@@ -14,15 +13,15 @@ return new class extends Migration
|
||||
Schema::create('transactions', function (Blueprint $table) {
|
||||
$table->id();
|
||||
$table->foreignId('user_id')->constrained('users');
|
||||
$table->string('amount');
|
||||
$table->string('currency');
|
||||
$table->string('callback_url');
|
||||
$table->string('description');
|
||||
$table->dateTime('expires_in');
|
||||
$table->string('amount')->nullable();
|
||||
$table->string('currency')->nullable();
|
||||
$table->string('callback_url')->nullable();
|
||||
$table->string('description')->nullable();
|
||||
$table->dateTime('expires_in')->nullable();
|
||||
$table->foreignId('payment_id')->constrained('payments');
|
||||
$table->string('payment_track_id');
|
||||
$table->foreignId('gateway_id')->constrained('gateways');
|
||||
$table->integer('status');
|
||||
$table->string('payment_track_id')->nullable();
|
||||
$table->foreignId('user_gateway_id')->constrained('user_gateways');
|
||||
$table->integer('status')->nullable();
|
||||
$table->timestamps();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
return new class extends Migration {
|
||||
/**
|
||||
* Run the migrations.
|
||||
*/
|
||||
@@ -14,23 +13,23 @@ return new class extends Migration
|
||||
Schema::create('fib_transactions', function (Blueprint $table) {
|
||||
$table->id();
|
||||
$table->foreignId('transaction_id')->constrained('transactions');
|
||||
$table->text('qrcode');
|
||||
$table->string('readable_code');
|
||||
$table->string('personalAppLink');
|
||||
$table->string('businessAppLink');
|
||||
$table->string('corporateAppLink');
|
||||
$table->string('paymentId');
|
||||
$table->string('paymentMethod');
|
||||
$table->timestamp('validUntil');
|
||||
$table->text('qrcode')->nullable();
|
||||
$table->string('readable_code')->nullable();
|
||||
$table->string('personalAppLink')->nullable();
|
||||
$table->string('businessAppLink')->nullable();
|
||||
$table->string('corporateAppLink')->nullable();
|
||||
$table->string('paymentId')->nullable();
|
||||
$table->string('paymentMethod')->nullable();
|
||||
$table->timestamp('validUntil')->nullable();
|
||||
$table->foreignId('status_id')->constrained('fib_transaction_statuses');
|
||||
$table->string('status_name');
|
||||
$table->timestamp('paidAt');
|
||||
$table->string('paidAmount');
|
||||
$table->string('paidCurrency');
|
||||
$table->string('decliningReason');
|
||||
$table->timestamp('declinedAt');
|
||||
$table->string('paidByName');
|
||||
$table->string('paidByIban');
|
||||
$table->string('status_name')->nullable();
|
||||
$table->timestamp('paidAt')->nullable();
|
||||
$table->string('paidAmount')->nullable();
|
||||
$table->string('paidCurrency')->nullable();
|
||||
$table->string('decliningReason')->nullable();
|
||||
$table->timestamp('declinedAt')->nullable();
|
||||
$table->string('paidByName')->nullable();
|
||||
$table->string('paidByIban')->nullable();
|
||||
$table->timestamps();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
/**
|
||||
* Run the migrations.
|
||||
*/
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('user_gateways', function (Blueprint $table) {
|
||||
$table->string('client_id')->nullable();
|
||||
$table->string('client_secret')->nullable();
|
||||
$table->integer('status')->default(0);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*/
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('user_gateways', function (Blueprint $table) {
|
||||
$table->dropColumn(['client_id', 'client_secret','status']);
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,34 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration {
|
||||
/**
|
||||
* Run the migrations.
|
||||
*/
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('payments', function (Blueprint $table) {
|
||||
$table->string('payment_method')->nullable();
|
||||
$table->string('paid_currency')->nullable();
|
||||
$table->string('paid_amount')->nullable();
|
||||
$table->timestamp('paid_at')->nullable();
|
||||
$table->timestamp('verified_at')->nullable();
|
||||
$table->timestamp('refunded_at')->nullable();
|
||||
$table->string('refund_reason')->nullable();
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*/
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('payments', function (Blueprint $table) {
|
||||
$table->dropColumn(['payment_method', 'paid_currency', 'paid_amount',
|
||||
'paid_at', 'verified_at', 'refunded_at', 'refund_reason',]);
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -4,6 +4,7 @@ namespace Database\Seeders;
|
||||
|
||||
use Illuminate\Database\Console\Seeds\WithoutModelEvents;
|
||||
use Illuminate\Database\Seeder;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class CitySeeder extends Seeder
|
||||
{
|
||||
@@ -12,6 +13,125 @@ 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,5 +22,9 @@ class DatabaseSeeder extends Seeder
|
||||
'email' => 'test@example.com',
|
||||
'password' => 'password123@',
|
||||
]);
|
||||
$this->call([
|
||||
ProvinceSeeder::class,
|
||||
CitySeeder::class,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ namespace Database\Seeders;
|
||||
|
||||
use Illuminate\Database\Console\Seeds\WithoutModelEvents;
|
||||
use Illuminate\Database\Seeder;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class FibTransactionStatusSeeder extends Seeder
|
||||
{
|
||||
@@ -12,6 +13,12 @@ class FibTransactionStatusSeeder extends Seeder
|
||||
*/
|
||||
public function run(): void
|
||||
{
|
||||
//
|
||||
DB::table('fib_transaction_statuses')->insert([
|
||||
['id' => 0, 'name' => 'unpaid', 'created_at' => now(), 'updated_at' => now(),],
|
||||
['id' => 1, 'name' => 'cancelled', 'created_at' => now(), 'updated_at' => now(),],
|
||||
['id' => 2, 'name' => 'expired', 'created_at' => now(), 'updated_at' => now(),],
|
||||
['id' => 3, 'name' => 'paid', 'created_at' => now(), 'updated_at' => now(),],
|
||||
['id' => 4, 'name' => 'refunded', 'created_at' => now(), 'updated_at' => now(),],
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ namespace Database\Seeders;
|
||||
|
||||
use Illuminate\Database\Console\Seeds\WithoutModelEvents;
|
||||
use Illuminate\Database\Seeder;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class ProvinceSeeder extends Seeder
|
||||
{
|
||||
@@ -12,6 +13,25 @@ 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()],
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,21 @@
|
||||
<?php
|
||||
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
use \App\User\Controllers\Payment\PaymentController;
|
||||
|
||||
Route::get('/user', function (Request $request) {
|
||||
return $request->user();
|
||||
})->middleware('auth:api');
|
||||
|
||||
Route::prefix('v1')->group(function () {
|
||||
Route::prefix('payment')
|
||||
// ->middleware('auth:api')
|
||||
->group(function () {
|
||||
Route::post('/create_payment', [PaymentController::class, 'createPayment'])->name('create_payment');
|
||||
Route::post('/inquiry', [PaymentController::class, 'checkPaymentStatus'])->name('inquiry');
|
||||
Route::post('/verify', [PaymentController::class, 'checkPaymentStatus'])->name('inquiry');
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
@@ -12,7 +12,6 @@ Route::prefix('auth')
|
||||
->name('auth.')
|
||||
->controller(AuthController::class)
|
||||
->group(function () {
|
||||
Route::post('register', 'register')->name('register');
|
||||
Route::post('login', 'login')->name('login');
|
||||
Route::post('logout', 'logout')->name('logout');
|
||||
});
|
||||
@@ -78,7 +77,7 @@ Route::prefix('expert')
|
||||
|
||||
Route::prefix('profile')
|
||||
->name('profile.')
|
||||
->middleware('auth')
|
||||
->middleware('auth:expert')
|
||||
->controller(ProfileController::class)
|
||||
->group(function () {
|
||||
Route::get('info', 'info')->name('info');
|
||||
|
||||
@@ -6,7 +6,9 @@ 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')
|
||||
@@ -39,3 +41,17 @@ Route::prefix('user_gateway')
|
||||
Route::post('/{gateway}', 'update')->name('update');
|
||||
Route::delete('/{gateway}', 'destroy')->name('destroy');
|
||||
});
|
||||
|
||||
Route::prefix('province')
|
||||
->name('province.')
|
||||
->controller(ProvinceController::class)
|
||||
->group(function () {
|
||||
Route::get('list', 'list')->name('list');
|
||||
});
|
||||
|
||||
Route::prefix('city')
|
||||
->name('city.')
|
||||
->controller(CityController::class)
|
||||
->group(function () {
|
||||
Route::get('list', 'list')->name('list');
|
||||
});
|
||||
|
||||
@@ -40,9 +40,7 @@ services:
|
||||
- payment
|
||||
|
||||
backend:
|
||||
build:
|
||||
context: ${BACKEND_PATH}
|
||||
dockerfile: Dockerfile
|
||||
image: payment-backend:latest
|
||||
container_name: laravel
|
||||
tty: true
|
||||
restart: unless-stopped
|
||||
@@ -54,6 +52,8 @@ services:
|
||||
- postgres
|
||||
networks:
|
||||
- payment
|
||||
command: ["php", "artisan", "serve", "--host=0.0.0.0", "--port=9000"]
|
||||
# Prints "Overridden command!"
|
||||
# logging:
|
||||
# driver: "syslog"
|
||||
# options:
|
||||
|
||||
Reference in New Issue
Block a user