From ff2cc4914ef2b78ab7f60c7bb6aad52a14e8aaa2 Mon Sep 17 00:00:00 2001 From: Nikolai R Kristiansen Date: Tue, 16 Aug 2016 21:18:41 +0200 Subject: [PATCH] api: fix card.has_valid_membership logic --- api/api_functions.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/api/api_functions.php b/api/api_functions.php index 321c854..e6453eb 100644 --- a/api/api_functions.php +++ b/api/api_functions.php @@ -162,13 +162,15 @@ function get_card($card_number) { $card = $res[0]; /* Set expiry date */ - $card['expires'] = date_format(date_modify(date_create($card['registered']), "+1 year"), "Y-m-d"); + $expires = date_modify(date_create($card['registered']), "+1 year"); if($card['owner_membership_trial']) { /* First of january next year, relative to registered date */ - $card['expires'] = date_format(date_modify(date_create($card['registered']), "first day of january next year"), "Y-m-d"); + $expires = date_modify(date_create($card['registered']), "first day of january next year"); } + $card['expires'] = date_format($expires, "Y-m-d"); + /* Set is valid flag */ - $card['has_valid_membership'] = $card['owner_phone_number'] && $card['expires'] <= date_create() ? "1": "0"; + $card['has_valid_membership'] = $card['owner_phone_number'] && $expires >= date_create('today') ? "1": "0"; return $card;