Closes #29!

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;
 }

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 {

transaction_log.php

@@ -509,6 +509,7 @@ if ((isset($_POST["MM_insert"])) && ($_POST["MM_insert"] == "ChangeDate")) {
 			  	<span id="original_price"></span>
 			  	<span id="membership_discount"></span>
 			  	<span id="membership_discount_price"></span>
+			  	<span id="volunteer_hours_to_membership_discount"></span>
 			  	</td>
 			  </tr>
 			  <?php } // end show_amount ?>		  	  
@@ -689,7 +690,7 @@ if ((isset($_POST["MM_insert"])) && ($_POST["MM_insert"] == "ChangeDate")) {
 		  <td <?php echo "title='Description: " . htmlspecialchars($row_Recordset1['description_with_locations'], ENT_QUOTES) . "'"; ?> ><?php echo $row_Recordset1['description_with_locations']; ?>&nbsp;</td>
 		  <td><?php echo $row_Recordset1['payment_type']; ?>&nbsp;</td>
 		  <td <?php 
-		  				$history = json_decode($row_Recordset1['history']);
+		  				$history = json_decode($row_Recordset1['history']);		  				
 		  				if ($history) {
 		  					end($history);
 		  					$key = key($history);