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

This properly records orginal price when redeeming volunteer hours for Stand Time when input is already pre-filled.

Browse Source
This commit is contained in:
Jonathan Rosenbaum 2017-08-06 08:22:55 +00:00
parent 09cc2893a4
commit 2d264773ed
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/transaction.js
View File

@ -788,10 +788,9 @@ $(function() {
// Membership and Volunteer Benefits // Membership and Volunteer Benefits
var d = new Date(); var d = new Date();
var price; var price;
amount.on("input",function () { amount.on("input",function () {
if ( $(this).cleanVal() >= 100 ) { if ( $(this).cleanVal() >= 100 ) {
price = ($(this).cleanVal() / 100).toFixed(2); price = ($(this).cleanVal() / 100).toFixed(2);
} else { } else {
@ -799,9 +798,9 @@ $(function() {
} }
console.log("original " + price); console.log("original " + price);
$("#original_price").text(price); $("#original_price").text(price);
$("#redeemable_hours").val(0); $("#redeemable_hours").val(0);
}); });
sold_to.change(function() { sold_to.change(function() {
@ -860,6 +859,15 @@ $(function() {
} }
}); // stand time pos }); // stand time pos
} }
// prexisting price without input, e.g. pre-filled Stand Time, needs to be taken into account
if ( amount.cleanVal() >= 100 ) {
price = (amount.cleanVal() / 100).toFixed(2);
} else {
price = amount.cleanVal();
}
console.log("original " + price);
$("#original_price").text(price);
// How many hours does this volunteer have? // How many hours does this volunteer have?
$("#redeemable_hours").val(""); $("#redeemable_hours").val("");
@ -1022,7 +1030,7 @@ $(function() {
} }
amount.val(""); amount.val("");
if (!$("#paid_member").text()) { if (!$("#paid_member").text()) {
$("#stand_time_total").text("Free Stand Time is good to " + end.toDateString()); $("#stand_time_total").text("Free Stand Time is good until " + end.toDateString());
} }
} else if ( now.getTime() > end.getTime() ) { } else if ( now.getTime() > end.getTime() ) {
console.log("Free Stand Time is now over"); console.log("Free Stand Time is now over");