Coinbase

branch.sql

@@ -0,0 +1,3 @@
+BEGIN;
+    ALTER TABLE participants ADD COLUMN last_coinbase_result text DEFAULT NULL;
+END;

defaults.env

@@ -14,7 +14,7 @@ GITTIP_COMPRESS_ASSETS=no
 STRIPE_SECRET_API_KEY=1
 STRIPE_PUBLISHABLE_API_KEY=1
 
-BALANCED_API_SECRET=90bb3648ca0a11e1a977026ba7e239a9
+BALANCED_API_SECRET=ak-test-21vi4ozmxY4RPh5A3O9cqvp7AVcFSKGTP
 
 DEBUG=1 # Used by oauthlib to bypass security checks. We need it because when
         # running locally the OAuth callbacks are http:, not https:. Of course

gittip/billing/payday.py

@@ -633,7 +633,7 @@ def ach_credit(self, ts_start, participant, tips, total):
             log(msg + "succeeded.")
             error = ""
         except balanced.exc.HTTPError as err:
-            error = err.message.message
+            error = err.description
         except:
             error = repr(sys.exc_info()[1])
 
@@ -656,11 +656,15 @@ def charge_on_balanced(self, username, balanced_customer_href, amount):
 
         try:
             customer = balanced.Customer.fetch(balanced_customer_href)
-            customer.cards.one().debit(amount=cents, description=username)
+            try:
+                source = customer.cards.one()
+            except balanced.exc.wac.NoResultFound:
+                source = customer.external_accounts.one()
+            source.debit(amount=cents, description=username)
             log(msg + "succeeded.")
             error = ""
         except balanced.exc.HTTPError as err:
-            error = err.message.message
+            error = err.description
         except:
             error = repr(sys.exc_info()[1])
 

gittip/wireup.py

@@ -187,6 +187,14 @@ def is_yesish(val):
             envvar('BITBUCKET_CONSUMER_SECRET'),
             envvar('BITBUCKET_CALLBACK'),
         ),
+        Bountysource(
+            website.db,
+            None,
+            envvar('BOUNTYSOURCE_API_SECRET'),
+            envvar('BOUNTYSOURCE_CALLBACK'),
+            envvar('BOUNTYSOURCE_API_HOST'),
+            envvar('BOUNTYSOURCE_WWW_HOST'),
+        ),
         OpenStreetMap(
             website.db,
             envvar('OPENSTREETMAP_CONSUMER_KEY'),
@@ -198,15 +206,8 @@ def is_yesish(val):
     ]
     website.signin_platforms = PlatformRegistry(signin_platforms)
     AccountElsewhere.signin_platforms_names = tuple(p.name for p in signin_platforms)
+
     other_platforms =  [
-        Bountysource(
-            website.db,
-            None,
-            envvar('BOUNTYSOURCE_API_SECRET'),
-            envvar('BOUNTYSOURCE_CALLBACK'),
-            envvar('BOUNTYSOURCE_API_HOST'),
-            envvar('BOUNTYSOURCE_WWW_HOST'),
-        ),
         Venmo(
             website.db,
             envvar('VENMO_CLIENT_ID'),

js/gittip/payments.js

@@ -18,21 +18,38 @@ Gittip.payments.havePayments = false;
 Gittip.payments.processorAttempts = 0;
 
 Gittip.payments.submitDeleteForm = function(e) {
-    var item = $("#payout").length ? "bank account" : "credit card";
-    var slug = $("#payout").length ? "bank-account" : "credit-card";
-    var msg = "Really disconnect your " + item + "?";
+    var item, slug;
+    var type = e.target.id.slice(-2);
+    if (type == "cc") {
+        item = "credit card";
+        slug = "credit-card";
+    } else if (type == "ba") {
+        item = "bank account";
+        slug = "bank-account";
+    } else if (type == "cb") {
+        item = "Coinbase account";
+        slug = "coinbase";
+    }
+
+    var msg = "Are you sure you want to remove " + item + "?";
     if (!confirm(msg)) {
         e.stopPropagation();
         e.preventDefault();
         return false;
     }
-
     jQuery.ajax(
         { url: '/' + slug + '.json'
         , data: {action: "delete"}
         , type: "POST"
         , success: function() {
-            window.location.href = '/' + slug + '.html';
+            if (type !== "cb") {
+                window.location.href = '/' + slug + '.html';
+            } else {
+                $('html, body').animate({scrollTop: 0}, 500);
+                var coinbase_confirm = $('<div class="confirm">Successfully deleted your Coinbase account.</div>');
+                $('#hero').prepend(coinbase_confirm);
+                location.reload();
+            }
           }
         , error: function(x,y,z) {
             select(cur);
@@ -52,7 +69,7 @@ Gittip.payments.ba = {};
 
 Gittip.payments.ba.init = function(balanced_uri, participantId) {
     Gittip.participantId = participantId;
-    $('#delete form').submit(Gittip.payments.submitDeleteForm);
+    $('#ba-delete form').submit(Gittip.payments.submitDeleteForm);
     $('#payout').submit(Gittip.payments.ba.submit);
 
     // Lazily depend on Balanced.
@@ -170,7 +187,7 @@ Gittip.payments.ba.handleResponse = function (response) {
         setTimeout(function() {
             $('#status').removeClass('highlight');
         }, 8000);
-        $('#delete').show();
+        $('#ba-delete').show();
         Gittip.forms.clearFeedback();
         $('button#save').text('Save');
         setTimeout(function() {
@@ -180,7 +197,7 @@ Gittip.payments.ba.handleResponse = function (response) {
 
     function detailedFeedback(data) {
         $('#status').text('failing');
-        $('#delete').show();
+        $('#ba-delete').show();
         var messages = [data.error];
         if (data.problem == 'More Info Needed') {
             messages = [ "Sorry, we couldn't verify your identity. Please "
@@ -209,7 +226,7 @@ Gittip.payments.cc = {};
 
 Gittip.payments.cc.init = function(balanced_uri, participantId) {
     Gittip.participantId = participantId;
-    $('#delete form').submit(Gittip.payments.submitDeleteForm);
+    $('#cc-delete form').submit(Gittip.payments.submitDeleteForm);
     $('form#payment').submit(Gittip.payments.cc.submit);
 
     // Lazily depend on Balanced.
@@ -332,7 +349,7 @@ Gittip.payments.cc.handleResponse = function(response) {
         setTimeout(function() {
             $('#status').removeClass('highlight');
         }, 8000);
-        $('#delete').show();
+        $('#cc-delete').show();
         Gittip.forms.clearFeedback();
         $('button#save').text('Save');
         setTimeout(function() {
@@ -342,7 +359,7 @@ Gittip.payments.cc.handleResponse = function(response) {
 
     function detailedFeedback(data) {
         $('#status').text('failing');
-        $('#delete').show();
+        $('#cc-delete').show();
         var details = [];
         Gittip.forms.showFeedback(data.problem, [data.error]);
         $('button#save').text('Save');
@@ -354,3 +371,77 @@ Gittip.payments.cc.handleResponse = function(response) {
                        , detailedFeedback
                         );
 };
+
+// Coinbase
+// ============
+
+Gittip.payments.cb = {};
+
+Gittip.payments.cb.init = function(balanced_uri, participantId) {
+    Gittip.participantId = participantId;
+    $('#cb-delete form').submit(Gittip.payments.submitDeleteForm);
+
+    // Lazily depend on Balanced.
+    var balanced_js = "https://js.balancedpayments.com/1.1/balanced.js";
+    jQuery.getScript(balanced_js, function() {
+        balanced.init(balanced_uri);
+        balanced.externalAccount.create('coinbase', Gittip.payments.cb.handleResponse);
+    });
+};
+Gittip.payments.cb.handleResponse = function(response) {
+    if (response.status_code !== 201) {
+        var msg = response.status.toString() + " " + response.error.description;
+        jQuery.ajax(
+            { type: "POST"
+            , url: "/coinbase.json"
+            , data: {action: 'store-error', msg: msg}
+             }
+        );
+
+        Gittip.forms.showFeedback(null, [response.error.description]);
+        return;
+    }
+
+    $('html, body').animate({scrollTop: 0}, 500);
+    if ($(".confirm").length > 0){
+        $(".confirm").text('Connecting to your Coinbase account..');
+    } else {
+        $('#hero').prepend('<div class="confirm">Connecting to your Coinbase account..</div>');
+    }
+
+    function success() {
+        $('.confirm').text('Successfully connected to your Coinbase account.');
+        location.reload();
+    }
+
+    function detailedFeedback(data) {
+        $('#status').text('failing');
+        $('#cb-delete').show();
+        var messages = [data.error];
+        if (data.problem == 'More Info Needed') {
+            messages = [ "Sorry, we couldn't verify your identity. Please "
+                       + "check, correct, and resubmit your details."
+            ];
+        }
+        Gittip.forms.showFeedback(data.problem, messages);
+        $('button#save').text('Save');
+    }
+
+    Gittip.forms.submit( "/coinbase.json"
+                       , {coinbase_uri: response.external_accounts[0].href}
+                       , success
+                       , detailedFeedback
+                        );
+}
+
+
+// templates/connected-accounts.html
+// ============
+
+// connect to coinbase
+$('#connect-coinbase').click(function (e) {
+    e.preventDefault();
+    Gittip.payments.cb.init(marketplace_uri, participant_username);
+});
+// for delete buttons in connected-accounts.html
+$('body').on('click', '#cc-delete .close, #ba-delete .close, #cb-delete .close', Gittip.payments.submitDeleteForm);

js/gittip/profile.js

@@ -301,12 +301,12 @@ Gittip.profile.init = function() {
                 $('a.bitcoin').text(d.bitcoin_address);
                 $('.bitcoin').toggle();
                 if (d.bitcoin_address === '') {
-                    html = "Add a <a href=\"javascript:;\" class=\"toggle-bitcoin\">Bitcoin address</a>.";
+                    html = '<span class="none">none</span><a class="btn small toggle-bitcoin" href="javascript:;">+ Add</a>';
                 } else {
-                    html = "<a rel=\"me\" href=\"http://blockchain.info/address/";
-                    html += d.bitcoin_address + "\">" + d.bitcoin_address + "</a>";
-                    html += "<div class=\"edit-bitcoin\"><a href=\"javascript:;\" class=\"toggle-bitcoin\">Edit</a> bitcoin address ";
-                    html += "</div>";
+                    html = '<a class="address" rel="me" href="http://blockchain.info/address/';
+                    html += d.bitcoin_address + '">' + d.bitcoin_address + '</a>';
+                    html += '<a href="javascript:;" class="edit-bitcoin btn small toggle-bitcoin">Edit</a>';
+                    html += '</div>';
                 }
                 $('div.bitcoin').html(html);
                 $this.text('Save');

js/gittip/tips.js

@@ -55,7 +55,9 @@ Gittip.tips.init = function() {
         var $this  = $(this),
             $myTip = $this.parents('form').find('.my-tip');
 
-        $myTip.val($this.text().match(/\d+/)[0] / ($this.hasClass('cents') ? 100 : 1)).change();
+        var amount = $this.text().match(/\d+.\d+/);
+        $myTip.val(amount).change();
+
     });
 
     $('form.my-tip').on('reset', function() {
@@ -65,6 +67,7 @@ Gittip.tips.init = function() {
 
     $('form.my-tip').submit(function(event) {
         event.preventDefault();
+
         var $this     = $(this),
             $myTip    = $this.find('.my-tip'),
             amount    = parseFloat($myTip.val(), 10),
@@ -75,8 +78,9 @@ Gittip.tips.init = function() {
         if (amount == oldAmount)
             return;
 
-        if(isAnon)
+        if(isAnon) {
             alert("Please sign in first");
+        }
         else {
             // send request to change tip
             $.post('/' + tippee + '/tip.json', { amount: amount }, function(data) {
@@ -95,11 +99,28 @@ Gittip.tips.init = function() {
                 if(!oldAmount)
                     $('.on-elsewhere .ready .number').text(
                         parseInt($('.on-elsewhere .ready .number').text(),10) + 1);
+
+                // show payment method dialog
+                if (has_payment_method === "False") {
+                    $('#payment-method-dialog').show();
+                    $("#payment-method").css({
+                        "marginLeft": -($("#payment-method").width()/2),
+                        "marginTop": -($("#payment-method").height()/2)
+                    });
+                }
 
                 // update quick stats
                 $('.quick-stats a').text('$' + data.total_giving + '/wk');
 
-                alert("Tip changed to $" + amount + "!");
+                // show confirmation message once
+                if ($(".confirm").length > 0){
+                    $(".confirm").remove();
+                }
+                var notice = $('<div class="confirm">Your weekly gift has been updated.</div>');
+                $('#hero').prepend(notice);
+
+                // update amount
+                $('.weekly-gift .amount').text('$' + $('input.my-tip').val() + ' / wk');
             })
             .fail(function() {
                 alert('Sorry, something went wrong while changing your tip. :(');
@@ -108,5 +129,39 @@ Gittip.tips.init = function() {
         }
     });
 
+    // highlight radio selection    
+    $paymentOption = $('#payment-method input:radio[name=payment-option]');
+    $paymentOption.click(function(e) {
+        $paymentOption.each(function (index, item){
+            if($(item).is(":checked")){
+                $(item).parent().addClass('selected');
+            } else {
+                $(item).parent().removeClass('selected');
+            }        
+        });
+    });
+
+    // connect to coinbase
+    $('.promo-bar a.coinbase').click(function(e) {
+        e.preventDefault();
+        Gittip.payments.cb.init(marketplace_uri, participant_username);
+    });
+
+    // payment method selection
+    $('#payment-method .primary').click(function(e) {
+        e.preventDefault();
+
+        if($('input:radio[name=payment-option]:checked').val() == 'coinbase') {
+            Gittip.payments.cb.init(marketplace_uri, participant_username);
+            $('#payment-method-dialog').hide();
+        } else {
+            window.location.href="/credit-card.html"
+        }
+    });
+
+    // close payment method dialog
+    $('#payment-method .close, #payment-method .secondary, #payment-method-dialog .overlay').click(function(e) {
+        $('#payment-method-dialog').hide();
+    });
 };
 

requirements.txt

@@ -29,7 +29,9 @@
 
 ./vendor/iso8601-0.1.4.tar.gz
 ./vendor/mock-0.8.0.tar.gz
-./vendor/balanced-1.0.1beta2.tar.gz
+./vendor/wac-0.22.tar.gz
+./vendor/uritemplate-0.6.tar.gz
+./vendor/balanced-1.0.1beta3.tar.gz
 ./vendor/python-bitcoinaddress-0.2.2.tar.gz
 
 ./vendor/pytz-2012j.tar.gz
@@ -39,4 +41,5 @@
 ./vendor/libsass-0.2.4.tar.gz
 ./vendor/honcho-0.5.0.tar.gz
 
+./vendor/PyYAML-3.10.tar.gz
 ./vendor/vcrpy-0.6.0.tar.gz