X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;ds=sidebyside;f=assistants%2Fbank.inc.php;h=e5152d3e7ae504ef7b8f38c0df0f06d7b4287c3c;hb=bcde38a30d241390aef0eec6fc726cc7937cd64e;hp=373e0a38579a63a31243196c1fe202a6746cd4a4;hpb=51ca86c44f2edf2fe7b12ff71eb45773dad6feaa;p=mirrors%2FSokoMan.git
diff --git a/assistants/bank.inc.php b/assistants/bank.inc.php
index 373e0a3..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));
@@ -37,12 +38,22 @@ function bank_add_account($ctx, $name) {
bank_transaction($ctx, $name, $name, "Created account \"$name\"");
}
-function bank_get_total($ctx, $account, $string=false) {
+function bank_month_sql($ctx, $month=false) {
+ global $bank_table;
+ $month_sql = 'TRUE';
+ if(!is_bool($month)) {
+ $month_q = $ctx->db->quote($month);
+ $month_sql .= " AND DATE_FORMAT(${bank_table}_time, '%Y-%m') = ".$month_q;
+ }
+ return $month_sql;
+}
+
+function bank_get_total($ctx, $account, $month, $string=false) {
global $bank_table;
$account_sql=$ctx->db->quote($account);
- $result = $ctx->db->safe_query_fetch("SELECT SUM(${bank_table}_amount) FROM `${bank_table}` WHERE `${bank_table}_to`=$account_sql;");
+ $result = $ctx->db->safe_query_fetch("SELECT SUM(${bank_table}_amount) FROM `${bank_table}` WHERE `${bank_table}_to`=$account_sql AND ".bank_month_sql($ctx,$month).';');
$deposits = $result[0]["SUM(${bank_table}_amount)"];
- $result = $ctx->db->safe_query_fetch("SELECT SUM(${bank_table}_amount) FROM `${bank_table}` WHERE `${bank_table}_from`=$account_sql;");
+ $result = $ctx->db->safe_query_fetch("SELECT SUM(${bank_table}_amount) FROM `${bank_table}` WHERE `${bank_table}_from`=$account_sql AND (".bank_month_sql($ctx,$month).');');
$withdrawals = $result[0]["SUM(${bank_table}_amount)"];
if($string) return "$deposits-$withdrawals";
return $deposits-$withdrawals;
@@ -61,11 +72,11 @@ function bank_rename_account($ctx, $old, $new) {
);
}
-function bank_get_overview($ctx,$prefix='') {
+function bank_get_overview($ctx,$prefix='',$month=false) {
global $bank_table;
$accounts = bank_get_accounts($ctx);
foreach($accounts as $acc) {
- $total=bank_get_total($ctx, $acc);
+ $total=bank_get_total($ctx, $acc, $month);
$overview['table'][]=array("${prefix}account"=>$acc,"${prefix}total"=>$total);
$overview['array'][$acc]=$total;
}
@@ -73,7 +84,7 @@ function bank_get_overview($ctx,$prefix='') {
}
if(isset($bank_json_only) && $bank_json_only) {
- $overview=bank_get_overview($this);
+ $overview=bank_get_overview($this,'');
die(json_encode(array(
'overview'=>$overview['array']
)));
@@ -82,15 +93,15 @@ if(isset($bank_json_only) && $bank_json_only) {
if(isset($_POST['create_account'])) {
$new_account=$_POST['account_name'];
bank_add_account($this, $new_account);
- $this->post_redirect_get("$URL_INTERNAL/admin","ÃÄet '$new_account' byl vytvoÅen!");
+ $this->post_redirect_get("$URL_INTERNAL/admin","ÃÄet $new_account byl vytvoÅen!");
}
if(isset($_POST['rename_account'])) {
$new_account=$_POST['account_new'];
$old_account=$_POST['account_old'];
if(bank_rename_account($this, $_POST['account_old'], $_POST['account_new'])) {
- $this->post_redirect_get("$URL_INTERNAL/admin","ÃÄet '$old_account' byl pÅejmenován na '$new_account'!");
+ $this->post_redirect_get("$URL_INTERNAL/admin","ÃÄet $old_account byl pÅejmenován na $new_account!");
} else {
- $this->post_redirect_get("$URL_INTERNAL/admin","ÃÄet '$new_account' již existuje!", false);
+ $this->post_redirect_get("$URL_INTERNAL/admin","ÃÄet $new_account již existuje!", false);
}
}
if(isset($_POST['transaction'])) {
@@ -98,42 +109,51 @@ 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:'),
+ array(false,'SELECT BY MONTH','submit')
+));
+echo('');
echo("ÃÄty:
");
$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;
}
+
+
switch($SUBPATH[0]) {
default:
if(!isset($_GET['account'])) {
- echo("