Alex Savenko / semena

Commit 9aaa5fa6c70bdaab6790d4697d85b0b4695e9559

Authored by Administrator
2 parents fa61b27c 00ab8017

Merge branch 'event' into 'master' 

Event

See merge request !2
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
Inline Side-by-side
src/app/frontend/views/partial/one_sale.php
  Show/Hide comments   View file @9aaa5fa
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <p><?= $sale['name'] ?></p> 10 <p><?= $sale['name'] ?></p>
11 <!--<span><?/*= $t->_('week_price') */?></span>--> 11 <!--<span><?/*= $t->_('week_price') */?></span>-->
12 <div class="end_sales"> 12 <div class="end_sales">
13 - <?= $sale['active'] ? $t->_('else') : 'через' ?> <span><?= $sale['diff'] ?></span> <?= $t->_('days') ?> 13 + <?= $sale['active'] ? $t->_('else') : 'через' ?> <span><?= $sale['diff'] ? $sale['diff']:1 ?></span> <?= $t->_('days') ?>
14 </div> 14 </div>
15 </div> 15 </div>
16 16
src/lib/models/sales.php
  Show/Hide comments   View file @9aaa5fa
@@ -312,7 +312,7 @@ class sales extends \db @@ -312,7 +312,7 @@ class sales extends \db
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 EXTRACT (DOY FROM end_date + INTERVAL '1' day) - EXTRACT (DOY FROM NOW()) 315 + THEN DATE_PART( 'day', (end_date + INTERVAL '1 day') - NOW() )
316 WHEN EXTRACT (DOY FROM start_date) >= EXTRACT (DOY FROM end_date) 316 WHEN EXTRACT (DOY FROM start_date) >= EXTRACT (DOY FROM end_date)
317 AND 317 AND
318 EXTRACT (DOY FROM NOW()) >= EXTRACT (DOY FROM start_date) 318 EXTRACT (DOY FROM NOW()) >= EXTRACT (DOY FROM start_date)