From 77422417ec5265a09f97159f7210dfcfbf780b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Thu, 25 Aug 2016 00:10:13 +0200 Subject: [PATCH] Fix products not available for purchased anymore --- shop/models.py | 10 ++++++++++ shop/templates/product_detail.html | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/shop/models.py b/shop/models.py index 2dd1aa86..0efe2e2b 100644 --- a/shop/models.py +++ b/shop/models.py @@ -282,6 +282,16 @@ class Product(CreatedUpdatedModel, UUIDModel): now = timezone.now() return now in self.available_in + def is_old(self): + now = timezone.now() + if hasattr(self.available_in, 'upper') and self.available_in.upper: + return self.available_in.upper < now + return False + + def is_upcoming(self): + now = timezone.now() + return self.available_in.lower > now + class OrderProductRelation(CreatedUpdatedModel): order = models.ForeignKey('shop.Order') diff --git a/shop/templates/product_detail.html b/shop/templates/product_detail.html index a5408361..66429795 100644 --- a/shop/templates/product_detail.html +++ b/shop/templates/product_detail.html @@ -40,8 +40,12 @@ {% else %}

+ {% if product.is_old %} + This product is not available anymore. + {% elif product.is_upcoming %} This product is available from {{ product.available_in.lower|date:"Y-m-d H:i T" }} + {% endif %}

{% endif %}