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

Alex Savenko
2 parents 2b03041a 0fd83787
Showing 2 changed files with 7 additions and 5 deletions Show diff stats
src/app/backend/controllers/DiscountController.php
src/app/backend/views/discount/index.php
@@ -167,25 +167,27 @@ class DiscountController extends Controller
         }
-
-        //$data[0]['group_ids'] = $this->common->parseArray($data[0]['group_ids']);
-        //$data[0]['catalog_ids'] = $this->common->parseArray($data[0]['catalog_ids']);
-
         $catalog_temp = $this->common->getTypeSubtype1(NULL, $lang_id)['catalog'];
         usort($catalog_temp, $titlecmp);
         foreach($catalog_temp as &$group) {
+
             usort($group['sub'], $titlecmp);
+
         }
         if(!empty($data[0]['group_ids'][0])) {
+
             $groups = $this->models->getItems()->getItemsByIds($lang_id, $data[0]['group_ids']);
             usort($groups, $titlecmp);
+
         }
         foreach($data as $k => $i) {
+
             if(isset($i['image']) && !empty($i['image']))
                 $data[$k]['image'] = $this->storage->getPhotoURL($i['image'], 'promo_codes', 'original');
+
         }
@@ -19,7 +19,7 @@
         <div class="content_wrapper float">
             <div class="h_700">
                 <div class="content_wrapper_list clearfix">
-                    <div class="table_name header_gradient">discounts</div>
+                    <div class="table_name header_gradient">Скидки</div>
                     <div class="table_add_page"><a href="<?= $this->url->get([ 'for' => 'discount_add' ]) ?>" title="Добавить">Добавить</a></div>
                     <div class="table_pages_wrapper">