ran php-cs-fixer & upgraded ember dependencies

roncodes · roncodes · commit 56204b36d7a2 · 2026-07-17T16:56:01.000+08:00
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "dependencies": {
         "@babel/core": "^7.23.2",
         "@fleetbase/ember-core": "^0.3.24",
-        "@fleetbase/ember-ui": "^0.3.39",
+        "@fleetbase/ember-ui": "^0.3.41",
         "@fleetbase/fleetops-data": "^0.1.37",
         "@fortawesome/ember-fontawesome": "^2.0.0",
         "@fortawesome/fontawesome-svg-core": "6.4.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -5,4 +5,5 @@ allowBuilds:
   '@fortawesome/free-solid-svg-icons': false
   core-js: false
   fsevents: false
-minimumReleaseAge: 0
+minimumReleaseAge: 0
+packages: []
diff --git a/server/src/Console/Commands/VerifyTalerSettlements.php b/server/src/Console/Commands/VerifyTalerSettlements.php
@@ -65,7 +65,7 @@ public function handle(PaymentGatewayManager $gatewayManager): int
                         ? 'wire_reconciled'
                         : ($status === 'paid' ? 'settlement_checked' : 'not_settled');
                     $transaction->reconciliation_checked_at = now();
-                    $transaction->reconciliation_data = [
+                    $transaction->reconciliation_data       = [
                         'http_status'      => $result['http_status'] ?? null,
                         'order_status'     => $status,
                         'wired'            => $wired,
@@ -76,9 +76,9 @@ public function handle(PaymentGatewayManager $gatewayManager): int
                     $transaction->save();
                     $checked++;
                 } catch (\Throwable $e) {
-                    $transaction->reconciliation_status = 'error';
+                    $transaction->reconciliation_status     = 'error';
                     $transaction->reconciliation_checked_at = now();
-                    $transaction->reconciliation_data = [
+                    $transaction->reconciliation_data       = [
                         'error' => $e->getMessage(),
                     ];
                     $transaction->save();
diff --git a/server/src/Gateways/TalerDriver.php b/server/src/Gateways/TalerDriver.php
@@ -6,11 +6,11 @@
 use Fleetbase\Ledger\DTO\PurchaseRequest;
 use Fleetbase\Ledger\DTO\RefundRequest;
 use Fleetbase\Ledger\Exceptions\WebhookSignatureException;
+use Fleetbase\Support\Utils;
 use Illuminate\Http\Client\Response as HttpResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Str;
-use Fleetbase\Support\Utils;
 use Milon\Barcode\Facades\DNS2DFacade as DNS2D;
 
 /**
@@ -505,8 +505,8 @@ public function refund(RefundRequest $request): GatewayResponse
             'amount'   => $talerAmount,
         ]);
 
-        $rawResponse = $response->json() ?? [];
-        $refundUri   = $rawResponse['taler_refund_uri'] ?? null;
+        $rawResponse  = $response->json() ?? [];
+        $refundUri    = $rawResponse['taler_refund_uri'] ?? null;
         $refundStatus = $refundUri ? 'wallet_uri_returned' : 'backend_approved';
 
         return GatewayResponse::success(
diff --git a/server/src/Http/Controllers/Internal/v1/GatewayController.php b/server/src/Http/Controllers/Internal/v1/GatewayController.php
@@ -45,16 +45,16 @@ public function drivers(): JsonResponse
 
     public function summary(): JsonResponse
     {
-        $companyUuid = session('company');
-        $gateways = Gateway::where('company_uuid', $companyUuid)->get();
+        $companyUuid  = session('company');
+        $gateways     = Gateway::where('company_uuid', $companyUuid)->get();
         $gatewayUuids = $gateways->pluck('uuid');
-        $lastPayment = $this->latestGatewayTransaction($gatewayUuids, fn ($query) => $query->whereIn('event_type', [
+        $lastPayment  = $this->latestGatewayTransaction($gatewayUuids, fn ($query) => $query->whereIn('event_type', [
             \Fleetbase\Ledger\DTO\GatewayResponse::EVENT_PAYMENT_PENDING,
             \Fleetbase\Ledger\DTO\GatewayResponse::EVENT_PAYMENT_SUCCEEDED,
         ]));
-        $lastRefund = $this->latestGatewayTransaction($gatewayUuids, fn ($query) => $query->where('type', 'refund'));
+        $lastRefund     = $this->latestGatewayTransaction($gatewayUuids, fn ($query) => $query->where('type', 'refund'));
         $lastSettlement = $this->latestGatewayTransaction($gatewayUuids, fn ($query) => $query->whereNotNull('reconciliation_checked_at'), 'reconciliation_checked_at');
-        $driverSummary = collect($this->paymentService->getDriverManifest())->map(function ($driver) use ($gateways) {
+        $driverSummary  = collect($this->paymentService->getDriverManifest())->map(function ($driver) use ($gateways) {
             $driverGateways = $gateways->where('driver', $driver['code']);
 
             return [
@@ -69,7 +69,7 @@ public function summary(): JsonResponse
         })->values();
 
         return response()->json([
-            'status' => 'ok',
+            'status'  => 'ok',
             'summary' => [
                 'total_gateways'     => $gateways->count(),
                 'active_gateways'    => $gateways->where('status', 'active')->count(),
@@ -202,11 +202,11 @@ public function testCredentials(Request $request, string $id): JsonResponse
         $result = $this->sanitizeProviderResult($driver->testCredentials());
 
         $this->recordGatewayDiagnostic($gateway, 'last_credential_test', [
-            'status'     => $result['status'] ?? (($result['ok'] ?? false) ? 'success' : 'failed'),
-            'successful' => (bool) ($result['ok'] ?? false),
-            'message'    => $result['message'] ?? null,
+            'status'      => $result['status'] ?? (($result['ok'] ?? false) ? 'success' : 'failed'),
+            'successful'  => (bool) ($result['ok'] ?? false),
+            'message'     => $result['message'] ?? null,
             'http_status' => $result['http_status'] ?? null,
-            'checked_at' => now()->toISOString(),
+            'checked_at'  => now()->toISOString(),
         ]);
 
         return response()->json($result, ($result['ok'] ?? false) ? 200 : 422);
@@ -329,7 +329,7 @@ public function diagnostics(Request $request, string $id): JsonResponse
         $lastTestOrder           = $diagnosticMeta['last_test_order'] ?? [];
 
         return response()->json([
-            'status' => 'ok',
+            'status'  => 'ok',
             'gateway' => [
                 'id'                 => $gateway->public_id,
                 'uuid'               => $gateway->uuid,
@@ -350,10 +350,10 @@ public function diagnostics(Request $request, string $id): JsonResponse
                 'last_payment_event_at'             => optional($lastPayment?->created_at)->toISOString(),
                 'last_refund_event_at'              => optional($lastRefund?->created_at)->toISOString(),
                 'last_settlement_seen_at'           => optional($lastSettlement?->reconciliation_checked_at)->toISOString(),
-                'last_reconciliation_status' => $lastSettlement?->reconciliation_status,
-                'last_credential_test'       => $lastCredentialTest ?: null,
-                'last_webhook_registration'  => $lastWebhookRegistration ?: null,
-                'last_test_order'            => $lastTestOrder ?: null,
+                'last_reconciliation_status'        => $lastSettlement?->reconciliation_status,
+                'last_credential_test'              => $lastCredentialTest ?: null,
+                'last_webhook_registration'         => $lastWebhookRegistration ?: null,
+                'last_test_order'                   => $lastTestOrder ?: null,
             ],
             'last_webhook'    => $lastWebhook ? (new GatewayTransactionResource($lastWebhook))->resolve() : null,
             'last_payment'    => $lastPayment ? (new GatewayTransactionResource($lastPayment))->resolve() : null,
@@ -390,7 +390,7 @@ private function latestGatewayTransaction($gatewayUuids, callable $scope, string
 
     private function recordGatewayDiagnostic(Gateway $gateway, string $key, array $summary): void
     {
-        $meta = $gateway->meta ?? [];
+        $meta                      = $gateway->meta ?? [];
         $meta['diagnostics'][$key] = array_filter($summary, fn ($value) => $value !== null);
 
         $gateway->forceFill(['meta' => $meta])->save();
diff --git a/server/src/Http/Controllers/Internal/v1/InvoiceController.php b/server/src/Http/Controllers/Internal/v1/InvoiceController.php
@@ -2,10 +2,10 @@
 
 namespace Fleetbase\Ledger\Http\Controllers\Internal\v1;
 
+use Fleetbase\Ledger\DTO\RefundRequest;
 use Fleetbase\Ledger\Http\Controllers\LedgerResourceController;
 use Fleetbase\Ledger\Http\Resources\v1\Invoice as InvoiceResource;
 use Fleetbase\Ledger\Http\Resources\v1\Transaction as TransactionResource;
-use Fleetbase\Ledger\DTO\RefundRequest;
 use Fleetbase\Ledger\Models\GatewayTransaction;
 use Fleetbase\Ledger\Models\Invoice;
 use Fleetbase\Ledger\Models\InvoiceItem;
@@ -156,13 +156,13 @@ public function refundOptions(string $id, Request $request): JsonResponse
 
         return response()->json([
             'invoice' => [
-                'id'                        => $invoice->public_id,
-                'uuid'                      => $invoice->uuid,
-                'number'                    => $invoice->number,
-                'currency'                  => $invoice->currency,
-                'total_amount'              => (int) $invoice->total_amount,
-                'amount_paid'               => (int) $invoice->amount_paid,
-                'refunded_amount'           => $this->invoiceRefundedAmount($invoice),
+                'id'                          => $invoice->public_id,
+                'uuid'                        => $invoice->uuid,
+                'number'                      => $invoice->number,
+                'currency'                    => $invoice->currency,
+                'total_amount'                => (int) $invoice->total_amount,
+                'amount_paid'                 => (int) $invoice->amount_paid,
+                'refunded_amount'             => $this->invoiceRefundedAmount($invoice),
                 'remaining_refundable_amount' => $this->invoiceRemainingRefundableAmount($invoice),
             ],
             'options' => $options,
@@ -182,21 +182,21 @@ public function refund(string $id, Request $request, PaymentService $paymentServ
             'reason'                 => 'nullable|string|max:500',
         ]);
 
-        $options = collect($this->refundableGatewayTransactions($invoice));
+        $options  = collect($this->refundableGatewayTransactions($invoice));
         $selected = $options->firstWhere('gateway_transaction_id', $request->input('gateway_transaction_id'));
 
         if (!$selected) {
             return response()->json(['error' => 'The selected payment cannot be refunded.'], 422);
         }
 
-        $amount = $request->integer('amount');
+        $amount                 = $request->integer('amount');
         $remainingInvoiceAmount = $this->invoiceRemainingRefundableAmount($invoice);
         $remainingPaymentAmount = (int) data_get($selected, 'refundable_amount', 0);
-        $maxRefundableAmount = min($remainingInvoiceAmount, $remainingPaymentAmount);
+        $maxRefundableAmount    = min($remainingInvoiceAmount, $remainingPaymentAmount);
 
         if ($amount > $maxRefundableAmount) {
             return response()->json([
-                'error' => 'Refund amount exceeds the remaining refundable amount.',
+                'error'                       => 'Refund amount exceeds the remaining refundable amount.',
                 'remaining_refundable_amount' => $maxRefundableAmount,
             ], 422);
         }
@@ -210,8 +210,8 @@ public function refund(string $id, Request $request, PaymentService $paymentServ
             reason: $request->input('reason'),
             invoiceUuid: $invoice->uuid,
             metadata: [
-                'refund_kind' => $refundKind,
-                'invoice_uuid' => $invoice->uuid,
+                'refund_kind'       => $refundKind,
+                'invoice_uuid'      => $invoice->uuid,
                 'invoice_public_id' => $invoice->public_id,
             ],
         ));
@@ -399,32 +399,32 @@ private function refundableGatewayTransactions(Invoice $invoice): array
 
         return $gatewayTransactions
             ->map(function (GatewayTransaction $transaction) use ($invoice, $remainingInvoiceAmount) {
-                $paidAmount = (int) ($transaction->amount ?: $invoice->amount_paid);
+                $paidAmount     = (int) ($transaction->amount ?: $invoice->amount_paid);
                 $refundedAmount = (int) GatewayTransaction::where('company_uuid', $invoice->company_uuid)
                     ->where('gateway_uuid', $transaction->gateway_uuid)
                     ->where('gateway_reference_id', $transaction->gateway_reference_id)
                     ->where('type', 'refund')
                     ->whereNotIn('status', ['failed'])
                     ->sum('amount');
                 $remainingPaymentAmount = max(0, $paidAmount - $refundedAmount);
-                $refundableAmount = min($remainingInvoiceAmount, $remainingPaymentAmount);
+                $refundableAmount       = min($remainingInvoiceAmount, $remainingPaymentAmount);
 
                 if (!$transaction->gateway || $refundableAmount <= 0) {
                     return null;
                 }
 
                 return [
-                    'id'                     => $transaction->public_id,
-                    'uuid'                   => $transaction->uuid,
-                    'gateway_transaction_id' => $transaction->gateway_reference_id,
-                    'amount'                 => $paidAmount,
-                    'currency'               => $transaction->currency ?? $invoice->currency,
-                    'refunded_amount'        => $refundedAmount,
-                    'refundable_amount'      => $refundableAmount,
-                    'status'                 => $transaction->status,
-                    'created_at'             => optional($transaction->created_at)->toISOString(),
+                    'id'                       => $transaction->public_id,
+                    'uuid'                     => $transaction->uuid,
+                    'gateway_transaction_id'   => $transaction->gateway_reference_id,
+                    'amount'                   => $paidAmount,
+                    'currency'                 => $transaction->currency ?? $invoice->currency,
+                    'refunded_amount'          => $refundedAmount,
+                    'refundable_amount'        => $refundableAmount,
+                    'status'                   => $transaction->status,
+                    'created_at'               => optional($transaction->created_at)->toISOString(),
                     'requires_customer_action' => $transaction->gateway->driver === 'taler',
-                    'gateway'                => [
+                    'gateway'                  => [
                         'id'        => $transaction->gateway->public_id ?? $transaction->gateway->uuid,
                         'uuid'      => $transaction->gateway->uuid,
                         'public_id' => $transaction->gateway->public_id,
diff --git a/server/src/Http/Resources/v1/GatewayTransaction.php b/server/src/Http/Resources/v1/GatewayTransaction.php
@@ -15,31 +15,31 @@ class GatewayTransaction extends FleetbaseResource
     public function toArray($request): array
     {
         return [
-            'id'                     => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-            'uuid'                   => $this->when(Http::isInternalRequest(), $this->uuid),
-            'public_id'              => $this->when(Http::isInternalRequest(), $this->public_id),
-            'company_uuid'           => $this->when(Http::isInternalRequest(), $this->company_uuid),
-            'gateway_uuid'           => $this->when(Http::isInternalRequest(), $this->gateway_uuid),
-            'gateway'                => $this->whenLoaded('gateway', fn () => new Gateway($this->gateway)),
-            'gateway_reference_id'   => $this->gateway_reference_id,
-            'gateway_transaction_id' => $this->gateway_reference_id,
-            'event_type'             => $this->event_type,
-            'type'                   => $this->type,
-            'status'                 => $this->status,
-            'message'                => $this->message,
-            'amount'                 => $this->amount,
-            'currency'               => $this->currency,
-            'transaction_uuid'       => $this->when(Http::isInternalRequest(), $this->transaction_uuid),
-            'processed_at'           => $this->processed_at,
-            'refund_status'          => $this->refund_status,
-            'refund_accepted_at'     => $this->refund_accepted_at,
-            'refund_expires_at'      => $this->refund_expires_at,
+            'id'                        => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                      => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'                 => $this->when(Http::isInternalRequest(), $this->public_id),
+            'company_uuid'              => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'gateway_uuid'              => $this->when(Http::isInternalRequest(), $this->gateway_uuid),
+            'gateway'                   => $this->whenLoaded('gateway', fn () => new Gateway($this->gateway)),
+            'gateway_reference_id'      => $this->gateway_reference_id,
+            'gateway_transaction_id'    => $this->gateway_reference_id,
+            'event_type'                => $this->event_type,
+            'type'                      => $this->type,
+            'status'                    => $this->status,
+            'message'                   => $this->message,
+            'amount'                    => $this->amount,
+            'currency'                  => $this->currency,
+            'transaction_uuid'          => $this->when(Http::isInternalRequest(), $this->transaction_uuid),
+            'processed_at'              => $this->processed_at,
+            'refund_status'             => $this->refund_status,
+            'refund_accepted_at'        => $this->refund_accepted_at,
+            'refund_expires_at'         => $this->refund_expires_at,
             'reconciliation_status'     => $this->reconciliation_status,
             'reconciliation_checked_at' => $this->reconciliation_checked_at,
             'reconciliation_data'       => $this->when(Http::isInternalRequest(), $this->reconciliation_data),
             'raw_response'              => $this->when(Http::isInternalRequest(), $this->raw_response),
-            'created_at'             => $this->created_at,
-            'updated_at'             => $this->updated_at,
+            'created_at'                => $this->created_at,
+            'updated_at'                => $this->updated_at,
         ];
     }
 }
diff --git a/server/src/Listeners/HandleProcessedRefund.php b/server/src/Listeners/HandleProcessedRefund.php
@@ -70,7 +70,7 @@ public function handle(RefundProcessed $event): void
                         'amount'             => $amount,
                         'net_amount'         => $amount,
                         'currency'           => $currency,
-                        'description'        => "Refund for invoice " . ($invoice?->number ?? $response->gatewayTransactionId),
+                        'description'        => 'Refund for invoice ' . ($invoice?->number ?? $response->gatewayTransactionId),
                         'type'               => 'gateway_refund',
                         'direction'          => 'debit',
                         'status'             => Transaction::STATUS_SUCCESS,
diff --git a/server/tests/FeatureTest.php b/server/tests/FeatureTest.php
diff --git a/server/tests/Gateways/TalerDriverTest.php b/server/tests/Gateways/TalerDriverTest.php
