From 65de7d90197a12ae2c020dd02bb41c889b749bf8 Mon Sep 17 00:00:00 2001
From: gbanyan <gbanyan.huang@gmail.com>
Date: Sun, 25 Jan 2026 05:31:01 +0800
Subject: [PATCH] Move disability status card to payment history

---
 resources/views/member/dashboard.blade.php | 70 +++++++++++-----------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/resources/views/member/dashboard.blade.php b/resources/views/member/dashboard.blade.php
index 30e37a3..bde692e 100644
--- a/resources/views/member/dashboard.blade.php
+++ b/resources/views/member/dashboard.blade.php
@@ -159,41 +159,6 @@
                             </dd>
                         </div>
 
-                        {{-- Disability Status Card --}}
-                        <div class="overflow-hidden rounded-lg px-4 py-5 sm:p-6 {{ $member->hasApprovedDisability() ? 'bg-green-50 dark:bg-green-900/30' : 'bg-gray-50 dark:bg-gray-700' }}">
-                            <dt class="truncate text-sm font-medium text-gray-500 dark:text-gray-400">
-                                身心障礙身份
-                            </dt>
-                            <dd class="mt-1 text-gray-900 dark:text-gray-100">
-                                @if($member->hasApprovedDisability())
-                                    <div class="flex items-center text-green-700 dark:text-green-300">
-                                        <svg class="h-5 w-5 mr-1.5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
-                                        </svg>
-                                        <span class="font-medium">已審核通過</span>
-                                    </div>
-                                    <p class="mt-1 text-sm text-green-600 dark:text-green-400">會費套用 50% 優惠</p>
-                                @elseif($member->hasDisabilityCertificate() && $member->isDisabilityPending())
-                                    <div class="flex items-center text-yellow-700 dark:text-yellow-300">
-                                        <svg class="h-5 w-5 mr-1.5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" />
-                                        </svg>
-                                        <span class="font-medium">審核中</span>
-                                    </div>
-                                @elseif($member->isDisabilityRejected())
-                                    <div class="flex items-center text-red-700 dark:text-red-300">
-                                        <svg class="h-5 w-5 mr-1.5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" />
-                                        </svg>
-                                        <span class="font-medium">審核未通過</span>
-                                    </div>
-                                    <a href="{{ route('profile.edit') }}#disability" class="mt-1 text-sm text-indigo-600 dark:text-indigo-400 hover:underline">重新上傳</a>
-                                @else
-                                    <span class="text-gray-500 dark:text-gray-400">未申請</span>
-                                    <a href="{{ route('profile.edit') }}#disability" class="block mt-1 text-sm text-indigo-600 dark:text-indigo-400 hover:underline">上傳手冊享優惠</a>
-                                @endif
-                            </dd>
-                        </div>
                     </dl>
                 </div>
             </section>
@@ -214,6 +179,41 @@
                         @endif
                     </div>
 
+                    <div class="mt-4 overflow-hidden rounded-lg border border-gray-200 px-4 py-5 dark:border-gray-700 sm:p-6 {{ $member->hasApprovedDisability() ? 'bg-green-50 dark:bg-green-900/30' : 'bg-gray-50 dark:bg-gray-700' }}">
+                        <h4 class="text-sm font-medium text-gray-500 dark:text-gray-400">
+                            身心障礙身份
+                        </h4>
+                        <div class="mt-2 text-gray-900 dark:text-gray-100">
+                            @if($member->hasApprovedDisability())
+                                <div class="flex items-center text-green-700 dark:text-green-300">
+                                    <svg class="h-5 w-5 mr-1.5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
+                                    </svg>
+                                    <span class="font-medium">已審核通過</span>
+                                </div>
+                                <p class="mt-1 text-sm text-green-600 dark:text-green-400">會費套用 50% 優惠</p>
+                            @elseif($member->hasDisabilityCertificate() && $member->isDisabilityPending())
+                                <div class="flex items-center text-yellow-700 dark:text-yellow-300">
+                                    <svg class="h-5 w-5 mr-1.5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" />
+                                    </svg>
+                                    <span class="font-medium">審核中</span>
+                                </div>
+                            @elseif($member->isDisabilityRejected())
+                                <div class="flex items-center text-red-700 dark:text-red-300">
+                                    <svg class="h-5 w-5 mr-1.5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" />
+                                    </svg>
+                                    <span class="font-medium">審核未通過</span>
+                                </div>
+                                <a href="{{ route('profile.edit') }}#disability" class="mt-1 text-sm text-indigo-600 dark:text-indigo-400 hover:underline">重新上傳</a>
+                            @else
+                                <span class="text-gray-500 dark:text-gray-400">未申請</span>
+                                <a href="{{ route('profile.edit') }}#disability" class="block mt-1 text-sm text-indigo-600 dark:text-indigo-400 hover:underline">上傳手冊享優惠</a>
+                            @endif
+                        </div>
+                    </div>
+
                     <div class="mt-5 overflow-x-auto">
                         <table class="min-w-full divide-y divide-gray-200 dark:divide-gray-700" role="table">
                             <thead class="bg-gray-50 dark:bg-gray-700">