X-Git-Url: https://git.hcoop.net/hcoop/portal.git/blobdiff_plain/eca832d83526a0ebee0dc38195b3b99f8e4746c9..10e55875c83d1d44a0b8d31ff1e49cfec843e9a2:/money.mlt diff --git a/money.mlt b/money.mlt index 085c3aa..af404c5 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 | <% @@ -285,6 +285,11 @@ end %>
Member | Pledge | Balance | |||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
<% #name dq %> | <% #shares dq %> | $<% #balance dq %> |
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 | <% @@ -695,13 +726,13 @@ val trans = iff lookback = 0 then Money.listUserTransactions (Init.getUserId ()) else Money.listUserTransactionsLimit (Init.getUserId (), lookback) %> -
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 %> |