solidus_paypal_braintree 0.2.0 → 1.1.0

data/db/migrate/20170505193712_add_null_constraint_to_sources.rb

@@ -15,7 +15,9 @@ class AddNullConstraintToSources < SolidusSupport::Migration[4.2]
 
     Spree::Payment.joins(join_sources).find_each do |payment|
       Rails.logger.info("Updating source #{payment.source_id} with payment method id #{payment.payment_method_id}")
-      SolidusPaypalBraintree::Source.where(id: payment.source_id).update_all(payment_method_id: payment.payment_method_id)
+      SolidusPaypalBraintree::Source.where(id: payment.source_id).update_all(
+        payment_method_id: payment.payment_method_id
+      )
     end
 
     # We use a foreign key constraint on the model,

data/db/migrate/20190705115327_add_paypal_button_preferences_to_braintree_configurations.rb

@@ -0,0 +1,5 @@
+class AddPaypalButtonPreferencesToBraintreeConfigurations < ActiveRecord::Migration[5.1]
+  def change
+    add_column :solidus_paypal_braintree_configurations, :preferences, :text
+  end
+end

data/db/migrate/20190911141712_add_3d_secure_to_braintree_configuration.rb

@@ -0,0 +1,5 @@
+class Add3dSecureToBraintreeConfiguration < SolidusSupport::Migration[4.2]
+  def change
+    add_column :solidus_paypal_braintree_configurations, :three_d_secure, :boolean, null: false, default: false
+  end
+end

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

@@ -1,18 +1,21 @@
+# frozen_string_literal: true
+
 module SolidusPaypalBraintree
-  class ConfigurationsController < Spree::Admin::BaseController
-    helper Spree::Core::Engine.routes.url_helpers
+  class ConfigurationsController < ::Spree::Admin::BaseController
+    helper ::Spree::Core::Engine.routes.url_helpers
 
     def list
       authorize! :list, SolidusPaypalBraintree::Configuration
 
-      @configurations = Spree::Store.all.map(&:braintree_configuration)
+      @configurations = ::Spree::Store.all.map { |s| s.braintree_configuration || s.create_braintree_configuration }
     end
 
     def update
       authorize! :update, SolidusPaypalBraintree::Configuration
 
       params = configurations_params[:configuration_fields]
-      if SolidusPaypalBraintree::Configuration.update(params.keys, params.values)
+      results = SolidusPaypalBraintree::Configuration.update(params.keys, params.values)
+      if results.all?(&:valid?)
         flash[:success] = t('update_success', scope: 'solidus_paypal_braintree.configurations')
       else
         flash[:error] = t('update_error', scope: 'solidus_paypal_braintree.configurations')
@@ -24,7 +27,22 @@ module SolidusPaypalBraintree
 
     def configurations_params
       params.require(:configurations).
-        permit(configuration_fields: [:paypal, :apple_pay, :credit_card])
+        permit(configuration_fields: [
+          :paypal,
+          :apple_pay,
+          :venmo,
+          :credit_card,
+          :three_d_secure,
+          :preferred_paypal_button_locale,
+          :preferred_paypal_button_color,
+          :preferred_paypal_button_shape,
+          :preferred_paypal_button_label,
+          :preferred_paypal_button_tagline,
+          :preferred_paypal_button_layout,
+          :preferred_paypal_button_messaging,
+          :preferred_venmo_button_color,
+          :preferred_venmo_button_width
+        ])
     end
   end
 end

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

@@ -1,27 +1,31 @@
-class SolidusPaypalBraintree::CheckoutsController < Spree::CheckoutController
-  PERMITTED_PAYMENT_PARAMS = [
-    :payment_method_id,
-    source_attributes: [
-      :nonce,
-      :payment_type
-    ]
-  ].freeze
+# frozen_string_literal: true
 
-  def update
-    @payment = Spree::PaymentCreate.new(@order, payment_params).build
+module SolidusPaypalBraintree
+  class CheckoutsController < ::Spree::CheckoutController
+    PERMITTED_PAYMENT_PARAMS = [
+      :payment_method_id,
+      { source_attributes: [
+        :nonce,
+        :payment_type
+      ] }
+    ].freeze
 
-    if @payment.save
-      render plain: "ok"
-    else
-      render plain: "not-ok"
+    def update
+      @payment = ::Spree::PaymentCreate.new(@order, payment_params).build
+
+      if @payment.save
+        render plain: "ok"
+      else
+        render plain: "not-ok"
+      end
     end
-  end
 
-  def payment_params
-    params.
-      require(:order).
-      require(:payments_attributes).
-      first.
-      permit(PERMITTED_PAYMENT_PARAMS)
+    def payment_params
+      params.
+        require(:order).
+        require(:payments_attributes).
+        first.
+        permit(PERMITTED_PAYMENT_PARAMS)
+    end
   end
 end

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

@@ -1,61 +1,67 @@
-class SolidusPaypalBraintree::TransactionsController < Spree::StoreController
-  class InvalidImportError < StandardError; end
-
-  PERMITTED_BRAINTREE_TRANSACTION_PARAMS = [
-    :nonce,
-    :payment_type,
-    :phone,
-    :email,
-    address_attributes: [
-      :country_code, :country_name, :last_name, :first_name,
-      :city, :zip, :state_code, :address_line_1, :address_line_2
-    ]
-  ]
-
-  def create
-    transaction = SolidusPaypalBraintree::Transaction.new transaction_params
-    import = SolidusPaypalBraintree::TransactionImport.new(current_order, transaction)
-
-    respond_to do |format|
-      if import.valid?
-        import.import!(import_state)
-
-        format.html { redirect_to redirect_url(import) }
-        format.json { render json: { redirectUrl: redirect_url(import) } }
-      else
-        status = 422
-        format.html { import_error(import) }
-        format.json { render json: { errors: import.errors, status: status }, status: status }
+# frozen_string_literal: true
+
+module SolidusPaypalBraintree
+  class TransactionsController < ::Spree::StoreController
+    class InvalidImportError < StandardError; end
+
+    PERMITTED_BRAINTREE_TRANSACTION_PARAMS = [
+      :nonce,
+      :payment_type,
+      :paypal_funding_source,
+      :phone,
+      :email,
+      { address_attributes: [
+        :country_code, :country_name, :name, :city, :zip, :state_code,
+        :address_line_1, :address_line_2, :first_name, :last_name
+      ] }
+    ].freeze
+
+    def create
+      transaction = SolidusPaypalBraintree::Transaction.new transaction_params
+      import = SolidusPaypalBraintree::TransactionImport.new(current_order, transaction)
+      restart_checkout = params[:options] && params[:options][:restart_checkout] == "true"
+
+      respond_to do |format|
+        if import.valid?
+          import.import!(import_state, restart_checkout: restart_checkout)
+
+          format.html { redirect_to redirect_url(import) }
+          format.json { render json: { redirectUrl: redirect_url(import) } }
+        else
+          status = 422
+          format.html { import_error(import) }
+          format.json { render json: { errors: import.errors, status: status }, status: status }
+        end
       end
     end
-  end
 
-  private
+    private
 
-  def import_state
-    params[:state] || 'confirm'
-  end
+    def import_state
+      params[:state] || 'confirm'
+    end
 
-  def import_error(import)
-    raise InvalidImportError,
-      "Import invalid: #{import.errors.full_messages.join(', ')}"
-  end
+    def import_error(import)
+      raise InvalidImportError,
+        "Import invalid: #{import.errors.full_messages.join(', ')}"
+    end
 
-  def redirect_url(import)
-    if import.order.complete?
-      spree.order_url(import.order)
-    else
-      spree.checkout_state_url(import.order.state)
+    def redirect_url(import)
+      if import.order.complete?
+        spree.order_url(import.order)
+      else
+        spree.checkout_state_url(import.order.state)
+      end
     end
-  end
 
-  def transaction_params
-    params.require(:transaction)
-      .permit(PERMITTED_BRAINTREE_TRANSACTION_PARAMS)
-      .merge({ payment_method: payment_method })
-  end
+    def transaction_params
+      params.require(:transaction)
+        .permit(PERMITTED_BRAINTREE_TRANSACTION_PARAMS)
+        .merge({ payment_method: payment_method })
+    end
 
-  def payment_method
-    SolidusPaypalBraintree::Gateway.find(params[:payment_method_id])
+    def payment_method
+      SolidusPaypalBraintree::Gateway.find(params[:payment_method_id])
+    end
   end
 end

data/lib/generators/solidus_paypal_braintree/install/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidusPaypalBraintree
   module Generators
     class InstallGenerator < Rails::Generators::Base
@@ -5,13 +7,12 @@ module SolidusPaypalBraintree
 
       def add_javascripts
         append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require solidus_paypal_braintree/frontend\n"
-        append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/paypal_button\n"
-        append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/solidus_paypal_braintree\n"
+        append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/solidus_paypal_braintree\n" # rubocop:disable Layout/LineLength
       end
 
       def add_stylesheets
-        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/solidus_paypal_braintree\n", before: /\*\//, verbose: true
-        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/solidus_paypal_braintree\n", before: /\*\//, verbose: true
+        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/solidus_paypal_braintree\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
+        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/solidus_paypal_braintree\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
       end
 
       def add_migrations
@@ -25,11 +26,11 @@ module SolidusPaypalBraintree
       end
 
       def run_migrations
-        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]'))
+        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]')) # rubocop:disable Layout/LineLength
         if run_migrations
           run 'bundle exec rake db:migrate'
         else
-          puts 'Skipping rake db:migrate, don\'t forget to run it!'
+          say_status :skipping, 'rake db:migrate, don\'t forget to run it!'
         end
       end
     end

data/lib/solidus_paypal_braintree/country_mapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidusPaypalBraintree
   module CountryMapper
     extend ActiveSupport::Concern
@@ -12,12 +14,12 @@ module SolidusPaypalBraintree
       "usa",
       "u.s.",
       "us"
-    ]
+    ].freeze
 
     CANADA_VARIANTS = [
       "canada",
       "ca"
-    ]
+    ].freeze
 
     # Generates a hash mapping each variant of the country name to the same ISO
     # ie: { "usa" => "US", "united states" => "US", "canada" => "CA", ... }

data/lib/solidus_paypal_braintree/engine.rb

@@ -1,8 +1,18 @@
+# frozen_string_literal: true
+
+require 'solidus_support'
+
 module SolidusPaypalBraintree
   class Engine < Rails::Engine
+    include SolidusSupport::EngineExtensions
+
     isolate_namespace SolidusPaypalBraintree
     engine_name 'solidus_paypal_braintree'
 
+    ActiveSupport::Inflector.inflections do |inflect|
+      inflect.acronym 'AVS'
+    end
+
     # use rspec for tests
     config.generators do |g|
       g.test_framework :rspec
@@ -10,45 +20,47 @@ 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
 
-    def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
-        Rails.configuration.cache_classes ? require(c) : load(c)
-      end
-    end
-
-    config.to_prepare(&method(:activate).to_proc)
-
-    def self.frontend_available?
-      defined?(Spree::Frontend::Engine) == "constant"
-    end
-
-    def self.backend_available?
-      defined?(Spree::Backend::Engine) == "constant"
-    end
-
-    if frontend_available?
+    if SolidusSupport.frontend_available?
       config.assets.precompile += [
         'solidus_paypal_braintree/checkout.js',
         'solidus_paypal_braintree/frontend.js',
-        'spree/frontend/paypal_button.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"
     end
 
-    if backend_available?
+    if SolidusSupport.backend_available?
       config.assets.precompile += ["spree/backend/solidus_paypal_braintree.js"]
       paths["app/controllers"] << "lib/controllers/backend"
 
       # We support Solidus v1.2, which requires some different markup in the
       # source form partial. This will take precedence over lib/views/backend.
-      paths["app/views"] << "lib/views/backend_v1.2" if Gem::Version.new(Spree.solidus_version) < Gem::Version.new('1.3')
+      paths["app/views"] << "lib/views/backend_v1.2" if Spree.solidus_gem_version < Gem::Version.new('1.3')
+
+      # Solidus v2.4 introduced preference field partials but does not ship a hash field type.
+      # This is solved in Solidus v2.5.
+      if Spree.solidus_gem_version <= Gem::Version.new('2.5.0')
+        paths["app/views"] << "lib/views/backend_v2.4"
+      end
 
       paths["app/views"] << "lib/views/backend"
+
+      initializer "solidus_paypal_braintree_admin_menu_item", after: "register_solidus_paypal_braintree_gateway" do
+        Spree::Backend::Config.configure do |config|
+          config.menu_items << config.class::MenuItem.new(
+            [:braintree],
+            'cc-paypal',
+            url: '/solidus_paypal_braintree/configurations/list',
+            condition: -> { can?(:list, SolidusPaypalBraintree::Configuration) }
+          )
+        end
+      end
     end
   end
 end

data/lib/solidus_paypal_braintree/factories.rb

@@ -1,18 +1,53 @@
-FactoryGirl.define do
-  # Define your Spree extensions Factories within this file to enable applications, and other extensions to use and override them.
+# frozen_string_literal: true
+
+FactoryBot.define do
+  # Define your Spree extensions Factories within this file to enable applications,
+  # and other extensions to use and override them.
   #
   # 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
 
-FactoryGirl.modify do
+FactoryBot.modify do
   # The Solidus address factory randomizes the zipcode.
   # The OrderWalkThrough we use in the credit card checkout spec uses this factory for the user addresses.
   # For credit card payments we transmit the billing address to braintree, for paypal payments the shipping address.
-  # As we match the body in our VCR settings VCR can not match the request anymore and therefore cannot replay existing cassettes.
+  # 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"
+    zipcode { '21088-0255' }
+
+    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/request_protection.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'active_merchant/network_connection_retries'
+
+module SolidusPaypalBraintree
+  module RequestProtection
+    include ActiveMerchant::NetworkConnectionRetries
+
+    def protected_request
+      raise ArgumentError unless block_given?
+
+      options = {
+        connection_exceptions: {
+          Braintree::BraintreeError => 'Error while connecting to Braintree gateway'
+        },
+        logger: Rails.logger
+      }
+      retry_exceptions(options) { yield }
+    end
+  end
+end

data/lib/solidus_paypal_braintree/version.rb

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

data/lib/solidus_paypal_braintree.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 require 'solidus_core'
-require 'solidus_support'
+require 'solidus_paypal_braintree/version'
 require 'solidus_paypal_braintree/engine'
 require 'solidus_paypal_braintree/country_mapper'
+require 'solidus_paypal_braintree/request_protection'
+require 'solidus_support'
 
 module SolidusPaypalBraintree
   def self.table_name_prefix

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

@@ -6,25 +6,58 @@
   <% @configurations.each do |config| %>
     <div class="row">
       <fieldset>
-        <h1><%= config.store.name %></h1>
+        <legend><%= config.store.name %></legend>
 
         <%= f.fields_for 'configuration_fields[]', config do |c| %>
           <div class="field">
-            <%= c.label :paypal %>
             <%= c.check_box :paypal %>
+            <%= c.label :paypal do %>
+              <%= tag.i class: 'fa fa-paypal' %>
+              <%= c.object.class.human_attribute_name(:paypal) %>
+            <% end %>
           </div>
+
           <div class="field">
-            <%= c.label :apple_pay %>
             <%= c.check_box :apple_pay %>
+            <%= c.label :apple_pay do %>
+              <%= tag.i class: 'fa fa-apple' %>
+              <%= c.object.class.human_attribute_name(:apple_pay) %>
+            <% 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.label :credit_card %>
             <%= c.check_box :credit_card %>
+            <%= c.label :credit_card do %>
+              <%= tag.i class: 'fa fa-credit-card' %>
+              <%= c.object.class.human_attribute_name(:credit_card) %>
+            <% end %>
+            +
+            <%= c.check_box :three_d_secure %>
+            <%= c.label :three_d_secure do %>
+              <%= tag.i class: 'fa fa-shield' %>
+              <%= c.object.class.human_attribute_name(:three_d_secure) %>
+            <% end %>
           </div>
+
+          <% config.admin_form_preference_names.each do |name| %>
+            <%= render "spree/admin/shared/preference_fields/#{config.preference_type(name)}",
+                       form: c, attribute: "preferred_#{name}",
+                       label: t(name, scope: 'spree', default: name.to_s.humanize) %>
+          <% end %>
         <% end %>
       </fieldset>
     </div>
   <% end %>
 
-  <%= submit_tag %>
+  <div class="form-buttons filter-actions actions">
+    <%= submit_tag "Update", class: 'btn btn-primary' %>
+  </div>
 <% end %>

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

@@ -6,11 +6,11 @@
       <% previous_cards.each do |card| %>
         <label><%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.display_number %><br /></label>
       <% end %>
-      <label><%= radio_button_tag :card, "new", false, { id: "card_new#{id}" } %> <%= Spree.t(:use_new_cc) %></label>
+      <label><%= radio_button_tag :card, "new", false, { id: "card_new#{id}" } %> <%= I18n.t("spree.use_new_cc") %></label>
     <% end %>
   </div>
 
   <div id="card_form<%= id %>" data-hook style="display: none;">
-    <%= render partial: "spree/shared/braintree_hosted_fields", locals: { id: id } %>
+    <%= render partial: "spree/shared/braintree_hosted_fields", locals: { payment_method: payment_method } %>
   </div>
 </fieldset>

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

@@ -4,10 +4,10 @@
   <div class="row">
     <div class="alpha six columns">
       <dl>
-        <dt><%= Spree.t(:identifier) %>:</dt>
+        <dt><%= I18n.t("spree.identifier") %>:</dt>
         <dd><%= payment.number %></dd>
 
-        <dt><%= Spree.t(:response_code) %>:</dt>
+        <dt><%= I18n.t("spree.response_code") %>:</dt>
         <dd><%= braintree_transaction_link(payment) %></dd>
 
         <% if payment.source.token.present? %>
@@ -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/backend_v1.2/spree/admin/payments/source_forms/_paypal_braintree.html.erb

@@ -6,11 +6,11 @@
       <% previous_cards.each do |card| %>
         <label><%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.display_number %><br /></label>
       <% end %>
-      <label><%= radio_button_tag :card, "new", false, { id: "card_new#{id}" } %> <%= Spree.t(:use_new_cc) %></label>
+      <label><%= radio_button_tag :card, "new", false, { id: "card_new#{id}" } %> <%= I18n.t("spree.use_new_cc") %></label>
     <% end %>
   </div>
 
   <div id="card_form<%= id %>" data-hook style="display: none;">
-    <%= render partial: "spree/shared/braintree_hosted_fields", locals: { id: id } %>
+    <%= render partial: "spree/shared/braintree_hosted_fields", locals: { payment_method: payment_method } %>
   </div>
 </fieldset>