spree_gateway 2.2.1 → 3.0.0

data/app/models/spree/gateway/cyber_source.rb

@@ -0,0 +1,10 @@
+module Spree
+  class Gateway::CyberSource < Gateway
+    preference :login, :string
+    preference :password, :password
+
+    def provider_class
+      ActiveMerchant::Billing::CyberSourceGateway
+    end
+  end
+end

data/app/models/spree/gateway/migs.rb

@@ -0,0 +1,11 @@
+module Spree
+  class Gateway::Migs < Gateway
+    preference :login, :string
+    preference :password, :string
+    preference :secure_hash, :string
+
+    def provider_class
+      ActiveMerchant::Billing::MigsGateway
+    end
+  end
+end

data/app/models/spree/gateway/payflow_pro.rb

@@ -2,6 +2,7 @@ module Spree
   class Gateway::PayflowPro < Gateway
     preference :login, :string
     preference :password, :password
+    preference :partner, :string
 
     def provider_class
       ActiveMerchant::Billing::PayflowGateway

data/app/models/spree/gateway/pin_gateway.rb

@@ -6,10 +6,55 @@ module Spree
     def provider_class
       ActiveMerchant::Billing::PinGateway
     end
+    
+    def purchase(money, creditcard, options = {})
+      super(money, creditcard.try(:gateway_customer_profile_id) || creditcard.try(:gateway_payment_profile_id) || creditcard, options)
+    end
+    
+    def create_profile(payment)
+      if payment.source.gateway_customer_profile_id.nil?
+        response = provider.store(payment.source, options_for_payment(payment))
+        
+        if response.success?
+          payment.source.update_attributes!(:gateway_customer_profile_id => response.authorization)
+
+          cc = response.params['response']['card']
+          payment.source.update_attributes!(:gateway_payment_profile_id => cc['token']) if cc
+        else
+          payment.send(:gateway_error, response.message)
+        end
+      end
+    end
 
     # Pin does not appear to support authorizing transactions yet
     def auto_capture?
       true
     end
+    
+    def payment_profiles_supported?
+      true
+    end
+    
+    private
+    
+    def options_for_payment(p)
+      o = Hash.new
+      o[:email] = p.order.email
+
+      if p.order.bill_address
+        bill_addr = p.order.bill_address
+
+        o[:billing_address] = {
+          address1: bill_addr.address1,
+          city: bill_addr.city,
+          state: bill_addr.state ? bill_addr.state.name : bill_addr.state_name,
+          country: bill_addr.country.iso3,
+          zip: bill_addr.zipcode
+        }
+      end
+
+      return o
+    end
+    
   end
 end

data/app/models/spree/gateway/spreedly_core_gateway.rb

@@ -0,0 +1,10 @@
+module Spree
+  class Gateway::SpreedlyCoreGateway < Gateway
+    preference :login, :string
+    preference :password, :string
+    preference :gateway_token, :string
+    def provider_class
+      ActiveMerchant::Billing::SpreedlyCoreGateway
+    end
+  end
+end

data/app/models/spree/gateway/stripe_gateway.rb

@@ -3,6 +3,12 @@ module Spree
     preference :secret_key, :string
     preference :publishable_key, :string
 
+    CARD_TYPE_MAPPING = {
+      'American Express' => 'american_express',
+      'Diners Club' => 'diners_club',
+      'Visa' => 'visa'
+    }
+
     def method_type
       'stripe'
     end
@@ -23,8 +29,8 @@ module Spree
       provider.authorize(*options_for_purchase_or_auth(money, creditcard, gateway_options))
     end
 
-    def capture(payment, creditcard, gateway_options)
-      provider.capture((payment.amount * 100).round, payment.response_code, gateway_options)
+    def capture(money, response_code, gateway_options)
+      provider.capture(money, response_code, gateway_options)
     end
 
     def credit(money, creditcard, response_code, gateway_options)
@@ -35,6 +41,10 @@ module Spree
       provider.void(response_code, {})
     end
 
+    def cancel(response_code)
+      provider.void(response_code, {})
+    end
+
     def create_profile(payment)
       return unless payment.source.gateway_customer_profile_id.nil?
       options = {
@@ -42,12 +52,21 @@ module Spree
         login: preferred_secret_key,
       }.merge! address_for(payment)
 
-      response = provider.store(payment.source, options)
+      source = update_source!(payment.source)
+      if source.number.blank? && source.gateway_payment_profile_id.present?
+        creditcard = source.gateway_payment_profile_id
+      else
+        creditcard = source
+      end
+
+      response = provider.store(creditcard, options)
       if response.success?
         payment.source.update_attributes!({
-          :gateway_customer_profile_id => response.params['id'],
-          :gateway_payment_profile_id => response.params['default_card']
+          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']
         })
+
       else
         payment.send(:gateway_error, response.message)
       end
@@ -61,7 +80,6 @@ module Spree
       options.merge(:login => preferred_secret_key)
     end
 
-
     def options_for_purchase_or_auth(money, creditcard, gateway_options)
       options = {}
       options[:description] = "Spree Order ID: #{gateway_options[:order_id]}"
@@ -99,5 +117,10 @@ module Spree
         end
       end
     end
+
+    def update_source!(source)
+      source.cc_type = CARD_TYPE_MAPPING[source.cc_type] if CARD_TYPE_MAPPING.include?(source.cc_type)
+      source
+    end
   end
 end

data/app/models/spree/gateway/usa_epay_transaction.rb

@@ -0,0 +1,9 @@
+module Spree
+  class Gateway::UsaEpayTransaction < Gateway
+    preference :login, :string
+
+    def provider_class
+      ActiveMerchant::Billing::UsaEpayTransactionGateway
+    end
+  end
+end

data/config/routes.rb

@@ -1,6 +1,6 @@
 Spree::Core::Engine.add_routes do
   # Add your extension routes here
-  resources :orders do
+  resources :orders, :only => [] do
     resource :checkout, :controller => 'checkout' do
       member do
         get :skrill_cancel

data/db/migrate/20111118164631_create_skrill_transactions.rb

@@ -7,8 +7,7 @@ class CreateSkrillTransactions < ActiveRecord::Migration
       t.integer :transaction_id
       t.integer :customer_id
       t.string :payment_type
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end
-

data/lib/assets/javascripts/spree/frontend/spree_gateway.js

@@ -0,0 +1 @@
+//= require spree/frontend

data/{app/controllers → lib/controllers/frontend}/spree/checkout_controller_decorator.rb

@@ -38,7 +38,7 @@ module Spree
 
     private
     def confirm_skrill
-      return unless (params[:state] == "payment") && params[:order][:payments_attributes]
+      return unless (params[:state] == "payment") && params[:order] && params[:order][:payments_attributes]
 
       payment_method = PaymentMethod.find(params[:order][:payments_attributes].first[:payment_method_id])
       if payment_method.kind_of?(BillingIntegration::Skrill::QuickCheckout)

data/lib/spree_gateway.rb

@@ -1,4 +1,4 @@
 require 'spree_core'
 require 'spree_gateway/engine'
-require 'savon'
 require 'coffee_script'
+require 'sass/rails'

data/lib/spree_gateway/engine.rb

@@ -5,31 +5,62 @@ module SpreeGateway
     config.autoload_paths += %W(#{config.root}/lib)
 
     initializer "spree.gateway.payment_methods", :after => "spree.register.payment_methods" do |app|
-        app.config.spree.payment_methods << Spree::Gateway::AuthorizeNetCim
-        app.config.spree.payment_methods << Spree::Gateway::AuthorizeNet
-        app.config.spree.payment_methods << Spree::Gateway::CardSave
-        app.config.spree.payment_methods << Spree::Gateway::Eway
-        app.config.spree.payment_methods << Spree::Gateway::Fatzebra
-        app.config.spree.payment_methods << Spree::Gateway::Linkpoint
-        app.config.spree.payment_methods << Spree::Gateway::Moneris
-        app.config.spree.payment_methods << Spree::Gateway::PayJunction
-        app.config.spree.payment_methods << Spree::Gateway::PayPalGateway
-        app.config.spree.payment_methods << Spree::Gateway::SagePay
-        app.config.spree.payment_methods << Spree::Gateway::Beanstream
-        app.config.spree.payment_methods << Spree::Gateway::BraintreeGateway
-        app.config.spree.payment_methods << Spree::Gateway::StripeGateway
-        app.config.spree.payment_methods << Spree::Gateway::Samurai
-        app.config.spree.payment_methods << Spree::Gateway::Worldpay
-        app.config.spree.payment_methods << Spree::Gateway::Banwire
-        app.config.spree.payment_methods << Spree::Gateway::UsaEpay
-        app.config.spree.payment_methods << Spree::BillingIntegration::Skrill::QuickCheckout
-        app.config.spree.payment_methods << Spree::Gateway::BalancedGateway
-        app.config.spree.payment_methods << Spree::Gateway::DataCash
-        app.config.spree.payment_methods << Spree::Gateway::UsaEpay
-        app.config.spree.payment_methods << Spree::Gateway::PinGateway
-        app.config.spree.payment_methods << Spree::Gateway::Paymill
-        app.config.spree.payment_methods << Spree::Gateway::PayflowPro
-        app.config.spree.payment_methods << Spree::Gateway::SecurePayAU
+      app.config.spree.payment_methods << Spree::BillingIntegration::Skrill::QuickCheckout
+      app.config.spree.payment_methods << Spree::Gateway::AuthorizeNet
+      app.config.spree.payment_methods << Spree::Gateway::AuthorizeNetCim
+      app.config.spree.payment_methods << Spree::Gateway::BalancedGateway
+      app.config.spree.payment_methods << Spree::Gateway::Banwire
+      app.config.spree.payment_methods << Spree::Gateway::Beanstream
+      app.config.spree.payment_methods << Spree::Gateway::BraintreeGateway
+      app.config.spree.payment_methods << Spree::Gateway::CardSave
+      app.config.spree.payment_methods << Spree::Gateway::CyberSource
+      app.config.spree.payment_methods << Spree::Gateway::DataCash
+      app.config.spree.payment_methods << Spree::Gateway::Eway
+      app.config.spree.payment_methods << Spree::Gateway::Maxipago
+      app.config.spree.payment_methods << Spree::Gateway::Migs
+      app.config.spree.payment_methods << Spree::Gateway::Moneris
+      app.config.spree.payment_methods << Spree::Gateway::PayJunction
+      app.config.spree.payment_methods << Spree::Gateway::PayPalGateway
+      app.config.spree.payment_methods << Spree::Gateway::PayflowPro
+      app.config.spree.payment_methods << Spree::Gateway::Paymill
+      app.config.spree.payment_methods << Spree::Gateway::PinGateway
+      app.config.spree.payment_methods << Spree::Gateway::SagePay
+      app.config.spree.payment_methods << Spree::Gateway::SecurePayAU
+      app.config.spree.payment_methods << Spree::Gateway::SpreedlyCoreGateway
+      app.config.spree.payment_methods << Spree::Gateway::StripeGateway
+      app.config.spree.payment_methods << Spree::Gateway::UsaEpayTransaction
+      app.config.spree.payment_methods << Spree::Gateway::Worldpay
     end
+
+    def self.activate
+      if SpreeGateway::Engine.frontend_available?
+        Rails.application.config.assets.precompile += [
+          'lib/assets/javascripts/spree/frontend/spree_gateway.js',
+          'lib/assets/javascripts/spree/frontend/spree_gateway.css',
+        ]
+        Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/frontend/*/*_decorator*.rb")) do |c|
+          Rails.configuration.cache_classes ? require(c) : load(c)
+        end
+      end
+    end
+
+    def self.backend_available?
+      @@backend_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Backend::Engine')
+    end
+
+    def self.frontend_available?
+      @@frontend_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Frontend::Engine')
+    end
+
+    if self.backend_available?
+      paths["app/views"] << "lib/views/backend"
+    end
+
+    if self.frontend_available?
+      paths["app/controllers"] << "lib/controllers/frontend"
+      paths["app/views"] << "lib/views/frontend"
+    end
+
+    config.to_prepare &method(:activate).to_proc
   end
 end

data/lib/views/backend/spree/admin/payments/source_forms/_stripe.html.erb

@@ -0,0 +1 @@
+<%= render "spree/admin/payments/source_forms/gateway", payment_method: payment_method, previous_cards: payment_method.reusable_sources(@order) %>

data/{app/views → lib/views/frontend}/spree/checkout/payment/_quickcheckout.html.erb

@@ -4,9 +4,9 @@
 opts = {}
 opts[:transaction_id] = "#{@order.number}"
 opts[:amount] = @order.total
-opts[:return_url] = skrill_return_order_checkout_url(@order, :token => @order.token,
+opts[:return_url] = skrill_return_order_checkout_url(@order, :token => @order.guest_token,
                                                              :payment_method_id => payment_method.id)
-opts[:cancel_url] = skrill_cancel_order_checkout_url(@order, :token => @order.token)
+opts[:cancel_url] = skrill_cancel_order_checkout_url(@order, :token => @order.guest_token)
 opts[:status_url] = skrill_url
 opts[:payment_method_id] = payment_method.id
 %>

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

@@ -0,0 +1,90 @@
+<%= render "spree/checkout/payment/gateway", payment_method: payment_method %>
+
+<script type="text/javascript" src="https://js.stripe.com/v2/"></script>
+<script type="text/javascript">
+  Stripe.setPublishableKey("<%= payment_method.preferred_publishable_key %>");
+</script>
+
+<script>
+  Spree.stripePaymentMethod = $('#payment_method_' + <%= payment_method.id %>);
+
+  var mapCC, stripeResponseHandler;
+
+  mapCC = function(ccType) {
+    if (ccType === 'MasterCard') {
+      return 'mastercard';
+    } else if (ccType === 'Visa') {
+      return 'visa';
+    } else if (ccType === 'American Express') {
+      return 'amex';
+    } else if (ccType === 'Discover') {
+      return 'discover';
+    } else if (ccType === 'Diners Club') {
+      return 'dinersclub';
+    } else if (ccType === 'JCB') {
+      return 'jcb';
+    }
+  };
+
+  stripeResponseHandler = function(status, response) {
+    var paymentMethodId, token;
+    if (response.error) {
+      $('#stripeError').html(response.error.message);
+      var param_map = {
+        number:    '#card_number',
+        exp_month: '#card_expiry',
+        exp_year:  '#card_expiry',
+        cvc:       '#card_code'
+      }
+      if (response.error.param)
+        Spree.stripePaymentMethod.find(param_map[response.error.param]).addClass('error');
+
+      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));
+      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").trigger('submit');
+    }
+  };
+
+  $(document).ready(function() {
+    Spree.stripePaymentMethod.prepend("<div id='stripeError' class='errorExplanation' style='display:none'></div>");
+    return $('#checkout_form_payment [data-hook=buttons]').click(function() {
+      var expiration, params;
+      $('#stripeError').hide();
+      Spree.stripePaymentMethod.find('#card_number, #card_expiry, #card_code').removeClass('error');
+      if (Spree.stripePaymentMethod.is(':visible')) {
+        expiration = $('.cardExpiry:visible').payment('cardExpiryVal');
+        params = $.extend({
+          number: $('.cardNumber:visible').val(),
+          cvc: $('.cardCode:visible').val(),
+          exp_month: expiration.month || 0,
+          exp_year: expiration.year || 0
+        }, Spree.stripeAdditionalInfo);
+        Stripe.card.createToken(params, stripeResponseHandler);
+        return false;
+      }
+    });
+  });
+</script>
+
+<%- if @order.has_checkout_step?('address') -%>
+  <script>
+    Spree.stripeAdditionalInfo = {
+      name: "<%= @order.bill_address.full_name %>",
+      address_line1: "<%= @order.bill_address.address1 %>",
+      address_line2: "<%= @order.bill_address.address2 %>",
+      address_city: "<%= @order.bill_address.city %>",
+      address_state: "<%= @order.bill_address.state_text %>",
+      address_zip: "<%= @order.bill_address.zipcode %>",
+      address_country: "<%= @order.bill_address.country %>"
+    }
+  </script>
+<%- end -%>

data/spec/factories/payment_method_factory.rb

@@ -1,6 +1,5 @@
 FactoryGirl.define do
   factory :skrill_quick_checkout, class: Spree::BillingIntegration::Skrill::QuickCheckout do
     name 'Skrill - Quick Checkout'
-    environment 'test'
   end
 end

data/spec/features/stripe_checkout_spec.rb

@@ -10,8 +10,7 @@ describe "Stripe checkout" do
     Spree::Gateway::StripeGateway.create!(
       :name => "Stripe",
       :preferred_secret_key => "sk_test_VCZnDv3GLU15TRvn8i2EsaAN",
-      :preferred_publishable_key => "pk_test_Cuf0PNtiAkkMpTVC2gwYDMIg",
-      :environment => "test"
+      :preferred_publishable_key => "pk_test_Cuf0PNtiAkkMpTVC2gwYDMIg"
     )
   end
 
@@ -63,6 +62,7 @@ describe "Stripe checkout" do
   it "shows an error with an invalid credit card number", :js => true do
     click_button "Save and Continue"
     page.should have_content("This card number looks invalid")
+    page.should have_css('#card_number.error')
   end
 
   it "shows an error with invalid security fields", :js => true do
@@ -70,13 +70,24 @@ describe "Stripe checkout" do
     fill_in "Expiration", :with => "01 / #{Time.now.year + 1}"
     click_button "Save and Continue"
     page.should have_content("Your card's security code is invalid.")
+    page.should have_css('#card_code.error')
   end
 
-  it "shows an error with invalid expiry fields", :js => true do
+  it "shows an error with invalid expiry month field", :js => true do
     fill_in "Card Number", :with => "4242 4242 4242 4242"
     fill_in "Expiration", :with => "00 / #{Time.now.year + 1}"
     fill_in "Card Code", :with => "123"
     click_button "Save and Continue"
     page.should have_content("Your card's expiration month is invalid.")
+    page.should have_css('#card_expiry.error')
   end
-end
+
+  it "shows an error with invalid expiry year field", :js => true do
+    fill_in "Card Number", :with => "4242 4242 4242 4242"
+    fill_in "Expiration", :with => "12 / "
+    fill_in "Card Code", :with => "123"
+    click_button "Save and Continue"
+    page.should have_content("Your card's expiration year is invalid.")
+    page.should have_css('#card_expiry.error')
+  end
+end