solidus_paypal_commerce_platform 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc92be06606fdc11bd65cb76e0121637054956852853f533dc22a0c04234bf31
-  data.tar.gz: 5e6eb3333ceb6590c711a572cce20a49c88ea313d6547612e1ae490766219454
+  metadata.gz: 64ecb1bbe9f5e77a70613976318354d6b0e3011c529e95d410229e31c55c3fb1
+  data.tar.gz: 7d6aae5716b1c2a9aa88a2c843755c0312b7025f5dde7cdd539c5ea7cb059974
 SHA512:
-  metadata.gz: '079cdd57b4e2dc48a17b79e15711b1182d31de5e12b3aa7087590df33ccd6686197c65c7636d48a57213d4fa28cff0c37cd93117eacba1b99818eafbb0ef13c1'
-  data.tar.gz: a66e1b6cfa262c523ab8b95d47bd975a96080b5772f8a032cae2d9fdc449f5723261409b552da351fa48def0b3a35e3049c9f50bf2224abfbe6f18f4efb2cc8b
+  metadata.gz: 532b61e156f5a3cd0ff0eca30e65fcdf7f9e70fdfb0c69f299b2528cf3ed96bd9c08540007bafc19f26e17a1e317067270506f1da986f5e52e38dd757ef62605
+  data.tar.gz: 9e79910413c373e01efd301789b1b3dce257976102c7de3ce61383a1aa3e8f32ac13f1ff54e514263ce0dfdad971e49ef2eddb8d7c59deb360e8b98f3a4c06d6

data/.github/stale.yml

@@ -1,17 +1 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: false
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-# Label to use when marking an issue as stale
-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 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
+_extends: .github

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## [v0.6.0](https://github.com/solidusio/solidus_paypal_commerce_platform/tree/v0.6.0) (2022-11-25)
+
+[Full Changelog](https://github.com/solidusio/solidus_paypal_commerce_platform/compare/v0.6.0...v0.6.0)
+
+**Merged pull requests:**
+
+- More fixes and improvements extracted from SSF support [\#168](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/168) ([elia](https://github.com/elia))
+  * inline the load_order before action
+  * require the payment_method_id param when loading the payment method
+  * mark the javascript_sdk_url as HTML safe
+  * ensure amounts are presented with 2 decimals for the PayPal API
+  * fixed the sign in requests
+- Reorganize the install generator and deprecate `--skip-migrations` [\#167](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/167) ([elia](https://github.com/elia))
+- Move 'shipping\_preference' preference under PaypalOrder\#to\_json [\#152](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/152) ([retsef](https://github.com/retsef))
+- Truncate the product name to 127 characters [\#139](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/139) ([DanielePalombo](https://github.com/DanielePalombo))
+- Fix issue on international transactions [\#129](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/129) ([jtapia](https://github.com/jtapia))
+
+## [v0.6.0](https://github.com/solidusio/solidus_paypal_commerce_platform/tree/v0.6.0) (2022-11-25)
+
+[Full Changelog](https://github.com/solidusio/solidus_paypal_commerce_platform/compare/v0.5.0...v0.6.0)
+
+**Fixed bugs:**
+
+- Gem does not support Ruby 3.0 [\#145](https://github.com/solidusio/solidus_paypal_commerce_platform/issues/145)
+
+**Closed issues:**
+
+- Invalid string length error [\#135](https://github.com/solidusio/solidus_paypal_commerce_platform/issues/135)
+- PayPal SDK JS Error: Disallowed query param: shipping\_preference [\#133](https://github.com/solidusio/solidus_paypal_commerce_platform/issues/133)
+
 ## [v0.5.0](https://github.com/solidusio/solidus_paypal_commerce_platform/tree/v0.5.0) (2022-10-07)
 
 [Full Changelog](https://github.com/solidusio/solidus_paypal_commerce_platform/compare/v0.4.0...v0.5.0)
@@ -7,8 +37,7 @@
 **Merged pull requests:**
 
 - Update links after moving to @solidusio [\#164](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/164) ([elia](https://github.com/elia))
-- Fix assigning API created orders to the current user [\#163](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/163) ([elia](https://github.com/elia))
-- Require Solidus 3 & Ruby 2.7 [\#163](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/163) ([elia](https://github.com/elia))
+- Assign created orders to users / Require Solidus 3 & Ruby 2.7 [\#163](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/163) ([elia](https://github.com/elia))
 - Fix master, import paypal-checkout-sdk [\#161](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/161) ([cpfergus1](https://github.com/cpfergus1))
 - Update to use forked solidus\_frontend when needed [\#160](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/160) ([waiting-for-dev](https://github.com/waiting-for-dev))
 - Fix paypal\_order name address bug [\#153](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/153) ([RyanofWoods](https://github.com/RyanofWoods))
@@ -108,13 +137,7 @@
 
 ## [v0.2.0](https://github.com/solidusio/solidus_paypal_commerce_platform/tree/v0.2.0) (2020-10-13)
 
-[Full Changelog](https://github.com/solidusio/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/solidus_paypal_commerce_platform/issues/97)
-- `paypal_email_confirmed` is not an actual preference [\#96](https://github.com/solidusio/solidus_paypal_commerce_platform/issues/96)
-- Make this extension the default option for Solidus [\#88](https://github.com/solidusio/solidus_paypal_commerce_platform/issues/88)
+[Full Changelog](https://github.com/solidusio/solidus_paypal_commerce_platform/compare/v0.2.0.alpha.1...v0.2.0)
 
 **Merged pull requests:**
 
@@ -126,6 +149,16 @@
 - Add skip migration option to installer [\#94](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/94) ([seand7565](https://github.com/seand7565))
 - Update README to reflect referral fee [\#93](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/93) ([seand7565](https://github.com/seand7565))
 
+## [v0.2.0.alpha.1](https://github.com/solidusio/solidus_paypal_commerce_platform/tree/v0.2.0.alpha.1) (2020-10-07)
+
+[Full Changelog](https://github.com/solidusio/solidus_paypal_commerce_platform/compare/v0.1.0...v0.2.0.alpha.1)
+
+**Closed issues:**
+
+- README lists two different types of PayPal credentials [\#97](https://github.com/solidusio/solidus_paypal_commerce_platform/issues/97)
+- `paypal_email_confirmed` is not an actual preference [\#96](https://github.com/solidusio/solidus_paypal_commerce_platform/issues/96)
+- Make this extension the default option for Solidus [\#88](https://github.com/solidusio/solidus_paypal_commerce_platform/issues/88)
+
 ## [v0.1.0](https://github.com/solidusio/solidus_paypal_commerce_platform/tree/v0.1.0) (2020-09-03)
 
 [Full Changelog](https://github.com/solidusio/solidus_paypal_commerce_platform/compare/v0.0.1...v0.1.0)

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

@@ -7,9 +7,9 @@ SolidusPaypalCommercePlatform.hideOverlay = function() {
 }
 
 SolidusPaypalCommercePlatform.handleError = function(error) {
-  console.log(error.name, error.message)
-  console.log("PayPal Debug ID: " + error.debug_id)
+  console.error(error);
   alert("There was a problem connecting with PayPal.")
+  throw error
 }
 
 SolidusPaypalCommercePlatform.sendOrder = function(payment_method_id) {
@@ -181,8 +181,11 @@ SolidusPaypalCommercePlatform.addPayment = function(paypal_amount, payment_metho
   })
 }
 
-SolidusPaypalCommercePlatform.updateAddress = function(response) { 
-  var updated_address = response.purchase_units[0].shipping.address
+SolidusPaypalCommercePlatform.updateAddress = function(response) {
+  var shipping = response.purchase_units[0].shipping;
+  if (!shipping) return Promise.resolve({});
+
+  var updated_address = shipping.address;
   return Spree.ajax({
     url: '/solidus_paypal_commerce_platform/update_address',
     method: 'POST',

data/app/controllers/solidus_paypal_commerce_platform/orders_controller.rb

@@ -2,7 +2,6 @@
 
 module SolidusPaypalCommercePlatform
   class OrdersController < ::Spree::Api::BaseController
-    before_action :load_order, except: :create
     skip_before_action :authenticate_user
     include ::Spree::Core::ControllerHelpers::Auth
 
@@ -25,6 +24,7 @@ module SolidusPaypalCommercePlatform
     end
 
     def update_address
+      load_order
       authorize! :update, @order, order_token
       paypal_address = SolidusPaypalCommercePlatform::PaypalAddress.new(@order)
 
@@ -38,6 +38,7 @@ module SolidusPaypalCommercePlatform
     end
 
     def verify_total
+      load_order
       authorize! :show, @order, order_token
 
       if total_is_correct?(params[:paypal_total])

data/app/controllers/solidus_paypal_commerce_platform/paypal_orders_controller.rb

@@ -15,7 +15,7 @@ module SolidusPaypalCommercePlatform
     private
 
     def load_payment_method
-      @payment_method = ::Spree::PaymentMethod.find(params[:payment_method_id])
+      @payment_method = ::Spree::PaymentMethod.find(params.require(:payment_method_id))
     end
   end
 end

data/app/models/solidus_paypal_commerce_platform/payment_method.rb

@@ -74,6 +74,8 @@ module SolidusPaypalCommercePlatform
     end
 
     def javascript_sdk_url(order: nil, currency: nil)
+      # Ref: https://developer.paypal.com/sdk/js/configuration/
+
       # Both instance and class respond to checkout_steps.
       step_names = order ? order.checkout_steps : ::Spree::Order.checkout_steps.keys
 
@@ -84,17 +86,16 @@ module SolidusPaypalCommercePlatform
         intent: auto_capture ? "capture" : "authorize",
         commit: commit_immediately ? "false" : "true",
         components: options[:display_credit_messaging] ? "buttons,messages" : "buttons",
-        currency: currency
+        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]
+      unless Rails.env.production?
+        parameters['buyer-country'] = options[:force_buyer_country].presence
       end
 
-      "https://www.paypal.com/sdk/js?#{parameters.to_query}"
+      "https://www.paypal.com/sdk/js?#{parameters.compact.to_query}".html_safe # rubocop:disable Rails/OutputSafety
     end
   end
 end

data/app/models/solidus_paypal_commerce_platform/paypal_address.rb

@@ -61,12 +61,16 @@ module SolidusPaypalCommercePlatform
 
     def address_attributes(address, recipient)
       country = ::Spree::Country.find_by(iso: address[:country_code])
+      state = find_state(
+        address[:admin_area_1] || address[:admin_area_2] || address[:state],
+        country,
+      )
 
       attributes = {
         address1: address[:address_line_1],
         address2: address[:address_line_2],
-        state: find_state(address[:admin_area_1] || address[:state], country),
-        state_name: address[:admin_area_1] || address[:state],
+        state_id: state.try(:id),
+        state_name: state.try(:name),
         city: address[:admin_area_2] || address[:city],
         country: country,
         zipcode: address[:postal_code],

data/app/models/solidus_paypal_commerce_platform/paypal_order.rb

@@ -10,14 +10,15 @@ module SolidusPaypalCommercePlatform
       {
         intent: intent,
         purchase_units: purchase_units,
-        payer: (payer if @order.bill_address)
+        payer: (payer if @order.bill_address),
+        application_context: application_context
       }
     end
 
     def to_replace_json
       {
         op: 'replace',
-        path: '/purchase_units/@reference_id==\'default\'',
+        path: "/purchase_units/@reference_id=='default'",
         value: purchase_units(include_shipping_address: false)[0]
       }
     end
@@ -55,10 +56,10 @@ module SolidusPaypalCommercePlatform
     def purchase_units(include_shipping_address: true)
       [
         {
-          amount: amount,
+          amount: price(@order.total).merge(breakdown: breakdown),
           items: line_items,
           shipping: (shipping_info if @order.ship_address && include_shipping_address)
-        }
+        }.compact
       ]
     end
 
@@ -79,21 +80,13 @@ module SolidusPaypalCommercePlatform
     def line_items
       @order.line_items.map{ |line_item|
         {
-          name: line_item.product.name,
+          name: line_item.product.name.truncate(127),
           unit_amount: price(line_item.price),
-          quantity: line_item.quantity
+          quantity: line_item.quantity.to_i.to_s
         }
       }
     end
 
-    def amount
-      {
-        currency_code: @order.currency,
-        value: @order.total,
-        breakdown: breakdown
-      }
-    end
-
     def breakdown
       {
         item_total: price(@order.item_total),
@@ -106,8 +99,22 @@ module SolidusPaypalCommercePlatform
     def price(amount)
       {
         currency_code: @order.currency,
-        value: amount
+        value: ('%.2f' % amount.to_f)
+      }
+    end
+
+    def application_context
+      {
+        shipping_preference: require_shipping? ? 'SET_PROVIDED_ADDRESS' : 'NO_SHIPPING'
       }
     end
+
+    def require_shipping?
+      step_names.include? :delivery
+    end
+
+    def step_names
+      @order ? @order.checkout_steps.map(&:to_sym) : ::Spree::Order.checkout_steps.keys
+    end
   end
 end

data/bin/sandbox

@@ -49,34 +49,13 @@ fi
 
 cd ./sandbox
 cat <<RUBY >> Gemfile
-gem 'solidus', github: 'solidusio/solidus', branch: '$BRANCH'
-gem 'solidus_auth_devise', '>= 2.1.0'
-gem 'rails-i18n'
-gem 'solidus_i18n'
-
-gem '$extension_name', path: '..'
-
-group :test, :development do
-  platforms :mri do
-    gem 'pry-byebug'
-  end
-end
+  gem 'solidus', github: 'solidusio/solidus', branch: '$BRANCH'
+  gem 'pry-byebug', platforms: :mri, groups: [:test, :development]
 RUBY
 
 unbundled bundle install --gemfile Gemfile
-
 unbundled bundle exec rake db:drop db:create
-
-unbundled bundle exec rails generate solidus:install \
-  --auto-accept \
-  --user_class=Spree::User \
-  --enforce_available_locales=true \
-  --with-authentication=false \
-  --payment-method=none \
-  $@
-
-unbundled bundle exec rails generate solidus:auth:install
-unbundled bundle exec rails generate ${extension_name}:install
+unbundled bundle exec rails generate solidus:install --auto-accept $@
 
 echo
 echo "🚀 Sandbox app successfully created for $extension_name!"

data/lib/generators/solidus_paypal_commerce_platform/install/install_generator.rb

@@ -4,44 +4,69 @@ 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
+
+      # This should only be used by the solidus installer prior to v3.3.
+      class_option :skip_migrations, type: :boolean, default: false, hide: true
 
       source_root File.expand_path('templates', __dir__)
 
-      def copy_initializer
+      def install_solidus_core_support
         template 'initializer.rb', 'config/initializers/solidus_paypal_commerce_platform.rb'
+        rake 'railties:install:migrations FROM=solidus_paypal_commerce_platform'
+        route "mount SolidusPaypalCommercePlatform::Engine, at: '/solidus_paypal_commerce_platform'"
       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
-        append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/solidus_paypal_commerce_platform\n" # rubocop:disable Layout/LineLength
+      def install_solidus_backend_support
+        support_code_for('solidus_backend') do
+          append_file(
+            'vendor/assets/javascripts/spree/backend/all.js',
+            "//= require spree/backend/solidus_paypal_commerce_platform\n"
+          )
+          inject_into_file(
+            'vendor/assets/stylesheets/spree/backend/all.css',
+            " *= require spree/backend/solidus_paypal_commerce_platform\n",
+            before: %r{\*/},
+            verbose: true,
+          )
+        end
       end
 
-      def add_stylesheets
-        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/solidus_paypal_commerce_platform\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
-        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/solidus_paypal_commerce_platform\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
+      def install_solidus_frontend_support
+        support_code_for('solidus_frontend') do
+          append_file(
+            'vendor/assets/javascripts/spree/frontend/all.js',
+            "//= require spree/frontend/solidus_paypal_commerce_platform\n",
+          )
+          inject_into_file(
+            'vendor/assets/stylesheets/spree/frontend/all.css',
+            " *= require spree/frontend/solidus_paypal_commerce_platform\n",
+            before: %r{\*/},
+            verbose: true,
+          )
+          directory engine.root.join("lib/views/frontend"), 'app/views/'
+        end
       end
 
-      def add_migrations
-        run 'bin/rails railties:install:migrations FROM=solidus_paypal_commerce_platform'
-      end
+      def run_migrations
+        return rake 'db:migrate' if options[:auto_run_migrations] && !options[:skip_migrations]
 
-      def mount_engine
-        insert_into_file File.join('config', 'routes.rb'), after: "Rails.application.routes.draw do\n" do
-          "mount SolidusPaypalCommercePlatform::Engine, at: '/solidus_paypal_commerce_platform'\n"
-        end
+        say_status :skip, 'db:migrate'
       end
 
-      def run_migrations
-        return if options[:skip_migrations]
+      private
 
-        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'
+      def support_code_for(gem_name, run_if: Bundler.locked_gems.specs.map(&:name).include?(gem_name), &block)
+        if run_if
+          say_status :install, "[#{engine.engine_name}] #{gem_name} code", :blue
+          shell.indent(&block)
         else
-          puts 'Skipping bin/rails db:migrate, don\'t forget to run it!' # rubocop:disable Rails/Output
+          say_status :skip, "[#{engine.engine_name}] #{gem_name} code", :blue
         end
       end
+
+      def engine
+        SolidusPaypalCommercePlatform::Engine
+      end
     end
   end
 end

data/lib/paypal/paypal_checkout_sdk/orders/orders_authorize_request.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: false
 
-# This class was generated on Mon, 27 Aug 2018 13:51:59 PDT by version 0.1.0-dev+904328-dirty of Braintree SDK Generator
-
 require 'cgi'
 
 module PayPalCheckoutSdk

data/lib/paypal/paypal_checkout_sdk/orders/orders_capture_request.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: false
 
-# This class was generated on Mon, 27 Aug 2018 13:51:59 PDT by version 0.1.0-dev+904328-dirty of Braintree SDK Generator
-
 require 'cgi'
 
 module PayPalCheckoutSdk

data/lib/paypal/paypal_checkout_sdk/orders/orders_create_request.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: false
 
-# This class was generated on Mon, 27 Aug 2018 13:51:59 PDT by version 0.1.0-dev+904328-dirty of Braintree SDK Generator
-
 require 'cgi'
 
 module PayPalCheckoutSdk

data/lib/paypal/paypal_checkout_sdk/orders/orders_get_request.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: false
 
-# This class was generated on Mon, 27 Aug 2018 13:51:59 PDT by version 0.1.0-dev+904328-dirty of Braintree SDK Generator
-
 require 'cgi'
 
 module PayPalCheckoutSdk

data/lib/paypal/paypal_checkout_sdk/orders/orders_patch_request.rb

@@ -1,61 +1,9 @@
 # frozen_string_literal: false
 
-# This class was generated on Mon, 27 Aug 2018 13:51:59 PDT by version 0.1.0-dev+904328-dirty of Braintree SDK Generator
-
 require 'cgi'
 
 module PayPalCheckoutSdk
   module Orders
-    #
-    # Updates an order that has the `CREATED` or `APPROVED` status. You cannot update an order with `COMPLETED` status.
-    # You can patch these attributes and objects:
-    # <table>
-    #   <thead>
-    #     <tr>
-    #       <th align="left">Attribute or object</th>
-    #       <th align="left">Operations</th>
-    #     </tr>
-    #   </thead>
-    #   <tbody>
-    #     <tr>
-    #       <td><code>intent</code></td>
-    #       <td align="left">Replace</td>
-    #     </tr>
-    #     <tr>
-    #       <td><code>purchase_units</code></td>
-    #       <td align="left">Replace, add</td>
-    #     </tr>
-    #     <tr>
-    #       <td><code>purchase_units[].custom_id</code></td>
-    #       <td align="left">Replace, add, remove</td>
-    #     </tr>
-    #     <tr>
-    #      <td><code>purchase_units[].description</code></td>
-    #      <td align="left">Replace, add, remove</td>
-    #     </tr>
-    #     <tr>
-    #       <td><code>purchase_units[].payee.email</code></td>
-    #       <td align="left">Replace, add</td>
-    #     </tr>
-    #     <tr>
-    #       <td><code>purchase_units[].shipping</code></td>
-    #       <td align="left">Replace, add, remove</td>
-    #     </tr>
-    #     <tr>
-    #       <td><code>purchase_units[].soft_descriptor</code></td>
-    #       <td align="left">Replace, add, remove</td>
-    #     </tr>
-    #     <tr>
-    #       <td><code>purchase_units[].amount</code></td>
-    #       <td align="left">Replace</td>
-    #     </tr>
-    #     <tr>
-    #       <td><code>purchase_units[].invoice_id</code></td>
-    #       <td align="left">Replace, add, remove</td>
-    #     </tr>
-    #   </tbody>
-    # </table>
-    #
     class OrdersPatchRequest
       attr_accessor :path, :body, :headers, :verb
 

data/lib/paypal/paypal_checkout_sdk/orders/orders_validate_request.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: false
 
-# This class was generated on Mon, 27 Aug 2018 13:51:59 PDT by version 0.1.0-dev+904328-dirty of Braintree SDK Generator
-
 require 'cgi'
 
 module PayPalCheckoutSdk

data/lib/paypal/paypal_checkout_sdk/payments/authorizations_capture_request.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: false
 
-# This class was generated on Mon, 27 Aug 2018 13:52:18 PDT by version 0.1.0-dev+904328-dirty of Braintree SDK Generator
-
 require 'cgi'
 
 module PayPalCheckoutSdk

data/lib/paypal/paypal_checkout_sdk/payments/authorizations_get_request.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: false
 
-# This class was generated on Mon, 27 Aug 2018 13:52:18 PDT by version 0.1.0-dev+904328-dirty of Braintree SDK Generator
-
 require 'cgi'
 
 module PayPalCheckoutSdk

data/lib/paypal/paypal_checkout_sdk/payments/authorizations_reauthorize_request.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: false
 
-# This class was generated on Mon, 27 Aug 2018 13:52:18 PDT by version 0.1.0-dev+904328-dirty of Braintree SDK Generator
-
 require 'cgi'
 
 module PayPalCheckoutSdk

data/lib/paypal/paypal_checkout_sdk/payments/authorizations_void_request.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: false
 
-# This class was generated on Mon, 27 Aug 2018 13:52:18 PDT by version 0.1.0-dev+904328-dirty of Braintree SDK Generator
-
 require 'cgi'
 
 module PayPalCheckoutSdk

data/lib/paypal/paypal_checkout_sdk/payments/captures_get_request.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: false
 
-# This class was generated on Mon, 27 Aug 2018 13:52:18 PDT by version 0.1.0-dev+904328-dirty of Braintree SDK Generator
-
 require 'cgi'
 
 module PayPalCheckoutSdk

data/lib/paypal/paypal_checkout_sdk/payments/captures_refund_request.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: false
 
-# This class was generated on Mon, 27 Aug 2018 13:52:18 PDT by version 0.1.0-dev+904328-dirty of Braintree SDK Generator
-
 require 'cgi'
 
 module PayPalCheckoutSdk

data/lib/paypal/paypal_checkout_sdk/payments/refunds_get_request.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: false
 
-# This class was generated on Mon, 27 Aug 2018 13:52:18 PDT by version 0.1.0-dev+904328-dirty of Braintree SDK Generator
-
 require 'cgi'
 
 module PayPalCheckoutSdk

data/lib/paypal/paypal_http_client.rb

@@ -11,8 +11,8 @@ module PayPal
       super(environment)
       @refresh_token = refresh_token
 
-      add_injector(&:_sign_request)
-      add_injector(&:_add_headers)
+      add_injector { |r| _sign_request(r) }
+      add_injector { |r| _add_headers(r) }
     end
 
     def user_agent
@@ -27,10 +27,10 @@ module PayPal
     end
 
     def _sign_request(request)
-      return if !_has_auth_header(request) && !_is_auth_request(request)
+      return if _has_auth_header(request) || _is_auth_request(request)
 
       if !@access_token || @access_token.expired?
-        access_token_request = PayPal.access_token_request.new(@environment, @refresh_token)
+        access_token_request = PayPal::AccessTokenRequest.new(@environment, @refresh_token)
         token_response = execute(access_token_request)
         @access_token = PayPal::AccessToken.new(token_response.result)
       end

data/lib/solidus_paypal_commerce_platform/client.rb

@@ -13,7 +13,7 @@ module SolidusPaypalCommercePlatform
       request.headers["PayPal-Partner-Attribution-Id"] = SolidusPaypalCommercePlatform.config.partner_code
     }.freeze
 
-    Response = Struct.new(:status_code, :error)
+    Response = Struct.new(:status_code, :error, keyword_init: true)
 
     attr_reader :environment
 
@@ -28,9 +28,12 @@ module SolidusPaypalCommercePlatform
     end
 
     def execute(request)
-      @paypal_client.execute(request)
+      Rails.logger.info "[SolidusPaypalCommercePlatform::Client#execute] #{request.inspect}"
+      @paypal_client.execute(request).tap do |response|
+        Rails.logger.info "[SolidusPaypalCommercePlatform::Client#execute] #{response.inspect}"
+      end
     rescue PayPalHttp::HttpError => e
-      Rails.logger.error e.result
+      Rails.logger.error "[SolidusPaypalCommercePlatform::Client#execute] #{e.result.inspect}"
       Response.new(status_code: 422, error: e.result)
     end
 

data/lib/solidus_paypal_commerce_platform/paypal_checkout_sdk/orders/orders_patch_request.rb

@@ -1,63 +1,10 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 
-# frozen_string_literal :true
-
-# This module was automatically generated from paypal_checkout_sdk 1.0.1
 require 'cgi'
 
 module SolidusPaypalCommercePlatform
   module PayPalCheckoutSdk
     module Orders
-      #
-      # Updates an order that has the `CREATED` or `APPROVED` status. You cannot update
-      # an order with `COMPLETED` status. You can patch these attributes and objects:
-      # <table>
-      #   <thead>
-      #    <tr>
-      #       <th align="left">Attribute or object</th>
-      #       <th align="left">Operations</th>
-      #     </tr>
-      #   </thead>
-      #   <tbody>
-      #     <tr>
-      #       <td><code>intent</code></td>
-      #       <td align="left">Replace</td>
-      #     </tr>
-      #     <tr>
-      #       <td><code>purchase_units</code></td>
-      #       <td align="left">Replace, add</td>
-      #     </tr>
-      #     <tr>
-      #       <td><code>purchase_units[].custom_id</code></td>
-      #       <td align="left">Replace, add, remove</td>
-      #     </tr>
-      #     <tr>
-      #       <td><code>purchase_units[].description</code></td>
-      #       <td align="left">Replace, add, remove</td>
-      #     </tr>
-      #     <tr>
-      #       <td><code>purchase_units[].payee.email</code></td>
-      #       <td align="left">Replace, add</td>
-      #     </tr>
-      #     <tr>
-      #       <td><code>purchase_units[].shipping</code></td>
-      #       <td align="left">Replace, add, remove</td>
-      #     </tr>
-      #     <tr>
-      #       <td><code>purchase_units[].soft_descriptor</code></td>
-      #       <td align="left">Replace, add, remove</td>
-      #     </tr>
-      #     <tr>
-      #       <td><code>purchase_units[].amount</code></td>
-      #       <td align="left">Replace</td>
-      #     </tr>
-      #     <tr>
-      #       <td><code>purchase_units[].invoice_id</code></td>
-      #       <td align="left">Replace, add, remove</td>
-      #     </tr>
-      #   </tbody>
-      # </table>
-      #
       class OrdersPatchRequest
         attr_accessor :path, :body, :headers, :verb
 

data/lib/solidus_paypal_commerce_platform/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_paypal_commerce_platform
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Sean Denny
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2022-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.21
+rubygems_version: 3.3.23
 signing_key:
 specification_version: 4
 summary: Integrate Solidus with Paypal Commerce Platform