Commit c7a9028a093b5bfb66830f2b32d9591c63b5f89b
1 parent
9f5f9ad2
products pick
Showing
2 changed files
with
4 additions
and
1 deletions
Show diff stats
src/app/backend/controllers/DiscountController.php
| @@ -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
| @@ -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 | { |