Allow commas in ticket titles

[hcoop/zz_old/portal.git] / money.mlt

diff --git a/money.mlt b/money.mlt
index 1e1f692..230eca5 100644 (file)
--- a/money.mlt
+++ b/money.mlt
@@ -2,11 +2,21 @@
 
 ref showNormal = true;
 
-if $"cmd" = "list" then
+if $"hist" <> "" then
+       showNormal := false;
+       val id = Web.stoi ($"hist") %>
+<table>
+<tr> <td><b>Date</b></td> <td><b>Description</b></td> <td><b>Amount</b></td> </tr>
+<% foreach (amount, trn) in Money.listUserTransactions id do %>
+<tr> <td><% #d trn %></td> <td><a href="money?trn=<% #id trn %>"><% Web.html (#descr trn) %></a></td> <td><% amount %>/<% #amount trn %></td> </tr>
+<% end %>
+</table>
+
+<% elseif $"cmd" = "list" then
        val admin = Group.inGroupName "money";
        showNormal := false %>
 
-<h3><b>Transactions</b></h3>
+<h3>Transactions</h3>
 
 <table>
 <tr> <td><b>Date</b></td> <td><b>Description</b></td> <td><b>Amount</b></td> <td><b>Last modified</b></td> <td><b>Participants</b></td> </tr>
@@ -27,17 +37,17 @@ end %>
 <% elseif $"cmd" = "bals" then
        showNormal := false %>
 
-<h3><b>Balances</b></h3>
+<h3>Balances</h3>
 
 <table>
-<% foreach bal in Balance.listBalances () do %>
+<% foreach bal in Balance.listOwnedBalances () do %>
 <tr><td><% #name bal %></td> <td><% #amount bal %></td> <td>
 <% switch Balance.listBalanceUsers (#id bal) of
          [] =>
        | (user :: users) =>
-               %><a href="user?id=<% #id user %>"><% Web.html (#name user) %></a><%
+               %><a href="money?hist=<% #id user %>"><% Web.html (#name user) %></a><%
                foreach user in users do
-                       %>, <a href="user?id=<% # id user %>"><% Web.html (#name user) %></a><%
+                       %>, <a href="money?hist=<% # id user %>"><% Web.html (#name user) %></a><%
                end
 end %></td> </tr>
 <% end %>
@@ -47,17 +57,17 @@ end %></td> </tr>
        Group.requireGroupName "money";
        showNormal := false %>
 
-<h3><b>New hosting bill</b></h3>
+<h3>New hosting bill</h3>
 
-<form action="money">
+<form action="money" method="post">
 <input type="hidden" name="cmd" value="hosting2">
-<table>
-<tr> <td align="right"><b>Description</b>:</td> <td><input name="descr"></td> </tr>
-<tr> <td align="right"><b>Date</b>:</td> <td><input name="d"></td> </tr>
-<tr> <td align="right"><b>Amount</b>:</td> <td><input name="amount"></td> </tr>
-<tr> <td align="right"><b>Free bandwidth cutoff (MB)</b>:</td> <td><input name="cutoff" value="200"></td> </tr>
-<tr> <td align="right"><b>Cost/GB</b>:</td> <td><input name="cost" value="4"></td> </tr>
-<tr> <td align="right" valign="top"><b>Member usage</b>:</td> <td><textarea wrap="soft" name="usage" rows="24" cols="80"></textarea></td> </tr>
+<table class="blanks">
+<tr> <td>Description:</td> <td><input name="descr"></td> </tr>
+<tr> <td>Date:</td> <td><input name="d"></td> </tr>
+<tr> <td>Amount:</td> <td><input name="amount"></td> </tr>
+<tr> <td>Free bandwidth cutoff (MB):</td> <td><input name="cutoff" value="200"></td> </tr>
+<tr> <td>Cost/GB:</td> <td><input name="cost" value="4"></td> </tr>
+<tr> <td>Member usage:</td> <td><textarea wrap="soft" name="usage" rows="24" cols="80"></textarea></td> </tr>
 <tr> <td><input type="submit" value="Add"></td> </tr>
 </table>
 
@@ -66,7 +76,7 @@ end %></td> </tr>
        val id = Money.addTransaction ($"descr", Util.neg (Web.stor ($"amount")), $"d");
        Money.addHostingCharges {trn = id, cutoff = 1000 * Web.stoi ($"cutoff"), cost = Web.stor ($"cost"), usage = $"usage"};
 
-       %><h3><b>Hosting transaction added.</b></h3>
+       %><h3>Hosting transaction added.</h3>
 
 <% elseif $"modHosting" <> "" then
        Group.requireGroupName "money";
@@ -74,17 +84,20 @@ end %></td> </tr>
        val id = Web.stoi ($"modHosting");
        val trn = Money.lookupTransaction id %>
 
-<h3><b>Modify hosting bill</b></h3>
+<h3>Modify hosting bill</h3>
 
-<form action="money">
+<form action="money" method="post">
 <input type="hidden" name="saveHosting" value="<% id %>">
-<table>
-<tr> <td align="right"><b>Description</b>:</td> <td><input name="descr" value="<% Web.html (#descr trn) %>"></td> </tr>
-<tr> <td align="right"><b>Date</b>:</td> <td><input name="d" value="<% Web.html (#d trn) %>"></td> </tr>
-<tr> <td align="right"><b>Amount</b>:</td> <td><input name="amount" value="<% Util.neg (#amount trn) %>"></td> </tr>
-<tr> <td align="right"><b>Free bandwidth cutoff (MB)</b>:</td> <td><input name="cutoff" value="200"></td> </tr>
-<tr> <td align="right"><b>Cost/GB</b>:</td> <td><input name="cost" value="4"></td> </tr>
-<tr> <td align="right" valign="top"><b>Member usage</b>:</td> <td><textarea wrap="soft" name="usage" rows="24" cols="80"></textarea></td> </tr>
+<table class="blanks">
+<tr> <td>Description:</td> <td><input name="descr" value="<% Web.html (#descr trn) %>"></td> </tr>
+<tr> <td>Date:</td> <td><input name="d" value="<% Web.html (#d trn) %>"></td> </tr>
+<tr> <td>Amount:</td> <td><input name="amount" value="<% Util.neg (#amount trn) %>"></td> </tr>
+<tr> <td>Free bandwidth cutoff (MB):</td> <td><input name="cutoff" value="200"></td> </tr>
+<tr> <td>Cost/GB:</td> <td><input name="cost" value="4"></td> </tr>
+<tr> <td>Member usage:</td> <td><textarea wrap="soft" name="usage" rows="24" cols="80"><%
+switch Money.lookupHostingUsage id of
+         SOME s => s
+end %></textarea></td> </tr>
 <tr> <td><input type="submit" value="Save"></td> </tr>
 </table>
 
@@ -97,19 +110,19 @@ end %></td> </tr>
        Money.modTransaction {trn with descr = $"descr", d = $"d", amount = Util.neg (Web.stor ($"amount"))};
        Money.addHostingCharges {trn = id, cutoff = 1000 * Web.stoi ($"cutoff"), cost = Web.stor ($"cost"), usage = $"usage"};
 
-       %><h3><b>Hosting transaction modified.</b></h3>
+       %><h3>Hosting transaction modified.</h3>
 
 <% elseif $"cmd" = "evenForm" then
        Group.requireGroupName "money";
        showNormal := false %>
-<h3><b>New generic/even transaction</b></h3>
-<form action="money">
+<h3>New generic/even transaction</h3>
+<form action="money" method="post">
 <input type="hidden" name="cmd" value="even">
-<table>
-<tr> <td align="right"><b>Description</b>:</td> <td><input name="descr"></td> </tr>
-<tr> <td align="right"><b>Date</b>:</td> <td><input name="d"></td> </tr>
-<tr> <td align="right"><b>Amount</b>:</td> <td><input name="amount"></td> </tr>
-<tr> <td align="right" valign="top"><b>Members</b>:</td> <td><select name="usrs" size="5" multiple>
+<table class="blanks">
+<tr> <td>Description:</td> <td><input name="descr"></td> </tr>
+<tr> <td>Date:</td> <td><input name="d"></td> </tr>
+<tr> <td>Amount:</td> <td><input name="amount"></td> </tr>
+<tr> <td>Members:</td> <td><select name="usrs" size="5" multiple>
 <% foreach usr in Init.listUsers () do %>
        <option value="<% #id usr %>"><% #name usr %></option>
 <% end %>
@@ -122,15 +135,15 @@ end %></td> </tr>
        Group.requireGroupName "money";
        showNormal := false %>
 
-<h3><b>New member payment</b></h3>
+<h3>New member payment</h3>
 
-<form action="money">
+<form action="money" method="post">
 <input type="hidden" name="cmd" value="pay2">
-<table>
-<tr> <td align="right"><b>Description</b>:</td> <td><input name="descr"></td> </tr>
-<tr> <td align="right"><b>Date</b>:</td> <td><input name="d"></td> </tr>
-<tr> <td align="right"><b>Amount</b>:</td> <td><input name="amount"></td> </tr>
-<tr> <td align="right" valign="top"><b>Member</b>:</td> <td><select name="usr">
+<table class="blanks">
+<tr> <td>Description:</td> <td><input name="descr"></td> </tr>
+<tr> <td>Date:</td> <td><input name="d"></td> </tr>
+<tr> <td>Amount:</td> <td><input name="amount"></td> </tr>
+<tr> <td>Member:</td> <td><select name="usr">
 <% foreach usr in Init.listUsers () do %>
        <option value="<% #id usr %>"><% #name usr %></option>
 <% end %>
@@ -146,7 +159,7 @@ end %></td> </tr>
        Money.addCharge {trn = id, usr = Web.stoi ($"usr"), amount = amount};
        Money.applyCharges id;
 
-       %><h3><b>Payment transaction added.</b></h3>
+       %><h3>Payment transaction added.</h3>
 
 <% elseif $"modPay" <> "" then
        Group.requireGroupName "money";
@@ -154,15 +167,15 @@ end %></td> </tr>
        val id = Web.stoi ($"modPay");
        val trn = Money.lookupTransaction id %>
 
-<h3><b>Modify member payment</b></h3>
+<h3>Modify member payment</h3>
 
-<form action="money">
+<form action="money" method="post">
 <input type="hidden" name="savePay" value="<% id %>">
-<table>
-<tr> <td align="right"><b>Description</b>:</td> <td><input name="descr" value="<% Web.html (#descr trn) %>"></td> </tr>
-<tr> <td align="right"><b>Date</b>:</td> <td><input name="d" value="<% Web.html (#d trn) %>"></td> </tr>
-<tr> <td align="right"><b>Amount</b>:</td> <td><input name="amount" value="<% Util.neg (#amount trn) %>"></td> </tr>
-<tr> <td align="right" valign="top"><b>Member</b>:</td> <td><select name="usr">
+<table class="blanks">
+<tr> <td>Description:</td> <td><input name="descr" value="<% Web.html (#descr trn) %>"></td> </tr>
+<tr> <td>Date:</td> <td><input name="d" value="<% Web.html (#d trn) %>"></td> </tr>
+<tr> <td>Amount:</td> <td><input name="amount" value="<% #amount trn %>"></td> </tr>
+<tr> <td>Member:</td> <td><select name="usr">
 <% foreach (sel, usr) in Money.listUsers (#id trn) do %>
        <option value="<% #id usr %>"<% if sel then %> selected<% end %>><% #name usr %></option>
 <% end %>
@@ -181,19 +194,19 @@ end %></td> </tr>
        Money.addCharge {trn = id, usr = Web.stoi ($"usr"), amount = amount};
        Money.applyCharges id;
 
-       %><h3><b>Member payment modified.</b></h3>
+       %><h3>Member payment modified.</h3>
 
 <% elseif $"cmd" = "evenForm" then
        Group.requireGroupName "money";
        showNormal := false %>
-<h3><b>New generic/even transaction</b></h3>
-<form action="money">
+<h3>New generic/even transaction</h3>
+<form action="money" method="post">
 <input type="hidden" name="cmd" value="even">
-<table>
-<tr> <td align="right"><b>Description</b>:</td> <td><input name="descr"></td> </tr>
-<tr> <td align="right"><b>Date</b>:</td> <td><input name="d"></td> </tr>
-<tr> <td align="right"><b>Amount</b>:</td> <td><input name="amount"></td> </tr>
-<tr> <td align="right" valign="top"><b>Members</b>:</td> <td><select name="usrs" size="5" multiple>
+<table class="blanks">
+<tr> <td>Description:</td> <td><input name="descr"></td> </tr>
+<tr> <td>Date:</td> <td><input name="d"></td> </tr>
+<tr> <td>Amount:</td> <td><input name="amount"></td> </tr>
+<tr> <td>Members:</td> <td><select name="usrs" size="5" multiple>
 <% foreach usr in Init.listUsers () do %>
        <option value="<% #id usr %>"><% #name usr %></option>
 <% end %>
@@ -207,21 +220,21 @@ end %></td> </tr>
        val id = Money.addTransaction ($"descr", Web.stor ($"amount"), $"d");
        Money.addEvenCharges (id, map Web.stoi (Web.getMultiParam "usrs"))
 
-       %><h3><b>Even transaction added.</b></h3>
+       %><h3>Even transaction added.</h3>
 
 <% elseif $"modEven" <> "" then
        Group.requireGroupName "money";
        showNormal := false;
        val trn = Money.lookupTransaction (Web.stoi ($"modEven")) %>
-<h3><b>Modify even transaction</b></h3>
+<h3>Modify even transaction</h3>
 
-<form action="money">
+<form action="money" method="post">
 <input type="hidden" name="saveEven" value="<% $"modEven" %>">
-<table>
-<tr> <td align="right"><b>Description</b>:</td> <td><input name="descr" value="<% Web.html (#descr trn) %>"></td> </tr>
-<tr> <td align="right"><b>Date</b>:</td> <td><input name="d" value="<% Web.html (#d trn) %>"></td> </tr>
-<tr> <td align="right"><b>Amount</b>:</td> <td><input name="amount" value="<% #amount trn %>"></td> </tr>
-<tr> <td align="right" valign="top"><b>Members</b>:</td> <td><select name="usrs" size="5" multiple>
+<table class="blanks">
+<tr> <td>Description:</td> <td><input name="descr" value="<% Web.html (#descr trn) %>"></td> </tr>
+<tr> <td>Date:</td> <td><input name="d" value="<% Web.html (#d trn) %>"></td> </tr>
+<tr> <td>Amount:</td> <td><input name="amount" value="<% #amount trn %>"></td> </tr>
+<tr> <td>Members:</td> <td><select name="usrs" size="5" multiple>
 <% foreach (sel, usr) in Money.listUsers (#id trn) do %>
        <option value="<% #id usr %>"<% if sel then %> selected<% end %>><% #name usr %></option>
 <% end %>
@@ -238,13 +251,13 @@ end %></td> </tr>
        Money.modTransaction {trn with descr = $"descr", d = $"d", amount = Web.stor ($"amount")};
        Money.addEvenCharges (id, map Web.stoi (Web.getMultiParam "usrs"))
 
-       %><h3><b>Even transaction modified</b></h3>
+       %><h3>Even transaction modified</h3>
 
 <% elseif $"del" <> "" then
        Group.requireGroupName "money";
        showNormal := false;
        val trn = Money.lookupTransaction (Web.stoi ($"del")) %>
-       <h3><b>Are you sure you want to delete transaction <a href="money?trn=<% #id trn %>"><% Web.html (#descr trn) %></a>?</b></h3>
+       <h3>Are you sure you want to delete transaction <a href="money?trn=<% #id trn %>"><% Web.html (#descr trn) %></a>?</h3>
        <a href="money?del2=<% $"del" %>">Yes, delete <% Web.html (#descr trn) %>!</a>
 
 <% elseif $"del2" <> "" then
@@ -253,23 +266,23 @@ end %></td> </tr>
        val trn = Money.lookupTransaction id;
        Money.clearCharges id;
        Money.deleteTransaction id %>
-       <h3><b><% Web.html (#descr trn) %> deleted!</b></h3>
+       <h3><% Web.html (#descr trn) %> deleted!</h3>
 
 <% elseif $"cmd" = "equalize" then
        Group.requireGroupName "money";
        Money.equalizeBalances ();
-       %><h3><b>Balances equalized</b></h3>
+       %><h3>Balances equalized</h3>
 
 <% elseif $"trn" <> "" then
        showNormal := false;
        val id = Web.stoi ($"trn");
        val trn = Money.lookupTransaction id %>
-<table>
-<tr> <td align="right"><b>TRN#</b>:</td> <td><% id %></td> </tr>
-<tr> <td align="right"><b>Description</b>:</td> <td><% Web.html (#descr trn) %></td> </tr>
-<tr> <td align="right"><b>Date</b>:</td> <td><% #d trn %></td> </tr>
-<tr> <td align="right"><b>Amount</b>:</td> <td>$<% #amount trn %></td> </tr>
-<tr> <td align="right" valign="top"><b>Distribution</b>:</td>
+<table class="blanks">
+<tr> <td>TRN#:</td> <td><% id %></td> </tr>
+<tr> <td>Description:</td> <td><% Web.html (#descr trn) %></td> </tr>
+<tr> <td>Date:</td> <td><% #d trn %></td> </tr>
+<tr> <td>Amount:</td> <td>$<% #amount trn %></td> </tr>
+<tr> <td>Distribution:</td>
 
 <% ref first = true;
 foreach (name, cha) in Money.listChargesWithNames id do
@@ -286,6 +299,8 @@ end %>
 
 <% if showNormal then %>
 
+<h3>Your balance:</b> $<% #amount (Balance.lookupBalance (#bal (Init.getUser ()))) %></h3>
+
 <a href="money?cmd=list">List all transactions</a><br>
 <a href="money?cmd=bals">List all balances</a><br>
 
@@ -298,7 +313,7 @@ end %>
 <br>
 <a href="money?cmd=equalize">Equalize balances</a><br>
 
-<h3><b>Most recent transactions</b></h3>
+<h3>Most recent transactions</h3>
 
 <table>
 <tr> <td><b>Date</b></td> <td><b>Description</b></td> <td><b>Amount</b></td> <td><b>Participants</b></td> <td><b>Replace</b></td> <td><b>Delete</b></td> </tr>
@@ -315,7 +330,9 @@ end %>
 
 <% else %>
 
-<h3><b>Your recent account activity</b></h3>
+<h3><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=payment@hcoop.net&item_name=Member+payment+for+<% Init.getUserName () %>">Add to your balance with PayPal</a></h3>
+
+<h3>Your recent account activity</h3>
 
 <table>
 <tr> <td><b>Date</b></td> <td><b>Description</b></td> <td><b>Amount</b></td> </tr>