X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=assistants%2Fbank.inc.php;h=eb04f230f993052eac4398ad2fa810e7a18fc05f;hb=90f6601d9959475df9685bae10f4e8c2193472d9;hp=173ff04dde2953d8c69df608f95c7a62e09cc134;hpb=68f2420e290fd8f77d8e8dca6686954368d38d02;p=mirrors%2FSokoMan.git

diff --git a/assistants/bank.inc.php b/assistants/bank.inc.php
index 173ff04..eb04f23 100644
--- a/assistants/bank.inc.php
+++ b/assistants/bank.inc.php
@@ -1,51 +1,88 @@
 <?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));
 
-	$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_amount) FROM `bank` WHERE `bank_to`=$account_sql;");
-	$deposits = $result[0]['SUM(bank_amount)'];
-	$result = $ctx->db->safe_query_fetch("SELECT SUM(bank_amount) FROM `bank` WHERE `bank_from`=$account_sql;");
-	$withdrawals = $result[0]['SUM(bank_amount)'];
+	$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);
 
-function bank_get_overview($ctx) {
+	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) $overview[]=array("bank_account"=>$acc,"bank_total"=>bank_get_total($ctx, $acc));
+	foreach($accounts as $acc) $overview[]=array("${prefix}account"=>$acc,"${prefix}total"=>bank_get_total($ctx, $acc));
 	return $overview;
 }
 
+if(isset($bank_json_only) && $bank_json_only) die(json_encode(array(
+	'overview'=>bank_get_overview($this)
+)));
+
 if(isset($_POST['create_account'])) {
 	bank_add_account($this, $_POST['account_name']);
 	$this->post_redirect_get("$URL_INTERNAL","Úč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","Účet byl upraven");
+	} else {
+		$this->post_redirect_get("$URL_INTERNAL","Takový účet již existuje!", false);
+	}
+}
 if(isset($_POST['transaction'])) {
 	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']);
@@ -58,7 +95,7 @@ if(isset($_POST['transaction'])) {
 echo("<a href='$URL/'>Banka</a> - ");
 echo("<a href='$URL/admin'>Správa účtů</a> - ");
 echo("Účty: ");
-$accounts = bank_get_accounts($this);
+$accounts = bank_get_accounts($this, $SUBPATH[0]=='admin');
 foreach($accounts as $account) echo("<a href='$URL?account=$account'>$account</a>, ");
 
 switch($SUBPATH[0]) {
@@ -67,12 +104,12 @@ switch($SUBPATH[0]) {
 		if(!isset($_GET['account'])) {
 			echo("<h1>Banka</h1>");
 			echo ("<h2>Stav</h2>");
-	    $result = $this->db->safe_query_fetch("SELECT COUNT(bank_amount) as troughput FROM bank;");
+	    $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_amount) as troughput FROM bank;");
+	    $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;");
-			echo $this->html->render_item_table(bank_get_overview($this));
+	    $result = $this->db->safe_query_fetch("SELECT * FROM `${bank_table}` ORDER BY ${bank_table}_time DESC;");
+			echo $this->html->render_item_table(bank_get_overview($this, $bank_table.'_'),'bank');
 			echo ("<h2>Přehled transakcí</h2>");
 		} else {
 			$account=bank_name($_GET['account']);
@@ -82,30 +119,43 @@ switch($SUBPATH[0]) {
 			?>
 			<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 /><br />
-				Důvod: <input type="text" name="comment" style="width:64em;" />
+					<?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(bank_get_total($this,$account,true)." $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;");
+	    $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;");
 		}
-		$this->html->table_hide_columns($result, 'bank');
- 	  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;