Commit 614bcf93a864dc2678465257fcd6c114f4044adf

Authored by Administrator
1 parent b1e4e577

add local config

Showing 1 changed file with 8 additions and 1 deletions   Show diff stats
src/lib/models/sales.php
... ... @@ -312,7 +312,14 @@ class sales extends \db
312 312 EXTRACT (DOY FROM end_date + INTERVAL '1' day)
313 313 OR
314 314 EXTRACT (DOY FROM NOW()) < EXTRACT (DOY FROM end_date)
315   - THEN DATE_PART( 'day', (end_date + INTERVAL '1 day') - NOW() )
  315 + THEN DATE_PART( 'day', (end_date) - NOW() )
  316 + WHEN EXTRACT (DOY FROM start_date) >= EXTRACT (DOY FROM end_date)
  317 + AND
  318 + EXTRACT (DOY FROM NOW()) >= EXTRACT (DOY FROM start_date)
  319 + /*OR
  320 + EXTRACT (DOY FROM NOW()) <= EXTRACT (DOY FROM end_date)*/
  321 + THEN EXTRACT (DOY FROM (date_trunc('year', now()) - INTERVAL '1' day)::date)
  322 + - EXTRACT (DOY FROM NOW()) + EXTRACT (DOY FROM end_date + INTERVAL '1' day)
316 323 end as diff,
317 324 TRUE as active
318 325 FROM
... ...