From 2e96ba936d07ce33eab0322e531d2fcc59094f7c Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Fri, 16 Sep 2016 02:01:06 +0300
Subject: [PATCH] big commti

---
 frontend/views/catalog/product.php | 81 ++++++++++++++++++++++++++++++++++++++++-----------------------------------------
 frontend/widgets/views/slider.php  | 36 +++++++++++++++++++++++++++++++++++-
 2 files changed, 75 insertions(+), 42 deletions(-)

diff --git a/frontend/views/catalog/product.php b/frontend/views/catalog/product.php
index 51fc2cb..8bb6323 100755
--- a/frontend/views/catalog/product.php
+++ b/frontend/views/catalog/product.php
@@ -144,6 +144,46 @@ FlipclockAsset::register($this);
                     </colgroup>
                     <tbody>
                     <tr>
+                        <?php foreach($product->events as $event):?>
+                            <?php if(!empty($event->end_at) && $event->isActive()):?>
+                                <div class="event_block">
+
+                                    <div class="event_title"> <?=  Html::a('Акция!!! '.$event->name,Url::to(['event/show','alias'=>$event->alias,'id'=>$event->primaryKey]))?></div>
+                                    <div class="event_time">До конца осталось:</div>
+                                    <div class="clock_<?= $event->primaryKey ?> clock_product_first "></div>
+                                    <script type="text/javascript">
+                                        var clock;
+
+                                        $(document).ready(function() {
+                                            var clock;
+
+                                            clock = $('.clock_<?= $event->primaryKey ?>').FlipClock({
+                                                clockFace: 'DailyCounter',
+                                                language: 'ru',
+                                                classes: {
+                                                    active: 'flip-clock-active',
+                                                    before: 'flip-clock-before',
+                                                    divider: 'flip-clock-divider',
+                                                    dot: 'flip-clock-dot',
+                                                    label: 'flip-clock-label',
+                                                    flip: 'flip',
+                                                    play: 'play',
+                                                    wrapper: 'flip-clock-wrapper'
+                                                },
+                                            });
+
+                                            clock.setTime(<?= strtotime($event->end_at) - strtotime(date("Y-m-d H:i:s"))?>);
+                                            clock.setCountdown(true);
+                                            clock.start();
+
+                                        });
+                                    </script>
+
+                                </div>
+                            <?php endif; ?>
+                        <?php endforeach; ?>
+                    </tr>
+                    <tr>
                         <td class="left_count available">
                             под заказ
                         </td>
@@ -211,47 +251,6 @@ FlipclockAsset::register($this);
                         </td>
                     </tr>
                     <tr>
-                        <?php foreach($product->events as $event):?>
-                            <?php if(!empty($event->end_at) && $event->isActive()):?>
-                                <div class="event_block">
-
-                                    <div class="event_title"> <?=  Html::a('Акция!!! '.$event->name,Url::to(['event/show','alias'=>$event->alias,'id'=>$event->primaryKey]))?></div>
-                                    <div class="event_time">До конца осталось:</div>
-                                    <div class="clock_<?= $event->primaryKey ?> clock_product_first "></div>
-                                    <script type="text/javascript">
-                                        var clock;
-
-                                        $(document).ready(function() {
-                                            var clock;
-
-                                            clock = $('.clock_<?= $event->primaryKey ?>').FlipClock({
-                                                clockFace: 'DailyCounter',
-                                                language: 'ru',
-                                                classes: {
-                                                    active: 'flip-clock-active',
-                                                    before: 'flip-clock-before',
-                                                    divider: 'flip-clock-divider',
-                                                    dot: 'flip-clock-dot',
-                                                    label: 'flip-clock-label',
-                                                    flip: 'flip',
-                                                    play: 'play',
-                                                    wrapper: 'flip-clock-wrapper'
-                                                },
-                                            });
-
-                                            clock.setTime(<?= strtotime($event->end_at) - strtotime(date("Y-m-d H:i:s"))?>);
-                                            clock.setCountdown(true);
-                                            clock.start();
-
-                                        });
-                                    </script>
-
-                                </div>
-                            <?php endif; ?>
-                        <?php endforeach; ?>
-
-                    </tr>
-                    <tr>
                         <td class="price_block">
                             <div class="price_block_container">
                                 
diff --git a/frontend/widgets/views/slider.php b/frontend/widgets/views/slider.php
index ece377f..c69b240 100755
--- a/frontend/widgets/views/slider.php
+++ b/frontend/widgets/views/slider.php
@@ -5,13 +5,47 @@ use common\models\Slider;
 use yii\helpers\Html;
 use yii\helpers\Url;
 use yii\web\View;
-
+use frontend\assets\FlipclockAsset;
 ?>
 
 
 <div id="<?=$title?>" class="owl-carousel owl-theme">
     <?php foreach($slider->sliderImage as $image):
 
+    if(!empty($image->end_at) && strtotime($row->end_at) > strtotime(date("Y-m-d"))){
+        ?>
+        <div class="clock_style clock_<?= $row->primaryKey ?>"></div>
+        <script type="text/javascript">
+            var clock;
+
+            $(document).ready(function() {
+                var clock;
+
+                clock = $('.clock_<?= $row->primaryKey ?>').FlipClock({
+                    clockFace: 'DailyCounter',
+                    language: 'ru',
+                    classes: {
+                        active: 'flip-clock-active',
+                        before: 'flip-clock-before',
+                        divider: 'flip-clock-divider',
+                        dot: 'flip-clock-dot',
+                        label: 'flip-clock-label',
+                        flip: 'flip',
+                        play: 'play',
+                        wrapper: 'flip-clock-wrapper'
+                    },
+                });
+
+                clock.setTime(<?= strtotime($row->end_at) - strtotime(date("Y-m-d H:i:s"))?>);
+                clock.setCountdown(true);
+                clock.start();
+
+            });
+        </script>
+
+
+    <?php
+    }
 
     ?>
     <div class="item">
--
libgit2 0.21.4