From 3969bc54dfeea7991120a7a625c850224dfe6cdb Mon Sep 17 00:00:00 2001 From: Niklas Fondberg Date: Thu, 27 May 2021 14:30:35 +0200 Subject: [PATCH] Use sku instead to see if it is a framed prints inquiry product (#40) --- api/lib/prices.py | 5 +++-- api/resources/prices.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/api/lib/prices.py b/api/lib/prices.py index 2558a40..4d351dd 100644 --- a/api/lib/prices.py +++ b/api/lib/prices.py @@ -470,7 +470,7 @@ def inquiry_price( rounded=False, inc_vat=False, ) - elif inquiry.product_group == "poster": + elif inquiry.product_group == "poster" and not sku: price = poster_price( width, height, @@ -482,7 +482,8 @@ def inquiry_price( rounded=False, inc_vat=False, ) - elif inquiry.product_group == "framed-print": + # Framed prints product group for inquires will be poster until addToCart but always has sku + elif sku: price = framed_print_price( sku=sku, market=inquiry.market, diff --git a/api/resources/prices.py b/api/resources/prices.py index a4a6c8e..ab80990 100644 --- a/api/resources/prices.py +++ b/api/resources/prices.py @@ -563,13 +563,14 @@ def inquiry_framed_print(inquiry): @mod.route("/inquiry/", methods=["GET"]) def inquiry(inquiry_id): inquiry = Inquiry.query.get_or_404(inquiry_id) + sku = request.args.get("sku", type=str) if inquiry.product_group == "photo-wallpaper": data = inquiry_wallpaper(inquiry) elif inquiry.product_group == "canvas": data = inquiry_canvas(inquiry) - elif inquiry.product_group == "poster": + elif inquiry.product_group == "poster" and not sku: data = inquiry_poster(inquiry) - elif inquiry.product_group == "framed-print": + elif sku: data = inquiry_framed_print(inquiry) else: raise ValueError("Invalid group {}".format(inquiry.product_group))