Alex Savenko / semena

Commit 6b2fc3db459cd94225f9ebcaa42e37e66194f922

Authored by Alex Savenko
2 parents f97bb77c 7851a50f

Merge branch 'discount' of gitlab.artweb.com.ua:Alex/semena

Showing 2 changed files with 10 additions and 3 deletions   Show diff stats
Inline Side-by-side
src/app/frontend/controllers/PageController.php
  Show/Hide comments   View file @6b2fc3d
... ... @@ -799,7 +799,6 @@
799 799 if( !empty( $type_child ) )
800 800 {
801 801 $type_alias = $type.'--'.$type_child;
802   -
803 802 }
804 803 else
805 804 {
... ... @@ -883,7 +882,7 @@
883 882 $news[$k]['link'] = $this->url->get(['for' => 'one_tips', 'tips_id' => $n['id'], 'tips_alias' => $n['alias']]);
884 883 }
885 884  
886   - // get popular items_groups
  885 + // get popular items_groups
887 886 //
888 887 // $popular_groups = $this->models->getItems()->getPopularItems($this->lang_id);
889 888 // $popular_groups = $this->common->explodeAlias($popular_groups);
... ... @@ -1470,15 +1469,19 @@
1470 1469 public function aboutuaAction(){
1471 1470 $this->view->setMainView('about_ukr');
1472 1471 }
  1472 +
1473 1473 public function aboutengAction(){
1474 1474 $this->view->setMainView('about_eng');
1475 1475 }
  1476 +
1476 1477 public function please_returnAction(){
1477 1478 $this->view->setMainView('please_return');
1478 1479 }
1479   - public function basket_uaAction(){
  1480 +
  1481 + public function basket_uaAction(){
1480 1482 $this->view->setMainView('basket_ua');
1481 1483 }
  1484 +
1482 1485 public function basket_ruAction(){
1483 1486 $this->view->setMainView('basket_ru');
1484 1487 }
... ...
src/app/frontend/views/partial/item_group.php
  Show/Hide comments   View file @6b2fc3d
... ... @@ -39,11 +39,15 @@
39 39 echo '<span style="text-decoration: line-through;"><span>'.$i['price'].'</span></span> грн<br/>';
40 40 echo '<span>'.round($i['price']*(1-$discount['discount']/100), 1).'</span> грн';
41 41 }
  42 + else {
  43 + echo '<span>'.$i['price'].'</span> грн';
  44 + }
42 45 }
43 46 else {
44 47 echo '<span>'.$i['price'].'</span> грн';
45 48 }
46 49 ?>
  50 + <span><?= $i['price']; ?></span> грн
47 51 </div>
48 52 <div class="one_item_buttons">
49 53 <a href="<?= $this->seoUrl->setUrl($i['alias']) ?>" title="" class="btn grey"><?= $t->_("details") ?></a>
... ...