From 9dccb888f9c03b1837fef78ab089715263daaebd Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Wed, 27 Jul 2016 12:16:40 +0300
Subject: [PATCH] 090316

---
 src/app/frontend/controllers/DealerController.php |  4 +++-
 src/app/frontend/views/dealer/catalog.php         | 15 ---------------
 src/app/frontend/views/partial/popupCart.php      |  1 +
 www/css/main.css                                  |  6 ++++++
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/app/frontend/controllers/DealerController.php b/src/app/frontend/controllers/DealerController.php
index 8257e78..2956f06 100644
--- a/src/app/frontend/controllers/DealerController.php
+++ b/src/app/frontend/controllers/DealerController.php
@@ -1145,12 +1145,14 @@ class DealerController extends \controllers\ControllerBase
         }
         $special_user = $this->models->getSpecialUsers()->getOneData($special_users_id)[0];
         $special_users = $this->models->getSpecialUsers()->getAllData($this->lang_id, 0);
+        $stock_availability =  \config::get( 'frontend#stock_availability' );
         $this->view->setVars([
             'groups' => isset($groups_) ? $groups_ : null,
             'total' => count($groups),
             'special_user' => $special_user,
             'special_users' => $special_users,
-            'cart'          => json_encode($cart)
+            'cart'          => json_encode($cart),
+            'stock_availability' => $stock_availability
         ]);
 
         $this->view->pick('dealer/catalog');
diff --git a/src/app/frontend/views/dealer/catalog.php b/src/app/frontend/views/dealer/catalog.php
index 84263df..d47b4f9 100644
--- a/src/app/frontend/views/dealer/catalog.php
+++ b/src/app/frontend/views/dealer/catalog.php
@@ -74,21 +74,6 @@
         <?php if(isset($catalog['sub']['title'])) : ?>
         <h2 style="display: inline-block" class="catalog_header"><?= $catalog['sub']['title'] ?></h2>
         <?php endif; ?>
-        <div style="display: inline-block;margin-top: 20px;float: right">
-            <div class="sort_price float padding_60">
-                <span><?= $t->_("sort") ?>:</span>
-            </div>
-            <div class="sort_price float last">
-                <a href="#" title=""><?= in_array( 3, $sort ) ? $sortName[3] : (in_array( 4, $sort )? $sortName[4] :$sortName[5]) ?></a>
-                <div class="sort_price_dropdown display_none">
-                    <ul>
-                        <li><a href="<?= $this->seoUrl->setUrl($this->url->get($page_url_for_sort['3'])) ?>" title=""><?= $sortName[3] ?></a></li>
-                        <li><a href="<?= $this->seoUrl->setUrl($this->url->get($page_url_for_sort['4'])) ?>" title=""><?= $sortName[4] ?></a></li>
-                        <li><a href="<?= $this->seoUrl->setUrl($this->url->get($page_url_for_sort['5'])) ?>" title=""><?= $sortName[5] ?></a></li>
-                    </ul>
-                </div>
-            </div>
-        </div>
 
         <div class="block_content" style="width:100%;">
             <div class="catalog_captions">
diff --git a/src/app/frontend/views/partial/popupCart.php b/src/app/frontend/views/partial/popupCart.php
index b6e577c..27f5ca6 100644
--- a/src/app/frontend/views/partial/popupCart.php
+++ b/src/app/frontend/views/partial/popupCart.php
@@ -22,6 +22,7 @@
             </div>
             <div class="popup_footer">
                 <a href="#" style="float: left" id="help"><?= $t->_('need_help') ?></a>
+                <span class="min_price_message"><?=$t->_("min_price") ?></span>
                 <a href="#" class="cont_shop_but"><?= $t->_('continue_shopping') ?></a>
                 <a href="<?= $this->seoUrl->setUrl('/basket') ?>" class="green_but2"><?= $t->_('checkout') ?></a>
             </div>
diff --git a/www/css/main.css b/www/css/main.css
index ef1698b..6226320 100644
--- a/www/css/main.css
+++ b/www/css/main.css
@@ -3116,6 +3116,12 @@ ul.prof_rubrics li a.active{color:#ffffff;background:#4fa22c;border-radius:5px;t
     margin-left: 20px;
 }
 
+.popup_window_content .min_price_message{
+    font-size: 14px;
+    color: red !important;
+    float: left;
+}
+
 .zasobi_zakhistu_logo {
     background: url('/images/background_logo_all_01.png') repeat-y 50% -20px;
 }
--
libgit2 0.21.4