From 792c8a8865aa8ec2b694abba1a5417ad091dc431 Mon Sep 17 00:00:00 2001
From: Mihail <tsurkanovm@gmail.com>
Date: Fri, 18 Dec 2015 17:15:05 +0200
Subject: [PATCH] work with goods one-item view

---
 frontend/controllers/GoodsController.php |  1 +
 frontend/views/goods/index.php           |  6 +++---
 frontend/views/goods/one_item.php        | 49 +++++++++++++++++++++++++++++++++++++++----------
 3 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/frontend/controllers/GoodsController.php b/frontend/controllers/GoodsController.php
index 217b726..51d0a50 100644
--- a/frontend/controllers/GoodsController.php
+++ b/frontend/controllers/GoodsController.php
@@ -23,6 +23,7 @@ class GoodsController extends Controller {
 
         $provider = new SqlDataProvider([
             'sql' => $query,
+            'key' => 'article',
             'pagination' => false,
             'params' => [':article' => '0092S40090',
                 ':brand' => 'BOSCH',
diff --git a/frontend/views/goods/index.php b/frontend/views/goods/index.php
index 59e6140..72802ab 100644
--- a/frontend/views/goods/index.php
+++ b/frontend/views/goods/index.php
@@ -118,7 +118,8 @@ $this->params['breadcrumbs'][] = $this->title;
         <p class="currency1  opposite1" id="dollars">грн</p>
         <p class="currency1 active_button_purple11" id="grivna">$</p>
         <table class="tovar_table" cellspacing="0" cellpadding="0" border="0">
-            <tbody><tr class="name">
+            <tbody>
+            <tr class="name">
                 <td class="small_width row_name">Фирма</td>
                 <td class="medium_width row_name">Номер детали</td>
                 <td class="large_width row_name">Описание</td>
@@ -144,8 +145,7 @@ $this->params['breadcrumbs'][] = $this->title;
                         <tbody>
 
 
-                        <tr class="one" style="border-bottom: 0;
-    border-top: 0;">
+                        <tr class="one" style="border-bottom: 0;border-top: 0;">
                             <td class="row_select" style="border-bottom: 0;
     border-top: 0;">
                                 <div class="lend-tovar-cart-left">
diff --git a/frontend/views/goods/one_item.php b/frontend/views/goods/one_item.php
index 729fd90..e2bfc0d 100644
--- a/frontend/views/goods/one_item.php
+++ b/frontend/views/goods/one_item.php
@@ -2,18 +2,47 @@
 use \yii\helpers\Html;
 
 $this->registerCssFile('/css/BC2_catalog_zapchasti.css');
+// если товар один и тот же то выводим только цену и кол-во
+// иначе всю информацию
+$new_good = false;
+//в провайдере в качестве ключей установлен - артикул
+$article_arr = $widget->dataProvider->getKeys();
+if ( empty($article_arr[$index - 1]) || $article_arr[$index - 1] != $key )
+    // если предыдущий артикул равен текущему, то это тот же товар
+    $new_good = true;
 ?>
 
-    <tr>
-        <td class="small_width"><?= $model['brand']?></td>
-        <td class="medium_width"><?= $model['article']?>
-            <img src="/images/favourite_notactive.png" class="favourite">
-            <img src="/images/favourite.png" class="pose">
-        </td>
-        <td class="large_width"><?= $model['description']?>
-            <a href=""><img src="/images/gear.png"></a>
-            <a href="" id="go_photo"><img src="/images/icon_cam.png"></a>
-        </td>
+<?php $this->beginBlock('item_details');
+// выделим отдельно детали товара в блок, для опционального его вывода
+?>
+<tr>
+    <td class="small_width"><?= $model['brand']?></td>
+    <td class="medium_width"><?= $model['article']?>
+        <img src="/images/favourite_notactive.png" class="favourite">
+        <img src="/images/favourite.png" class="pose">
+    </td>
+    <td class="large_width"><?= $model['description']?>
+        <a href=""><img src="/images/gear.png"></a>
+        <a href="" id="go_photo"><img src="/images/icon_cam.png"></a>
+    </td>
+<?php $this->endBlock(); ?>
+
+    <?php $this->beginBlock('empty_details');
+    // иначе пустой блок
+    ?>
+<tr style="border-bottom: 0;border-top: 0;">
+    <td colspan="3"></td>
+
+    <?php $this->endBlock(); ?>
+
+        <?php
+        if($new_good){
+            echo $this->blocks['item_details'];
+        }else{
+            echo $this->blocks['empty_details'];
+        }
+
+        ?>
         <td class="right">
             <table class="tovar_table right" cellspacing="0" cellpadding="0" border="0" style="border: 0;">
                 <tbody>
--
libgit2 0.21.4