Finished off inital money stuff

diff --git a/mlt.conf b/mlt.conf
index 3540eff..4b27a02 100644 (file)
--- a/mlt.conf
+++ b/mlt.conf
@@ -5,7 +5,7 @@ before  before
 after  after
 exn    exn
 
-out    /home/hcoop/public_html/src/hcoop/out
+out    out
 pub    /var/www/users.hcoop.net/cgi/hcoop
 
 cm     /usr/local/share/smlsql/smlsql.cm

diff --git a/money.mlt b/money.mlt
index e2bf406..b16b14a 100644 (file)
--- a/money.mlt
+++ b/money.mlt
@@ -56,11 +56,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 +197,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 +225,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,12 +235,14 @@ 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;
@@ -161,6 +282,7 @@ 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>
 
 <h3><b>Most recent transactions</b></h3>
@@ -173,7 +295,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>
 

diff --git a/money.sig b/money.sig
index e35df38..7ec8b7b 100644 (file)
--- a/money.sig
+++ b/money.sig
@@ -21,7 +21,7 @@ sig
     val listChargesWithNames : int -> (string * charge) list
 
     val clearCharges : int -> unit
-    val applyCharges : Init.C.conn -> int -> unit
+    val applyCharges : int -> unit
 
     val addEvenCharges : int * int list -> unit
 

diff --git a/money.sml b/money.sml
index 133e37b..b5b20f1 100644 (file)
--- a/money.sml
+++ b/money.sml
@@ -137,8 +137,10 @@ fun clearCharges trn =
        ignore (C.dml db ($`DELETE FROM Charge WHERE trn = ^(C.intToSql trn)`))
     end
 
-fun applyCharges db trn =
+fun applyCharges trn =
     let
+       val db = getDb ()
+
        fun applyCharge [bal, amount] =
            ignore (C.dml db ($`UPDATE Balance
                                SET amount = amount + ^amount
@@ -165,7 +167,7 @@ fun addEvenCharges (trn, usrs) =
                                VALUES (^(C.intToSql trn), ^(C.intToSql usr), ^(C.realToSql split))`))
     in
        app addCharge usrs;
-       applyCharges db trn
+       applyCharges trn
     end
 
 (* Automated hosting charges *)

diff --git a/portal.mlt b/portal.mlt
dissimilarity index 96%
index 03be2b2..c7bce36 100644 (file)
--- a/portal.mlt
+++ b/portal.mlt
@@ -1,5 +1,12 @@
-<% val you = Init.getUser ();
-
-@header [] %>
-
-<% @footer [] %>
\ No newline at end of file
+<% @header [] %>
+
+<h3><b>Your recent account activity</b></h3>
+
+<table>
+<tr> <td><b>Date</b></td> <td><b>Description</b></td> <td><b>Amount</b></td> </tr>
+<% foreach (amount, trn) in Money.listUserTransactionsLimit (Init.getUserId (), 5) 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>
+
+<% @footer [] %>
\ No newline at end of file

diff --git a/util.sig b/util.sig
index 3a03953..a4f5b28 100644 (file)
--- a/util.sig
+++ b/util.sig
@@ -5,4 +5,5 @@ sig
 
     val id : 'a -> 'a
     val makeSet : ('a -> string) -> 'a list -> string
+    val neg : real -> real
 end
\ No newline at end of file

diff --git a/util.sml b/util.sml
index 6f067ac..39edd39 100644 (file)
--- a/util.sml
+++ b/util.sml
@@ -21,4 +21,6 @@ fun makeSet f items =
       | [usr] => "(" ^ f usr ^ ")"
       | usr::rest => foldl (fn (usr, s) => s ^ ", " ^ f usr) ("(" ^ f usr) rest ^ ")"
 
+fun neg (r : real) = ~r
+
 end
\ No newline at end of file