if $"hist" <> "" then
showNormal := false;
val id = Web.stoi ($"hist") %>
-<table>
+<table class="data">
<tr> <td><b>Date</b></td> <td><b>Description</b></td> <td><b>Amount</b></td> </tr>
<% foreach (amount, trn) in Money.listUserTransactions id 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>
<h3>Transactions</h3>
-<table>
+<table class="data">
<tr> <td><b>Date</b></td> <td><b>Description</b></td> <td><b>Amount</b></td> <td><b>Last modified</b></td> <td><b>Participants</b></td> </tr>
<% 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>
| _ => %><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?modBill=<% #id trn %>">[Bill]</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>
+
+<% elseif $"cmd" = "primary" then
+ val admin = Group.inGroupName "money";
+ showNormal := false %>
+
+<h3>Primary Transactions</h3>
+
+<table class="data">
+<tr> <td><b>Date</b></td> <td><b>Description</b></td> <td><b>Amount</b></td> <td><b>Last modified</b></td> <td><b>Participants</b></td> </tr>
+<% foreach (amt, trn) in Money.listUserTransactions (valOf (Init.userNameToId "hcoop")) do %>
+<tr> <td><% #d trn %></td> <td><a href="money?trn=<% #id trn %>"><% Web.html (#descr trn) %></a></td> <td style="text-align: right"><% #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><%
+ | _ => %><td><i>multi</i></td><%
+end;
+if admin then
+ %><td><a href="money?modBill=<% #id trn %>">[Bill]</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><%
<h3>Active Balances</h3>
-<table>
+<table class="data">
<% foreach bal in Balance.listOwnedBalances () do %>
<tr><td><% #name bal %></td> <td><% #amount bal %></td> <td>
<% switch Balance.listBalanceUsers (#id bal) of
[] =>
| (user :: users) =>
- %><a href="money?hist=<% #id user %>"><% Web.html (#name user) %></a><%
+ %><a href="money?hist=<% #id user %>"><% Web.html (#name user) %></a> <a href="money?hist=<% #id user %>">[History]</a><%
foreach user in users do
%>, <a href="money?hist=<% # id user %>"><% Web.html (#name user) %></a><%
end
<h3>Retired Balances</h3>
-<table>
+<table class="data">
<% foreach bal in Balance.listUnownedBalances () do %>
<tr><td><% #name bal %></td> <td><% #amount bal %></td> <td>
<% switch Balance.listBalanceUsers (#id bal) of
<h3>Negative Active Balances (<% length bals %>)</h3>
-<table>
+<table class="data">
<% foreach bal in bals do %>
<tr><td><% #name bal %></td> <td><% #amount bal %></td> <td>
<% switch Balance.listBalanceUsers (#id bal) of
%><h3>Hosting transaction modified.</h3>
+<% elseif $"cmd" = "bill" then
+ Group.requireGroupName "money";
+ showNormal := false %>
+
+<h3>New bill for the co-op</h3>
+
+<form action="money" method="post">
+<input type="hidden" name="cmd" value="bill2">
+<table class="blanks">
+<tr> <td>Description:</td> <td><input name="descr"></td> </tr>
+<tr> <td>Date:</td> <td><input name="d"></td> </tr>
+<tr> <td>Amount:</td> <td><input name="amount"></td> </tr>
+<tr> <td><input type="submit" value="Add"></td> </tr>
+</table>
+
+<% elseif $"cmd" = "bill2" then
+ Group.requireGroupName "money";
+ val id = Money.addTransaction ($"descr", Util.neg (Web.stor ($"amount")), $"d");
+ Money.addCharge {trn = id, usr = valOf (Init.userNameToId "hcoop"), amount = Util.neg (Web.stor ($"amount"))};
+ Money.applyCharges id;
+
+ %><h3>Bill added.</h3>
+
+<% elseif $"modBill" <> "" then
+ Group.requireGroupName "money";
+ showNormal := false;
+ val id = Web.stoi ($"modBill");
+ val trn = Money.lookupTransaction id %>
+
+<h3>Modify bill</h3>
+
+<form action="money" method="post">
+<input type="hidden" name="saveBill" value="<% id %>">
+<table class="blanks">
+<tr> <td>Description:</td> <td><input name="descr" value="<% Web.html (#descr trn) %>"></td> </tr>
+<tr> <td>Date:</td> <td><input name="d" value="<% Web.html (#d trn) %>"></td> </tr>
+<tr> <td>Amount:</td> <td><input name="amount" value="<% Util.neg (#amount trn) %>"></td> </tr>
+<tr> <td><input type="submit" value="Save"></td> </tr>
+</table>
+
+<% elseif $"saveBill" <> "" then
+ Group.requireGroupName "money";
+ val id = Web.stoi ($"saveBill");
+ val trn = Money.lookupTransaction id;
+
+ Money.clearCharges id;
+ Money.modTransaction {trn with descr = $"descr", d = $"d", amount = Util.neg (Web.stor ($"amount"))};
+ Money.addCharge {trn = id, usr = valOf (Init.userNameToId "hcoop"), amount = Util.neg (Web.stor ($"amount"))};
+ Money.applyCharges id;
+
+ %><h3>Bill modified.</h3>
+
<% elseif $"cmd" = "evenForm" then
Group.requireGroupName "money";
showNormal := false %>
%><h3>Payment transaction added.</h3>
+<% elseif $"cmd" = "stripeApply" then
+ val stripePmt = Money.lookupStripePayment ($"stripeId");
+ val txid = Money.applyStripePayment stripePmt;
+%><h3>Stripe Payment Processed (Transaction <% txid %>)</h3>
+
+<% elseif $"cmd" = "stripeRejected" then
+%><h3>Stripe Payment Rejected!</h3>
+
+<% elseif $"cmd" = "stripeReject" then
+ Group.requireGroupName "money";
+ showNormal := false;
+%>
+<h3>Are you sure you want to reject Stripe Payment <% $"stripeChargeId" %>?</h3>
+<form method="post" action="/stripe/stripe-admin.cgi">
+ <input type="hidden" name="cmd" value="reject_member_payment" />
+ <input type="hidden" name="stripeChargeId" value="<% $"stripeChargeId" %>" />
+ <label>Reason for rejection <input type="text" name="reason" /></label>
+ <input type="submit" value="Really Reject Payment" />
+ </form>
+
<% elseif $"modPay" <> "" then
Group.requireGroupName "money";
showNormal := false;
</table>
</form>
+<% elseif $"cmd" = "dues" then
+ Group.requireGroupName "money";
+ showNormal := false %>
+
+<h3>Monthly dues</h3>
+
+<form action="money" method="post">
+<input type="hidden" name="cmd" value="dues2">
+<table class="blanks">
+<tr> <td>Description:</td> <td><input name="descr" value="Dues"></td> </tr>
+<tr> <td>Date:</td> <td><input name="d"></td> </tr>
+<tr> <td>Amount/pledge:</td> <td><input name="base"></td> </tr>
+<tr> <td><input type="submit" value="Add"></td> </tr>
+</table>
+
+<% elseif $"cmd" = "dues2" then
+ Group.requireGroupName "money";
+ Money.billDues {descr = $"descr", base = Web.stor ($"base"), date = $"d"};
+
+ %><h3>Dues debits added.</h3>
+
<% elseif $"cmd" = "even" then
Group.requireGroupName "money";
val id = Money.addTransaction ($"descr", Web.stor ($"amount"), $"d");
(nil, nil) => %>No matches.<%
end
+elseif $"cmd" = "realname" then
+ showNormal := false;
+ val users = Init.searchRealName ($"rname");
+
+ switch users of
+ _ :: _ =>
+ %><h3>Members</h3>
+
+ <% foreach user in users do %>
+ <li> <a href="user?id=<% #id user %>"><% #name user %></a> <a href="?cmd=pay&user=<% #id user %>">[add payment]</a></li>
+ <% end
+ end;
+
+ switch users of
+ nil => %>No matches.<%
+ end
+
elseif $"cmd" = "checkout" then
showNormal := false;
val apps = App.searchCheckout ($"email");
elseif $"cmd" = "delinq" then
showNormal := false;
val dqs = Money.delinquentPledgers () %>
-<table>
+<table class="data">
<tr> <th>Member</th> <th>Pledge</th> <th>Balance</th> </tr>
<% foreach dq in dqs do %>
<tr> <td><a href="user?id=<% #id dq %>"><% #name dq %></a></td> <td><% #shares dq %></td> <td>$<% #balance dq %></td> </tr>
elseif $"cmd" = "freezeworthy" then
showNormal := false;
val dqs = Money.freezeworthyPledgers () %>
-<table>
+<table class="data">
<tr> <th>Member</th> <th>Balance</th> </tr>
<% foreach dq in dqs do %>
-<tr> <td><a href="user?id=<% #id dq %>"><% #name dq %></a></td> <td>$<% #balance dq %></td> </tr>
+<tr> <td><a href="user?id=<% #id dq %>"><% #name dq %></a></td> <td style="text-align: right">$<% #balance dq %></td>
+<td><a href="money?hist=<% #id dq %>">[History]</a></td>
+<% if #joinedThisMonth dq then %><td><i>(joined this month)</i></td><% end %></tr>
<% end %>
</table>
<% elseif $"cmd" = "bootworthy" then
showNormal := false;
val dqs = Money.bootworthyPledgers () %>
-<table>
+<table class="data">
<tr> <th>Member</th> <th>Balance</th> </tr>
<% foreach dq in dqs do %>
-<tr> <td><a href="user?id=<% #id dq %>"><% #name dq %></a></td> <td>$<% #balance dq %></td> </tr>
+<tr> <td><a href="user?id=<% #id dq %>"><% #name dq %></a></td> <td style="text-align: right">$<% #balance dq %></td><td><a href="money?hist=<% #id dq %>">[History]</a></td>
+<% if #joinedThisMonth dq then %><td><i>(joined this month)</i></td><% end %></tr>
<% end %>
</table>
<% if showNormal then
val you = Init.getUser();
val bal = Balance.lookupBalance (#bal you);
- val deposit = Balance.depositAmount (#id bal) %>
-
-<h3>Your balance: $<% Util.sub (#amount bal, deposit) %><br>
-Deposit: $<% deposit %></b> (3 months of dues at the minimal <a href="pledge">pledge level</a>)</h3>
+ val deposit = Balance.depositAmount (#id bal);
+ val showBal = Util.sub (#amount bal, deposit) %>
-<!--h3>Your balance: $<% #amount bal %></h3-->
+<h3>Your balance: $<% showBal %><br>
+Deposit: $<% deposit %> (3 months of dues at the minimal <a href="pledge">pledge level</a>)<br>
+<!--Co-op balance: $<% #amount (Balance.lookupBalance (valOf (Balance.balanceNameToId "hcoop"))) %>--></h3>
<% if (iff Group.inGroupName "money" then $"lookback" = "" else $"audit" <> "") then %><h3>Sum of all active balances: $<% Balance.sumOwnedBalances () %></h3><% end %>
-
+<div class="payment-tile">
+ <h3>Financial Information</h3>
<a href="money?cmd=list">List all transactions</a><br>
+<a href="money?cmd=primary">List primary transactions</a><br>
<a href="money?cmd=bals">List active balances</a><br>
<a href="money?cmd=nbals">List negative active balances</a><br>
<a href="money?cmd=freezeworthy">List members who deserve account freezing</a><br>
<a href="?cmd=delinq">Drop pledges of delinquent members</a><br>
<a href="?lookback=20">Switch to regular member view</a><br>
-<br><b><u>New transaction:</u></b><br>
-<a href="money?cmd=hosting">Hosting bill</a><br>
+<% end %>
+</div>
+
+<% if (Group.inGroupName "money" and $"lookback" = "") or $"audit" <> "" then %>
+<div class="payment-tile">
+ <h3>New Transaction</h3>
+<a href="money?cmd=bill">Bill for the co-op</a><br>
<a href="money?cmd=pay">Payment from member</a><br>
+<a href="money?cmd=dues">Monthly dues</a><br>
+<a href="money?cmd=hosting">New hosting bill (old style)</a><br>
<a href="money?cmd=evenForm">Generic/even</a><br>
<br>
-<a href="money?cmd=equalize">Equalize balances</a><br>
+<!-- <a href="money?cmd=equalize">Equalize balances</a><br> -->
<br>
+</div>
+<div>
+<div class="payment-tile">
<h3>Look up a PayPal e-mail address</h3>
<form method="post">
<input type="hidden" name="cmd" value="paypal">
<input name="email"> <input type="submit" value="Look up">
</form>
+</div>
+
-<h3>Look up a Google Checkout e-mail address</h3>
+<div class="payment-tile">
+<h3>Look up a Real Name</h3>
<form method="post">
-<input type="hidden" name="cmd" value="checkout">
-<input name="email"> <input type="submit" value="Look up">
+<input type="hidden" name="cmd" value="realname">
+<input name="rname"> <input type="submit" value="Look up">
</form>
+</div>
+</div>
+
+<h3>Apply Stripe Payments</h3>
+
+<table class="data">
+<tr><td><strong>Date</strong></td><td><strong>Member</strong></td>
+ <td><strong>Name on Card</strong></td>
+ <td><strong>Amount</strong> (After Fees)</td><td><td></td>
+</tr>
+<% foreach stripePmt in Money.listAllPendingStripePayments () do %>
+
+<tr>
+ <td><% #name (Init.lookupUser (#webuser_id stripePmt)) %></td>
+ <td><% #paid_on stripePmt %></td>
+ <td><% #card_name stripePmt %></td>
+ <td style="text-align: right">$<% #net stripePmt %></td>
+ <td><form method="post">
+ <input type="hidden" name="cmd" value="stripeApply" />
+ <input type="hidden" name="stripeId" value="<% #charge_id stripePmt %>" />
+ <input type="submit" value="Apply to Balance" /> <!-- also, refund? -->
+ </form>
+ </td>
+ <td><form method="post">
+ <input type="hidden" name="cmd" value="stripeReject" />
+ <input type="hidden" name="stripeChargeId" value="<% #charge_id stripePmt %>" />
+ <input type="submit" value="Reject Payment" /> <!-- also, refund? -->
+ </form>
+ </td>
+</tr>
+<% end %>
+</table>
<h3>Most recent transactions</h3>
-<table>
+
+
+<table class="data">
<tr> <td><b>Date</b></td> <td><b>Description</b></td> <td><b>Amount</b></td> <td><b>Participants</b></td> <td><b>Replace</b></td> <td><b>Delete</b></td> </tr>
<% foreach trn in Money.listTransactionsLimit 20 do %>
-<tr> <td><% #d trn %></td> <td><a href="money?trn=<% #id trn %>"><% Web.html (#descr trn) %></a></td> <td><% #amount trn %></td>
+<tr> <td><% #d trn %></td> <td><a href="money?trn=<% #id trn %>"><% Web.html (#descr trn) %></a></td> <td style="text-align: right"><% #amount trn %></td>
<% switch Money.listChargesWithNames (#id trn) of
[(name, cha)] => %><td><a href="user?id=<% #usr cha %>"><% name %></a></td><%
| _ => %><td><i>multi</i></td><%
end %>
-<td><a href="money?mod
Hosting=<% #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?mod
Bill=<% #id trn %>">[Bill]</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>
<% else %>
+<div class="payment-tile">
+<p>
<a href="?audit=1">Switch to audit view</a><br>
-<% val lookback = case $"lookback" of "" => 20 | lb => Web.stoi lb;
+</p></div>
+<% val lookback = case $"lookback" of "" => 20 | "inf" => 0 | lb => Web.stoi lb;
@payment [] %>
<h3>Your recent account activity</h3>
<form>
- Show <input name="lookback" size="5" value="<% lookback %>"> most recent transactions.
+ Show <input name="lookback" size="5" value="<% iff lookback = 0 then 20 else lookback %>"> most recent transactions.
<input type="submit" value="Show">
</form>
-<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 (), lookback) 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 %>
+<% ref running = showBal;
+val trans = iff lookback = 0 then
+ Money.listUserTransactions (Init.getUserId ())
+ else
+ Money.listUserTransactionsLimit (Init.getUserId (), lookback) %>
+<table class="data">
+<tr> <td><b>Date</b></td> <td><b>Description</b></td> <td><b>Debit</b></td> <td><b>Credit</b></td> <td><b>Balance</b></td></tr>
+<% foreach (amount, trn) in trans do %>
+<tr> <td><% #d trn %></td> <td><a href="money?trn=<% #id trn %>"><% Web.html (#descr trn) %></a></td>
+<td style="text-align: right"><% if Util.lt (amount, 0.0) then %><% amount %><% end %></td>
+<td style="text-align: right"><% if Util.ge (amount, 0.0) then %><% amount %><% end %></td>
+<td style="text-align: right"><% running %></tr>
+<% running := Util.sub (running, amount)
+end %>
</table>
+<% if lookback <> 0 then %>
+<a href="?lookback=inf">Show all transactions</a><br>
+<% end %>
<% end
end %>
HCoop / hcoop / portal.git / blobdiff