diff --git a/billing/admin.py b/billing/admin.py index becf3cb..19fd08d 100644 --- a/billing/admin.py +++ b/billing/admin.py @@ -26,8 +26,11 @@ class TopupAdmin(admin.ModelAdmin): "paid", "paid_at", "created_at", + "is_expired", + "expires_at", "updated_at", ) + search_fields = ( "user__first_name", "user__last_name", @@ -35,6 +38,10 @@ class TopupAdmin(admin.ModelAdmin): "user__mobile", ) + @admin.display(boolean=True, description="Expired") + def is_expired(self, obj): + return obj.is_expired + admin.site.register(Payment, PaymentAdmin) admin.site.register(BillFormula) diff --git a/billing/serializers.py b/billing/serializers.py index 44dcc5c..8b613a8 100644 --- a/billing/serializers.py +++ b/billing/serializers.py @@ -21,6 +21,7 @@ class UpdatePaymentSerializer(serializers.ModelSerializer): class TopupSerializer(serializers.ModelSerializer): user = serializers.SerializerMethodField() + is_expired = serializers.SerializerMethodField() def get_user(self, obj): user = obj.user @@ -33,6 +34,9 @@ class TopupSerializer(serializers.ModelSerializer): } return None + def get_is_expired(self, obj): + return obj.is_expired + class Meta: # type: ignore model = Topup fields = [ @@ -41,6 +45,7 @@ class TopupSerializer(serializers.ModelSerializer): "user", "paid", "mib_reference", + "is_expired", "created_at", "updated_at", ]