X-Git-Url: http://git.hcoop.net/hcoop/portal.git/blobdiff_plain/466c59448d7bb1abee78e7f3f231be194e73b5ea..e4964ef9036ec719d052082b34af0deb0db89382:/money.mlt?ds=sidebyside
diff --git a/money.mlt b/money.mlt
index e7413e5..abd34a8 100644
--- a/money.mlt
+++ b/money.mlt
@@ -7,7 +7,7 @@ ref showNormal = true;
if $"hist" <> "" then
showNormal := false;
val id = Web.stoi ($"hist") %>
-
+
Date | Description | Amount |
<% foreach (amount, trn) in Money.listUserTransactions id do %>
<% #d trn %> | <% Web.html (#descr trn) %> | <% amount %>/<% #amount trn %> |
@@ -20,7 +20,7 @@ if $"hist" <> "" then
Transactions
-
+
+
+<% elseif $"cmd" = "primary" then
+ val admin = Group.inGroupName "money";
+ showNormal := false %>
+
+Primary Transactions
+
+
+ Date | Description | Amount | Last modified | Participants |
+<% foreach (amt, trn) in Money.listUserTransactions (valOf (Init.userNameToId "hcoop")) do %>
+ <% #d trn %> | <% Web.html (#descr trn) %> | <% #amount trn %> | <% #stamp trn %> |
+<% switch Money.listChargesWithNames (#id trn) of
+ [(name, cha)] => %><% name %> | <%
+ | _ => %>multi | <%
+end;
+if admin then
+ %>[Bill] [Payment] [Other] |
[Delete] | <%
end
%>
<%
@@ -47,7 +69,7 @@ end %>
<% switch Balance.listBalanceUsers (#id bal) of
[] =>
| (user :: users) =>
- %><% Web.html (#name user) %><%
+ %><% Web.html (#name user) %> [History]<%
foreach user in users do
%>, <% Web.html (#name user) %><%
end
@@ -153,6 +175,58 @@ end %>
%>Hosting transaction modified.
+<% elseif $"cmd" = "bill" then
+ Group.requireGroupName "money";
+ showNormal := false %>
+
+New bill for the co-op
+
+
+
<% elseif $"modPay" <> "" then
Group.requireGroupName "money";
showNormal := false;
@@ -265,6 +359,27 @@ end %>
+<% elseif $"cmd" = "dues" then
+ Group.requireGroupName "money";
+ showNormal := false %>
+
+Monthly dues
+
+