Commit bff655793cda4f52747080560a8f4ac4e86ef823
1 parent
82f961f9
test commit
Showing
10 changed files
with
444 additions
and
283 deletions
Show diff stats
common/modules/comment/models/CommentModel.php
| @@ -166,17 +166,17 @@ | @@ -166,17 +166,17 @@ | ||
| 166 | ]; | 166 | ]; |
| 167 | } | 167 | } |
| 168 | 168 | ||
| 169 | - function setEntity(string $entity) | 169 | + function setEntity( $entity) |
| 170 | { | 170 | { |
| 171 | $this->entity = $entity; | 171 | $this->entity = $entity; |
| 172 | } | 172 | } |
| 173 | 173 | ||
| 174 | - function getEntity(): string | 174 | + function getEntity() |
| 175 | { | 175 | { |
| 176 | return $this->entity; | 176 | return $this->entity; |
| 177 | } | 177 | } |
| 178 | 178 | ||
| 179 | - static function getTree(string $entity, int $entityId): ActiveDataProvider | 179 | + static function getTree( $entity, $entityId) |
| 180 | { | 180 | { |
| 181 | return new ActiveDataProvider([ | 181 | return new ActiveDataProvider([ |
| 182 | 'query' => self::find() | 182 | 'query' => self::find() |
| @@ -202,7 +202,7 @@ | @@ -202,7 +202,7 @@ | ||
| 202 | ]); | 202 | ]); |
| 203 | } | 203 | } |
| 204 | 204 | ||
| 205 | - function deleteComment(): bool { | 205 | + function deleteComment() { |
| 206 | if(\Yii::$app->user->id != NULL && \Yii::$app->user->id == $this->user_id) { | 206 | if(\Yii::$app->user->id != NULL && \Yii::$app->user->id == $this->user_id) { |
| 207 | if($this->delete()) { | 207 | if($this->delete()) { |
| 208 | return true; | 208 | return true; |
| @@ -211,12 +211,12 @@ | @@ -211,12 +211,12 @@ | ||
| 211 | return false; | 211 | return false; |
| 212 | } | 212 | } |
| 213 | 213 | ||
| 214 | - function setEntityId(int $entityId) | 214 | + function setEntityId( $entityId) |
| 215 | { | 215 | { |
| 216 | $this->entityId = $entityId; | 216 | $this->entityId = $entityId; |
| 217 | } | 217 | } |
| 218 | 218 | ||
| 219 | - function getEntityId(): int | 219 | + function getEntityId() |
| 220 | { | 220 | { |
| 221 | return $this->entityId; | 221 | return $this->entityId; |
| 222 | } | 222 | } |
common/modules/comment/models/interfaces/CommentInterface.php
| @@ -10,14 +10,14 @@ | @@ -10,14 +10,14 @@ | ||
| 10 | */ | 10 | */ |
| 11 | interface CommentInterface | 11 | interface CommentInterface |
| 12 | { | 12 | { |
| 13 | - function setEntity(string $entity); | 13 | + function setEntity( $entity); |
| 14 | 14 | ||
| 15 | - function getEntity(): string; | 15 | + function getEntity(); |
| 16 | 16 | ||
| 17 | - function setEntityId(int $entityId); | 17 | + function setEntityId( $entityId); |
| 18 | 18 | ||
| 19 | - function getEntityId(): int; | 19 | + function getEntityId(); |
| 20 | 20 | ||
| 21 | - static function getTree(string $entity, int $entityId): ActiveDataProvider; | 21 | + static function getTree( $entity, $entityId); |
| 22 | 22 | ||
| 23 | } | 23 | } |
| 24 | \ No newline at end of file | 24 | \ No newline at end of file |
common/modules/comment/widgets/CommentWidget.php
| @@ -357,7 +357,7 @@ | @@ -357,7 +357,7 @@ | ||
| 357 | $this->model = $model; | 357 | $this->model = $model; |
| 358 | } | 358 | } |
| 359 | 359 | ||
| 360 | - public function getModel(): \yii\base\Model | 360 | + public function getModel() |
| 361 | { | 361 | { |
| 362 | if(!empty( $this->model )) { | 362 | if(!empty( $this->model )) { |
| 363 | return $this->model; | 363 | return $this->model; |
common/modules/product/widgets/views/product_smart.php
| @@ -5,8 +5,14 @@ | @@ -5,8 +5,14 @@ | ||
| 5 | use yii\helpers\Html; | 5 | use yii\helpers\Html; |
| 6 | use yii\helpers\Url; | 6 | use yii\helpers\Url; |
| 7 | ?> | 7 | ?> |
| 8 | -<div class="catalog_item"> | 8 | +<div class="catalog_item home_slider_it"> |
| 9 | <div class="wrapper"> | 9 | <div class="wrapper"> |
| 10 | + <div class="status_block-wr"> | ||
| 11 | + <div class="staus_new"></div> | ||
| 12 | + <!--статусы--> | ||
| 13 | +<!-- <div class="staus_hit"></div>--> | ||
| 14 | +<!-- <div class="status_sale">-60%</div>--> | ||
| 15 | + </div> | ||
| 10 | <div class="item_container" > | 16 | <div class="item_container" > |
| 11 | <input class="prodInfo" type="hidden" value="[]"> | 17 | <input class="prodInfo" type="hidden" value="[]"> |
| 12 | 18 |
frontend/assets/AppAsset.php
| @@ -26,7 +26,7 @@ class AppAsset extends AssetBundle | @@ -26,7 +26,7 @@ class AppAsset extends AssetBundle | ||
| 26 | //'js/js_head.js', | 26 | //'js/js_head.js', |
| 27 | //'js/js_footer.js', | 27 | //'js/js_footer.js', |
| 28 | '/js/artbox_basket.js', | 28 | '/js/artbox_basket.js', |
| 29 | -// 'js/script.js', | 29 | + 'js/script.js', |
| 30 | 'js/new_script.js', | 30 | 'js/new_script.js', |
| 31 | ]; | 31 | ]; |
| 32 | public $depends = [ | 32 | public $depends = [ |
frontend/views/catalog/product.php
| @@ -25,22 +25,21 @@ | @@ -25,22 +25,21 @@ | ||
| 25 | $this->params[ 'breadcrumbs' ][] = $product->fullname . ' #' . $product->enabledVariants[ 0 ]->sku; | 25 | $this->params[ 'breadcrumbs' ][] = $product->fullname . ' #' . $product->enabledVariants[ 0 ]->sku; |
| 26 | ?> | 26 | ?> |
| 27 | <!-- Табы для слайдера --> | 27 | <!-- Табы для слайдера --> |
| 28 | -<div class="bigSlidertabs fixed" style="position:fixed;"> | ||
| 29 | - <div class="block-100"> | ||
| 30 | - <div class="tab1"> | ||
| 31 | - <a href="actionlist.htm"> | ||
| 32 | - <div class="tab_bg_1"></div> | ||
| 33 | - <p>В данный момент у нас проходит <a href="actionlist.htm">25 акций</p></a> | ||
| 34 | - </a> | ||
| 35 | - </div> | ||
| 36 | - <!-- | ||
| 37 | - <div class="tab2" style="display: none;"> | ||
| 38 | - <div class="tab_bg_2"></div> | ||
| 39 | - <p>Поступило на продажу <a href="#">10 новинок</a></p> | ||
| 40 | - </div> | ||
| 41 | - --> | ||
| 42 | - </div> | ||
| 43 | -</div> | 28 | +<!--<div class="bigSlidertabs fixed" style="position:fixed;">--> |
| 29 | +<!-- <div class="block-100">--> | ||
| 30 | +<!-- <div class="tab1">--> | ||
| 31 | +<!-- <a href="actionlist.htm">--> | ||
| 32 | +<!-- <div class="tab_bg_1"></div>--> | ||
| 33 | +<!-- <p>В данный момент у нас проходит <a href="actionlist.htm">25 акций</p></a>--> | ||
| 34 | +<!-- </a>--> | ||
| 35 | +<!-- </div>--> | ||
| 36 | +<!-- <!----> | ||
| 37 | +<!-- <div class="tab2" style="display: none;">--> | ||
| 38 | +<!-- <div class="tab_bg_2"></div>--> | ||
| 39 | +<!-- <p>Поступило на продажу <a href="#">10 новинок</a></p>--> | ||
| 40 | +<!-- </div>--> | ||
| 41 | +<!-- </div>--> | ||
| 42 | +<!--</div>--> | ||
| 44 | 43 | ||
| 45 | <div class="wrapper white item_container"> | 44 | <div class="wrapper white item_container"> |
| 46 | <div class="container"> | 45 | <div class="container"> |
frontend/views/layouts/main.php
| @@ -59,6 +59,7 @@ AppAsset::register($this); | @@ -59,6 +59,7 @@ AppAsset::register($this); | ||
| 59 | </div> | 59 | </div> |
| 60 | </div> | 60 | </div> |
| 61 | 61 | ||
| 62 | + | ||
| 62 | <!-- Add your site or application content here --> | 63 | <!-- Add your site or application content here --> |
| 63 | <div id="top-nav-wrapper"> | 64 | <div id="top-nav-wrapper"> |
| 64 | <div id="top-nav"> | 65 | <div id="top-nav"> |
| @@ -433,6 +434,9 @@ AppAsset::register($this); | @@ -433,6 +434,9 @@ AppAsset::register($this); | ||
| 433 | </div> | 434 | </div> |
| 434 | </footer> | 435 | </footer> |
| 435 | 436 | ||
| 437 | + <div class="btn-fixeds fixed-events"><a href="#">акции</a></div> | ||
| 438 | + <div class="btn-fixeds fixed-sale"><a href="#">Распродажа</a></div> | ||
| 439 | + | ||
| 436 | <!-- <div class="up_arr">--> | 440 | <!-- <div class="up_arr">--> |
| 437 | <!-- <a href="#">--> | 441 | <!-- <a href="#">--> |
| 438 | <!-- <span class="icon"></span>--> | 442 | <!-- <span class="icon"></span>--> |
frontend/web/css/comments.css
| 1 | -@import "https://fonts.googleapis.com/css?family=Roboto:400,700,500&subset=cyrillic-ext,latin,cyrillic,latin-ext";.input_bl,.area_bl,.form-comm-wr,.user_name,.user_txt,.comment-panel,.answer-form,.comments-start input,.comments-start textarea,.submit_btn button,.input_bl label{box-sizing:border-box}.comments-border{width:100%;margin-top:25px;margin-bottom:27px;height:1px;background:#d2d2d2}.comments-start{width:730px;margin:0 auto;font-family:'Roboto',sans-serif;font-weight:400;color:#333}.form-comm-wr{width:100%;background:#f5f5f5;padding:20px;float:left}.input_bl{margin-top:15px;float:left}.area_bl,.input_bl{position:relative}.input_bl input,.input_bl textarea,.answer-form textarea{width:258px;height:30px;border:1px solid #d2d2d2;background:#fff;outline:none!important;border-radius:4px;padding-left:10px}.area_bl textarea,.answer-form textarea{resize:none!important;height:140px;width:585px;padding-top:7px}.input_bl input:focus,.input_bl textarea:focus,.answer-form textarea:focus{box-shadow:1px 2px 2px 0 rgba(215,215,215,0.75) inset;transition:.1s}.input_bl label{font-size:12px;color:#7d7d7d;font-weight:400;text-transform:uppercase;position:relative;width:105px;float:left;text-align:right;padding-right:10px;margin-top:9px}.input_bl:nth-child(2) label{width:69px}.submit_btn{float:right;margin-top:27px}.submit_btn button,.answer-form button{padding:0 17px;height:32px;font-weight:500;font-size:15px;color:#fff;border-top:0;border-left:0;border-right:0;border-bottom:2px solid #799920;background:#95ba2f;border-radius:4px;cursor:pointer;outline:none!important}.submit_btn button:hover,.answer-form button:hover{border-bottom:2px solid #95ba2f}.submit_btn button:active,.answer-form button:active{border-bottom:2px solid #799920;background:#799920}.answer-form button{float:right;margin-top:27px}.comments-wr,.comment-answer{min-height:64px;position:relative;float:left;width:100%}.answer-form{float:left;width:100%}.user-ico{width:80px;height:80px;float:left;overflow:hidden;border-radius:50%;position:absolute;top:0;left:0}.user-ico img{width:100%;height:100%}.user_data{margin-top:-2px;font-size:12px;color:#636363}.user_name{margin-top:6px;font-weight:700;font-size:15px}.user_name,.user_txt,.comment-panel,.answer-form,.user_data{width:100%;float:left;padding-left:100px}.user_txt{margin-top:8px;font-size:13px;line-height:18px}.comment-panel{width:100%;float:left;margin-top:11px}.comment-panel a:first-child{margin-left:0}.btn-comm-answer,.btn-comm-delete{font-size:13px;color:#799920;border-bottom:1px dotted #799920}.btn-comm-answer,.btn-comm-delete,.btn-comm-like,.btn-comm-dislike{float:left;margin-left:10px;text-decoration:none}.btn-comm-answer,.btn-comm-delete{height:16px;line-height:16px}.btn-comm-answer:hover,.btn-comm-delete:hover{text-decoration:none;border-bottom:0}.btn-comm-like,.btn-comm-dislike{width:14px;height:16px;background-image:url(../images/like_dislike.png);background-repeat:no-repeat}.btn-comm-like{background-position:0 0}.btn-comm-like:hover{background-position:0 -16px}.btn-comm-dislike:hover{background-position:-14px -16px}.btn-comm-dislike{background-position:-14px 0}.btn-comm-like:active,.btn-comm-dislike:active{opacity:.7}.comment-answer{margin-top:40px}.comment-answer .user-ico{left:100px}.comment-answer .user_name,.comment-answer .user_txt,.comment-answer .comment-panel,.comment-answer .answer-form,.comment-answer .user_data{padding-left:200px}.comments-wr{margin-top:40px}.answer-form{margin-top:20px}.answer-form textarea{width:100%;height:90px}.input_bl.has-error input,.input_bl.has-error textarea,.answer-form .has-error textarea{box-shadow:1px 2px 2px 0 rgba(212,0,0,0.2) inset}.input_bl .help-block,.answer-form .help-block{display:none}.required label:before{display:block;content:"*";position:absolute;top:0;right:-7px}.comments-start ul.pagination{list-style:none;text-align:center;margin-top:40px;width:100%;float:left}.comments-start ul.pagination li{display:inline}.comments-start ul.pagination li.prev.disabled span{display:none}.comments-start ul.pagination li a{padding:3px;color:#82a02f;font-size:15px;margin:0;text-decoration:none}.comments-start ul.pagination li.active a{color:#333} | ||
| 2 | \ No newline at end of file | 1 | \ No newline at end of file |
| 2 | +@import "https://fonts.googleapis.com/css?family=Roboto:400,700,500&subset=cyrillic-ext,latin,cyrillic,latin-ext";.input_bl,.area_bl,.form-comm-wr,.user_name,.user_txt,.comment-panel,.answer-form,.comments-start input,.comments-start textarea,.submit_btn button,.input_bl label{box-sizing:border-box}.comments-border{width:100%;margin-top:25px;margin-bottom:27px;height:1px;background:#d2d2d2}.comments-start{width:730px;margin:0 auto;font-family:'Roboto',sans-serif;font-weight:400;color:#333}.form-comm-wr{width:100%;background:#f5f5f5;padding:20px;float:left}.input_bl{margin-top:15px;float:left}.area_bl,.input_bl{position:relative}.input_bl input,.input_bl textarea,.answer-form textarea{width:258px;height:30px;border:1px solid #d2d2d2;background:#fff;outline:none!important;border-radius:4px;padding-left:10px}.area_bl textarea,.answer-form textarea{resize:none!important;height:140px;width:585px;padding-top:7px}.input_bl input:focus,.input_bl textarea:focus,.answer-form textarea:focus{box-shadow:1px 2px 2px 0 rgba(215,215,215,0.75) inset;transition:.1s}.input_bl label{font-size:12px;color:#7d7d7d;font-weight:400;text-transform:uppercase;position:relative;width:105px;float:left;text-align:right;padding-right:10px;margin-top:9px}.submit_btn{float:right;margin-top:27px}.submit_btn button,.answer-form button{padding:0 17px;height:32px;font-weight:500;font-size:15px;color:#fff;border-top:0;border-left:0;border-right:0;border-bottom:2px solid #1e5488;background:#256caf;border-radius:4px;cursor:pointer;outline:none!important}.submit_btn button:hover,.answer-form button:hover{border-bottom:2px solid #256caf}.submit_btn button:active,.answer-form button:active{border-bottom:2px solid #1e5488;background:#1e5488}.answer-form button{float:right;margin-top:27px}.comments-wr,.comment-answer{min-height:64px;position:relative;float:left;width:100%}.answer-form{float:left;width:100%}.user-ico{width:80px;height:80px;float:left;overflow:hidden;border-radius:50%;position:absolute;top:0;left:0}.user-ico img{width:100%;height:100%}.user_data{margin-top:-2px;font-size:12px;color:#636363}.user_name{margin-top:6px;font-weight:700;font-size:15px}.user_name,.user_txt,.comment-panel,.answer-form,.user_data{width:100%;float:left;padding-left:100px}.user_txt{margin-top:8px;font-size:13px;line-height:18px}.comment-panel{width:100%;float:left;margin-top:11px}.comment-panel a:first-child{margin-left:0}.btn-comm-answer,.btn-comm-delete{font-size:13px;color:#799920;border-bottom:1px dotted #799920}.btn-comm-answer,.btn-comm-delete,.btn-comm-like,.btn-comm-dislike{float:left;margin-left:10px;text-decoration:none}.btn-comm-answer,.btn-comm-delete{height:16px;line-height:16px}.btn-comm-answer:hover,.btn-comm-delete:hover{text-decoration:none;border-bottom:0}.btn-comm-like,.btn-comm-dislike{width:14px;height:16px;background-image:url(../images/like_dislike.png);background-repeat:no-repeat}.btn-comm-like{background-position:0 0}.btn-comm-like:hover{background-position:0 -16px}.btn-comm-dislike:hover{background-position:-14px -16px}.btn-comm-dislike{background-position:-14px 0}.btn-comm-like:active,.btn-comm-dislike:active{opacity:.7}.comment-answer{margin-top:40px}.comment-answer .user-ico{left:100px}.comment-answer .user_name,.comment-answer .user_txt,.comment-answer .comment-panel,.comment-answer .answer-form,.comment-answer .user_data{padding-left:200px}.comments-wr{margin-top:40px}.answer-form{margin-top:20px}.answer-form textarea{width:100%;height:90px}.input_bl.has-error input,.input_bl.has-error textarea,.answer-form .has-error textarea{box-shadow:1px 2px 2px 0 rgba(212,0,0,0.2) inset}.input_bl .help-block,.answer-form .help-block{display:none}.required label:before{display:block;content:"*";position:absolute;top:0;right:-7px}.comments-start ul.pagination{list-style:none;text-align:center;margin-top:40px;width:100%;float:left}.comments-start ul.pagination li{display:inline}.comments-start ul.pagination li.prev.disabled span{display:none}.comments-start ul.pagination li a{padding:3px;color:#82a02f;font-size:15px;margin:0;text-decoration:none}.comments-start ul.pagination li.active a{color:#333}.field-commentmodel-email label{width: 69px;}#artbox-comment-list .empty{font-size: 14px;color: #7d7d7d;float:left;margin-top:10px;width:100%;} | ||
| 3 | \ No newline at end of file | 3 | \ No newline at end of file |
frontend/web/css/css_header.css
| @@ -4615,7 +4615,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { | @@ -4615,7 +4615,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { | ||
| 4615 | .breadcrumb > .active { | 4615 | .breadcrumb > .active { |
| 4616 | color: #777 | 4616 | color: #777 |
| 4617 | } | 4617 | } |
| 4618 | - | 4618 | +.breadcrumb li a {} |
| 4619 | .pagination { | 4619 | .pagination { |
| 4620 | display: inline-block; | 4620 | display: inline-block; |
| 4621 | padding-left: 0; | 4621 | padding-left: 0; |
| @@ -7251,7 +7251,7 @@ body, .background-body { | @@ -7251,7 +7251,7 @@ body, .background-body { | ||
| 7251 | background:#edeeef; | 7251 | background:#edeeef; |
| 7252 | } | 7252 | } |
| 7253 | a { | 7253 | a { |
| 7254 | - color: #003569 | 7254 | + color: #0f6fc7; |
| 7255 | } | 7255 | } |
| 7256 | 7256 | ||
| 7257 | a.popup { | 7257 | a.popup { |
| @@ -7470,7 +7470,7 @@ a.popup { | @@ -7470,7 +7470,7 @@ a.popup { | ||
| 7470 | width: 100%; | 7470 | width: 100%; |
| 7471 | background: #a7acb0; | 7471 | background: #a7acb0; |
| 7472 | position: fixed; | 7472 | position: fixed; |
| 7473 | - z-index: 1999; | 7473 | + z-index: 2000; |
| 7474 | height: 40px; | 7474 | height: 40px; |
| 7475 | } | 7475 | } |
| 7476 | 7476 | ||
| @@ -9342,6 +9342,31 @@ footer .content-title { | @@ -9342,6 +9342,31 @@ footer .content-title { | ||
| 9342 | float: left; | 9342 | float: left; |
| 9343 | } | 9343 | } |
| 9344 | .artweb-wr:hover a {text-decoration: none;} | 9344 | .artweb-wr:hover a {text-decoration: none;} |
| 9345 | +.btn-fixeds { | ||
| 9346 | + position: fixed; | ||
| 9347 | + bottom: 0; | ||
| 9348 | + height: 44px; | ||
| 9349 | + width: 150px; | ||
| 9350 | + background: #fff; | ||
| 9351 | + box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.35); | ||
| 9352 | +} | ||
| 9353 | +.btn-fixeds a { | ||
| 9354 | + display: block; | ||
| 9355 | + width: 100%; | ||
| 9356 | + height: 100%; | ||
| 9357 | + line-height: 44px; | ||
| 9358 | + text-align: center; | ||
| 9359 | + text-decoration: none; | ||
| 9360 | + text-transform: uppercase; | ||
| 9361 | + font-size: 15px; | ||
| 9362 | + font-weight: 700; | ||
| 9363 | +} | ||
| 9364 | +.fixed-events {border-bottom: 3px solid #ed1c24;right: 40px;} | ||
| 9365 | +.fixed-events a {color: #ed1c24;} | ||
| 9366 | +.fixed-sale {border-bottom: 3px solid #01974a;left: 40px;} | ||
| 9367 | +.fixed-sale a {color: #01974a;} | ||
| 9368 | + | ||
| 9369 | + | ||
| 9345 | /****************/ | 9370 | /****************/ |
| 9346 | /*******brbeadcrumbs*********/ | 9371 | /*******brbeadcrumbs*********/ |
| 9347 | .brbeadcrumbs-wr { | 9372 | .brbeadcrumbs-wr { |
| @@ -10588,14 +10613,27 @@ footer .vacancies p { | @@ -10588,14 +10613,27 @@ footer .vacancies p { | ||
| 10588 | display: inline-block | 10613 | display: inline-block |
| 10589 | } | 10614 | } |
| 10590 | 10615 | ||
| 10591 | -/*.catalog_product_list {*/ | ||
| 10592 | - /*margin: 0 0 20px 0*/ | ||
| 10593 | -/*}*/ | ||
| 10594 | - | 10616 | +.catalog_product_list { |
| 10617 | + margin: 0 0 20px 0 | ||
| 10618 | +} | ||
| 10619 | +.slider_mp_items .catalog_product_list { | ||
| 10620 | + margin: 0; | ||
| 10621 | +} | ||
| 10595 | .catalog_product_list.view_table .catalog_item, | 10622 | .catalog_product_list.view_table .catalog_item, |
| 10596 | .category_popular_list .catalog_item { | 10623 | .category_popular_list .catalog_item { |
| 10624 | + float: left; | ||
| 10625 | + width: 33%; | ||
| 10626 | + height: 420px; | ||
| 10627 | + margin: 0 0 10px 0; | ||
| 10628 | + position: relative; | ||
| 10629 | + z-index: 1; | ||
| 10630 | +} | ||
| 10631 | +.catalog_product_list .catalog_item.home_slider_it { | ||
| 10597 | height: 420px; | 10632 | height: 420px; |
| 10598 | border: 1px solid #e4e4e4; | 10633 | border: 1px solid #e4e4e4; |
| 10634 | + float: none; | ||
| 10635 | + margin: 0; | ||
| 10636 | + | ||
| 10599 | } | 10637 | } |
| 10600 | 10638 | ||
| 10601 | .catalog_product_list.view_table.view_list .catalog_item { | 10639 | .catalog_product_list.view_table.view_list .catalog_item { |
| @@ -10610,12 +10648,66 @@ footer .vacancies p { | @@ -10610,12 +10648,66 @@ footer .vacancies p { | ||
| 10610 | 10648 | ||
| 10611 | .catalog_product_list.view_table .catalog_item .wrapper, | 10649 | .catalog_product_list.view_table .catalog_item .wrapper, |
| 10612 | .category_popular_list .catalog_item .wrapper { | 10650 | .category_popular_list .catalog_item .wrapper { |
| 10651 | + position: absolute; | ||
| 10652 | + z-index: 1; | ||
| 10653 | + width: 100%; | ||
| 10654 | + min-height: 360px; | ||
| 10655 | + height: 360px; | ||
| 10656 | + overflow: hidden; | ||
| 10657 | + left: 0; | ||
| 10658 | + top: 0; | ||
| 10659 | + border-radius: 4px; | ||
| 10660 | + background: #fff; | ||
| 10661 | + -webkit-box-sizing: content-box !important; | ||
| 10662 | + -moz-box-sizing: content-box !important; | ||
| 10663 | + box-sizing: content-box !important; | ||
| 10664 | +} | ||
| 10665 | + | ||
| 10666 | +.catalog_product_list .catalog_item.home_slider_it .wrapper { | ||
| 10613 | position: relative; | 10667 | position: relative; |
| 10614 | z-index: 1; | 10668 | z-index: 1; |
| 10615 | width: 100%; | 10669 | width: 100%; |
| 10616 | height: 100%; | 10670 | height: 100%; |
| 10671 | + min-height: 100%; | ||
| 10617 | overflow: hidden; | 10672 | overflow: hidden; |
| 10618 | background: #fff; | 10673 | background: #fff; |
| 10674 | + left: auto; | ||
| 10675 | + top: auto; | ||
| 10676 | + border-radius: 0; | ||
| 10677 | + box-sizing: border-box !important; | ||
| 10678 | + | ||
| 10679 | +} | ||
| 10680 | +.status_block-wr { | ||
| 10681 | + position: absolute; | ||
| 10682 | + top:20px; | ||
| 10683 | + left: 20px; | ||
| 10684 | + width: 42px; | ||
| 10685 | + height: 42px; | ||
| 10686 | + z-index: 999; | ||
| 10687 | +} | ||
| 10688 | +.staus_new, .staus_hit, .status_sale { | ||
| 10689 | + position: absolute; | ||
| 10690 | + top:0; | ||
| 10691 | + left: 0; | ||
| 10692 | + width: 100%; | ||
| 10693 | + height: 100%; | ||
| 10694 | + border-radius: 100%; | ||
| 10695 | + overflow: hidden; | ||
| 10696 | +} | ||
| 10697 | +.staus_new { | ||
| 10698 | + background: url("../images/new_img/ico/ico-15.png") no-repeat; | ||
| 10699 | +} | ||
| 10700 | +.staus_hit { | ||
| 10701 | + background: url("../images/new_img/ico/ico-16.png") no-repeat; | ||
| 10702 | +} | ||
| 10703 | +.status_sale { | ||
| 10704 | + background: #e22229; | ||
| 10705 | + color: #fff; | ||
| 10706 | + text-align: center; | ||
| 10707 | + font-size: 14px; | ||
| 10708 | + font-weight: 700; | ||
| 10709 | + line-height: 42px; | ||
| 10710 | + cursor: pointer; | ||
| 10619 | } | 10711 | } |
| 10620 | 10712 | ||
| 10621 | .catalog_product_list.view_table.view_list .catalog_item .wrapper { | 10713 | .catalog_product_list.view_table.view_list .catalog_item .wrapper { |
| @@ -10633,17 +10725,27 @@ footer .vacancies p { | @@ -10633,17 +10725,27 @@ footer .vacancies p { | ||
| 10633 | z-index: 1999 | 10725 | z-index: 1999 |
| 10634 | } | 10726 | } |
| 10635 | 10727 | ||
| 10636 | -.catalog_product_list.view_table .catalog_item:hover { | ||
| 10637 | - box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.35); | 10728 | +.catalog_product_list.view_table .catalog_item .wrapper:hover { |
| 10729 | + box-shadow: 0 0 5px #ccc; | ||
| 10730 | + padding: 0 20px; | ||
| 10731 | + margin-left: -20px; | ||
| 10732 | +} | ||
| 10733 | +.catalog_product_list.view_table .catalog_item.home_slider_it .wrapper:hover { | ||
| 10734 | + padding: 0 0; | ||
| 10735 | + margin-left: 0; | ||
| 10736 | +} | ||
| 10737 | +.catalog_product_list.view_table .catalog_item.home_slider_it:hover { | ||
| 10738 | + box-shadow: 0 0 12px 0 rgba(0, 0, 0, 0.35); | ||
| 10739 | + padding: 0 0; | ||
| 10740 | + margin-left: 0; | ||
| 10638 | } | 10741 | } |
| 10639 | - | ||
| 10640 | 10742 | ||
| 10641 | 10743 | ||
| 10642 | .catalog_product_list.view_table .catalog_item .wrapper:hover { | 10744 | .catalog_product_list.view_table .catalog_item .wrapper:hover { |
| 10643 | - | 10745 | + height: auto; |
| 10644 | } | 10746 | } |
| 10645 | 10747 | ||
| 10646 | -.img a { | 10748 | +.catalog_item.home_slider_it .img a { |
| 10647 | display: table-cell; | 10749 | display: table-cell; |
| 10648 | width: 172px; | 10750 | width: 172px; |
| 10649 | height: 258px; | 10751 | height: 258px; |
| @@ -10653,12 +10755,19 @@ footer .vacancies p { | @@ -10653,12 +10755,19 @@ footer .vacancies p { | ||
| 10653 | 10755 | ||
| 10654 | .catalog_product_list.view_table .catalog_item .wrapper .item_container, | 10756 | .catalog_product_list.view_table .catalog_item .wrapper .item_container, |
| 10655 | .category_popular_list .catalog_item .wrapper .item_container { | 10757 | .category_popular_list .catalog_item .wrapper .item_container { |
| 10758 | + padding: 15px 5px; | ||
| 10759 | +} | ||
| 10760 | +.catalog_product_list .catalog_item.home_slider_it .wrapper .item_container { | ||
| 10656 | height: 100%; | 10761 | height: 100%; |
| 10762 | + padding: 0; | ||
| 10657 | } | 10763 | } |
| 10658 | .slider_mp_items .owl-carousel .owl-item {padding: 7px 15px 30px 15px;} | 10764 | .slider_mp_items .owl-carousel .owl-item {padding: 7px 15px 30px 15px;} |
| 10765 | +.catalog_product_list .catalog_item .img, .category_popular_list .catalog_item .img { | ||
| 10766 | + min-height: 205px; | ||
| 10767 | +} | ||
| 10659 | .catalog_product_list .img, | 10768 | .catalog_product_list .img, |
| 10660 | .category_popular_list .catalog_item .img { | 10769 | .category_popular_list .catalog_item .img { |
| 10661 | - margin: 9px 0 0 0; | 10770 | + margin: 0 0 10px 0; |
| 10662 | position: relative; | 10771 | position: relative; |
| 10663 | z-index: 1 | 10772 | z-index: 1 |
| 10664 | } | 10773 | } |
| @@ -10672,14 +10781,25 @@ footer .vacancies p { | @@ -10672,14 +10781,25 @@ footer .vacancies p { | ||
| 10672 | 10781 | ||
| 10673 | .catalog_product_list .catalog_item .img img, | 10782 | .catalog_product_list .catalog_item .img img, |
| 10674 | .category_popular_list .catalog_item .img img { | 10783 | .category_popular_list .catalog_item .img img { |
| 10784 | + max-width: 250px; | ||
| 10785 | + max-height: 250px; | ||
| 10786 | + min-height: 15px; | ||
| 10787 | + display: block; | ||
| 10788 | + margin: 0 auto; | ||
| 10789 | +} | ||
| 10790 | +.catalog_product_list .catalog_item .img img.selected, .category_popular_list .catalog_item .img | ||
| 10791 | +img.selected { | ||
| 10792 | + display: block; | ||
| 10793 | +} | ||
| 10794 | +.catalog_product_list .catalog_item.home_slider_it .img img { | ||
| 10675 | max-width: 172px; | 10795 | max-width: 172px; |
| 10676 | max-height: 258px; | 10796 | max-height: 258px; |
| 10677 | margin: 0 auto; | 10797 | margin: 0 auto; |
| 10678 | vertical-align: middle; | 10798 | vertical-align: middle; |
| 10799 | + display: block; | ||
| 10679 | } | 10800 | } |
| 10680 | 10801 | ||
| 10681 | -.catalog_product_list .catalog_item .img, | ||
| 10682 | -.category_popular_list .catalog_item .img { | 10802 | + .catalog_product_list .catalog_item.home_slider_it .img { |
| 10683 | height: 258px; | 10803 | height: 258px; |
| 10684 | display: table; | 10804 | display: table; |
| 10685 | margin: 0 auto; | 10805 | margin: 0 auto; |
| @@ -10890,13 +11010,14 @@ footer .vacancies p { | @@ -10890,13 +11010,14 @@ footer .vacancies p { | ||
| 10890 | 11010 | ||
| 10891 | .catalog_product_list .additional_info.params .descr ul, | 11011 | .catalog_product_list .additional_info.params .descr ul, |
| 10892 | .category_popular_list .catalog_item .additional_info.params .descr ul { | 11012 | .category_popular_list .catalog_item .additional_info.params .descr ul { |
| 10893 | - padding: 0 | 11013 | + padding: 0; |
| 11014 | + margin-top: 10px; | ||
| 10894 | } | 11015 | } |
| 10895 | 11016 | ||
| 10896 | .catalog_product_list .additional_info.params .descr ul li, | 11017 | .catalog_product_list .additional_info.params .descr ul li, |
| 10897 | .category_popular_list .catalog_item .additional_info.params .descr ul li { | 11018 | .category_popular_list .catalog_item .additional_info.params .descr ul li { |
| 10898 | list-style-type: none; | 11019 | list-style-type: none; |
| 10899 | - line-height: 12px; | 11020 | + line-height: 17px; |
| 10900 | padding: 0 0 5px 0 | 11021 | padding: 0 0 5px 0 |
| 10901 | } | 11022 | } |
| 10902 | 11023 | ||
| @@ -11236,8 +11357,9 @@ footer .vacancies p { | @@ -11236,8 +11357,9 @@ footer .vacancies p { | ||
| 11236 | } | 11357 | } |
| 11237 | 11358 | ||
| 11238 | .product_detail .img_part { | 11359 | .product_detail .img_part { |
| 11239 | - max-width: 400px; | ||
| 11240 | - min-width: 300px; | 11360 | + /*max-width: 400px;*/ |
| 11361 | + max-width: 342px; | ||
| 11362 | + min-width: 327px; | ||
| 11241 | width: 30%; | 11363 | width: 30%; |
| 11242 | margin: 0 50px 30px 0; | 11364 | margin: 0 50px 30px 0; |
| 11243 | float: left; | 11365 | float: left; |
| @@ -11254,9 +11376,10 @@ footer .vacancies p { | @@ -11254,9 +11376,10 @@ footer .vacancies p { | ||
| 11254 | } | 11376 | } |
| 11255 | 11377 | ||
| 11256 | .product_detail .img_part .position.fixed { | 11378 | .product_detail .img_part .position.fixed { |
| 11257 | - max-width: 410px; | 11379 | + /*max-width: 410px;*/ |
| 11380 | + max-width: 342px; | ||
| 11258 | width: 30%; | 11381 | width: 30%; |
| 11259 | - padding-right: 10px | 11382 | + /*padding-right: 10px;*/ |
| 11260 | } | 11383 | } |
| 11261 | 11384 | ||
| 11262 | .product_detail .img_part_big { | 11385 | .product_detail .img_part_big { |
| @@ -14314,5 +14437,31 @@ h1.title { | @@ -14314,5 +14437,31 @@ h1.title { | ||
| 14314 | float:left; | 14437 | float:left; |
| 14315 | width: 100%; | 14438 | width: 100%; |
| 14316 | } | 14439 | } |
| 14440 | + .comments-start { | ||
| 14441 | + width: 563px !important; | ||
| 14442 | + } | ||
| 14443 | + .input_bl input, .input_bl textarea, .answer-form textarea { | ||
| 14444 | + width: 172px !important; | ||
| 14445 | + } | ||
| 14446 | + .area_bl textarea, .answer-form textarea {width: 413px !important;} | ||
| 14447 | + | ||
| 14448 | + .fixed-events { | ||
| 14449 | + transform: rotate(-90deg); | ||
| 14450 | + -webkit-transform: rotate(-90deg); | ||
| 14451 | + right: -53px; | ||
| 14452 | + | ||
| 14453 | + } | ||
| 14454 | + .fixed-sale { | ||
| 14455 | + transform: rotate(90deg); | ||
| 14456 | + -webkit-transform: rotate(90deg); | ||
| 14457 | + left: -53px; | ||
| 14458 | + } | ||
| 14459 | + .fixed-sale a { | ||
| 14460 | + transform: rotate(-180deg); | ||
| 14461 | + -webkit-transform: rotate(-180deg); | ||
| 14462 | + } | ||
| 14463 | + .btn-fixeds { | ||
| 14464 | + bottom: 53px; | ||
| 14465 | + } | ||
| 14317 | } | 14466 | } |
| 14318 | 14467 |
frontend/web/js/script.js
| 1 | -// var artbox_basket = new ArtboxBasket(); | ||
| 2 | -// | ||
| 3 | -// /*order basket form js logic*/ | ||
| 4 | -// | ||
| 5 | -// var recountPrice = function(container,new_value){ | ||
| 6 | -// var new_price = +$(container).find('.price span').html() * new_value; | ||
| 7 | -// $(container).find('.cost span').html(new_price); | ||
| 8 | -// var total_price = 0; | ||
| 9 | -// $('#orderFrom').find('#cost span').each(function(){ | ||
| 10 | -// total_price += +$(this).html(); | ||
| 11 | -// }); | ||
| 12 | -// | ||
| 13 | -// var total = $('#total span').html(total_price); | ||
| 14 | -// }; | ||
| 15 | -// | ||
| 16 | -// $(document).on('click', '#ordersFrom .count_choise .plus', function(e) { | ||
| 17 | -// e.preventDefault(); | ||
| 18 | -// var container = $(this).parents('.order_item'); | ||
| 19 | -// var input = $(container).find('.prod_count'); | ||
| 20 | -// var value = $(input).val(); | ||
| 21 | -// var new_value = parseInt(value) + 1; | ||
| 22 | -// $(input).val(new_value); | ||
| 23 | -// $(input).trigger('change'); | ||
| 24 | -// recountPrice(container,new_value); | ||
| 25 | -// | ||
| 26 | -// }); | ||
| 27 | -// | ||
| 28 | -// $(document).on('click', '#ordersFrom .count_choise .minus', function(e) { | ||
| 29 | -// e.preventDefault(); | ||
| 30 | -// var container = $(this).parents('.order_item'); | ||
| 31 | -// var input = $(container).find('.prod_count'); | ||
| 32 | -// var value = $(input).val(); | ||
| 33 | -// if(value > 1 ){ | ||
| 34 | -// var new_value = parseInt(value) - 1; | ||
| 35 | -// $(input).val(new_value); | ||
| 36 | -// $(input).trigger('change'); | ||
| 37 | -// recountPrice(container,new_value); | ||
| 38 | -// } | ||
| 39 | -// | ||
| 40 | -// }); | ||
| 41 | -// | ||
| 42 | -// $(document).on('change', '#ordersFrom .prod_count', function(e) { | ||
| 43 | -// e.preventDefault(); | ||
| 44 | -// var container = $(this).parents('.order_item'); | ||
| 45 | -// var new_value = $(this).val(); | ||
| 46 | -// recountPrice(container,new_value); | ||
| 47 | -// var product_variant_id = container.data('id'); | ||
| 48 | -// var value = $(this).val(); | ||
| 49 | -// if(value < 0) { | ||
| 50 | -// value = 0; | ||
| 51 | -// } | ||
| 52 | -// artbox_basket.set(product_variant_id, value); | ||
| 53 | -// }); | ||
| 54 | -// | ||
| 55 | -// | ||
| 56 | -// | ||
| 57 | -// $(document).on('click', '#ordersFrom .cart_remove', function(e) { | ||
| 58 | -// e.preventDefault(); | ||
| 59 | -// var container = $(this).parents('.order_item'); | ||
| 60 | -// | ||
| 61 | -// var id = $(container).data('id'); | ||
| 62 | -// container.remove(); | ||
| 63 | -// artbox_basket.set(id, 0); | ||
| 64 | -// }); | ||
| 65 | -// | ||
| 66 | -// | ||
| 67 | -// /*end order basket form js logic*/ | ||
| 68 | -// | ||
| 69 | -// $(document).on('click', '.buy_button', function(e) { | ||
| 70 | -// e.preventDefault(); | ||
| 71 | -// var product_variant_id = $(this).data('id'); | ||
| 72 | -// var count = 1; | ||
| 73 | -// artbox_basket.add(product_variant_id, count); | ||
| 74 | -// }); | ||
| 75 | -// $(document).on('change', '#buyForm .prod_count', function(e) { | ||
| 76 | -// e.preventDefault(); | ||
| 77 | -// var product_variant_id = $(this).parents('tr').data('id'); | ||
| 78 | -// var value = $(this).val(); | ||
| 79 | -// if(value < 0) { | ||
| 80 | -// value = 0; | ||
| 81 | -// } | ||
| 82 | -// artbox_basket.set(product_variant_id, value); | ||
| 83 | -// }); | ||
| 84 | -// | ||
| 85 | -// $(document).on('click', '#buyForm .count_choise .minus', function(e) { | ||
| 86 | -// e.preventDefault(); | ||
| 87 | -// var container = $(this).parents('tr'); | ||
| 88 | -// var input = $(container).find('.prod_count'); | ||
| 89 | -// var value = $(input).val(); | ||
| 90 | -// var new_value = parseInt(value) - 1; | ||
| 91 | -// $(input).val(new_value); | ||
| 92 | -// $(input).trigger('change'); | ||
| 93 | -// }); | ||
| 94 | -// | ||
| 95 | -// | ||
| 96 | -// $(document).on('click', '#buyForm .count_choise .plus', function(e) { | ||
| 97 | -// e.preventDefault(); | ||
| 98 | -// var container = $(this).parents('tr'); | ||
| 99 | -// var input = $(container).find('.prod_count'); | ||
| 100 | -// var value = $(input).val(); | ||
| 101 | -// var new_value = parseInt(value) + 1; | ||
| 102 | -// $(input).val(new_value); | ||
| 103 | -// $(input).trigger('change'); | ||
| 104 | -// }); | ||
| 105 | -// | ||
| 106 | -// | ||
| 107 | -// $(document).on('click', '#top-cart-info', function() { | ||
| 108 | -// if(artbox_basket.count > 0) { | ||
| 109 | -// location.href='/order' | ||
| 110 | -// } | ||
| 111 | -// }); | ||
| 112 | -// | ||
| 113 | -// $(document).on('click', '#buyForm .cart_remove', function() { | ||
| 114 | -// var container = $(this).parents('tr'); | ||
| 115 | -// var id = $(container).data('id'); | ||
| 116 | -// artbox_basket.set(id, 0); | ||
| 117 | -// }); | ||
| 118 | -// | ||
| 119 | -// /* Category filter open submenu */ | ||
| 120 | -// $(document).on('click', '.properties_block', function(e) { | ||
| 121 | -// var active = $(this).hasClass('opened'); | ||
| 122 | -// if(active) { | ||
| 123 | -// $(this).removeClass('opened').addClass('closed'); | ||
| 124 | -// $(this).find('.chechboxes').hide(); | ||
| 125 | -// } else { | ||
| 126 | -// $(this).removeClass('closed').addClass('opened'); | ||
| 127 | -// $(this).find('.chechboxes').show(); | ||
| 128 | -// } | ||
| 129 | -// }); | ||
| 130 | -// /* End Category filter open submenu */ | ||
| 131 | -// /* Cart resize on scroll */ | ||
| 132 | -// $('.img_part').height($('.info').height()); | ||
| 133 | -// $(document).on('scroll', window, function(e) | ||
| 134 | -// { | ||
| 135 | -// currentScroll = $(window).scrollTop(); | ||
| 136 | -// if (currentScroll > 0) { | ||
| 137 | -// $('#top-cart-content').addClass('small-cart'); | ||
| 138 | -// } else { | ||
| 139 | -// $('#top-cart-content').removeClass('small-cart'); | ||
| 140 | -// } | ||
| 141 | -// }); | ||
| 142 | -// /* End cart resize on scroll */ | ||
| 143 | -// /* Catalog product scroll watcher */ | ||
| 144 | -// $(document).on('scroll', window, function(e) { | ||
| 145 | -// checkFixed(e); | ||
| 146 | -// checkSelector(e); | ||
| 147 | -// }); | ||
| 148 | -// function checkFixed(e) { | ||
| 149 | -// var img_part = $('.img_part'); | ||
| 150 | -// var position = $(img_part).find('.position'); | ||
| 151 | -// var position_height = $(position).height(); | ||
| 152 | -// var info = $('.info'); | ||
| 153 | -// var info_position = $(info).position(); | ||
| 154 | -// var info_height = $(info).height(); | ||
| 155 | -// var info_top = info_position.top; | ||
| 156 | -// var info_bottom = info_top + info_height; | ||
| 157 | -// var currentScroll = $(window).scrollTop(); | ||
| 158 | -// if(info_bottom - currentScroll > 0 && info_bottom - currentScroll < position_height) { | ||
| 159 | -// $(position).removeClass('fixed').css({ | ||
| 160 | -// position: 'absolute', | ||
| 161 | -// bottom: 0, | ||
| 162 | -// top: 'auto', | ||
| 163 | -// }); | ||
| 164 | -// } else if(currentScroll > info_top && currentScroll < info_bottom) { | ||
| 165 | -// $(position).addClass('fixed').css({ | ||
| 166 | -// position: 'fixed', | ||
| 167 | -// top: '100px', | ||
| 168 | -// bottom: 'auto' | ||
| 169 | -// }); | ||
| 170 | -// } else { | ||
| 171 | -// $(position).removeClass('fixed').css({ | ||
| 172 | -// position: 'relative', | ||
| 173 | -// top: 0, | ||
| 174 | -// bottom: 'auto' | ||
| 175 | -// }); | ||
| 176 | -// } | ||
| 177 | -// } | ||
| 178 | -// function checkSelector(e) { | ||
| 179 | -// var tab_content = $('#characteristics'); | ||
| 180 | -// var tab_content_top = $(tab_content).position().top - 100; | ||
| 181 | -// var comments_block = $('#reviews'); | ||
| 182 | -// var comments_block_top = $(comments_block).position().top - 100; | ||
| 183 | -// var collection = $('#collection'); | ||
| 184 | -// var collection_top = $(collection).position().top - 100; | ||
| 185 | -// var currentScroll = $(window).scrollTop(); | ||
| 186 | -// var detail_main_tabs = $('.detail_main_tabs'); | ||
| 187 | -// var active; | ||
| 188 | -// if(currentScroll > tab_content_top && currentScroll < collection_top) { | ||
| 189 | -// active = 'characteristics'; | ||
| 190 | -// } else if(currentScroll > comments_block_top) { | ||
| 191 | -// active = 'reviews'; | ||
| 192 | -// } else if(currentScroll > collection_top && currentScroll < comments_block_top) { | ||
| 193 | -// active = 'collection'; | ||
| 194 | -// } | ||
| 195 | -// $(detail_main_tabs).find('li.selected').removeClass('selected'); | ||
| 196 | -// $(detail_main_tabs).find('[data-target='+active+']').addClass('selected'); | ||
| 197 | -// } | ||
| 198 | -// $(window).scroll(function(e) { | ||
| 199 | -// checkFixed(e); | ||
| 200 | -// checkSelector(e); | ||
| 201 | -// }); | ||
| 202 | -// /* End catalog product scroll watcher */ | ||
| 203 | -// /* Animated links */ | ||
| 204 | -// $(document).on('click', '.detail_main_tabs a', function(e) { | ||
| 205 | -// e.preventDefault(); | ||
| 206 | -// var hash = $(this).attr('href').replace(/^.*?(#|$)/,''); | ||
| 207 | -// var target = $('#'+hash); | ||
| 208 | -// var target_top = $(target).position().top - 50; | ||
| 209 | -// var body = $('html, body'); | ||
| 210 | -// body.stop().animate({scrollTop:target_top}, 500, 'swing', function() {}); | ||
| 211 | -// }); | ||
| 212 | -// /* End animated links */ | ||
| 213 | -// /* Ajax form submit */ | ||
| 214 | -// $(document).on('submit', '#feedback-form', function(e) { | ||
| 215 | -// e.preventDefault(); | ||
| 216 | -// $.post('/ajax/feedback', $(this).serialize(), function(data) { | ||
| 217 | -// $('#myCallback').find('.modal-body').html(data.result); | ||
| 218 | -// }); | ||
| 219 | -// }); | ||
| 220 | -// $(document).on('submit', '#quickbuy-form', function(e) { | ||
| 221 | -// e.preventDefault(); | ||
| 222 | -// var container = $(this).parents('.fast_order_form'); | ||
| 223 | -// $.post('/order/quick', $(this).serialize(), function(data) { | ||
| 224 | -// if(!data.error) { | ||
| 225 | -// $(container).html(data.result); | ||
| 226 | -// } else { | ||
| 227 | -// $(container).html(data.error); | ||
| 228 | -// } | ||
| 229 | -// }) | ||
| 230 | -// }); | ||
| 231 | -// /* End ajax form submit */ | ||
| 232 | \ No newline at end of file | 1 | \ No newline at end of file |
| 2 | +var artbox_basket = new ArtboxBasket(); | ||
| 3 | + | ||
| 4 | +/*order basket form js logic*/ | ||
| 5 | + | ||
| 6 | +var recountPrice = function(container,new_value){ | ||
| 7 | + var new_price = +$(container).find('.price span').html() * new_value; | ||
| 8 | + $(container).find('.cost span').html(new_price); | ||
| 9 | + var total_price = 0; | ||
| 10 | + $('#orderFrom').find('#cost span').each(function(){ | ||
| 11 | + total_price += +$(this).html(); | ||
| 12 | + }); | ||
| 13 | + | ||
| 14 | + var total = $('#total span').html(total_price); | ||
| 15 | +}; | ||
| 16 | + | ||
| 17 | +$(document).on('click', '#ordersFrom .count_choise .plus', function(e) { | ||
| 18 | + e.preventDefault(); | ||
| 19 | + var container = $(this).parents('.order_item'); | ||
| 20 | + var input = $(container).find('.prod_count'); | ||
| 21 | + var value = $(input).val(); | ||
| 22 | + var new_value = parseInt(value) + 1; | ||
| 23 | + $(input).val(new_value); | ||
| 24 | + $(input).trigger('change'); | ||
| 25 | + recountPrice(container,new_value); | ||
| 26 | + | ||
| 27 | +}); | ||
| 28 | + | ||
| 29 | +$(document).on('click', '#ordersFrom .count_choise .minus', function(e) { | ||
| 30 | + e.preventDefault(); | ||
| 31 | + var container = $(this).parents('.order_item'); | ||
| 32 | + var input = $(container).find('.prod_count'); | ||
| 33 | + var value = $(input).val(); | ||
| 34 | + if(value > 1 ){ | ||
| 35 | + var new_value = parseInt(value) - 1; | ||
| 36 | + $(input).val(new_value); | ||
| 37 | + $(input).trigger('change'); | ||
| 38 | + recountPrice(container,new_value); | ||
| 39 | + } | ||
| 40 | + | ||
| 41 | +}); | ||
| 42 | + | ||
| 43 | +$(document).on('change', '#ordersFrom .prod_count', function(e) { | ||
| 44 | + e.preventDefault(); | ||
| 45 | + var container = $(this).parents('.order_item'); | ||
| 46 | + var new_value = $(this).val(); | ||
| 47 | + recountPrice(container,new_value); | ||
| 48 | + var product_variant_id = container.data('id'); | ||
| 49 | + var value = $(this).val(); | ||
| 50 | + if(value < 0) { | ||
| 51 | + value = 0; | ||
| 52 | + } | ||
| 53 | + artbox_basket.set(product_variant_id, value); | ||
| 54 | +}); | ||
| 55 | + | ||
| 56 | + | ||
| 57 | + | ||
| 58 | +$(document).on('click', '#ordersFrom .cart_remove', function(e) { | ||
| 59 | + e.preventDefault(); | ||
| 60 | + var container = $(this).parents('.order_item'); | ||
| 61 | + | ||
| 62 | + var id = $(container).data('id'); | ||
| 63 | + container.remove(); | ||
| 64 | + artbox_basket.set(id, 0); | ||
| 65 | +}); | ||
| 66 | + | ||
| 67 | + | ||
| 68 | +/*end order basket form js logic*/ | ||
| 69 | + | ||
| 70 | +$(document).on('click', '.buy_button', function(e) { | ||
| 71 | + e.preventDefault(); | ||
| 72 | + var product_variant_id = $(this).data('id'); | ||
| 73 | + var count = 1; | ||
| 74 | + artbox_basket.add(product_variant_id, count); | ||
| 75 | +}); | ||
| 76 | +$(document).on('change', '#buyForm .prod_count', function(e) { | ||
| 77 | + e.preventDefault(); | ||
| 78 | + var product_variant_id = $(this).parents('tr').data('id'); | ||
| 79 | + var value = $(this).val(); | ||
| 80 | + if(value < 0) { | ||
| 81 | + value = 0; | ||
| 82 | + } | ||
| 83 | + artbox_basket.set(product_variant_id, value); | ||
| 84 | +}); | ||
| 85 | + | ||
| 86 | +$(document).on('click', '#buyForm .count_choise .minus', function(e) { | ||
| 87 | + e.preventDefault(); | ||
| 88 | + var container = $(this).parents('tr'); | ||
| 89 | + var input = $(container).find('.prod_count'); | ||
| 90 | + var value = $(input).val(); | ||
| 91 | + var new_value = parseInt(value) - 1; | ||
| 92 | + $(input).val(new_value); | ||
| 93 | + $(input).trigger('change'); | ||
| 94 | +}); | ||
| 95 | + | ||
| 96 | + | ||
| 97 | +$(document).on('click', '#buyForm .count_choise .plus', function(e) { | ||
| 98 | + e.preventDefault(); | ||
| 99 | + var container = $(this).parents('tr'); | ||
| 100 | + var input = $(container).find('.prod_count'); | ||
| 101 | + var value = $(input).val(); | ||
| 102 | + var new_value = parseInt(value) + 1; | ||
| 103 | + $(input).val(new_value); | ||
| 104 | + $(input).trigger('change'); | ||
| 105 | +}); | ||
| 106 | + | ||
| 107 | + | ||
| 108 | +$(document).on('click', '#top-cart-info', function() { | ||
| 109 | + if(artbox_basket.count > 0) { | ||
| 110 | + location.href='/order' | ||
| 111 | + } | ||
| 112 | +}); | ||
| 113 | + | ||
| 114 | +$(document).on('click', '#buyForm .cart_remove', function() { | ||
| 115 | + var container = $(this).parents('tr'); | ||
| 116 | + var id = $(container).data('id'); | ||
| 117 | + artbox_basket.set(id, 0); | ||
| 118 | +}); | ||
| 119 | + | ||
| 120 | +/* Category filter open submenu */ | ||
| 121 | +$(document).on('click', '.properties_block', function(e) { | ||
| 122 | + var active = $(this).hasClass('opened'); | ||
| 123 | + if(active) { | ||
| 124 | + $(this).removeClass('opened').addClass('closed'); | ||
| 125 | + $(this).find('.chechboxes').hide(); | ||
| 126 | + } else { | ||
| 127 | + $(this).removeClass('closed').addClass('opened'); | ||
| 128 | + $(this).find('.chechboxes').show(); | ||
| 129 | + } | ||
| 130 | +}); | ||
| 131 | +/* End Category filter open submenu */ | ||
| 132 | +/* Cart resize on scroll */ | ||
| 133 | +$('.img_part').height($('.info').height()); | ||
| 134 | +$(document).on('scroll', window, function(e) | ||
| 135 | +{ | ||
| 136 | + currentScroll = $(window).scrollTop(); | ||
| 137 | + if (currentScroll > 0) { | ||
| 138 | + $('#top-cart-content').addClass('small-cart'); | ||
| 139 | + } else { | ||
| 140 | + $('#top-cart-content').removeClass('small-cart'); | ||
| 141 | + } | ||
| 142 | +}); | ||
| 143 | +/* End cart resize on scroll */ | ||
| 144 | +/* Catalog product scroll watcher */ | ||
| 145 | +$(document).on('scroll', window, function(e) { | ||
| 146 | + if(($('.detail_main_tabs').length)>0) { | ||
| 147 | + checkFixed(e); | ||
| 148 | + checkSelector(e); | ||
| 149 | + } | ||
| 150 | + | ||
| 151 | +}); | ||
| 152 | +function checkFixed(e) { | ||
| 153 | + var img_part = $('.img_part'); | ||
| 154 | + var position = $(img_part).find('.position'); | ||
| 155 | + var position_height = $(position).height(); | ||
| 156 | + var info = $('.info'); | ||
| 157 | + var info_position = $(info).position(); | ||
| 158 | + var info_height = $(info).height(); | ||
| 159 | + var info_top = info_position.top; | ||
| 160 | + var info_bottom = info_top + info_height; | ||
| 161 | + var currentScroll = $(window).scrollTop(); | ||
| 162 | + if(info_bottom - currentScroll > 0 && info_bottom - currentScroll < position_height) { | ||
| 163 | + $(position).removeClass('fixed').css({ | ||
| 164 | + position: 'absolute', | ||
| 165 | + bottom: 0, | ||
| 166 | + top: 'auto', | ||
| 167 | + }); | ||
| 168 | + } else if(currentScroll > info_top && currentScroll < info_bottom) { | ||
| 169 | + $(position).addClass('fixed').css({ | ||
| 170 | + position: 'fixed', | ||
| 171 | + top: '100px', | ||
| 172 | + bottom: 'auto' | ||
| 173 | + }); | ||
| 174 | + } else { | ||
| 175 | + $(position).removeClass('fixed').css({ | ||
| 176 | + position: 'relative', | ||
| 177 | + top: 0, | ||
| 178 | + bottom: 'auto' | ||
| 179 | + }); | ||
| 180 | + } | ||
| 181 | +} | ||
| 182 | +function checkSelector(e) { | ||
| 183 | + var tab_content = $('#characteristics'); | ||
| 184 | + var tab_content_top = $(tab_content).position().top - 100; | ||
| 185 | + var comments_block = $('#reviews'); | ||
| 186 | + var comments_block_top = $(comments_block).position().top - 100; | ||
| 187 | + var collection = $('#collection'); | ||
| 188 | + var collection_top = $(collection).position().top - 100; | ||
| 189 | + var currentScroll = $(window).scrollTop(); | ||
| 190 | + var detail_main_tabs = $('.detail_main_tabs'); | ||
| 191 | + var active; | ||
| 192 | + if(currentScroll > tab_content_top && currentScroll < collection_top) { | ||
| 193 | + active = 'characteristics'; | ||
| 194 | + } else if(currentScroll > comments_block_top) { | ||
| 195 | + active = 'reviews'; | ||
| 196 | + } else if(currentScroll > collection_top && currentScroll < comments_block_top) { | ||
| 197 | + active = 'collection'; | ||
| 198 | + } | ||
| 199 | + $(detail_main_tabs).find('li.selected').removeClass('selected'); | ||
| 200 | + $(detail_main_tabs).find('[data-target='+active+']').addClass('selected'); | ||
| 201 | +} | ||
| 202 | +$(window).scroll(function(e) { | ||
| 203 | + // checkFixed(e); | ||
| 204 | + // checkSelector(e); | ||
| 205 | +}); | ||
| 206 | +/* End catalog product scroll watcher */ | ||
| 207 | +/* Animated links */ | ||
| 208 | +$(document).on('click', '.detail_main_tabs a', function(e) { | ||
| 209 | + e.preventDefault(); | ||
| 210 | + var hash = $(this).attr('href').replace(/^.*?(#|$)/,''); | ||
| 211 | + var target = $('#'+hash); | ||
| 212 | + var target_top = $(target).position().top - 50; | ||
| 213 | + var body = $('html, body'); | ||
| 214 | + body.stop().animate({scrollTop:target_top}, 500, 'swing', function() {}); | ||
| 215 | +}); | ||
| 216 | +/* End animated links */ | ||
| 217 | +/* Ajax form submit */ | ||
| 218 | +$(document).on('submit', '#feedback-form', function(e) { | ||
| 219 | + e.preventDefault(); | ||
| 220 | + $.post('/ajax/feedback', $(this).serialize(), function(data) { | ||
| 221 | + $('#myCallback').find('.modal-body').html(data.result); | ||
| 222 | + }); | ||
| 223 | +}); | ||
| 224 | +$(document).on('submit', '#quickbuy-form', function(e) { | ||
| 225 | + e.preventDefault(); | ||
| 226 | + var container = $(this).parents('.fast_order_form'); | ||
| 227 | + $.post('/order/quick', $(this).serialize(), function(data) { | ||
| 228 | + if(!data.error) { | ||
| 229 | + $(container).html(data.result); | ||
| 230 | + } else { | ||
| 231 | + $(container).html(data.error); | ||
| 232 | + } | ||
| 233 | + }) | ||
| 234 | +}); | ||
| 235 | +/* End ajax form submit */ | ||
| 233 | \ No newline at end of file | 236 | \ No newline at end of file |