From d71db4e8c8f38f8a1a22915701ddc19ae30677dd Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 30 Jan 2017 18:33:51 +0200 Subject: [PATCH] price fix (1-%) --- src/app/frontend/controllers/PageController.php | 4 ++-- src/lib/common.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/frontend/controllers/PageController.php b/src/app/frontend/controllers/PageController.php index 7c201b4..845c94f 100644 --- a/src/app/frontend/controllers/PageController.php +++ b/src/app/frontend/controllers/PageController.php @@ -1429,7 +1429,7 @@ $i['cover'] = !empty( $i['group_cover'] ) ? $this->storage->getPhotoUrl( $i['group_cover'], 'avatar', '200x' ) : '/images/packet.jpg'; $i['alias'] = $this->url->get([ 'for' => 'item', 'type' => $i['type_alias'], 'subtype' => $i['subtype_alias'], 'group_alias' => $i['group_alias'], 'item_id' => $i['id'] ]); $i['price'] = $i['price2']; - $i['price'] = $i['price']*($users_group_discount/100); + $i['price'] = $i['price']*(1-$users_group_discount/100); $i['type_id'] = $i['type']; $i['id'] = $i['group_id']; @@ -1596,7 +1596,7 @@ $num = count($items); for($i=0; $i<$num; $i++){ $items[$i]['full_alias'] = $this->models->getCatalog()->getFullAlias($this->lang_id, $items[$i]['catalog'])[0]['full_alias']; - $items[$i]['price2'] = round($items[$i]['price2']*($users_group_discount/100), 1); + $items[$i]['price2'] = round($items[$i]['price2']*(1-$users_group_discount/100), 1); } foreach( $properties as $p ) diff --git a/src/lib/common.php b/src/lib/common.php index 55d4344..2c5de9f 100644 --- a/src/lib/common.php +++ b/src/lib/common.php @@ -805,7 +805,7 @@ namespace $g['checked'] = !empty($compare[$g['type_id']][$g['catalog']]) && in_array($g['id'], $compare[$g['type_id']][$g['catalog']]) ? 1 : 0; if (isset($users_group_id)) - $g['price'] = $g['price']*($users_group_discount/100); + $g['price'] = $g['price']*(1-$users_group_discount/100); if( !empty( $g['options'] ) ) { @@ -1242,7 +1242,7 @@ namespace for ($i = $price_first; $i < $price_last + 1; $i++) { if (isset($users_group_id)) { - $prices[] = $item['price' . $i]*($users_group_discount/100); + $prices[] = $item['price' . $i]*(1-$users_group_discount/100); } else { $prices[] = $item['price' . $i]; } -- libgit2 0.21.4