Commit 9dccb888f9c03b1837fef78ab089715263daaebd
1 parent
d5a88313
090316
Showing
4 changed files
with
10 additions
and
16 deletions
Show diff stats
src/app/frontend/controllers/DealerController.php
@@ -1145,12 +1145,14 @@ class DealerController extends \controllers\ControllerBase | @@ -1145,12 +1145,14 @@ class DealerController extends \controllers\ControllerBase | ||
1145 | } | 1145 | } |
1146 | $special_user = $this->models->getSpecialUsers()->getOneData($special_users_id)[0]; | 1146 | $special_user = $this->models->getSpecialUsers()->getOneData($special_users_id)[0]; |
1147 | $special_users = $this->models->getSpecialUsers()->getAllData($this->lang_id, 0); | 1147 | $special_users = $this->models->getSpecialUsers()->getAllData($this->lang_id, 0); |
1148 | + $stock_availability = \config::get( 'frontend#stock_availability' ); | ||
1148 | $this->view->setVars([ | 1149 | $this->view->setVars([ |
1149 | 'groups' => isset($groups_) ? $groups_ : null, | 1150 | 'groups' => isset($groups_) ? $groups_ : null, |
1150 | 'total' => count($groups), | 1151 | 'total' => count($groups), |
1151 | 'special_user' => $special_user, | 1152 | 'special_user' => $special_user, |
1152 | 'special_users' => $special_users, | 1153 | 'special_users' => $special_users, |
1153 | - 'cart' => json_encode($cart) | 1154 | + 'cart' => json_encode($cart), |
1155 | + 'stock_availability' => $stock_availability | ||
1154 | ]); | 1156 | ]); |
1155 | 1157 | ||
1156 | $this->view->pick('dealer/catalog'); | 1158 | $this->view->pick('dealer/catalog'); |
src/app/frontend/views/dealer/catalog.php
@@ -74,21 +74,6 @@ | @@ -74,21 +74,6 @@ | ||
74 | <?php if(isset($catalog['sub']['title'])) : ?> | 74 | <?php if(isset($catalog['sub']['title'])) : ?> |
75 | <h2 style="display: inline-block" class="catalog_header"><?= $catalog['sub']['title'] ?></h2> | 75 | <h2 style="display: inline-block" class="catalog_header"><?= $catalog['sub']['title'] ?></h2> |
76 | <?php endif; ?> | 76 | <?php endif; ?> |
77 | - <div style="display: inline-block;margin-top: 20px;float: right"> | ||
78 | - <div class="sort_price float padding_60"> | ||
79 | - <span><?= $t->_("sort") ?>:</span> | ||
80 | - </div> | ||
81 | - <div class="sort_price float last"> | ||
82 | - <a href="#" title=""><?= in_array( 3, $sort ) ? $sortName[3] : (in_array( 4, $sort )? $sortName[4] :$sortName[5]) ?></a> | ||
83 | - <div class="sort_price_dropdown display_none"> | ||
84 | - <ul> | ||
85 | - <li><a href="<?= $this->seoUrl->setUrl($this->url->get($page_url_for_sort['3'])) ?>" title=""><?= $sortName[3] ?></a></li> | ||
86 | - <li><a href="<?= $this->seoUrl->setUrl($this->url->get($page_url_for_sort['4'])) ?>" title=""><?= $sortName[4] ?></a></li> | ||
87 | - <li><a href="<?= $this->seoUrl->setUrl($this->url->get($page_url_for_sort['5'])) ?>" title=""><?= $sortName[5] ?></a></li> | ||
88 | - </ul> | ||
89 | - </div> | ||
90 | - </div> | ||
91 | - </div> | ||
92 | 77 | ||
93 | <div class="block_content" style="width:100%;"> | 78 | <div class="block_content" style="width:100%;"> |
94 | <div class="catalog_captions"> | 79 | <div class="catalog_captions"> |
src/app/frontend/views/partial/popupCart.php
@@ -22,6 +22,7 @@ | @@ -22,6 +22,7 @@ | ||
22 | </div> | 22 | </div> |
23 | <div class="popup_footer"> | 23 | <div class="popup_footer"> |
24 | <a href="#" style="float: left" id="help"><?= $t->_('need_help') ?></a> | 24 | <a href="#" style="float: left" id="help"><?= $t->_('need_help') ?></a> |
25 | + <span class="min_price_message"><?=$t->_("min_price") ?></span> | ||
25 | <a href="#" class="cont_shop_but"><?= $t->_('continue_shopping') ?></a> | 26 | <a href="#" class="cont_shop_but"><?= $t->_('continue_shopping') ?></a> |
26 | <a href="<?= $this->seoUrl->setUrl('/basket') ?>" class="green_but2"><?= $t->_('checkout') ?></a> | 27 | <a href="<?= $this->seoUrl->setUrl('/basket') ?>" class="green_but2"><?= $t->_('checkout') ?></a> |
27 | </div> | 28 | </div> |
www/css/main.css
@@ -3116,6 +3116,12 @@ ul.prof_rubrics li a.active{color:#ffffff;background:#4fa22c;border-radius:5px;t | @@ -3116,6 +3116,12 @@ ul.prof_rubrics li a.active{color:#ffffff;background:#4fa22c;border-radius:5px;t | ||
3116 | margin-left: 20px; | 3116 | margin-left: 20px; |
3117 | } | 3117 | } |
3118 | 3118 | ||
3119 | +.popup_window_content .min_price_message{ | ||
3120 | + font-size: 14px; | ||
3121 | + color: red !important; | ||
3122 | + float: left; | ||
3123 | +} | ||
3124 | + | ||
3119 | .zasobi_zakhistu_logo { | 3125 | .zasobi_zakhistu_logo { |
3120 | background: url('/images/background_logo_all_01.png') repeat-y 50% -20px; | 3126 | background: url('/images/background_logo_all_01.png') repeat-y 50% -20px; |
3121 | } | 3127 | } |