Browse Source

Closes #29!

devel
Jonathan Rosenbaum 7 years ago
parent
commit
a7decc5735
  1. 2
      css/transactions.css
  2. 10
      js/transaction.js
  3. 1
      transaction_log.php

2
css/transactions.css

@ -135,7 +135,7 @@ input[value=Save]:focus, input[value=Close]:focus {
font-size: .9em; font-size: .9em;
} }
#original_price, #membership_discount, #membership_discount_price { #original_price, #membership_discount, #membership_discount_price, #volunteer_hours_to_membership_discount {
display: none; display: none;
color: blueviolet; color: blueviolet;
} }

10
js/transaction.js

@ -1155,6 +1155,7 @@ $(function() {
if (remaining === ui.value && remaining !== 0 && ui.value !== 0) { if (remaining === ui.value && remaining !== 0 && ui.value !== 0) {
if ( typeof amount.val() !== 'undefined') { 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); volunteer_hours_to_membership_discount(price, membership_obj);
} }
} }
@ -1201,6 +1202,7 @@ $(function() {
if (remaining === Number(val) && remaining !== 0 && Number(val) !== 0) { if (remaining === Number(val) && remaining !== 0 && Number(val) !== 0) {
if ( typeof amount.val() !== 'undefined') { 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); volunteer_hours_to_membership_discount(price, membership_obj);
} }
} }
@ -1427,9 +1429,17 @@ $(function() {
// handle history for membership discount price // handle history for membership discount price
var price, original_price; var price, original_price;
if ($("#membership_discount_price").text()) { if ($("#membership_discount_price").text()) {
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(); price = $("#membership_discount_price").text();
original_price = $("#amount").val(); original_price = $("#amount").val();
$("#amount").val(price); $("#amount").val(price);
}
// update database to reflect change .. hopefully // update database to reflect change .. hopefully
$.post("json/transaction.php",{discount_update: 1, transaction_id: transaction_id, price: price }); $.post("json/transaction.php",{discount_update: 1, transaction_id: transaction_id, price: price });
} else { } else {

1
transaction_log.php

@ -509,6 +509,7 @@ if ((isset($_POST["MM_insert"])) && ($_POST["MM_insert"] == "ChangeDate")) {
<span id="original_price"></span> <span id="original_price"></span>
<span id="membership_discount"></span> <span id="membership_discount"></span>
<span id="membership_discount_price"></span> <span id="membership_discount_price"></span>
<span id="volunteer_hours_to_membership_discount"></span>
</td> </td>
</tr> </tr>
<?php } // end show_amount ?> <?php } // end show_amount ?>

Loading…
Cancel
Save