Commit 8cff44e308bc1d7c9bc9dca302125218e3a044e6
1 parent
080132b6
fix
Showing
2 changed files
with
25 additions
and
7 deletions
Show diff stats
src/app/frontend/controllers/PageController.php
| @@ -5,7 +5,12 @@ | @@ -5,7 +5,12 @@ | ||
| 5 | 5 | ||
| 6 | /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// | 6 | /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// |
| 7 | use \Phalcon\Mvc\View; | 7 | use \Phalcon\Mvc\View; |
| 8 | - | 8 | + |
| 9 | + /** | ||
| 10 | + * Class PageController | ||
| 11 | + * @package controllers | ||
| 12 | + * @param $this \models | ||
| 13 | + */ | ||
| 9 | class PageController extends \controllers\ControllerBase | 14 | class PageController extends \controllers\ControllerBase |
| 10 | { | 15 | { |
| 11 | /////////////////////////////////////////////////////////////////////////// | 16 | /////////////////////////////////////////////////////////////////////////// |
| @@ -1436,12 +1441,13 @@ | @@ -1436,12 +1441,13 @@ | ||
| 1436 | 1441 | ||
| 1437 | //discount | 1442 | //discount |
| 1438 | $discount = $this->models->getDiscount()->getActiveData(); | 1443 | $discount = $this->models->getDiscount()->getActiveData(); |
| 1439 | - if (!empty($discount)) { | ||
| 1440 | - $discount = $discount[0]; | ||
| 1441 | - $discount['group_ids'] = str_replace('{', '', $discount['group_ids']); | ||
| 1442 | - $discount['group_ids'] = str_replace('}', '', $discount['group_ids']); | ||
| 1443 | - $discount['group_ids'] = explode(',', $discount['group_ids']); | ||
| 1444 | - } | 1444 | + $discount = $this->models->getDiscount()->explodeGroupIds($discount); |
| 1445 | +// if (!empty($discount)) { | ||
| 1446 | +// $discount = $discount[0]; | ||
| 1447 | +// $discount['group_ids'] = str_replace('{', '', $discount['group_ids']); | ||
| 1448 | +// $discount['group_ids'] = str_replace('}', '', $discount['group_ids']); | ||
| 1449 | +// $discount['group_ids'] = explode(',', $discount['group_ids']); | ||
| 1450 | +// } | ||
| 1445 | 1451 | ||
| 1446 | $this->view->setVars([ | 1452 | $this->view->setVars([ |
| 1447 | 'groups' => $items, | 1453 | 'groups' => $items, |
src/lib/models/discount.php
| @@ -255,4 +255,16 @@ class discount extends \db | @@ -255,4 +255,16 @@ class discount extends \db | ||
| 255 | ); | 255 | ); |
| 256 | } | 256 | } |
| 257 | 257 | ||
| 258 | + public static function explodeGroupIds($discounts_array) { | ||
| 259 | + | ||
| 260 | + foreach ($discounts_array as &$discount) { | ||
| 261 | + $discount['group_ids'] = str_replace('{', '', $discount['group_ids']); | ||
| 262 | + $discount['group_ids'] = str_replace('}', '', $discount['group_ids']); | ||
| 263 | + $discount['group_ids'] = explode(',', $discount['group_ids']); | ||
| 264 | + } | ||
| 265 | + | ||
| 266 | + return $discounts_array; | ||
| 267 | + | ||
| 268 | + } | ||
| 269 | + | ||
| 258 | } | 270 | } |
| 259 | \ No newline at end of file | 271 | \ No newline at end of file |