solidus_paypal_commerce_platform 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83bafb3733936d20e66b9f930f5c503ab68ca026f8c7e74b864af8664199e60f
-  data.tar.gz: 9861750ba0a1c6e699cdaac965153c5a2879f641b4a851c776c90221b3f1ccae
+  metadata.gz: f0a234ec6a201a2b7e7a4f9e3c65359c70acaea23995134f7de9513a96530fc4
+  data.tar.gz: b94786018f9da41a5e5915db8c87b87c2eaa767580e8739c11ae472fb248d782
 SHA512:
-  metadata.gz: 582c3af98a3247f8d6ff6408f98076d24079952ddf9b59e9fd7828b83f00314b50757cb518e39039b306ec9b084e7d2bba2ff58f673541ed1c8e98abb28c038a
-  data.tar.gz: a435d9d574cefe7eac61c5387fc225f868fe9a96ff54d35a29df4f1453144591ac4f936d905f527512b13a8ce787e5cd0778fbe5b487e347d7072667c7ff1ca6
+  metadata.gz: 825f4bcff61bbb9ff666391607dc657383d67b2635454375bc12df1a8bef1c02e2cff334b0474ce53dd9d7e04c4d8885dcc9a85ccb729d31a641ab5b9ccaa84c
+  data.tar.gz: 7589bcb66e13a57e5154227ef9212b209177f1a3f76338c67c852ca837c9df60670e8ce1730153b7121db364034f191170f59d95a863b563663ba47fcfde6b35

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2020 Nebulab srls
+Copyright (c) 2021 Nebulab srls
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/app/models/solidus_paypal_commerce_platform/payment_method.rb

@@ -72,6 +72,8 @@ module SolidusPaypalCommercePlatform
         currency: currency
       }
 
+      parameters[:shipping_preference] = 'NO_SHIPPING' if step_names.exclude? 'delivery'
+
       "https://www.paypal.com/sdk/js?#{parameters.to_query}"
     end
   end

data/app/models/solidus_paypal_commerce_platform/paypal_order.rb

@@ -44,10 +44,19 @@ module SolidusPaypalCommercePlatform
     end
 
     def name(address)
-      {
-        given_name: address.firstname,
-        surname: address.lastname
-      }
+      if greater_than_2_10?
+        name = ::Spree::Address::Name.new @order.ship_address.name
+
+        {
+          given_name: name.first_name,
+          surname: name.last_name
+        }
+      else
+        {
+          given_name: address.firstname,
+          surname: address.lastname
+        }
+      end
     end
 
     def purchase_units(include_shipping_address: true)
@@ -63,13 +72,21 @@ module SolidusPaypalCommercePlatform
     def shipping_info
       {
         name: {
-          full_name: @order.ship_address.full_name
+          full_name: full_name,
         },
         email_address: @order.email,
         address: get_address(@order.ship_address)
       }
     end
 
+    def full_name
+      if greater_than_2_10?
+        @order.ship_address.name
+      else
+        @order.ship_address.full_name
+      end
+    end
+
     def line_items
       @order.line_items.map{ |line_item|
         {
@@ -103,5 +120,9 @@ module SolidusPaypalCommercePlatform
         value: amount
       }
     end
+
+    def greater_than_2_10?
+      ::Spree.solidus_gem_version >= Gem::Version.new('2.11')
+    end
   end
 end

data/bin/sandbox

@@ -67,7 +67,7 @@ unbundled bundle install --gemfile Gemfile
 
 unbundled bundle exec rake db:drop db:create
 
-unbundled bundle exec rails generate spree:install \
+unbundled bundle exec rails generate solidus:install \
   --auto-accept \
   --user_class=Spree::User \
   --enforce_available_locales=true \

data/lib/solidus_paypal_commerce_platform/configuration.rb

@@ -39,7 +39,7 @@ module SolidusPaypalCommercePlatform
     end
 
     def default_env
-      return ENV['PAYPAL_ENV'] if ENV['PAYPAL_ENV']
+      return ENV['PAYPAL_ENV'] if ENV['PAYPAL_ENV'] # rubocop:disable Rails/EnvironmentVariableAccess
 
       case Rails.env
       when 'production'
@@ -60,11 +60,11 @@ module SolidusPaypalCommercePlatform
     end
 
     def partner_id
-      @partner_id ||= ENV['PAYPAL_PARTNER_ID'] || DEFAULT_PARTNER_ID[env.to_sym]
+      @partner_id ||= ENV['PAYPAL_PARTNER_ID'] || DEFAULT_PARTNER_ID[env.to_sym] # rubocop:disable Rails/EnvironmentVariableAccess
     end
 
     def partner_client_id
-      @partner_client_id ||= ENV['PAYPAL_PARTNER_CLIENT_ID'] || DEFAULT_PARTNER_CLIENT_ID[env.to_sym]
+      @partner_client_id ||= ENV['PAYPAL_PARTNER_CLIENT_ID'] || DEFAULT_PARTNER_CLIENT_ID[env.to_sym] # rubocop:disable Rails/EnvironmentVariableAccess
     end
 
     def partner_code

data/lib/solidus_paypal_commerce_platform/engine.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 require 'deface'
-require 'spree/core'
+require 'solidus_core'
 require 'solidus_paypal_commerce_platform'
 require 'solidus_webhooks'
+require 'solidus_support'
 
 module SolidusPaypalCommercePlatform
   class Engine < Rails::Engine

data/lib/solidus_paypal_commerce_platform/version.rb

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

data/solidus_paypal_commerce_platform.gemspec

@@ -36,5 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'paypal-checkout-sdk'
 
   spec.add_development_dependency 'cuprite'
-  spec.add_development_dependency 'solidus_dev_support', '~> 2.1'
+  spec.add_development_dependency 'solidus_dev_support', '~> 2.5'
 end

data/spec/models/solidus_paypal_commerce_platform/payment_method_spec.rb

@@ -93,6 +93,14 @@ RSpec.describe SolidusPaypalCommercePlatform::PaymentMethod, type: :model do
       end
     end
 
+    context 'when checkout_steps does not include "delivery"' do
+      let(:order) { instance_double(Spree::Order, checkout_steps: { "foo" => "bar" }) }
+
+      it 'disables autocommit' do
+        expect(url.query.split("&")).to include("shipping_preference=NO_SHIPPING")
+      end
+    end
+
     context 'when messaging is turned on' do
       let(:order) { instance_double(Spree::Order, checkout_steps: { "foo" => "bar" }) }
 

data/spec/models/solidus_paypal_commerce_platform/paypal_order_spec.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe SolidusPaypalCommercePlatform::PaypalOrder, type: :model do
+  describe '#to_json' do
+    subject(:to_json) { described_class.new(order).to_json('intent') }
+
+    let(:order) { create(:order_ready_to_complete) }
+
+    it { expect { to_json }.not_to raise_error }
+
+    if Spree.solidus_gem_version >= Gem::Version.new('2.11')
+      it 'returns the name of the user' do
+        expect(to_json).to match hash_including(
+          purchase_units: array_including(
+            hash_including(shipping: hash_including(name: { full_name: 'John Von Doe' }))
+          ),
+          payer: hash_including(name: { given_name: 'John', surname: 'Von Doe' })
+        )
+      end
+    else
+      it 'returns the name and surname of the user' do
+        expect(to_json).to match hash_including(
+          purchase_units: array_including(
+            hash_including(shipping: hash_including(name: { full_name: 'John' }))
+          ),
+          payer: hash_including(name: { given_name: 'John', surname: nil })
+        )
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_paypal_commerce_platform
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Sean Denny
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-20 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -113,14 +113,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.5'
 description:
 email: contact@solidus.io
 executables: []
@@ -226,6 +226,7 @@ files:
 - spec/models/solidus_paypal_commerce_platform/payment_method_spec.rb
 - spec/models/solidus_paypal_commerce_platform/payment_source_spec.rb
 - spec/models/solidus_paypal_commerce_platform/paypal_address_spec.rb
+- spec/models/solidus_paypal_commerce_platform/paypal_order_spec.rb
 - spec/models/solidus_paypal_commerce_platform/state_guesser_spec.rb
 - spec/models/solidus_paypal_commerce_platform/wizard_spec.rb
 - spec/requests/solidus_paypal_commerce_platform/orders_controller_spec.rb
@@ -279,6 +280,7 @@ test_files:
 - spec/models/solidus_paypal_commerce_platform/payment_method_spec.rb
 - spec/models/solidus_paypal_commerce_platform/payment_source_spec.rb
 - spec/models/solidus_paypal_commerce_platform/paypal_address_spec.rb
+- spec/models/solidus_paypal_commerce_platform/paypal_order_spec.rb
 - spec/models/solidus_paypal_commerce_platform/state_guesser_spec.rb
 - spec/models/solidus_paypal_commerce_platform/wizard_spec.rb
 - spec/requests/solidus_paypal_commerce_platform/orders_controller_spec.rb