release portal3 into production

[hcoop/portal.git] / money.mlt

diff --git a/money.mlt b/money.mlt
index e846c3f..865cd09 100644 (file)
--- a/money.mlt
+++ b/money.mlt
@@ -7,7 +7,7 @@ ref showNormal = true;
 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>
@@ -20,7 +20,7 @@ if $"hist" <> "" then
 
 <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>
@@ -42,10 +42,10 @@ end %>
 
 <h3>Primary 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 (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><% #amount trn %></td> <td><% #stamp 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> <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><%
@@ -63,7 +63,7 @@ end %>
 
 <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
@@ -82,7 +82,7 @@ end %></td> </tr>
 
 <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
@@ -102,7 +102,7 @@ end %></td> </tr>
 
 <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
@@ -290,6 +290,21 @@ end %></textarea></td> </tr>
         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;
@@ -579,7 +594,7 @@ elseif $"cmd" = "checkout" then
 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>
@@ -596,10 +611,11 @@ elseif $"cmd" = "delinq" then
 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> <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>
@@ -607,10 +623,10 @@ elseif $"cmd" = "freezeworthy" then
 <% 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> <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>
@@ -624,13 +640,14 @@ elseif $"cmd" = "freezeworthy" then
    val showBal = Util.sub (#amount bal, deposit) %>
 
 <h3>Your balance: $<% showBal %><br>
-Deposit: $<% deposit %></b> (3 months of dues at the minimal <a href="pledge">pledge level</a>)<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>
 
 <!--h3>Your balance: $<% #amount bal %></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>
@@ -644,33 +661,46 @@ Co-op balance: $<% #amount (Balance.lookupBalance (valOf (Balance.balanceNameToI
 <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>
+<% 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>
+
 
+<div class="payment-tile">
 <h3>Look up a Real Name</h3>
 
 <form method="post">
 <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>
+<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>
@@ -680,14 +710,20 @@ Co-op balance: $<% #amount (Balance.lookupBalance (valOf (Balance.balanceNameToI
 <tr>
   <td><% #name (Init.lookupUser (#webuser_id stripePmt)) %></td>
   <td><% #paid_on stripePmt %></td>
-  <td><% #card_name stripePmt %>
-  <td>$<% #net 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>
@@ -696,10 +732,10 @@ Co-op balance: $<% #amount (Balance.lookupBalance (valOf (Balance.balanceNameToI
 
 
 
-<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><%
@@ -710,7 +746,10 @@ end %>
 </table>
 
 <% else %>
+<div class="payment-tile">
+<p>
 <a href="?audit=1">Switch to audit view</a><br>
+</p></div>
 <% val lookback = case $"lookback" of "" => 20 | "inf" => 0 | lb => Web.stoi lb;
    @payment [] %>
 
@@ -726,13 +765,13 @@ val trans = iff lookback = 0 then
         Money.listUserTransactions (Init.getUserId ())
     else
        Money.listUserTransactionsLimit (Init.getUserId (), lookback) %>
-<table>
+<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 align="right"><% if Util.lt (amount, 0.0) then %><% amount %><% end %></td>
-<td align="right"><% if Util.ge (amount, 0.0) then %><% amount %><% end %></td>
-<td><% running %></tr>
+<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>