Commit 0c32825a0699d09a79260a800b8ec0d691e53867
1 parent
36260480
add new promocode logic
Showing
1 changed file
with
5 additions
and
5 deletions
 
Show diff stats
src/lib/models/sales.php
| ... | ... | @@ -206,6 +206,7 @@ class sales extends \db | 
| 206 | 206 | public function updateData($data, $id) | 
| 207 | 207 | { | 
| 208 | 208 | |
| 209 | + | |
| 209 | 210 | return $this->exec( | 
| 210 | 211 | ' | 
| 211 | 212 | UPDATE | 
| ... | ... | @@ -344,13 +345,12 @@ class sales extends \db | 
| 344 | 345 | EXTRACT (DOY FROM end_date) | 
| 345 | 346 | OR | 
| 346 | 347 | ( | 
| 347 | - EXTRACT (DOY FROM start_date) >= EXTRACT (DOY FROM end_date) | |
| 348 | + EXTRACT (DOY FROM start_date) <= EXTRACT (DOY FROM end_date) | |
| 348 | 349 | AND | 
| 349 | - ( | |
| 350 | 350 | EXTRACT (DOY FROM NOW()) >= EXTRACT (DOY FROM start_date) | 
| 351 | - OR | |
| 352 | - EXTRACT (DOY FROM NOW()) < EXTRACT (DOY FROM end_date) | |
| 353 | - ) | |
| 351 | + AND | |
| 352 | + EXTRACT (DOY FROM NOW()) <= EXTRACT (DOY FROM end_date) | |
| 353 | + | |
| 354 | 354 | ) | 
| 355 | 355 | ) | 
| 356 | 356 | ) | ... | ... |