solidus_paypal_commerce_platform 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9978b8449f0f9ae68173743517e3b4c1316a590e9407fff1768eeef0b3a087a2
-  data.tar.gz: 3fc6310b89a972b8950917e2ead0b23144e262d536f8465a9d2096ca51ec967b
+  metadata.gz: e33941522d8f8b2364c0ff2d374034c9dd4fb1e097902945ef39646ba5c1010a
+  data.tar.gz: 661106b06c08efb525dc3e869646f4ece38cabf4a92a895b923066f234d8dfd6
 SHA512:
-  metadata.gz: 4d17b5204087cc10c13db4dc384cb7b961e37c50d13e775f05e4d7531e454be94798a072274b36e4b30557a1e58c2afe9671e035d7a50a8d7c7160845aa224e4
-  data.tar.gz: 0df8558dd967fd6c8c62157a35f7b17809bb92cdbf5d8cfca5d622c34faef779f54bda2b61eb46a8ede1932db91f6a4b63fe7e6dde6b58c7f08d0edd29986d5c
+  metadata.gz: 007ff9cf231887d503172920a7585a832f3a109cab7557f72eaeb2f8493bc1c54dcac442ad2ba7c2c881b6bc71e7ac23dc5ece0a47290fc0af96d471812bb4b6
+  data.tar.gz: 25e7205d4bfa71b754660dab04ca2f627bbbab92d7ee8a751243aeae13df318ebe017139a024484411921c94d92974a0690e862cfdcb16ff6a1f73ac1d57cc98

data/.github/stale.yml

@@ -1,17 +1,17 @@
 # Number of days of inactivity before an issue becomes stale
 daysUntilStale: 60
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
+daysUntilClose: false
 # Issues with these labels will never be considered stale
 exemptLabels:
   - pinned
   - security
 # Label to use when marking an issue as stale
-staleLabel: wontfix
+staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
   This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
+  recent activity. It might be closed if no further activity occurs. Thank you
   for your contributions.
 # Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
+closeComment: false

data/.github_changelog_generator

@@ -0,0 +1,2 @@
+issues=false
+exclude-labels=infrastructure

data/.rubocop.yml

@@ -2,6 +2,7 @@ require:
   - solidus_dev_support/rubocop
 
 AllCops:
+  NewCops: enable
   Exclude:
     - sandbox/**/*
     - spec/dummy/**/*
@@ -62,17 +63,3 @@ Rails/Inquiry:
   Enabled: true
   Exclude:
     - spec/lib/solidus_paypal_commerce_platform/configuration_spec.rb
-
-# New cops (2020-09-03)
-
-Rails/ActiveRecordCallbacksOrder: {Enabled: true}
-Rails/FindById: {Enabled: true}
-Rails/MailerName: {Enabled: true}
-Rails/MatchRoute: {Enabled: true}
-Rails/NegateInclude: {Enabled: true}
-Rails/Pluck: {Enabled: true}
-Rails/PluckInWhere: {Enabled: true}
-Rails/RenderInline: {Enabled: true}
-Rails/RenderPlainText: {Enabled: true}
-Rails/ShortI18n: {Enabled: true}
-Rails/WhereExists: {Enabled: true}

data/CHANGELOG.md

@@ -0,0 +1,96 @@
+# Changelog
+
+## [Unreleased](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/tree/HEAD)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/compare/v0.1.0...HEAD)
+
+**Merged pull requests:**
+
+- Add PayPal messaging component [\#102](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/102) ([seand7565](https://github.com/seand7565))
+- Add partner ID attribute to SDK javascript tag [\#101](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/101) ([seand7565](https://github.com/seand7565))
+- Set current\_order\_id and token during payment step [\#100](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/100) ([MFRWDesign](https://github.com/MFRWDesign))
+- Remove incorrect/unclear info from README [\#98](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/98) ([seand7565](https://github.com/seand7565))
+- Update the extension with the latest solidus\_dev\_support defaults [\#95](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/95) ([elia](https://github.com/elia))
+- Add skip migration option to installer [\#94](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/94) ([seand7565](https://github.com/seand7565))
+- Update README to reflect referral fee [\#93](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/93) ([seand7565](https://github.com/seand7565))
+
+## [v0.1.0](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/tree/v0.1.0) (2020-09-03)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/compare/v0.0.1...v0.1.0)
+
+**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))
+
+## [v0.0.1](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/tree/v0.0.1) (2020-08-10)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/compare/11111204cc53e8bcfd365ae70506c07940446b0c...v0.0.1)
+
+**Implemented enhancements:**
+
+- 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))
+- Add response object to API calls to PayPal [\#30](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/30) ([seand7565](https://github.com/seand7565))
+
+**Fixed bugs:**
+
+- 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))
+
+**Merged pull requests:**
+
+- 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))
+- Cleanup [\#81](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/81) ([elia](https://github.com/elia))
+- Send line\_item and shipping promotions to PayPal [\#80](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/80) ([seand7565](https://github.com/seand7565))
+- Change outstanding\_balance to total in order total checker [\#79](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/79) ([seand7565](https://github.com/seand7565))
+- Add overlay to ease transition to confirmation page [\#78](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/78) ([seand7565](https://github.com/seand7565))
+- Default available\_to\_users to true [\#77](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/77) ([seand7565](https://github.com/seand7565))
+- Add info about PayPal Terminal to README [\#76](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/76) ([seand7565](https://github.com/seand7565))
+- Return a payment declined error on the frontend [\#74](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/74) ([seand7565](https://github.com/seand7565))
+- Only use the necessary data to let the spec pass [\#73](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/73) ([elia](https://github.com/elia))
+- Display capture\_id instead of order\_id to admin user [\#72](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/72) ([seand7565](https://github.com/seand7565))
+- Use options instead of preferences [\#67](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/67) ([seand7565](https://github.com/seand7565))
+- Update README to reflect new preferences [\#66](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/66) ([seand7565](https://github.com/seand7565))
+- Add version to cache\_key [\#65](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/65) ([seand7565](https://github.com/seand7565))
+- Include payment method information in pricing options cache key [\#62](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/62) ([seand7565](https://github.com/seand7565))
+- Only use available payment\_methods [\#61](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/61) ([seand7565](https://github.com/seand7565))
+- Explicitly require deface [\#60](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/60) ([elia](https://github.com/elia))
+- Verify email address is verified before allowing payment method to be available [\#59](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/59) ([seand7565](https://github.com/seand7565))
+- Use the ORB definition of lint-code [\#58](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/58) ([elia](https://github.com/elia))
+- Send amount of payment to PayPal on capture [\#56](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/56) ([seand7565](https://github.com/seand7565))
+- Verify amount to charge with order total [\#55](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/55) ([seand7565](https://github.com/seand7565))
+- Linting the project with rubocop [\#53](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/53) ([elia](https://github.com/elia))
+- Add PayPal Debug ID to log entries [\#52](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/52) ([seand7565](https://github.com/seand7565))
+- Fix PayPal request success message en.yml paths [\#51](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/51) ([seand7565](https://github.com/seand7565))
+- Add configuration options to SolidusPaypalCommercePlatform [\#50](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/50) ([seand7565](https://github.com/seand7565))
+- Add PayPal button to product page [\#45](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/45) ([seand7565](https://github.com/seand7565))
+- Add PayPal Button To Cart Page [\#43](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/43) ([seand7565](https://github.com/seand7565))
+- Add ability to change address on PayPal [\#42](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/42) ([seand7565](https://github.com/seand7565))
+- Add a basic codecov config to show commit status [\#41](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/41) ([elia](https://github.com/elia))
+- Add CI & Coverage badges to the readme [\#40](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/40) ([elia](https://github.com/elia))
+- Rely on sdk request classes [\#39](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/39) ([elia](https://github.com/elia))
+- Use "commit=false" in the JS SDK url when "confirm" step is present [\#33](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/33) ([elia](https://github.com/elia))
+- Renames: Gateway → PaymentMethod / Requests → Gateway [\#32](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/32) ([elia](https://github.com/elia))
+- Add PayPal Virtual Terminal notice to backend [\#25](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/25) ([seand7565](https://github.com/seand7565))
+- Add missing partials necessary for backend [\#24](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/24) ([seand7565](https://github.com/seand7565))
+- Add the ability to void authorized payments [\#23](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/23) ([seand7565](https://github.com/seand7565))
+- Fix order controller response [\#22](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/22) ([seand7565](https://github.com/seand7565))
+- Add refund ability to admin payment management [\#21](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/21) ([seand7565](https://github.com/seand7565))
+- Fixes and refactoring [\#20](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/20) ([elia](https://github.com/elia))
+- Add ability for admin users to customize paypal button [\#16](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/16) ([seand7565](https://github.com/seand7565))
+- Restore the generic bin/rails command [\#11](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/11) ([elia](https://github.com/elia))
+- Add PayPal buttons to frontend checkout flow [\#10](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/10) ([seand7565](https://github.com/seand7565))
+- Update readme to reflect onboarding and wizards 🧙 [\#4](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/4) ([seand7565](https://github.com/seand7565))
+- Add setup wizard for paypal commerce platform [\#3](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/3) ([seand7565](https://github.com/seand7565))
+- Add paypal\_commerce\_platform as a payment method [\#2](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/2) ([seand7565](https://github.com/seand7565))
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/README.md

@@ -16,8 +16,7 @@ gem 'solidus_paypal_commerce_platform'
 Bundle your dependencies and run the installation generator:
 
 ```shell
-bundle
-bundle exec rails g solidus_paypal_commerce_platform:install
+bin/rails generate solidus_paypal_commerce_platform:install
 ```
 
 ### PayPal Sandbox/Live Environment
@@ -26,26 +25,6 @@ This extension will automatically select a PayPal environment based on Rails env
 
 If you want to override these values you can either set `SolidusPaypalCommercePlatform.config.env` to `"live"` or `"sandbox"` inside an initializer. Or, alternatively, you can set the `PAYPAL_ENV` environment variable to one of the same two values.
 
-### Custom PartnerID & PartnerClientID
-
-You can declare your PayPal Partner-ID and Partner-Client-ID as environment
-variables or set their values directly on `SolidusPaypalCommercePlatform.config`
-or by using the configuration method detailed in the Customization section.
-
-#### Use ENV variables
-
-```shell
-export PAYPAL_PARTNER_ID="xxxxxxxxxxKG2"
-export PAYPAL_PARTNER_CLIENT_ID="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-xxxxxxxxxxxxxxxxxxxxxxxxxVSX"
-```
-
-#### Set them directly
-
-```ruby
-SolidusPaypalCommercePlatform.config.partner_id = "xxxxxxxxxxKG2"
-SolidusPaypalCommercePlatform.config.partner_client_id = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-xxxxxxxxxxxxxxxxxxxxxxxxxVSX"
-```
-
 ## Address Phone Number Validation
 
 Since PayPal is being used as the checkout if the user checks out on the product or cart page, and PayPal doesn't collect phone numbers, this extension disables phone number required validation for `Spree::Address`. To turn phone number validation back on, you'll need to either:
@@ -73,7 +52,6 @@ Spree::Config.configure do |config|
       test_mode: !Rails.env.production?,
       client_id: ENV['PAYPAL_CLIENT_ID'],
       client_secret: ENV['PAYPAL_CLIENT_SECRET'],
-      paypal_email_confirmed: true,
       display_on_product_page: true,
       display_on_cart: true,
     }
@@ -172,7 +150,7 @@ the sandbox app is `./sandbox` and `bin/rails` will forward any Rails commands t
 
 Here's an example:
 
-```shell
+```
 $ bin/rails server
 => Booting Puma
 => Rails 6.0.2.1 application starting in development
@@ -180,14 +158,33 @@ $ bin/rails server
 Use Ctrl-C to stop
 ```
 
+### Updating the changelog
+
+Before and after releases the changelog should be updated to reflect the up-to-date status of
+the project:
+
+```shell
+bin/rake changelog
+git add CHANGELOG.md
+git commit -m "Update the changelog"
+```
+
 ### Releasing new versions
 
 Your new extension version can be released using `gem-release` like this:
 
 ```shell
-bundle exec gem bump -v VERSION --tag --push --remote origin && gem release
+bundle exec gem bump -v 1.6.0
+bin/rake changelog
+git commit -a --amend
+git push
+bundle exec gem release
 ```
 
+## Referral Fee
+
+By using this extension, you are giving back to Solidus. PayPal will pay a fee to the maintainers ([Nebulab](https://nebulab.it)) for each order made through the payment gateway.
+
 ## License
 
 Copyright (c) 2020 Nebulab srls, released under the New BSD License

data/app/controllers/solidus_paypal_commerce_platform/orders_controller.rb

@@ -64,10 +64,12 @@ module SolidusPaypalCommercePlatform
         ],
         recipient: [
           :email_address,
-          name: [
-            :given_name,
-            :surname,
-          ]
+          {
+            name: [
+              :given_name,
+              :surname,
+            ]
+          }
         ]
       )
     end

data/app/models/solidus_paypal_commerce_platform/payment_method.rb

@@ -11,6 +11,7 @@ module SolidusPaypalCommercePlatform
     preference :paypal_button_layout, :paypal_select, default: "vertical"
     preference :display_on_cart, :boolean, default: true
     preference :display_on_product_page, :boolean, default: true
+    preference :display_credit_messaging, :boolean, default: true
 
     def partial_name
       "paypal_commerce_platform"
@@ -67,6 +68,7 @@ module SolidusPaypalCommercePlatform
         'client-id': client_id,
         intent: auto_capture ? "capture" : "authorize",
         commit: commit_immediately ? "false" : "true",
+        components: options[:display_credit_messaging] ? "buttons,messages" : "buttons",
       }
 
       "https://www.paypal.com/sdk/js?#{parameters.to_query}"

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.2.0'
 end

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

@@ -0,0 +1,4 @@
+<script 
+  src="<%= payment_method.javascript_sdk_url(order: @order) %>" 
+  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,11 +9,11 @@ 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')
@@ -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'
+  spec.add_development_dependency 'solidus_dev_support', '~> 2.1'
 end

data/spec/features/frontend/cart_spec.rb

@@ -16,22 +16,24 @@ 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
-
-    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
+    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
 
-    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 partner_id attribute with the correct partner code attached" do
         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_partner_id).to eq("Solidus_PCP_SP")
+      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,24 @@ 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
-
-    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
+    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
 
-    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 partner_id attribute with the correct partner code attached" do
         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_partner_id).to eq("Solidus_PCP_SP")
+      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,31 @@ 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
 
-    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 = {}")

data/spec/lib/solidus_paypal_commerce_platform/configuration_spec.rb

@@ -82,4 +82,10 @@ RSpec.describe SolidusPaypalCommercePlatform::Configuration do
       expect(subject.state_guesser_class).to eq(SolidusPaypalCommercePlatform::BetterStateGuesser)
     end
   end
+
+  describe "#partner_code" do
+    it "returns the correct code" do
+      expect(subject.partner_code).to eq("Solidus_PCP_SP")
+    end
+  end
 end

data/spec/models/solidus_paypal_commerce_platform/payment_method_spec.rb

@@ -92,6 +92,25 @@ RSpec.describe SolidusPaypalCommercePlatform::PaymentMethod, type: :model do
         expect(url.query.split("&")).to include("commit=true")
       end
     end
+
+    context 'when messaging is turned on' do
+      let(:order) { instance_double(Spree::Order, checkout_steps: { "foo" => "bar" }) }
+
+      it 'includes messaging component' do
+        paypal_payment_method.preferences.update(display_credit_messaging: true)
+        expect(url.query.split("&")).to include("components=buttons%2Cmessages")
+      end
+    end
+
+    context 'when messaging is turned off' do
+      let(:order) { instance_double(Spree::Order, checkout_steps: { "foo" => "bar" }) }
+
+      it 'only includes buttons components' do
+        paypal_payment_method.preferences.update(display_credit_messaging: false)
+        expect(url.query.split("&")).not_to include("messages")
+        expect(url.query.split("&")).to include("components=buttons")
+      end
+    end
   end
 
   private

data/spec/spec_helper.rb

@@ -19,8 +19,8 @@ require 'spree/testing_support/order_walkthrough'
 # in spec/support/ and its subdirectories.
 Dir["#{__dir__}/support/**/*.rb"].sort.each { |f| require f }
 
-# Requires factories defined in lib/solidus_paypal_commerce_platform/factories.rb
-require 'solidus_paypal_commerce_platform/factories'
+# Requires factories defined in lib/solidus_paypal_commerce_platform/testing_support/factories.rb
+require 'solidus_paypal_commerce_platform/testing_support/factories'
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!

data/spec/support/paypal_sdk_script_tag_helper.rb

@@ -0,0 +1,13 @@
+module PaypalSdkScriptTagHelper
+  def js_sdk_script_query
+    URI(page.find('script[src*="sdk/js?"]', visible: false)[:src]).query.split('&')
+  end
+
+  def js_sdk_script_partner_id
+    page.find('script[src*="sdk/js?"]', visible: false)['data-partner-attribution-id']
+  end
+end
+
+RSpec.configure do |config|
+  config.include PaypalSdkScriptTagHelper, type: :feature
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_paypal_commerce_platform
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sean Denny
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -105,16 +105,16 @@ dependencies:
   name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 description:
 email: contact@solidus.io
 executables: []
@@ -124,9 +124,11 @@ files:
 - ".circleci/config.yml"
 - ".gem_release.yml"
 - ".github/stale.yml"
+- ".github_changelog_generator"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -179,13 +181,14 @@ files:
 - config/routes.rb
 - db/migrate/20200521190038_add_paypal_commerce_platform_sources.rb
 - lib/generators/solidus_paypal_commerce_platform/install/install_generator.rb
+- lib/generators/solidus_paypal_commerce_platform/install/templates/initializer.rb
 - lib/solidus_paypal_commerce_platform.rb
 - lib/solidus_paypal_commerce_platform/access_token_authorization_request.rb
 - lib/solidus_paypal_commerce_platform/client.rb
 - lib/solidus_paypal_commerce_platform/configuration.rb
 - lib/solidus_paypal_commerce_platform/engine.rb
-- lib/solidus_paypal_commerce_platform/factories.rb
 - lib/solidus_paypal_commerce_platform/fetch_merchant_credentials_request.rb
+- lib/solidus_paypal_commerce_platform/testing_support/factories.rb
 - lib/solidus_paypal_commerce_platform/version.rb
 - lib/views/api/spree/api/payments/source_views/_paypal_commerce_platform.json.jbuilder
 - lib/views/backend/spree/admin/payments/source_forms/_paypal_commerce_platform.html.erb
@@ -194,6 +197,7 @@ files:
 - lib/views/frontend/solidus_paypal_commerce_platform/cart/_cart_buttons.html.erb
 - lib/views/frontend/solidus_paypal_commerce_platform/payments/_payment.html.erb
 - lib/views/frontend/solidus_paypal_commerce_platform/product/_product_buttons.html.erb
+- lib/views/frontend/solidus_paypal_commerce_platform/shared/_javascript_sdk_tag.html.erb
 - lib/views/frontend/spree/checkout/payment/_paypal_commerce_platform.html.erb
 - lib/views/frontend/spree/orders/payment/_paypal_commerce_platform.html.erb
 - lib/views/frontend/spree/products/payment/_paypal_commerce_platform.html.erb
@@ -223,12 +227,13 @@ files:
 - spec/requests/solidus_paypal_commerce_platform/wizard_controller_spec.rb
 - spec/spec_helper.rb
 - spec/support/capybara.rb
-homepage: https://github.com/solidusio-contrib/solidus_paypal_commerce_platform#readme
+- spec/support/paypal_sdk_script_tag_helper.rb
+homepage: https://github.com/solidusio-contrib/solidus_paypal_commerce_platform
 licenses:
 - BSD-3-Clause
 metadata:
-  homepage_uri: https://github.com/solidusio-contrib/solidus_paypal_commerce_platform#readme
-  source_code_uri: https://github.com/solidusio-contrib/solidus_paypal_commerce_platform#readme
+  homepage_uri: https://github.com/solidusio-contrib/solidus_paypal_commerce_platform
+  source_code_uri: https://github.com/solidusio-contrib/solidus_paypal_commerce_platform
   changelog_uri: https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/releases
 post_install_message:
 rdoc_options: []
@@ -275,3 +280,4 @@ test_files:
 - spec/requests/solidus_paypal_commerce_platform/wizard_controller_spec.rb
 - spec/spec_helper.rb
 - spec/support/capybara.rb
+- spec/support/paypal_sdk_script_tag_helper.rb