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

Allows storage transactions error validation to work properly.

Browse Source
This commit is contained in:
Jonathan Rosenbaum 2015-01-27 21:53:22 +00:00
parent b0f940b2b1
commit caedba99cc
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/transaction.js
View File

@ -493,13 +493,19 @@ $(function() {
// sold_by error // sold_by error
err2 = error_handler(sold_by.val(), sold_by_error, "no_selection", "*Required",e); err2 = error_handler(sold_by.val(), sold_by_error, "no_selection", "*Required",e);
// payment type error // for storage transactions don't check for payment_type and payment until there is an actual date
console.log("Date: " + date.val());
var payment_type_result; var payment_type_result;
payment_type.each(function(){ if ($(this).prop("checked") == true) { payment_type_result = true; } }); if ( date.val() != "0000-00-00" && date.val() != "") {
err3 = error_handler(payment_type_result, payment_type_error, undefined,"*Required",e);
// payment type error
// payment error payment_type.each(function(){ if ($(this).prop("checked") == true) { payment_type_result = true; } });
err4 = error_handler(amount.val(), payment_error, "","*Required",e); err3 = error_handler(payment_type_result, payment_type_error, undefined,"*Required",e);
// payment error
err4 = error_handler(amount.val(), payment_error, "","*Required",e);
}
// description error // description error
err5 = error_handler(description.val(), description_error, "","*Required: a detailed description",e); err5 = error_handler(description.val(), description_error, "","*Required: a detailed description",e);
@ -521,9 +527,11 @@ $(function() {
err7 = error_handler(quantity.val(), quantity_error, "","*Required",e); err7 = error_handler(quantity.val(), quantity_error, "","*Required",e);
// date // date
err8 = error_handler(date.val(), date_error, "","*Required",e); if (!$("#date_startstorage").length) { // not a storage transaction
err8 = error_handler(date.val(), date_error, "","*Required",e);
}
// for storage transactions don't check for payment_type and payment until there is an actual date // Decides whether or not to post a parent error message (at the top)
if ( ( err1 + err2 + err3 + err4 + err5 + err6 + err7) > 0) { if ( ( err1 + err2 + err3 + err4 + err5 + err6 + err7) > 0) {
if ( !transaction_error.is(":visible") ) { if ( !transaction_error.is(":visible") ) {
transaction_error.show(); transaction_error.show();