solidus_paypal_commerce_platform 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aae67f5e5c8af750b1f887d988b383dfa5ea5f9eb4fea2e3e3560a9179b63842
-  data.tar.gz: 0ad40e286a533be1433f73b83c3ed012f7887c5d3eae5ffa036298a8c465930c
+  metadata.gz: b2d50512fee899487beba77fee503dd0dfe94f4b4b6dc842fa4598c6fb243623
+  data.tar.gz: '0444833a634b9afadcda2125d9b965964832e31fcf6365f013121ad6a4b42945'
 SHA512:
-  metadata.gz: a773acc2923435a1765a8c7e2fa6508ef54011455fe4694df163b8a403a8446a8ee6b400c4fea8a1a0c56496db1b1e6fdbf662e83ad114076e9ea33cabe424e0
-  data.tar.gz: 61b973cfb34095b9913d0aded13a6510af224718c8a7094117c54e158c249b1f232e0ac3d26c116e4efadb873e3baf758f692302d12eb149822cfb8e056ea317
+  metadata.gz: d41a23f1448ee2633da0af85607432a657bfc3853c58b4a4ed8a65226023c10f2e0ff2eaa9b021a08a108e4f7dd5a938fe66cb1e23d17cc8e35f1a23adbab231
+  data.tar.gz: fb6dc9b34cc7363cc028925601bd10448a9c78ee1588fcc4483a8f4d26abd7db9a30e7329da7c89df5bc28e02187c42fa20826d2825e2185d99e92e40ab69954

data/.circleci/config.yml

@@ -1,6 +1,8 @@
 version: 2.1
 
 orbs:
+  browser-tools: circleci/browser-tools@1.1
+
   # Always take the latest version of the orb, this allows us to
   # run specs against Solidus supported versions only without the need
   # to change this configuration every time a Solidus version is released
@@ -11,10 +13,12 @@ jobs:
   run-specs-with-postgres:
     executor: solidusio_extensions/postgres
     steps:
+      - browser-tools/install-browser-tools
       - solidusio_extensions/run-tests
   run-specs-with-mysql:
     executor: solidusio_extensions/mysql
     steps:
+      - browser-tools/install-browser-tools
       - solidusio_extensions/run-tests
   lint-code:
     executor: solidusio_extensions/sqlite-memory

data/.rubocop.yml

@@ -14,6 +14,10 @@ Layout/FirstArgumentIndentation:
 Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
+Naming/VariableNumber:
+  # PayPal uses snake_case, we use normal_case ¯\_(ツ)_/¯
+  Enabled: false
+
 # We use this extensively, the alternatives are not viable or desirable.
 RSpec/AnyInstance:
   Enabled: false
@@ -43,10 +47,6 @@ 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,5 +1,49 @@
 # Changelog
 
+## [v0.4.0](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/tree/v0.4.0) (2022-06-02)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/compare/v0.3.2...v0.4.0)
+
+**Closed issues:**
+
+- Gem has RuboCop warnings [\#144](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/144)
+- Silent Failure In JS [\#130](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/130)
+- Not Applying Sales Tax [\#126](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/126)
+
+**Merged pull requests:**
+
+- Fix Rails 7 autoloading issues with SolidusPaypalCommercePlatform [\#156](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/156) ([gsmendoza](https://github.com/gsmendoza))
+- Block \#capture on Pending Payments" [\#155](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/155) ([Naokimi](https://github.com/Naokimi))
+- Block \#capture on PayPal PENDING Payments [\#154](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/154) ([Naokimi](https://github.com/Naokimi))
+- Change Venmo integration to use Venmo standalone [\#151](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/151) ([RyanofWoods](https://github.com/RyanofWoods))
+- Allow enable\_venmo preference to have default Venmo behaviour [\#148](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/148) ([RyanofWoods](https://github.com/RyanofWoods))
+- Fix RuboCop warnings [\#147](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/147) ([RyanofWoods](https://github.com/RyanofWoods))
+- Revert "Allow Ruby 3" [\#146](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/146) ([RyanofWoods](https://github.com/RyanofWoods))
+- Add Venmo as payment option [\#138](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/138) ([RyanofWoods](https://github.com/RyanofWoods))
+- Wizard\#logo use `image_path` over `image_url`. [\#131](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/131) ([essn](https://github.com/essn))
+
+## [v0.3.2](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/tree/v0.3.2) (2021-05-11)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/compare/v0.3.1...v0.3.2)
+
+**Closed issues:**
+
+- Unable To Cancel An Order [\#120](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/120)
+
+**Merged pull requests:**
+
+- Update solidus using solidus\_dev\_support [\#124](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/124) ([DanielePalombo](https://github.com/DanielePalombo))
+- Add NO\_SHIPPING to shipping preference [\#123](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/123) ([DanielePalombo](https://github.com/DanielePalombo))
+- Support solidus 3.0 [\#122](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/122) ([DanielePalombo](https://github.com/DanielePalombo))
+
+## [v0.3.1](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/tree/v0.3.1) (2021-04-20)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/compare/v0.3.0...v0.3.1)
+
+**Merged pull requests:**
+
+- Allow Solidus 3 [\#121](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/121) ([kennyadsl](https://github.com/kennyadsl))
+
 ## [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.2.2...v0.3.0)
@@ -55,7 +99,7 @@
 **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)
+- `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:**
@@ -75,6 +119,7 @@
 **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))
 
@@ -128,7 +173,6 @@
 
 **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/Gemfile

@@ -9,12 +9,12 @@ gem 'solidus', github: 'solidusio/solidus', branch: branch
 # Needed to help Bundler figure out how to resolve dependencies,
 # otherwise it takes forever to resolve them.
 # See https://github.com/bundler/bundler/issues/6677
-gem 'rails', '>0.a'
+gem 'rails', ENV.fetch('RAILS_VERSION', '>0.a')
 
 # Provides basic authentication functionality for testing parts of your engine
 gem 'solidus_auth_devise'
 
-case ENV['DB']
+case ENV.fetch('DB', nil)
 when 'mysql'
   gem 'mysql2'
 when 'postgresql'

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

@@ -120,6 +120,25 @@ With product and cart page checkout, the user is directed to the checkout confir
 
 PayPals API does not allow for admin-side payments. Instead, backend users taking payments for customers will need to use the PayPal Virtual Terminal to take payments. [More info is available on the PayPal website.](https://www.paypal.com/merchantapps/appcenter/acceptpayments/virtualterminal?locale.x=en_US)
 
+## Venmo
+Venmo is currently available to US merchants and buyers. There are also other [prequisites](https://developer.paypal.com/docs/business/checkout/pay-with-venmo/#eligibility).
+
+If the transaction supports Venmo and it is enabled by the following, then a button should appear for it on checkout payment page. Note, Venmo cannot currently be rendered on the product or cart pages.
+
+Set the PaypalCommercePlatform `PaymentMethod` `venmo_standalone` preference to:
+- `render only standalone`, show Venmo on the payment page and do not show the other funding sources (i.e. PayPal, Credit); or
+- `enabled`, show Venmo on the payment page; or
+- `disabled` (default), do not show the Venmo button.
+
+See more about preferences([Configuration](#configuration)) below.
+
+[_As Venmo is only available in the US, you may want to mock your location for testing_](#mocking-your-buyer-country)
+
+## Configuration
+The easiest way to change the `Payment Method`'s preferences is through admin: `Settings > Payments > "PayPal Commerce Platform" > Edit`.
+
+See more about preferences [here](https://guides.solidus.io/developers/preferences/add-model-preferences.html#access-your-preferences)/
+
 ## Development
 
 ### Testing the extension
@@ -162,6 +181,12 @@ $ bin/rails server
 Use Ctrl-C to stop
 ```
 
+### Mocking your buyer country
+PayPal normally looks at your IP geolocation to see where you are located to determine what funding sources are available to you. For example, Venmo is currently only available to US buyers.
+Because of this, you may want to pretend you are from US check that that Venmo is correctly integrated for these customers. To do this, set the payment method's preference of `force_buyer_country` to "US". See more information about preferences above.
+
+This preference has no effect on production.
+
 ### Updating the changelog
 
 Before and after releases the changelog should be updated to reflect the up-to-date status of

data/app/assets/javascripts/spree/frontend/solidus_paypal_commerce_platform/button_actions.js

@@ -84,6 +84,7 @@ SolidusPaypalCommercePlatform.approveOrder = function(data, actions) {
       SolidusPaypalCommercePlatform.verifyTotal(response.purchase_units[0].amount.value).then(function(){
         $("#payments_source_paypal_order_id").val(data.orderID)
         $("#payments_source_paypal_email").val(response.payer.email_address)
+        $("#payments_source_paypal_funding_source").val(SolidusPaypalCommercePlatform.fundingSource)
         $("#checkout_form_payment").submit()
       })
     })
@@ -168,7 +169,8 @@ SolidusPaypalCommercePlatform.addPayment = function(paypal_amount, payment_metho
         payment_method_id: payment_method_id,
         source_attributes: {
           paypal_order_id: data.orderID,
-          paypal_email: email
+          paypal_email: email,
+          paypal_funding_source: SolidusPaypalCommercePlatform.fundingSource
         }
       }
     },

data/app/assets/javascripts/spree/frontend/solidus_paypal_commerce_platform/buttons.js

@@ -2,6 +2,7 @@ SolidusPaypalCommercePlatform.renderButton = function(payment_method_id, style)
   paypal.Buttons({
     style: style,
     createOrder: SolidusPaypalCommercePlatform.sendOrder.bind(null, payment_method_id),
+    onClick: (data) => { SolidusPaypalCommercePlatform.fundingSource = data.fundingSource },
     onApprove: SolidusPaypalCommercePlatform.approveOrder,
     onShippingChange: SolidusPaypalCommercePlatform.shippingChange,
     onError: SolidusPaypalCommercePlatform.handleError
@@ -12,6 +13,7 @@ SolidusPaypalCommercePlatform.renderCartButton = function(payment_method_id, sty
   paypal.Buttons({
     style: style,
     createOrder: SolidusPaypalCommercePlatform.sendOrder.bind(null, payment_method_id),
+    onClick: (data) => { SolidusPaypalCommercePlatform.fundingSource = data.fundingSource },
     onApprove: SolidusPaypalCommercePlatform.finalizeOrder.bind(null, payment_method_id),
     onShippingChange: SolidusPaypalCommercePlatform.shippingChange,
     onError: SolidusPaypalCommercePlatform.handleError
@@ -22,8 +24,20 @@ SolidusPaypalCommercePlatform.renderProductButton = function(payment_method_id,
   paypal.Buttons({
     style: style,
     createOrder: SolidusPaypalCommercePlatform.createAndSendOrder.bind(null, payment_method_id),
+    onClick: (data) => { SolidusPaypalCommercePlatform.fundingSource = data.fundingSource },
     onApprove: SolidusPaypalCommercePlatform.finalizeOrder.bind(null, payment_method_id),
     onShippingChange: SolidusPaypalCommercePlatform.shippingChange,
     onError: SolidusPaypalCommercePlatform.handleError
   }).render('#paypal-button-container')
 }
+
+SolidusPaypalCommercePlatform.renderVenmoStandalone = function(payment_method_id, style) {
+  paypal.Buttons({
+    style: style,
+    fundingSource: paypal.FUNDING.VENMO,
+    createOrder: SolidusPaypalCommercePlatform.sendOrder.bind(null, payment_method_id),
+    onClick: () => { SolidusPaypalCommercePlatform.fundingSource = paypal.FUNDING.VENMO },
+    onApprove: SolidusPaypalCommercePlatform.approveOrder,
+    onError: SolidusPaypalCommercePlatform.handleError
+  }).render('#paypal-button-container')
+}

data/app/controllers/solidus_paypal_commerce_platform/payments_controller.rb

@@ -10,11 +10,13 @@ module SolidusPaypalCommercePlatform
       paypal_order_id = paypal_params[:paypal_order_id]
 
       if !paypal_order_id
-        return redirect_to checkout_state_path(@order.state), notice: "Invalid order confirmation data passed in"
+        return redirect_to checkout_state_path(@order.state),
+          notice: I18n.t("solidus_paypal_commerce_platform.controllers.payments_controller.invalid_paypal_order_id")
       end
 
       if @order.complete?
-        return redirect_to spree.order_path(@order), notice: "Order is already in complete state"
+        return redirect_to spree.order_path(@order),
+          notice: I18n.t("solidus_paypal_commerce_platform.controllers.payments_controller.order_complete")
       end
 
       source = SolidusPaypalCommercePlatform::PaymentSource.new(paypal_order_id: paypal_order_id)

data/app/helpers/solidus_paypal_commerce_platform/button_options_helper.rb

@@ -17,5 +17,9 @@ module SolidusPaypalCommercePlatform
     def preferred_paypal_button_layout_options
       [["Vertical", "vertical"], ["Horizontal", "horizontal"]]
     end
+
+    def preferred_venmo_standalone_options
+      [['Render only standalone', 'render only standalone'], ['Enabled', 'Enabled'], ['Disabled', 'disabled']]
+    end
   end
 end

data/app/models/solidus_paypal_commerce_platform/gateway.rb

@@ -45,7 +45,7 @@ module SolidusPaypalCommercePlatform
       request = AuthorizationsCaptureRequest.new(source.authorization_id)
       request.request_body(amount: { currency_code: options[:currency], value: Money.new(money).dollars })
 
-      response = @client.execute_with_response(request)
+      response = capture_with_response(request)
       if response.success?
         source.update(capture_id: response.params["result"].id)
       end
@@ -83,5 +83,24 @@ module SolidusPaypalCommercePlatform
     def get_order(order_id)
       @client.execute(OrdersGetRequest.new(order_id)).result
     end
+
+    private
+
+    def capture_with_response(request, success_message: nil, failure_message: nil)
+      response = @client.execute(request)
+      if response.result&.status == "PENDING"
+        ActiveMerchant::Billing::Response.new(
+          false,
+          "Payment is awaiting processing on PayPal's side"
+        )
+      else
+        i18n_scope = @client.i18n_scope_for(request)
+        @client.wrap_response(
+          response,
+          success_message: success_message || I18n.t("#{i18n_scope}.success", default: nil),
+          failure_message: failure_message || I18n.t("#{i18n_scope}.failure", default: nil)
+        )
+      end
+    end
   end
 end

data/app/models/solidus_paypal_commerce_platform/payment_method.rb

@@ -12,6 +12,21 @@ module SolidusPaypalCommercePlatform
     preference :display_on_cart, :boolean, default: true
     preference :display_on_product_page, :boolean, default: true
     preference :display_credit_messaging, :boolean, default: true
+    preference :venmo_standalone, :paypal_select, default: 'disabled'
+    preference :force_buyer_country, :string
+
+    validates :preferred_paypal_button_color, exclusion: {
+      in: %w[gold],
+      message: I18n.t("solidus_paypal_commerce_platform.payment_method.gold_button_message")
+    }, if: :venmo_standalone_enabled?
+
+    def venmo_standalone_enabled?
+      options[:venmo_standalone] != 'disabled'
+    end
+
+    def render_only_venmo_standalone?
+      options[:venmo_standalone] == 'render only standalone'
+    end
 
     def partial_name
       "paypal_commerce_platform"
@@ -72,6 +87,13 @@ module SolidusPaypalCommercePlatform
         currency: currency
       }
 
+      parameters[:shipping_preference] = 'NO_SHIPPING' if step_names.exclude? 'delivery'
+      parameters['enable-funding'] = 'venmo' if venmo_standalone_enabled?
+
+      if !Rails.env.production? && options[:force_buyer_country].present?
+        parameters['buyer-country'] = options[:force_buyer_country]
+      end
+
       "https://www.paypal.com/sdk/js?#{parameters.to_query}"
     end
   end

data/app/models/solidus_paypal_commerce_platform/payment_source.rb

@@ -3,8 +3,19 @@
 module SolidusPaypalCommercePlatform
   class PaymentSource < SolidusSupport.payment_source_parent_class
     self.table_name = "paypal_commerce_platform_sources"
+    enum paypal_funding_source: {
+      applepay: 0, bancontact: 1, blik: 2, boleto: 3, card: 4, credit: 5, eps: 6, giropay: 7, ideal: 8,
+      itau: 9, maxima: 10, mercadopago: 11, mybank: 12, oxxo: 13, p24: 14, paylater: 15, paypal: 16, payu: 17,
+      sepa: 18, sofort: 19, trustly: 20, venmo: 21, verkkopankki: 22, wechatpay: 23, zimpler: 24
+    }, _suffix: :funding
     validates :paypal_order_id, :payment_method_id, presence: true
 
+    def display_paypal_funding_source
+      I18n.t(paypal_funding_source,
+        scope: 'solidus_paypal_commerce_platform.paypal_funding_sources',
+        default: paypal_funding_source)
+    end
+
     def actions
       %w(capture void credit)
     end

data/app/models/solidus_paypal_commerce_platform/paypal_order.rb

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

data/app/models/solidus_paypal_commerce_platform/wizard.rb

@@ -34,7 +34,7 @@ module SolidusPaypalCommercePlatform
     private
 
     def logo
-      ActionController::Base.helpers.image_url(::Spree::Config[:admin_interface_logo])
+      ActionController::Base.helpers.image_path(::Spree::Config[:admin_interface_logo])
     end
   end
 end

data/bin/rails-engine

@@ -7,7 +7,7 @@ ENGINE_PATH = File.expand_path('../lib/solidus_paypal_commerce_platform/engine',
 
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV.fetch('BUNDLE_GEMFILE', nil))
 
 require 'rails/all'
 require 'rails/engine/commands'

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/config/locales/en.yml

@@ -18,9 +18,15 @@ en:
   paypal_capture_id: PayPal Capture ID
   paypal_debug_id: PayPal Debug ID
   paypal_email: PayPal Email
+  paypal_funding: 'PayPal Funding: %{funding}'
+  paypal_funding_source: 'PayPal Funding Source'
   payment_email: "Payment Email: %{email}"
   virtual_terminal_notice_html: Backend Credit Card payments can only be accepted through PayPal via the <a href="https://www.paypal.com/merchantapps/appcenter/acceptpayments/virtualterminal">PayPal Virtual Terminal</a>.
   solidus_paypal_commerce_platform:
+    controllers:
+      payments_controller:
+        invalid_paypal_order_id: "Invalid order confirmation data passed in"
+        order_complete: "Order is already in complete state"
     responses:
       pay_pal_checkout_sdk/orders/orders_capture_request:
         success: "Payment captured"
@@ -34,4 +40,31 @@ en:
         success: "Payment refunded for %{amount}"
       pay_pal_checkout_sdk/payments/authorizations_void_request:
         success: "Payment voided"
-
+    payment_method:
+      gold_button_message: "cannot be 'gold' when Venmo standalone is enabled."
+    paypal_funding_sources:
+      applepay: 'Apple Pay'
+      bancontact: 'Bancontact'
+      blik: 'BLIK'
+      boleto: 'Boleto'
+      card: 'Credit or debit card'
+      credit: 'PayPal Credit'
+      eps: 'eps'
+      giropay: 'giropay'
+      ideal: 'iDEAL'
+      itau: 'Itau'
+      maxima: 'Maxima'
+      mercadopago: 'Mercado Pago'
+      mybank: 'MyBank'
+      oxxo: 'Oxxo'
+      p24: 'Przelewy24'
+      paylater: 'Pay Later'
+      paypal: 'PayPal'
+      payu: 'PayU'
+      sepa: 'SEPA-Lastschrift'
+      sofort: 'Sofort'
+      trustly: 'Trustly'
+      venmo: 'Venmo'
+      verkkopankki: 'Verkkopankki'
+      wechatpay: 'WeChat Pay'
+      zimpler: 'Zimpler'

data/db/migrate/20211220133406_add_paypal_funding_source_to_paypal_commerce_platform_sources.rb

@@ -0,0 +1,5 @@
+class AddPaypalFundingSourceToPaypalCommercePlatformSources < ActiveRecord::Migration[6.1]
+  def change
+    add_column :paypal_commerce_platform_sources, :paypal_funding_source, :integer
+  end
+end

data/lib/solidus_paypal_commerce_platform/client.rb

@@ -13,6 +13,8 @@ module SolidusPaypalCommercePlatform
       request.headers["PayPal-Partner-Attribution-Id"] = SolidusPaypalCommercePlatform.config.partner_code
     }.freeze
 
+    Response = Struct.new(:status_code, :error)
+
     attr_reader :environment
 
     def initialize(client_id:, client_secret: "", test_mode: nil)
@@ -29,7 +31,7 @@ module SolidusPaypalCommercePlatform
       @paypal_client.execute(request)
     rescue PayPalHttp::HttpError => e
       Rails.logger.error e.result
-      OpenStruct.new(status_code: 422, error: e.result)
+      Response.new(status_code: 422, error: e.result)
     end
 
     def execute_with_response(request, success_message: nil, failure_message: nil)
@@ -60,8 +62,6 @@ module SolidusPaypalCommercePlatform
       )).result
     end
 
-    private
-
     def wrap_response(response, success_message: nil, failure_message: nil)
       if SUCCESS_STATUS_CODES.include? response.status_code
         success_message ||= "Success."

data/lib/solidus_paypal_commerce_platform/configuration.rb

@@ -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.fetch('PAYPAL_PARTNER_ID') { DEFAULT_PARTNER_ID[env.to_sym] }
     end
 
     def partner_client_id
-      @partner_client_id ||= ENV['PAYPAL_PARTNER_CLIENT_ID'] || DEFAULT_PARTNER_CLIENT_ID[env.to_sym]
+      @partner_client_id ||= ENV.fetch('PAYPAL_PARTNER_CLIENT_ID') { DEFAULT_PARTNER_CLIENT_ID[env.to_sym] }
     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
@@ -14,9 +15,17 @@ module SolidusPaypalCommercePlatform
     engine_name 'solidus_paypal_commerce_platform'
 
     initializer "solidus_paypal_commerce_platform.add_payment_method", after: "spree.register.payment_methods" do |app|
-      app.config.spree.payment_methods << SolidusPaypalCommercePlatform::PaymentMethod
-      SolidusPaypalCommercePlatform::PaymentMethod.allowed_admin_form_preference_types << :paypal_select
-      Spree::PermittedAttributes.source_attributes.concat [:paypal_order_id, :authorization_id, :paypal_email]
+      app.config.to_prepare do
+        app.config.spree.payment_methods << SolidusPaypalCommercePlatform::PaymentMethod
+
+        unless SolidusPaypalCommercePlatform::PaymentMethod.allowed_admin_form_preference_types.include?(:paypal_select)
+          SolidusPaypalCommercePlatform::PaymentMethod.allowed_admin_form_preference_types << :paypal_select
+        end
+
+        old_source_attributes = ::Spree::PermittedAttributes.source_attributes
+        new_source_attributes = [:paypal_order_id, :authorization_id, :paypal_email, :paypal_funding_source]
+        ::Spree::PermittedAttributes.source_attributes.concat(new_source_attributes - old_source_attributes)
+      end
     end
 
     initializer "solidus_paypal_commerce_platform.add_wizard", after: "spree.register.payment_methods" do |app|

data/lib/solidus_paypal_commerce_platform/testing_support/factories.rb

@@ -7,7 +7,8 @@ FactoryBot.define do
     preferences {
       {
         client_id: SecureRandom.hex(8),
-        client_secret: SecureRandom.hex(10)
+        client_secret: SecureRandom.hex(10),
+        venmo_standalone: 'disabled'
       }
     }
   end

data/lib/solidus_paypal_commerce_platform/version.rb

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

data/lib/views/backend/spree/admin/payments/source_views/_paypal_commerce_platform.html.erb

@@ -12,6 +12,9 @@
 
         <dt><%= I18n.t("paypal_email") %>:</dt>
         <dd><%= payment.source.paypal_email %></dd>
+
+        <dt><%= I18n.t("paypal_funding_source") %>:</dt>
+        <dd><%= payment.source.display_paypal_funding_source %></dd>
       </dl>
     </div>
   </div>

data/lib/views/frontend/solidus_paypal_commerce_platform/payments/_payment.html.erb

@@ -1,3 +1,7 @@
+<% if payment.source.respond_to?(:paypal_funding_source) %>
+  <br />
+  <%= t('paypal_funding', funding: payment.source.display_paypal_funding_source) %>
+<% end %>
 <% if payment.source.respond_to?(:paypal_email) %>
   <br />
   <%= t('payment_email', email: payment.source.paypal_email) %>