bike/Yellow-Bike-Database-Mirror
1
0
Fork 0
mirror of https://github.com/fspc/Yellow-Bike-Database.git synced 2025-10-31 08:55:36 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/fspc/Yellow-Bike-Database into devel

Browse Source 
Hopefully, no issues merging.
This commit is contained in:
Jonathan Rosenbaum 2016-01-19 08:54:10 +00:00
commit 1e5cec042a
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
css/transactions.css
View File

@ -85,3 +85,8 @@ input[value=Save]:focus, input[value=Close]:focus {
#quantity_error, #anonymous_error { #quantity_error, #anonymous_error {
color: red; color: red;
} }
/* for shop_log */
#shop_log td {
padding: 0px 10px 0px 10px;
}

2
shop_log.php
View File

@ -189,7 +189,7 @@ if ((isset($_POST["MM_insert"])) && ($_POST["MM_insert"] == "FormEdit")) {
<br /><br /> <br /><br />
<table width="850px" style="margin-left:170px" border="1" cellpadding="1" cellspacing="0" bordercolor="#CCCCCC"> <table id="shop_log" width="relative" style="margin-left:170px" border="1" cellpadding="1" cellspacing="0" bordercolor="#CCCCCC">
<tbody <tbody
<tr valign="bottom" bordercolor="#CCCCCC"> <tr valign="bottom" bordercolor="#CCCCCC">
<td height="25" colspan="1" bgcolor="#99CC33">Existing Shop Users</td> <td height="25" colspan="1" bgcolor="#99CC33">Existing Shop Users</td>

4
sql/populate.sql
View File

@ -41,7 +41,7 @@ INSERT INTO shop_user_roles (
("Volunteer",0,1,0,0), ("Volunteer",0,1,0,0),
("Greeter",0,1,1,0), ("Greeter",0,1,1,0),
("Staff",0,0,1,1), ("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); ("Shopping",0,0,0,0);
-- Add some projects to projects -- 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), ("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), ("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), ("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), ("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), ("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), ("Inventory Parts", 9, 1, 1, 1, 1, 0, 1, 1, 1, 1, "Sale Date", "Sold By"," ", "Sold To", 1, "Description", "Sales", 1, 0, 0),