X-Git-Url: http://git.hcoop.net/hcoop/zz_old/portal.git/blobdiff_plain/8d347a3306ce7cc6e744183f0d4229f09d3f7101..f9d08b8c04c4174dac4f9c9e4750d39c3e6c5423:/money.mlt

diff --git a/money.mlt b/money.mlt
index e2bf406..1e1f692 100644
--- a/money.mlt
+++ b/money.mlt
@@ -3,6 +3,7 @@
 ref showNormal = true;
 
 if $"cmd" = "list" then
+	val admin = Group.inGroupName "money";
 	showNormal := false %>
 
 <h3><b>Transactions</b></h3>
@@ -12,9 +13,14 @@ if $"cmd" = "list" then
 <% foreach trn in Money.listTransactions () 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> </tr><%
-	| _ => %><td><i>multi</i></td> </tr><%
+	  [(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?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?del=<% #id trn %>">[Delete]</a></td><%
 end
+%></tr><%
 end %>
 </table>
 
@@ -56,11 +62,127 @@ end %></td> </tr>
 </table>
 
 <% elseif $"cmd" = "hosting2" then
-	val id = Money.addTransaction ($"descr", Web.stor ($"amount"), $"d");
+	Group.requireGroupName "money";
+	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>
 
+<% elseif $"modHosting" <> "" then
+	Group.requireGroupName "money";
+	showNormal := false;
+	val id = Web.stoi ($"modHosting");
+	val trn = Money.lookupTransaction id %>
+
+<h3><b>Modify hosting bill</b></h3>
+
+<form action="money">
+<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>
+<tr> <td><input type="submit" value="Save"></td> </tr>
+</table>
+
+<% elseif $"saveHosting" <> "" then
+	Group.requireGroupName "money";
+	val id = Web.stoi ($"saveHosting");
+	val trn = Money.lookupTransaction id;
+
+	Money.clearCharges id;
+	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>
+
+<% elseif $"cmd" = "evenForm" then
+	Group.requireGroupName "money";
+	showNormal := false %>
+<h3><b>New generic/even transaction</b></h3>
+<form action="money">
+<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>
+<% foreach usr in Init.listUsers () do %>
+	<option value="<% #id usr %>"><% #name usr %></option>
+<% end %>
+</select></td> </tr>
+<tr> <td><input type="submit" value="Add"></td> </tr>
+</table>
+</form>
+
+<% elseif $"cmd" = "pay" then
+	Group.requireGroupName "money";
+	showNormal := false %>
+
+<h3><b>New member payment</b></h3>
+
+<form action="money">
+<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">
+<% foreach usr in Init.listUsers () do %>
+	<option value="<% #id usr %>"><% #name usr %></option>
+<% end %>
+</select></td> </tr>
+<tr> <td><input type="submit" value="Add"></td> </tr>
+</table>
+</form>
+
+<% elseif $"cmd" = "pay2" then
+	Group.requireGroupName "money";
+	val amount = Web.stor ($"amount");
+	val id = Money.addTransaction ($"descr", amount, $"d");
+	Money.addCharge {trn = id, usr = Web.stoi ($"usr"), amount = amount};
+	Money.applyCharges id;
+
+	%><h3><b>Payment transaction added.</b></h3>
+
+<% elseif $"modPay" <> "" then
+	Group.requireGroupName "money";
+	showNormal := false;
+	val id = Web.stoi ($"modPay");
+	val trn = Money.lookupTransaction id %>
+
+<h3><b>Modify member payment</b></h3>
+
+<form action="money">
+<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">
+<% foreach (sel, usr) in Money.listUsers (#id trn) do %>
+	<option value="<% #id usr %>"<% if sel then %> selected<% end %>><% #name usr %></option>
+<% end %>
+</td></tr>
+<tr> <td><input type="submit" value="Save"></td> </tr>
+</table>
+
+<% elseif $"savePay" <> "" then
+	Group.requireGroupName "money";
+	val id = Web.stoi ($"savePay");
+	val trn = Money.lookupTransaction id;
+
+	val amount = Web.stor ($"amount");
+	Money.clearCharges id;
+	Money.modTransaction {trn with descr = $"descr", d = $"d", amount = amount};
+	Money.addCharge {trn = id, usr = Web.stoi ($"usr"), amount = amount};
+	Money.applyCharges id;
+
+	%><h3><b>Member payment modified.</b></h3>
+
 <% elseif $"cmd" = "evenForm" then
 	Group.requireGroupName "money";
 	showNormal := false %>
@@ -81,12 +203,14 @@ end %></td> </tr>
 </form>
 
 <% elseif $"cmd" = "even" then
+	Group.requireGroupName "money";
 	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>
 
 <% elseif $"modEven" <> "" then
+	Group.requireGroupName "money";
 	showNormal := false;
 	val trn = Money.lookupTransaction (Web.stoi ($"modEven")) %>
 <h3><b>Modify even transaction</b></h3>
@@ -107,6 +231,7 @@ end %></td> </tr>
 </form>
 
 <% elseif $"saveEven" <> "" then
+	Group.requireGroupName "money";
 	val id = Web.stoi ($"saveEven");
 	val trn = Money.lookupTransaction id;
 	Money.clearCharges id;
@@ -116,18 +241,25 @@ end %></td> </tr>
 	%><h3><b>Even transaction modified</b></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>
 	<a href="money?del2=<% $"del" %>">Yes, delete <% Web.html (#descr trn) %>!</a>
 
 <% elseif $"del2" <> "" then
+	Group.requireGroupName "money";
 	val id = Web.stoi ($"del2");
 	val trn = Money.lookupTransaction id;
 	Money.clearCharges id;
 	Money.deleteTransaction id %>
 	<h3><b><% Web.html (#descr trn) %> deleted!</b></h3>
 
+<% elseif $"cmd" = "equalize" then
+	Group.requireGroupName "money";
+	Money.equalizeBalances ();
+	%><h3><b>Balances equalized</b></h3>
+
 <% elseif $"trn" <> "" then
 	showNormal := false;
 	val id = Web.stoi ($"trn");
@@ -161,7 +293,10 @@ end %>
 
 <br><b><u>New transaction:</u></b><br>
 <a href="money?cmd=hosting">Hosting bill</a><br>
+<a href="money?cmd=pay">Payment from member</a><br>
 <a href="money?cmd=evenForm">Generic/even</a><br>
+<br>
+<a href="money?cmd=equalize">Equalize balances</a><br>
 
 <h3><b>Most recent transactions</b></h3>
 
@@ -173,7 +308,8 @@ end %>
 	  [(name, cha)] => %><td><a href="user?id=<% #usr cha %>"><% name %></a></td><%
 	| _ => %><td><i>multi</i></td><%
 end %>
-<td><a href="money?modEven=<% #id trn %>">[Even]</a></td> <td><a href="money?del=<% #id trn %>">[Delete]</a></td> </tr>
+<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?del=<% #id trn %>">[Delete]</a></td> </tr>
 <% end %>
 </table>