solidus_stripe 3.1.0 → 4.2.0

data/app/decorators/models/spree/refund_decorator.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Spree
+  module RefundDecorator
+    attr_reader :response
+
+    Spree::Refund.prepend(self)
+  end
+end

data/app/models/solidus_stripe/address_from_params_service.rb

@@ -4,7 +4,7 @@ module SolidusStripe
   class AddressFromParamsService
     attr_reader :address_params, :user
 
-    def initialize(address_params, user)
+    def initialize(address_params, user = nil)
       @address_params, @user = address_params, user
     end
 
@@ -43,7 +43,10 @@ module SolidusStripe
     end
 
     def state
-      @state ||= country.states.find_by_abbr(address_params[:region])
+      @state ||= begin
+        region = address_params[:region]
+        country.states.find_by(abbr: region) || country.states.find_by(name: region)
+      end
     end
 
     def default_attributes

data/app/models/solidus_stripe/create_intents_payment_service.rb

@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+module SolidusStripe
+  class CreateIntentsPaymentService
+    attr_reader :intent_id, :stripe, :controller
+
+    delegate :request, :current_order, :params, to: :controller
+
+    def initialize(intent_id, stripe, controller)
+      @intent_id, @stripe, @controller = intent_id, stripe, controller
+    end
+
+    def call
+      invalidate_previous_payment_intents_payments
+      if (payment = create_payment)
+        description = "Solidus Order ID: #{payment.gateway_order_identifier}"
+        stripe.update_intent(nil, intent_id, nil, description: description)
+        true
+      else
+        invalidate_current_payment_intent
+        false
+      end
+    end
+
+    private
+
+    def intent
+      @intent ||= stripe.show_intent(intent_id, {})
+    end
+
+    def invalidate_current_payment_intent
+      stripe.cancel(intent_id)
+    end
+
+    def invalidate_previous_payment_intents_payments
+      if stripe.v3_intents?
+        current_order.payments.pending.where(payment_method: stripe).each(&:void_transaction!)
+      end
+    end
+
+    def create_payment
+      Spree::OrderUpdateAttributes.new(
+        current_order,
+        payment_params,
+        request_env: request.headers.env
+      ).apply
+
+      created_payment = Spree::Payment.find_by(response_code: intent_id)
+      created_payment&.tap { |payment| payment.update!(state: :pending) }
+    end
+
+    def payment_params
+      {
+        payments_attributes: [{
+          payment_method_id: stripe.id,
+          amount: current_order.total,
+          response_code: intent_id,
+          source_attributes: {
+            month: intent_card['exp_month'],
+            year: intent_card['exp_year'],
+            cc_type: intent_card['brand'],
+            last_digits: intent_card['last4'],
+            gateway_payment_profile_id: intent_customer_profile,
+            name: card_holder_name || address_full_name,
+            address_attributes: address_attributes
+          }
+        }]
+      }
+    end
+
+    def intent_card
+      intent_data['payment_method_details']['card']
+    end
+
+    def intent_customer_profile
+      intent.params['payment_method']
+    end
+
+    def card_holder_name
+      (html_payment_source_data['name'] || intent_data['billing_details']['name']).presence
+    end
+
+    def intent_data
+      intent.params['charges']['data'][0]
+    end
+
+    def form_data
+      params[:form_data]
+    end
+
+    def html_payment_source_data
+      if form_data.is_a?(String)
+        data = Rack::Utils.parse_nested_query(form_data)
+        data['payment_source'][stripe.id.to_s]
+      else
+        {}
+      end
+    end
+
+    def address_attributes
+      html_payment_source_data['address_attributes'] || SolidusStripe::AddressFromParamsService.new(form_data).call.attributes
+    end
+
+    def address_full_name
+      current_order.bill_address&.full_name || form_data[:recipient]
+    end
+
+    def update_stripe_payment_description
+      description = "Solidus Order ID: #{payment.gateway_order_identifier}"
+      stripe.update_intent(nil, intent_id, nil, description: description)
+    end
+  end
+end

data/app/models/spree/payment_method/stripe_credit_card.rb

@@ -15,7 +15,7 @@ module Spree
         'Visa' => 'visa'
       }
 
-      delegate :create_intent, :update_intent, :confirm_intent, to: :gateway
+      delegate :create_intent, :update_intent, :confirm_intent, :show_intent, to: :gateway
 
       def stripe_config(order)
         {
@@ -81,6 +81,21 @@ module Spree
         gateway.void(response_code, {})
       end
 
+      def payment_intents_refund_reason
+        Spree::RefundReason.where(name: Spree::Payment::Cancellation::DEFAULT_REASON).first_or_create
+      end
+
+      def try_void(payment)
+        if v3_intents? && payment.completed?
+          payment.refunds.create!(
+            amount: payment.credit_allowed,
+            reason: payment_intents_refund_reason
+          ).response
+        else
+          void(payment.response_code, nil, nil)
+        end
+      end
+
       def cancel(response_code)
         gateway.void(response_code, {})
       end

data/bin/r

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/solidus_stripe/engine', __dir__)
+
+# 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 'rails/all'
+require 'rails/engine/commands'

data/bin/rake

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/sandbox

@@ -0,0 +1,84 @@
+#!/usr/bin/env bash
+
+set -e
+
+case "$DB" in
+postgres|postgresql)
+  RAILSDB="postgresql"
+  ;;
+mysql)
+  RAILSDB="mysql"
+  ;;
+sqlite|'')
+  RAILSDB="sqlite3"
+  ;;
+*)
+  echo "Invalid DB specified: $DB"
+  exit 1
+  ;;
+esac
+
+if [ ! -z $SOLIDUS_BRANCH ]
+then
+  BRANCH=$SOLIDUS_BRANCH
+else
+  BRANCH="master"
+fi
+
+extension_name="solidus_stripe"
+
+# Stay away from the bundler env of the containing extension.
+function unbundled {
+  ruby -rbundler -e'b = proc {system *ARGV}; Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&b) : Bundler.with_clean_env(&b)' -- $@
+}
+
+rm -rf ./sandbox
+unbundled bundle exec rails new sandbox --database="$RAILSDB" \
+  --skip-bundle \
+  --skip-git \
+  --skip-keeps \
+  --skip-rc \
+  --skip-spring \
+  --skip-test \
+  --skip-javascript
+
+if [ ! -d "sandbox" ]; then
+  echo 'sandbox rails application failed'
+  exit 1
+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
+RUBY
+
+unbundled bundle install --gemfile Gemfile
+
+unbundled bundle exec rake db:drop db:create
+
+unbundled bundle exec rails generate spree:install \
+  --auto-accept \
+  --user_class=Spree::User \
+  --enforce_available_locales=true \
+  --with-authentication=false \
+  $@
+
+unbundled bundle exec rails generate solidus:auth:install
+
+echo
+echo "🚀 Sandbox app successfully created for $extension_name!"
+echo "🚀 Using $RAILSDB and Solidus $BRANCH"
+echo "🚀 Use 'export DB=[postgres|mysql|sqlite]' to control the DB adapter"
+echo "🚀 Use 'export SOLIDUS_BRANCH=<BRANCH-NAME>' to control the Solidus version"
+echo "🚀 This app is intended for test purposes."

data/bin/sandbox_rails

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+app_root = 'sandbox'
+
+unless File.exist? "#{app_root}/bin/rails"
+  warn 'Creating the sandbox app...'
+  Dir.chdir "#{__dir__}/.." do
+    system "#{__dir__}/sandbox" or begin # rubocop:disable Style/AndOr
+      warn 'Automatic creation of the sandbox app failed'
+      exit 1
+    end
+  end
+end
+
+Dir.chdir app_root
+exec 'bin/rails', *ARGV

data/bin/setup

@@ -5,4 +5,4 @@ set -vx
 
 gem install bundler --conservative
 bundle update
-bundle exec rake extension:test_app
+bin/rake clobber

data/config/routes.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 Spree::Core::Engine.routes.draw do
   # route to a deprecated controller, will be removed in the future:
   post '/stripe/confirm_payment', to: 'stripe#confirm_payment'
 
   # payment intents routes:
-  post '/stripe/confirm_intents', to: '/solidus_stripe/intents#confirm'
+  post '/stripe/create_intent', to: '/solidus_stripe/intents#create_intent'
+  post '/stripe/create_payment', to: '/solidus_stripe/intents#create_payment'
 
   # payment request routes:
   post '/stripe/shipping_rates', to: '/solidus_stripe/payment_request#shipping_rates'

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

@@ -13,12 +13,16 @@ module SolidusStripe
         run 'bundle exec rake railties:install:migrations FROM=solidus_stripe'
       end
 
+      def add_migrations
+        run 'bin/rails railties:install:migrations FROM=solidus_stripe'
+      end
+
       def run_migrations
-        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]'))
+        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]')) # rubocop:disable Metrics/LineLength
         if run_migrations
-          run 'bundle exec rake db:migrate'
+          run 'bin/rails db:migrate'
         else
-          puts 'Skipping rake db:migrate, don\'t forget to run it!' # rubocop:disable Rails/Output
+          puts 'Skipping bin/rails db:migrate, don\'t forget to run it!' # rubocop:disable Rails/Output
         end
       end
 

data/lib/solidus_stripe/engine.rb

@@ -4,9 +4,9 @@ require 'spree/core'
 
 module SolidusStripe
   class Engine < Rails::Engine
-    include SolidusSupport::EngineExtensions::Decorators
+    include SolidusSupport::EngineExtensions
 
-    isolate_namespace Spree
+    isolate_namespace ::Spree
 
     engine_name 'solidus_stripe'
 

data/lib/solidus_stripe/factories.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+end

data/lib/solidus_stripe/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusStripe
-  VERSION = "3.1.0"
+  VERSION = "4.2.0"
 end

data/lib/views/frontend/spree/checkout/payment/v3/_form_elements.html.erb

@@ -1,6 +1,5 @@
 <div id="payment-request-button" data-stripe-config="<%= payment_method.stripe_config(current_order).to_json %>" data-v3-api="<%= stripe_v3_api %>"></div>
 
-<%= image_tag 'credit_cards/credit_card.gif', id: 'credit-card-image' %>
 <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
 <div class="field field-required">

data/solidus_stripe.gemspec

@@ -1,40 +1,37 @@
 # frozen_string_literal: true
 
-$:.push File.expand_path('lib', __dir__)
-require 'solidus_stripe/version'
-
-Gem::Specification.new do |s|
-  s.name = 'solidus_stripe'
-  s.version = SolidusStripe::VERSION
-  s.summary     = "Stripe Payment Method for Solidus"
-  s.description = s.summary
-  s.required_ruby_version = ">= 2.2"
-
-  s.author       = "Solidus Team"
-  s.email        = "contact@solidus.io"
-  s.homepage     = "https://solidus.io"
-  s.license      = 'BSD-3'
-
-  if s.respond_to?(:metadata)
-    s.metadata["homepage_uri"] = s.homepage if s.homepage
-    s.metadata["source_code_uri"] = s.homepage if s.homepage
-  end
-
-  s.files        = `git ls-files`.split("\n")
-  s.test_files   = `git ls-files -- spec/*`.split("\n")
-  s.require_path = "lib"
-  s.requirements << "none"
-
-  s.bindir = "exe"
-  s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
-
-  s.add_dependency 'solidus_core', ['>= 2.3', '< 3']
-  s.add_dependency 'solidus_support', '~> 0.4.0'
-  # ActiveMerchant v1.58 through v1.59 introduced a breaking change
-  # to the stripe gateway.
-  #
-  # This was resolved in v1.60, but we still need to skip 1.58 & 1.59.
-  s.add_dependency "activemerchant", ">= 1.100" # includes "Stripe Payment Intents: Fix fallback for Store"
-
-  s.add_development_dependency 'solidus_dev_support'
+require_relative 'lib/solidus_stripe/version'
+
+Gem::Specification.new do |spec|
+  spec.name = 'solidus_stripe'
+  spec.version = SolidusStripe::VERSION
+  spec.authors = ['Solidus Team']
+  spec.email = 'contact@solidus.io'
+
+  spec.summary = 'Stripe Payment Method for Solidus'
+  spec.description = 'Stripe Payment Method for Solidus'
+  spec.homepage = 'https://github.com/solidusio/solidus_stripe#readme'
+  spec.license = 'BSD-3'
+
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = 'https://github.com/solidusio/solidus_stripe'
+  spec.metadata['changelog_uri'] = 'https://github.com/solidusio/solidus_stripe/blob/master/CHANGELOG.md'
+
+  spec.required_ruby_version = Gem::Requirement.new('~> 2.4')
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  files = Dir.chdir(__dir__) { `git ls-files -z`.split("\x0") }
+
+  spec.files = files.grep_v(%r{^(test|spec|features)/})
+  spec.test_files = files.grep(%r{^(test|spec|features)/})
+  spec.bindir = "exe"
+  spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency 'solidus_core', ['>= 2.3', '< 3']
+  spec.add_dependency 'solidus_support', '~> 0.5'
+  spec.add_dependency 'activemerchant', '>= 1.100'
+
+  spec.add_development_dependency 'solidus_dev_support'
 end