Merge pull request #2412 from gittip/cancel-account

implement account cancellation

410.spt

@@ -0,0 +1,21 @@
+[---]
+[---] text/html via jinja2
+{% extends "templates/base.html" %}
+{% block heading %}<h2 class="top"><span>Closed</span></h2>{% endblock %}
+{% block box %}
+
+<div class="as-content">
+
+    <p style="margin: 3em 0;">The account owner has closed this account.</p>
+
+    {% if user.ANON %}
+        <h2>Are you the account owner?</h2>
+
+        <p>{% include "templates/sign-in-using.html" %} to reopen your account.</p>
+    {% endif %}
+
+</div>
+
+<div class="nav level-1"><a href="/"><button>Home</button></a></div>
+
+{% endblock %}

gittip/models/participant.py

@@ -149,6 +149,14 @@ def set_session_expires(self, expires):
         self.set_attributes(session_expires=expires)
 
 
+    # Suspiciousness
+    # ==============
+
+    @property
+    def is_whitelisted(self):
+        return self.is_suspicious is False
+
+
     # Claimed-ness
     # ============
 
@@ -236,22 +244,19 @@ def set_as_claimed(self):
             self.set_attributes(claimed_time=claimed_time)
 
 
-    # Canceling
-    # =========
+    # Closing
+    # =======
 
     class UnknownDisbursementStrategy(Exception): pass
 
-    def cancel(self, disbursement_strategy):
-        """Cancel the participant's account.
+    def close(self, disbursement_strategy):
+        """Close the participant's account.
         """
         with self.db.get_cursor() as cursor:
-
             if disbursement_strategy == None:
                 pass  # No balance, supposedly. final_check will make sure.
             elif disbursement_strategy == 'bank':
                 self.withdraw_balance_to_bank_account(cursor)
-            elif disbursement_strategy == 'upstream':
-                self.refund_to_patrons(cursor)
             elif disbursement_strategy == 'downstream':
                 # This in particular needs to come before clear_tips_giving.
                 self.distribute_balance_as_final_gift(cursor)
@@ -290,10 +295,6 @@ def withdraw_balance_to_bank_account(self, cursor):
                         ) # XXX Records the exchange using a different cursor. :-/
 
 
-    def refund_balance_to_patrons(self, cursor):
-        raise NotImplementedError
-
-
     class NoOneToGiveFinalGiftTo(Exception): pass
 
     def distribute_balance_as_final_gift(self, cursor):

gittip/utils/__init__.py

@@ -352,6 +352,9 @@ def get_participant(request, restrict=True):
 
     canonicalize(request.line.uri.path.raw, '/', participant.username, slug, qs)
 
+    if participant.is_closed:
+        raise Response(410)
+
     if participant.claimed_time is None:
 
         # This is a stub participant record for someone on another platform who

js/gittip/account.js

@@ -163,4 +163,11 @@ Gittip.account.init = function() {
         return false;
     });
 
+
+    // Wire up close knob.
+    // ===================
+
+    $('button.close-account').click(function() {
+        window.location.href = './close';
+    });
 };

scss/buttons-knobs.scss

@@ -48,11 +48,12 @@ button.selected:hover, button.selected.drag,
 }
 
 button.join-leave[data-is-member="true"],
-.button.join-leave[data-is-member="true"] {
+.button.join-leave[data-is-member="true"],
+button.close-account {
     font-weight: normal;
     background: none;
     color: $red;
-    text-decoration: underline;
+    border: 1px solid $red;
     &:hover {
         background: $red;
         color: white;

scss/layout.scss

@@ -420,7 +420,14 @@
             padding: 0;
             text-transform: uppercase;
         }
-        input {
+        input[type="radio"] + label {
+            display: inline;
+            margin: 0;
+        }
+        input[type="radio"]:disabled + label {
+            color: #888;
+        }
+        input:not([type]), input[type="text"] {
             font: normal 11pt/14pt $Helvetica;
             width: 292px;
             margin: 0;
@@ -431,6 +438,9 @@
         input.disabled {
             color: $light-brown;
         }
+        input[type="radio"] {
+            vertical-align: middle;
+        }
 
         .half input {
             width: 137px;