rschneider/fitness-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix discount , using floor method, change version to 0.0.30

Browse Source
This commit is contained in:
Roland Schneider 2016-02-01 21:48:39 +01:00
parent 7b4fe04229
commit e9bdcb715d
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.txt
View File

@ -1,3 +1,5 @@
-0.0.30
- fix discount to integer ( using floor )
-0.0.29 -0.0.29
- change daily listings to use paid_by instead id_user - change daily listings to use paid_by instead id_user
- add customer cart details - add customer cart details

2
common/config/params.php
View File

@ -4,7 +4,7 @@ return [
'supportEmail' => 'rocho02@gmail.com', 'supportEmail' => 'rocho02@gmail.com',
'infoEmail' => 'info@rocho-net.hu', 'infoEmail' => 'info@rocho-net.hu',
'user.passwordResetTokenExpire' => 3600, 'user.passwordResetTokenExpire' => 3600,
'version' => 'v0.0.29', 'version' => 'v0.0.30',
'company' => 'movar',//gyor 'company' => 'movar',//gyor
'company_name' => "Freimann Kft.", 'company_name' => "Freimann Kft.",
'product_visiblity' => 'account',// on reception which products to display. account or global 'product_visiblity' => 'account',// on reception which products to display. account or global

2
common/models/Discount.php
View File

@ -114,7 +114,7 @@ class Discount extends \yii\db\ActiveRecord
* */ * */
public static function applyDiscount($money,$discount){ public static function applyDiscount($money,$discount){
$result = $money; $result = $money;
$valueOfDiscount = $money * $discount->value / 100; $valueOfDiscount = floor( $money * $discount->value / 100 );
$result = $money - $valueOfDiscount; $result = $money - $valueOfDiscount;
return $result; return $result;
} }

1
frontend/web/js/product.sell.js
View File

@ -527,6 +527,7 @@ function ProductSell(o){
if ( discount ){ if ( discount ){
result = price * ( discount.value / 100 ); result = price * ( discount.value / 100 );
result = Math.floor( result );
} }
return result; return result;