From 1165fa8cdbae10134e0bcf52c34a38398d3880a0 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 9 Sep 2019 19:10:05 -0500 Subject: [PATCH] Show product image from database, if it exists only use POD image if we have nothing in our DB (and config doesn't say not to) --- tailbone/views/products.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/tailbone/views/products.py b/tailbone/views/products.py index 028baf95..c3265efd 100644 --- a/tailbone/views/products.py +++ b/tailbone/views/products.py @@ -887,11 +887,22 @@ class ProductsView(MasterView): return pretty_quantity(value) def template_kwargs_view(self, **kwargs): - kwargs['image'] = False product = kwargs['instance'] - if product.upc: - kwargs['image_url'] = pod.get_image_url(self.rattail_config, product.upc) - kwargs['image_path'] = pod.get_image_path(self.rattail_config, product.upc) + + # TODO: pretty sure this is no longer needed? guess we'll find out + # kwargs['image'] = False + + # maybe provide image URL for product; we prefer image from our DB if + # present, but otherwise a "POD" image URL can be attempted. + if product.image: + kwargs['image_url'] = self.request.route_url('products.image', uuid=product.uuid) + + elif product.upc: + if self.rattail_config.getbool('tailbone', 'products.show_pod_image', default=False): + # here we try to give a URL to a so-called "POD" image for the product + kwargs['image_url'] = pod.get_image_url(self.rattail_config, product.upc) + kwargs['image_path'] = pod.get_image_path(self.rattail_config, product.upc) + kwargs['costs_label_preferred'] = "Pref." kwargs['costs_label_vendor'] = "Vendor" kwargs['costs_label_code'] = "Order Code"