Commit 66169da66aa92aae3621723c9ff63c7bc1885b7f
1 parent
7fdb1f47
basket fix test
Showing
1 changed file
with
15 additions
and
16 deletions
Show diff stats
src/app/frontend/controllers/PageController.php
| @@ -1122,23 +1122,22 @@ | @@ -1122,23 +1122,22 @@ | ||
| 1122 | ]); | 1122 | ]); |
| 1123 | } | 1123 | } |
| 1124 | 1124 | ||
| 1125 | - $discount = 0; | ||
| 1126 | //discount | 1125 | //discount |
| 1127 | -// $discount = $this->models->getDiscount()->getActiveData(); | ||
| 1128 | -// if (!empty($discount)) { | ||
| 1129 | -// $discount = $discount[0]; | ||
| 1130 | -// $discount['group_ids'] = str_replace('{', '', $discount['group_ids']); | ||
| 1131 | -// $discount['group_ids'] = str_replace('}', '', $discount['group_ids']); | ||
| 1132 | -// $discount['group_ids'] = explode(',', $discount['group_ids']); | ||
| 1133 | -// if ($discount['discount'] > 0 && $discount['discount'] <= 100 && in_array($item_id, $discount['group_ids'])) { | ||
| 1134 | -// $discount = $discount['discount']; | ||
| 1135 | -// } | ||
| 1136 | -// else { | ||
| 1137 | -// $discount = 0; | ||
| 1138 | -// } | ||
| 1139 | -// } else { | ||
| 1140 | -// $discount = 0; | ||
| 1141 | -// } | 1126 | + $discount = $this->models->getDiscount()->getActiveData(); |
| 1127 | + if (!empty($discount)) { | ||
| 1128 | + $discount = $discount[0]; | ||
| 1129 | + $discount['group_ids'] = str_replace('{', '', $discount['group_ids']); | ||
| 1130 | + $discount['group_ids'] = str_replace('}', '', $discount['group_ids']); | ||
| 1131 | + $discount['group_ids'] = explode(',', $discount['group_ids']); | ||
| 1132 | + if ($discount['discount'] > 0 && $discount['discount'] <= 100 && in_array($item_id, $discount['group_ids'])) { | ||
| 1133 | + $discount = $discount['discount']; | ||
| 1134 | + } | ||
| 1135 | + else { | ||
| 1136 | + $discount = 0; | ||
| 1137 | + } | ||
| 1138 | + } else { | ||
| 1139 | + $discount = 0; | ||
| 1140 | + } | ||
| 1142 | //vip | 1141 | //vip |
| 1143 | $users_group_id = $this->session->get('users_group_id'); | 1142 | $users_group_id = $this->session->get('users_group_id'); |
| 1144 | 1143 |