solidus_paypal_braintree 0.4.0 → 1.0.0

data/lib/solidus_paypal_braintree/engine.rb

@@ -1,10 +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
@@ -15,14 +23,6 @@ module SolidusPaypalBraintree
       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)
-      end
-    end
-
-    config.to_prepare(&method(:activate).to_proc)
-
     if SolidusSupport.frontend_available?
       config.assets.precompile += [
         'solidus_paypal_braintree/checkout.js',
@@ -39,17 +39,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,5 +1,8 @@
+# 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'
@@ -9,10 +12,11 @@ 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' }
+    lastname { 'Doe' }
   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.0.0'
 end

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

@@ -6,25 +6,50 @@
   <% @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.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? %>

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/spree/checkout/payment/_paypal_braintree.html.erb

@@ -8,10 +8,12 @@
 
 <% 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 %>
+
+<%= render "spree/shared/braintree_errors" %>

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

@@ -0,0 +1,30 @@
+<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,
+    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.4'
+
+  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.test_files = Dir['spec/**/*']
+  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
+  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_development_dependency 'selenium-webdriver'
+  s.add_development_dependency 'solidus_dev_support'
+  s.add_development_dependency 'vcr'
+  s.add_development_dependency 'webmock'
+end

data/spec/controllers/solidus_paypal_braintree/checkouts_controller_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+require 'support/order_ready_for_payment'
+
+RSpec.describe SolidusPaypalBraintree::CheckoutsController, type: :controller do
+  routes { SolidusPaypalBraintree::Engine.routes }
+
+  include_context 'when order is ready for payment'
+
+  describe 'PATCH update' do
+    subject(:patch_update) { patch :update, params: params }
+
+    let(:params) do
+      {
+        "state" => "payment",
+        "order" => {
+          "payments_attributes" => [
+            {
+              "payment_method_id" => payment_method.id,
+              "source_attributes" => {
+                "nonce" => "fake-paypal-billing-agreement-nonce",
+                "payment_type" => SolidusPaypalBraintree::Source::PAYPAL
+              }
+            }
+          ],
+          "use_billing" => "1",
+          "use_postmates_shipping" => "0"
+        },
+        "reuse_credit" => "1",
+        "order_bill_address" => "",
+        "reuse_bill_address" => "1"
+      }
+    end
+
+    let!(:payment_method) do
+      create_gateway
+    end
+
+    before do
+      allow(controller).to receive(:try_spree_current_user) { user }
+      allow(controller).to receive(:spree_current_user) { user }
+      allow(controller).to receive(:current_order) { order }
+    end
+
+    context "when a payment is created successfully", vcr: {
+      cassette_name: 'checkout/update',
+      match_requests_on: [:braintree_uri]
+    } do
+      it 'creates a payment' do
+        expect { patch_update }.
+          to change { order.payments.count }.
+          from(0).
+          to(1)
+      end
+
+      it 'creates a payment source' do
+        expect { patch_update }.
+          to change { SolidusPaypalBraintree::Source.count }.
+          from(0).
+          to(1)
+      end
+
+      it 'assigns @order' do
+        patch_update
+        expect(assigns(:order)).to eq order
+      end
+
+      it "is successful" do
+        expect(patch_update).to be_successful
+      end
+
+      it "renders 'ok'" do
+        expect(patch_update.body).to eql("ok")
+      end
+    end
+
+    context "when a payment is not created successfully" do
+      before do
+        allow_any_instance_of(::Spree::Payment).to receive(:save).and_return(false)
+      end
+
+      # No idea why this is the case, but I'm just adding the tests here
+      it "is successful" do
+        expect(patch_update).to be_successful
+      end
+
+      it "renders 'not-ok'" do
+        expect(patch_update.body).to eq('not-ok')
+      end
+
+      it "does not change the number of payments in the system" do
+        expect{ patch_update }.not_to(change{ ::Spree::Payment.count })
+      end
+
+      it "does not change the number of sources in the system" do
+        expect{ patch_update }.not_to(change{ SolidusPaypalBraintree::Source.count })
+      end
+    end
+  end
+end

data/spec/controllers/solidus_paypal_braintree/client_tokens_controller_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe SolidusPaypalBraintree::ClientTokensController do
+  routes { SolidusPaypalBraintree::Engine.routes }
+
+  cassette_options = { cassette_name: "braintree/token" }
+  describe "POST create", vcr: cassette_options do
+    let!(:gateway) { create_gateway }
+    let(:user) { create(:user) }
+    let(:json) { JSON.parse(response.body) }
+
+    before { user.generate_spree_api_key! }
+
+    context 'without a payment method id' do
+      subject(:response) do
+        post :create, params: { token: user.spree_api_key }
+      end
+
+      it "returns a client token", aggregate_failures: true do
+        expect(response).to have_http_status(:success)
+        expect(response.content_type).to include 'application/json'
+        expect(json["client_token"]).to be_present
+        expect(json["client_token"]).to be_a String
+        expect(json["payment_method_id"]).to eq gateway.id
+      end
+
+      context "when there's two gateway's for different stores" do
+        let!(:store1) { create(:store, code: 'store_1') }
+        let!(:store2) { create(:store, code: 'store_2') }
+        let!(:gateway_for_store1) { create_gateway.tap{ |gw| store1.payment_methods << gw } }
+        let!(:gateway_for_store2) { create_gateway.tap{ |gw| store2.payment_methods << gw } }
+
+        it "returns the correct gateway for store1" do
+          allow_any_instance_of(described_class).to receive(:current_store).and_return store1
+          expect(json["payment_method_id"]).to eq gateway_for_store1.id
+        end
+
+        it "returns the correct gateway for store2" do
+          allow_any_instance_of(described_class).to receive(:current_store).and_return store2
+          expect(json["payment_method_id"]).to eq gateway_for_store2.id
+        end
+      end
+    end
+
+    context 'with a payment method id' do
+      subject(:response) do
+        post :create, params: { token: user.spree_api_key, payment_method_id: gateway.id }
+      end
+
+      it 'uses the selected gateway' do
+        expect(json["payment_method_id"]).to eq gateway.id
+      end
+    end
+  end
+end