X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;ds=sidebyside;f=assistants%2Fbank.inc.php;h=e5152d3e7ae504ef7b8f38c0df0f06d7b4287c3c;hb=bcde38a30d241390aef0eec6fc726cc7937cd64e;hp=2b57d422a0a65880c4f7517f866e6ce9c79d5ff1;hpb=6e9dc519736d5e6a13701d1cd7ae5a5a466e1b11;p=mirrors%2FSokoMan.git
diff --git a/assistants/bank.inc.php b/assistants/bank.inc.php
index 2b57d42..e5152d3 100644
--- a/assistants/bank.inc.php
+++ b/assistants/bank.inc.php
@@ -2,6 +2,7 @@
$bank_currency='KÄ';
global $bank_table;
$bank_table='transaction';
+$recursive=true; //USE RECURSIVE QUERIES???
function bank_name($name) {
return strtolower(trim($name));
@@ -108,17 +109,17 @@ if(isset($_POST['transaction'])) {
$account_to=$_POST['account_to'];
$amount=$_POST['amount'];
$comment=trim($_POST['comment']);
- if(!is_numeric($amount) || $amount < 0) $this->post_redirect_get("$URL_INTERNAL?account=".$account_from,"Lze pÅevádÄt jen kladné Äástky", true);
- if(strlen($comment)<4) $this->post_redirect_get("$URL_INTERNAL?account=".$account_from,"KomentáŠmusà mÃt alespoÅ 4 znaky!",true);
+ if(!is_numeric($amount) || $amount < 0) $this->post_redirect_get("$URL_INTERNAL?account=".urlencode($account_from),"Lze pÅevádÄt jen kladné Äástky", true);
+ if(strlen($comment)<4) $this->post_redirect_get("$URL_INTERNAL?account=".urlencode($account_from),"KomentáŠmusà mÃt alespoÅ 4 znaky!",true);
bank_transaction($this, $account_from, $account_to, $comment, $amount);
- $this->post_redirect_get("$URL_INTERNAL?account=".$account_from,"Transakce byla provedena:
PÅevod $amount $bank_currency z úÄtu $account_from na úÄet $account_to.
($comment)");
+ $this->post_redirect_get("$URL_INTERNAL?account=".urlencode($account_from),"Transakce byla provedena:
PÅevod $amount $bank_currency z úÄtu $account_from na úÄet $account_to.
($comment)");
}
$month = isset($_GET['month']) ? $_GET['month'] : false;
//bank_add_account($this, 'material');
echo("Banka - ");
-echo("Správa úÄtů - ");
+echo("Správa úÄtů - ");
echo('');
echo $this->html->form($URL, 'GET', array(
array('month',$month,'text',false,'','YYYY-MM:'),
@@ -130,7 +131,7 @@ $accounts = bank_get_accounts($this, $SUBPATH[0]=='admin');
$lastaccount=false;
foreach($accounts as $account) {
if($lastaccount && $lastaccount[0]!=$account[0] && !preg_match('/[a-zA-Z0-9]/', $lastaccount[0])) echo('
');
- echo("$account, ");
+ echo("$account, ");
$lastaccount=$account;
}
@@ -174,7 +175,12 @@ switch($SUBPATH[0]) {
db->safe_query_fetch("SELECT * FROM `${bank_table}` WHERE (`${bank_table}_to`=$account_sql OR `${bank_table}_from`=$account_sql) AND (".bank_month_sql($this,$month).") ORDER BY ${bank_table}_time DESC;");
+ $subtotal=$recursive?",(
+ (SELECT SUM(${bank_table}_amount) FROM ${bank_table} x WHERE ${bank_table}_to=$account_sql AND x.${bank_table}_id<=${bank_table}.${bank_table}_id)
+ -(SELECT SUM(${bank_table}_amount) FROM ${bank_table} x WHERE ${bank_table}_from=$account_sql AND x.${bank_table}_id<=${bank_table}.${bank_table}_id)
+ ) as ${bank_table}_subtotal":'';
+ //(@flux := IF(transaction_to='harvie',IF(transaction_from='harvie',0,1),IF(transaction_from='harvie',-1,0))) as flux
+ $result = $this->db->safe_query_fetch("SELECT *${subtotal} FROM `${bank_table}` WHERE (`${bank_table}_to`=$account_sql OR `${bank_table}_from`=$account_sql) AND (".bank_month_sql($this,$month).") ORDER BY ${bank_table}_time DESC;");
}
echo ("PÅehled transakcà $month
");
echo $this->html->render_item_table($result,$bank_table);