bike/Yellow-Bike-Database-Mirror
1
0
Fork 0
mirror of https://github.com/fspc/Yellow-Bike-Database.git synced 2025-02-22 17:03:22 -05:00
Code Issues Projects Releases Wiki Activity

Added SHOP_SHOP_ID option.

Browse Source 
1). Most collectives require only one shop at a time, but YBDB provides a way to handle 2 concurrent shops in the same location.  The current shop will be shown, and users will have to remember the number of the previous shop to enter into the transaction.  Note: Remote shops function independently via there IP identification.
This commit is contained in:
Jonathan Rosenbaum 2015-01-28 07:16:40 +00:00
parent 2175ab18e4
commit a2fbb3d5cc
2 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Connections/database_functions.php
View File

@ -60,6 +60,14 @@ $gnucash_accounts = array( "Assets:Current Assets:Checking" => "checking",
"Assets:Current Assets:PayPal" => "credit", "Assets:Current Assets:PayPal" => "credit",
"Assets:Account Receivable" => "account_receivable" "Assets:Account Receivable" => "account_receivable"
); );
// Most collectives require only one shop at a time, but YBDB provides a way to handle 2 concurrent
// shops in the same location. The current shop will be shown, and users will have to remember the
// number of the previous shop to enter into the transaction.
// Note: Remote shops function independently via there IP identification.
//
// Normally, you will want this set at 0.
define('SHOW_SHOP_ID',0);
// other constants // other constants
define("PAGE_START_SHOP", "/start_shop.php"); define("PAGE_START_SHOP", "/start_shop.php");

43
transaction_log.php
View File

@ -10,6 +10,7 @@ $storage_period = STORAGE_PERIOD;
$default_transaction_type = DEFAULT_TRANSACTION_TYPE; $default_transaction_type = DEFAULT_TRANSACTION_TYPE;
$number_of_transactions = NUMBER_OF_TRANSACTIONS; $number_of_transactions = NUMBER_OF_TRANSACTIONS;
$change_fund = CHANGE_FUND; $change_fund = CHANGE_FUND;
$show_shop_id = SHOW_SHOP_ID;
//transaction ID //transaction ID
if($_GET['trans_id']>0){ if($_GET['trans_id']>0){
@ -391,15 +392,39 @@ if ((isset($_POST["MM_insert"])) && ($_POST["MM_insert"] == "ChangeDate")) {
<!-- Save before using paypal ->> --> <!-- Save before using paypal ->> -->
</td> </td>
</tr> </tr>
<tr><td>&nbsp;</td> <?php if ($show_shop_id) { ?>
<td><label>Transaction ID:</label></td> <tr><td>&nbsp;</td>
<td><?php echo $row_Recordset2['transaction_id']; ?><em><?php echo $row_Recordset3['message_transaction_id']; ?></em></em></td>
</tr> <td><label>Transaction ID:</label></td>
<tr><td>&nbsp;</td> <td><?php echo $row_Recordset2['transaction_id']; ?><em>
<td><label for="shop_id">ShopID:</label> </td> <?php echo $row_Recordset3['message_transaction_id']; ?></em>
<td><input name="shop_id" type="text" id="shop_id" value="<?php echo $row_Recordset2['shop_id']; ?>" size="6" /></td> </td>
</tr>
</tr>
<tr><td>&nbsp;</td>
<td><label for="shop_id">ShopID:</label> </td>
<td><input name="shop_id" type="text" id="shop_id"
value="<?php echo $row_Recordset2['shop_id']; ?>" size="6" />
</td>
</tr>
<?php } else { ?>
<tr><td>&nbsp;</td>
<td><label>Transaction #:</label></td>
<td><?php echo $row_Recordset2['transaction_id']; ?>
<em><?php echo $row_Recordset3['message_transaction_id']; ?>
-
<?php echo $row_Recordset2['shop_id']; ?></em>
<input name="shop_id" type="hidden" id="shop_id"
value="<?php echo $row_Recordset2['shop_id']; ?>" />
</td>
</tr>
<?php } ?>
<?php ?> <?php ?>
<tr><td>&nbsp;</td><td><label for="trans_type_info">Transaction Type:</label></td> <tr><td>&nbsp;</td><td><label for="trans_type_info">Transaction Type:</label></td>
<td><?php echo "<span id='trans_type_info'>" . $row_Recordset2['transaction_type'] . "</span>"; <td><?php echo "<span id='trans_type_info'>" . $row_Recordset2['transaction_type'] . "</span>";