From 48b8477b8e3ea8e29c5ab04bf67bc869d33e7c02 Mon Sep 17 00:00:00 2001 From: Jonas Braathen Date: Mon, 10 Aug 2015 00:10:53 +0200 Subject: [PATCH] Properly check if the activation code is still valid in has_pending_new_membership --- tekstmelding.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tekstmelding.py b/tekstmelding.py index 18ed98e..457716a 100644 --- a/tekstmelding.py +++ b/tekstmelding.py @@ -373,7 +373,7 @@ def has_pending_new_membership(number): WHERE incoming.msisdn = %s AND incoming.id = event.incoming_id AND event.action = 'new_membership' - AND event.timestamp > DATE_SUB(event.timestamp, INTERVAL 1 YEAR) + AND event.timestamp > DATE_SUB(CURDATE(), INTERVAL 1 YEAR) AND event2.incoming_id = event.incoming_id AND event2.action = 'new_membership_delivered') AND activation_code IS NOT NULL""", [number], one=True)