Commit d71db4e8c8f38f8a1a22915701ddc19ae30677dd
1 parent
2060495f
price fix (1-%)
Showing
2 changed files
with
4 additions
and
4 deletions
Show diff stats
src/app/frontend/controllers/PageController.php
| @@ -1429,7 +1429,7 @@ | @@ -1429,7 +1429,7 @@ | ||
| 1429 | $i['cover'] = !empty( $i['group_cover'] ) ? $this->storage->getPhotoUrl( $i['group_cover'], 'avatar', '200x' ) : '/images/packet.jpg'; | 1429 | $i['cover'] = !empty( $i['group_cover'] ) ? $this->storage->getPhotoUrl( $i['group_cover'], 'avatar', '200x' ) : '/images/packet.jpg'; |
| 1430 | $i['alias'] = $this->url->get([ 'for' => 'item', 'type' => $i['type_alias'], 'subtype' => $i['subtype_alias'], 'group_alias' => $i['group_alias'], 'item_id' => $i['id'] ]); | 1430 | $i['alias'] = $this->url->get([ 'for' => 'item', 'type' => $i['type_alias'], 'subtype' => $i['subtype_alias'], 'group_alias' => $i['group_alias'], 'item_id' => $i['id'] ]); |
| 1431 | $i['price'] = $i['price2']; | 1431 | $i['price'] = $i['price2']; |
| 1432 | - $i['price'] = $i['price']*($users_group_discount/100); | 1432 | + $i['price'] = $i['price']*(1-$users_group_discount/100); |
| 1433 | $i['type_id'] = $i['type']; | 1433 | $i['type_id'] = $i['type']; |
| 1434 | $i['id'] = $i['group_id']; | 1434 | $i['id'] = $i['group_id']; |
| 1435 | 1435 | ||
| @@ -1596,7 +1596,7 @@ | @@ -1596,7 +1596,7 @@ | ||
| 1596 | $num = count($items); | 1596 | $num = count($items); |
| 1597 | for($i=0; $i<$num; $i++){ | 1597 | for($i=0; $i<$num; $i++){ |
| 1598 | $items[$i]['full_alias'] = $this->models->getCatalog()->getFullAlias($this->lang_id, $items[$i]['catalog'])[0]['full_alias']; | 1598 | $items[$i]['full_alias'] = $this->models->getCatalog()->getFullAlias($this->lang_id, $items[$i]['catalog'])[0]['full_alias']; |
| 1599 | - $items[$i]['price2'] = round($items[$i]['price2']*($users_group_discount/100), 1); | 1599 | + $items[$i]['price2'] = round($items[$i]['price2']*(1-$users_group_discount/100), 1); |
| 1600 | } | 1600 | } |
| 1601 | 1601 | ||
| 1602 | foreach( $properties as $p ) | 1602 | foreach( $properties as $p ) |
src/lib/common.php
| @@ -805,7 +805,7 @@ namespace | @@ -805,7 +805,7 @@ namespace | ||
| 805 | $g['checked'] = !empty($compare[$g['type_id']][$g['catalog']]) && in_array($g['id'], $compare[$g['type_id']][$g['catalog']]) ? 1 : 0; | 805 | $g['checked'] = !empty($compare[$g['type_id']][$g['catalog']]) && in_array($g['id'], $compare[$g['type_id']][$g['catalog']]) ? 1 : 0; |
| 806 | 806 | ||
| 807 | if (isset($users_group_id)) | 807 | if (isset($users_group_id)) |
| 808 | - $g['price'] = $g['price']*($users_group_discount/100); | 808 | + $g['price'] = $g['price']*(1-$users_group_discount/100); |
| 809 | 809 | ||
| 810 | if( !empty( $g['options'] ) ) | 810 | if( !empty( $g['options'] ) ) |
| 811 | { | 811 | { |
| @@ -1242,7 +1242,7 @@ namespace | @@ -1242,7 +1242,7 @@ namespace | ||
| 1242 | for ($i = $price_first; $i < $price_last + 1; $i++) { | 1242 | for ($i = $price_first; $i < $price_last + 1; $i++) { |
| 1243 | 1243 | ||
| 1244 | if (isset($users_group_id)) { | 1244 | if (isset($users_group_id)) { |
| 1245 | - $prices[] = $item['price' . $i]*($users_group_discount/100); | 1245 | + $prices[] = $item['price' . $i]*(1-$users_group_discount/100); |
| 1246 | } else { | 1246 | } else { |
| 1247 | $prices[] = $item['price' . $i]; | 1247 | $prices[] = $item['price' . $i]; |
| 1248 | } | 1248 | } |