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

Another UI change, css file, and sql change.

Browse Source
This commit is contained in:
Jonathan Rosenbaum 2014-12-29 01:18:02 +00:00
parent 203708dad2
commit 6f1a9d241e
3 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
css/transactions.css Normal file
View File

@ -0,0 +1,24 @@
/* sensible UI defaults for transaction views */
/* right-align labels */
td > label {
float: right;
padding-right: 5px;
}
/* make unimportant buttons into links */
input[value=Delete], input[name=date_fill] {
background:none!important;
border:none;
padding:0!important;
color: blue;
/*border is optional*/
/* border-bottom:1px solid blue; */
cursor: pointer;
}
form[name=FormEdit] select:focus {
color: green;
}

16
sql/populate.sql
View File

@ -111,11 +111,12 @@ INSERT INTO contacts (
-- --
INSERT INTO transaction_types INSERT INTO transaction_types
(transaction_type_id, rank, active, community_bike, show_transaction_id, (transaction_type_id, rank,
show_type, show_startdate, show_amount, show_description, show_soldto, active, community_bike, show_transaction_id, show_type, show_startdate,
show_soldby, fieldname_date, fieldname_soldby, message_transaction_id, show_amount, show_description, show_soldto, show_soldby,
fieldname_soldto, show_soldto_location, fieldname_description, fieldname_date, fieldname_soldby, message_transaction_id,
accounting_group fieldname_soldto, show_soldto_location, fieldname_description,
accounting_group
) VALUES ) VALUES
("Build Your Own Bike", 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, "Sale Date", "Sold By"," ", "Sold To", 1, "Description", "Sales"), ("Build Your Own Bike", 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, "Sale Date", "Sold By"," ", "Sold To", 1, "Description", "Sales"),
("Bicycles", 2, 1, 1, 1, 1, 0, 1, 1, 1, 1, "Sale Date", "Sold By"," ", "Sold To", 1, "Description", "Sales"), ("Bicycles", 2, 1, 1, 1, 1, 0, 1, 1, 1, 1, "Sale Date", "Sold By"," ", "Sold To", 1, "Description", "Sales"),
@ -139,10 +140,11 @@ INSERT INTO transaction_types
("Sale - Complete Bike", 20, 1, 0, 1, 1, 0, 1, 1, 1, 1, "Sale Date", "Sold By"," ", "Sold To", 1, "Description", "Sales"); ("Sale - Complete Bike", 20, 1, 0, 1, 1, 0, 1, 1, 1, 1, "Sale Date", "Sold By"," ", "Sold To", 1, "Description", "Sales");
-- transaction_log - added paid or not -- transaction_log - added paid or not
-- - added payment_type (cash, check or cc) -- - added payment_type (cash, check or cc)
-- transaction_id, date_startstorage, date,transaction_type, amount, -- transaction_id, date_startstorage, date,transaction_type, amount,
-- description, sold_to, sold_by, quantity, shop_id, paid -- description, sold_to, sold_by, quantity, shop_id, paid
ALTER TABLE transaction_log ADD paid tinyint(1) NOT NULL DEFAULT '0'; ALTER TABLE transaction_log ADD paid tinyint(1) NOT NULL DEFAULT '0';
ALTER TABLE transaction_log ADD payment_type varchar(5) DEFAULT NULL;

6
transaction_log.php
View File

@ -285,14 +285,14 @@ FROM transaction_log WHERE transaction_id = $trans_id; ";
<td><label>Storage Start Date:</label></td> <td><label>Storage Start Date:</label></td>
<td><input name="date_startstorage" type="text" id="date_startstorage" value="<?php <td><input name="date_startstorage" type="text" id="date_startstorage" value="<?php
echo $row_Recordset2['date_startstorage_day']; ?>" size="10" maxlength="10" /> echo $row_Recordset2['date_startstorage_day']; ?>" size="10" maxlength="10" />
<em>YYYY-MM-DD</em></td> (yyyy-mm-dd)</td>
</tr> </tr>
<?php } //end if storage | start of date ================================================ <?php } //end if storage | start of date ================================================
?> ?>
<tr><td>&nbsp;</td> <tr><td>&nbsp;</td>
<td><label><?php echo $row_Recordset3['fieldname_date']; ?>:</label></td> <td><label><?php echo $row_Recordset3['fieldname_date']; ?>:</label></td>
<td><input name="date" type="text" id="date" value="<?php echo $row_Recordset2['date_day']; ?>" size="10" maxlength="10" /> <td><input name="date" type="text" id="date" value="<?php echo $row_Recordset2['date_day']; ?>" size="10" maxlength="10" />
<em>YYYY-MM-DD (yyyy-mm-dd)
<SCRIPT> <SCRIPT>
function FillDate() { function FillDate() {
document.FormEdit.date.value = '<?php echo current_date(); ?>' } document.FormEdit.date.value = '<?php echo current_date(); ?>' }
@ -301,7 +301,7 @@ FROM transaction_log WHERE transaction_id = $trans_id; ";
<br /><?php <br /><?php
if ($row_Recordset3['show_startdate']) { // If there is a start date show storage expiration message. if ($row_Recordset3['show_startdate']) { // If there is a start date show storage expiration message.
echo ($row_Recordset2['date_day'] == "0000-00-00") ? $row_Recordset2['storage_days_left'] . " days of storage remaining. Bike must be finished by " . $row_Recordset2['storage_deadline'] . "." : "Bike is marked as complete and should no longer be stored in the shop."; echo ($row_Recordset2['date_day'] == "0000-00-00") ? $row_Recordset2['storage_days_left'] . " days of storage remaining. Bike must be finished by " . $row_Recordset2['storage_deadline'] . "." : "Bike is marked as complete and should no longer be stored in the shop.";
} ?></em></td> } ?></td>
</tr> </tr>
<?php if($row_Recordset3['show_amount']){ ?> <?php if($row_Recordset3['show_amount']){ ?>
<tr><td>&nbsp;</td> <tr><td>&nbsp;</td>