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 @@ Principal Type - Princiapl Subscription + style="width: 44.2344px;">Principal Subscription --> Transaction Type @@ -54,9 +54,12 @@ Amount - Coins + @@ -68,11 +71,12 @@ {{transaction_obj.principal}} {{transaction_obj.principal.principal_type}} - {{transaction_obj.principal_subscription}} + {{transaction_obj.transaction_type}} {{transaction_obj.payment_method}} {{transaction_obj.transaction_status}} {{transaction_obj.amount}} + {{transaction_obj.coin}} {% endfor %}