X-Git-Url: http://git.hcoop.net/hcoop/portal.git/blobdiff_plain/eca832d83526a0ebee0dc38195b3b99f8e4746c9..0142983cd82e445f507b08bffd39e6b6ce4a4c51:/money.mlt diff --git a/money.mlt b/money.mlt index 085c3aa..d92969b 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 | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
<% #d trn %> | <% Web.html (#descr trn) %> | <% amount %>/<% #amount trn %> |
Date | Description | Amount | Last modified | Participants | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
<% #d trn %> | <% Web.html (#descr trn) %> | <% #amount trn %> | <% #stamp trn %> | @@ -42,10 +42,10 @@ end %>
Date | Description | Amount | Last modified | Participants | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
<% #d trn %> | <% Web.html (#descr trn) %> | <% #amount trn %> | <% #stamp trn %> | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
<% #d trn %> | <% Web.html (#descr trn) %> | <% #amount trn %> | <% #stamp trn %> | <% switch Money.listChargesWithNames (#id trn) of [(name, cha)] => %><% name %> | <% | _ => %>multi | <% @@ -63,7 +63,7 @@ end %>
<% #name bal %> | <% #amount bal %> | <% switch Balance.listBalanceUsers (#id bal) of @@ -82,7 +82,7 @@ end %> |
<% #name bal %> | <% #amount bal %> | <% switch Balance.listBalanceUsers (#id bal) of @@ -102,7 +102,7 @@ end %> |
<% #name bal %> | <% #amount bal %> | <% switch Balance.listBalanceUsers (#id bal) of @@ -258,7 +258,6 @@ end %> |
Description: | |||||
E-mail address: | <% #email appl %> | ||||
PayPal: | <% s %> | ||||
Google Checkout: | <% s %> | ||||
Forward e-mail? | <% if #forward appl then %>yes<% else %>no<% end %> | ||||
Proposed uses: | <% Web.htmlNl (#uses appl) %> | ||||
E-mail address: | <% #email appl %> | ||||
PayPal: | <% s %> | ||||
Google Checkout: | <% s %> | ||||
Forward e-mail? | <% if #forward appl then %>yes<% else %>no<% end %> | ||||
Proposed uses: | <% Web.htmlNl (#uses appl) %> |
Member | Pledge | Balance | |||
---|---|---|---|---|---|
<% #name dq %> | <% #shares dq %> | $<% #balance dq %> |
Member | Balance | ||
---|---|---|---|
<% #name dq %> | $<% #balance dq %> | +||
<% #name dq %> | $<% #balance dq %> | +[History] | <% if #joinedThisMonth dq then %>(joined this month) | <% end %>
Member | Balance | ||
---|---|---|---|
<% #name dq %> | $<% #balance dq %> | +||
<% #name dq %> | $<% #balance dq %> | [History] | <% if #joinedThisMonth dq then %>(joined this month) | <% end %>
Date | Member | +Name on Card | +Amount (After Fees) | + | |
<% #name (Init.lookupUser (#webuser_id stripePmt)) %> | +<% #paid_on stripePmt %> | +<% #card_name stripePmt %> | +$<% #net stripePmt %> | ++ | ++ | +
Date | Description | Amount | Participants | Replace | Delete |
<% #d trn %> | <% Web.html (#descr trn) %> | <% #amount trn %> | +|||
<% #d trn %> | <% Web.html (#descr trn) %> | <% #amount trn %> | <% switch Money.listChargesWithNames (#id trn) of [(name, cha)] => %><% name %> | <% | _ => %>multi | <% @@ -679,7 +737,10 @@ end %>
Date | Description | Debit | Credit | Balance |
<% #d trn %> | <% Web.html (#descr trn) %> | -<% if Util.lt (amount, 0.0) then %><% amount %><% end %> | -<% if Util.ge (amount, 0.0) then %><% amount %><% end %> | -<% running %> | <% if Util.lt (amount, 0.0) then %><% amount %><% end %> | +<% if Util.ge (amount, 0.0) then %><% amount %><% end %> | +<% running %> <% running := Util.sub (running, amount) end %> |