diff --git a/lib/views/frontend/solidus_paypal_commerce_platform/payments/_payment.html.erb b/lib/views/frontend/solidus_paypal_commerce_platform/payments/_payment.html.erb
index a0095af2..286717af 100644
--- a/lib/views/frontend/solidus_paypal_commerce_platform/payments/_payment.html.erb
+++ b/lib/views/frontend/solidus_paypal_commerce_platform/payments/_payment.html.erb
@@ -1,3 +1,7 @@
+<% if payment.source.respond_to?(:paypal_funding_source) %>
+
+ <%= t('paypal_funding', funding: payment.source.display_paypal_funding_source) %>
+<% end %>
<% if payment.source.respond_to?(:paypal_email) %>
<%= t('payment_email', email: payment.source.paypal_email) %>
diff --git a/lib/views/frontend/spree/checkout/payment/_paypal_commerce_platform.html.erb b/lib/views/frontend/spree/checkout/payment/_paypal_commerce_platform.html.erb
index b9fdbb38..6ffba4b0 100644
--- a/lib/views/frontend/spree/checkout/payment/_paypal_commerce_platform.html.erb
+++ b/lib/views/frontend/spree/checkout/payment/_paypal_commerce_platform.html.erb
@@ -6,13 +6,27 @@
+
+<% unless payment_method.render_only_venmo_standalone? %>
+
+<% end %>
+
+<% if payment_method.venmo_standalone_enabled? %>
+
+<% end %>
+
diff --git a/spec/features/frontend/checkout_spec.rb b/spec/features/frontend/checkout_spec.rb
index 20b551ab..57ee94f4 100644
--- a/spec/features/frontend/checkout_spec.rb
+++ b/spec/features/frontend/checkout_spec.rb
@@ -70,6 +70,16 @@
click_button("Save and Continue")
expect(Spree::Payment.last.source.paypal_email).to eq "fake@email.com"
end
+
+ it "records the paypal funding source" do
+ visit '/checkout/payment'
+ choose(option: paypal_payment_method.id)
+ find(:xpath, "//input[@id='payments_source_paypal_order_id']", visible: false).set SecureRandom.hex(8)
+ find(:xpath, "//input[@id='payments_source_paypal_email']", visible: false).set "fake@email.com"
+ find(:xpath, "//input[@id='payments_source_paypal_funding_source']", visible: false).set "venmo"
+ click_button("Save and Continue")
+ expect(Spree::Payment.last.source.paypal_funding_source).to eq "venmo"
+ end
end
context "when a payment fails" do
diff --git a/spec/models/solidus_paypal_commerce_platform/payment_method_spec.rb b/spec/models/solidus_paypal_commerce_platform/payment_method_spec.rb
index 5c42c0a1..9e5ebd6b 100644
--- a/spec/models/solidus_paypal_commerce_platform/payment_method_spec.rb
+++ b/spec/models/solidus_paypal_commerce_platform/payment_method_spec.rb
@@ -15,6 +15,23 @@ def Struct(data) # rubocop:disable Naming/MethodName
before { allow_any_instance_of(PayPal::PayPalHttpClient).to receive(:execute) { response } }
+ describe 'preferences' do
+ context 'with paypal_button_color' do
+ before do
+ paypal_payment_method.preferences.update(paypal_button_color: 'gold')
+ paypal_payment_method.save
+ end
+
+ it 'cannot be gold when Venmo standalone is enabled' do
+ expect(paypal_payment_method).to be_valid
+ paypal_payment_method.preferences.update(venmo_standalone: 'enabled')
+ expect(paypal_payment_method).to be_invalid
+ paypal_payment_method.preferences.update(venmo_standalone: 'only render standalone')
+ expect(paypal_payment_method).to be_invalid
+ end
+ end
+ end
+
describe "#purchase" do
let(:result) { Struct(purchase_units: [Struct(payments: payments)]) }
let(:payments) { Struct(captures: [Struct(id: SecureRandom.hex(4))]) }
@@ -107,64 +124,28 @@ def Struct(data) # rubocop:disable Naming/MethodName
end
end
- describe 'preferences' do
- context 'with venmo_control' do
- it 'is "default" by default' do
- expect(paypal_payment_method.preferred_venmo_control).to eq('enabled')
- end
-
- it 'only allows "enforced", "enabled" and "disabled" as values', :aggregate_failures do
- expect(paypal_payment_method).to be_valid
- valid_values = %w[enforced enabled disabled]
- invalid_values = %w[foo bar]
-
- valid_values.each do |value|
- paypal_payment_method.preferred_venmo_control = value
- expect(paypal_payment_method).to be_valid
- end
-
- invalid_values.each do |value|
- paypal_payment_method.preferred_venmo_control = value
- expect(paypal_payment_method).to be_invalid
- end
- end
- end
- end
-
- context 'when venmo_control is "enforced"' do
- before { paypal_payment_method.preferences.update(venmo_control: 'enforced') }
+ context 'when venmo_standalone is "only render standalone"' do
+ before { paypal_payment_method.preferences.update(venmo_standalone: 'only render standalone') }
it 'includes "enable-funding=venmo" as a parameter' do
expect(url.query.split('&')).to include('enable-funding=venmo')
end
-
- it 'does not include the "disable-funding" parameter' do
- expect(url.query.split('&')).not_to include(match 'disable-funding')
- end
end
- context 'when venmo_control is "enabled"' do
- before { paypal_payment_method.preferences.update(venmo_control: 'enabled') }
-
- it 'include the "enable-funding" parameter' do
- expect(url.query.split('&')).not_to include(match 'enable-funding')
- end
+ context 'when venmo_standalone is "enabled"' do
+ before { paypal_payment_method.preferences.update(venmo_standalone: 'enabled') }
- it 'does not include the "disable-funding" parameter' do
- expect(url.query.split('&')).not_to include(match 'disable-funding')
+ it 'includes "enable-funding=venmo" as a parameter' do
+ expect(url.query.split('&')).to include('enable-funding=venmo')
end
end
- context 'when venmo_control is "disabled"' do
- before { paypal_payment_method.preferences.update(venmo_control: 'disabled') }
+ context 'when venmo_standalone is "disabled"' do
+ before { paypal_payment_method.preferences.update(venmo_standalone: 'disabled') }
it 'does not include the "enable-funding" parameter' do
expect(url.query.split('&')).not_to include(match 'enable-funding')
end
-
- it 'includes "disable-funding=venmo" as a parameter' do
- expect(url.query.split('&')).to include('disable-funding=venmo')
- end
end
context 'when force_buyer_country is an empty string' do
diff --git a/spec/models/solidus_paypal_commerce_platform/payment_source_spec.rb b/spec/models/solidus_paypal_commerce_platform/payment_source_spec.rb
index d5506216..e479b927 100644
--- a/spec/models/solidus_paypal_commerce_platform/payment_source_spec.rb
+++ b/spec/models/solidus_paypal_commerce_platform/payment_source_spec.rb
@@ -61,5 +61,56 @@
expect(payment.actions).not_to include("void")
end
end
+
+ context 'with #display_paypal_funding_source' do
+ context 'when the EN locale exists' do
+ it 'translates the funding source' do
+ payment_source.paypal_funding_source = 'card'
+
+ result = payment_source.display_paypal_funding_source
+
+ expect(result).to eq('Credit or debit card')
+ end
+ end
+
+ context "when the locale doesn't exist" do
+ it 'returns the paypal_funding_source as the default' do
+ allow(payment_source).to receive(:paypal_funding_source).and_return('non-existent')
+
+ result = payment_source.display_paypal_funding_source
+
+ expect(result).to eq('non-existent')
+ end
+ end
+ end
+ end
+
+ describe 'attributes' do
+ context 'with paypal_funding_source' do
+ it 'can be nil' do
+ payment_source.paypal_funding_source = nil
+
+ expect(payment_source).to be_valid
+ end
+
+ it 'makes empty strings nil' do
+ payment_source.paypal_funding_source = ''
+
+ result = payment_source.save
+
+ expect(result).to eq(true)
+ expect(payment_source.paypal_funding_source).to be_nil
+ end
+
+ it 'gets correctly mapped as an enum' do
+ payment_source.paypal_funding_source = 'applepay'
+
+ result = payment_source.save
+
+ expect(result).to eq(true)
+ expect(payment_source.paypal_funding_source).to eq('applepay')
+ expect(payment_source.applepay_funding?).to eq(true)
+ end
+ end
end
end