allow developers to use accounts for which they have accepted the TOS (bug 834544)

Author: cvan

media/css/devreg/payments.less

@@ -404,15 +404,17 @@
 }
 
 .terms-accepted {
-    color: orangered;
     font-family: monospace;
+}
+
+.accepted .terms-accepted {
+    color: green;
     &:before {
-        content: "\2717";
-    }
-    &.accepted {
-        color: green;
-        &:before {
-            content: "\2713";
-        }
+        content: "\2713";
     }
 }
+
+.accepted .accept-tos,
+.rejected .modify-account {
+    display: none;
+}

media/js/devreg/payments-manage.js

@@ -2,67 +2,45 @@ define('payments-manage', ['payments'], function(payments) {
     'use strict';
 
     function refreshAccountForm(data) {
-        var $account_list_form = $('#bango-account-list');
-        $account_list_form.load($account_list_form.data('url'));
+        var $accountListForm = $('#bango-account-list');
+        $accountListForm.load($accountListForm.data('url'));
     }
 
     function newBangoPaymentAccount(e) {
         var $overlay = payments.getOverlay('add-bango-account');
         payments.setupPaymentAccountOverlay($overlay, showAgreement);
     }
 
-    function agreementSuccess(pk) {
-        $('.account-list [data-account=' + pk + '] .terms-accepted').removeClass('rejected').addClass('accepted');
-    }
+    function setupAgreementOverlay(data, onsubmit) {
+        var $waiting_overlay = payments.getOverlay('bango-waiting');
 
-    function agreementError(pk) {
-        $('.account-list [data-account=' + pk + '] .terms-accepted').removeClass('accepted').addClass('rejected');
-    }
+        $.getJSON(data['agreement-url'], function(response) {
+            var $overlay = payments.getOverlay('show-agreement');
+            $overlay.on('submit', 'form', _pd(function(e) {
+                var $form = $(this);
 
-    var agreementUrl = $('#show-agreement-template').data('url');
+                // Assume the POST below was a success, and close the modal.
+                $overlay.detach().trigger('overlay_dismissed');
+                onsubmit.apply($form, data);
 
-    function setupAgreementOverlay(data, $overlay, onsubmit) {
-        var url = format(agreementUrl, data.pk);
+                // If the POST failed, we show an error message.
+                $.post(data['agreement-url'], $form.serialize(), refreshAccountForm).fail(function() {
+                    $waiting_overlay.find('h2').text(gettext('Error'));
+                    $waiting_overlay.find('p').text(gettext('There was a problem contacting the payment server.'));
+                });
+            }));
 
-        // TODO: Do something with waiting overlays. This is slow.
-        $.getJSON(url, function(data) {
             // Plop in date of agreement.
             var msg = $('.agreement-valid');
-            msg.html(format(msg.html(), {date: data.valid}));
+            msg.html(format(msg.html(), {date: response.valid}));
 
             // Plop in text of agreement.
-            $('.agreement-text').text(data.text);
-        });
-
-        $overlay.on('submit', 'form', _pd(function(e) {
-            var $form = $(this);
-
-            // Assume the POST below was a success, and close the modal.
-            $overlay.detach();
-            z.body.removeClass('overlayed');
-            onsubmit.apply($form, data);
-
-            // If the POST failed, we show an error message.
-            $.post(url, $form.serialize(), function(response) {
-                if (response.accepted) {
-                    agreementSuccess(data.pk);
-                } else {
-                    agreementError();
-                }
-            }, 'json').error(function() {
-                agreementError(data.pk);
-            });
-        })).on('overlay_dismissed', function() {
-            // If it wasn't already marked as successful, then the user cancelled.
-            if (!$('.account-list [data-account=' + data.pk + '] .terms-accepted.success')) {
-                agreementError(data.pk);
-            }
+            $('.agreement-text').text(response.text);
         });
     }
 
     function showAgreement(data) {
-        var $overlay = payments.getOverlay('show-agreement');
-        setupAgreementOverlay(data, $overlay, function() {
+        setupAgreementOverlay(data, function() {
             refreshAccountForm();
             $('#no-payment-providers').addClass('js-hidden');
         });
@@ -110,10 +88,12 @@ define('payments-manage', ['payments'], function(payments) {
 
                 // Post to the delete URL, then refresh the account form.
                 $.post($tr.data('delete-url')).then(refreshAccountForm);
-            })).on('click', 'a.modify-account', _pd(function() {
+            })).on('click', '.modify-account', _pd(function() {
                 // Get the account URL from the table row and pass it to
                 // the function to handle the Edit overlay.
                 editBangoPaymentAccount($(this).parents('tr').data('account-url'))();
+            })).on('click', '.accept-tos', _pd(function() {
+                showAgreement($(this).parents('tr').data());
             }));
         });
     }

media/js/devreg/payments.js

@@ -8,10 +8,7 @@ define('payments', [], function() {
         overlay.html($('#' + name + '-template').html())
                .addClass('show')
                .on('click', '.close', _pd(function() {
-                   // TODO: Generalize this with the event listeners in overlay.js.
-                   overlay.trigger('overlay_dismissed');
-                   z.body.removeClass('overlayed');
-                   overlay.remove();
+                   overlay.trigger('overlay_dismissed').remove();
                }));
         return overlay;
     }

media/js/mkt/overlay.js

@@ -8,7 +8,6 @@
         var $overlay = $('.overlay.show');
         if ($overlay.length) {
             $overlay.removeClass('show');
-            z.body.removeClass('overlayed');
             $overlay.trigger('overlay_dismissed');
         }
     }
@@ -28,8 +27,11 @@
             e.preventDefault();
             dismiss();
         }
-    }).on('dismiss', '.overlay', dismiss
-    ).on('click', '.overlay .dismiss', _pd(dismiss));
+    }).on('dismiss', '.overlay', dismiss)
+      .on('click', '.overlay .dismiss', _pd(dismiss))
+      .on('overlay_dismissed', function() {
+          z.body.removeClass('overlayed');
+      });
 
 })();
 
@@ -51,4 +53,4 @@ function notify(msg, title) {
 z.win.on('notify', function(e, o) {
     if (!o.msg) return;
     notify(o.msg, o.title);
-});
+});

migrations/528-payment_accounts-agreed_tos.sql

@@ -0,0 +1 @@
+ALTER TABLE payment_accounts ADD COLUMN agreed_tos tinyint(1) unsigned;

mkt/developers/forms_payments.py

@@ -214,7 +214,6 @@ def save(self):
 
 
 class UpsellForm(happyforms.Form):
-
     upsell_of = AddonChoiceField(queryset=Addon.objects.none(), required=False,
                                  label=_lazy(u'This is a paid upgrade of'),
                                  empty_label=_lazy(u'Not an upgrade'))
@@ -259,7 +258,6 @@ def save(self):
 
 
 class BangoPaymentAccountForm(happyforms.Form):
-
     bankAccountPayeeName = forms.CharField(
         max_length=50, label=_lazy(u'Account Holder Name'))
     companyName = forms.CharField(
@@ -349,8 +347,8 @@ def __init__(self, *args, **kwargs):
 
         super(BangoAccountListForm, self).__init__(*args, **kwargs)
 
-        self.fields['accounts'].queryset = (
-            PaymentAccount.objects.filter(user=user, inactive=False))
+        self.fields['accounts'].queryset = PaymentAccount.objects.filter(
+            user=user, inactive=False, agreed_tos=True)
 
         try:
             current_account = AddonPaymentAccount.objects.get(addon=self.addon)

mkt/developers/models.py

@@ -51,6 +51,7 @@ def create(cls, user):
 class PaymentAccount(CurlingHelper, amo.models.ModelBase):
     user = UserForeignKey()
     name = models.CharField(max_length=64)
+    agreed_tos = models.BooleanField()
     solitude_seller = models.ForeignKey(SolitudeSeller)
 
     # These two fields can go away when we're not 1:1 with SolitudeSellers.

mkt/developers/templates/developers/payments/includes/accept_terms.html

@@ -1,5 +1,4 @@
-<script type="text/template" id="show-agreement-template"
-        data-url="{{ url('mkt.developers.bango.agreement', '0')|replace('0', '{0}') }}">
+<script type="text/template" id="show-agreement-template">
   <section class="show-agreement">
     <header>
       <h2>{{ _('Bango Terms of Agreement') }}</h2>

mkt/developers/templates/developers/payments/includes/account_list.html

@@ -27,12 +27,14 @@ <h2>{{ _('Payment Accounts') }}</h2>
 </script>
 
 <script type="text/template" id="account-row-template">
-  <tr data-account="{id}"
-      data-delete-url="{delete-url}"
-      data-account-url="{account-url}">
+  <tr class="{agreement}"
+      data-account="{id}"
+      data-account-url="{account-url}"
+      data-agreement-url="{agreement-url}"
+      data-delete-url="{delete-url}">
     <td><div class="terms-accepted {agreement}"></div></td>
     <td>{name}</td>
-    <td><a href="#" class="modify-account">{{ _('Modify') }}</a></td>
+    <td><a href="#" class="modify-account">{{ _('Modify') }}</a> <a href="#" class="accept-tos">{{ _('Accept Terms of Service') }}</a></td>
     <td><a href="#" class="delete-account">{{ _('Delete') }}</a></td>
   </tr>
 </script>

mkt/developers/views_payments.py

@@ -146,14 +146,11 @@ def account(acc):
                 reverse('mkt.developers.bango.payment_account', args=[acc.pk]),
             'delete-url':
                 reverse('mkt.developers.bango.delete_payment_account',
-                        args=[acc.pk])
+                        args=[acc.pk]),
+            'agreement-url':
+                reverse('mkt.developers.bango.agreement', args=[acc.pk]),
+            'agreement': 'accepted' if acc.agreed_tos else 'rejected'
         }
-        data['agreement'] = 'rejected'
-        try:
-            if _agreement(request, acc.pk)['accepted']:
-                data['agreement'] = 'accepted'
-        except KeyError:
-            pass
         return data
 
     return map(account, accounts)
@@ -185,7 +182,10 @@ def payments_accounts_add(request):
         raise  # We want to see these exceptions!
         return http.HttpResponse(
             _(u'Could not connect to payment server.'), status=400)
-    return {'pk': obj.pk}
+    return {
+        'pk': obj.pk,
+        'agreement-url': reverse('mkt.developers.bango.agreement', args=[obj.pk]),
+    }
 
 
 @write
@@ -273,21 +273,18 @@ def get_seller_product(account):
                   .get_object_or_404())
 
 
-def _agreement(request, id):
+# TODO: move these into a tastypie API.
+@login_required
+@json_view
+def agreement(request, id):
     account = get_object_or_404(models.PaymentAccount, pk=id,
                                 user=request.user)
     # It's a shame we have to do another get to find this out.
     package = client.api.bango.package(account.uri).get_object_or_404()
     if request.method == 'POST':
         # Set the agreement.
+        account.update(agreed_tos=True)
         return (client.api.bango.sbi.post(
                 data={'seller_bango': package['resource_uri']}))
     return (client.api.bango.sbi.agreement
             .get_object(data={'seller_bango': package['resource_uri']}))
-
-
-# TODO: move these into a tastypie API.
-@login_required
-@json_view
-def agreement(request, id):
-    return _agreement(request, id)