solidus_paypal_braintree 0.4.0 → 1.1.1

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,33 +1,37 @@
+# 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
     end
 
     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]
-    end
-
-    def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
-        Rails.configuration.cache_classes ? require(c) : load(c)
+      config.to_prepare do
+        app.config.spree.payment_methods << SolidusPaypalBraintree::Gateway
+        SolidusPaypalBraintree::Gateway.allowed_admin_form_preference_types.push(:preference_select).uniq!
+        ::Spree::PermittedAttributes.source_attributes.concat([:nonce, :payment_type, :paypal_funding_source]).uniq!
       end
     end
 
-    config.to_prepare(&method(:activate).to_proc)
-
     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"
@@ -39,17 +43,17 @@ module SolidusPaypalBraintree
 
       # 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 SolidusSupport.solidus_gem_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 SolidusSupport.solidus_gem_version <= Gem::Version.new('2.5.0')
+      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 |app|
+      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],

data/lib/solidus_paypal_braintree/factories.rb

@@ -1,18 +1,53 @@
+# 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.
+  # 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
 
 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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_merchant/network_connection_retries'
 
 module SolidusPaypalBraintree
@@ -6,6 +8,7 @@ module SolidusPaypalBraintree
 
     def protected_request
       raise ArgumentError unless block_given?
+
       options = {
         connection_exceptions: {
           Braintree::BraintreeError => 'Error while connecting to Braintree gateway'

data/lib/solidus_paypal_braintree/version.rb

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

data/lib/solidus_paypal_braintree.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 require 'solidus_core'
+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>

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

@@ -8,10 +8,16 @@
 
 <% if current_store.braintree_configuration.credit_card? %>
   <fieldset class="braintree-hosted-fields" data-braintree-hosted-fields data-id="<%= id %>">
-    <%= render "spree/shared/braintree_hosted_fields", id: id %>
+    <%= render "spree/shared/braintree_hosted_fields", payment_method: payment_method %>
   </fieldset>
 <% end %>
 
 <% if current_store.braintree_configuration.apple_pay? %>
-  <%= render "spree/shared/apple_pay_button" %>
+  <%= 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

@@ -0,0 +1,32 @@
+<div id="paypal-button"></div>
+<div data-pp-message data-pp-placement="payment" data-pp-amount="<%= @order.total %>"></div>
+
+<script>
+  var address = <%= sanitize SolidusPaypalBraintree::Address.new(current_order.ship_address).to_json %>
+
+  var paypalOptions = {
+    flow: '<%= SolidusPaypalBraintree::Gateway.first.preferred_paypal_flow %>',
+    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" %>',
+    locale: '<%= paypal_button_preference(:paypal_button_locale, store: current_store) %>',
+    style: {
+      color: '<%= paypal_button_preference(:paypal_button_color, store: current_store) %>',
+      shape: '<%= paypal_button_preference(:paypal_button_shape, store: current_store) %>',
+      label: '<%= paypal_button_preference(:paypal_button_label, store: current_store) %>',
+      layout: '<%= paypal_button_preference(:paypal_button_layout, store: current_store) %>',
+      <% if paypal_button_preference(:paypal_button_layout, store: current_store) == "horizontal" %>
+        tagline: '<%= paypal_button_preference(:paypal_button_tagline, store: current_store) %>',
+      <% end %>
+      messaging: '<%= paypal_button_preference(:paypal_button_messaging, store: current_store) %>'
+    }
+  }
+
+  var button = new SolidusPaypalBraintree.createPaypalButton(document.querySelector("#paypal-button"), paypalOptions);
+  button.initialize();
+</script>

data/solidus_paypal_braintree.gemspec

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+$:.push File.expand_path('lib', __dir__)
+require 'solidus_paypal_braintree/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'solidus_paypal_braintree'
+  s.version     = SolidusPaypalBraintree::VERSION
+  s.summary     = 'Officially supported Paypal/Braintree extension'
+  s.description = 'Uses the javascript API for seamless braintree payments'
+  s.license     = 'BSD-3-Clause'
+
+  s.author    = 'Stembolt'
+  s.email     = 'braintree+gemfile@stembolt.com'
+  s.homepage  = 'https://github.com/solidusio/solidus_paypal_braintree'
+
+  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)/}) }
+  end
+  s.bindir = "exe"
+  s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  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', '~> 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'
+  s.add_development_dependency 'vcr'
+  s.add_development_dependency 'webmock'
+end