Rizwan.Shaikh/goodtimes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

15-03-2024 4

Browse Source
This commit is contained in:
rizwanisready
2024-03-15 17:03:46 +05:30
parent 0231b89499
commit 8a06b69a92
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/api/serializers.py
View File

@@ -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")

14
templates/manage_wallets/payment_list.html
View File

@@ -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 %}