From 6d1bb2ad8becebd015294f23e0ab7e8929582d9b Mon Sep 17 00:00:00 2001 From: Jonathan Rosenbaum Date: Sun, 27 Dec 2015 01:29:46 +0000 Subject: [PATCH 1/3] Modifies Student Volunteer to Student Volunteer/Community Service Changes fixed size in shop_log to relative for sign-in display Changes Donations to the accounting group Donations --- shop_log.php | 2 +- sql/populate.sql | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/shop_log.php b/shop_log.php index 58cda02..e63f321 100644 --- a/shop_log.php +++ b/shop_log.php @@ -189,7 +189,7 @@ if ((isset($_POST["MM_insert"])) && ($_POST["MM_insert"] == "FormEdit")) {

- +
diff --git a/sql/populate.sql b/sql/populate.sql index 3464449..95c7283 100644 --- a/sql/populate.sql +++ b/sql/populate.sql @@ -41,7 +41,7 @@ INSERT INTO shop_user_roles ( ("Volunteer",0,1,0,0), ("Greeter",0,1,1,0), ("Staff",0,0,1,1), - ("Student Volunteer",0,0,0,0), + ("Student Volunteer/Community Service Hours",0,0,0,0), ("Shopping",0,0,0,0); -- Add some projects to projects @@ -159,7 +159,7 @@ 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, 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, 0), ("Helmets", 5, 1, 1, 1, 1, 0, 1, 1, 1, 1, "Sale Date", "Sold By"," ", "Sold To", 1, "Description", "Sales", 1, 0, 0), - ("Donations", 6, 1, 0, 1, 1, 0, 0, 1, 1, 1, "Sale Date", "Received by"," ", "Donated by", 1, "Description", "Sales", 0, 1, 0), + ("Donations", 6, 1, 0, 1, 1, 0, 0, 1, 1, 1, "Sale Date", "Received by"," ", "Donated by", 1, "Description", "Donations", 0, 1, 0), ("Monetary Donations", 7, 1, 0, 1, 1, 0, 1, 1, 1, 1, "Sale Date", "Received by"," ", "Donated by", 1, "Description", "Sales", 1, 1, 0), ("Memberships", 8, 1, 1, 1, 1, 0, 1, 1, 1, 1, "Sale Date", "Sold By"," ", "Sold To", 1, "Description", "Sales", 1, 0, 0), ("Inventory Parts", 9, 1, 1, 1, 1, 0, 1, 1, 1, 1, "Sale Date", "Sold By"," ", "Sold To", 1, "Description", "Sales", 1, 0, 0), From 90c93eb996ac36d74170a11b416d5f9c5a90e58b Mon Sep 17 00:00:00 2001 From: Jonathan Rosenbaum Date: Sun, 27 Dec 2015 19:36:07 +0000 Subject: [PATCH 2/3] Improves the css a little (in transaction.css) for shop_log now that table is relative to take into account longer statuses. --- shop_log.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shop_log.php b/shop_log.php index e63f321..b2a8fb5 100644 --- a/shop_log.php +++ b/shop_log.php @@ -189,7 +189,7 @@ if ((isset($_POST["MM_insert"])) && ($_POST["MM_insert"] == "FormEdit")) {

-
Existing Shop Users
+
From 818caf32dacae853a451cb8cedacf0e0e6d485d1 Mon Sep 17 00:00:00 2001 From: Jonathan Rosenbaum Date: Sun, 27 Dec 2015 19:40:21 +0000 Subject: [PATCH 3/3] And here is the important file for 90c93eb. --- css/transactions.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/css/transactions.css b/css/transactions.css index fa4501b..358f640 100644 --- a/css/transactions.css +++ b/css/transactions.css @@ -84,4 +84,9 @@ input[value=Save]:focus, input[value=Close]:focus { #payment_error, #payment_type_error, #quantity_error, #anonymous_error { color: red; +} + +/* for shop_log */ +#shop_log td { + padding: 0px 10px 0px 10px; } \ No newline at end of file
Existing Shop Users