raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-01 02:03:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Stripe existing_card param key to existing_card_id

Browse Source
This commit is contained in:
Rob Harrington
2017-09-11 17:22:11 +10:00
parent a2dee8d3d8
commit 61feb2b27d
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/darkswarm/services/checkout.js.coffee
View File

@@ -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], {

4
app/controllers/checkout_controller.rb
View File

@@ -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)

2
spec/javascripts/unit/darkswarm/services/checkout_spec.js.coffee
View File

@@ -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

2
spec/requests/stripe_connect_checkout_spec.rb
View File

@@ -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