From 61feb2b27d82088aa8c8ddf0e8189e7ea95aa47c Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Mon, 11 Sep 2017 17:22:11 +1000 Subject: [PATCH] Rename Stripe existing_card param key to existing_card_id --- app/assets/javascripts/darkswarm/services/checkout.js.coffee | 2 +- app/controllers/checkout_controller.rb | 4 ++-- .../unit/darkswarm/services/checkout_spec.js.coffee | 2 +- spec/requests/stripe_connect_checkout_spec.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/darkswarm/services/checkout.js.coffee b/app/assets/javascripts/darkswarm/services/checkout.js.coffee index fd07e71e86..204c35ac66 100644 --- a/app/assets/javascripts/darkswarm/services/checkout.js.coffee +++ b/app/assets/javascripts/darkswarm/services/checkout.js.coffee @@ -62,7 +62,7 @@ Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeE if @paymentMethod()?.method_type == 'stripe' if @secrets.selected_card angular.extend munged_order, { - existing_card: @secrets.selected_card + existing_card_id: @secrets.selected_card } else angular.extend munged_order.payments_attributes[0], { diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb index 5d3c884400..62c91df4f4 100644 --- a/app/controllers/checkout_controller.rb +++ b/app/controllers/checkout_controller.rb @@ -119,7 +119,7 @@ class CheckoutController < Spree::CheckoutController if (params[:order][:payments_attributes]) params[:order][:payments_attributes].first[:amount] = @order.total end - if params[:order][:existing_card] + if params[:order][:existing_card_id] construct_saved_card_attributes end params[:order] @@ -207,7 +207,7 @@ class CheckoutController < Spree::CheckoutController end def construct_saved_card_attributes - existing_card_id = params[:order].delete(:existing_card) + existing_card_id = params[:order].delete(:existing_card_id) return if existing_card_id.blank? credit_card = Spree::CreditCard.find(existing_card_id) diff --git a/spec/javascripts/unit/darkswarm/services/checkout_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/checkout_spec.js.coffee index 9120ad31b6..5ca05a344f 100644 --- a/spec/javascripts/unit/darkswarm/services/checkout_spec.js.coffee +++ b/spec/javascripts/unit/darkswarm/services/checkout_spec.js.coffee @@ -208,4 +208,4 @@ describe 'Checkout service', -> Checkout.secrets.selected_card = 1 source_attributes = Checkout.preprocess() expect(source_attributes).toBeDefined() - expect(source_attributes.existing_card).toBe 1 + expect(source_attributes.existing_card_id).toBe 1 diff --git a/spec/requests/stripe_connect_checkout_spec.rb b/spec/requests/stripe_connect_checkout_spec.rb index d5cc332126..511f380f24 100644 --- a/spec/requests/stripe_connect_checkout_spec.rb +++ b/spec/requests/stripe_connect_checkout_spec.rb @@ -176,7 +176,7 @@ describe "Submitting Stripe Connect charge requests", type: :request do let(:charge_response_mock) { { status: 200, body: JSON.generate(id: "ch_1234", object: "charge", amount: 2000) } } before do - params[:order][:existing_card] = credit_card.id + params[:order][:existing_card_id] = credit_card.id quick_login_as(order.user) # Requests a token