Tracking dues policy changes

diff --git a/money.mlt b/money.mlt
index 331c079..4654b06 100644 (file)
--- a/money.mlt
+++ b/money.mlt
@@ -29,7 +29,29 @@ if $"hist" <> "" then
        | _ => %><td><i>multi</i></td><%
 end;
 if admin then
-       %><td><a href="money?modHosting=<% #id trn %>">[Hosting]</a> <a href="money?modPay=<% #id trn %>">[Payment]</a> <a href="money?modEven=<% #id trn %>">[Other]</a></td>
+       %><td><a href="money?modBill=<% #id trn %>">[Bill]</a> <a href="money?modPay=<% #id trn %>">[Payment]</a> <a href="money?modEven=<% #id trn %>">[Other]</a></td>
+       <td><a href="money?del=<% #id trn %>">[Delete]</a></td><%
+end
+%></tr><%
+end %>
+</table>
+
+<% elseif $"cmd" = "primary" then
+       val admin = Group.inGroupName "money";
+       showNormal := false %>
+
+<h3>Primary 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>
+<% foreach (amt, trn) in Money.listUserTransactions (valOf (Init.userNameToId "hcoop")) do %>
+<tr> <td><% #d trn %></td> <td><a href="money?trn=<% #id trn %>"><% Web.html (#descr trn) %></a></td> <td><% #amount trn %></td> <td><% #stamp trn %></td>
+<% switch Money.listChargesWithNames (#id trn) of
+         [(name, cha)] => %><td><a href="user?id=<% #usr cha %>"><% name %></a></td><%
+       | _ => %><td><i>multi</i></td><%
+end;
+if admin then
+       %><td><a href="money?modBill=<% #id trn %>">[Bill]</a> <a href="money?modPay=<% #id trn %>">[Payment]</a> <a href="money?modEven=<% #id trn %>">[Other]</a></td>
        <td><a href="money?del=<% #id trn %>">[Delete]</a></td><%
 end
 %></tr><%
@@ -47,7 +69,7 @@ end %>
 <% switch Balance.listBalanceUsers (#id bal) of
          [] =>
        | (user :: users) =>
-               %><a href="money?hist=<% #id user %>"><% Web.html (#name user) %></a><%
+               %><a href="money?hist=<% #id user %>"><% Web.html (#name user) %></a> <a href="money?hist=<% #id user %>">[History]</a><%
                foreach user in users do
                        %>, <a href="money?hist=<% # id user %>"><% Web.html (#name user) %></a><%
                end
@@ -153,6 +175,58 @@ end %></textarea></td> </tr>
 
        %><h3>Hosting transaction modified.</h3>
 
+<% elseif $"cmd" = "bill" then
+       Group.requireGroupName "money";
+       showNormal := false %>
+
+<h3>New bill for the co-op</h3>
+
+<form action="money" method="post">
+<input type="hidden" name="cmd" value="bill2">
+<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><input type="submit" value="Add"></td> </tr>
+</table>
+
+<% elseif $"cmd" = "bill2" then
+       Group.requireGroupName "money";
+       val id = Money.addTransaction ($"descr", Util.neg (Web.stor ($"amount")), $"d");
+       Money.addCharge {trn = id, usr = valOf (Init.userNameToId "hcoop"), amount = Util.neg (Web.stor ($"amount"))};
+       Money.applyCharges id;
+
+       %><h3>Bill added.</h3>
+
+<% elseif $"modBill" <> "" then
+       Group.requireGroupName "money";
+       showNormal := false;
+       val id = Web.stoi ($"modBill");
+       val trn = Money.lookupTransaction id %>
+
+<h3>Modify bill</h3>
+
+<form action="money" method="post">
+<input type="hidden" name="saveBill" value="<% id %>">
+<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><input type="submit" value="Save"></td> </tr>
+</table>
+
+<% elseif $"saveBill" <> "" then
+       Group.requireGroupName "money";
+       val id = Web.stoi ($"saveBill");
+       val trn = Money.lookupTransaction id;
+
+       Money.clearCharges id;
+       Money.modTransaction {trn with descr = $"descr", d = $"d", amount = Util.neg (Web.stor ($"amount"))};
+       Money.addCharge {trn = id, usr = valOf (Init.userNameToId "hcoop"), amount = Util.neg (Web.stor ($"amount"))};
+       Money.applyCharges id;
+
+       %><h3>Bill modified.</h3>
+
 <% elseif $"cmd" = "evenForm" then
        Group.requireGroupName "money";
        showNormal := false %>
@@ -504,13 +578,15 @@ elseif $"cmd" = "freezeworthy" then
    val deposit = Balance.depositAmount (#id bal) %>
 
 <h3>Your balance: $<% Util.sub (#amount bal, deposit) %><br>
-Deposit: $<% deposit %></b> (3 months of dues at the minimal <a href="pledge">pledge level</a>)</h3>
+Deposit: $<% deposit %></b> (3 months of dues at the minimal <a href="pledge">pledge level</a>)<br>
+Co-op balance: $<% #amount (Balance.lookupBalance (valOf (Balance.balanceNameToId "hcoop"))) %></h3>
 
 <!--h3>Your balance: $<% #amount bal %></h3-->
 
 <% if (iff Group.inGroupName "money" then $"lookback" = "" else $"audit" <> "") 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=primary">List primary transactions</a><br>
 <a href="money?cmd=bals">List active balances</a><br>
 <a href="money?cmd=nbals">List negative active balances</a><br>
 <a href="money?cmd=freezeworthy">List members who deserve account freezing</a><br>
@@ -523,7 +599,7 @@ Deposit: $<% deposit %></b> (3 months of dues at the minimal <a href="pledge">pl
 <a href="?lookback=20">Switch to regular member view</a><br>
 
 <br><b><u>New transaction:</u></b><br>
-<a href="money?cmd=hosting">Hosting bill</a><br>
+<a href="money?cmd=bill">Bill for the co-op</a><br>
 <a href="money?cmd=pay">Payment from member</a><br>
 <a href="money?cmd=evenForm">Generic/even</a><br>
 <br>
@@ -554,7 +630,7 @@ Deposit: $<% deposit %></b> (3 months of dues at the minimal <a href="pledge">pl
          [(name, cha)] => %><td><a href="user?id=<% #usr cha %>"><% name %></a></td><%
        | _ => %><td><i>multi</i></td><%
 end %>
-<td><a href="money?modHosting=<% #id trn %>">[Hosting]</a> <a href="money?modPay=<% #id trn %>">[Payment]</a> <a href="money?modEven=<% #id trn %>">[Other]</a></td>
+<td><a href="money?modBill=<% #id trn %>">[Bill]</a> <a href="money?modPay=<% #id trn %>">[Payment]</a> <a href="money?modEven=<% #id trn %>">[Other]</a></td>
 <td><a href="money?del=<% #id trn %>">[Delete]</a></td> </tr>
 <% end %>
 </table>