Compare commits
14 Commits
feature/Ga
...
feature/pa
| Author | SHA1 | Date | |
|---|---|---|---|
| 738b21e182 | |||
| 77a4e98058 | |||
| 01bae8474b | |||
| 463ca3f006 | |||
| 1ba141e715 | |||
| 76e6ab4e0c | |||
| fb35ed58b1 | |||
| ffb4179e0d | |||
| d04637b1ef | |||
| 3c61e279ec | |||
| e9f6ee71fa | |||
| 60129f5abb | |||
| 2d8f2dbcc5 | |||
| 86e353749a |
@@ -3,6 +3,7 @@
|
||||
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;
|
||||
@@ -19,6 +20,24 @@ 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();
|
||||
|
||||
38
backend/app/Admin/Requests/Profile/EditRequest.php
Executable file
38
backend/app/Admin/Requests/Profile/EditRequest.php
Executable file
@@ -0,0 +1,38 @@
|
||||
<?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',
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -9,4 +9,6 @@ class FibTransaction extends Model
|
||||
{
|
||||
/** @use HasFactory<\Database\Factories\FibTransactionFactory> */
|
||||
use HasFactory;
|
||||
|
||||
protected $guarded = ['id'];
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
86
backend/app/Services/FIB/FIBClient.php
Executable file
86
backend/app/Services/FIB/FIBClient.php
Executable file
@@ -0,0 +1,86 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\FIB;
|
||||
|
||||
use Illuminate\Support\Facades\Http;
|
||||
|
||||
class FIBClient
|
||||
{
|
||||
|
||||
public $auth_service;
|
||||
public $create_payment_service;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
}
|
||||
|
||||
public function client()
|
||||
{
|
||||
return Http::acceptJson()
|
||||
->contentType('application/json')
|
||||
->withToken($this->getAccessToken())
|
||||
->timeout(30);
|
||||
}
|
||||
|
||||
public function getAccessToken()
|
||||
{
|
||||
try {
|
||||
if ($this->isNotProduction()) {
|
||||
return json_decode(
|
||||
file_get_contents(storage_path('app/mock/fib/token.json'))
|
||||
);
|
||||
}
|
||||
$response = Http::withOptions([
|
||||
'proxy' => 'http://host.docker.internal:10808',
|
||||
])->asForm()->post('https://fib-stage.fib.iq/auth/realms/fib-online-shop/protocol/openid-connect/token', [
|
||||
'grant_type' => 'client_credentials',
|
||||
'client_id' => 'ipay-test-payment',
|
||||
'client_secret' => '8dae3180-f39c-448e-8b45-a01c8f4c8c15',
|
||||
]);
|
||||
|
||||
if ($response->failed()) {
|
||||
throw new \Exception(
|
||||
'Unable to authenticate with FIB: ' .
|
||||
$response->body()
|
||||
);
|
||||
}
|
||||
|
||||
$data = $response->json();
|
||||
|
||||
if (!isset($data['access_token'])) {
|
||||
throw new \Exception('FIB token missing in response');
|
||||
}
|
||||
|
||||
return $data['access_token'];
|
||||
} catch (\Exception $exception) {
|
||||
return $exception->getMessage();
|
||||
}
|
||||
}
|
||||
|
||||
public function createPaymentService()
|
||||
{
|
||||
if ($this->isNotProduction()) {
|
||||
return json_decode(
|
||||
file_get_contents(storage_path('app/mock/fib/payment_create_success.json'))
|
||||
);
|
||||
}
|
||||
$response = $this->client()->post("https://fib-stage.fib.iq/protected/v1/payments");
|
||||
if ($response->failed()) {
|
||||
throw new \Exception(
|
||||
'Unable to authenticate with FIB: ' .
|
||||
$response->body()
|
||||
);
|
||||
}
|
||||
|
||||
$data = $response->json();
|
||||
if (!isset($data['paymentId'])) {
|
||||
throw new \Exception('FIB paymentId missing in response');
|
||||
}
|
||||
return $data;
|
||||
}
|
||||
|
||||
public function isNotProduction()
|
||||
{
|
||||
return env('APP_ENV') === 'local';
|
||||
}
|
||||
}
|
||||
38
backend/app/Services/Payments/DTO/FIBPaymentCreateDTO.php
Normal file
38
backend/app/Services/Payments/DTO/FIBPaymentCreateDTO.php
Normal file
@@ -0,0 +1,38 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\Payments\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,
|
||||
]);
|
||||
}
|
||||
}
|
||||
46
backend/app/Services/Payments/DTO/PaymentCreateDTO.php
Normal file
46
backend/app/Services/Payments/DTO/PaymentCreateDTO.php
Normal file
@@ -0,0 +1,46 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\Payments\DTO;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class PaymentCreateDTO
|
||||
{
|
||||
|
||||
public string $username;
|
||||
public int $user_id;
|
||||
public string $track_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->track_id = $data['track_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',
|
||||
'track_id' => uuid_create(),
|
||||
'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();
|
||||
}
|
||||
}
|
||||
72
backend/app/Services/Payments/PaymentService.php
Normal file
72
backend/app/Services/Payments/PaymentService.php
Normal file
@@ -0,0 +1,72 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\Payments;
|
||||
|
||||
use App\Enums\PaymentStatusEnum;
|
||||
use App\Models\FibTransaction;
|
||||
use App\Models\Payment;
|
||||
use App\Models\Transaction;
|
||||
use App\Services\FIB\FIBClient;
|
||||
use App\Services\Payments\DTO\FIBPaymentCreateDTO;
|
||||
use App\Services\Payments\DTO\PaymentCreateDTO;
|
||||
|
||||
class PaymentService
|
||||
{
|
||||
public $fib_client;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->fib_client = new FibClient();
|
||||
}
|
||||
|
||||
public function createPayment(PaymentCreateDTO $dto)
|
||||
{
|
||||
try {
|
||||
$payment = Payment::query()->create([
|
||||
'user_id' => $dto->user_id,
|
||||
'username' => $dto->username,
|
||||
'track_id' => $dto->track_id,
|
||||
'amount' => $dto->amount,
|
||||
'currency' => $dto->currency,
|
||||
'callback_url' => $dto->callback_url,
|
||||
'status_id' => PaymentStatusEnum::Unpaid->value,
|
||||
'status_name' => PaymentStatusEnum::Unpaid->name,
|
||||
'ip' => $dto->ip,
|
||||
'user_gateway_id' => $dto->user_gateway_id,
|
||||
]);
|
||||
|
||||
$response = $this->fib_client->createPaymentService();
|
||||
$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' => '',
|
||||
]);
|
||||
|
||||
$fib_transactions = 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;
|
||||
} catch (\Exception $exception) {
|
||||
throw new \Exception($exception->getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -13,6 +13,8 @@ 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
|
||||
{
|
||||
@@ -29,25 +31,33 @@ class GatewayManagementController extends Controller
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @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;
|
||||
|
||||
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,
|
||||
]);
|
||||
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();
|
||||
}
|
||||
|
||||
35
backend/app/User/Controllers/Payment/PaymentController.php
Normal file
35
backend/app/User/Controllers/Payment/PaymentController.php
Normal file
@@ -0,0 +1,35 @@
|
||||
<?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\StoreRequest;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,14 +2,19 @@
|
||||
|
||||
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
|
||||
{
|
||||
@@ -20,21 +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' => $request->province_id,
|
||||
'city_id' => $request->city_id,
|
||||
'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' => $request->national_id,
|
||||
'address' => $request->address,
|
||||
'postal_code' => $request->postal_code,
|
||||
'phone_number' => $request->phone_number,
|
||||
'province_id' => $province->id,
|
||||
'province_name' => $province->name,
|
||||
'city_id' => $city->id,
|
||||
'city_name' => $city->name,
|
||||
'birth_date' => $request->birth_date,
|
||||
'email' => $request->email,
|
||||
'kyc_status' => 1,
|
||||
]);
|
||||
});
|
||||
|
||||
return $this->successResponse();
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ namespace App\User\Requests\Gateway;
|
||||
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
class StoreRequest extends FormRequest
|
||||
{
|
||||
@@ -12,7 +13,7 @@ class StoreRequest extends FormRequest
|
||||
*/
|
||||
public function authorize(): bool
|
||||
{
|
||||
return true;
|
||||
return Auth::guard('web')->user()->kyc_status;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -4,6 +4,7 @@ namespace App\User\Requests\Gateway;
|
||||
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
class UpdateRequest extends FormRequest
|
||||
{
|
||||
@@ -12,7 +13,7 @@ class UpdateRequest extends FormRequest
|
||||
*/
|
||||
public function authorize(): bool
|
||||
{
|
||||
return true;
|
||||
return Auth::guard('web')->user()->kyc_status;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
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'],
|
||||
'track_id' => ['required'],
|
||||
'amount' => ['required'],
|
||||
'currency' => ['required'],
|
||||
'callback_url' => ['required'],
|
||||
'user_gateway_id' => ['required'],
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -4,6 +4,9 @@ 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
|
||||
{
|
||||
@@ -22,15 +25,20 @@ class EditRequest extends FormRequest
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
$user = Auth::guard('web')->user();
|
||||
|
||||
return [
|
||||
'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',
|
||||
'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']
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,6 +18,18 @@ 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,6 +127,12 @@ return [
|
||||
'path' => storage_path('logs/laravel.log'),
|
||||
],
|
||||
|
||||
'fib_authorization' => [
|
||||
'driver' => 'single',
|
||||
'path' => storage_path('logs/fib/authorization.log'),
|
||||
'level' => 'error',
|
||||
],
|
||||
|
||||
],
|
||||
|
||||
];
|
||||
|
||||
@@ -22,7 +22,6 @@ 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');
|
||||
|
||||
@@ -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();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -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(),],
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,19 @@
|
||||
<?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');
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
@@ -4,6 +4,7 @@ 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;
|
||||
|
||||
@@ -74,3 +75,13 @@ 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');
|
||||
});
|
||||
|
||||
@@ -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