Commit 9ebe6e903a3e45a83daae25682abcdcccbe7fb66
1 parent
23e06da6
price display
Showing
2 changed files
with
15 additions
and
3 deletions
Show diff stats
src/app/frontend/controllers/PageController.php
| @@ -703,6 +703,14 @@ | @@ -703,6 +703,14 @@ | ||
| 703 | $catalog_sales[] = $active_sales[$k]; | 703 | $catalog_sales[] = $active_sales[$k]; |
| 704 | } | 704 | } |
| 705 | } | 705 | } |
| 706 | + | ||
| 707 | + $discount = $this->models->getDiscount()->getActiveData(); | ||
| 708 | + if (!empty($discount)) { | ||
| 709 | + $discount = $discount[0]; | ||
| 710 | + $discount['group_ids'] = str_replace('{', '', $discount['group_ids']); | ||
| 711 | + $discount['group_ids'] = str_replace('}', '', $discount['group_ids']); | ||
| 712 | + $discount['group_ids'] = explode(',', $discount['group_ids']); | ||
| 713 | + } | ||
| 706 | 714 | ||
| 707 | $cssSale = [ | 715 | $cssSale = [ |
| 708 | 'https://fonts.googleapis.com/css?family=Ubuntu:400,700,400italic', | 716 | 'https://fonts.googleapis.com/css?family=Ubuntu:400,700,400italic', |
| @@ -744,8 +752,9 @@ | @@ -744,8 +752,9 @@ | ||
| 744 | 'meta_link_next' => $meta_link_next[1], | 752 | 'meta_link_next' => $meta_link_next[1], |
| 745 | 'meta_link_prev' => $meta_link_prev[1], | 753 | 'meta_link_prev' => $meta_link_prev[1], |
| 746 | 'catalog_sales' => $catalog_sales, | 754 | 'catalog_sales' => $catalog_sales, |
| 747 | - 'css' => $cssSale, | ||
| 748 | - 'js' => $jsSale | 755 | + 'css' => $cssSale, |
| 756 | + 'js' => $jsSale, | ||
| 757 | + 'discount' => $discount | ||
| 749 | ]); | 758 | ]); |
| 750 | } | 759 | } |
| 751 | 760 |
src/app/frontend/views/page/subtype.php
| @@ -197,7 +197,10 @@ | @@ -197,7 +197,10 @@ | ||
| 197 | $minPrice = 0; | 197 | $minPrice = 0; |
| 198 | ?> | 198 | ?> |
| 199 | <?php foreach ($groups as $k => $i): ?> | 199 | <?php foreach ($groups as $k => $i): ?> |
| 200 | - <?php $this->partial('partial/item_group', ['k' => $k, 'i' => $i, 'limit' => 3, 'discount' => $discount]) ?> | 200 | + <?php |
| 201 | + if (empty($discount)) $discount = 0; | ||
| 202 | + $this->partial('partial/item_group', ['k' => $k, 'i' => $i, 'limit' => 3, 'discount' => $discount]) | ||
| 203 | + ?> | ||
| 201 | <?php | 204 | <?php |
| 202 | if ($i['price'] > $maxPrice) { | 205 | if ($i['price'] > $maxPrice) { |
| 203 | $maxPrice = $i['price']; | 206 | $maxPrice = $i['price']; |