solidus_paypal_commerce_platform 0.1.0 → 0.3.1

data/app/models/solidus_paypal_commerce_platform/paypal_address.rb

@@ -19,7 +19,7 @@ module SolidusPaypalCommercePlatform
     end
 
     def update(paypal_address)
-      formatted_address = format_address(paypal_address)
+      formatted_address = address_attributes(paypal_address[:updated_address], paypal_address[:recipient])
       new_address = @order.ship_address.dup || ::Spree::Address.new
       new_address.assign_attributes(formatted_address)
 
@@ -51,36 +51,35 @@ module SolidusPaypalCommercePlatform
     end
 
     def format_simulated_address(paypal_address)
-      country = ::Spree::Country.find_by(iso: paypal_address[:country_code])
-      # Also adds fake information for a few fields, so validations can run
+      # Adds fake information for a few fields, so validations can run
+      paypal_address[:address_line_1] = "123 Fake St."
+
       ::Spree::Address.new(
-        city: paypal_address[:city],
-        state: find_state(paypal_address[:state], country),
-        state_name: paypal_address[:state],
-        zipcode: paypal_address[:postal_code],
-        country: country,
-        address1: "123 Fake St.",
-        phone: "123456789",
-        firstname: "Fake"
+        address_attributes(paypal_address, { name: { given_name: "Fake" } })
       )
     end
 
-    def format_address(paypal_address)
-      address = paypal_address[:updated_address]
-      recipient = paypal_address[:recipient]
+    def address_attributes(address, recipient)
       country = ::Spree::Country.find_by(iso: address[:country_code])
 
-      {
+      attributes = {
         address1: address[:address_line_1],
         address2: address[:address_line_2],
-        state: find_state(address[:admin_area_1], country),
-        state_name: address[:admin_area_1],
-        city: address[:admin_area_2],
+        state: find_state(address[:admin_area_1] || address[:state], country),
+        state_name: address[:admin_area_1] || address[:state],
+        city: address[:admin_area_2] || address[:city],
         country: country,
         zipcode: address[:postal_code],
-        firstname: recipient[:name][:given_name],
-        lastname: recipient[:name][:surname]
       }
+
+      if SolidusSupport.combined_first_and_last_name_in_address?
+        attributes[:name] = "#{recipient[:name][:given_name]} #{recipient[:name][:surname]}"
+      else
+        attributes[:firstname] = recipient[:name][:given_name]
+        attributes[:lastname] = recipient[:name][:surname]
+      end
+
+      attributes
     end
   end
 end

data/app/models/solidus_paypal_commerce_platform/paypal_order.rb

@@ -18,7 +18,7 @@ module SolidusPaypalCommercePlatform
       {
         op: 'replace',
         path: '/purchase_units/@reference_id==\'default\'',
-        value: purchase_units[0]
+        value: purchase_units(include_shipping_address: false)[0]
       }
     end
 
@@ -50,12 +50,12 @@ module SolidusPaypalCommercePlatform
       }
     end
 
-    def purchase_units
+    def purchase_units(include_shipping_address: true)
       [
         {
           amount: amount,
           items: line_items,
-          shipping: (shipping_info if @order.ship_address)
+          shipping: (shipping_info if @order.ship_address && include_shipping_address)
         }
       ]
     end

data/app/models/solidus_paypal_commerce_platform/pricing_options.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusPaypalCommercePlatform
-  class PricingOptions < Spree::Variant::PricingOptions
+  class PricingOptions < ::Spree::Variant::PricingOptions
     def cache_key
       SolidusPaypalCommercePlatform::PaymentMethod.active.map(&:cache_key_with_version).sort + [super]
     end

data/app/models/solidus_paypal_commerce_platform/state_guesser.rb

@@ -22,7 +22,7 @@ module SolidusPaypalCommercePlatform
     end
 
     def spree_state(name)
-      Spree::State.find_by(name: name)
+      ::Spree::State.find_by(name: name)
     end
   end
 end

data/bin/sandbox

@@ -72,7 +72,7 @@ unbundled bundle exec rails generate spree:install \
   --user_class=Spree::User \
   --enforce_available_locales=true \
   --with-authentication=false \
-  --payment-method=none
+  --payment-method=none \
   $@
 
 unbundled bundle exec rails generate solidus:auth:install

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

@@ -4,6 +4,13 @@ module SolidusPaypalCommercePlatform
   module Generators
     class InstallGenerator < Rails::Generators::Base
       class_option :auto_run_migrations, type: :boolean, default: false
+      class_option :skip_migrations, type: :boolean, default: false
+
+      source_root File.expand_path('templates', __dir__)
+
+      def copy_initializer
+        template 'initializer.rb', 'config/initializers/solidus_paypal_commerce_platform.rb'
+      end
 
       def add_javascripts
         append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/solidus_paypal_commerce_platform\n" # rubocop:disable Layout/LineLength
@@ -26,6 +33,8 @@ module SolidusPaypalCommercePlatform
       end
 
       def run_migrations
+        return if options[:skip_migrations]
+
         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 'bin/rails db:migrate'

data/lib/generators/solidus_paypal_commerce_platform/install/templates/initializer.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+SolidusPaypalCommercePlatform.configure do |config|
+  # TODO: Remember to change this with the actual preferences you have implemented!
+  # config.sample_preference = 'sample_value'
+end

data/lib/solidus_paypal_commerce_platform.rb

@@ -3,19 +3,21 @@
 require 'solidus_core'
 require 'solidus_support'
 
-require 'solidus_paypal_commerce_platform/version'
-require 'solidus_paypal_commerce_platform/configuration'
 require 'solidus_paypal_commerce_platform/client'
+require 'solidus_paypal_commerce_platform/configuration'
+require 'solidus_paypal_commerce_platform/version'
 require 'solidus_paypal_commerce_platform/engine'
 
 module SolidusPaypalCommercePlatform
   class << self
-    def config
-      @config ||= Configuration.new
+    def configuration
+      @configuration ||= Configuration.new
     end
 
+    alias config configuration
+
     def configure
-      yield config
+      yield configuration
     end
   end
 end

data/lib/solidus_paypal_commerce_platform/client.rb

@@ -10,12 +10,12 @@ module SolidusPaypalCommercePlatform
     SUCCESS_STATUS_CODES = [201, 204].freeze
 
     PARTNER_ATTRIBUTION_INJECTOR = ->(request) {
-      request.headers["PayPal-Partner-Attribution-Id"] = "Solidus_PCP_SP"
+      request.headers["PayPal-Partner-Attribution-Id"] = SolidusPaypalCommercePlatform.config.partner_code
     }.freeze
 
     attr_reader :environment
 
-    def initialize(test_mode: nil, client_id:, client_secret: "")
+    def initialize(client_id:, client_secret: "", test_mode: nil)
       test_mode = SolidusPaypalCommercePlatform.config.env.sandbox? if test_mode.nil?
       env_class = test_mode ? PayPal::SandboxEnvironment : PayPal::LiveEnvironment
 

data/lib/solidus_paypal_commerce_platform/configuration.rb

@@ -66,5 +66,9 @@ module SolidusPaypalCommercePlatform
     def partner_client_id
       @partner_client_id ||= ENV['PAYPAL_PARTNER_CLIENT_ID'] || DEFAULT_PARTNER_CLIENT_ID[env.to_sym]
     end
+
+    def partner_code
+      "Solidus_PCP_SP"
+    end
   end
 end

data/lib/solidus_paypal_commerce_platform/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusPaypalCommercePlatform
-  VERSION = '0.1.0'
+  VERSION = '0.3.1'
 end

data/lib/views/frontend/solidus_paypal_commerce_platform/shared/_javascript_sdk_tag.html.erb

@@ -0,0 +1,6 @@
+<% currency = @order ? @order.currency : current_pricing_options.currency %>
+
+<script 
+  src="<%= payment_method.javascript_sdk_url(order: @order, currency: currency) %>" 
+  data-partner-attribution-id="<%= SolidusPaypalCommercePlatform.config.partner_code %>">
+</script>

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

@@ -1,10 +1,15 @@
-<script src="<%= payment_method.javascript_sdk_url(order: @order) %>"></script>
+<%= render partial: "solidus_paypal_commerce_platform/shared/javascript_sdk_tag", locals: {payment_method: payment_method} %>
 
 <div id="paypal-button-container"></div>
+
+<div data-pp-message data-pp-placement="payment" data-pp-amount="<%= @order.total %>"></div>
+
 <input type="hidden" name="payment_source[<%= payment_method.id %>][paypal_order_id]" id="payments_source_paypal_order_id">
 <input type="hidden" name="payment_source[<%= payment_method.id %>][paypal_email]" id="payments_source_paypal_email">
 
 <script>
+  Spree.current_order_id = "<%= @order.number %>"
+  Spree.current_order_token = "<%= @order.guest_token %>"
   $( document ).ready(function() {
     SolidusPaypalCommercePlatform.renderButton("<%= payment_method.id %>",<%= raw payment_method.button_style.to_json %>)
   })

data/lib/views/frontend/spree/orders/payment/_paypal_commerce_platform.html.erb

@@ -1,9 +1,10 @@
 <div style="margin-left:auto;margin-right:auto;width:50%;margin-top:20px;">
-  <script src="<%= payment_method.javascript_sdk_url(order: @order) %>">
-  </script>
+  <%= render partial: "solidus_paypal_commerce_platform/shared/javascript_sdk_tag", locals: {payment_method: payment_method} %>
 
   <div id="paypal-button-container"></div>
 
+  <div data-pp-message data-pp-placement="cart" data-pp-amount="<%= @order.total %>"></div>
+
   <script>
     Spree.current_order_id = "<%= @order.number %>"
     Spree.current_order_token = "<%= @order.guest_token %>"

data/lib/views/frontend/spree/products/payment/_paypal_commerce_platform.html.erb

@@ -1,9 +1,10 @@
 <div style="margin-top:20px;">
-  <script src="<%= payment_method.javascript_sdk_url %>">
-  </script>
+  <%= render partial: "solidus_paypal_commerce_platform/shared/javascript_sdk_tag", locals: {payment_method: payment_method} %>
 
   <div id="paypal-button-container"></div>
 
+  <div data-pp-message data-pp-placement="product" data-pp-amount="<%= @product.price %>"></div>
+
   <script>
     SolidusPaypalCommercePlatform.checkout_url = "<%= checkout_url %>"
     $( document ).ready(function() {

data/solidus_paypal_commerce_platform.gemspec

@@ -9,14 +9,14 @@ Gem::Specification.new do |spec|
   spec.email = 'contact@solidus.io'
 
   spec.summary = 'Integrate Solidus with Paypal Commerce Platform'
-  spec.homepage = 'https://github.com/solidusio-contrib/solidus_paypal_commerce_platform#readme'
+  spec.homepage = 'https://github.com/solidusio-contrib/solidus_paypal_commerce_platform'
   spec.license = 'BSD-3-Clause'
 
   spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/solidusio-contrib/solidus_paypal_commerce_platform#readme'
+  spec.metadata['source_code_uri'] = 'https://github.com/solidusio-contrib/solidus_paypal_commerce_platform'
   spec.metadata['changelog_uri'] = 'https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/releases'
 
-  spec.required_ruby_version = Gem::Requirement.new('~> 2.5')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5')
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -29,12 +29,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'deface', '~> 1.5'
-  spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 3']
-  spec.add_dependency 'solidus_support', '~> 0.5'
-  spec.add_dependency 'solidus_webhooks', '~> 0.2.0'
+  spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 4']
+  spec.add_dependency 'solidus_support', [">= 0.8.0", "< 1"]
+  spec.add_dependency 'solidus_webhooks', '~> 0.2'
 
   spec.add_dependency 'paypal-checkout-sdk'
 
   spec.add_development_dependency 'cuprite'
-  spec.add_development_dependency 'solidus_dev_support'
+  spec.add_development_dependency 'solidus_dev_support', '~> 2.1'
 end

data/spec/features/frontend/cart_spec.rb

@@ -16,22 +16,30 @@ RSpec.describe "Cart page" do
       )
     end
 
-    def paypal_script_options
-      script_tag_url = URI(page.find('script[src*="sdk/js?"]', visible: false)[:src])
-      script_tag_url.query.split('&')
-    end
+    context "when generating a script tag" do
+      it "generates a url with the correct credentials attached" do
+        visit '/cart'
+        expect(js_sdk_script_query).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
+      end
 
-    it "generate a js file with the correct credentials and intent attached" do
-      visit '/cart'
-      expect(paypal_script_options).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
-    end
+      it "generates a partner_id attribute with the correct partner code attached" do
+        visit '/cart'
+        expect(js_sdk_script_partner_id).to eq("Solidus_PCP_SP")
+      end
 
-    context "when auto-capture is set to true" do
-      it "generate a js file with intent capture" do
-        paypal_payment_method.update(auto_capture: true)
+      it "generates a URL with the correct currency" do
+        allow(order).to receive(:currency).and_return "EUR"
         visit '/cart'
-        expect(paypal_script_options).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
-        expect(paypal_script_options).to include("intent=capture")
+        expect(js_sdk_script_query).to include("currency=EUR")
+      end
+
+      context "when auto-capture is set to true" do
+        it "generates a url with intent capture" do
+          paypal_payment_method.update(auto_capture: true)
+          visit '/cart'
+          expect(js_sdk_script_query).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
+          expect(js_sdk_script_query).to include("intent=capture")
+        end
       end
     end
   end

data/spec/features/frontend/checkout_spec.rb

@@ -17,22 +17,30 @@ RSpec.describe "Checkout" do
       )
     end
 
-    def paypal_script_options
-      script_tag_url = URI(page.find('script[src*="sdk/js?"]', visible: false)[:src])
-      script_tag_url.query.split('&')
-    end
+    context "when generating a script tag" do
+      it "generates a url with the correct credentials attached" do
+        visit '/checkout/payment'
+        expect(js_sdk_script_query).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
+      end
 
-    it "generates a js file with the correct credentials and intent attached" do
-      visit '/checkout/payment'
-      expect(paypal_script_options).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
-    end
+      it "generates a partner_id attribute with the correct partner code attached" do
+        visit '/checkout/payment'
+        expect(js_sdk_script_partner_id).to eq("Solidus_PCP_SP")
+      end
 
-    context "when auto-capture is set to true" do
-      it "generates a js file with intent capture" do
-        paypal_payment_method.update(auto_capture: true)
+      it "generates a URL with the correct currency" do
+        allow(order).to receive(:currency).and_return "EUR"
         visit '/checkout/payment'
-        expect(paypal_script_options).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
-        expect(paypal_script_options).to include("intent=capture")
+        expect(js_sdk_script_query).to include("currency=EUR")
+      end
+
+      context "when auto-capture is set to true" do
+        it "generates a url with intent capture" do
+          paypal_payment_method.update(auto_capture: true)
+          visit '/checkout/payment'
+          expect(js_sdk_script_query).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
+          expect(js_sdk_script_query).to include("intent=capture")
+        end
       end
     end
 

data/spec/features/frontend/product_spec.rb

@@ -12,29 +12,37 @@ RSpec.describe "Product page", js: true do
       paypal_payment_method
     end
 
-    def paypal_script_options
-      script_tag_url = URI(page.find('script[src*="sdk/js?"]', visible: false)[:src])
-      script_tag_url.query.split('&')
-    end
+    context "when generating a script tag" do
+      it "generates a url with the correct credentials attached" do
+        visit "/products/#{product.slug}"
+        expect(js_sdk_script_query).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
+      end
 
-    it "generates a js file with the correct credentials and intent attached" do
-      visit '/products/' + product.slug
-      expect(paypal_script_options).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
-    end
+      it "generates a partner_id attribute with the correct partner code attached" do
+        visit "/products/#{product.slug}"
+        expect(js_sdk_script_partner_id).to eq("Solidus_PCP_SP")
+      end
+
+      it "generates a URL with the correct currency" do
+        allow_any_instance_of(SolidusPaypalCommercePlatform::PricingOptions).to receive(:currency).and_return "EUR"
+        visit "/products/#{product.slug}"
+        expect(js_sdk_script_query).to include("currency=EUR")
+      end
 
-    context "when auto-capture is set to true" do
-      it "generates a js file with intent capture" do
-        paypal_payment_method.update(auto_capture: true)
-        visit '/products/' + product.slug
-        expect(paypal_script_options).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
-        expect(paypal_script_options).to include("intent=capture")
+      context "when auto-capture is set to true" do
+        it "generates a url with intent capture" do
+          paypal_payment_method.update(auto_capture: true)
+          visit "/products/#{product.slug}"
+          expect(js_sdk_script_query).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
+          expect(js_sdk_script_query).to include("intent=capture")
+        end
       end
     end
 
     describe "order creation" do
       before do
         allow_any_instance_of(Spree::Core::ControllerHelpers::Store).to receive(:current_store) { store }
-        visit '/products/' + product.slug
+        visit "/products/#{product.slug}"
 
         # Stubbing out paypal methods since their JS doesn't load in correctly on tests
         page.execute_script("paypal = {}")