From 3fddd951570a3876c5b7b2edea46f18868023c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=B3=B4=EA=B3=A4?= Date: Fri, 6 Feb 2026 08:34:34 +0900 Subject: [PATCH] =?UTF-8?q?fix:=EC=B9=B4=EB=93=9C=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EB=82=B4=EC=97=AD=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=95=84=EC=9B=83=20=EA=B0=9C=EC=84=A0=20(=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9D=BC=EC=8B=9C,=2010=EC=9E=90=20=ED=91=9C=EC=8B=9C?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/finance/dashboard.blade.php | 39 +++++++++++---------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/resources/views/finance/dashboard.blade.php b/resources/views/finance/dashboard.blade.php index c278fc5a..b6953e33 100644 --- a/resources/views/finance/dashboard.blade.php +++ b/resources/views/finance/dashboard.blade.php @@ -291,49 +291,50 @@ class="inline-flex items-center gap-2 px-4 py-2 bg-blue-600 hover:bg-blue-700 te
- +
- - - - - - - + + + + + + + @forelse($recentCardTransactions as $card) @php $useDate = \Carbon\Carbon::createFromFormat('Ymd', $card->use_date); + $useTime = $card->use_time ? substr($card->use_time, 0, 2) . ':' . substr($card->use_time, 2, 2) : ''; $isCancel = $card->approval_type === '취소'; $isDeductible = $card->deduction_type === 'deductible'; $cardLast4 = substr($card->card_num, -4); @endphp - - - - - - - @empty
사용일카드번호공제가맹점내역금액계정과목사용일시카드번호공제가맹점내역금액계정과목
- {{ $useDate->format('m/d') }} + + {{ $useDate->format('m/d') }} {{ $useTime }} + ****-{{ $cardLast4 }} + {{ $isDeductible ? '공제' : '불공' }} - {{ Str::limit($card->merchant_name, 6) }} + + {{ Str::limit($card->merchant_name, 10) }} - {{ Str::limit($card->description ?: '-', 6) }} + + {{ Str::limit($card->description ?: '-', 10) }} + {{ $isCancel ? '+' : '-' }}{{ number_format($card->approval_amount) }} - {{ Str::limit($card->account_name ?: '-', 6) }} + + {{ Str::limit($card->account_name ?: '-', 10) }}