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 #57, happy New Years!

Browse Source
This commit is contained in:
Jonathan Rosenbaum 2018-01-01 22:46:29 +00:00
parent 28f836597f
commit 8ffb51e20a
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/transaction.js
View File

@ -688,6 +688,9 @@ $(function() {
// figure out remaining hours that can be redeemed if some, but not all, 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) {
// will need to figure out these values when there isn't a property for the new year
if (volunteer.hasOwnProperty(year)) {
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);
//console.log(obj.volunteer_hour_value + " * " + volunteer[year].volunteer_hours_redeemed + " = " + vhr ); //console.log(obj.volunteer_hour_value + " * " + volunteer[year].volunteer_hours_redeemed + " = " + vhr );
remaining = obj.current_year_volunteer_hours - volunteer[year].volunteer_hours_redeemed; remaining = obj.current_year_volunteer_hours - volunteer[year].volunteer_hours_redeemed;
@ -699,7 +702,7 @@ $(function() {
//console.log(spinner_difference + " " + price_after_redeeming); //console.log(spinner_difference + " " + price_after_redeeming);
} }
} }
}
// no volunteer_hours_redeemed or still less than the allowable sweat_equity_hours // no volunteer_hours_redeemed or still less than the allowable sweat_equity_hours
@ -755,6 +758,7 @@ $(function() {
} }
//console.log(price_after_redeeming + " - " + redeemable_value + " * ." + discount); //console.log(price_after_redeeming + " - " + redeemable_value + " * ." + discount);
} else { } else {
// Never redeemed before
amount.val(price - redeemable_value); amount.val(price - redeemable_value);
} }
} }
@ -1179,7 +1183,7 @@ $(function() {
if ((volunteer_hours && volunteer_hours.length)) { if ((volunteer_hours && volunteer_hours.length)) {
var max; var max;
if ((remaining || remaining === 0) && obj.volunteer) { if ((remaining || remaining === 0) && (obj.volunteer && volunteer.hasOwnProperty(year))) {
max = remaining; max = remaining;
} else { } else {
max = obj.current_year_volunteer_hours; max = obj.current_year_volunteer_hours;