From c2c87f0c6228202734b73ba0e2fbbea28fe6b2fb Mon Sep 17 00:00:00 2001 From: Stefan van den Eertwegh <34129243+svandeneertwegh@users.noreply.github.com> Date: Mon, 22 Apr 2024 13:57:29 +0200 Subject: [PATCH] Fix get rules from order with option value instead of option code (#4269) * Fix get rules from order with option value instead of option code * Fix get rules from order with option value instead of option code * fixed reformat * change oscar-catalogue-menu and fixed some translation space was wrong * fixed reformat * change oscar-catalogue-menu and fixed some translation space was wrong * small change v2 --- src/oscar/apps/order/abstract_models.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/oscar/apps/order/abstract_models.py b/src/oscar/apps/order/abstract_models.py index f47ce3e433..ba8c6b3755 100644 --- a/src/oscar/apps/order/abstract_models.py +++ b/src/oscar/apps/order/abstract_models.py @@ -707,10 +707,11 @@ def description(self): value = attribute.value if isinstance(value, list): ops.append( - "%s = '%s'" % (attribute.type, (", ".join([str(v) for v in value]))) + "%s = '%s'" + % (attribute.option.name, (", ".join([str(v) for v in value]))) ) else: - ops.append("%s = '%s'" % (attribute.type, value)) + ops.append("%s = '%s'" % (attribute.option.name, value)) if ops: desc = "%s (%s)" % (desc, ", ".join(ops)) return desc