activemerchant 1.31.0 → 1.32.0

data/lib/active_merchant/billing/gateways/paypal/paypal_express_response.rb

@@ -8,31 +8,36 @@ module ActiveMerchant #:nodoc:
       def info
         (@params['PayerInfo']||{})
       end
-      
+
+      def details
+        (@params['PaymentDetails']||{})
+      end
+
       def name
         payer = (info['PayerName']||{})
         [payer['FirstName'], payer['MiddleName'], payer['LastName']].compact.join(' ')
       end
-      
+
       def token
         @params['Token']
       end
-      
+
       def payer_id
         info['PayerID']
       end
-      
+
       def payer_country
         info['PayerCountry']
       end
-      
-      # PayPal returns a contact telephone number only if your Merchant account profile settings require that the buyer enter one.
+
+      # PayPal returns a contact telephone number only if your Merchant account
+      # profile settings require that the buyer enter one.
       def contact_phone
         @params['ContactPhone']
       end
-      
+
       def address
-        address = (@params['PaymentDetails']||{})['ShipToAddress']
+        address = (details['ShipToAddress']||{})
         {  'name'       => address['Name'],
            'company'    => info['PayerBusiness'],
            'address1'   => address['Street1'],
@@ -44,7 +49,7 @@ module ActiveMerchant #:nodoc:
            'phone'      => (contact_phone || address['Phone'])
         }
       end
-      
+
       def shipping
         shipping = (@params['UserSelectedOptions']||{})
         {  'amount'   => shipping['ShippingOptionAmount'],

data/lib/active_merchant/billing/gateways/pin.rb

@@ -78,7 +78,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_invoice(post, options)
-        post[:description] = options[:description]
+        post[:description] = options[:description] || "Active Merchant Purchase"
       end
 
       def add_creditcard(post, creditcard)
@@ -93,22 +93,30 @@ module ActiveMerchant #:nodoc:
             :name => "#{creditcard.first_name} #{creditcard.last_name}"
           )
         elsif creditcard.kind_of?(String)
-          post[:customer_token] = creditcard
+          if creditcard =~ /^card_/
+            post[:card_token] = creditcard
+          else
+            post[:customer_token] = creditcard
+          end
         end
       end
 
-      def headers
-        {
+      def headers(params = {})
+        result = {
           "Content-Type" => "application/json",
           "Authorization" => "Basic #{Base64.strict_encode64(options[:api_key] + ':').strip}"
         }
+
+        result['X-Partner-Key'] = params[:partner_key] if params[:partner_key]
+        result['X-Safe-Card'] = params[:safe_card] if params[:safe_card]
+        result
       end
 
       def commit(action, params)
         url = "#{test? ? test_url : live_url}/#{action}"
 
         begin
-          body = parse(ssl_post(url, post_data(params), headers))
+          body = parse(ssl_post(url, post_data(params), headers(params)))
         rescue ResponseError => e
           body = parse(e.response.body)
         end

data/lib/active_merchant/billing/gateways/spreedly_core.rb

@@ -3,11 +3,11 @@ require 'nokogiri'
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     # Public: This gateway allows you to interact with any gateway you've
-    # created in Spreedly Core (https://spreedlycore.com).  It's an adapter
-    # which can be particularly useful if you already have code interacting with
-    # ActiveMerchant and want to easily take advantage of Core's vault.
+    # created in Spreedly (https://spreedly.com).  It's an adapter which can be
+    # particularly useful if you already have code interacting with
+    # ActiveMerchant and want to easily take advantage of Spreedly's vault.
     class SpreedlyCoreGateway < Gateway
-      self.live_url = 'https://spreedlycore.com/v1'
+      self.live_url = 'https://core.spreedly.com/v1'
 
       self.supported_countries = %w(AD AE AT AU BD BE BG BN CA CH CY CZ DE DK EE EG ES FI FR GB
                                     GI GR HK HU ID IE IL IM IN IS IT JO KW LB LI LK LT LU LV MC
@@ -15,18 +15,18 @@ module ActiveMerchant #:nodoc:
                                     TR TT UM US VA VN ZA)
 
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
-      self.homepage_url = 'https://spreedlycore.com'
-      self.display_name = 'Spreedly Core'
+      self.homepage_url = 'https://spreedly.com'
+      self.display_name = 'Spreedly'
       self.money_format = :cents
       self.default_currency = 'USD'
 
-      # Public: Create a new Spreedly Core Gateway.
+      # Public: Create a new Spreedly gateway.
       #
       # options - A hash of options:
-      #           :login         - Your Spreedly Core API login.
-      #           :password      - Your Spreedly Core API secret.
+      #           :login         - The environment key.
+      #           :password      - The access secret.
       #           :gateway_token - The token of the gateway you've created in
-      #                            Spreedly Core.
+      #                            Spreedly.
       def initialize(options = {})
         requires!(options, :login, :password, :gateway_token)
         super
@@ -35,8 +35,7 @@ module ActiveMerchant #:nodoc:
       # Public: Run a purchase transaction.
       #
       # money          - The monetary amount of the transaction in cents.
-      # payment_method - The CreditCard or the Spreedly Core payment method
-      #                  token.
+      # payment_method - The CreditCard or the Spreedly payment method token.
       # options        - A standard ActiveMerchant options hash
       def purchase(money, payment_method, options = {})
         if payment_method.is_a?(String)
@@ -52,8 +51,7 @@ module ActiveMerchant #:nodoc:
       # Public: Run an authorize transaction.
       #
       # money          - The monetary amount of the transaction in cents.
-      # payment_method - The CreditCard or the Spreedly Core payment method
-      #                  token.
+      # payment_method - The CreditCard or the Spreedly payment method token.
       # options        - A standard ActiveMerchant options hash
       def authorize(money, payment_method, options = {})
         if payment_method.is_a?(String)
@@ -86,7 +84,7 @@ module ActiveMerchant #:nodoc:
         commit("transactions/#{authorization}/void.xml", '')
       end
 
-      # Public: Store a credit card in the Spreedly Core vault and retain it.
+      # Public: Store a credit card in the Spreedly vault and retain it.
       #
       # credit_card    - The CreditCard to store
       # options        - A standard ActiveMerchant options hash
@@ -94,8 +92,8 @@ module ActiveMerchant #:nodoc:
         save_card(true, credit_card, options)
       end
 
-      # Public: Redact the CreditCard in Spreedly Core.  This wipes the
-      # sensitive payment information from the card.
+      # Public: Redact the CreditCard in Spreedly. This wipes the sensitive
+      #         payment information from the card.
       #
       # credit_card    - The CreditCard to store
       # options        - A standard ActiveMerchant options hash

data/lib/active_merchant/billing/gateways/stripe.rb

@@ -35,6 +35,14 @@ module ActiveMerchant #:nodoc:
         super
       end
 
+      def authorize(money, creditcard, options = {})
+        post = create_post_for_auth_or_purchase(money, creditcard, options)
+        post[:capture] = "false"
+        meta = generate_meta(options)
+
+        commit(:post, 'charges', post, meta)
+      end
+
       # To create a charge on a card or a token, call
       #
       #   purchase(money, card_hash_or_token, { ... })
@@ -43,23 +51,16 @@ module ActiveMerchant #:nodoc:
       #
       #   purchase(money, nil, { :customer => id, ... })
       def purchase(money, creditcard, options = {})
-        post = {}
-
-        add_amount(post, money, options)
-        add_creditcard(post, creditcard, options)
-        add_customer(post, options)
-        add_customer_data(post,options)
-        post[:description] = options[:description] || options[:email]
-        post[:application_fee] = options[:application_fee] if options[:application_fee]
-        add_flags(post, options)
-
+        post = create_post_for_auth_or_purchase(money, creditcard, options)
         meta = generate_meta(options)
 
-        raise ArgumentError.new("Customer or Credit Card required.") if !post[:card] && !post[:customer]
-
         commit(:post, 'charges', post, meta)
       end
 
+      def capture(money, authorization, options = {})
+        commit(:post, "charges/#{CGI.escape(authorization)}/capture", {:amount => amount(money)})
+      end
+
       def void(identification, options = {})
         commit(:post, "charges/#{CGI.escape(identification)}/refund", {})
       end
@@ -101,6 +102,18 @@ module ActiveMerchant #:nodoc:
 
       private
 
+      def create_post_for_auth_or_purchase(money, creditcard, options)
+        post = {}
+        add_amount(post, money, options)
+        add_creditcard(post, creditcard, options)
+        add_customer(post, options)
+        add_customer_data(post,options)
+        post[:description] = options[:description] || options[:email]
+        post[:application_fee] = options[:application_fee] if options[:application_fee]
+        add_flags(post, options)
+        post
+      end
+
       def add_amount(post, money, options)
         post[:amount] = amount(money)
         post[:currency] = (options[:currency] || currency(money)).downcase

data/lib/active_merchant/billing/gateways/webpay.rb

@@ -13,6 +13,14 @@ module ActiveMerchant #:nodoc:
       self.homepage_url = 'https://webpay.jp/'
       self.display_name = 'WebPay'
 
+      def authorize(money, credit_card, options = {})
+        raise NotImplementedError.new
+      end
+
+      def capture(money, credit_card, options = {})
+        raise NotImplementedError.new
+      end
+
       def json_error(raw_response)
         msg = 'Invalid response received from the WebPay API.  Please contact support@webpay.jp if you continue to receive this message.'
         msg += "  (The raw response returned by the API was #{raw_response.inspect})"

data/lib/active_merchant/billing/gateways/worldpay.rb

@@ -58,7 +58,7 @@ module ActiveMerchant #:nodoc:
 
       def refund(money, authorization, options = {})
         MultiResponse.run do |r|
-          r.process{inquire_request(authorization, options, "CAPTURED")}
+          r.process{inquire_request(authorization, options, "CAPTURED", "SETTLED")}
           r.process{refund_request(money, authorization, options)}
         end
       end
@@ -77,12 +77,12 @@ module ActiveMerchant #:nodoc:
         commit('cancel', build_void_request(authorization, options), :ok)
       end
 
-      def inquire_request(authorization, options, success_criteria)
-        commit('inquiry', build_order_inquiry_request(authorization, options), success_criteria)
+      def inquire_request(authorization, options, *success_criteria)
+        commit('inquiry', build_order_inquiry_request(authorization, options), *success_criteria)
       end
 
       def refund_request(money, authorization, options)
-        commit('inquiry', build_refund_request(money, authorization, options), :ok)
+        commit('refund', build_refund_request(money, authorization, options), :ok)
       end
 
       def build_request
@@ -149,7 +149,7 @@ module ActiveMerchant #:nodoc:
       def build_refund_request(money, authorization, options)
         build_order_modify_request(authorization) do |xml|
           xml.tag! 'refund' do
-            add_amount(xml, money, options)
+            add_amount(xml, money, options.merge(:debit_credit_indicator => "credit"))
           end
         end
       end
@@ -158,7 +158,17 @@ module ActiveMerchant #:nodoc:
         currency = options[:currency] || currency(money)
         amount   = localized_amount(money, currency)
 
-        xml.tag! 'amount', :value => amount, 'currencyCode' => currency, 'exponent' => 2
+        amount_hash = {
+          :value => amount,
+          'currencyCode' => currency,
+          'exponent' => 2
+        }
+
+        if options[:debit_credit_indicator]
+          amount_hash.merge!('debitCreditIndicator' => options[:debit_credit_indicator])
+        end
+
+        xml.tag! 'amount', amount_hash
       end
 
       def add_payment_method(xml, amount, payment_method, options)
@@ -226,20 +236,18 @@ module ActiveMerchant #:nodoc:
         raw
       end
 
-      def commit(action, request, success_criteria)
-        xmr = ssl_post((test? ? self.test_url : self.live_url),
-          request,
-          'Content-Type' => 'text/xml',
-          'Authorization' => encoded_credentials)
-
+      def commit(action, request, *success_criteria)
+        xmr = ssl_post(url, request, 'Content-Type' => 'text/xml', 'Authorization' => encoded_credentials)
         raw = parse(action, xmr)
+        success, message = success_and_message_from(raw, success_criteria)
 
         Response.new(
-          success_from(raw, success_criteria),
-          message_from(raw),
+          success,
+          message,
           raw,
           :authorization => authorization_from(raw),
           :test => test?)
+
       rescue ActiveMerchant::ResponseError => e
         if e.response.code.to_s == "401"
           return Response.new(false, "Invalid credentials", {}, :test => test?)
@@ -248,15 +256,29 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def success_from(raw, success_criteria)
-        (raw[:last_event] == success_criteria ||
-          raw[:ok].present?)
+      def url
+        test? ? self.test_url : self.live_url
       end
 
-      def message_from(raw)
-        (raw[:iso8583_return_code_description] ||
-          raw[:error] ||
-          "SUCCESS")
+      # success_criteria can be:
+      #   - a string or an array of strings (if one of many responses)
+      #   - An array of strings if one of many responses could be considered a
+      #     success.
+      def success_and_message_from(raw, success_criteria)
+        success = (success_criteria.include?(raw[:last_event]) || raw[:ok].present?)
+        if success
+          message = "SUCCESS"
+        else
+          message = (raw[:iso8583_return_code_description] || raw[:error] || required_status_message(raw, success_criteria))
+        end
+
+        [ success, message ]
+      end
+
+      def required_status_message(raw, success_criteria)
+        if(!success_criteria.include?(raw[:last_event]))
+          "A transaction status of #{success_criteria.collect{|c| "'#{c}'"}.join(" or ")} is required."
+        end
       end
 
       def authorization_from(raw)
@@ -272,7 +294,7 @@ module ActiveMerchant #:nodoc:
       def localized_amount(money, currency)
         amount = amount(money)
         return amount unless CURRENCIES_WITHOUT_FRACTIONS.include?(currency.to_s)
-        
+
         amount.to_i / 100 * 100
       end
     end

data/lib/active_merchant/billing/integrations/payflow_link/helper.rb

@@ -32,14 +32,15 @@ module ActiveMerchant #:nodoc:
                                      :phone   => 'phone',
                                      :name    => 'name'
 
-          mapping :customer, :name => 'name'
+          mapping :customer, { :first_name => 'first_name', :last_name => 'last_name' }
 
           def description(value)
             add_field('description', "#{value}".delete("#"))
           end
 
           def customer(params = {})
-            add_field(mappings[:customer][:name], [params.delete(:first_name), params.delete(:last_name)].compact.join(' '))
+            add_field(mappings[:customer][:first_name], params[:first_name])
+            add_field(mappings[:customer][:last_name], params[:last_name])
           end
 
           def billing_address(params = {})

data/lib/active_merchant/billing/integrations/pxpay/helper.rb

@@ -80,6 +80,7 @@ module ActiveMerchant #:nodoc:
             root = xml.add_element('GenerateRequest')
 
             @fields.each do | k, v |
+              v = v.slice(0, 50) if k == "MerchantReference"
               root.add_element(k).text = v
             end
 

data/lib/active_merchant/billing/integrations/robokassa/common.rb

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
           def generate_signature_string
             custom_param_keys = params.keys.select {|key| key =~ /^shp/}.sort
             custom_params = custom_param_keys.map {|key| "#{key}=#{params[key]}"}
-            [main_params, secret, custom_params].flatten.compact.join(':')
+            [main_params, secret, custom_params.compact].flatten.join(':')
           end
 
           def generate_signature

data/lib/active_merchant/billing/integrations/sage_pay_form/helper.rb

@@ -41,6 +41,8 @@ module ActiveMerchant #:nodoc:
           mapping :return_url, 'SuccessURL'
           mapping :description, 'Description'
 
+          class_attribute :referrer_id
+
           def shipping_address(params = {})
             @shipping_address_set = true unless params.empty?
 
@@ -74,12 +76,14 @@ module ActiveMerchant #:nodoc:
             key = fields['EncryptKey']
             @crypt ||= create_crypt_field(fields.except(*crypt_skip), key)
 
-            {
+            result = {
               'VPSProtocol' => '2.23',
               'TxType' => 'PAYMENT',
               'Vendor' => @fields['Vendor'],
               'Crypt'  => @crypt
             }
+            result['ReferrerID'] = referrer_id if referrer_id
+            result
           end
 
           private

data/lib/active_merchant/billing/integrations/world_pay.rb

@@ -4,20 +4,27 @@ require File.dirname(__FILE__) + '/world_pay/notification.rb'
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
-      module WorldPay 
-       
-        # production and test have the same endpoint
-        mattr_accessor :production_url
-        self.production_url = 'https://secure.wp3.rbsworldpay.com/wcc/purchase'
-        
+      module WorldPay
+
+        mattr_accessor :production_url, :test_url
+        self.production_url = 'https://secure.worldpay.com/wcc/purchase'
+        self.test_url = 'https://secure-test.worldpay.com/wcc/purchase'
+
         def self.service_url
-          production_url
+          case ActiveMerchant::Billing::Base.integration_mode
+          when :production
+            self.production_url
+          when :test
+            self.test_url
+          else
+            raise StandardError, "Integration mode set to an invalid value: #{mode}"
+          end
         end
 
         def self.notification(post, options = {})
           Notification.new(post, options)
         end
-        
+
         def self.return(post, options = {})
           Return.new(post, options)
         end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.31.0"
+  VERSION = "1.32.0"
 end