Alex Savenko / semena

Commit 0abd76694098b114daeb24f4d576c93f5395e257

Authored by Alex Savenko
2 parents f05aac7f c7a9028a

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

Showing 2 changed files with 4 additions and 1 deletions   Show diff stats
Inline Side-by-side
src/app/backend/controllers/DiscountController.php
  Show/Hide comments   View file @0abd766
@@ -198,6 +198,9 @@ class DiscountController extends Controller @@ -198,6 +198,9 @@ class DiscountController extends Controller
198 198
199 } 199 }
200 200
  201 + $data[0]['group_ids'] = $this->common->parseArray($data[0]['group_ids']);
  202 + $data[0]['catalog_ids'] = $this->common->parseArray($data[0]['catalog_ids']);
  203 +
201 $catalog_temp = $this->common->getTypeSubtype1(NULL, $lang_id)['catalog']; 204 $catalog_temp = $this->common->getTypeSubtype1(NULL, $lang_id)['catalog'];
202 usort($catalog_temp, $titlecmp); 205 usort($catalog_temp, $titlecmp);
203 206
src/lib/models.php
  Show/Hide comments   View file @0abd766
@@ -84,7 +84,7 @@ namespace @@ -84,7 +84,7 @@ namespace
84 * @author Jane Bezmaternykh 84 * @author Jane Bezmaternykh
85 * @version 0.1.20140327 85 * @version 0.1.20140327
86 * 86 *
87 - * @return obj 87 + * @return \models\items
88 */ 88 */
89 public function getItems() 89 public function getItems()
90 { 90 {