solidus_paypal_commerce_platform 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e33941522d8f8b2364c0ff2d374034c9dd4fb1e097902945ef39646ba5c1010a
-  data.tar.gz: 661106b06c08efb525dc3e869646f4ece38cabf4a92a895b923066f234d8dfd6
+  metadata.gz: 779847e688c91abf5ee4a98964d82b04023ffe9f76942e6496931b46400e5a01
+  data.tar.gz: d544f13ab4f42442259769e8fc2fac803404cc65a7bd12d63e7b0063aee949e3
 SHA512:
-  metadata.gz: 007ff9cf231887d503172920a7585a832f3a109cab7557f72eaeb2f8493bc1c54dcac442ad2ba7c2c881b6bc71e7ac23dc5ece0a47290fc0af96d471812bb4b6
-  data.tar.gz: 25e7205d4bfa71b754660dab04ca2f627bbbab92d7ee8a751243aeae13df318ebe017139a024484411921c94d92974a0690e862cfdcb16ff6a1f73ac1d57cc98
+  metadata.gz: ce32213a28c24dec07afd333855cc662364b8349e96c4438cec4e49842cfd08dc9c0714dc7de6b35a73f3dd3ea8afb92e19dfcd36e4f15f98af88cb5064d81c3
+  data.tar.gz: c6a4c2f4aae95fe12110c47fe16479e485835702e3f334f472458b7192268e6969fd515b1222408d8287c4af2c25014afaafdc61482811fd43dc96ea9a2fbaa6

data/CHANGELOG.md

@@ -1,8 +1,31 @@
 # Changelog
 
-## [Unreleased](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/tree/HEAD)
+## [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.1.0...HEAD)
+[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:**
 
@@ -31,6 +54,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,10 +63,39 @@
 
 **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:**
 
 - Use live partner ids [\#85](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/85) ([elia](https://github.com/elia))

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,6 +69,7 @@ module SolidusPaypalCommercePlatform
         intent: auto_capture ? "capture" : "authorize",
         commit: commit_immediately ? "false" : "true",
         components: options[:display_credit_messaging] ? "buttons,messages" : "buttons",
+        currency: currency
       }
 
       "https://www.paypal.com/sdk/js?#{parameters.to_query}"

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/lib/solidus_paypal_commerce_platform/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusPaypalCommercePlatform
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 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

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   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_support', [">= 0.5.1", "< 1"]
   spec.add_dependency 'solidus_webhooks', '~> 0.2.0'
 
   spec.add_dependency 'paypal-checkout-sdk'

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/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

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.2.1
 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: 2020-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -49,16 +49,22 @@ dependencies:
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: solidus_webhooks
   requirement: !ruby/object:Gem::Requirement
@@ -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

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