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

Alex Savenko
2 parents f97bb77c 7851a50f
Showing 2 changed files with 10 additions and 3 deletions Show diff stats
src/app/frontend/controllers/PageController.php
src/app/frontend/views/partial/item_group.php
@@ -799,7 +799,6 @@
             if( !empty( $type_child ) )
             {
                 $type_alias     = $type.'--'.$type_child;
-                
             }
             else
             {
@@ -883,7 +882,7 @@
                     $news[$k]['link'] = $this->url->get(['for' => 'one_tips', 'tips_id' => $n['id'], 'tips_alias' => $n['alias']]);
                 }
-                // get popular items_groups
+                //            get popular items_groups
                 //
                 //            $popular_groups = $this->models->getItems()->getPopularItems($this->lang_id);
                 //            $popular_groups = $this->common->explodeAlias($popular_groups);
@@ -1470,15 +1469,19 @@
         public function aboutuaAction(){
             $this->view->setMainView('about_ukr');
         }
+
         public function aboutengAction(){
             $this->view->setMainView('about_eng');
         }
+
         public function please_returnAction(){
             $this->view->setMainView('please_return');
         }
-		public function basket_uaAction(){
+
+        public function basket_uaAction(){
 			$this->view->setMainView('basket_ua');
         }
+
         public function basket_ruAction(){
 			$this->view->setMainView('basket_ru');
         }
@@ -39,11 +39,15 @@
                     echo '<span style="text-decoration: line-through;"><span>'.$i['price'].'</span></span> грн<br/>';
                     echo '<span>'.round($i['price']*(1-$discount['discount']/100), 1).'</span> грн';
                 }
+                else {
+                    echo '<span>'.$i['price'].'</span> грн';
+                }
             }
             else {
                 echo '<span>'.$i['price'].'</span> грн';
             }
             ?>
+            <span><?= $i['price']; ?></span> грн
         </div>
         <div class="one_item_buttons">
             <a href="<?= $this->seoUrl->setUrl($i['alias']) ?>" title="" class="btn grey"><?= $t->_("details") ?></a>