X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=assistants%2Fbank.inc.php;h=067e98943b2859fc9adb18b90057859585d5a2f2;hb=7da3f2f4cedfd49dc4cc946f6f0e63846089e23e;hp=7e3cf5224408c76dc332cd2b150d14d5175f7a58;hpb=399c761fe1537f3524ee42126aea3699a7d7c2eb;p=mirrors%2FSokoMan.git

diff --git a/assistants/bank.inc.php b/assistants/bank.inc.php
index 7e3cf52..067e989 100644
--- a/assistants/bank.inc.php
+++ b/assistants/bank.inc.php
@@ -1,94 +1,175 @@
 <?php
 $bank_currency='Kč';
+global $bank_table;
+$bank_table='transaction';
 
 function bank_name($name) {
 	return strtolower(trim($name));
 }
 
 function bank_transaction($ctx, $from, $to, $comment, $amount=0) {
+	global $bank_table;
 	$author=$ctx->db->quote($ctx->db->auth->get_user_id());
 	$from=$ctx->db->quote(bank_name($from));
 	$to=$ctx->db->quote(bank_name($to));
 	$amount=$ctx->db->quote($amount);
+	$comment=$ctx->db->quote(trim($comment));
 
-	$comment=trim($comment);
-	if(strlen($comment)<4) die("Komentář musí mít alespoň 4 znaky!");
-	$comment=$ctx->db->quote($comment);
-
-	$sql="INSERT INTO `bank` (`bank_time`, `bank_from`, `bank_to`, `bank_amount`, `bank_author`, `bank_comment`) VALUES (now(), $from, $to, $amount, $author, $comment);";
+	$sql="INSERT INTO `${bank_table}` (`${bank_table}_time`, `${bank_table}_from`, `${bank_table}_to`, `${bank_table}_amount`, `${bank_table}_author`, `${bank_table}_comment`) VALUES (now(), $from, $to, $amount, $author, $comment);";
 	$ctx->db->safe_query($sql);
 }
 
-function bank_get_accounts($ctx) {
-	$fetch = $ctx->db->safe_query_fetch('SELECT DISTINCT bank_to FROM bank ORDER BY bank_to;');
-	foreach($fetch as $account) $accounts[]=$account['bank_to'];
+function bank_get_accounts($ctx, $all=false) {
+	global $bank_table;
+	$fetch = $ctx->db->safe_query_fetch("SELECT DISTINCT ${bank_table}_to FROM ${bank_table} ORDER BY ${bank_table}_to;");
+	foreach($fetch as $account) if($all || $account[$bank_table.'_to'][0]!='_') $accounts[]=$account[$bank_table.'_to'];
 	return $accounts;
 }
 
+function bank_get_last_to($ctx, $account) {
+	global $bank_table;
+	$account=$ctx->db->quote(bank_name($account));
+	$fetch = $ctx->db->safe_query_fetch("SELECT ${bank_table}_to FROM ${bank_table} WHERE ${bank_table}_from=$account ORDER BY ${bank_table}_time DESC LIMIT 1;");
+	return $fetch[0][$bank_table.'_to'];
+}
+
 function bank_add_account($ctx, $name) {
 	bank_transaction($ctx, $name, $name, "Created account \"$name\"");
 }
 
+function bank_get_total($ctx, $account, $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;");
+	$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;");
+	$withdrawals = $result[0]["SUM(${bank_table}_amount)"];
+	if($string) return "$deposits-$withdrawals";
+	return $deposits-$withdrawals;
+}
+function bank_rename_account($ctx, $old, $new) {
+	global $bank_table;
+	if(in_array($new, bank_get_accounts($ctx, true))) return false;
+	$old=$ctx->db->quote($old);
+	$new=$ctx->db->quote($new);
+
+	return $ctx->db->safe_query(
+		"START TRANSACTION;".
+		"UPDATE ${bank_table} SET `${bank_table}_to`=$new WHERE `${bank_table}_to`=$old;".
+		"UPDATE ${bank_table} SET `${bank_table}_from`=$new WHERE `${bank_table}_from`=$old;".
+		"COMMIT;"
+	);
+}
+
+function bank_get_overview($ctx,$prefix='') {
+	global $bank_table;
+	$accounts = bank_get_accounts($ctx);
+	foreach($accounts as $acc) {
+		$total=bank_get_total($ctx, $acc);
+		$overview['table'][]=array("${prefix}account"=>$acc,"${prefix}total"=>$total);
+		$overview['array'][$acc]=$total;
+	}
+	return $overview;
+}
+
+if(isset($bank_json_only) && $bank_json_only) {
+	$overview=bank_get_overview($this);
+	die(json_encode(array(
+		'overview'=>$overview['array']
+	)));
+}
+
 if(isset($_POST['create_account'])) {
 	bank_add_account($this, $_POST['account_name']);
-	$this->post_redirect_get("$URL_INTERNAL","Účet byl vytvořen");
+	$this->post_redirect_get("$URL_INTERNAL/admin","Účet byl vytvořen");
+}
+if(isset($_POST['rename_account'])) {
+	if(bank_rename_account($this, $_POST['account_old'], $_POST['account_new'])) {
+		$this->post_redirect_get("$URL_INTERNAL/admin","Účet byl upraven");
+	} else {
+		$this->post_redirect_get("$URL_INTERNAL/admin","Takový účet již existuje!", false);
+	}
 }
 if(isset($_POST['transaction'])) {
-	if(!is_numeric($_POST['amount']) || $_POST['amount'] < 0) $this->post_redirect_get("$URL_INTERNAL","Lze převádět jen kladné částky", true);
+	if(!is_numeric($_POST['amount']) || $_POST['amount'] < 0) $this->post_redirect_get("$URL_INTERNAL?account=".$_POST['account_from'],"Lze převádět jen kladné částky", true);
+	$comment=trim($_POST['comment']);
+	if(strlen($comment)<4) $this->post_redirect_get("$URL_INTERNAL?account=".$_POST['account_from'],"Komentář musí mít alespoň 4 znaky!",true);
 	bank_transaction($this, $_POST['account_from'], $_POST['account_to'], $_POST['comment'], $_POST['amount']);
-	$this->post_redirect_get("$URL_INTERNAL","Transakce byla provedena"); //TODO redirect na account_from
+	$this->post_redirect_get("$URL_INTERNAL?account=".$_POST['account_from'],"Transakce byla provedena");
 }
 
 //bank_add_account($this, 'material');
-		echo("<a href='$URL/'>Banka</a> - ");
-		echo("<a href='$URL/admin'>Správa účtů</a> - ");
-		echo("Účty: ");
-		$accounts = bank_get_accounts($this);
-		foreach($accounts as $account) echo("<a href='$URL?account=$account'>$account</a>, ");
+echo("<a href='$URL/'>Banka</a> - ");
+echo("<a href='$URL/admin'>Správa účtů - </a>");
+echo("Účty: <br />");
+$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('<br />');
+	echo("<a href='$URL?account=$account'>$account</a>, ");
+	$lastaccount=$account;
+}
 
 switch($SUBPATH[0]) {
 	default:
 
 		if(!isset($_GET['account'])) {
 			echo("<h1>Banka</h1>");
-	    $result = $this->db->safe_query_fetch("SELECT SUM(bank_amount) as troughput FROM bank;");
+			echo ("<h2>Stav</h2>");
+	    $result = $this->db->safe_query_fetch("SELECT COUNT(${bank_table}_amount) as troughput FROM ${bank_table};");
+			echo("Transakcí: ".$result[0]['troughput']."<br />");
+	    $result = $this->db->safe_query_fetch("SELECT SUM(${bank_table}_amount) as troughput FROM ${bank_table};");
 			echo("Obrat: ".$result[0]['troughput'].' '.$bank_currency);
-	    $result = $this->db->safe_query_fetch("SELECT * FROM `bank` ORDER BY bank_time DESC;");
+	    $result = $this->db->safe_query_fetch("SELECT * FROM `${bank_table}` ORDER BY ${bank_table}_time DESC;");
+			$overview=bank_get_overview($this,$bank_table.'_');
+			echo $this->html->render_item_table($overview['table'],'bank');
+			echo ("<h2>Přehled transakcí</h2>");
 		} else {
 			$account=bank_name($_GET['account']);
 			$account_sql=$this->db->quote($account);
-	    $result = $this->db->safe_query_fetch("SELECT SUM(bank_amount) FROM `bank` WHERE `bank_to`=$account_sql;");
-			$deposits = $result[0]['SUM(bank_amount)'];
-	    $result = $this->db->safe_query_fetch("SELECT SUM(bank_amount) FROM `bank` WHERE `bank_from`=$account_sql;");
-			$withdrawals = $result[0]['SUM(bank_amount)'];
-			echo("<h1>Účet: ".$_GET['account']." (".($deposits-$withdrawals).$bank_currency.")</h1>");
+			echo("<h1>Účet: ".$account." (".bank_get_total($this,$account).$bank_currency.")</h1>");
 
 			?>
 			<form action="?" method="POST">
 				Převést <input type="number" name="amount" value="" /> <?php echo $bank_currency; ?>
-				z účtu <?php echo $account; ?> <input type="hidden" name="account_from" value="<?php echo $account; ?>" />
+				z účtu <b><?php echo $account; ?></b> <input type="hidden" name="account_from" value="<?php echo $account; ?>" />
 				na účet <select name='account_to'>
-					<?php foreach($accounts as $acc) echo("<option value='$acc'>$acc</option>"); ?>
-				</select> (pozor, dluhy se převádí opačným směrem než peníze!)<br />
-				Důvod: <input type="text" name="comment" style="width:800px;" />
+					<?php
+						//Ziskat posledni cilovy ucet a presunout na zacatek $accounts
+						$last=bank_get_last_to($this,$account);
+						unset($accounts[array_search($last,$accounts)]);
+						array_unshift($accounts,$last);
+
+						foreach($accounts as $acc) echo("<option value='$acc'>$acc</option>");
+					?>
+				</select> (pozor! zamysli se! převádíš peníze nebo dluhy?!)<br /><br />
+				Důvod: <input type="text" name="comment" maxlength="128" style="width:64em;" />
 				<input type="submit" name="transaction" value="Převést" />
 			</form>
 			<?php
 
-			echo("$deposits-$withdrawals $bank_currency");
-	    $result = $this->db->safe_query_fetch("SELECT * FROM `bank` WHERE `bank_to`=$account_sql OR `bank_from`=$account_sql ORDER BY bank_time DESC;");
+			echo(bank_get_total($this,$account,true)." $bank_currency");
+	    $result = $this->db->safe_query_fetch("SELECT * FROM `${bank_table}` WHERE `${bank_table}_to`=$account_sql OR `${bank_table}_from`=$account_sql ORDER BY ${bank_table}_time DESC;");
 		}
- 	  echo $this->html->render_item_table($result);
-
+		echo $this->html->render_item_table($result,$bank_table);
 
 		break;
 	case 'admin':
 ?>
+	</p>
 	<form action="<?php echo $ASSISTANT; ?>" method="POST" >
-		Account name:
+		Account:
 		<input type="text" name="account_name" />
 		<input type="submit" name="create_account" value="Create account" />
 	</form>
+	<form action="<?php echo $ASSISTANT; ?>" method="POST" >
+		Account: <select name='account_old'>
+			<?php foreach($accounts as $acc) echo("<option value='$acc'>$acc</option>"); ?>
+		</select>
+		<input type="text" name="account_new" />
+		<input type="submit" name="rename_account" value="Rename account" /> (účty začínající podtržítkem nebudou běžně viditelné)
+	</form>
+	</p>
 <?php
 		break;
 }