From 614bcf93a864dc2678465257fcd6c114f4044adf Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Tue, 10 Jan 2017 11:12:21 +0200 Subject: [PATCH] add local config --- src/lib/models/sales.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/lib/models/sales.php b/src/lib/models/sales.php index 0d42805..5aa9770 100644 --- a/src/lib/models/sales.php +++ b/src/lib/models/sales.php @@ -312,7 +312,14 @@ class sales extends \db EXTRACT (DOY FROM end_date + INTERVAL '1' day) OR EXTRACT (DOY FROM NOW()) < EXTRACT (DOY FROM end_date) - THEN DATE_PART( 'day', (end_date + INTERVAL '1 day') - NOW() ) + THEN DATE_PART( 'day', (end_date) - NOW() ) + WHEN EXTRACT (DOY FROM start_date) >= EXTRACT (DOY FROM end_date) + AND + EXTRACT (DOY FROM NOW()) >= EXTRACT (DOY FROM start_date) + /*OR + EXTRACT (DOY FROM NOW()) <= EXTRACT (DOY FROM end_date)*/ + THEN EXTRACT (DOY FROM (date_trunc('year', now()) - INTERVAL '1' day)::date) + - EXTRACT (DOY FROM NOW()) + EXTRACT (DOY FROM end_date + INTERVAL '1' day) end as diff, TRUE as active FROM -- libgit2 0.21.4