From c650430f9ae400596707f836ceae572803c696fb Mon Sep 17 00:00:00 2001
From: yznahmad <jaradatgamer@gmail.com>
Date: Sun, 22 Jun 2025 08:46:05 +0300
Subject: [PATCH] Add 30 n123456885440000

---
 .../app/api/user/actions/statistics/route.ts  |  2 +-
 .../dashboard/members/membersList.tsx         | 46 +++++++++++--------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/webapp/src/app/api/user/actions/statistics/route.ts b/webapp/src/app/api/user/actions/statistics/route.ts
index c0b597b..0507a2b 100644
--- a/webapp/src/app/api/user/actions/statistics/route.ts
+++ b/webapp/src/app/api/user/actions/statistics/route.ts
@@ -25,7 +25,7 @@ export async function GET(req:Request)
         let expiredSubscriptionsCount : number = await memberModel.count({planExpAt_unix: {$lte : Math.floor(new Date().getTime() / 1000)}}) 
         let servicesCount : number = await servicesModel.count({})
         let activeServicesCount : number = await servicesModel.count({status: "active"})
-        let disActiveServicesCount : number = await servicesModel.count({status: "active"})
+        let disActiveServicesCount : number = await servicesModel.count({status: "inactive"})
         let servicesNameAndSubscribers :
             {
                 _id: Types.ObjectId,
diff --git a/webapp/src/components/dashboard/members/membersList.tsx b/webapp/src/components/dashboard/members/membersList.tsx
index 9abca25..e93eca7 100644
--- a/webapp/src/components/dashboard/members/membersList.tsx
+++ b/webapp/src/components/dashboard/members/membersList.tsx
@@ -38,6 +38,8 @@ export default function List()
                     <label htmlFor="email" className="relative text-gray-400 focus-within:text-gray-600 block">
                         <svg className="text-secondary dark:text-primary/50 cursor-pointer w-[15px] h-[15px] absolute top-1/2 transform -translate-y-1/2 rtl:left-3 ltr:right-3" width="19" height="19" viewBox="0 0 19 19" fill="none" xmlns="http://www.w3.org/2000/svg">
                             <path d="M18.4479 16.9688L14.9063 13.4375C16.0489 11.9817 16.669 10.184 16.6667 8.33334C16.6667 6.68516 16.1779 5.074 15.2623 3.70359C14.3466 2.33318 13.0451 1.26507 11.5224 0.634341C9.99965 0.00361068 8.32409 -0.161417 6.70759 0.160126C5.09108 0.48167 3.60622 1.27534 2.44078 2.44078C1.27534 3.60622 0.48167 5.09108 0.160126 6.70759C-0.161417 8.32409 0.00361068 9.99965 0.634341 11.5224C1.26507 13.0451 2.33318 14.3466 3.70359 15.2623C5.074 16.1779 6.68516 16.6667 8.33334 16.6667C10.184 16.669 11.9817 16.0489 13.4375 14.9063L16.9688 18.4479C17.0656 18.5456 17.1808 18.6231 17.3077 18.6759C17.4347 18.7288 17.5708 18.756 17.7083 18.756C17.8459 18.756 17.982 18.7288 18.1089 18.6759C18.2359 18.6231 18.3511 18.5456 18.4479 18.4479C18.5456 18.3511 18.6231 18.2359 18.6759 18.1089C18.7288 17.982 18.756 17.8459 18.756 17.7083C18.756 17.5708 18.7288 17.4347 18.6759 17.3077C18.6231 17.1808 18.5456 17.0656 18.4479 16.9688ZM2.08334 8.33334C2.08334 7.0972 2.44989 5.88883 3.13665 4.86102C3.82341 3.83322 4.79953 3.03214 5.94157 2.55909C7.0836 2.08604 8.34027 1.96227 9.55265 2.20343C10.765 2.44459 11.8787 3.03984 12.7528 3.91392C13.6268 4.788 14.2221 5.90164 14.4632 7.11402C14.7044 8.3264 14.5806 9.58307 14.1076 10.7251C13.6345 11.8671 12.8335 12.8433 11.8057 13.53C10.7778 14.2168 9.56947 14.5833 8.33334 14.5833C6.67573 14.5833 5.08602 13.9249 3.91392 12.7528C2.74182 11.5807 2.08334 9.99094 2.08334 8.33334Z" fill="currentColor"/>
+                            <circle cx="20" cy="29" r="2" fill="currentColor"/>
+                            <rect x="18" y="10" width="4" height="14" rx="2" fill="currentColor"/>
                         </svg>
                         <input onChange={(async(e) => {
                             if(e.target.value.length == 0)
@@ -125,30 +127,38 @@ export default function List()
                                         <span className="w-full text-start flex gap-2 whitespace-nowrap text-ellipsis overflow-hidden lg:block hidden">{v.payMonth} {appGeneralSettings.currencySymbol}</span>
                                         <span className="w-full text-start flex gap-2 whitespace-nowrap text-ellipsis overflow-hidden lg:block hidden">{v.planDelay + ' ' + t('months')}</span>
                                         <span className="w-full text-start flex gap-2 whitespace-nowrap text-ellipsis overflow-hidden">
-                                            {v.planExpAt_unix - (Date.now() / 1000) > 259200 ? 
-                                            <span className="flex gap-1 text-success">
-                                                <svg width="6" height="6" viewBox="0 0 6 6" fill="none" xmlns="http://www.w3.org/2000/svg">
-                                                    <rect y="2.79895" width="3.95833" height="3.95833" rx="1" transform="rotate(-45 0 2.79895)" fill="currentColor"/>
-                                                </svg>
-                                                {t('trueActive')}
-                                            </span>
-                                            : 
-                                            (
-                                                v.planExpAt_unix - (Date.now() / 1000) > 0 ?
-                                                <span className="flex gap-1 text-warning">
-                                                    <svg width="6" height="6" viewBox="0 0 6 6" fill="none" xmlns="http://www.w3.org/2000/svg">
-                                                        <rect y="2.79895" width="3.95833" height="3.95833" rx="1" transform="rotate(-45 0 2.79895)" fill="currentColor"/>
-                                                    </svg>
-                                                    {t('expireVerySoon')}
-                                                </span>
+                                            {v.active ? 
+                                                (v.planExpAt_unix - (Date.now() / 1000) > 259200 ? 
+                                                    <span className="flex gap-1 text-success">
+                                                        <svg width="6" height="6" viewBox="0 0 6 6" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                                            <rect y="2.79895" width="3.95833" height="3.95833" rx="1" transform="rotate(-45 0 2.79895)" fill="currentColor"/>
+                                                        </svg>
+                                                        {t('trueActive')}
+                                                    </span>
+                                                    : 
+                                                    (v.planExpAt_unix - (Date.now() / 1000) > 0 ?
+                                                        <span className="flex gap-1 text-warning">
+                                                            <svg width="6" height="6" viewBox="0 0 6 6" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                                                <rect y="2.79895" width="3.95833" height="3.95833" rx="1" transform="rotate(-45 0 2.79895)" fill="currentColor"/>
+                                                            </svg>
+                                                            {t('expireVerySoon')}
+                                                        </span>
+                                                        :
+                                                        <span className="flex gap-1 text-error">
+                                                            <svg width="6" height="6" viewBox="0 0 6 6" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                                                <rect y="2.79895" width="3.95833" height="3.95833" rx="1" transform="rotate(-45 0 2.79895)" fill="currentColor"/>
+                                                            </svg>
+                                                            {t('falseActive')}
+                                                        </span>
+                                                    )
+                                                )
                                                 :
                                                 <span className="flex gap-1 text-error">
                                                     <svg width="6" height="6" viewBox="0 0 6 6" fill="none" xmlns="http://www.w3.org/2000/svg">
                                                         <rect y="2.79895" width="3.95833" height="3.95833" rx="1" transform="rotate(-45 0 2.79895)" fill="currentColor"/>
                                                     </svg>
-                                                    {t('falseActive')}
+                                                    {t('inactive')}
                                                 </span>
-                                            )
                                             }
                                         </span>
                                         <span className="lg:w-full w-[100px] h-full text-start flex justify-start items-center gap-3">