Commit b1e4e5771e3d5522fea0e235a5ab15f530ec7489
1 parent
031759ea
add local config
Showing
1 changed file
with
1 additions
and
8 deletions
Show diff stats
src/lib/models/sales.php
| @@ -311,15 +311,8 @@ class sales extends \db | @@ -311,15 +311,8 @@ class sales extends \db | ||
| 311 | AND | 311 | AND |
| 312 | EXTRACT (DOY FROM end_date + INTERVAL '1' day) | 312 | EXTRACT (DOY FROM end_date + INTERVAL '1' day) |
| 313 | OR | 313 | OR |
| 314 | - EXTRACT (DOY FROM NOW()) <= EXTRACT (DOY FROM end_date) | 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 + INTERVAL '1 day') - 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) | ||
| 323 | end as diff, | 316 | end as diff, |
| 324 | TRUE as active | 317 | TRUE as active |
| 325 | FROM | 318 | FROM |