diff --git a/css/transactions.css b/css/transactions.css index 21cee04..4a5fdb1 100644 --- a/css/transactions.css +++ b/css/transactions.css @@ -135,7 +135,7 @@ input[value=Save]:focus, input[value=Close]:focus { font-size: .9em; } -#original_price, #membership_discount, #membership_discount_price { +#original_price, #membership_discount, #membership_discount_price, #volunteer_hours_to_membership_discount { display: none; color: blueviolet; } diff --git a/js/transaction.js b/js/transaction.js index ba1b129..58de612 100644 --- a/js/transaction.js +++ b/js/transaction.js @@ -1154,7 +1154,8 @@ $(function() { if (obj.volunteer && current_membership === true) { if (remaining === ui.value && remaining !== 0 && ui.value !== 0) { if ( typeof amount.val() !== 'undefined') { - var price = amount.cleanVal(); + var price = amount.cleanVal(); + $("#volunteer_hours_to_membership_discount").text("true"); volunteer_hours_to_membership_discount(price, membership_obj); } } @@ -1201,6 +1202,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").text("true"); volunteer_hours_to_membership_discount(price, membership_obj); } } @@ -1427,9 +1429,17 @@ $(function() { // handle history for membership discount price var price, original_price; if ($("#membership_discount_price").text()) { - price = $("#membership_discount_price").text(); - original_price = $("#amount").val(); - $("#amount").val(price); + + if ($("#volunteer_hours_to_membership_discount").text()) { + price = $("#membership_discount_price").text(); + original_price = $("#original_price").text() + " (" + $("#amount").val() + ")"; + $("#amount").val(price); + } else { + price = $("#membership_discount_price").text(); + original_price = $("#amount").val(); + $("#amount").val(price); + } + // update database to reflect change .. hopefully $.post("json/transaction.php",{discount_update: 1, transaction_id: transaction_id, price: price }); } else { diff --git a/transaction_log.php b/transaction_log.php index 6c09e8b..cd13bf1 100644 --- a/transaction_log.php +++ b/transaction_log.php @@ -509,6 +509,7 @@ if ((isset($_POST["MM_insert"])) && ($_POST["MM_insert"] == "ChangeDate")) { + @@ -689,7 +690,7 @@ if ((isset($_POST["MM_insert"])) && ($_POST["MM_insert"] == "ChangeDate")) { >