solidus_paypal_commerce_platform 0.2.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e33941522d8f8b2364c0ff2d374034c9dd4fb1e097902945ef39646ba5c1010a
-  data.tar.gz: 661106b06c08efb525dc3e869646f4ece38cabf4a92a895b923066f234d8dfd6
+  metadata.gz: f0a234ec6a201a2b7e7a4f9e3c65359c70acaea23995134f7de9513a96530fc4
+  data.tar.gz: b94786018f9da41a5e5915db8c87b87c2eaa767580e8739c11ae472fb248d782
 SHA512:
-  metadata.gz: 007ff9cf231887d503172920a7585a832f3a109cab7557f72eaeb2f8493bc1c54dcac442ad2ba7c2c881b6bc71e7ac23dc5ece0a47290fc0af96d471812bb4b6
-  data.tar.gz: 25e7205d4bfa71b754660dab04ca2f627bbbab92d7ee8a751243aeae13df318ebe017139a024484411921c94d92974a0690e862cfdcb16ff6a1f73ac1d57cc98
+  metadata.gz: 825f4bcff61bbb9ff666391607dc657383d67b2635454375bc12df1a8bef1c02e2cff334b0474ce53dd9d7e04c4d8885dcc9a85ccb729d31a641ab5b9ccaa84c
+  data.tar.gz: 7589bcb66e13a57e5154227ef9212b209177f1a3f76338c67c852ca837c9df60670e8ce1730153b7121db364034f191170f59d95a863b563663ba47fcfde6b35

data/.rubocop.yml

@@ -43,6 +43,10 @@ RSpec/VerifiedDoubles:
   # Sometimes you really need an "anything" double
   IgnoreSymbolicNames: true
 
+Rspec/Naming/VariableNumber:
+  # PayPal uses snake_case, we use normal_case ¯\_(ツ)_/¯
+  Enabled: false
+
 Style/FrozenStringLiteralComment:
   Exclude:
     - spec/**/*

data/CHANGELOG.md

@@ -1,8 +1,62 @@
 # Changelog
 
-## [Unreleased](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/tree/HEAD)
+## [v0.3.0](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/tree/v0.3.0) (2021-03-16)
 
-[Full Changelog](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/compare/v0.1.0...HEAD)
+[Full Changelog](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/compare/v0.2.2...v0.3.0)
+
+**Closed issues:**
+
+- Prepare Solidus Paypal Commerce Platform for Solidus 3.0 [\#115](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/115)
+
+**Merged pull requests:**
+
+- Use new factories loading method [\#118](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/118) ([kennyadsl](https://github.com/kennyadsl))
+- Update extension for Solidus 3.0 [\#117](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/117) ([seand7565](https://github.com/seand7565))
+
+## [v0.2.2](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/tree/v0.2.2) (2020-11-20)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/compare/v0.2.1...v0.2.2)
+
+**Implemented enhancements:**
+
+- Make the PayPal messaging component a bit more modular [\#112](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/112)
+- Implement and QA Paypal credit solutions [\#99](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/99)
+
+**Closed issues:**
+
+- Simulated Address Info in Live Order [\#104](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/104)
+
+**Merged pull requests:**
+
+- Relax SolidusWebhooks dependency [\#114](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/114) ([kennyadsl](https://github.com/kennyadsl))
+- Add information about paypal credit messaging to readme [\#113](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/113) ([seand7565](https://github.com/seand7565))
+
+## [v0.2.1](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/tree/v0.2.1) (2020-11-09)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/compare/v0.2.0...v0.2.1)
+
+**Closed issues:**
+
+- There was a problem connecting with paypal.  [\#107](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/107)
+- Bad Request \(400\) when opening PayPal Payment Popup \(eg clicking Pay with PayPal during checkout\) [\#103](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/103)
+
+**Merged pull requests:**
+
+- Move and rename address decorator [\#111](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/111) ([seand7565](https://github.com/seand7565))
+- Constrain solidus\_support to 0.5.1 or greater [\#110](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/110) ([seand7565](https://github.com/seand7565))
+- Add currency to PayPal SDK URL [\#108](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/108) ([seand7565](https://github.com/seand7565))
+- Update specs to comply with new rubocop regulations [\#106](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/106) ([seand7565](https://github.com/seand7565))
+- Add address only to initial PayPal request [\#105](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/105) ([seand7565](https://github.com/seand7565))
+
+## [v0.2.0](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/tree/v0.2.0) (2020-10-13)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/compare/v0.1.0...v0.2.0)
+
+**Closed issues:**
+
+- README lists two different types of PayPal credentials [\#97](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/97)
+- `paypal\_email\_confirmed` is not an actual preference [\#96](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/96)
+- Make this extension the default option for Solidus [\#88](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/88)
 
 **Merged pull requests:**
 
@@ -21,7 +75,6 @@
 **Merged pull requests:**
 
 - Temporarily switch from apparition to cuprite [\#92](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/92) ([elia](https://github.com/elia))
-- Update links after moving the repo to solidusio-contrib [\#91](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/91) ([elia](https://github.com/elia))
 - Add a configurable state\_guesser class to guess states [\#90](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/90) ([seand7565](https://github.com/seand7565))
 - Add better error handling to button\_actions.js [\#89](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/89) ([seand7565](https://github.com/seand7565))
 
@@ -31,6 +84,8 @@
 
 **Implemented enhancements:**
 
+- Frontend users should be able to check out using PayPal [\#6](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/6)
+- Admin users should be able to style the PayPal buttons on the payment\_method show page [\#5](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/5)
 - Webhooks [\#83](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/83) ([elia](https://github.com/elia))
 - Display paypal email to customer on confirmation [\#54](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/54) ([seand7565](https://github.com/seand7565))
 - Use an env accessor to control live/sandbox urls and classes [\#31](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/31) ([elia](https://github.com/elia))
@@ -38,12 +93,42 @@
 
 **Fixed bugs:**
 
+- Users can check out with invalid payment [\#19](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/19)
 - Have different nonce for every click of the wizard button [\#87](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/87) ([elia](https://github.com/elia))
 - Correctly communicate errors when updating shipping rates [\#86](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/86) ([elia](https://github.com/elia))
 - Add deface to deps [\#57](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/57) ([elia](https://github.com/elia))
 
+**Closed issues:**
+
+- Add something to the README about backend payments [\#75](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/75)
+- Explore enabling the payment method by default [\#71](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/71)
+- Explore subscribing to webhooks [\#70](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/70)
+- We're using the wrong ID for paypal\_order\_id [\#69](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/69)
+- Handle instrument declined errors [\#68](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/68)
+- Extend lightbox during customer payment [\#63](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/63)
+- Add this extension to demo store for integration team walkthrough [\#49](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/49)
+- Store PayPal Debug ID [\#48](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/48)
+- PayPal email address needs to be included on the confirm step [\#47](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/47)
+- Digital goods should be set as not requiring shipment [\#46](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/46)
+- Allow checkout on product/cart page to complete the order [\#44](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/44)
+- PayPal uses different states than Solidus for some countries [\#38](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/38)
+- Validate amount charged with PayPal [\#37](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/37)
+- Allow order simulator to be a configurable class [\#36](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/36)
+- Admin users have the option to edit payment amount [\#29](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/29)
+- Add PayPal button to product page [\#27](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/27)
+- Add PayPal button to cart page [\#26](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/26)
+- Add `commit=false` to javascript SDK URL [\#18](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/18)
+- Explore using Rails secrets to encode and decrypt PayPal client id and secret [\#17](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/17)
+- Backend users should be able to checkout & admin payments [\#15](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/15)
+- Change static sandbox URL and objects to dynamic [\#14](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/14)
+- PayPal response address change [\#13](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/13)
+- Ensure the email is verified before activating the payment method [\#9](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/9)
+- Add a URL generator for the PayPal JS SDK [\#8](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/8)
+- Allow users to onboard with PayPal [\#1](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/1)
+
 **Merged pull requests:**
 
+- Update links after moving the repo to solidusio-contrib [\#91](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/91) ([elia](https://github.com/elia))
 - Use live partner ids [\#85](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/85) ([elia](https://github.com/elia))
 - Update README to account for checkouts without a confirmation step [\#84](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/84) ([seand7565](https://github.com/seand7565))
 - Replace order simulator with something simpler [\#82](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/82) ([seand7565](https://github.com/seand7565))

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/README.md

@@ -71,6 +71,10 @@ When you return to your app, your payment method should be set up and ready to g
 A confirmed email is required to get paid by PayPal. You'll need to check `Paypal Email Confirmed` on your new
 payment method before being able to select `Available To Users`.
 
+### Messaging Component
+
+PayPal offers a messaging component that displays credit messaging to the user. You can find more information [here.](https://www.paypal.com/us/webapps/mpp/on-site-messaging) This messaging is enabled by default on all pages that use the paypal payment buttons, but can be disabled via preferences. PayPal recommends that this messaging be displayed near product or order totals, so please keep that in mind during implementation.
+
 ## Wizards
 
 This gem adds support for payment method wizards to be set up. Payment wizards can be used to automatically set up

data/app/controllers/solidus_paypal_commerce_platform/orders_controller.rb

@@ -11,7 +11,8 @@ module SolidusPaypalCommercePlatform
 
       @order = ::Spree::Order.create!(
         user: try_spree_current_user,
-        store: current_store
+        store: current_store,
+        currency: current_pricing_options.currency
       )
 
       if @order.contents.update_cart order_params

data/app/decorators/models/solidus_paypal_commerce_platform/spree/address_decorator.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module SolidusPaypalCommercePlatform
+  module Spree
+    module AddressDecorator
+      # PayPal doesn't use the phone number, so in cases where the user checks out via
+      # PayPal, this field will be unpopulated. If you want to require phone numbers,
+      # you'll need to turn off cart & product page displays on the payment method edit
+      # page.
+      def require_phone?
+        super && false
+      end
+
+      ::Spree::Address.prepend self
+    end
+  end
+end

data/app/jobs/solidus_paypal_commerce_platform/webhook_job.rb

@@ -6,15 +6,15 @@ module SolidusPaypalCommercePlatform
       case payload["resource_type"]
       when "checkout-order"
         payment_source = PaymentSource.find_by!(paypal_order_id: payload.dig("resource", "id"))
-        payment = Spree::Payment.where(source: payment_source).last!
+        payment = ::Spree::Payment.where(source: payment_source).last!
         payment.log_entries.create!(details: payload.to_yaml)
       when "capture"
         payment_source = PaymentSource.find_by!(capture_id: payload.dig("resource", "id"))
-        payment = Spree::Payment.where(source: payment_source).last!
+        payment = ::Spree::Payment.where(source: payment_source).last!
         payment.log_entries.create!(details: payload.to_yaml)
       when "refund"
         payment_source = PaymentSource.find_by!(refund_id: payload.dig("resource", "id"))
-        payment = Spree::Payment.where(source: payment_source).last!
+        payment = ::Spree::Payment.where(source: payment_source).last!
         payment.log_entries.create!(details: payload.to_yaml)
       end
     end

data/app/models/solidus_paypal_commerce_platform/payment_method.rb

@@ -58,7 +58,7 @@ module SolidusPaypalCommercePlatform
       }
     end
 
-    def javascript_sdk_url(order: nil)
+    def javascript_sdk_url(order: nil, currency: nil)
       # Both instance and class respond to checkout_steps.
       step_names = order ? order.checkout_steps : ::Spree::Order.checkout_steps.keys
 
@@ -69,8 +69,11 @@ module SolidusPaypalCommercePlatform
         intent: auto_capture ? "capture" : "authorize",
         commit: commit_immediately ? "false" : "true",
         components: options[:display_credit_messaging] ? "buttons,messages" : "buttons",
+        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_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
 
@@ -44,18 +44,27 @@ 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
+    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
@@ -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/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

@@ -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.2.0'
+  VERSION = '0.3.2'
 end

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

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

data/solidus_paypal_commerce_platform.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   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', '~> 2.1'
+  spec.add_development_dependency 'solidus_dev_support', '~> 2.5'
 end

data/spec/features/frontend/cart_spec.rb

@@ -27,6 +27,12 @@ RSpec.describe "Cart page" do
         expect(js_sdk_script_partner_id).to eq("Solidus_PCP_SP")
       end
 
+      it "generates a URL with the correct currency" do
+        allow(order).to receive(:currency).and_return "EUR"
+        visit '/cart'
+        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)

data/spec/features/frontend/checkout_spec.rb

@@ -28,6 +28,12 @@ RSpec.describe "Checkout" do
         expect(js_sdk_script_partner_id).to eq("Solidus_PCP_SP")
       end
 
+      it "generates a URL with the correct currency" do
+        allow(order).to receive(:currency).and_return "EUR"
+        visit '/checkout/payment'
+        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)

data/spec/features/frontend/product_spec.rb

@@ -23,6 +23,12 @@ RSpec.describe "Product page", js: true do
         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 url with intent capture" do
           paypal_payment_method.update(auto_capture: true)

data/spec/lib/solidus_paypal_commerce_platform/client_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe SolidusPaypalCommercePlatform::Client do
     let(:status_code) { 201 }
 
     it 'forwards to the upstream client adding i18n response messages' do
-      expect_any_instance_of(PayPal::PayPalHttpClient)
+      allow_any_instance_of(PayPal::PayPalHttpClient)
         .to receive(:execute).with(paypal_request).and_return(paypal_response)
 
       response = subject.execute_with_response(paypal_request)

data/spec/lib/solidus_paypal_commerce_platform/configuration_spec.rb

@@ -12,16 +12,16 @@ RSpec.describe SolidusPaypalCommercePlatform::Configuration do
     it "falls back to Rails.env if ENV['PAYPAL_ENV'] is not set" do
       expect(ENV).to receive(:[]).with("PAYPAL_ENV").and_return(nil).at_least(:once)
 
-      expect(Rails).to receive(:env).and_return("development".inquiry)
+      allow(Rails).to receive(:env).and_return("development".inquiry)
       expect(subject.default_env).to eq("sandbox")
 
-      expect(Rails).to receive(:env).and_return("test".inquiry)
+      allow(Rails).to receive(:env).and_return("test".inquiry)
       expect(subject.default_env).to eq("sandbox")
 
-      expect(Rails).to receive(:env).and_return("production".inquiry)
+      allow(Rails).to receive(:env).and_return("production".inquiry)
       expect(subject.default_env).to eq("live")
 
-      expect(Rails).to receive(:env).and_return("staging".inquiry)
+      allow(Rails).to receive(:env).and_return("staging".inquiry)
       expect{ subject.default_env }.to raise_error(described_class::InvalidEnvironment)
     end
   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_address_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 RSpec.describe SolidusPaypalCommercePlatform::PaypalAddress, type: :model do
   let(:order) { create(:order) }
   let(:original_address) { create(:address) }
-  let(:address) { create(:address) }
+  let(:address) { create(:address, name_attributes) }
   let(:params) {
     {
       updated_address: {
@@ -16,8 +16,8 @@ RSpec.describe SolidusPaypalCommercePlatform::PaypalAddress, type: :model do
       },
       recipient: {
         name: {
-          given_name: address.firstname,
-          surname: address.lastname
+          given_name: "Alexander",
+          surname: "Hamilton"
         }
       }
     }
@@ -37,8 +37,12 @@ RSpec.describe SolidusPaypalCommercePlatform::PaypalAddress, type: :model do
       expect(subject.address2).to eq address.address2
       expect(subject.zipcode).to eq address.zipcode
       expect(subject.country).to eq address.country
-      expect(subject.firstname).to eq address.firstname
-      expect(subject.lastname).to eq address.lastname
+      if SolidusSupport.combined_first_and_last_name_in_address?
+        expect(subject.name).to eq address.name
+      else
+        expect(subject.firstname).to eq address.firstname
+        expect(subject.lastname).to eq address.lastname
+      end
       expect(subject.phone).to eq original_address.phone
     end
 
@@ -52,4 +56,12 @@ RSpec.describe SolidusPaypalCommercePlatform::PaypalAddress, type: :model do
       end
     end
   end
+
+  def name_attributes
+    if SolidusSupport.combined_first_and_last_name_in_address?
+      { name: "Alexander Hamilton" }
+    else
+      { firstname: "Alexander", lastname: "Hamilton" }
+    end
+  end
 end

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

data/spec/requests/solidus_paypal_commerce_platform/orders_controller_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe SolidusPaypalCommercePlatform::OrdersController, type: :request d
 
         get solidus_paypal_commerce_platform.verify_total_path, params: params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_http_status(:ok)
       end
     end
 
@@ -29,7 +29,7 @@ RSpec.describe SolidusPaypalCommercePlatform::OrdersController, type: :request d
 
         get solidus_paypal_commerce_platform.verify_total_path, params: params
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_http_status(:bad_request)
       end
     end
   end

data/spec/requests/solidus_paypal_commerce_platform/shipping_rates_controller_spec.rb

@@ -23,9 +23,9 @@ RSpec.describe SolidusPaypalCommercePlatform::ShippingRatesController, type: :re
       }
     end
 
-    it "returns a paypal_order with the new address" do
-      expect(response.body).to include new_address.state.abbr
-      expect(response.body).not_to include order.ship_address.state.abbr
+    it "returns a paypal_order without the simulated address" do
+      expect(response.body).not_to include "admin_area_1\":\"#{new_address.state.abbr}\""
+      expect(response.body).not_to include "admin_area_1\":\"#{order.ship_address.state.abbr}\""
     end
 
     it "does not modify original address" do

data/spec/requests/solidus_paypal_commerce_platform/wizard_controller_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe SolidusPaypalCommercePlatform::WizardController, type: :request d
 
       expect(payment_method.preferred_client_id).to eq("CLIENT-ID")
       expect(payment_method.preferred_client_secret).to eq("CLIENT-SECRET")
-      expect(response).to have_http_status(201)
+      expect(response).to have_http_status(:created)
     end
   end
 end

data/spec/spec_helper.rb

@@ -20,7 +20,7 @@ require 'spree/testing_support/order_walkthrough'
 Dir["#{__dir__}/support/**/*.rb"].sort.each { |f| require f }
 
 # Requires factories defined in lib/solidus_paypal_commerce_platform/testing_support/factories.rb
-require 'solidus_paypal_commerce_platform/testing_support/factories'
+SolidusDevSupport::TestingSupport::Factories.load_for(SolidusPaypalCommercePlatform::Engine)
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_paypal_commerce_platform
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Sean Denny
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -34,7 +34,7 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,35 +44,41 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: solidus_webhooks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: paypal-checkout-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -107,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: []
@@ -147,7 +153,7 @@ files:
 - app/controllers/solidus_paypal_commerce_platform/paypal_orders_controller.rb
 - app/controllers/solidus_paypal_commerce_platform/shipping_rates_controller.rb
 - app/controllers/solidus_paypal_commerce_platform/wizard_controller.rb
-- app/decorators/solidus_paypal_commerce_platform/remove_required_phone_from_address.rb
+- app/decorators/models/solidus_paypal_commerce_platform/spree/address_decorator.rb
 - app/helpers/solidus_paypal_commerce_platform/button_options_helper.rb
 - app/jobs/solidus_paypal_commerce_platform/application_job.rb
 - app/jobs/solidus_paypal_commerce_platform/webhook_job.rb
@@ -220,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
@@ -241,7 +248,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -250,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Integrate Solidus with Paypal Commerce Platform
@@ -273,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

data/app/decorators/solidus_paypal_commerce_platform/remove_required_phone_from_address.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module RemoveRequiredPhoneFromAddress
-  # PayPal doesn't use the phone number, so in cases where the user checks out via
-  # PayPal, this field will be unpopulated. If you want to require phone numbers,
-  # you'll need to turn off cart & product page displays on the payment method edit
-  # page.
-  def require_phone?
-    super && false
-  end
-
-  ::Spree::Address.prepend self
-end