Commit 9537a122dcfe2fad4642e3686ec51476e8251f56
1 parent
aa61d143
-Some bug fixes
Showing
2 changed files
with
86 additions
and
155 deletions
Show diff stats
frontend/views/account/order.php
| @@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
| 2 | 2 | ||
| 3 | use artbox\core\helpers\ImageHelper; | 3 | use artbox\core\helpers\ImageHelper; |
| 4 | use artbox\order\models\Order; | 4 | use artbox\order\models\Order; |
| 5 | + use yii\helpers\Url; | ||
| 5 | use yii\web\View; | 6 | use yii\web\View; |
| 6 | 7 | ||
| 7 | /** | 8 | /** |
| @@ -37,7 +38,9 @@ _________________________________________________________ --> | @@ -37,7 +38,9 @@ _________________________________________________________ --> | ||
| 37 | ?> and is currently | 38 | ?> and is currently |
| 38 | <strong><?= $order->label->lang->title ?></strong>.<?php } ?></p> | 39 | <strong><?= $order->label->lang->title ?></strong>.<?php } ?></p> |
| 39 | <p class="lead text-muted">If you have any questions, please feel free to | 40 | <p class="lead text-muted">If you have any questions, please feel free to |
| 40 | - <a href="contact.html">contact us</a>, our customer service center is working for you 24/7.</p> | 41 | + <a target="_blank" href="<?= Url::to( |
| 42 | + [ 'site/contact' ] | ||
| 43 | + ) ?>">contact us</a>, our customer service center is working for you 24/7.</p> | ||
| 41 | 44 | ||
| 42 | <div class="box"> | 45 | <div class="box"> |
| 43 | <div class="table-responsive"> | 46 | <div class="table-responsive"> |
| @@ -58,7 +61,12 @@ _________________________________________________________ --> | @@ -58,7 +61,12 @@ _________________________________________________________ --> | ||
| 58 | ?> | 61 | ?> |
| 59 | <tr> | 62 | <tr> |
| 60 | <td> | 63 | <td> |
| 61 | - <a href="#"> | 64 | + <a target="_blank" href="<?= Url::to( |
| 65 | + [ | ||
| 66 | + 'product/view', | ||
| 67 | + 'id' => $product->variant->product->id, | ||
| 68 | + ] | ||
| 69 | + ) ?>"> | ||
| 62 | <?= ImageHelper::set( | 70 | <?= ImageHelper::set( |
| 63 | $product->variant ? $product->variant->product->image->getPath( | 71 | $product->variant ? $product->variant->product->image->getPath( |
| 64 | ) : '@frontend/web/img/no-image.png' | 72 | ) : '@frontend/web/img/no-image.png' |
| @@ -71,7 +79,12 @@ _________________________________________________________ --> | @@ -71,7 +79,12 @@ _________________________________________________________ --> | ||
| 71 | ) ?> | 79 | ) ?> |
| 72 | </a> | 80 | </a> |
| 73 | </td> | 81 | </td> |
| 74 | - <td><a href="#"><?= $product->variant->product->lang->title ?></a> | 82 | + <td><a target="_blank" href="<?= Url::to( |
| 83 | + [ | ||
| 84 | + 'product/view', | ||
| 85 | + 'id' => $product->variant->product->id, | ||
| 86 | + ] | ||
| 87 | + ) ?>"><?= $product->variant->product->lang->title ?></a> | ||
| 75 | </td> | 88 | </td> |
| 76 | <td><?= $product->count ?></td> | 89 | <td><?= $product->count ?></td> |
| 77 | <td><?= $product->price ?></td> | 90 | <td><?= $product->price ?></td> |
frontend/views/layouts/main.php
| @@ -391,17 +391,17 @@ _________________________________________________________ --> | @@ -391,17 +391,17 @@ _________________________________________________________ --> | ||
| 391 | echo $login->field($loginForm, 'rememberMe') | 391 | echo $login->field($loginForm, 'rememberMe') |
| 392 | ->checkbox(); | 392 | ->checkbox(); |
| 393 | ?> | 393 | ?> |
| 394 | - <div class="text-center"> | ||
| 395 | - <? | ||
| 396 | - echo Html::submitButton( | ||
| 397 | - \Yii::t('app', 'Login'), | ||
| 398 | - [ | ||
| 399 | - 'class' => 'btn btn-success', | ||
| 400 | - ] | ||
| 401 | - ); | ||
| 402 | - $login::end(); | ||
| 403 | - ?> | ||
| 404 | - </div> | 394 | + <div class="text-center"> |
| 395 | + <? | ||
| 396 | + echo Html::submitButton( | ||
| 397 | + \Yii::t('app', 'Login'), | ||
| 398 | + [ | ||
| 399 | + 'class' => 'btn btn-success', | ||
| 400 | + ] | ||
| 401 | + ); | ||
| 402 | + $login::end(); | ||
| 403 | + ?> | ||
| 404 | + </div> | ||
| 405 | <p class="text-center text-muted"> | 405 | <p class="text-center text-muted"> |
| 406 | <?php echo \Yii::t('app', 'Not registered yet?'); ?></p> | 406 | <?php echo \Yii::t('app', 'Not registered yet?'); ?></p> |
| 407 | <p class="text-center text-muted"> | 407 | <p class="text-center text-muted"> |
| @@ -546,170 +546,86 @@ _________________________________________________________ --> | @@ -546,170 +546,86 @@ _________________________________________________________ --> | ||
| 546 | 546 | ||
| 547 | <footer id="footer"> | 547 | <footer id="footer"> |
| 548 | <div class="container"> | 548 | <div class="container"> |
| 549 | - <div class="col-md-3 col-sm-6"> | ||
| 550 | - <h4><?php echo \Yii::t('app', 'About us'); ?></h4> | ||
| 551 | - | ||
| 552 | - <p><?php echo $settings->about; ?></p> | ||
| 553 | - | ||
| 554 | - <hr> | 549 | + <div class="col-md-4 col-sm-6"> |
| 550 | + <h4>О нас</h4> | ||
| 551 | + | ||
| 552 | + <p><?= $settings->about ?></p> | ||
| 555 | 553 | ||
| 556 | - <h4>Join our monthly newsletter</h4> | ||
| 557 | - <?php | ||
| 558 | - $newsletterForm = ActiveForm::begin( | ||
| 559 | - [ | ||
| 560 | - 'action' => '/site/subscribe', | ||
| 561 | - ] | ||
| 562 | - ); | ||
| 563 | - echo Html::beginTag( | ||
| 564 | - 'div', | ||
| 565 | - [ | ||
| 566 | - 'class' => 'input-group', | ||
| 567 | - ] | ||
| 568 | - ); | ||
| 569 | - echo $newsletterForm->field( | ||
| 570 | - $newsletter, | ||
| 571 | - 'email', | ||
| 572 | - [ | ||
| 573 | - 'options' => [ | ||
| 574 | - 'tag' => false, | ||
| 575 | - ], | ||
| 576 | - ] | ||
| 577 | - ) | ||
| 578 | - ->label(false) | ||
| 579 | - ->textInput(); | ||
| 580 | - echo Html::tag( | ||
| 581 | - 'span', | ||
| 582 | - Html::button( | ||
| 583 | - Html::tag( | ||
| 584 | - 'i', | ||
| 585 | - '', | ||
| 586 | - [ | ||
| 587 | - 'class' => 'fa fa-send', | ||
| 588 | - ] | ||
| 589 | - ), | ||
| 590 | - [ | ||
| 591 | - 'class' => 'btn btn-default', | ||
| 592 | - ] | ||
| 593 | - ), | ||
| 594 | - [ | ||
| 595 | - 'class' => 'input-group-btn', | ||
| 596 | - ] | ||
| 597 | - ); | ||
| 598 | - echo Html::endTag('div'); | ||
| 599 | - $newsletterForm::end(); | ||
| 600 | - ?> | ||
| 601 | <hr class="hidden-md hidden-lg hidden-sm"> | 554 | <hr class="hidden-md hidden-lg hidden-sm"> |
| 602 | 555 | ||
| 603 | </div> | 556 | </div> |
| 604 | <!-- /.col-md-3 --> | 557 | <!-- /.col-md-3 --> |
| 605 | - | ||
| 606 | - <div class="col-md-3 col-sm-6"> | ||
| 607 | - | ||
| 608 | - <h4><?php echo \Yii::t('app', 'Blog'); ?></h4> | 558 | + |
| 559 | + <div class="col-md-2 col-sm-6"> | ||
| 560 | + | ||
| 561 | + <h4>Разделы</h4> | ||
| 609 | 562 | ||
| 610 | <div class="blog-entries"> | 563 | <div class="blog-entries"> |
| 611 | - <div class="item same-height-row clearfix"> | ||
| 612 | - <div class="image same-height-always"> | ||
| 613 | - <a href="#"> | ||
| 614 | - <img class="img-responsive" src="/img/detailsquare.jpg" alt=""> | ||
| 615 | - </a> | ||
| 616 | - </div> | ||
| 617 | - <div class="name same-height-always"> | ||
| 618 | - <h5><a href="#">Blog post name</a></h5> | ||
| 619 | - </div> | ||
| 620 | - </div> | ||
| 621 | - | ||
| 622 | - <div class="item same-height-row clearfix"> | ||
| 623 | - <div class="image same-height-always"> | ||
| 624 | - <a href="#"> | ||
| 625 | - <img class="img-responsive" src="/img/detailsquare.jpg" alt=""> | ||
| 626 | - </a> | ||
| 627 | - </div> | ||
| 628 | - <div class="name same-height-always"> | ||
| 629 | - <h5><a href="#">Blog post name</a></h5> | ||
| 630 | - </div> | ||
| 631 | - </div> | 564 | + |
| 565 | + <?php foreach ($pages as $page) { ?> | ||
| 566 | + <div class="item same-height-row clearfix"> | ||
| 567 | + <div class="name"> | ||
| 568 | + <h5><?= Html::a( | ||
| 569 | + $page->lang->title, | ||
| 570 | + [ | ||
| 571 | + 'page/view', | ||
| 572 | + 'id' => $page->id, | ||
| 573 | + ] | ||
| 574 | + ) ?></h5> | ||
| 575 | + </div> | ||
| 576 | + </div> | ||
| 577 | + <?php } ?> | ||
| 632 | 578 | ||
| 633 | <div class="item same-height-row clearfix"> | 579 | <div class="item same-height-row clearfix"> |
| 634 | - <div class="image same-height-always"> | ||
| 635 | - <a href="#"> | ||
| 636 | - <img class="img-responsive" src="/img/detailsquare.jpg" alt=""> | ||
| 637 | - </a> | ||
| 638 | - </div> | ||
| 639 | - <div class="name same-height-always"> | ||
| 640 | - <h5><a href="#">Very very long blog post name</a></h5> | 580 | + <div class="name"> |
| 581 | + <h5><?= Html::a(\Yii::t('app', 'Контакты'), [ 'site/contact' ]) ?></h5> | ||
| 641 | </div> | 582 | </div> |
| 642 | </div> | 583 | </div> |
| 584 | + | ||
| 643 | </div> | 585 | </div> |
| 644 | 586 | ||
| 645 | <hr class="hidden-md hidden-lg"> | 587 | <hr class="hidden-md hidden-lg"> |
| 646 | 588 | ||
| 647 | </div> | 589 | </div> |
| 648 | - <!-- /.col-md-3 --> | ||
| 649 | 590 | ||
| 650 | <div class="col-md-3 col-sm-6"> | 591 | <div class="col-md-3 col-sm-6"> |
| 651 | - | ||
| 652 | - <h4><?php echo \Yii::t('app', 'Contact'); ?></h4> | ||
| 653 | - | ||
| 654 | - <p> | ||
| 655 | - <?php | ||
| 656 | - echo $settings->name ? Html::tag('strong', $settings->name) : ''; | ||
| 657 | - echo $settings->office ? Html::tag('br') . $settings->office : ''; | ||
| 658 | - echo $settings->street ? Html::tag( | ||
| 659 | - 'br' | ||
| 660 | - ) . $settings->street . ' ' . $settings->house : ''; | ||
| 661 | - echo $settings->city ? Html::tag('br') . $settings->city : ''; | ||
| 662 | - echo $settings->country ? Html::tag('br') . Html::tag( | ||
| 663 | - 'strong', | ||
| 664 | - $settings->country | ||
| 665 | - ) : ''; | ||
| 666 | - ?> | 592 | + |
| 593 | + <h4>Социальные сети</h4> | ||
| 594 | + | ||
| 595 | + <p class="socials-links"> | ||
| 596 | + <?php if (!empty($settings->facebook)) { ?> | ||
| 597 | + <a href="<?= $settings->facebook ?>"><i class="fa fa-facebook-official" aria-hidden="true"></i></a> | ||
| 598 | + <?php } | ||
| 599 | + if (!empty($settings->vk)) { ?> | ||
| 600 | + <a href="<?= $settings->vk ?>"><i class="fa fa-vk" aria-hidden="true"></i></a> | ||
| 601 | + <?php } | ||
| 602 | + if (!empty($settings->google)) { ?> | ||
| 603 | + <a href="<?= $settings->google ?>"><i class="fa fa-google-plus-square" aria-hidden="true"></i></a> | ||
| 604 | + <?php } | ||
| 605 | + if (!empty($settings->twitter)) { ?> | ||
| 606 | + <a href="<?= $settings->twitter ?>"><i class="fa fa-twitter-square" aria-hidden="true"></i></a> | ||
| 607 | + <?php } | ||
| 608 | + if (!empty($settings->ok)) { ?> | ||
| 609 | + <a href="<?= $settings->ok ?>"><i class="fa fa-odnoklassniki" aria-hidden="true"></i></a> | ||
| 610 | + <?php } ?> | ||
| 667 | </p> | 611 | </p> |
| 668 | - | ||
| 669 | - <a href="contact.html" class="btn btn-small btn-template-main">Go to contact page</a> | ||
| 670 | - | ||
| 671 | - <hr class="hidden-md hidden-lg hidden-sm"> | ||
| 672 | 612 | ||
| 673 | </div> | 613 | </div> |
| 674 | - <!-- /.col-md-3 --> | ||
| 675 | - | ||
| 676 | 614 | ||
| 677 | <div class="col-md-3 col-sm-6"> | 615 | <div class="col-md-3 col-sm-6"> |
| 678 | - | ||
| 679 | - <h4><?php echo \Yii::t('app', 'Photostream'); ?></h4> | ||
| 680 | - | ||
| 681 | - <div class="photostream"> | ||
| 682 | - <div> | ||
| 683 | - <a href="#"> | ||
| 684 | - <img src="/img/detailsquare.jpg" class="img-responsive" alt="#"> | ||
| 685 | - </a> | ||
| 686 | - </div> | ||
| 687 | - <div> | ||
| 688 | - <a href="#"> | ||
| 689 | - <img src="/img/detailsquare2.jpg" class="img-responsive" alt="#"> | ||
| 690 | - </a> | ||
| 691 | - </div> | ||
| 692 | - <div> | ||
| 693 | - <a href="#"> | ||
| 694 | - <img src="/img/detailsquare3.jpg" class="img-responsive" alt="#"> | ||
| 695 | - </a> | ||
| 696 | - </div> | ||
| 697 | - <div> | ||
| 698 | - <a href="#"> | ||
| 699 | - <img src="/img/detailsquare3.jpg" class="img-responsive" alt="#"> | ||
| 700 | - </a> | ||
| 701 | - </div> | ||
| 702 | - <div> | ||
| 703 | - <a href="#"> | ||
| 704 | - <img src="/img/detailsquare2.jpg" class="img-responsive" alt="#"> | ||
| 705 | - </a> | ||
| 706 | - </div> | ||
| 707 | - <div> | ||
| 708 | - <a href="#"> | ||
| 709 | - <img src="/img/detailsquare.jpg" class="img-responsive" alt="#"> | ||
| 710 | - </a> | ||
| 711 | - </div> | ||
| 712 | - </div> | 616 | + |
| 617 | + <h4>Контактная информация</h4> | ||
| 618 | + | ||
| 619 | + <p><strong><?= $settings->email ?></strong> | ||
| 620 | + <br><?= $settings->city . ',' ?> | ||
| 621 | + <br><?= $settings->street . ', ' . $settings->house ?> | ||
| 622 | + <br> | ||
| 623 | + <strong><?= $settings->country ?></strong> | ||
| 624 | + </p> | ||
| 625 | + | ||
| 626 | + <a href="contact.html" class="btn btn-small btn-template-main">Написать нам</a> | ||
| 627 | + | ||
| 628 | + <hr class="hidden-md hidden-lg hidden-sm"> | ||
| 713 | 629 | ||
| 714 | </div> | 630 | </div> |
| 715 | <!-- /.col-md-3 --> | 631 | <!-- /.col-md-3 --> |
| @@ -719,6 +635,8 @@ _________________________________________________________ --> | @@ -719,6 +635,8 @@ _________________________________________________________ --> | ||
| 719 | <!-- /#footer --> | 635 | <!-- /#footer --> |
| 720 | 636 | ||
| 721 | <!-- *** FOOTER END *** --> | 637 | <!-- *** FOOTER END *** --> |
| 638 | + | ||
| 639 | + | ||
| 722 | </div> | 640 | </div> |
| 723 | <!-- /#all --> | 641 | <!-- /#all --> |
| 724 | <?php $this->endBody() ?> | 642 | <?php $this->endBody() ?> |