From 8a06b69a92b1b517a7fa3352b27adff585ec2874 Mon Sep 17 00:00:00 2001
From: rizwanisready <rizwanisready@gmail.com>
Date: Fri, 15 Mar 2024 17:03:46 +0530
Subject: [PATCH] 15-03-2024 4

---
 accounts/api/serializers.py                |  2 ++
 templates/manage_wallets/payment_list.html | 14 +++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/accounts/api/serializers.py b/accounts/api/serializers.py
index 38368fe..93bffa9 100644
--- a/accounts/api/serializers.py
+++ b/accounts/api/serializers.py
@@ -190,6 +190,8 @@ class ProfileSerializer(serializers.ModelSerializer):
             last_active_subscription = PrincipalSubscription.objects.filter(
                 principal=obj,
                 cancelled=False,
+                deleted=False,
+                active=True,
                 status=SubscriptionStatus.ACTIVE,
                 end_date__gte=today,
             ).latest("end_date")
diff --git a/templates/manage_wallets/payment_list.html b/templates/manage_wallets/payment_list.html
index 3c116c4..4fd0070 100644
--- a/templates/manage_wallets/payment_list.html
+++ b/templates/manage_wallets/payment_list.html
@@ -39,9 +39,9 @@
                                             <th class="text-center sorting" tabindex="0" aria-controls="style-3" rowspan="1"
                                                 colspan="1" aria-label="Image: activate to sort column ascending"
                                                 style="width: 44.2344px;">Principal Type</th>
-                                            <th class="text-center sorting" tabindex="0" aria-controls="style-3" rowspan="1"
+                                            <!-- <th class="text-center sorting" tabindex="0" aria-controls="style-3" rowspan="1"
                                                 colspan="1" aria-label="Image: activate to sort column ascending"
-                                                style="width: 44.2344px;">Princiapl Subscription</th>
+                                                style="width: 44.2344px;">Principal Subscription</th> -->
                                             <th class="sorting" tabindex="0" aria-controls="style-3" rowspan="1" colspan="1"
                                                 aria-label="Last Name: activate to sort column ascending"
                                                 style="width: 77.3281px;">Transaction Type</th>
@@ -54,9 +54,12 @@
                                             <th class="sorting" tabindex="0" aria-controls="style-3" rowspan="1" colspan="1"
                                                 aria-label="Mobile No.: activate to sort column ascending"
                                                 style="width: 98.875px;">Amount</th>
-                                            <th class="text-center sorting" tabindex="0" aria-controls="style-3" rowspan="1"
+                                            <th class="sorting" tabindex="0" aria-controls="style-3" rowspan="1" colspan="1"
+                                                aria-label="Mobile No.: activate to sort column ascending"
+                                                style="width: 98.875px;">Coins</th>
+                                            <!-- <th class="text-center sorting" tabindex="0" aria-controls="style-3" rowspan="1"
                                                 colspan="1" aria-label="Status: activate to sort column ascending"
-                                                style="width: 76.625px;">Comments</th>
+                                                style="width: 76.625px;">Comments</th> -->
                                             
                                         </tr>
                                     </thead>
@@ -68,11 +71,12 @@
                                             
                                             <td>{{transaction_obj.principal}}</td>
                                             <td>{{transaction_obj.principal.principal_type}}</td>
-                                            <td>{{transaction_obj.principal_subscription}}</td>
+                                            <!-- <td>{{transaction_obj.principal_subscription}}</td> -->
                                             <td>{{transaction_obj.transaction_type}}</td>
                                             <td>{{transaction_obj.payment_method}}</td>
                                             <td>{{transaction_obj.transaction_status}}</td>
                                             <td>{{transaction_obj.amount}}</td>                                           
+                                            <td>{{transaction_obj.coin}}</td>                                           
                                             
                                         </tr>
                                         {% endfor %}