Browse Source

If volunteer has no hours for new year and is a member, this assings 0 to remaining.

* otherwise spinner spins infinitely, and membership discount is not applied.
devel
Jonathan Rosenbaum 7 years ago
parent
commit
df31281ef8
  1. 8
      js/transaction.js

8
js/transaction.js

@ -1090,13 +1090,17 @@ $(function() {
if (obj.volunteer) { if (obj.volunteer) {
volunteer = $.parseJSON(obj.volunteer); volunteer = $.parseJSON(obj.volunteer);
if (volunteer.hasOwnProperty(year)) { if (volunteer.hasOwnProperty(year)) {
remaining = obj.current_year_volunteer_hours - volunteer[year].volunteer_hours_redeemed; remaining = obj.current_year_volunteer_hours - volunteer[year].volunteer_hours_redeemed;
vhr = volunteer[year].volunteer_hours_redeemed; vhr = volunteer[year].volunteer_hours_redeemed;
max_bikes_earned = volunteer[year].max_bike_earned; max_bikes_earned = volunteer[year].max_bike_earned;
} }
} else { } else {
vhr = 0; vhr = 0;
} }
if (obj.current_year_volunteer_hours === null) {
remaining = 0;
}
var title = obj.normal_full_name + "\r\n" + var title = obj.normal_full_name + "\r\n" +
obj.email + "\r\n" + obj.email + "\r\n" +

Loading…
Cancel
Save