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

This fixes a bug introduced by the 34650c9be fix.

Browse Source 
* There is an issue if the spinner is used, when the transaction is complete, the function is called infinitely.
This commit is contained in:
Jonathan Rosenbaum 2017-11-26 04:44:27 +00:00
parent a56ec4d9ff
commit e99d2863b8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/transaction.js
View File

@ -608,7 +608,7 @@ $(function() {
} // end function save_or_close
// invoke when volunteer hours run out for a member with a qualifying transaction
function volunteer_hours_to_membership_discount(price) {
function volunteer_hours_to_membership_discount(price, membership_obj) {
var discount = (price * (membership_obj.membership_discount / 100).toFixed(2)).toFixed(2);
var discount_price = (price - discount).toFixed(2);
@ -880,7 +880,7 @@ $(function() {
// Is this a paid member?
// Determine membership benefits of current transaction
$.post("json/transaction.php", { membership_benefits: 1, contact_id: this.value }, function (data) {
membership_obj = $.parseJSON(data);
var title = membership_obj.normal_full_name + "\r\n" +
membership_obj.email + "\r\n" +
@ -1148,14 +1148,14 @@ $(function() {
redeemable(obj, ui.value, event, volunteer);
} else {
$(this).spinner("disable");
}
}
// good place for a function to handle bug #4
if (obj.volunteer && current_membership === true) {
if (remaining === ui.value && remaining !== 0 && ui.value !== 0) {
if ( typeof amount.val() !== 'undefined') {
var price = amount.cleanVal();
volunteer_hours_to_membership_discount(price);
volunteer_hours_to_membership_discount(price, membership_obj);
}
}
}
@ -1201,7 +1201,7 @@ $(function() {
if (remaining === Number(val) && remaining !== 0 && Number(val) !== 0) {
if ( typeof amount.val() !== 'undefined') {
var price = amount.cleanVal();
volunteer_hours_to_membership_discount(price);
volunteer_hours_to_membership_discount(price, membership_obj);
}
}
}