diff --git a/vendor/registrasion/registrasion/admin.py b/vendor/registrasion/registrasion/admin.py index 3967b0967040f4add4fe18171b73746e2c98e0eb..082046904b6b1a14611c07a0e6f358c64fbd06dc 100644 --- a/vendor/registrasion/registrasion/admin.py +++ b/vendor/registrasion/registrasion/admin.py @@ -143,6 +143,11 @@ class VoucherAdmin(nested_admin.NestedAdmin): ''' List the effects of the voucher in the admin. ''' out = [] + try: + voucher_condition = obj.voucherflag.condition + except ObjectDoesNotExist: + voucher_condition = None + try: discount_effects = obj.voucherdiscount.effects() except ObjectDoesNotExist: @@ -155,6 +160,8 @@ class VoucherAdmin(nested_admin.NestedAdmin): if discount_effects: out.append("Discounts: " + str(list(discount_effects))) + if voucher_condition: + out.append("Condition: " + obj.voucherflag.get_condition_display()) if enabling_effects: out.append("Enables: " + str(list(enabling_effects))) @@ -181,7 +188,7 @@ class ProductFlagAdmin( fields = ("description", "enabling_products", "condition", "products", "categories"), - list_display = ("description", "enablers", "effects") + list_display = ("description", "condition", "enablers", "effects") # Enabling conditions @@ -194,7 +201,7 @@ class CategoryFlagAdmin( fields = ("description", "enabling_category", "condition", "products", "categories"), - list_display = ("description", "enabling_category", "effects") + list_display = ("description", "condition", "enabling_category", "effects") ordering = ("enabling_category",) @@ -215,13 +222,14 @@ class GroupMemberFlagAdmin(admin.ModelAdmin, EffectsDisplayMixin): fields = ("description", "group", "products", "categories") - list_display = ("description", "effects") + list_display = ("description", "condition", "effects") @admin.register(conditions.TimeOrStockLimitFlag) class TimeOrStockLimitFlagAdmin(admin.ModelAdmin, EffectsDisplayMixin): list_display = ( "description", + "condition", "start_time", "end_time", "limit",