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

Creates the object, and adds redeemed hours together.

Browse Source
This commit is contained in:
Jonathan Rosenbaum 2017-08-04 06:25:27 +00:00
parent aeb6b23889
commit b7f128feca
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
js/transaction.js
View File

@ -1019,33 +1019,36 @@ $(function() {
} }
// data structure for volunteer benefits history // data structure for volunteer benefits history
var volunteer_benefits_history = []; var year = d.getFullYear();
var redeemed = { var volunteer_benefits_history = {
[year] :
{
}; volunteer_hours_redeemed: parseFloat($("#redeemable_hours").val()),
max_bike_earned: 0
}
};
// Volunteer History query // Volunteer History query
$.post("json/transaction.php",{ volunteer_history_select: 1, contact_id: sold_to }, function(data) { $.post("json/transaction.php",{ volunteer_history_select: 1, contact_id: sold_to }, function(data) {
if (data === "First Volunteer History") {
volunteer_benefits_history.push(redeemed);
/* if (data === "First Volunteer History") { //initialize volunteer history
$.post("json/transaction.php",{ history_update: 1,
transaction_id: transaction_id, $.post("json/transaction.php",{ volunteer_history_update: 1,
history: transaction_history }); contact_id: sold_to,
*/ volunteer_history: volunteer_benefits_history });
} else { // update redeemed hours } else { // update redeemed hours
/* volunteer_benefits_history = $.parseJSON(data);
transaction_history = $.parseJSON(data); if ($("#redeemable_hours").val().length) {
transaction_history.push(current_transaction); volunteer_benefits_history[year].volunteer_hours_redeemed = parseFloat(volunteer_benefits_history[year].volunteer_hours_redeemed) +
$.post("json/transaction.php",{ history_update: 1, parseFloat($("#redeemable_hours").val());
transaction_id: transaction_id, }
history: transaction_history,
more_than_one: 1 }); $.post("json/transaction.php",{ volunteer_history_update: 1,
*/ contact_id: sold_to,
volunteer_history: volunteer_benefits_history,
more_than_one: 1 });
} // update redeemed hours } // update redeemed hours
@ -1083,7 +1086,7 @@ $(function() {
transaction_type: $("#transaction_type").val(), transaction_type: $("#transaction_type").val(),
original_price: $("#original_price").text(), original_price: $("#original_price").text(),
amount: $("#amount").val(), amount: $("#amount").val(),
redeemed_hours: $("#redeemable_hours").val() || $("#volunteer_hours").text(), redeemed_hours: parseFloat($("#redeemable_hours").val()) || parseFloat($("#volunteer_hours").text()),
description: $("#description").val(), description: $("#description").val(),
sold_to: sold_to, sold_to: sold_to,
sold_by: $("[name='sold_by']").val(), sold_by: $("[name='sold_by']").val(),