From d2390a3a630ab5bc0980673e26276d01a9ff9dde Mon Sep 17 00:00:00 2001
From: Alex <program.artweb@gmail.com>
Date: Wed, 21 Dec 2016 12:53:21 +0200
Subject: [PATCH] products pick

---
 src/app/backend/controllers/DiscountController.php |  2 +-
 src/app/backend/views/discount/addEdit.php         | 42 ++++++++++++++++++++++++++++++++++++++++++
 src/app/backend/views/promo_codes/addEdit.php      |  2 +-
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/app/backend/controllers/DiscountController.php b/src/app/backend/controllers/DiscountController.php
index 5177620..32f63cf 100644
--- a/src/app/backend/controllers/DiscountController.php
+++ b/src/app/backend/controllers/DiscountController.php
@@ -95,7 +95,7 @@ class DiscountController extends Controller
             }
             else {
 
-                $this->flash->error( 'Выберите товары для промокода' );
+                $this->flash->error( 'Выберите товары на которые распространяется скидка' );
 
             }
         }
diff --git a/src/app/backend/views/discount/addEdit.php b/src/app/backend/views/discount/addEdit.php
index 3de7751..6ae16c4 100644
--- a/src/app/backend/views/discount/addEdit.php
+++ b/src/app/backend/views/discount/addEdit.php
@@ -50,6 +50,48 @@
                                 </div>
                             </div>
 
+                            <div class="clearfix input_wrapper">
+                                <div class="label"><label for="catalog">Категории товаров</label></div>
+                                <div class="input">
+                                    <select class="catalog" id="catalog">
+                                        <option selected label=" "></option>
+                                        <?php foreach($catalog_temp as $group): ?>
+                                            <option value="<?= $group['id'] ?>"><?= $group['title'] ?></option>
+                                        <?php endforeach; ?>
+                                    </select>
+                                </div>
+                                <button type="button" id="apply_filter">Применить</button>
+                                <div class="input">
+                                    <div>Цена</div>
+                                    <label for="from_price">От</label>
+                                    <input type="text" id="from_price">
+                                    <label for="to_price">До</label>
+                                    <input type="text" id="to_price">
+                                </div>
+                                <div class="filter">
+
+                                </div>
+                            </div>
+
+
+                            <div class="clearfix input_wrapper products">
+
+                            </div>
+
+                            <div class="clearfix input_wrapper chose_items">
+                                <?php if(isset($groups) && !empty($groups)): ?>
+                                    <?php foreach($groups as $group): ?>
+                                        <div>
+                                            <label>
+                                                <input disabled checked style="display:inline-block" id="items" name="items[]" class="items" type="checkbox"
+                                                       value="<?= $group['id'] ?>"> <?= $group['title'] ?> <?= $group['size'] ?> <?= $group['price2'] ?> грн.
+                                            </label>
+                                            <button type="button" class="delete_item">Удалить</button>
+                                        </div>
+                                    <?php endforeach; ?>
+                                <?php endif; ?>
+                            </div>
+
                             <div class="clearfix submit_wrapper">
                                 <a href="<?= $this->url->get([ 'for' => 'discount_index' ]) ?>" class="news_cancel float">Отмена</a>
                                 <input type="submit" class="news_submit float" name="save" value="Сохранить">
diff --git a/src/app/backend/views/promo_codes/addEdit.php b/src/app/backend/views/promo_codes/addEdit.php
index 4b05241..4ca6f28 100644
--- a/src/app/backend/views/promo_codes/addEdit.php
+++ b/src/app/backend/views/promo_codes/addEdit.php
@@ -273,7 +273,7 @@
         parent.append(items);
     }
 
-    /* var data = JSON.parse('<?php //echo json_encode($catalog_temp); ?>');*/
+    // var data = JSON.parse("<?php //echo json_encode($catalog_temp); ?>");
 
     /*$('#name').autocomplete({
         minLength: 2,
--
libgit2 0.21.4