fix route for expert in profile

backend/app/Enums/PaymentStatusEnum.php

@@ -2,28 +2,22 @@
 
 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 PendingVerification = 5;
-
-    case REFUND_REQUESTED = 6;
+    case Paid = 3;
+    case Refunded = 4;
 
     public function label(): string
     {
         return match ($this) {
-            self::UNPAID => 'UNPAID',
-            self::Cancelled => 'CANCELLED',
-            self::Expired => 'EXPIRED',
-            self::PAID => 'PAID',
-            self::REFUNDED => 'REFUNDED',
-            self::REFUND_REQUESTED => 'REFUND_REQUESTED',
-            self::PendingVerification => 'PENDING_VERIFICATION',
+            self::Unpaid => 'unpaid',
+            self::Cancelled => 'cancelled',
+            self::Expired => 'expired',
+            self::Paid => 'paid',
+            self::Refunded => 'refunded',
         };
     }
 }

backend/app/Models/FibTransaction.php

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

backend/app/Models/User.php

@@ -24,7 +24,7 @@ class User extends Authenticatable
 
     public function documents(): MorphToMany
     {
-        return $this->morphToMany(Document::class, 'documents');
+        return $this->morphToMany(Document::class, 'documentable');
     }
 
     public function validateForPassportPasswordGrant(string $password): bool

backend/app/Services/FIB/CancelPaymentService.php

@@ -11,13 +11,21 @@ class CancelPaymentService
 {
     protected string $url;
     protected string $channelName;
-    protected AuthorizationService $authorizationService;
+    protected string $accessToken;
+    protected array $headers;
 
-    public function __construct(AuthorizationService $authorizationService)
+    public function __construct()
     {
         $this->url = config('fib.cancelPayment.url');
         $this->channelName = '';
-        $this->authorizationService = $authorizationService;
+    }
+
+    public function setHeaders(): void
+    {
+        $this->headers = [
+            'Authorization' => 'Bearer ' . $this->accessToken,
+            'Content-Type' => 'application/json',
+        ];
     }
 
     /**
@@ -42,26 +50,13 @@ class CancelPaymentService
 
     /**
      * @throws ConnectionException
-     * @throws Exception
      */
     public function sendRequest(): array
     {
-        return Http::withHeaders([
-            'Authorization' => 'Bearer ' . $this->getToken(),
-            'Content-Type' => 'application/json',
-            ])
+        return Http::withHeaders($this->headers)
             ->throw()
             ->withoutVerifying()
             ->post($this->url)
             ->json();
     }
-
-    /**
-     * @throws Exception
-     */
-    public function getToken(): string
-    {
-        $data =  $this->authorizationService->run();
-        return $data['access_token'];
-    }
 }

backend/app/Services/FIB/CheckPaymentStatusService.php

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

backend/app/Services/FIB/CreatePaymentService.php

@@ -11,14 +11,27 @@ class CreatePaymentService
 {
     protected string $url;
     protected string $channelName;
+    protected string $accessToken;
+    protected array $headers;
     protected array $inputParameters;
-    protected AuthorizationService $authorizationService;
 
-    public function __construct(AuthorizationService $authorizationService)
+    public function __construct()
     {
         $this->url = config('fib.createPayment.url');
-        $this->channelName = 'fib_create_payment';
-        $this->authorizationService = $authorizationService;
+        $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',
+        ];
     }
 
     public function setInputParameters(array $inputParameters): void
@@ -48,26 +61,13 @@ class CreatePaymentService
 
     /**
      * @throws ConnectionException
-     * @throws Exception
      */
     public function sendRequest(): array
     {
-        return Http::withHeaders([
-            'Authorization' => 'Bearer ' . $this->getToken(),
-            'Content-Type' => 'application/json',
-            ])
+        return Http::withHeaders($this->headers)
             ->throw()
             ->withoutVerifying()
             ->post($this->url, $this->inputParameters)
             ->json();
     }
-
-    /**
-     * @throws Exception
-     */
-    public function getToken(): string
-    {
-        $data =  $this->authorizationService->run();
-        return $data['access_token'];
-    }
 }

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

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

backend/app/Services/FIB/RefundService.php

@@ -11,13 +11,21 @@ class RefundService
 {
     protected string $url;
     protected string $channelName;
-    protected AuthorizationService $authorizationService;
+    protected string $accessToken;
+    protected array $headers;
 
-    public function __construct(AuthorizationService $authorizationService)
+    public function __construct()
     {
         $this->url = config('fib.refund.url');
-        $this->channelName = 'fib_refund';
-        $this->authorizationService = $authorizationService;
+        $this->channelName = '';
+    }
+
+    public function setHeaders(): void
+    {
+        $this->headers = [
+            'Authorization' => 'Bearer ' . $this->accessToken,
+            'Content-Type' => 'application/json',
+        ];
     }
 
     /**
@@ -42,26 +50,13 @@ class RefundService
 
     /**
      * @throws ConnectionException
-     * @throws Exception
      */
     public function sendRequest(): array
     {
-        return Http::withHeaders([
-            'Authorization' => 'Bearer ' . $this->getToken(),
-            'Content-Type' => 'application/json',
-            ])
+        return Http::withHeaders($this->headers)
             ->throw()
             ->withoutVerifying()
             ->post($this->url)
             ->json();
     }
-
-    /**
-     * @throws Exception
-     */
-    public function getToken(): string
-    {
-        $data =  $this->authorizationService->run();
-        return $data['access_token'];
-    }
 }

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

@@ -1,20 +0,0 @@
-<?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

@@ -1,40 +0,0 @@
-<?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

@@ -1,43 +0,0 @@
-<?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,
-        ]);
-    }
-}

backend/app/Services/Payments/FibAdapter.php

@@ -1,37 +0,0 @@
-<?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();
-    }
-}

backend/app/Services/Payments/PaymentService.php

@@ -1,176 +0,0 @@
-<?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() ?? 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

@@ -1,113 +0,0 @@
-<?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/GatewayManagementController.php

@@ -14,7 +14,6 @@ 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
@@ -24,11 +23,11 @@ class GatewayManagementController extends Controller
     public function index(Request $request)
     {
         return DataTableFacade::run(
-            UserGateway::query()->where('user_id', '=', Auth::guard('web')->user()->id),
+            UserGateway::query()->where('user_id', '=', Auth::guard('web')->id()),
             $request,
             allowedFilters: ['*'],
             allowedSortings: ['*'],
-            allowedSelects: ['*'],
+            allowedSelects: ['id', 'name', 'domain', 'tax_id', 'bank_name', 'account_holder', 'iban', 'business_type_id', 'business_type_name'],
         );
     }
 
@@ -39,15 +38,9 @@ class GatewayManagementController extends Controller
     {
         $user = Auth::guard('web')->user();
 
-        $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');
+        $logo = $request->has('logo') ? FileFacade::save($request->file('logo'), "{$user->id}") : null;
 
+        DB::transaction(function () use ($user, $logo, $request) {
             UserGateway::query()->create([
                 'user_id' => $user->id,
                 'username' => $user->username,
@@ -60,20 +53,15 @@ 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([
-            'client_id' => $passportClient->id,
-            'client_secret' => $passportClient->secret,
-        ]);
+
+        return $this->successResponse();
     }
+
     public function show(UserGateway $gateway): JsonResponse
     {
         return $this->successResponse($gateway);

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

@@ -1,54 +0,0 @@
-<?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 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

@@ -1,117 +0,0 @@
-<?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

@@ -1,30 +0,0 @@
-<?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

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

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

@@ -1,30 +0,0 @@
-<?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,13 +3,12 @@
 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')
@@ -24,9 +23,6 @@ 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/config/logging.php

@@ -133,24 +133,6 @@ return [
             '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',
-        ],
-
     ],
 
 ];

backend/database/migrations/2026_05_18_095610_create_transactions_table.php

@@ -4,7 +4,8 @@ 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.
      */
@@ -13,15 +14,15 @@ return new class extends Migration {
         Schema::create('transactions', function (Blueprint $table) {
             $table->id();
             $table->foreignId('user_id')->constrained('users');
-            $table->string('amount')->nullable();
-            $table->string('currency')->nullable();
-            $table->string('callback_url')->nullable();
-            $table->string('description')->nullable();
-            $table->dateTime('expires_in')->nullable();
+            $table->string('amount');
+            $table->string('currency');
+            $table->string('callback_url');
+            $table->string('description');
+            $table->dateTime('expires_in');
             $table->foreignId('payment_id')->constrained('payments');
-            $table->string('payment_track_id')->nullable();
+            $table->string('payment_track_id');
             $table->foreignId('user_gateway_id')->constrained('user_gateways');
-            $table->integer('status')->nullable();
+            $table->integer('status');
             $table->timestamps();
         });
     }

backend/database/migrations/2026_05_18_104524_create_fib_transactions_table.php

@@ -4,7 +4,8 @@ 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.
      */
@@ -13,23 +14,23 @@ return new class extends Migration {
         Schema::create('fib_transactions', function (Blueprint $table) {
             $table->id();
             $table->foreignId('transaction_id')->constrained('transactions');
-            $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->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->foreignId('status_id')->constrained('fib_transaction_statuses');
-            $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->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->timestamps();
         });
     }

backend/database/migrations/2026_06_01_102551_add_client_credentials_to_user_gateways_table.php

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

backend/database/migrations/2026_06_05_142646_add_columns_to_payments_table.php

@@ -1,34 +0,0 @@
-<?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/FibTransactionStatusSeeder.php

@@ -4,7 +4,6 @@ namespace Database\Seeders;
 
 use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Facades\DB;
 
 class FibTransactionStatusSeeder extends Seeder
 {
@@ -13,12 +12,6 @@ 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(),],
-        ]);
+        //
     }
 }

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,13 +14,11 @@ 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' => 5, 'name' => 'PENDING_VERIFICATION', 'created_at' => now(), 'updated_at' => now(),],
-            ['id' => 6, 'name' => 'REFUND_REQUESTED', '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(),],
         ]);
     }
 }

backend/routes/api.php

@@ -1,22 +1,8 @@
 <?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')
-        ->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,13 +2,7 @@
 
 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,7 +7,6 @@ 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.')
@@ -15,7 +14,7 @@ Route::prefix('auth')
     ->group(function () {
         Route::post('login', 'login')->name('login');
         Route::post('logout', 'logout')->name('logout');
-    });
+});
 
 Route::prefix('documents')
     ->name('documents.')
@@ -34,10 +33,10 @@ Route::prefix('user_management')
     ->controller(UserManagementController::class)
     ->group(function () {
         Route::get('/', 'index')->name('index');
-        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::post('/', 'store')->name('store');
+        Route::get('/{user}', 'show')->name('show');
+        Route::post('/{user}', 'update')->name('update');
+        Route::delete('/{user}', 'destroy')->name('destroy');
     });
 
 Route::prefix('roles')
@@ -46,10 +45,10 @@ Route::prefix('roles')
     ->controller(RoleManagementController::class)
     ->group(function () {
         Route::get('/', 'index')->name('index');
-        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::post('/', 'store')->name('store');
+        Route::get('/{role}', 'show')->name('show');
+        Route::post('/{role}', 'update')->name('update');
+        Route::delete('/{role}', 'destroy')->name('destroy');
     });
 
 Route::prefix('permissions')
@@ -58,22 +57,22 @@ Route::prefix('permissions')
     ->controller(PermissionManagementController::class)
     ->group(function () {
         Route::get('/', 'index')->name('index');
-        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::post('/', 'store')->name('store');
+        Route::get('/{permission}', 'show')->name('show');
+        Route::post('/{permission}', 'update')->name('update');
+        Route::delete('/{permission}', 'destroy')->name('destroy');
     });
 
-Route::prefix('expert_manage')
+Route::prefix('expert')
     ->name('expert.')
     ->middleware(['auth:expert', 'permission:expert-management'])
     ->controller(ExpertManagementController::class)
     ->group(function () {
         Route::get('/', 'index')->name('index');
-        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::post('/', 'store')->name('store');
+        Route::get('/{expert}', 'show')->name('show');
+        Route::post('/{expert}', 'update')->name('update');
+        Route::delete('/{expert}', 'destroy')->name('destroy');
     });
 
 Route::prefix('profile')

backend/routes/web.php

@@ -1,13 +1,15 @@
 <?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.')
@@ -53,13 +55,3 @@ 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');
-        });
-});

docker-compose.yml

@@ -40,7 +40,9 @@ services:
       - payment
 
   backend:
-    image: payment-backend:latest
+    build:
+      context: ${BACKEND_PATH}
+      dockerfile: Dockerfile
     container_name: laravel
     tty: true
     restart: unless-stopped
@@ -52,8 +54,6 @@ services:
       - postgres
     networks:
       - payment
-    command: ["php", "artisan", "serve", "--host=0.0.0.0", "--port=9000"]
-    # Prints "Overridden command!"
 #    logging:
 #      driver: "syslog"
 #      options: