Commit a349984a15257051f9a66df3929deb6715544be8
Merge branch 'discount' of gitlab.artweb.com.ua:Alex/semena
Showing
1 changed file
with
4 additions
and
2 deletions
Show diff stats
src/app/backend/controllers/DiscountController.php
| @@ -167,6 +167,7 @@ class DiscountController extends Controller | @@ -167,6 +167,7 @@ class DiscountController extends Controller | ||
| 167 | 167 | ||
| 168 | } | 168 | } |
| 169 | 169 | ||
| 170 | + /* | ||
| 170 | $data[0]['group_ids'] = $this->common->parseArray($data[0]['group_ids']); | 171 | $data[0]['group_ids'] = $this->common->parseArray($data[0]['group_ids']); |
| 171 | $data[0]['catalog_ids'] = $this->common->parseArray($data[0]['catalog_ids']); | 172 | $data[0]['catalog_ids'] = $this->common->parseArray($data[0]['catalog_ids']); |
| 172 | 173 | ||
| @@ -186,13 +187,14 @@ class DiscountController extends Controller | @@ -186,13 +187,14 @@ class DiscountController extends Controller | ||
| 186 | if(isset($i['image']) && !empty($i['image'])) | 187 | if(isset($i['image']) && !empty($i['image'])) |
| 187 | $data[$k]['image'] = $this->storage->getPhotoURL($i['image'], 'promo_codes', 'original'); | 188 | $data[$k]['image'] = $this->storage->getPhotoURL($i['image'], 'promo_codes', 'original'); |
| 188 | } | 189 | } |
| 190 | + */ | ||
| 189 | 191 | ||
| 190 | $this->view->pick( 'discount/addEdit' ); | 192 | $this->view->pick( 'discount/addEdit' ); |
| 191 | 193 | ||
| 192 | $this->view->setVars([ | 194 | $this->view->setVars([ |
| 193 | 'page' => $data, | 195 | 'page' => $data, |
| 194 | - 'catalog_temp' => $catalog_temp, | ||
| 195 | - 'groups' => !empty($groups) ? $groups : null | 196 | + //'catalog_temp' => $catalog_temp, |
| 197 | + //'groups' => !empty($groups) ? $groups : null | ||
| 196 | ]); | 198 | ]); |
| 197 | 199 | ||
| 198 | } | 200 | } |