activemerchant 1.42.2 → 1.42.3

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

@@ -40,7 +40,7 @@ module ActiveMerchant #:nodoc:
         post = create_post_for_auth_or_purchase(money, creditcard, options)
         post[:capture] = "false"
 
-        commit(:post, 'charges', post, generate_options(options))
+        commit(:post, 'charges', post, options)
       end
 
       # To create a charge on a card or a token, call
@@ -53,31 +53,30 @@ module ActiveMerchant #:nodoc:
       def purchase(money, creditcard, options = {})
         post = create_post_for_auth_or_purchase(money, creditcard, options)
 
-        commit(:post, 'charges', post, generate_options(options))
+        commit(:post, 'charges', post, options)
       end
 
       def capture(money, authorization, options = {})
         post = {:amount => amount(money)}
         add_application_fee(post, options)
 
-        commit(:post, "charges/#{CGI.escape(authorization)}/capture", post)
+        commit(:post, "charges/#{CGI.escape(authorization)}/capture", post, options)
       end
 
       def void(identification, options = {})
-        commit(:post, "charges/#{CGI.escape(identification)}/refund", {})
+        commit(:post, "charges/#{CGI.escape(identification)}/refund", {}, options)
       end
 
       def refund(money, identification, options = {})
         post = {:amount => amount(money)}
-        commit_options = generate_options(options)
 
         MultiResponse.run(:first) do |r|
-          r.process { commit(:post, "charges/#{CGI.escape(identification)}/refund", post, commit_options) }
+          r.process { commit(:post, "charges/#{CGI.escape(identification)}/refund", post, options) }
 
           return r unless options[:refund_fee_amount]
 
-          r.process { fetch_application_fees(identification, commit_options) }
-          r.process { refund_application_fee(options[:refund_fee_amount], application_fee_from_response(r), commit_options) }
+          r.process { fetch_application_fees(identification, options) }
+          r.process { refund_application_fee(options[:refund_fee_amount], application_fee_from_response(r), options) }
         end
       end
 
@@ -104,17 +103,16 @@ module ActiveMerchant #:nodoc:
         post[:description] = options[:description]
         post[:email] = options[:email]
 
-        commit_options = generate_options(options)
         if options[:customer]
           MultiResponse.run(:first) do |r|
-            r.process { commit(:post, "customers/#{CGI.escape(options[:customer])}/cards", post, commit_options) }
+            r.process { commit(:post, "customers/#{CGI.escape(options[:customer])}/cards", post, options) }
 
             return r unless options[:set_default] and r.success? and !r.params["id"].blank?
 
             r.process { update_customer(options[:customer], :default_card => r.params["id"]) }
           end
         else
-          commit(:post, 'customers', post, commit_options)
+          commit(:post, 'customers', post, options)
         end
       end
 
@@ -124,14 +122,14 @@ module ActiveMerchant #:nodoc:
       end
 
       def update_customer(customer_id, options = {})
-        commit(:post, "customers/#{CGI.escape(customer_id)}", options, generate_options(options))
+        commit(:post, "customers/#{CGI.escape(customer_id)}", options, options)
       end
 
       def unstore(customer_id, card_id = nil, options = {})
         if card_id.nil?
-          commit(:delete, "customers/#{CGI.escape(customer_id)}", nil, generate_options(options))
+          commit(:delete, "customers/#{CGI.escape(customer_id)}", nil, options)
         else
-          commit(:delete, "customers/#{CGI.escape(customer_id)}/cards/#{CGI.escape(card_id)}", nil, generate_options(options))
+          commit(:delete, "customers/#{CGI.escape(customer_id)}/cards/#{CGI.escape(card_id)}", nil, options)
         end
       end
 
@@ -143,7 +141,8 @@ module ActiveMerchant #:nodoc:
         add_creditcard(post, creditcard, options)
         add_customer(post, creditcard, options)
         add_customer_data(post,options)
-        post[:description] = options[:description] || options[:email]
+        post[:description] = options[:description]
+        post[:metadata] = { email: options[:email] } if options[:email]
         add_flags(post, options)
         add_application_fee(post, options)
         post
@@ -158,6 +157,10 @@ module ActiveMerchant #:nodoc:
         post[:application_fee] = options[:application_fee] if options[:application_fee]
       end
 
+      def add_expand_parameters(post, options)
+        post[:expand] = Array.wrap(options[:expand])
+      end
+
       def add_customer_data(post, options)
         metadata_options = [:description, :ip, :user_agent, :referrer]
         post.update(options.slice(*metadata_options))
@@ -232,21 +235,14 @@ module ActiveMerchant #:nodoc:
               h["#{key}[#{k}]"] = v unless v.blank?
             end
             post_data(h)
+          elsif value.is_a?(Array)
+            value.map { |v| "#{key}[]=#{CGI.escape(v.to_s)}" }.join("&")
           else
             "#{key}=#{CGI.escape(value.to_s)}"
           end
         end.compact.join("&")
       end
 
-      def generate_options(raw_options)
-        options = generate_meta(raw_options)
-        options.merge!(raw_options.slice(:version))
-      end
-
-      def generate_meta(options)
-        {:meta => {:ip => options[:ip]}}
-      end
-
       def headers(options = {})
         @@ua ||= JSON.dump({
           :bindings_version => ActiveMerchant::VERSION,
@@ -262,13 +258,15 @@ module ActiveMerchant #:nodoc:
           "Authorization" => "Basic " + Base64.encode64(key.to_s + ":").strip,
           "User-Agent" => "Stripe/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
           "X-Stripe-Client-User-Agent" => @@ua,
-          "X-Stripe-Client-User-Metadata" => options[:meta].to_json
+          "X-Stripe-Client-User-Metadata" => {:ip => options[:ip]}.to_json
         }
         headers.merge!("Stripe-Version" => options[:version]) if options[:version]
         headers
       end
 
       def commit(method, url, parameters=nil, options = {})
+        add_expand_parameters(parameters, options) if parameters
+
         raw_response = response = nil
         success = false
         begin

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

@@ -179,7 +179,6 @@ module ActiveMerchant #:nodoc:
       } #:nodoc:
 
       CHECK_DATA_OPTIONS = {
-        :check_number => [:integer, 'CheckNumber'],
         :drivers_license => [:string, 'DriversLicense'],
         :drivers_license_state => [:string, 'DriversLicenseState'],
         :record_type => [:string, 'RecordType'],
@@ -339,9 +338,10 @@ module ActiveMerchant #:nodoc:
         commit(__method__, request)
       end
 
-      # Update a customer by replacing all of the customer details..
+      # Update a customer by replacing all of the customer details.
       #
-      # Use quickUpdateCustomer to just update a few attributes.
+      # ==== Required
+      # * <tt>:customer_number</tt> -- customer to update
       #
       # ==== Options
       #  * Same as add_customer
@@ -355,7 +355,7 @@ module ActiveMerchant #:nodoc:
 
       # Enable a customer for recurring billing.
       #
-      # Note: Customer does not need to have all recurring paramerters to succeed.
+      # Note: Customer does not need to have all recurring parameters to succeed.
       #
       # ==== Required
       # * <tt>:customer_number</tt>
@@ -454,7 +454,7 @@ module ActiveMerchant #:nodoc:
         commit(__method__, request)
       end
 
-      # Delete one the payment methods beloning to a customer
+      # Delete one the payment methods belonging to a customer
       #
       # ==== Required
       # * <tt>:customer_number</tt>
@@ -543,11 +543,11 @@ module ActiveMerchant #:nodoc:
       # will be returned in the response.
       #
       # ==== Options
-      # * <tt>:method</tt> -- credit_card or check
+      # * <tt>:payment_method</tt> -- credit_card or check
       # * <tt>:command</tt> -- sale, credit, void, creditvoid, authonly, capture, postauth, check, checkcredit; defaults to sale; only required for run_transaction when other than sale
       # * <tt>:reference_number</tt> -- for the original transaction; obtained by sale or authonly
       # * <tt>:authorization_code</tt> -- required for postauth; obtained offline
-      # * <tt>:ignore_duplicate</tt> -- set +true+ if you want to override the duplicate tranaction handling
+      # * <tt>:ignore_duplicate</tt> -- set +true+ if you want to override the duplicate transaction handling
       # * <tt>:account_holder</tt> -- name of account holder
       # * <tt>:customer_id</tt> -- merchant assigned id
       # * <tt>:customer_receipt</tt> -- set +true+ to email receipt to billing email address
@@ -680,7 +680,7 @@ module ActiveMerchant #:nodoc:
         commit(__method__, request)
       end
 
-      # Override transaction flagged for mananager approval.
+      # Override transaction flagged for manager approval.
       #
       # Note: Checks only!
       #
@@ -1166,7 +1166,7 @@ module ActiveMerchant #:nodoc:
         soap.tag! "ns1:captureTransaction" do |soap|
           build_token soap, options
           build_tag soap, :integer, 'RefNum', options[:reference_number]
-          build_tag soap, :double, 'RefNum', amount(options[:amount])
+          build_tag soap, :double, 'Amount', amount(options[:amount])
         end
       end
 
@@ -1244,16 +1244,18 @@ module ActiveMerchant #:nodoc:
         when payment_method[:method].kind_of?(ActiveMerchant::Billing::CreditCard)
           build_tag soap, :string, 'CardNumber', payment_method[:method].number
           build_tag soap, :string, 'CardExpiration',
-            "#{"%02d" % payment_method[:method].month}#{payment_method[:method].year}"
+            "#{"%02d" % payment_method[:method].month}#{payment_method[:method].year.to_s[-2..-1]}"
           if options[:billing_address]
             build_tag soap, :string, 'AvsStreet', options[:billing_address][:address1]
             build_tag soap, :string, 'AvsZip', options[:billing_address][:zip]
           end
           build_tag soap, :string, 'CardCode', payment_method[:method].verification_value
         when payment_method[:method].kind_of?(ActiveMerchant::Billing::Check)
-          build_tag soap, :string, 'Account', payment_method[:method].number
+          build_tag soap, :string, 'Account', payment_method[:method].account_number
           build_tag soap, :string, 'Routing', payment_method[:method].routing_number
-          build_tag soap, :string, 'AccountType', payment_method[:method].account_type.capitalize
+          unless payment_method[:method].account_type.nil?
+            build_tag soap, :string, 'AccountType', payment_method[:method].account_type.capitalize
+          end
           build_tag soap, :string, 'DriversLicense', options[:drivers_license]
           build_tag soap, :string, 'DriversLicenseState', options[:drivers_license_state]
           build_tag soap, :string, 'RecordType', options[:record_type]
@@ -1323,8 +1325,7 @@ module ActiveMerchant #:nodoc:
       def build_credit_card_data(soap, options)
         soap.CreditCardData 'xsi:type' => "ns1:CreditCardData" do |soap|
           build_tag soap, :string, 'CardNumber', options[:payment_method].number
-          build_tag soap, :string, 'CardExpiration',
-            "#{"%02d" % options[:payment_method].month}#{options[:payment_method].year}"
+          build_tag soap, :string, 'CardExpiration', build_card_expiration(options)
           if options[:billing_address]
             build_tag soap, :string, 'AvsStreet', options[:billing_address][:address1]
             build_tag soap, :string, 'AvsZip', options[:billing_address][:zip]
@@ -1337,8 +1338,17 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def build_card_expiration(options)
+        month = options[:payment_method].month
+        year  = options[:payment_method].year
+        unless month.nil? || year.nil?
+          "#{"%02d" % month}#{year.to_s[-2..-1]}"
+        end
+      end
+
       def build_check_data(soap, options)
         soap.CheckData 'xsi:type' => "ns1:CheckData" do |soap|
+          build_tag soap, :integer, 'CheckNumber', options[:payment_method].number
           build_tag soap, :string, 'Account', options[:payment_method].account_number
           build_tag soap, :string, 'Routing', options[:payment_method].routing_number
           build_tag soap, :string, 'AccountType', options[:payment_method].account_type.capitalize
@@ -1461,7 +1471,8 @@ module ActiveMerchant #:nodoc:
           when :get_customer_payment_methods
             p['item']
           when :get_transaction_custom
-            p['item'].inject({}) { |map, field| map[field['field']] = field['value']; map }
+            items = p['item'].kind_of?(Array) ? p['item'] : [p['item']]
+            items.inject({}) { |hash, item| hash[item['field']] = item['value']; hash }
           else
             p
           end

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

@@ -13,25 +13,22 @@ 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
+      def capture(money, authorization, options = {})
+        post = {:amount => localized_amount(money)}
+        add_application_fee(post, options)
+        commit(:post, "charges/#{CGI.escape(authorization)}/capture", post)
       end
 
       def refund(money, identification, options = {})
         post = {:amount => localized_amount(money)}
-        commit_options = generate_meta(options)
 
         MultiResponse.run do |r|
-          r.process { commit(:post, "charges/#{CGI.escape(identification)}/refund", post, commit_options) }
+          r.process { commit(:post, "charges/#{CGI.escape(identification)}/refund", post, options) }
 
           return r unless options[:refund_fee_amount]
 
-          r.process { fetch_application_fees(identification, commit_options) }
-          r.process { refund_application_fee(options[:refund_fee_amount], application_fee_from_response(r), commit_options) }
+          r.process { fetch_application_fees(identification, options) }
+          r.process { refund_application_fee(options[:refund_fee_amount], application_fee_from_response(r), options) }
         end
       end
 
@@ -52,6 +49,25 @@ module ActiveMerchant #:nodoc:
         post[:customer] = options[:customer] if options[:customer] && !creditcard.respond_to?(:number)
       end
 
+      def store(creditcard, options = {})
+        post = {}
+        add_creditcard(post, creditcard, options)
+        post[:description] = options[:description]
+        post[:email] = options[:email]
+
+        if options[:customer]
+          MultiResponse.run(:first) do |r|
+            r.process { commit(:post, "customers/#{CGI.escape(options[:customer])}/", post, options) }
+
+            return r unless options[:set_default] and r.success? and !r.params["id"].blank?
+
+            r.process { update_customer(options[:customer], :default_card => r.params["id"]) }
+          end
+        else
+          commit(:post, 'customers', post, options)
+        end
+      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})"
@@ -75,7 +91,7 @@ module ActiveMerchant #:nodoc:
           "Authorization" => "Basic " + Base64.encode64(@api_key.to_s + ":").strip,
           "User-Agent" => "Webpay/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
           "X-Webpay-Client-User-Agent" => @@ua,
-          "X-Webpay-Client-User-Metadata" => options[:meta].to_json
+          "X-Webpay-Client-User-Metadata" => {:ip => options[:ip]}.to_json
         }
       end
     end

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

@@ -232,7 +232,7 @@ module ActiveMerchant #:nodoc:
         response
       end
 
-      # Parse the <ProcessingStatus> Element which containts all important information
+      # Parse the <ProcessingStatus> Element which contains all important information
       def parse_response(response, root)
         status = nil
         # get the root element for this Transaction

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

@@ -55,7 +55,7 @@ module ActiveMerchant #:nodoc:
 
             response = http.request(request)
             JSON.parse(response.body)
-          rescue JSON::ParseError
+          rescue JSON::ParserError
           end
         end
       end

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

@@ -10,6 +10,10 @@ module ActiveMerchant #:nodoc:
           "https://www.mobile88.com/epayment/entry.asp"
         end
 
+        def self.requery_url
+          "https://www.mobile88.com/epayment/enquiry.asp"
+        end
+
         def self.return(query_string, options={})
           Return.new(query_string, options)
         end

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

@@ -107,7 +107,7 @@ module ActiveMerchant #:nodoc:
             components  = [merchant_key]
             components << fields[mappings[:account]]
             components << fields[mappings[:order]]
-            components << amount_in_dollars.to_s.gsub(/0+$/, '').gsub(/[.,]/, '')
+            components << amount_in_dollars.gsub(/[.,]/, '')
             components << fields[mappings[:currency]]
             components.join
           end

data/lib/active_merchant/billing/integrations/ipay88/notification.rb

@@ -0,0 +1,103 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Ipay88
+        class Notification < ActiveMerchant::Billing::Integrations::Notification
+          include ActiveMerchant::PostsData
+
+          def status
+            params["Status"] == '1' ? 'Completed' : 'Failed'
+          end
+
+          def complete?
+            status == 'Completed'
+          end
+
+          def item_id
+            params["RefNo"]
+          end
+
+          def gross
+            params["Amount"]
+          end
+
+          def currency
+            params["Currency"]
+          end
+
+          def account
+            params["MerchantCode"]
+          end
+
+          def payment
+            params["PaymentId"].to_i
+          end
+
+          def remark
+            params["Remark"]
+          end
+
+          def transaction_id
+            params["TransId"]
+          end
+
+          def auth_code
+            params["AuthCode"]
+          end
+
+          def error
+            params["ErrDesc"]
+          end
+
+          def signature
+            params["Signature"]
+          end
+
+          def secure?
+            generated_signature == signature
+          end
+
+          def success?
+            status == 'Completed'
+          end
+
+          def acknowledge
+            secure? && success? && requery == "00"
+          end
+
+          protected
+
+          def generated_signature
+            Helper.sign(sig_components)
+          end
+
+          def sig_components
+            components = [@options[:credential2]]
+            [:account, :payment, :item_id, :amount_in_cents, :currency].each do |i|
+              components << send(i)
+            end
+            components << params["Status"]
+            components.join
+          end
+
+          def requery
+            data   = { "MerchantCode" => account, "RefNo" => item_id, "Amount" => gross }
+            params = parameterize(data)
+            ssl_post Ipay88.requery_url, params, { "Content-Length" => params.size.to_s, "User-Agent" => "Active Merchant -- http://activemerchant.org" }
+          end
+
+          private
+
+          def parameterize(params)
+            params.reject { |k, v| v.blank? }.keys.sort.collect { |key| "#{key}=#{CGI.escape(params[key].to_s)}" }.join("&")
+          end
+
+          def amount_in_cents
+            @amount_in_cents ||= (gross || "").gsub(/[.,]/, "")
+          end
+        end
+      end
+    end
+  end
+end
+