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

Adds patrons name to the csv description.

Browse Source
This commit is contained in:
Jonathan Rosenbaum 2015-04-07 05:55:32 +00:00
parent a1b7d0df0f
commit 80d85c9dcd
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/transaction.js
View File

@ -401,6 +401,7 @@ $(function() {
if (gnucash_accounts) { if (gnucash_accounts) {
$.each(gnucash_accounts, function(k,v) { $.each(gnucash_accounts, function(k,v) {
$.post("json/transaction.php",{ gnucash_account_type: v, transaction_range: transaction_range}, function(data) { $.post("json/transaction.php",{ gnucash_account_type: v, transaction_range: transaction_range}, function(data) {
// download file - data is this directory/file
$("body").append("<iframe src='" + data + "' style='display: none;' ></iframe>"); $("body").append("<iframe src='" + data + "' style='display: none;' ></iframe>");
}); });
}); });

31
json/transaction.php
View File

@ -210,9 +210,11 @@ $csv_directory = CSV_DIRECTORY;
// checking (check or cash) || credit // checking (check or cash) || credit
// transaction has been 1) paid and is 2) cash & check [checking] or credit and 3) deposited // transaction has been 1) paid and is 2) cash & check [checking] or credit and 3) deposited
if( $account_type === 'checking' ) { if( $account_type === 'checking' ) {
$query = "SELECT SUBSTRING_INDEX(date, ' ', 1) AS 'date', transaction_id, transaction_type, description, amount " . $query = "SELECT SUBSTRING_INDEX(date, ' ', 1) AS 'date', transaction_id, transaction_type, description, amount, " .
"FROM transaction_log WHERE paid=1 AND date!='NULL' " . "CONCAT(contacts.first_name, ' ', contacts.last_name) AS 'patron' " .
"FROM transaction_log, contacts WHERE paid=1 AND date!='NULL' " .
"AND (payment_type='cash' OR payment_type='check') " . "AND (payment_type='cash' OR payment_type='check') " .
"AND contacts.contact_id = transaction_log.sold_to " .
"AND (transaction_id>" . $transaction_range[0] . " AND transaction_id<" . $transaction_range[1] . ");"; "AND (transaction_id>" . $transaction_range[0] . " AND transaction_id<" . $transaction_range[1] . ");";
$sql = mysql_query($query, $YBDB) or die(mysql_error()); $sql = mysql_query($query, $YBDB) or die(mysql_error());
$gnucash_csv_file = ""; $gnucash_csv_file = "";
@ -221,7 +223,9 @@ $csv_directory = CSV_DIRECTORY;
$description = preg_replace('/\r/', '\r', $description); $description = preg_replace('/\r/', '\r', $description);
$description = preg_replace('/,/', ';', $description); $description = preg_replace('/,/', ';', $description);
$gnucash_csv_file .= $result['date'] . ', ' . $result['transaction_id'] . $gnucash_csv_file .= $result['date'] . ', ' . $result['transaction_id'] .
', (Income:' . $result['transaction_type'] . ') ' . $description . ', ' . $result['amount'] . ', ' . ', (Income:' . $result['transaction_type'] . ') ' .
$description . ' [' . $result['patron'] . ']' .
', ' . $result['amount'] . ', ' .
$accounts_gnucash['checking'] . "\n"; $accounts_gnucash['checking'] . "\n";
} }
@ -234,23 +238,14 @@ $csv_directory = CSV_DIRECTORY;
fclose($csv_file); fclose($csv_file);
echo $file; echo $file;
// download file to browser
/*
header('Content-Description: File Transfer');
header('Content-Type: application/octet-stream');
header('Content-Disposition: attachment; filename='.basename($file));
header('Expires: 0');
header('Cache-Control: must-revalidate');
header('Pragma: public');
header('Content-Length: ' . filesize($file));
readfile($file);
*/
} }
if ( $account_type === 'credit' ) { if ( $account_type === 'credit' ) {
$query = "SELECT SUBSTRING_INDEX(date, ' ', 1) AS 'date', transaction_id, transaction_type, description, amount " . $query = "SELECT SUBSTRING_INDEX(date, ' ', 1) AS 'date', transaction_id, transaction_type, description, amount, " .
"FROM transaction_log WHERE paid=1 AND date!='NULL' " . "CONCAT(contacts.first_name, ' ', contacts.last_name) AS 'patron' " .
"FROM transaction_log, contacts WHERE paid=1 AND date!='NULL' " .
"AND payment_type='credit' " . "AND payment_type='credit' " .
"AND contacts.contact_id = transaction_log.sold_to " .
"AND (transaction_id>" . $transaction_range[0] . " AND transaction_id<" . $transaction_range[1] . ");"; "AND (transaction_id>" . $transaction_range[0] . " AND transaction_id<" . $transaction_range[1] . ");";
$sql = mysql_query($query, $YBDB) or die(mysql_error()); $sql = mysql_query($query, $YBDB) or die(mysql_error());
$gnucash_csv_file = ""; $gnucash_csv_file = "";
@ -259,7 +254,9 @@ $csv_directory = CSV_DIRECTORY;
$description = preg_replace('/\r/', '\r', $description); $description = preg_replace('/\r/', '\r', $description);
$description = preg_replace('/,/', ';', $description); $description = preg_replace('/,/', ';', $description);
$gnucash_csv_file .= $result['date'] . ', ' . $result['transaction_id'] . $gnucash_csv_file .= $result['date'] . ', ' . $result['transaction_id'] .
', (Income:' . $result['transaction_type'] . ') ' . $description . ', ' . $result['amount'] . ', ' . ', (Income:' . $result['transaction_type'] . ') ' .
$description . ' [' . $result['patron'] . ']' .
', ' . $result['amount'] . ', ' .
$accounts_gnucash['credit'] . "\n"; $accounts_gnucash['credit'] . "\n";
} }