solidus_paypal_braintree 1.0.0 → 1.1.0

data/app/models/solidus_paypal_braintree/transaction_address.rb

@@ -51,16 +51,24 @@ module SolidusPaypalBraintree
         zipcode: zip
       )
 
-      if !first_name.nil?
-        ::Spree::Deprecation.warn("first_name and last_name are deprecated. Use name instead.", caller)
-        address.first_name = first_name
-        address.last_name = last_name || "(left blank)"
-      elsif address.respond_to? :name
-        address.name = name
+      if SolidusSupport.combined_first_and_last_name_in_address?
+        address.name = begin
+          if first_name.nil?
+            name
+          else
+            [first_name, last_name].join(" ")
+          end
+        end
       else
-        first_name, last_name = split_name(name)
-        address.first_name = first_name
-        address.last_name = last_name || "(left blank)"
+        ::Spree::Deprecation.warn("first_name and last_name are deprecated. Use name instead.", caller)
+        if first_name.nil?
+          first, last = SolidusPaypalBraintree::Address.split_name(name)
+          address.firstname = first
+          address.lastname = last || "(left blank)"
+        else
+          address.firstname = first_name
+          address.lastname = last_name || "(left blank)"
+        end
       end
 
       if spree_state
@@ -71,10 +79,6 @@ module SolidusPaypalBraintree
       address
     end
 
-    def split_name(name)
-      name.strip.split(' ', 2)
-    end
-
     # Check to see if this address should match to a state model in the database
     def should_match_state_model?
       spree_country&.states_required?

data/app/models/solidus_paypal_braintree/transaction_import.rb

@@ -31,6 +31,7 @@ module SolidusPaypalBraintree
         nonce: transaction.nonce,
         payment_type: transaction.payment_type,
         payment_method: transaction.payment_method,
+        paypal_funding_source: transaction.paypal_funding_source,
         user: user
       )
     end
@@ -45,7 +46,7 @@ module SolidusPaypalBraintree
           order.shipping_address = order.billing_address = address
           # work around a bug in most solidus versions
           # about tax zone cachine between address changes
-          order.instance_variable_set("@tax_zone", nil)
+          order.instance_variable_set(:@tax_zone, nil)
         end
 
         payment = order.payments.new(

data/app/overrides/spree/payments/payment/add_paypal_funding_source_to_payment.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+Deface::Override.new(
+  name: "payments/payment/add_paypal_funding_source_to_payment",
+  virtual_path: "spree/payments/_payment",
+  original: "0b5b5ae53626059cb3a202ef95d10827dd399925",
+  insert_after: "erb[loud]:contains('content_tag(:span, payment.payment_method.name)')",
+  partial: "solidus_paypal_braintree/payments/payment"
+)

data/app/views/spree/shared/_braintree_errors.html.erb

@@ -10,4 +10,7 @@
   BraintreeError.HOSTED_FIELDS_TOKENIZATION_CVV_VERIFICATION_FAILED = "<%= I18n.t('solidus_paypal_braintree.errors.cvv_verification_failed')%>"
   BraintreeError.THREEDS_AUTHENTICATION_FAILED = "<%= t('solidus_paypal_braintree.errors.threeds.authentication_failed') %>";
   BraintreeError.THREEDS_CARDINAL_SDK_ERROR = "<%= t('solidus_paypal_braintree.errors.threeds.authentication_failed') %>";
+  BraintreeError.VENMO_CANCELED = "<%= t('solidus_paypal_braintree.errors.venmo.canceled') %>";
+  BraintreeError.VENMO_DESKTOP_CANCELED = "<%= t('solidus_paypal_braintree.errors.venmo.desktop_canceled') %>";
+  BraintreeError.VENMO_APP_CANCELED = "<%= t('solidus_paypal_braintree.errors.venmo.app_canceled') %>";
 </script>

data/app/views/spree/shared/_paypal_braintree_head_scripts.html.erb

@@ -1,21 +1,25 @@
 <% content_for :head do %>
-  <script src="https://js.braintreegateway.com/web/3.67.0/js/client.min.js"></script>
-  <script src="https://js.braintreegateway.com/web/3.67.0/js/data-collector.min.js"></script>
+  <script src="https://js.braintreegateway.com/web/3.84.0/js/client.min.js"></script>
+  <script src="https://js.braintreegateway.com/web/3.84.0/js/data-collector.min.js"></script>
 
   <% if current_store.braintree_configuration.paypal? %>
-    <script src="https://js.braintreegateway.com/web/3.67.0/js/paypal-checkout.min.js"></script>
+    <script src="https://js.braintreegateway.com/web/3.84.0/js/paypal-checkout.min.js"></script>
   <% end %>
 
   <% if current_store.braintree_configuration.credit_card? %>
-    <script src="https://js.braintreegateway.com/web/3.67.0/js/hosted-fields.min.js"></script>
+    <script src="https://js.braintreegateway.com/web/3.84.0/js/hosted-fields.min.js"></script>
 
     <% if current_store.braintree_configuration.three_d_secure? %>
-      <script src="https://js.braintreegateway.com/web/3.67.0/js/three-d-secure.min.js"></script>
+      <script src="https://js.braintreegateway.com/web/3.84.0/js/three-d-secure.min.js"></script>
     <% end %>
   <% end %>
 
   <% if current_store.braintree_configuration.apple_pay? %>
-    <script src="https://js.braintreegateway.com/web/3.67.0/js/apple-pay.min.js"></script>
+    <script src="https://js.braintreegateway.com/web/3.84.0/js/apple-pay.min.js"></script>
+  <% end %>
+
+  <% if current_store.braintree_configuration.venmo? %>
+    <script src="https://js.braintreegateway.com/web/3.84.0/js/venmo.min.js"></script>
   <% end %>
 
   <%= javascript_include_tag "solidus_paypal_braintree/checkout" %>

data/app/views/spree/shared/_paypal_cart_button.html.erb

@@ -9,8 +9,10 @@
     amount: '<%= current_order.total %>',
     currency: '<%= current_order.currency %>',
     enableShippingAddress: true,
+    buyerCountry: '<%= SolidusPaypalBraintree::Gateway.first.preferred_force_buyer_country %>',
     environment: '<%= Rails.env.production? ? "production" : "sandbox" %>',
     locale: '<%= paypal_button_preference(:paypal_button_locale, store: current_store) %>',
+    useDataCollector: <%= SolidusPaypalBraintree::Gateway.first.preferred_use_data_collector %>,
     style: {
       color: '<%= paypal_button_preference(:paypal_button_color, store: current_store) %>',
       shape: '<%= paypal_button_preference(:paypal_button_shape, store: current_store) %>',

data/app/views/spree/shared/_venmo_button.html.erb

@@ -0,0 +1,33 @@
+<%= button_tag '', id: 'venmo-button', class: 'venmo-button', type: 'button' %>
+
+<% store = Spree::Store.default %>
+<% style = venmo_button_style(store) %>
+
+<style>
+  .venmo-button {
+    width: <%= style[:width] %>px;
+    background-image: url('<%= venmo_button_asset_url(style)%>');
+  }
+  .venmo-button:active, .venmo-button:hover {
+    background-color: transparent !important;
+    background-image: url('<%= venmo_button_asset_url(style, active: true)%>') !important;
+  }
+</style>
+
+<% prefix = "payment_source[#{payment_method.id}]" %>
+
+<div class="venmo-fields">
+  <div class="clear"></div>
+  <input disabled type="hidden" name="<%= prefix %>[payment_type]" value="<%= SolidusPaypalBraintree::Source::VENMO %>">
+  <input disabled type="hidden" id="venmo_payment_method_nonce" name="<%= prefix %>[nonce]">
+</div>
+
+<script>
+  var venmoButtonElement = document.getElementById('venmo-button');
+  var venmoOptions = {
+    newBrowserTabSupported: <%= SolidusPaypalBraintree::Gateway.first.preferred_venmo_new_tab_support %>,
+    flow: '<%= SolidusPaypalBraintree::Gateway.first.preferred_paypal_flow %>'
+  };
+  var button = new SolidusPaypalBraintree.createVenmoButton(venmoButtonElement, venmoOptions);
+  button.initialize();
+</script>

data/config/locales/en.yml

@@ -8,6 +8,7 @@ en:
         apple_pay: Apple Pay
         credit_card: Credit Card
         three_d_secure: 3D Secure
+        venmo: Venmo
   spree:
     admin:
       tab:
@@ -21,6 +22,8 @@ en:
     public_key: Public key
     token_generation_enabled: Token generation enabled?
     paypal_flow: PayPal flow
+    paypal_funding: 'PayPal Funding: %{funding}'
+    paypal_funding_source: 'PayPal Funding Source'
   solidus_paypal_braintree:
     braintree: Braintree
     nonce: Nonce
@@ -37,11 +40,16 @@ en:
       cvv_verification_failed: "CVV did not pass verification."
       threeds:
         authentication_failed: "3D Secure authentication failed. Please try again using a different payment method."
+      venmo:
+        canceled: "App is not available or you aborted the payment flow."
+        desktop_canceled: "Venmo authorization was canceled by closing the Venmo Desktop modal."
+        app_canceled: "Payment flow was canceled."
     payment_type:
       label: Payment Type
       apple_pay_card: Apple Pay
       credit_card: Credit Card
       pay_pal_account: PayPal
+      venmo_account: Venmo
     configurations:
       title: Braintree Configurations
       tab: Braintree
@@ -60,3 +68,29 @@ en:
       gateway_rejected: Gateway rejected this transaction.
       processor_declined: Processor declined this transaction.
       settlement_declined: Settlement was declined by processor.
+    paypal_funding_sources:
+       applepay: 'Apple Pay'
+       bancontact: 'Bancontact'
+       blik: 'BLIK'
+       boleto: 'Boleto'
+       card: 'Credit or debit card'
+       credit: 'PayPal Credit'
+       eps: 'eps'
+       giropay: 'giropay'
+       ideal: 'iDEAL'
+       itau: 'Itau'
+       maxima: 'Maxima'
+       mercadopago: 'Mercado Pago'
+       mybank: 'MyBank'
+       oxxo: 'Oxxo'
+       p24: 'Przelewy24'
+       paylater: 'Pay Later'
+       paypal: 'PayPal'
+       payu: 'PayU'
+       sepa: 'SEPA-Lastschrift'
+       sofort: 'Sofort'
+       trustly: 'Trustly'
+       venmo: 'Venmo'
+       verkkopankki: 'Verkkopankki'
+       wechatpay: 'WeChat Pay'
+       zimpler: 'Zimpler'

data/config/locales/it.yml

@@ -29,6 +29,8 @@ it:
       duplicate_iframe: Ci sono due iframe di Braintree.
       fail_on_duplicate: Questo metodo di pagamento esiste già.
       cvv_verification_failed: Il codice CVV non è corretto.
+      threeds:
+        authentication_failed: "Autenticazione 3D Secure fallita. Riprova usando un altro metodo di pagamento."
     payment_type:
       label: Metodo di Pagamento
       apple_pay_card: Apple Pay

data/db/migrate/20211222170950_add_paypal_funding_source_to_solidus_paypal_braintree_sources.rb

@@ -0,0 +1,5 @@
+class AddPaypalFundingSourceToSolidusPaypalBraintreeSources < ActiveRecord::Migration[5.0]
+  def change
+    add_column :solidus_paypal_braintree_sources, :paypal_funding_source, :integer
+  end
+end

data/db/migrate/20220104150301_add_venmo_to_braintree_configuration.rb

@@ -0,0 +1,5 @@
+class AddVenmoToBraintreeConfiguration < ActiveRecord::Migration[5.0]
+  def change
+    add_column :solidus_paypal_braintree_configurations, :venmo, :boolean, null: false, default: false
+  end
+end

data/lib/controllers/backend/solidus_paypal_braintree/configurations_controller.rb

@@ -30,6 +30,7 @@ module SolidusPaypalBraintree
         permit(configuration_fields: [
           :paypal,
           :apple_pay,
+          :venmo,
           :credit_card,
           :three_d_secure,
           :preferred_paypal_button_locale,
@@ -38,7 +39,9 @@ module SolidusPaypalBraintree
           :preferred_paypal_button_label,
           :preferred_paypal_button_tagline,
           :preferred_paypal_button_layout,
-          :preferred_paypal_button_messaging
+          :preferred_paypal_button_messaging,
+          :preferred_venmo_button_color,
+          :preferred_venmo_button_width
         ])
     end
   end

data/lib/controllers/frontend/solidus_paypal_braintree/transactions_controller.rb

@@ -7,6 +7,7 @@ module SolidusPaypalBraintree
     PERMITTED_BRAINTREE_TRANSACTION_PARAMS = [
       :nonce,
       :payment_type,
+      :paypal_funding_source,
       :phone,
       :email,
       { address_attributes: [

data/lib/solidus_paypal_braintree/engine.rb

@@ -20,14 +20,16 @@ module SolidusPaypalBraintree
 
     initializer "register_solidus_paypal_braintree_gateway", after: "spree.register.payment_methods" do |app|
       app.config.spree.payment_methods << SolidusPaypalBraintree::Gateway
-      Spree::PermittedAttributes.source_attributes.concat [:nonce, :payment_type]
+      SolidusPaypalBraintree::Gateway.allowed_admin_form_preference_types << :preference_select
+      Spree::PermittedAttributes.source_attributes.concat [:nonce, :payment_type, :paypal_funding_source]
     end
 
     if SolidusSupport.frontend_available?
       config.assets.precompile += [
         'solidus_paypal_braintree/checkout.js',
         'solidus_paypal_braintree/frontend.js',
-        'spree/frontend/apple_pay_button.js'
+        'spree/frontend/apple_pay_button.js',
+        'solidus_paypal_braintree_manifest.js'
       ]
       paths["app/controllers"] << "lib/controllers/frontend"
       paths["app/views"] << "lib/views/frontend"

data/lib/solidus_paypal_braintree/factories.rb

@@ -6,6 +6,28 @@ FactoryBot.define do
   #
   # Example adding this to your spec_helper will load these Factories for use:
   # require 'solidus_paypal_braintree/factories'
+
+  factory :solidus_paypal_braintree_payment_method, class: SolidusPaypalBraintree::Gateway do
+    name 'Solidus PayPal Braintree Gateway'
+    active true
+  end
+
+  factory :solidus_paypal_braintree_source, class: SolidusPaypalBraintree::Source do
+    association(:payment_method, factory: :solidus_paypal_braintree_payment_method)
+    user
+
+    trait :credit_card do
+      payment_type SolidusPaypalBraintree::Source::CREDIT_CARD
+    end
+
+    trait :paypal do
+      payment_type SolidusPaypalBraintree::Source::PAYPAL
+    end
+
+    trait :apple_pay do
+      payment_type SolidusPaypalBraintree::Source::APPLE_PAY
+    end
+  end
 end
 
 FactoryBot.modify do
@@ -15,8 +37,17 @@ FactoryBot.modify do
   # As we match the body in our VCR settings VCR can not match the request anymore and therefore cannot replay existing
   # cassettes.
   #
+
   factory :address do
     zipcode { '21088-0255' }
-    lastname { 'Doe' }
+
+    if SolidusSupport.combined_first_and_last_name_in_address?
+      transient do
+        firstname { "John" }
+        lastname { "Doe" }
+      end
+
+      name { "#{firstname} #{lastname}" }
+    end
   end
 end

data/lib/solidus_paypal_braintree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusPaypalBraintree
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/views/backend/solidus_paypal_braintree/configurations/list.html.erb

@@ -25,6 +25,14 @@
             <% end %>
           </div>
 
+          <div class="field">
+            <%= c.check_box :venmo %>
+            <%= c.label :venmo do %>
+              <%= tag.i class: 'fa fa-mobile' %>
+              <%= c.object.class.human_attribute_name(:venmo) %>
+            <% end %>
+          </div>
+
           <div class="field">
             <%= c.check_box :credit_card %>
             <%= c.label :credit_card do %>

data/lib/views/backend/spree/admin/payments/source_views/_paypal_braintree.html.erb

@@ -28,6 +28,11 @@
           <dt><%= Spree::CreditCard.human_attribute_name(:last_digits) %>:</dt>
           <dd><%= payment.source.last_digits %></dd>
         <% end %>
+
+        <% if payment.source.paypal? %>
+          <dt><%= I18n.t('spree.paypal_funding_source') %>:</dt>
+          <dd><%= payment.source.display_paypal_funding_source %></dd>
+        <% end %>
       </dl>
     </div>
   </div>

data/lib/views/backend/spree/admin/shared/preference_fields/_preference_select.html.erb

@@ -0,0 +1,13 @@
+<% label = local_assigns[:label].presence %>
+<% html_options = {class: 'custom-select fullwidth'}.update(local_assigns[:html_options] || {}) %>
+<% options = form.object.send("#{attribute}_options") %>
+
+<div class="field">
+  <% if local_assigns[:form] %>
+    <%= form.label attribute, label %>
+    <%= form.select attribute, options, {}, html_options %>
+  <% else %>
+    <%= label_tag name, label %>
+    <%= select_tag name, value, html_options %>
+  <% end %>
+</div>

data/lib/views/frontend/solidus_paypal_braintree/payments/_payment.html.erb

@@ -0,0 +1,12 @@
+<br />
+<%= payment.source.display_payment_type %>
+
+<% if payment.source.paypal? %>
+  <% if payment.source.respond_to?(:paypal_funding_source) && payment.source.paypal_funding_source.present? %>
+    <br />
+    <%= t('spree.paypal_funding', funding: payment.source.display_paypal_funding_source) %>
+  <% end %>
+<% elsif payment.source.venmo? %>
+  <br />
+  <%= payment.source.source_description %>
+<% end %>

data/lib/views/frontend/spree/checkout/payment/_paypal_braintree.html.erb

@@ -16,4 +16,8 @@
   <%= render "spree/shared/apple_pay_button", id: id %>
 <% end %>
 
+<% if current_store.braintree_configuration.venmo? %>
+  <%= render "spree/shared/venmo_button", payment_method: payment_method %>
+<% end %>
+
 <%= render "spree/shared/braintree_errors" %>

data/lib/views/frontend/spree/shared/_paypal_checkout_button.html.erb

@@ -9,6 +9,8 @@
     amount: '<%= current_order.total %>',
     currency: '<%= current_order.currency %>',
     enableShippingAddress: true,
+    venmoFunding: <%= SolidusPaypalBraintree::Gateway.first.preferred_enable_venmo_funding %>,
+    buyerCountry: '<%= SolidusPaypalBraintree::Gateway.first.preferred_force_buyer_country %>',
     shippingAddressOverride: address,
     shippingAddressEditable: false,
     environment: '<%= Rails.env.production? ? "production" : "sandbox" %>',

data/solidus_paypal_braintree.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.email     = 'braintree+gemfile@stembolt.com'
   s.homepage  = 'https://github.com/solidusio/solidus_paypal_braintree'
 
-  s.required_ruby_version = '~> 2.4'
+  s.required_ruby_version = '>= 2.5'
 
   s.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -27,13 +27,14 @@ Gem::Specification.new do |s|
   if s.respond_to?(:metadata)
     s.metadata["homepage_uri"] = s.homepage if s.homepage
     s.metadata["source_code_uri"] = s.homepage if s.homepage
+    s.metadata["rubygems_mfa_required"] = 'true'
   end
 
   s.add_dependency 'activemerchant', '~> 1.48'
-  s.add_dependency 'braintree', '~> 2.65'
-  s.add_dependency 'solidus_api', ['>= 2.0.0', '< 3']
-  s.add_dependency 'solidus_core', ['>= 2.0.0', '< 3']
-  s.add_dependency 'solidus_support', '~> 0.5.0'
+  s.add_dependency 'braintree', '~> 3.4'
+  s.add_dependency 'solidus_api', ['>= 2.0.0', '< 4']
+  s.add_dependency 'solidus_core', ['>= 2.0.0', '< 4']
+  s.add_dependency 'solidus_support', ['>= 0.8.1', '< 1']
 
   s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'solidus_dev_support'

data/spec/controllers/solidus_paypal_braintree/transactions_controller_spec.rb

@@ -101,7 +101,7 @@ RSpec.describe SolidusPaypalBraintree::TransactionsController, type: :controller
           # the transaction import only creates 1 new one
           order
           expect { post_create }.to change { Spree::Address.count }.by(1)
-          expect(Spree::Address.last.full_name).to eq "Wade Wilson"
+          expect(Spree::Address.last.address1).to eq "123 Fake Street"
         end
       end
 

data/spec/features/frontend/braintree_credit_card_checkout_spec.rb

@@ -5,6 +5,7 @@ shared_context "with frontend checkout setup" do
   let(:braintree) { new_gateway(active: true) }
   let!(:gateway) { create :payment_method }
   let(:three_d_secure_enabled) { false }
+  let(:venmo_enabled) { false }
   let(:card_number) { "4111111111111111" }
   let(:card_expiration) { "01/#{Time.now.utc.year + 2}" }
 
@@ -14,7 +15,8 @@ shared_context "with frontend checkout setup" do
     create(:store, payment_methods: [gateway, braintree]).tap do |store|
       store.braintree_configuration.update!(
         credit_card: true,
-        three_d_secure: three_d_secure_enabled
+        three_d_secure: three_d_secure_enabled,
+        venmo: venmo_enabled
       )
 
       braintree.update(
@@ -77,6 +79,8 @@ describe 'entering credit card details', type: :feature, js: true do
     match_requests_on: [:braintree_uri]
   } do
     include_context "with frontend checkout setup"
+    # To ensure Venmo inputs do not conflict with checkout
+    let(:venmo_enabled) { true }
 
     before do
       within_frame("braintree-hosted-field-number") do