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

Cleans up the code a little bit.

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

4
js/transaction.js
View File

@ -629,7 +629,7 @@ $(function() {
discount = obj.volunteer_discount; discount = obj.volunteer_discount;
} }
// figure out remaining hours that can be redeemed if volunteer hours have been redeemed. // figure out remaining hours that can be redeemed if some, but not all, volunteer hours have been redeemed.
var remaining, year = d.getFullYear(), exceeded_sweat_equity_limit = false, price_after_redeeming, spinner_difference; var remaining, year = d.getFullYear(), exceeded_sweat_equity_limit = false, price_after_redeeming, spinner_difference;
if (volunteer) { if (volunteer) {
var vhr = obj.volunteer_hour_value * volunteer[year].volunteer_hours_redeemed + (spinner_value * obj.volunteer_hour_value); var vhr = obj.volunteer_hour_value * volunteer[year].volunteer_hours_redeemed + (spinner_value * obj.volunteer_hour_value);
@ -638,8 +638,8 @@ $(function() {
//console.log(obj.current_year_volunteer_hours + " - " + volunteer[year].volunteer_hours_redeemed + " = " + remaining ); //console.log(obj.current_year_volunteer_hours + " - " + volunteer[year].volunteer_hours_redeemed + " = " + remaining );
if (vhr > obj.sweat_equity_limit) { if (vhr > obj.sweat_equity_limit) {
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));
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;
price_after_redeeming = price - (obj.volunteer_hour_value * spinner_difference);
//console.log(spinner_difference + " " + price_after_redeeming); //console.log(spinner_difference + " " + price_after_redeeming);
} }
} }