Commit a14db9e59a46548f1c1ae25b91c8e0108ba8adac

Authored by Alex Savenko
1 parent a4148c0e

price display

src/app/frontend/controllers/PageController.php
@@ -798,7 +798,6 @@ @@ -798,7 +798,6 @@
798 if( !empty( $type_child ) ) 798 if( !empty( $type_child ) )
799 { 799 {
800 $type_alias = $type.'--'.$type_child; 800 $type_alias = $type.'--'.$type_child;
801 -  
802 } 801 }
803 else 802 else
804 { 803 {
@@ -882,7 +881,7 @@ @@ -882,7 +881,7 @@
882 $news[$k]['link'] = $this->url->get(['for' => 'one_tips', 'tips_id' => $n['id'], 'tips_alias' => $n['alias']]); 881 $news[$k]['link'] = $this->url->get(['for' => 'one_tips', 'tips_id' => $n['id'], 'tips_alias' => $n['alias']]);
883 } 882 }
884 883
885 - // get popular items_groups 884 + // get popular items_groups
886 // 885 //
887 // $popular_groups = $this->models->getItems()->getPopularItems($this->lang_id); 886 // $popular_groups = $this->models->getItems()->getPopularItems($this->lang_id);
888 // $popular_groups = $this->common->explodeAlias($popular_groups); 887 // $popular_groups = $this->common->explodeAlias($popular_groups);
@@ -1469,15 +1468,19 @@ @@ -1469,15 +1468,19 @@
1469 public function aboutuaAction(){ 1468 public function aboutuaAction(){
1470 $this->view->setMainView('about_ukr'); 1469 $this->view->setMainView('about_ukr');
1471 } 1470 }
  1471 +
1472 public function aboutengAction(){ 1472 public function aboutengAction(){
1473 $this->view->setMainView('about_eng'); 1473 $this->view->setMainView('about_eng');
1474 } 1474 }
  1475 +
1475 public function please_returnAction(){ 1476 public function please_returnAction(){
1476 $this->view->setMainView('please_return'); 1477 $this->view->setMainView('please_return');
1477 } 1478 }
1478 - public function basket_uaAction(){ 1479 +
  1480 + public function basket_uaAction(){
1479 $this->view->setMainView('basket_ua'); 1481 $this->view->setMainView('basket_ua');
1480 } 1482 }
  1483 +
1481 public function basket_ruAction(){ 1484 public function basket_ruAction(){
1482 $this->view->setMainView('basket_ru'); 1485 $this->view->setMainView('basket_ru');
1483 } 1486 }
src/app/frontend/views/partial/item_group.php
@@ -39,6 +39,9 @@ @@ -39,6 +39,9 @@
39 echo '<span style="text-decoration: line-through;"><span>'.$i['price'].'</span></span> грн<br/>'; 39 echo '<span style="text-decoration: line-through;"><span>'.$i['price'].'</span></span> грн<br/>';
40 echo '<span>'.round($i['price']*(1-$discount['discount']/100), 1).'</span> грн'; 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 else { 46 else {
44 echo '<span>'.$i['price'].'</span> грн'; 47 echo '<span>'.$i['price'].'</span> грн';