From 525bb4d16dc7057fa746d5e66c9c8ebb336466b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= <aurelien.delobelle@gmail.com>
Date: Mon, 15 Jan 2018 16:56:38 +0100
Subject: [PATCH] kfet -- Fix available checkouts in K-Psul

The checkout validity is checked using the current datetime (when
requesting the kpsul page).
---
 kfet/forms.py  | 16 ++++++++--------
 kfet/models.py |  9 +++++++++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/kfet/forms.py b/kfet/forms.py
index 963e4254..26774b1c 100644
--- a/kfet/forms.py
+++ b/kfet/forms.py
@@ -296,17 +296,17 @@ class KPsulAccountForm(forms.ModelForm):
 
 class KPsulCheckoutForm(forms.Form):
     checkout = forms.ModelChoiceField(
-        queryset=(
-            Checkout.objects
-            .filter(
-                is_protected=False,
-                valid_from__lte=timezone.now(),
-                valid_to__gte=timezone.now(),
-            )
-        ),
+        queryset=None,
         widget=forms.Select(attrs={'id': 'id_checkout_select'}),
     )
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # Create the queryset on form instanciation to use the current time.
+        self.fields['checkout'].queryset = (
+            Checkout.objects.is_valid().filter(is_protected=False))
+
 
 class KPsulOperationForm(forms.ModelForm):
     article = forms.ModelChoiceField(
diff --git a/kfet/models.py b/kfet/models.py
index deee76eb..c9de48bc 100644
--- a/kfet/models.py
+++ b/kfet/models.py
@@ -341,6 +341,13 @@ class AccountNegative(models.Model):
         return self.start + kfet_config.overdraft_duration
 
 
+class CheckoutQuerySet(models.QuerySet):
+
+    def is_valid(self):
+        now = timezone.now()
+        return self.filter(valid_from__lte=now, valid_to__gte=now)
+
+
 class Checkout(models.Model):
     created_by = models.ForeignKey(
         Account, on_delete = models.PROTECT,
@@ -353,6 +360,8 @@ class Checkout(models.Model):
         default = 0)
     is_protected = models.BooleanField(default = False)
 
+    objects = CheckoutQuerySet.as_manager()
+
     def get_absolute_url(self):
         return reverse('kfet.checkout.read', kwargs={'pk': self.pk})