add trancactions report

backend/app/Admin/Controllers/DocumentationController.php

@@ -29,16 +29,6 @@ class DocumentationController extends Controller
         );
     }
 
-    public function show(User $user): JsonResponse
-    {
-        $data=User::query()
-            ->with([
-                'gateway:id,user_id,domain,tax_id,bank_name,account_holder,logo',
-                'documents:id,documentable_id,documentable_type,title,url',
-            ])->find($user);
-        return $this->successResponse($data);
-    }
-
     public function files(User $user): JsonResponse
     {
         return $this->successResponse($user->load('documents'));

backend/app/Enums/PaymentStatusEnum.php

@@ -2,22 +2,28 @@
 
 namespace App\Enums;
 
-enum PaymentStatusEnum:int
+enum PaymentStatusEnum: int
 {
-    case Unpaid = 0;
+    case UNPAID = 0;
     case Cancelled = 1;
     case Expired = 2;
-    case Paid = 3;
-    case Refunded = 4;
+    case PAID = 3;
+    case REFUNDED = 4;
+
+    case PendingVerification = 5;
+
+    case REFUND_REQUESTED = 6;
 
     public function label(): string
     {
         return match ($this) {
-            self::Unpaid => 'unpaid',
-            self::Cancelled => 'cancelled',
-            self::Expired => 'expired',
-            self::Paid => 'paid',
-            self::Refunded => 'refunded',
+            self::UNPAID => 'UNPAID',
+            self::Cancelled => 'CANCELLED',
+            self::Expired => 'EXPIRED',
+            self::PAID => 'PAID',
+            self::REFUNDED => 'REFUNDED',
+            self::REFUND_REQUESTED => 'REFUND_REQUESTED',
+            self::PendingVerification => 'PENDING_VERIFICATION',
         };
     }
 }

backend/app/Models/FibTransaction.php

@@ -4,6 +4,7 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class FibTransaction extends Model
 {
@@ -11,4 +12,14 @@ class FibTransaction extends Model
     use HasFactory;
 
     protected $guarded = ['id'];
+
+    public function transaction(): BelongsTo
+    {
+        return $this->belongsTo(Transaction::class);
+    }
+
+    public function payment(): BelongsTo
+    {
+        return $this->belongsTo(Payment::class);
+    }
 }

backend/app/Models/Transaction.php

@@ -5,6 +5,7 @@ namespace App\Models;
 use Database\Factories\TransactionFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Transaction extends Model
 {
@@ -12,4 +13,9 @@ class Transaction extends Model
     use HasFactory;
 
     protected $guarded = ['id'];
+
+    public function payment(): BelongsTo
+    {
+        return $this->belongsTo(Payment::class);
+    }
 }

backend/app/Models/User.php

@@ -7,8 +7,7 @@ use Database\Factories\UserFactory;
 use Illuminate\Database\Eloquent\Attributes\Guarded;
 use Illuminate\Database\Eloquent\Attributes\Hidden;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\HasOne;
-use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\Hash;
@@ -23,13 +22,9 @@ class User extends Authenticatable
     use HasFactory, Notifiable, HasApiTokens;
     protected $guarded = ['id'];
 
-    public function documents(): MorphMany
+    public function documents(): MorphToMany
     {
-        return $this->morphMany(Document::class, 'documentable');
-    }
-    public function gateway(): HasOne
-    {
-        return $this->hasOne(UserGateway::class);
+        return $this->morphToMany(Document::class, 'documents');
     }
 
     public function validateForPassportPasswordGrant(string $password): bool

backend/app/Services/FIB/CheckPaymentStatusService.php

@@ -11,31 +11,29 @@ class CheckPaymentStatusService
 {
     protected string $url;
     protected string $channelName;
-    protected AuthorizationService $authorizationService;
+    protected AuthorizationService $authorization_service;
 
-    public function __construct(AuthorizationService $authorizationService)
+    public function __construct(AuthorizationService $authorization_service)
     {
-        $this->url = config('fib.checkPaymentStatus.url');
+        $this->url = 'https://fib-stage.fib.iq/protected/v1/payments/';
         $this->channelName = 'fib_status';
-        $this->authorizationService = $authorizationService;
+        $this->authorization_service = $authorization_service;
     }
 
     /**
      * @throws Exception
      */
-    public function run(): array
+    public function run(string $fib_payment_id): array
     {
         try {
-            return $this->sendRequest();
-        }
-        catch (Exception $e) {
+            return $this->sendRequest($fib_payment_id);
+        } catch (Exception $e) {
             Log::channel($this->channelName)
                 ->error(get_class($this),
                     [
                         'message' => $e->getMessage(),
                     ]
                 );
-
             throw $e;
         }
     }
@@ -44,15 +42,16 @@ class CheckPaymentStatusService
      * @throws ConnectionException
      * @throws Exception
      */
-    public function sendRequest(): array
+    public function sendRequest(string $fib_payment_id): array
     {
+        $url = rtrim($this->url, '/') . "/{$fib_payment_id}/status";
         return Http::withHeaders([
             'Authorization' => 'Bearer ' . $this->getToken(),
-            'Content-Type' => 'application/json',
-            ])
+            'Accept' => 'application/json',
+        ])
             ->throw()
             ->withoutVerifying()
-            ->post($this->url)
+            ->get($url)
             ->json();
     }
 
@@ -61,7 +60,7 @@ class CheckPaymentStatusService
      */
     public function getToken(): string
     {
-        $data =  $this->authorizationService->run();
+        $data = $this->authorization_service->run();
         return $data['access_token'];
     }
 }

backend/app/Services/FIB/DTO/FIBPaymentCreateDTO.php

@@ -26,13 +26,13 @@ class FIBPaymentCreateDTO
     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,
+            'paymentId' => $data['paymentId'],
+            'readableCode' => $data['readableCode'],
+            'qrCode' => $data['qrCode'],
+            'validUntil' => $data['validUntil'],
+            'personalAppLink' => $data['personalAppLink'],
+            'businessAppLink' => $data['businessAppLink'],
+            'corporateAppLink' => $data['corporateAppLink'],
         ]);
     }
 }

backend/app/Services/FIB/FIBClient.php

@@ -1,86 +0,0 @@
-<?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';
-    }
-}

backend/app/Services/Payments/Commands/SyncFibPaymentStatuses.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Services\Payments\Commands;
+
+use App\Models\FibTransaction;
+use App\Services\Payments\SyncFibPaymentStatusService;
+use Illuminate\Console\Command;
+
+class SyncFibPaymentStatuses extends Command
+{
+    protected $signature = 'payments:sync-fib-statuses';
+    protected $description = 'Poll FIB for status updates on all pending payments';
+
+    public function handle(SyncFibPaymentStatusService $service)
+    {
+        $this->info('Syncing FIB payment statuses...');
+        $service->run();
+        $this->info('Done.');
+    }
+}

backend/app/Services/Payments/Controllers/FIBTempController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Services\Payments\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Services\FIB\CheckPaymentStatusService;
+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 FIBTempController extends Controller
+{
+    use ApiResponse;
+
+    public $check_status_service;
+
+    public function __construct(CheckPaymentStatusService $check_status_service)
+    {
+        $this->check_status_service = $check_status_service;
+    }
+
+    public function checkStatus(Request $request): JsonResponse
+    {
+        try {
+            $result = $this->check_status_service->run('8a6e8f4d-b9fb-44f4-b086-12450939bf5c');
+            return $this->successResponse($result);
+        } catch (\Exception $exception) {
+            throw $exception;
+        }
+    }
+
+
+}

backend/app/Services/Payments/DTO/PaymentCreateDTO.php

@@ -9,7 +9,6 @@ class PaymentCreateDTO
 
     public string $username;
     public int $user_id;
-    public string $track_id;
     public string $amount;
     public string $currency;
     public string $callback_url;
@@ -21,7 +20,6 @@ class PaymentCreateDTO
     {
         $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'];
@@ -35,7 +33,6 @@ class 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,

backend/app/Services/Payments/PaymentService.php

@@ -6,6 +6,8 @@ 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;
@@ -16,10 +18,16 @@ use Throwable;
 class PaymentService
 {
     protected CreatePaymentService $create_payment_service;
+    protected CheckPaymentStatusService $check_payment_status_service;
 
-    public function __construct(CreatePaymentService $create_payment_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;
     }
 
     /**
@@ -28,19 +36,33 @@ class PaymentService
      */
     public function createPayment(PaymentCreateDTO $dto)
     {
-        return DB::transaction(function () use ($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' => $dto->track_id,
+                'track_id' => $this->generateTrackId(),
                 'amount' => $dto->amount,
                 'currency' => $dto->currency,
-                'callback_url' => $dto->callback_url,
-                'status_id' => PaymentStatusEnum::Unpaid->value,
-                'status_name' => PaymentStatusEnum::Unpaid->name,
+                'callback_url' => 'https://user_callback',
+                'status_id' => PaymentStatusEnum::UNPAID->value,
+                'status_name' => PaymentStatusEnum::UNPAID->name,
                 'ip' => $dto->ip,
-                'user_gateway_id' => $dto->user_gateway_id,
+                '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();
@@ -51,12 +73,12 @@ class PaymentService
                 'amount' => $payment->amount,
                 'currency' => $payment->currency,
                 'callback_url' => $payment->callback_url,
-    //                'description' => '',
-    //                'expires_in' => '',
+                //                'description' => '',
+                //                'expires_in' => '',
                 'payment_id' => $payment->id,
                 'payment_track_id' => $payment->track_id,
                 'user_gateway_id' => $payment->user_gateway_id,
-    //                'status' => '',
+                //                'status' => '',
             ]);
 
             FibTransaction::query()->create([
@@ -69,11 +91,86 @@ class PaymentService
                 'paymentId' => $fib_response_dto->paymentId,
                 'paymentMethod' => 'fib',
                 'validUntil' => $fib_response_dto->validUntil,
-                'status_id' => PaymentStatusEnum::Unpaid->value,
-                'status_name' => PaymentStatusEnum::Unpaid->name,
+                'status_id' => PaymentStatusEnum::UNPAID->value,
+                'status_name' => PaymentStatusEnum::UNPAID->name,
             ]);
 
-            return $payment;
+            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() ?? 2;
+        return Payment::query()->where('track_id', $track_id)
+            ->where('user_id', $user_id)
+            ->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,
+            ];
+        });
+
+    }
 }

backend/app/Services/Payments/SyncFibPaymentStatusService.php

@@ -0,0 +1,113 @@
+<?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\CheckPaymentStatusService;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class SyncFibPaymentStatusService
+{
+    public function __construct(
+        protected CheckPaymentStatusService $checkPaymentStatusService
+    )
+    {
+    }
+
+    public function run(): void
+    {
+        $fib_transactions = FibTransaction::query()
+            ->whereIn('status_id', [
+                PaymentStatusEnum::UNPAID->value,
+            ])
+            ->with('transaction.payment')
+            ->get();
+
+        foreach ($fib_transactions as $fib_transaction) {
+            try {
+                $this->syncOne($fib_transaction);
+            } catch (\Exception $e) {
+                Log::channel('fib_status')->error('Failed to sync fib transaction', [
+                    'fib_transaction_id' => $fib_transaction->id,
+                    'fib_payment_id' => $fib_transaction->paymentId,
+                    'error' => $e->getMessage(),
+                ]);
+            }
+        }
+    }
+
+    public function syncOne(FibTransaction $fib_transaction)
+    {
+
+        $fib_status_response = $this->checkPaymentStatusService->run($fib_transaction->paymentId);
+        if (!$fib_status_response['status']) {
+            Log::error('No status feild in fib ', []);
+            return false;
+        }
+        $mapped_status = $this->mapFibStatus($fib_status_response['status']);
+
+//        if ($mapped_status->value == $fib_transaction->status) {
+//            return;
+//        }
+
+        return DB::transaction(function () use ($fib_transaction, $fib_status_response, $mapped_status) {
+            $transaction = $fib_transaction->transaction;
+            $payment = $transaction->payment;
+            $fib_transaction->update([
+                'status_id' => $mapped_status->value,
+                'status_name' => $fib_transaction->status,
+                'paidAt' => $fib_status_response['paidAt'] ?? null,
+                'paidAmount' => $fib_status_response['amount']['amount'] ?? null,
+                'paidCurrency' => $fib_status_response['amount']['currency'] ?? null,
+                'decliningReason' => $fib_status_response['decliningReason'] ?? null,
+                'declinedAt' => $fib_status_response['declinedAt'] ?? null,
+                'paidByName' => $fib_status_response['paidBy']['name'] ?? null,
+                'paidByIban' => $fib_status_response['paidBy']['iban'] ?? null,
+            ]);
+
+            $transaction->update([
+                'status_id' => $mapped_status->value,
+                'status_name' => $mapped_status->label(),
+            ]);
+
+            if ($mapped_status === PaymentStatusEnum::PAID) {
+                $payment->update([
+                    'status_id' => PaymentStatusEnum::PendingVerification->value,
+                    'status_name' => PaymentStatusEnum::PendingVerification->label(),
+                    'payment_method' => 'FIB',
+                    'paid_currency' => $fib_transaction->paidCurrency,
+                    'paid_amount' => $fib_transaction->paidAmount,
+                    'paid_at' => $fib_transaction->paidAt,
+                ]);
+                #------ has to implement ------
+//                $this->notifyMerchant($payment);
+            } else {
+                $payment->update([
+                    'status_id' => $mapped_status->value,
+                    'status_name' => $mapped_status->label(),
+                    'paid_currency' => $fib_transaction->paidCurrency,
+                    'paid_amount' => $fib_transaction->paidAmount,
+                    'paid_at' => $fib_transaction->paidAt,
+                ]);
+            }
+            return $payment;
+        });
+    }
+
+    protected function mapFibStatus(string $fib_status_response): PaymentStatusEnum
+    {
+        return match (strtoupper($fib_status_response)) {
+            'PAID' => PaymentStatusEnum::PAID,
+            'UNPAID' => PaymentStatusEnum::UNPAID,
+            'DECLINED' => PaymentStatusEnum::Cancelled,
+            'EXPIRED' => PaymentStatusEnum::Expired,
+            'REFUNDED' => PaymentStatusEnum::REFUNDED,
+            'REFUND_REQUESTED' => PaymentStatusEnum::REFUND_REQUESTED,
+            default => PaymentStatusEnum::UNPAID,
+        };
+    }
+}

backend/app/User/Controllers/Payment/PaymentController.php

@@ -6,9 +6,12 @@ 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
@@ -32,4 +35,20 @@ class PaymentController extends Controller
             throw $exception;
         }
     }
+
+    public function InquiryTransaction(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()
+    {
+
+    }
+
 }

backend/app/User/Controllers/Transactions/MerchantTransactionController.php

@@ -0,0 +1,117 @@
+<?php
+
+namespace App\User\Controllers\Transactions;
+
+use App\Enums\PaymentStatusEnum;
+use App\Facades\DataTable\DataTableFacade;
+use App\Http\Controllers\Controller;
+use App\Models\Payment;
+use App\Models\Transaction;
+use App\Traits\ApiResponse;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+
+class MerchantTransactionController extends Controller
+{
+    use ApiResponse;
+
+    public function index(Request $request)
+    {
+        $merchantId = Auth::id();
+
+        $query = Transaction::query()
+            ->select([
+                'transactions.id',
+                'transactions.amount',
+                'transactions.currency',
+                'transactions.status_id',
+                'transactions.created_at',
+
+                'payments.id',
+                'payments.payment_method',
+                'payments.paid_amount',
+                'payments.paid_currency',
+                'payments.paid_at',
+                'payments.status_name as payment_status',
+                'payments.status_id as payment_status_id',
+                'payments.verified_at',
+                'payments.refunded_at',
+                'payments.refund_reason',
+                'payments.track_id',
+
+                'user_gateways.name',
+            ])
+            ->join(
+                'payments',
+                'payments.id',
+                '=',
+                'transactions.payment_id'
+            )
+            ->leftJoin(
+                'user_gateways',
+                'user_gateways.id',
+                '=',
+                'transactions.user_gateway_id'
+            )
+            ->where('transactions.user_id', $merchantId);
+
+        return DataTableFacade::run(
+            $query,
+            $request,
+            allowedFilters: ['*'],
+            allowedSortings: ['*'],
+            allowedSelects: ['payments.id as payment_id', 'payments.track_id', 'payments.status_id as payment_status_id',
+                'payments.status_name as payment_status',
+                'payment_method', 'paid_amount', 'paid_currency', 'paid_at', 'payment_track_id',
+                'transactions.amount',
+                'transactions.currency',
+                'user_gateways.name as gateway_name',
+                'payments.verified_at',
+                'payments.refunded_at',
+                'payments.refund_reason',
+            ]
+        );
+    }
+
+    public function stats(): JsonResponse
+    {
+        $merchantId = Auth::id();
+
+        $data = [
+            'total_transactions' => Payment::query()->where(
+                'user_id',
+                $merchantId
+            )->count(),
+
+            'successful_transactions' => Payment::query()->where(
+                'user_id',
+                $merchantId
+            )
+                ->where('status_id', PaymentStatusEnum::PAID->value)
+                ->count(),
+
+            'failed_transactions' => Payment::query()->where(
+                'user_id',
+                $merchantId
+            )
+                ->whereIn('status_id', [
+                    PaymentStatusEnum::Cancelled->value,
+                    PaymentStatusEnum::Expired->value
+                ])
+                ->count(),
+
+            'total_paid_amount' => Payment::query()
+                ->where('user_id', $merchantId)
+                ->where(
+                    'status_id',
+                    PaymentStatusEnum::PendingVerification->value
+                )
+                ->selectRaw('SUM(CAST(paid_amount AS DECIMAL(20,2))) as total')
+                ->value('total'),
+        ];
+
+        return $this->successResponse($data);
+    }
+}

backend/app/User/Requests/Payment/FIB/InquiryRequest.php

@@ -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'],
+        ];
+    }
+}

backend/app/User/Requests/Payment/FIB/StoreRequest.php

@@ -25,12 +25,12 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'username' => ['required'],
-            'track_id' => ['required'],
+            'username' => ['required', 'string'],
             'amount' => ['required'],
-            'currency' => ['required'],
+            'currency' => ['required', 'string'],
             'callback_url' => ['required'],
-            'user_gateway_id' => ['required'],
+            'user_gateway_id' => ['required', 'integer', 'exists:user_gateways,id'],
+            'description' => ['nullable', 'string', 'max:500'],
         ];
     }
 }

backend/app/User/Resources/Payment/InquiryResource.php

@@ -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,
+        ];
+    }
+}

backend/bootstrap/app.php

@@ -3,12 +3,13 @@
 use Illuminate\Foundation\Application;
 use Illuminate\Foundation\Configuration\Exceptions;
 use Illuminate\Foundation\Configuration\Middleware;
+use Illuminate\Support\Facades\Route;
 
 return Application::configure(basePath: dirname(__DIR__))
     ->withRouting(
-        web: __DIR__.'/../routes/web.php',
-        api: __DIR__.'/../routes/api.php',
-        commands: __DIR__.'/../routes/console.php',
+        web: __DIR__ . '/../routes/web.php',
+        api: __DIR__ . '/../routes/api.php',
+        commands: __DIR__ . '/../routes/console.php',
         health: '/up',
         then: function () {
             Route::middleware('web')
@@ -23,6 +24,9 @@ return Application::configure(basePath: dirname(__DIR__))
     ->withExceptions(function (Exceptions $exceptions): void {
         //
     })
+    ->withCommands([
+        __DIR__ . '/../app/Services/Payments/Commands',
+    ])
     ->withEvents(discover: [
-        __DIR__.'/../app/User/Listeners',
+        __DIR__ . '/../app/User/Listeners',
     ])->create();

backend/database/migrations/2026_06_05_142646_add_columns_to_payments_table.php

@@ -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',]);
+        });
+    }
+};

backend/database/seeders/PaymentStatusSeeder.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\DB;
 
-class PaymentStatusSeeder extends Seeder
+class   PaymentStatusSeeder extends Seeder
 {
     /**
      * Run the database seeds.
@@ -14,11 +14,13 @@ class PaymentStatusSeeder extends Seeder
     public function run(): void
     {
         DB::table('payment_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(),],
+            ['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(),],
+            ['id' => 5, 'name' => 'PENDING_VERIFICATION', 'created_at' => now(), 'updated_at' => now(),],
+            ['id' => 6, 'name' => 'REFUND_REQUESTED', 'created_at' => now(), 'updated_at' => now(),],
         ]);
     }
 }

backend/routes/api.php

@@ -11,9 +11,12 @@ Route::get('/user', function (Request $request) {
 
 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, 'InquiryTransaction'])->name('inquiry');
+            Route::post('/verify', [PaymentController::class, 'checkPaymentStatus'])->name('verify');
+            Route::get('check_fib_status', [\App\Services\Payments\Controllers\FIBTempController::class, 'checkStatus']);
         });
-
 });
+
+

backend/routes/console.php

@@ -2,7 +2,13 @@
 
 use Illuminate\Foundation\Inspiring;
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Schedule;
+use App\Services\Payments\Commands\SyncFibPaymentStatuses;
+
+
 
 Artisan::command('inspire', function () {
     $this->comment(Inspiring::quote());
 })->purpose('Display an inspiring quote');
+
+Schedule::command(SyncFibPaymentStatuses::class)->everyMinute();

backend/routes/expert.php

@@ -7,6 +7,7 @@ use App\Admin\Controllers\PermissionManagementController;
 use App\Admin\Controllers\ProfileController;
 use App\Admin\Controllers\RoleManagementController;
 use App\Admin\Controllers\UserManagementController;
+use Illuminate\Support\Facades\Route;
 
 Route::prefix('auth')
     ->name('auth.')
@@ -14,7 +15,7 @@ Route::prefix('auth')
     ->group(function () {
         Route::post('login', 'login')->name('login');
         Route::post('logout', 'logout')->name('logout');
-});
+    });
 
 Route::prefix('documents')
     ->name('documents.')
@@ -22,7 +23,6 @@ Route::prefix('documents')
     ->controller(DocumentationController::class)
     ->group(function () {
         Route::get('/', 'index')->name('index');
-        Route::get('/{user}', 'show')->name('show');
         Route::post('confirm/{user}', 'confirm')->name('confirm');
         Route::post('reject/{user}', 'reject')->name('reject');
         Route::get('files/{user}', 'files')->name('files');
@@ -34,10 +34,10 @@ Route::prefix('user_management')
     ->controller(UserManagementController::class)
     ->group(function () {
         Route::get('/', 'index')->name('index');
-        Route::post('/', 'store')->name('store');
-        Route::get('/{user}', 'show')->name('show');
-        Route::post('/{user}', 'update')->name('update');
-        Route::delete('/{user}', 'destroy')->name('destroy');
+        Route::post('/store', 'store')->name('store');
+        Route::get('{user}', 'show')->name('show');
+        Route::post('/update/{user}', 'update')->name('update');
+        Route::delete('/delete/{user}', 'destroy')->name('destroy');
     });
 
 Route::prefix('roles')
@@ -46,10 +46,10 @@ Route::prefix('roles')
     ->controller(RoleManagementController::class)
     ->group(function () {
         Route::get('/', 'index')->name('index');
-        Route::post('/', 'store')->name('store');
-        Route::get('/{role}', 'show')->name('show');
-        Route::post('/{role}', 'update')->name('update');
-        Route::delete('/{role}', 'destroy')->name('destroy');
+        Route::post('/store', 'store')->name('store');
+        Route::get('{role}', 'show')->name('show');
+        Route::post('/update/{role}', 'update')->name('update');
+        Route::delete('/delete/{role}', 'destroy')->name('destroy');
     });
 
 Route::prefix('permissions')
@@ -58,22 +58,22 @@ Route::prefix('permissions')
     ->controller(PermissionManagementController::class)
     ->group(function () {
         Route::get('/', 'index')->name('index');
-        Route::post('/', 'store')->name('store');
-        Route::get('/{permission}', 'show')->name('show');
-        Route::post('/{permission}', 'update')->name('update');
-        Route::delete('/{permission}', 'destroy')->name('destroy');
+        Route::post('/store', 'store')->name('store');
+        Route::get('{permission}', 'show')->name('show');
+        Route::post('/update/{permission}', 'update')->name('update');
+        Route::delete('/delete/{permission}', 'destroy')->name('destroy');
     });
 
-Route::prefix('expert')
+Route::prefix('expert_manage')
     ->name('expert.')
     ->middleware(['auth:expert', 'permission:expert-management'])
     ->controller(ExpertManagementController::class)
     ->group(function () {
         Route::get('/', 'index')->name('index');
-        Route::post('/', 'store')->name('store');
-        Route::get('/{expert}', 'show')->name('show');
-        Route::post('/{expert}', 'update')->name('update');
-        Route::delete('/{expert}', 'destroy')->name('destroy');
+        Route::post('/stores', 'store')->name('store');
+        Route::get('{expert}', 'show')->name('show');
+        Route::post('/update/{expert}', 'update')->name('update');
+        Route::delete('/delete/{expert}', 'destroy')->name('destroy');
     });
 
 Route::prefix('profile')

backend/routes/web.php

@@ -1,15 +1,13 @@
 <?php
 
-use App\Admin\Controllers\ExpertManagementController;
-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;
+use App\User\Controllers\Transactions\MerchantTransactionController;
 
 Route::prefix('auth')
     ->name('Auth.')
@@ -55,3 +53,13 @@ Route::prefix('city')
     ->group(function () {
         Route::get('list', 'list')->name('list');
     });
+
+
+Route::prefix('merchant')->group(function () {
+    Route::prefix('transactions')
+        ->middleware(['auth'])
+        ->group(function () {
+            Route::get('/list', [MerchantTransactionController::class, 'index'])->name('index');
+            Route::get('/stats', [MerchantTransactionController::class, 'stats'])->name('stats');
+        });
+});