solidus_stripe 1.0.0 → 1.1.0

data/app/models/solidus_stripe/prepare_order_for_payment_service.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module SolidusStripe
+  class PrepareOrderForPaymentService
+    attr_reader :order, :address, :user, :email, :shipping_id
+
+    def initialize(address, controller)
+      @address = address
+      @order = controller.current_order
+      @user = controller.spree_current_user
+      @email = controller.params[:email]
+      @shipping_id = controller.params[:shipping_option][:id]
+    end
+
+    def call
+      set_order_addresses
+      manage_guest_checkout
+      advance_order_to_payment_state
+    end
+
+    private
+
+    def set_shipping_rate
+      order.shipments.each do |shipment|
+        rate = shipment.shipping_rates.find_by(shipping_method: shipping_id)
+        shipment.selected_shipping_rate_id = rate.id
+      end
+    end
+
+    def set_order_addresses
+      order.ship_address = address
+      order.bill_address ||= address
+    end
+
+    def manage_guest_checkout
+      order.email = email unless user
+    end
+
+    def advance_order_to_payment_state
+      while !order.payment?
+        set_shipping_rate if order.state == "delivery"
+        order.next || break
+      end
+    end
+  end
+end

data/app/models/solidus_stripe/shipping_rates_service.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module SolidusStripe
+  class ShippingRatesService
+    attr_reader :order, :user, :shipping_address_params
+
+    def initialize(order, user, shipping_address_params)
+      @order = order
+      @user = user
+      @shipping_address_params = shipping_address_params
+    end
+
+    def call
+      # setting a temporary and probably incomplete address to the order
+      # only to calculate the available shipping options:
+      order.ship_address = address_from_params
+
+      available_shipping_methods.each_with_object([]) do |(id, rates), options|
+        options << shipping_method_data(id, rates)
+      end
+    end
+
+    private
+
+    def available_shipping_methods
+      shipments = Spree::Stock::SimpleCoordinator.new(order).shipments
+      all_rates = shipments.map(&:shipping_rates).flatten
+
+      all_rates.group_by(&:shipping_method_id).select do |_, rates|
+        rates.size == shipments.size
+      end
+    end
+
+    def shipping_method_data(id, rates)
+      {
+        id: id.to_s,
+        label: Spree::ShippingMethod.find(id).name,
+        amount: (rates.sum(&:cost) * 100).to_i
+      }
+    end
+
+    def address_from_params
+      SolidusStripe::AddressFromParamsService.new(shipping_address_params, user).call
+    end
+  end
+end

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

@@ -5,7 +5,9 @@ module Spree
     class StripeCreditCard < Spree::PaymentMethod::CreditCard
       preference :secret_key, :string
       preference :publishable_key, :string
+      preference :stripe_country, :string
       preference :v3_elements, :boolean
+      preference :v3_intents, :boolean
 
       CARD_TYPE_MAPPING = {
         'American Express' => 'american_express',
@@ -13,6 +15,22 @@ module Spree
         'Visa' => 'visa'
       }
 
+      def stripe_config(order)
+        {
+          id: id,
+          publishable_key: preferred_publishable_key
+        }.tap do |config|
+          config.merge!(
+            payment_request: {
+              country: preferred_stripe_country,
+              currency: order.currency.downcase,
+              label: "Payment for order #{order.number}",
+              amount: (order.total * 100).to_i
+            }
+          ) if payment_request?
+        end
+      end
+
       def partial_name
         'stripe'
       end
@@ -21,14 +39,34 @@ module Spree
         !!preferred_v3_elements
       end
 
+      def payment_request?
+        v3_intents? && preferred_stripe_country.present?
+      end
+
+      def v3_intents?
+        !!preferred_v3_intents
+      end
+
       def gateway_class
-        ActiveMerchant::Billing::StripeGateway
+        if v3_intents?
+          ActiveMerchant::Billing::StripePaymentIntentsGateway
+        else
+          ActiveMerchant::Billing::StripeGateway
+        end
       end
 
       def payment_profiles_supported?
         true
       end
 
+      def create_intent(*args)
+        gateway.create_intent(*args)
+      end
+
+      def confirm_intent(*args)
+        gateway.confirm_intent(*args)
+      end
+
       def purchase(money, creditcard, transaction_options)
         gateway.purchase(*options_for_purchase_or_auth(money, creditcard, transaction_options))
       end
@@ -63,19 +101,30 @@ module Spree
 
         source = update_source!(payment.source)
         if source.number.blank? && source.gateway_payment_profile_id.present?
-          creditcard = source.gateway_payment_profile_id
+          if v3_intents?
+            creditcard = ActiveMerchant::Billing::StripeGateway::StripePaymentToken.new('id' => source.gateway_payment_profile_id)
+          else
+            creditcard = source.gateway_payment_profile_id
+          end
         else
           creditcard = source
         end
 
         response = gateway.store(creditcard, options)
         if response.success?
-          payment.source.update_attributes!({
-            cc_type: payment.source.cc_type, # side-effect of update_source!
-            gateway_customer_profile_id: response.params['id'],
-            gateway_payment_profile_id: response.params['default_source'] || response.params['default_card']
-          })
-
+          if v3_intents?
+            payment.source.update!(
+              cc_type: payment.source.cc_type,
+              gateway_customer_profile_id: response.params['customer'],
+              gateway_payment_profile_id: response.params['id']
+            )
+          else
+            payment.source.update!(
+              cc_type: payment.source.cc_type,
+              gateway_customer_profile_id: response.params['id'],
+              gateway_payment_profile_id: response.params['default_source'] || response.params['default_card']
+            )
+          end
         else
           payment.send(:gateway_error, response.message)
         end

data/bin/console

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "solidus_stripe"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+$LOAD_PATH.unshift(*Dir["#{__dir__}/../app/*"])
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/rails

@@ -1,7 +1,15 @@
 #!/usr/bin/env ruby
 
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/solidus_stripe/engine', __FILE__)
+# frozen_string_literal: true
 
-require 'rails/all'
-require 'rails/engine/commands'
+app_root = 'spec/dummy'
+
+unless File.exist? "#{app_root}/bin/rails"
+  system "bin/rake", app_root or begin # rubocop:disable Style/AndOr
+    warn "Automatic creation of the dummy app failed"
+    exit 1
+  end
+end
+
+Dir.chdir app_root
+exec 'bin/rails', *ARGV

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+gem install bundler --conservative
+bundle update
+bundle exec rake extension:test_app

data/config/routes.rb

@@ -0,0 +1,11 @@
+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'
+
+  # payment request routes:
+  post '/stripe/shipping_rates', to: '/solidus_stripe/payment_request#shipping_rates'
+  post '/stripe/update_order', to: '/solidus_stripe/payment_request#update_order'
+end

data/lib/assets/stylesheets/spree/frontend/solidus_stripe.scss

@@ -4,3 +4,8 @@
   border: 1px solid #d9d9db;
   padding: 5px;
 }
+
+#cart #stripe-payment-request {
+  clear: both;
+  margin-top: 100px;
+}

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

@@ -3,9 +3,7 @@
 module SolidusStripe
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      class_option :migrate, type: :boolean, default: true
       class_option :auto_run_migrations, type: :boolean, default: false
-      class_option :auto_run_seeds, type: :boolean, default: false
 
       def add_stylesheets
         filename = 'vendor/assets/stylesheets/spree/frontend/all.css'
@@ -19,10 +17,11 @@ module SolidusStripe
       end
 
       def run_migrations
-        if options.migrate? && running_migrations?
+        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]'))
+        if run_migrations
           run 'bundle exec rake db:migrate'
         else
-          puts "Skiping rake db:migrate, don't forget to run it!"
+          puts 'Skipping rake db:migrate, don\'t forget to run it!' # rubocop:disable Rails/Output
         end
       end
 
@@ -32,15 +31,6 @@ module SolidusStripe
         say_status :loading, 'stripe seed data'
         rake('db:seed:solidus_stripe')
       end
-
-      private
-
-      def running_migrations?
-        options.auto_run_migrations? || begin
-          response = ask 'Would you like to run the migrations now? [Y/n]'
-          ['', 'y'].include? response.downcase
-        end
-      end
     end
   end
 end

data/lib/solidus_stripe/engine.rb

@@ -1,11 +1,18 @@
 # frozen_string_literal: true
 
+require 'spree/core'
+
 module SolidusStripe
   class Engine < Rails::Engine
+    include SolidusSupport::EngineExtensions::Decorators
+
+    isolate_namespace Spree
+
     engine_name 'solidus_stripe'
 
-    initializer "spree.payment_method.add_stripe_credit_card", after: "spree.register.payment_methods" do |app|
-      app.config.spree.payment_methods << Spree::PaymentMethod::StripeCreditCard
+    # use rspec for tests
+    config.generators do |g|
+      g.test_framework :rspec
     end
 
     if SolidusSupport.backend_available?
@@ -14,10 +21,15 @@ module SolidusStripe
 
     if SolidusSupport.frontend_available?
       paths["app/views"] << "lib/views/frontend"
+      config.assets.precompile += ['solidus_stripe/stripe-init.js']
     end
 
     if SolidusSupport.api_available?
       paths["app/views"] << "lib/views/api"
     end
+
+    initializer "spree.payment_method.add_stripe_credit_card", after: "spree.register.payment_methods" do |app|
+      app.config.spree.payment_methods << Spree::PaymentMethod::StripeCreditCard
+    end
   end
 end

data/lib/solidus_stripe/version.rb

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

data/lib/views/frontend/spree/checkout/payment/_stripe.html.erb

@@ -1,5 +1,7 @@
 <% if payment_method.v3_elements? %>
   <%= render 'spree/checkout/payment/v3/stripe', payment_method: payment_method %>
+<% elsif payment_method.v3_intents? %>
+  <%= render 'spree/checkout/payment/v3/intents', payment_method: payment_method %>
 <% else %>
   <%= render "spree/checkout/payment/gateway", payment_method: payment_method %>
   <%= render 'spree/checkout/payment/v2/javascript', payment_method: payment_method %>

data/lib/views/frontend/spree/checkout/payment/v2/_javascript.html.erb

@@ -4,7 +4,8 @@
 </script>
 
 <script>
-  Spree.stripePaymentMethod = $('#payment_method_' + <%= payment_method.id %>);
+  window.SolidusStripe = window.SolidusStripe || {};
+  SolidusStripe.paymentMethod = $('#payment_method_' + <%= payment_method.id %>);
   var mapCC, stripeResponseHandler;
 
   mapCC = function(ccType) {
@@ -29,25 +30,25 @@
       $('#stripeError').html(response.error.message);
       return $('#stripeError').show();
     } else {
-      Spree.stripePaymentMethod.find('#card_number, #card_expiry, #card_code').prop("disabled", true);
-      Spree.stripePaymentMethod.find(".ccType").prop("disabled", false);
-      Spree.stripePaymentMethod.find(".ccType").val(mapCC(response.card.brand));
+      SolidusStripe.paymentMethod.find('#card_number, #card_expiry, #card_code').prop("disabled", true);
+      SolidusStripe.paymentMethod.find(".ccType").prop("disabled", false);
+      SolidusStripe.paymentMethod.find(".ccType").val(mapCC(response.card.brand));
       token = response['id'];
-      paymentMethodId = Spree.stripePaymentMethod.prop('id').split("_")[2];
-      Spree.stripePaymentMethod.append("<input type='hidden' class='stripeToken' name='payment_source[" + paymentMethodId + "][gateway_payment_profile_id]' value='" + token + "'/>");
-      Spree.stripePaymentMethod.append("<input type='hidden' class='stripeToken' name='payment_source[" + paymentMethodId + "][last_digits]' value='" + response.card.last4 + "'/>");
-      Spree.stripePaymentMethod.append("<input type='hidden' class='stripeToken' name='payment_source[" + paymentMethodId + "][month]' value='" + response.card.exp_month + "'/>");
-      Spree.stripePaymentMethod.append("<input type='hidden' class='stripeToken' name='payment_source[" + paymentMethodId + "][year]' value='" + response.card.exp_year + "'/>");
-      return Spree.stripePaymentMethod.parents("form").get(0).submit();
+      paymentMethodId = SolidusStripe.paymentMethod.prop('id').split("_")[2];
+      SolidusStripe.paymentMethod.append("<input type='hidden' class='stripeToken' name='payment_source[" + paymentMethodId + "][gateway_payment_profile_id]' value='" + token + "'/>");
+      SolidusStripe.paymentMethod.append("<input type='hidden' class='stripeToken' name='payment_source[" + paymentMethodId + "][last_digits]' value='" + response.card.last4 + "'/>");
+      SolidusStripe.paymentMethod.append("<input type='hidden' class='stripeToken' name='payment_source[" + paymentMethodId + "][month]' value='" + response.card.exp_month + "'/>");
+      SolidusStripe.paymentMethod.append("<input type='hidden' class='stripeToken' name='payment_source[" + paymentMethodId + "][year]' value='" + response.card.exp_year + "'/>");
+      return SolidusStripe.paymentMethod.parents("form").get(0).submit();
     }
   };
 
   $(document).ready(function() {
-    Spree.stripePaymentMethod.prepend("<div id='stripeError' class='errorExplanation' style='display:none'></div>");
+    SolidusStripe.paymentMethod.prepend("<div id='stripeError' class='errorExplanation' style='display:none'></div>");
     return $('#checkout_form_payment [data-hook=buttons]').click(function() {
       var expiration, params;
       $('#stripeError').hide();
-      if (Spree.stripePaymentMethod.is(':visible')) {
+      if (SolidusStripe.paymentMethod.is(':visible')) {
         expiration = $('.cardExpiry:visible').payment('cardExpiryVal');
         params = $.extend({
           number: $('.cardNumber:visible').val(),

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

@@ -0,0 +1,28 @@
+<script>
+  // Stripe V3 elements specific JS code
+
+  var cardNumber = initElements();
+
+  cardNumber.addEventListener('change', function(event) {
+    if (event.error) {
+      showError(event.error.message);
+    } else {
+      errorElement.hide().text('');
+    }
+  });
+
+  form.bind('submit', function(event) {
+    if (element.is(':visible')) {
+      event.preventDefault();
+
+      stripe.createToken(cardNumber).then(function(result) {
+        if (result.error) {
+          showError(result.error.message);
+        } else {
+          stripeTokenHandler(result.token);
+          form[0].submit();
+        }
+      });
+    }
+  });
+</script>

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

@@ -0,0 +1,42 @@
+<div id="payment-request-button" data-stripe-config="<%= payment_method.stripe_config(current_order).to_json %>"></div>
+
+<%= image_tag 'credit_cards/credit_card.gif', id: 'credit-card-image' %>
+<% param_prefix = "payment_source[#{payment_method.id}]" %>
+
+<div class="field field-required">
+  <%= label_tag "name_on_card_#{payment_method.id}", t('spree.name_on_card') %>
+  <%= text_field_tag "#{param_prefix}[name]", "#{@order.billing_firstname} #{@order.billing_lastname}", { id: "name_on_card_#{payment_method.id}", autocomplete: "cc-name" } %>
+</div>
+
+<div class="field field-required" data-hook="card_number">
+  <%= label_tag "card_number", t('spree.card_number') %>
+  <div id="card_number"></div>
+  <span id="card_type" style="display:none;">
+    ( <span id="looks_like" ><%= t('spree.card_type_is') %> <span id="type"></span></span>
+      <span id="unrecognized"><%= t('spree.unrecognized_card_type') %></span>
+    )
+  </span>
+</div>
+
+<div class="field field-required" data-hook="card_expiration">
+  <%= label_tag "card_expiry", t('spree.expiration') %>
+  <div id="card_expiry"></div>
+</div>
+
+<div class="field field-required" data-hook="card_code">
+  <%= label_tag "card_cvc", t('spree.card_code') %>
+  <div id="card_cvc"></div>
+  <%= link_to "(#{t('spree.what_is_this')})", spree.cvv_path, target: '_blank', "data-hook" => "cvv_link", id: "cvv_link" %>
+</div>
+
+<div id="card-errors" class='errorExplanation' role="alert" style="display: none"></div>
+
+<% if @order.bill_address %>
+  <%= fields_for "#{param_prefix}[address_attributes]", @order.bill_address do |f| %>
+    <%= render partial: 'spree/address/form_hidden', locals: { form: f } %>
+  <% end %>
+<% end %>
+
+<%= hidden_field_tag "#{param_prefix}[cc_type]", '', id: "cc_type", class: 'ccType' %>
+
+<script src="https://js.stripe.com/v3/"></script>