Commit 0fd837871e5ed70b38da200c2f62f9817067b7bd
1 parent
39420bfc
add/edit
Showing
2 changed files
with
7 additions
and
5 deletions
 
Show diff stats
src/app/backend/controllers/DiscountController.php
| @@ -167,25 +167,27 @@ class DiscountController extends Controller | @@ -167,25 +167,27 @@ class DiscountController extends Controller | ||
| 167 | 167 | ||
| 168 | } | 168 | } | 
| 169 | 169 | ||
| 170 | - | ||
| 171 | - //$data[0]['group_ids'] = $this->common->parseArray($data[0]['group_ids']); | ||
| 172 | - //$data[0]['catalog_ids'] = $this->common->parseArray($data[0]['catalog_ids']); | ||
| 173 | - | ||
| 174 | $catalog_temp = $this->common->getTypeSubtype1(NULL, $lang_id)['catalog']; | 170 | $catalog_temp = $this->common->getTypeSubtype1(NULL, $lang_id)['catalog']; | 
| 175 | usort($catalog_temp, $titlecmp); | 171 | usort($catalog_temp, $titlecmp); | 
| 176 | 172 | ||
| 177 | foreach($catalog_temp as &$group) { | 173 | foreach($catalog_temp as &$group) { | 
| 174 | + | ||
| 178 | usort($group['sub'], $titlecmp); | 175 | usort($group['sub'], $titlecmp); | 
| 176 | + | ||
| 179 | } | 177 | } | 
| 180 | 178 | ||
| 181 | if(!empty($data[0]['group_ids'][0])) { | 179 | if(!empty($data[0]['group_ids'][0])) { | 
| 180 | + | ||
| 182 | $groups = $this->models->getItems()->getItemsByIds($lang_id, $data[0]['group_ids']); | 181 | $groups = $this->models->getItems()->getItemsByIds($lang_id, $data[0]['group_ids']); | 
| 183 | usort($groups, $titlecmp); | 182 | usort($groups, $titlecmp); | 
| 183 | + | ||
| 184 | } | 184 | } | 
| 185 | 185 | ||
| 186 | foreach($data as $k => $i) { | 186 | foreach($data as $k => $i) { | 
| 187 | + | ||
| 187 | if(isset($i['image']) && !empty($i['image'])) | 188 | if(isset($i['image']) && !empty($i['image'])) | 
| 188 | $data[$k]['image'] = $this->storage->getPhotoURL($i['image'], 'promo_codes', 'original'); | 189 | $data[$k]['image'] = $this->storage->getPhotoURL($i['image'], 'promo_codes', 'original'); | 
| 190 | + | ||
| 189 | } | 191 | } | 
| 190 | 192 | ||
| 191 | 193 | 
src/app/backend/views/discount/index.php
| @@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
| 19 | <div class="content_wrapper float"> | 19 | <div class="content_wrapper float"> | 
| 20 | <div class="h_700"> | 20 | <div class="h_700"> | 
| 21 | <div class="content_wrapper_list clearfix"> | 21 | <div class="content_wrapper_list clearfix"> | 
| 22 | - <div class="table_name header_gradient">discounts</div> | 22 | + <div class="table_name header_gradient">Скидки</div> | 
| 23 | <div class="table_add_page"><a href="<?= $this->url->get([ 'for' => 'discount_add' ]) ?>" title="Добавить">Добавить</a></div> | 23 | <div class="table_add_page"><a href="<?= $this->url->get([ 'for' => 'discount_add' ]) ?>" title="Добавить">Добавить</a></div> | 
| 24 | 24 | ||
| 25 | <div class="table_pages_wrapper"> | 25 | <div class="table_pages_wrapper"> | 
