bike/Yellow-Bike-Database-Mirror
1
0
Fork 0
mirror of https://github.com/fspc/Yellow-Bike-Database.git synced 2025-10-31 00:45:35 -04:00
Code Issues Projects Releases Wiki Activity

Corrects some human introduced bugs by returned code to earlier state.

Browse Source
This commit is contained in:
Jonathan Rosenbaum 2017-08-05 19:22:02 +00:00
parent 3e18f89e65
commit fb0e9cfbfb
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/transaction.js
View File

@ -653,6 +653,12 @@ $(function() {
var value_to_apply_discount, difference, hours_applied_with_value; var value_to_apply_discount, difference, hours_applied_with_value;
var max_discount_price;
if ($("#transaction_type").val() !== "Stand Time") {
max_discount_price = obj.current_year_volunteer_hours * obj.volunteer_hour_value;
} else {
max_discount_price = obj.stand_time_value * obj.volunteer_hour_value;
}
var max_discount_price_difference; var max_discount_price_difference;
@ -675,9 +681,9 @@ $(function() {
redeemable_value = difference - (hours_applied_with_value * (discount / 100).toFixed(2)); redeemable_value = difference - (hours_applied_with_value * (discount / 100).toFixed(2));
} }
amount.val(price - redeemable_value); amount.val(redeemable_value);
// volunteer hours redeemed before discount for special_volunteer_hours_qualification kicks in // 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) {
amount.val(price - (redeemable_value * (discount / 100).toFixed(2))); amount.val(price - (redeemable_value * (discount / 100).toFixed(2)));