Commit 91082289c5eb582f2416581ec60d07db36d89882
Merge branch 'master' into 'remote_work'
copy master See merge request !4
Showing
6 changed files
with
10 additions
and
6 deletions
Show diff stats
src/app/frontend/views/about_eng.php
src/app/frontend/views/about_ukr.php
src/app/frontend/views/landing.php
| 1 | -<!DOCTYPE html> | 1 | +<?php $in_cart = $this->session->get('in_cart', []); ?> |
| 2 | +<!DOCTYPE html> | ||
| 2 | <html xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html"> | 3 | <html xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html"> |
| 3 | <head> | 4 | <head> |
| 4 | <meta charset="utf-8"> | 5 | <meta charset="utf-8"> |
| @@ -102,7 +103,7 @@ | @@ -102,7 +103,7 @@ | ||
| 102 | </div> | 103 | </div> |
| 103 | <div class="float columns3 third_column last"> | 104 | <div class="float columns3 third_column last"> |
| 104 | <div class="clearfix"> | 105 | <div class="clearfix"> |
| 105 | - <div class="float basket_number float_right last"><a href="/basket/ru" title="Корзина">0</a></div> | 106 | + <div class="float basket_number float_right last"><a href="/basket/ru" title="Корзина"><?= !empty( $in_cart ) ? count( $in_cart ) : '0' ?></a></div> |
| 106 | 107 | ||
| 107 | <div class="float basket float_right"><a href="/basket/ru" title="Корзина" class="">Ваша корзина</a></div> | 108 | <div class="float basket float_right"><a href="/basket/ru" title="Корзина" class="">Ваша корзина</a></div> |
| 108 | <div class="float menu_cabinet float_right"><a href="/cabinet/ru" title="Личный кабинет" class="">Личный кабинет</a></div> </div> | 109 | <div class="float menu_cabinet float_right"><a href="/cabinet/ru" title="Личный кабинет" class="">Личный кабинет</a></div> </div> |
src/app/frontend/views/landing_ukr.php
| 1 | -<!DOCTYPE html> | 1 | +<?php $in_cart = $this->session->get('in_cart', []); ?> |
| 2 | +<!DOCTYPE html> | ||
| 2 | <html xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html"> | 3 | <html xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html"> |
| 3 | <head> | 4 | <head> |
| 4 | <meta charset="utf-8"> | 5 | <meta charset="utf-8"> |
| @@ -100,7 +101,7 @@ | @@ -100,7 +101,7 @@ | ||
| 100 | </div> | 101 | </div> |
| 101 | <div class="float columns3 third_column last"> | 102 | <div class="float columns3 third_column last"> |
| 102 | <div class="clearfix"> | 103 | <div class="clearfix"> |
| 103 | - <div class="float basket_number float_right last"><a href="/basket" title="Кошик">0</a></div> | 104 | + <div class="float basket_number float_right last"><a href="/basket" title="Кошик"><?= !empty( $in_cart ) ? count( $in_cart ) : '0' ?></a></div> |
| 104 | 105 | ||
| 105 | <div class="float basket float_right"><a href="/basket" title="Кошик" class="">Ваш кошик</a></div> | 106 | <div class="float basket float_right"><a href="/basket" title="Кошик" class="">Ваш кошик</a></div> |
| 106 | <div class="float menu_cabinet float_right"><a href="/cabinet" title="Особистий кабінет" class="">Особистий кабінет</a></div> </div> | 107 | <div class="float menu_cabinet float_right"><a href="/cabinet" title="Особистий кабінет" class="">Особистий кабінет</a></div> </div> |
src/app/frontend/views/partial/footer.php
| @@ -41,7 +41,7 @@ | @@ -41,7 +41,7 @@ | ||
| 41 | 41 | ||
| 42 | <script type="text/javascript" src="/js/jquery.maskedinput.js"></script> | 42 | <script type="text/javascript" src="/js/jquery.maskedinput.js"></script> |
| 43 | <script type="text/javascript"> | 43 | <script type="text/javascript"> |
| 44 | - $('.order_phone').mask('38(999) 999-9999'); | 44 | + $('.order_phone').mask('389999999999'); |
| 45 | </script> | 45 | </script> |
| 46 | 46 | ||
| 47 | <script src="/js/jquery.ui.widget.js"></script> | 47 | <script src="/js/jquery.ui.widget.js"></script> |
src/app/frontend/views/please_return.php