Add all-balance summing and listing of retired balances

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

diff --git a/money.mlt b/money.mlt
index 230eca5..bd532be 100644 (file)
--- a/money.mlt
+++ b/money.mlt
@@ -37,7 +37,7 @@ end %>
 <% elseif $"cmd" = "bals" then
        showNormal := false %>
 
-<h3>Balances</h3>
+<h3>Active Balances</h3>
 
 <table>
 <% foreach bal in Balance.listOwnedBalances () do %>
@@ -53,6 +53,25 @@ end %></td> </tr>
 <% end %>
 </table>
 
+<% elseif $"cmd" = "deadbals" then
+       showNormal := false %>
+
+<h3>Retired Balances</h3>
+
+<table>
+<% foreach bal in Balance.listUnownedBalances () do %>
+<tr><td><% #name bal %></td> <td><% #amount bal %></td> <td>
+<% switch Balance.listBalanceUsers (#id bal) of
+         [] =>
+       | (user :: users) =>
+               %><a href="money?hist=<% #id user %>"><% Web.html (#name user) %></a><%
+               foreach user in users do
+                       %>, <a href="money?hist=<% # id user %>"><% Web.html (#name user) %></a><%
+               end
+end %></td> </tr>
+<% end %>
+</table>
+
 <% elseif $"cmd" = "hosting" then
        Group.requireGroupName "money";
        showNormal := false %>
@@ -140,7 +159,13 @@ end %></textarea></td> </tr>
 <form action="money" method="post">
 <input type="hidden" name="cmd" value="pay2">
 <table class="blanks">
-<tr> <td>Description:</td> <td><input name="descr"></td> </tr>
+<tr> <td>Description:</td> <td><select name="descr">
+       <option selected>PayPal</option>
+       <option>Google Checkout</option>
+       <option>Check</option>
+       <option>Direct transfer</option>
+       <option value="">Other:</option>
+</select> <input name="descr2"></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">
@@ -155,6 +180,8 @@ end %></textarea></td> </tr>
 <% elseif $"cmd" = "pay2" then
        Group.requireGroupName "money";
        val amount = Web.stor ($"amount");
+       val descr = $"descr";
+       val descr = iff descr = "" then $"descr2" else descr;
        val id = Money.addTransaction ($"descr", amount, $"d");
        Money.addCharge {trn = id, usr = Web.stoi ($"usr"), amount = amount};
        Money.applyCharges id;
@@ -299,10 +326,12 @@ end %>
 
 <% if showNormal then %>
 
-<h3>Your balance:</b> $<% #amount (Balance.lookupBalance (#bal (Init.getUser ()))) %></h3>
+<h3>Your balance: $<% #amount (Balance.lookupBalance (#bal (Init.getUser ()))) %></h3>
+<% if Group.inGroupName "money" then %><h3>Sum of all active balances: $<% Balance.sumOwnedBalances () %></h3><% end %>
 
 <a href="money?cmd=list">List all transactions</a><br>
-<a href="money?cmd=bals">List all balances</a><br>
+<a href="money?cmd=bals">List active balances</a><br>
+<a href="money?cmd=deadbals">List retired balances</a><br>
 
 <% if Group.inGroupName "money" then %>