bike/Yellow-Bike-Database-Mirror
1
0
Fork 0
mirror of https://github.com/fspc/Yellow-Bike-Database.git synced 2025-02-22 17:03:22 -05:00
Code Issues Projects Releases Wiki Activity

Fixes a bug with then newest introduced volunteer benefits math.

Browse Source
This commit is contained in:
Jonathan Rosenbaum 2017-08-09 05:48:56 +00:00
parent 3f195f358b
commit a2ae9907e4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/transaction.js
View File

@ -640,7 +640,7 @@ $(function() {
exceeded_sweat_equity_limit = true; exceeded_sweat_equity_limit = true;
price_after_redeeming = price - (obj.volunteer_hour_value * ((obj.sweat_equity_limit / obj.volunteer_hour_value) - volunteer[year].volunteer_hours_redeemed)); price_after_redeeming = price - (obj.volunteer_hour_value * ((obj.sweat_equity_limit / obj.volunteer_hour_value) - volunteer[year].volunteer_hours_redeemed));
spinner_difference = (obj.sweat_equity_limit / obj.volunteer_hour_value) - volunteer[year].volunteer_hours_redeemed; spinner_difference = (obj.sweat_equity_limit / obj.volunteer_hour_value) - volunteer[year].volunteer_hours_redeemed;
//console.log(spinner_difference); //console.log(spinner_difference + " " + price_after_redeeming);
} }
} }
@ -692,7 +692,7 @@ $(function() {
// volunteer hours redeemed if the redeemable_value <= obj.sweat_equity_limit // volunteer hours redeemed if the redeemable_value <= obj.sweat_equity_limit
} else { } else {
if (exceeded_sweat_equity_limit === true) { if (exceeded_sweat_equity_limit === true) {
if (price_after_redeeming) { if (price_after_redeeming && price_after_redeeming && spinner_difference > 0) {
amount.val(price_after_redeeming - (((spinner_value - spinner_difference) * obj.volunteer_hour_value) * (discount / 100).toFixed(2))); amount.val(price_after_redeeming - (((spinner_value - spinner_difference) * obj.volunteer_hour_value) * (discount / 100).toFixed(2)));
} else { } else {
amount.val(price - (redeemable_value * (discount / 100).toFixed(2))); amount.val(price - (redeemable_value * (discount / 100).toFixed(2)));