From 15f3892a27542f8a01ee86a28ff103709d8d6566 Mon Sep 17 00:00:00 2001
From: Alex <program.artweb@gmail.com>
Date: Tue, 31 Jan 2017 13:36:28 +0200
Subject: [PATCH] tab

---
 src/app/frontend/controllers/AjaxController.php | 39 ++++++++++++++++++++++++---------------
 src/app/frontend/controllers/MenuController.php |  1 -
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/app/frontend/controllers/AjaxController.php b/src/app/frontend/controllers/AjaxController.php
index 017d2cf..42698cd 100644
--- a/src/app/frontend/controllers/AjaxController.php
+++ b/src/app/frontend/controllers/AjaxController.php
@@ -11,41 +11,50 @@ class AjaxController extends \controllers\ControllerBase
 {
     ///////////////////////////////////////////////////////////////////////////
 
-    public function getItemsAction(  )
-    {
+    public function getItemsAction() {
+
         header('Content-Type: application/json; charset=utf8');
-       
-        $term       = $this->request->getPost('term', 'string', '' );
 
-        $items_     = $this->models->getItems()->getItemsByTermFromCatalog( $term, 'items_dropdown', 1, $this->lang_id );
+        $term   = $this->request->getPost('term', 'string', '');
+
+        $items_ = $this->models->getItems()->getItemsByTermFromCatalog($term, 'items_dropdown', 1, $this->lang_id);
+
         if(!$items_) {
-            $items_     = $this->models->getItems()->getItemsByTerm( $term, 'items_dropdown', 1, $this->lang_id );
+
+            $items_ = $this->models->getItems()->getItemsByTerm($term, 'items_dropdown', 1, $this->lang_id);
+
         }
 
-        $items      = [];
-        if( !empty( $items_ ) )
-        {
-            $items_ids  = $this->common->array_column( $items_, 'item_id' );
+        $items = [];
+
+        if(!empty($items_)) {
+
+            $items_ids = $this->common->array_column($items_, 'item_id');
 
             //discount
             $discount = $this->models->getDiscount()->getActiveData();
             $discount = $this->models->getDiscount()->explodeGroupIds($discount);
             $discount = $discount[0];
 
-            $items      = $this->models->getItems()->getItemsByIds( $this->lang_id, $items_ids );
-            foreach( $items as &$i )
-            {
+            $items = $this->models->getItems()->getItemsByIds( $this->lang_id, $items_ids );
 
-                $i['cover']         = !empty( $i['group_cover'] ) ? $this->storage->getPhotoUrl( $i['group_cover'], 'avatar', '200x' ) : '/images/packet.jpg';
-                $i['alias']         = $this->seoUrl->setUrl($this->url->get([ 'for' => 'item', 'subtype' => $i['catalog_alias'], 'group_alias' => $i['group_alias'], 'item_id' => $i['id'] ]));
+            foreach($items as &$i) {
+
+                $i['cover'] = !empty( $i['group_cover'] ) ? $this->storage->getPhotoUrl( $i['group_cover'], 'avatar', '200x' ) : '/images/packet.jpg';
+                $i['alias'] = $this->seoUrl->setUrl($this->url->get([ 'for' => 'item', 'subtype' => $i['catalog_alias'], 'group_alias' => $i['group_alias'], 'item_id' => $i['id'] ]));
 
                 if ($discount['discount'] > 0 && $discount['discount'] <= 100 && in_array($i['id'], $discount['group_ids'])) {
+
                     $i['discounted_price'] = round($i['price2']*(1-$discount['discount']/100), 1);
+
                 }
+
             }
+
         }
 
         die( json_encode( $items ) );
+
     }
 
 
diff --git a/src/app/frontend/controllers/MenuController.php b/src/app/frontend/controllers/MenuController.php
index fb9d2b4..40e9f95 100644
--- a/src/app/frontend/controllers/MenuController.php
+++ b/src/app/frontend/controllers/MenuController.php
@@ -421,7 +421,6 @@ class MenuController extends \controllers\ControllerBase
         }
 
         //discount
-
         $discount = $this->models->getDiscount()->getActiveData();
         if (!empty($discount)) {
             $discount = $discount[0];
--
libgit2 0.21.4