From bf2527e1cf87eb3a84099d4e04585e05fc7d2506 Mon Sep 17 00:00:00 2001 From: Jonathan Rosenbaum Date: Mon, 12 Jan 2015 18:57:52 +0000 Subject: [PATCH] Changed some text is populate. --- js/transaction.js | 2 +- sql/populate.sql | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/transaction.js b/js/transaction.js index 8d70b47..819c668 100644 --- a/js/transaction.js +++ b/js/transaction.js @@ -132,7 +132,7 @@ $(function() { var sum = Number(v.check) + Number(v.cash); $("#" + k + "_sum span").text("$" + sum.toFixed(2)); - // Difference + // Difference (regexp - good up to 6 places and 2 digits) var deposit_amount = $('input[name="' + k + '"]').parent().prev().prev().text().replace(/\$(\d*(?:,\d{3})*\.\d*)\s+/, "$1" ); deposit_amount = deposit_amount.replace(/,/, ""); if (deposit_amount != 0) { diff --git a/sql/populate.sql b/sql/populate.sql index 9f8916c..be76121 100644 --- a/sql/populate.sql +++ b/sql/populate.sql @@ -150,8 +150,8 @@ INSERT INTO transaction_types ("Non-inventory Parts", 3, 1, 1, 1, 1, 0, 1, 1, 1, 1, "Sale Date", "Sold By"," ", "Sold To", 1, "Description", "Sales", 1, 0), ("Trade-ups/Ins", 4, 1, 1, 1, 1, 0, 1, 1, 1, 1, "Sale Date", "Sold By"," ", "Sold To", 1, "Description", "Sales", 1, 0), ("Helmets", 5, 1, 1, 1, 1, 0, 1, 1, 1, 1, "Sale Date", "Sold By"," ", "Sold To", 1, "Description", "Sales", 1, 0), - ("Donations", 6, 1, 0, 1, 1, 0, 0, 1, 1, 1, "Sale Date", "Received by"," ", "Given by", 1, "Description", "Sales", 0, 1), - ("Monetary Donations", 7, 1, 0, 1, 1, 0, 1, 1, 1, 1, "Sale Date", "Received by"," ", "Given by", 1, "Description", "Sales", 1, 1), + ("Donations", 6, 1, 0, 1, 1, 0, 0, 1, 1, 1, "Sale Date", "Received by"," ", "Donated by", 1, "Description", "Sales", 0, 1), + ("Monetary Donations", 7, 1, 0, 1, 1, 0, 1, 1, 1, 1, "Sale Date", "Received by"," ", "Donated by", 1, "Description", "Sales", 1, 1), ("Memberships", 8, 1, 1, 1, 1, 0, 1, 1, 1, 1, "Sale Date", "Sold By"," ", "Sold To", 1, "Description", "Sales", 1, 0), ("Inventory Parts", 9, 1, 1, 1, 1, 0, 1, 1, 1, 1, "Sale Date", "Sold By"," ", "Sold To", 1, "Description", "Sales", 1, 0), ("Cargo Related", 10, 1, 1, 1, 1, 0, 1, 1, 1, 1, "Sale Date", "Sold By"," ", "Sold To", 1, "Description", "Sales", 1, 0),