Zaporne castky v bance

[mirrors/SokoMan.git] / assistants / bank.inc.php

diff --git a/assistants/bank.inc.php b/assistants/bank.inc.php
index 4c816cb975abda280ce8e85a5211986b7e7d93f9..d6137cf30d54fac64139d22738471fd8e7e6da12 100644 (file)
--- a/assistants/bank.inc.php
+++ b/assistants/bank.inc.php
@@ -109,10 +109,15 @@ 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);
+       $account_redirect=$account_from;
+       if(!is_numeric($amount)) $this->post_redirect_get("$URL_INTERNAL?account=".urlencode($account_from),"Převáděnou částkou musí být celé číslo.", true);
+       if($amount < 0) {
+               $amount=abs($amount);
+               list($account_from,$account_to)=array($account_to,$account_from); //swap from/to
+       }
+       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:<br />Převod <b>$amount $bank_currency</b> z účtu <b>$account_from</b> na účet <b>$account_to</b>.<br />($comment)");
+       $this->post_redirect_get("$URL_INTERNAL?account=".urlencode($account_redirect),"Transakce byla provedena:<br />Převod <b>$amount $bank_currency</b> z účtu <b>$account_from</b> na účet <b>$account_to</b>.<br />($comment)");
 }
 
 $month = isset($_GET['month']) ? $_GET['month'] : false;
@@ -131,7 +136,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('<br />');
-       echo("<a href='$URL?account=$account'>$account</a>, ");
+       echo("<a href='$URL?account=".urlencode($account)."'>$account</a>, ");
        $lastaccount=$account;
 }
 
@@ -157,7 +162,7 @@ switch($SUBPATH[0]) {
 
                        ?>
                        <form action="?" method="POST">
-                               Převést <input type="number" name="amount" value="" /> <?php echo $bank_currency; ?>
+                               Převést <!-- &plusmn; --><input type="number" name="amount" value="" /> <?php echo $bank_currency; ?>
                                z účtu <b><?php echo $account; ?></b> <input type="hidden" name="account_from" value="<?php echo $account; ?>" />
                                na účet <select name='account_to'>
                                        <?php
@@ -168,7 +173,7 @@ switch($SUBPATH[0]) {
 
                                                foreach($accounts as $acc) echo("<option value='$acc'>$acc</option>");
                                        ?>
-                               </select> (pozor! zamysli se! převádíš peníze nebo dluhy?!)<br /><br />
+                               </select> (pozor! zamysli se! převádíš peníze nebo dluhy?! záporná částka = převod v opačném směru.)<br /><br />
                                Důvod: <input type="text" name="comment" maxlength="128" style="width:64em;" />
                                <input type="submit" name="transaction" value="Převést" />
                        </form>
@@ -179,7 +184,8 @@ switch($SUBPATH[0]) {
                                (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":'';
-                       $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;"); //TADY
+                       //(@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 ("<h2>Přehled transakcí $month</h2>");
                echo $this->html->render_item_table($result,$bank_table);