activemerchant 1.42.4 → 1.42.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NThjMjQ4YWE3M2Y3MGUyM2UzMDg2MWQ3ZjJjYjNiMzAyNzUxNTUyYw==
+    ZjExMzYzY2FiZmNmZDE1YWI2M2VhMTU5YzY4MGM2N2FkMGEwMDQzMQ==
   data.tar.gz: !binary |-
-    ZTVkZDAwNWUyOGIwZGJmYzQxMmRmOWQ0YTdjODQ1Y2RkZTYxOGU3NA==
+    MDAyMGFkMTU4MmU1MmJhOWJkNjQxYjNkNTIxODFlZjA0NWZiZTBlYw==
 SHA512:
   metadata.gz: !binary |-
-    MjBkOGY2OTgzZTg3YzU5YmEwMzQwZjI3ODM2MTcwZDdmODBlYTExMjRiNTVi
-    YzYyMDdlNThkYjBhNTBhMWFjZWM0ZTdkODVlYTI1NGVjNTdjMWU3ZTg1YmYx
-    NTVjYjE5ZTA1ZDYyNDgzYTE2NDY1MDY2NDMyOGQ4ZDRmM2E5OWI=
+    ZDBiZmExZjY3ZGI2OTk4ZjAwNDI2ZDk0ZWUyZjA2NWY2ODQxNWRmMWVlYTA1
+    MzZhOTQ4YTJlYjlmNTRhOTRkNGM2OGM3MGJjNjI2ZWQwZmM5ODEzM2I3NjY1
+    NThlMTcxZjQ3OGNjMWRmNjIzMmVjYmVhYmFlNTcwZDhhYTJjMWU=
   data.tar.gz: !binary |-
-    MmMwZDg4OGJmNzFlOTI4N2ZlNjczYWRkY2ZjM2ZiOGIzZTBmNGQ1M2VkZGRj
-    MWZjOGU0YjEyMDRhMmZmYzBiMDBhMmFmMGNiM2JkMjQ1MDUxMGE4NTc5NDVm
-    NWYyZGI1NWYzZmMzYzgyNTBjZDkyMDc2NTVhMzJmYWE2ZWYxZTY=
+    YzNmOGJiMDZmMjJlZjY3OWU0MWQ5NzM4M2M1NzI4ZmQ3OTNjNjI1ZmE0MzYz
+    ZjRjNjdlZGNkNTc3M2YxMjFjYWQyMmJhMzZlYWM0MzhkMWVkMTdkNWNkZDM0
+    YWIyYWJhNWQyYzE4YTVkNGVjN2ZlOTgxMzZiYWRlMmU1NTgzNWY=

data/CHANGELOG

@@ -1,5 +1,10 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.42.5 (February 7th, 2014)
+
+* Add Doku Indonesia [bizla]
+* Cardstream: Update gateway to use latest API [odorcicd]
+
 == Version 1.42.4 (January 8th, 2014)
 
 * DataCash: Set 'ecomm' as capturemethod [DavidGeukers]

data/README.md

@@ -1,5 +1,5 @@
 # Active Merchant
-[![Build Status](https://secure.travis-ci.org/Shopify/active_merchant.png)](http://travis-ci.org/Shopify/active_merchant)
+[![Build Status](https://travis-ci.org/Shopify/active_merchant.png?branch=master)](https://travis-ci.org/Shopify/active_merchant)
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/Shopify/active_merchant)
 
 Active Merchant is an extraction from the e-commerce system [Shopify](http://www.shopify.com).
@@ -201,6 +201,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [DirecPay](http://www.timesofmoney.com/direcpay/jsp/home.jsp)
 * [Direct-eBanking / sofortueberweisung.de by Payment-Networks AG](https://www.payment-network.com/deb_com_en/merchantarea/home) - DE, AT, CH, BE, UK, NL
 * [Dotpay](http://dotpay.pl)
+* [Doku](http://doku.com)
 * [Dwolla](https://www.dwolla.com/default.aspx)
 * [ePay](http://www.epay.dk/epay-payment-solutions/)
 * [First Data](https://firstdata.zendesk.com/entries/407522-first-data-global-gateway-e4sm-payment-pages-integration-manual)

data/lib/active_merchant/billing/gateway.rb

@@ -62,7 +62,7 @@ module ActiveMerchant #:nodoc:
       include Utils
 
       DEBIT_CARDS = [ :switch, :solo ]
-      CURRENCIES_WITHOUT_FRACTIONS = [ 'JPY', 'HUF', 'TWD', 'ISK' ]
+      CURRENCIES_WITHOUT_FRACTIONS = [ 'BIF', 'BYR', 'CLP', 'CVE', 'DJF', 'GNF', 'HUF', 'ISK', 'JPY', 'KMF', 'KRW', 'PYG', 'RWF', 'TWD', 'UGX', 'VND', 'VUV', 'XAF', 'XOF', 'XPF' ]
       CREDIT_DEPRECATION_MESSAGE = "Support for using credit to refund existing transactions is deprecated and will be removed from a future release of ActiveMerchant. Please use the refund method instead."
 
       cattr_reader :implementations

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

@@ -1,55 +1,29 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
-    #
-    # CardStream supports the following credit cards, which are auto-detected by
-    # the gateway based on the card number used:
-    # * AM American Express
-    # * Diners Club
-    # * Electron
-    # * JCB
-    # * UK Maestro
-    # * Maestro International
-    # * Mastercard
-    # * Solo
-    # * Style
-    # * Switch
-    # * Visa Credit
-    # * Visa Debit
-    # * Visa Purchasing
-    #
     class CardStreamGateway < Gateway
-      self.live_url = self.test_url = 'https://gateway.cardstream.com/process.ashx'
-
+      self.test_url = self.live_url = 'https://gateway.cardstream.com/direct/'
       self.money_format = :cents
       self.default_currency = 'GBP'
-      self.supported_countries = ['GB']
+      self.supported_countries = ['GB', 'USD', 'EUR', 'CHF', 'SEK', 'SGD', 'NOK', 'JPY', 'ICK', 'HKD', 'DKK', 'CZK', 'CAD', 'AUD']
       self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :discover, :jcb, :maestro, :solo, :switch]
       self.homepage_url = 'http://www.cardstream.com/'
       self.display_name = 'CardStream'
 
-      APPROVED = '00'
-
       CURRENCY_CODES = {
-        "AUD"=> '036',
-        "CAD"=> '124',
-        "CZK"=> '203',
-        "DKK"=> '208',
-        "HKD"=> '344',
-        "ICK"=> '352',
-        "JPY"=> '392',
-        "NOK"=> '578',
-        "SGD"=> '702',
-        "SEK"=> '752',
-        "CHF"=> '756',
-        "GBP"=> '826',
-        "USD"=> '840',
-        "EUR"=> '978'
-      }
-
-      TRANSACTIONS = {
-        :purchase => 'ESALE_KEYED',
-        :refund => 'EREFUND_KEYED',
-        :authorization => 'ESALE_KEYED'
+        "AUD" => '036',
+        "CAD" => '124',
+        "CZK" => '203',
+        "DKK" => '208',
+        "HKD" => '344',
+        "ICK" => '352',
+        "JPY" => '392',
+        "NOK" => '578',
+        "SGD" => '702',
+        "SEK" => '752',
+        "CHF" => '756',
+        "GBP" => '826',
+        "USD" => '840',
+        "EUR" => '978'
       }
 
       CVV_CODE = {
@@ -86,136 +60,158 @@ module ActiveMerchant #:nodoc:
       }
 
       def initialize(options = {})
-        requires!(options, :login, :password)
+        requires!(options, :login, :shared_secret)
+        if (options[:threeDSRequired])
+          @threeDSRequired = options[:threeDSRequired]
+        else
+          @threeDSRequired = 'N'
+        end
         super
       end
 
-      def purchase(money, credit_card, options = {})
-        requires!(options, :order_id)
-
+      def authorize(money, creditcard, options = {})
         post = {}
+        add_amount(post, money, options)
+        add_invoice(post, creditcard, money, options)
+        add_creditcard(post, creditcard)
+        add_address(post, creditcard, options)
+        add_customer_data(post, options)
+        commit('PREAUTH', post)
+      end
 
+      def purchase(money, creditcard, options = {})
+        post = {}
         add_amount(post, money, options)
-        add_invoice(post, money, credit_card, options)
-        add_credit_card(post, credit_card)
-        add_address(post, options)
+        add_invoice(post, creditcard, money, options)
+        add_creditcard(post, creditcard)
+        add_address(post, creditcard, options)
         add_customer_data(post, options)
+        commit('SALE', post)
+      end
 
-        commit(:purchase, post)
+      def capture(money, authorization, options = {})
+        post = {}
+        add_pair(post, :xref, authorization)
+        add_amount(post, money, options)
+        commit('SALE', post)
+      end
+
+      def refund(money, authorization, options = {})
+        post = {}
+        add_pair(post, :xref, authorization)
+        add_amount(post, money, options)
+        commit('REFUND', post)
+      end
+
+      def void(authorization, options = {})
+        post = {}
+        add_pair(post, :xref, authorization)
+        commit('REFUND', post)
       end
 
       private
 
       def add_amount(post, money, options)
-        add_pair(post, :Amount, amount(money), :required => true)
-        add_pair(post, :CurrencyCode, currency_code(options[:currency] || currency(money)), :required => true)
+        add_pair(post, :amount, amount(money), :required => true)
+        add_pair(post, :currencyCode, currency_code(options[:currency] || currency(money)) || currency_code(self.default_currency))
       end
 
       def add_customer_data(post, options)
-        add_pair(post, :BillingEmail, options[:email])
-        add_pair(post, :BillingPhoneNumber, options[:phone])
+        address = options[:billing_address] || options[:address]
+        add_pair(post, :customerPostCode, address[:zip])
+        add_pair(post, :customerEmail, options[:email])
+        add_pair(post, :customerPhone, options[:phone])
       end
 
-      def add_address(post, options)
+      def add_address(post, creditcard, options)
         address = options[:billing_address] || options[:address]
 
         return if address.nil?
 
-        add_pair(post, :BillingStreet, address[:address1])
-        add_pair(post, :BillingHouseNumber, address[:address2])
-        add_pair(post, :BillingCity, address[:city])
-        add_pair(post, :BillingState, address[:state])
-        add_pair(post, :BillingPostCode, address[:zip])
+        add_pair(post, :customerAddress, address[:address1] + " " + (address[:address2].nil? ? "" : address[:address2]))
+        add_pair(post, :customerPostCode, address[:zip])
       end
 
-      def add_invoice(post, money, credit_card, options)
-        add_pair(post, :TransactionUnique, options[:order_id], :required => true)
-        add_pair(post, :OrderDesc, options[:description] || options[:order_id], :required => true)
-
-        if [ 'american_express', 'diners_club' ].include?(card_brand(credit_card).to_s)
-          add_pair(post, :AEIT1Quantity,  1)
-          add_pair(post, :AEIT1Description,  (options[:description] || options[:order_id]).slice(0, 15))
-          add_pair(post, :AEIT1GrossValue, amount(money))
+      def add_invoice(post, credit_card, money, options)
+        add_pair(post, :transactionUnique, options[:order_id], :required => true)
+        add_pair(post, :orderRef, options[:description] || options[:order_id], :required => true)
+        if ['american_express', 'diners_club'].include?(card_brand(credit_card).to_s)
+          add_pair(post, :item1Quantity, 1)
+          add_pair(post, :item1Description, (options[:description] || options[:order_id]).slice(0, 15))
+          add_pair(post, :item1GrossValue, amount(money))
         end
       end
 
-      def add_credit_card(post, credit_card)
-        add_pair(post, :CardName, credit_card.name, :required => true)
-        add_pair(post, :CardNumber, credit_card.number, :required => true)
+      def add_creditcard(post, credit_card)
+        add_pair(post, :customerName, credit_card.name, :required => true)
+        add_pair(post, :cardNumber, credit_card.number, :required => true)
 
-        add_pair(post, :ExpiryDateMM, format(credit_card.month, :two_digits), :required => true)
-        add_pair(post, :ExpiryDateYY, format(credit_card.year, :two_digits), :required => true)
+        add_pair(post, :cardExpiryMonth, format(credit_card.month, :two_digits), :required => true)
+        add_pair(post, :cardExpiryYear, format(credit_card.year, :two_digits), :required => true)
 
         if requires_start_date_or_issue_number?(credit_card)
-          add_pair(post, :StartDateMM, format(credit_card.start_month, :two_digits))
-          add_pair(post, :StartDateYY, format(credit_card.start_year, :two_digits))
+          add_pair(post, :cardStartMonth, format(credit_card.start_month, :two_digits))
+          add_pair(post, :cardStartYear, format(credit_card.start_year, :two_digits))
 
-          add_pair(post, :IssueNumber, credit_card.issue_number)
+          add_pair(post, :cardIssueNumber, credit_card.issue_number)
         end
 
-        add_pair(post, :CV2, credit_card.verification_value)
+        add_pair(post, :cardCVV, credit_card.verification_value)
       end
 
-      def commit(action, parameters)
-        response = parse( ssl_post(self.live_url, post_data(action, parameters)) )
-
-        Response.new(response[:response_code] == APPROVED, message_from(response), response,
-          :test => test?,
-          :authorization => response[:cross_reference],
-          :cvv_result => CVV_CODE[ response[:avscv2_response_code].to_s[0, 1] ],
-          :avs_result => {
-            :street_match => AVS_STREET_MATCH[ response[:avscv2_response_code].to_s[2, 1] ],
-            :postal_match => AVS_POSTAL_MATCH[ response[:avscv2_response_code].to_s[1, 1] ]
-          }
-        )
-      end
+      def add_hmac(post)
+        result = post.sort.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
+        result = Digest::SHA512.hexdigest("#{result}#{@options[:shared_secret]}")
 
-      def message_from(results)
-        results[:response_code] == APPROVED ? "APPROVED" : results[:message]
+        add_pair(post, :signature, result)
       end
 
-      def post_data(action, parameters = {})
-        parameters.update(
-          :MerchantPassword => @options[:password],
-          :MerchantID => @options[:login],
-          :MessageType => TRANSACTIONS[action],
-          :CallBack => "disable",
-          :DuplicateDelay => "0",
-          :EchoCardType => "YES",
-          :EchoAmount => "YES",
-          :EchoAVSCV2ResponseCode => "YES",
-          :ReturnAVSCV2Message => "YES",
-          :CountryCode => '826' # 826 for UK based merchant
-        )
-
-        add_pair(parameters, :Dispatch, action == :authorization ? "LATER" : "NOW")
-
-        parameters.collect { |key, value| "VP#{key}=#{CGI.escape(value.to_s)}" }.join("&")
-      end
-
-      # VPCrossReference
-      # The value in VPCrossReference on a success transaction will contain
-      # a unique reference that you may use to run future transactions.
-      # Please note that cross reference transactions must come a static IP
-      # addressed that has been pre-registered with Cardstream. To
-      # register an IP address please send it to support@cardstream.com
-      # with your Cardstream issued merchant ID and it will be added to
-      # your account.
       def parse(body)
         result = {}
         pairs = body.split("&")
         pairs.each do |pair|
           a = pair.split("=")
-          result[a[0].gsub(/^VP/,'').underscore.to_sym] = a[1]
+          # because some values pairs dont have a value
+          result[a[0].to_sym] = a[1] == nil ? '' : CGI.unescape(a[1])
         end
-
         result
       end
 
+      def commit(action, parameters)
+
+        parameters.update(
+          :merchantID => @options[:login],
+          :action => action,
+          :type => '1', #Ecommerce
+          :countryCode => self.supported_countries[0],
+          :threeDSRequired => @threeDSRequired #Disable 3d secure by default
+        )
+        # adds a signature to the post hash/array
+        add_hmac(parameters)
+
+        response = parse(ssl_post(self.live_url, post_data(action, parameters)))
+
+        Response.new(response[:responseCode] == "0",
+                     response[:responseCode] == "0" ? "APPROVED" : response[:responseMessage],
+                     response,
+                     :test => test?,
+                     :authorization => response[:xref],
+                     :cvv_result => CVV_CODE[response[:avscv2ResponseCode].to_s[0, 1]],
+                     :avs_result => {
+                       :postal_match => AVS_POSTAL_MATCH[response[:avscv2ResponseCode].to_s[1, 1]],
+                       :street_match => AVS_STREET_MATCH[response[:avscv2ResponseCode].to_s[2, 1]]
+                     }
+        )
+      end
+
       def currency_code(currency)
         CURRENCY_CODES[currency]
       end
 
+      def post_data(action, parameters = {})
+        parameters.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
+      end
+
       def add_pair(post, key, value, options = {})
         post[key] = value if !value.blank? || options[:required]
       end

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

@@ -201,7 +201,7 @@ module ActiveMerchant #:nodoc:
             raise unless options[:order_timestamp]
             amount = @fields['x_amount']
             data = "#{@fields['x_login']}^#{@fields['x_fp_sequence']}^#{options[:order_timestamp].to_i}^#{amount}^#{@fields['x_currency_code']}"
-            hmac = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new('md5'), options[:transaction_key], data)
+            hmac = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('md5'), options[:transaction_key], data)
             add_field 'x_fp_hash', hmac
             add_field 'x_fp_timestamp', options[:order_timestamp].to_i
           end

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

@@ -42,7 +42,7 @@ module ActiveMerchant
         end
 
         def self.checksum(secret_key, payload_items )
-          digest = OpenSSL::Digest::Digest.new('sha1')
+          digest = OpenSSL::Digest.new('sha1')
 		      OpenSSL::HMAC.hexdigest(digest, secret_key, payload_items)
         end
       end

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

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/doku/helper.rb'
+require File.dirname(__FILE__) + '/doku/notification.rb'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Doku
+
+        def self.service_url
+          'https://apps.myshortcart.com/payment/request-payment/'
+        end
+
+        def self.notification(post, options = {})
+          Notification.new(post, options)
+        end
+
+        def self.return(post, options = {})
+          Return.new(post, options)
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,102 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Doku
+
+        # # Example.
+        #
+        #  payment_service_for('ORDER_ID', 'DOKU_STORE_ID', :service => :doku,  :amount => 155_000, :shared_key => 'DOKU_SHARED_KEY') do |service|
+        #
+        #    service.customer :name              => 'Ismail Danuarta',
+        #                     :email             => 'ismail.danuarta@gmail.com',
+        #                     :mobile_phone      => '085779280093',
+        #                     :working_phone     => '0215150555',
+        #                     :home_phone        => '0215150555',
+        #                     :birth_date        => '1991-09-11'
+        #
+        #    service.billing_address :city     => 'Jakarta Selatan',
+        #                            :address  => 'Jl. Jendral Sudirman kav 59, Plaza Asia Office Park Unit 3',
+        #                            :state    => 'DKI Jakarta',
+        #                            :zip      => '12190',
+        #                            :country  => 'ID'
+
+        #    service.shipping_address :city     => 'Jakarta',
+        #                             :address  => 'Jl. Jendral Sudirman kav 59, Plaza Asia Office Park Unit 3',
+        #                             :state    => 'DKI Jakarta',
+        #                             :zip      => '12190',
+        #                             :country  => 'ID'
+        #
+        #    service.url 'http://yourstore.com'
+        #
+        # end
+        #
+
+        class Helper < ActiveMerchant::Billing::Integrations::Helper
+          def initialize(order, account, options = {})
+            @shared_key      = options.delete(:credential2)
+            @transidmerchant = order
+            super
+          end
+
+          def form_fields
+            add_field 'WORDS', words
+            add_field 'BASKET', basket
+            add_field 'TRANSIDMERCHANT', @transidmerchant
+            @fields
+          end
+
+          def customer(params = {})
+            add_field mappings[:customer][:name], "#{params[:first_name]} #{params[:last_name]}"
+            add_field mappings[:customer][:email], params[:email]
+            add_field mappings[:customer][:phone], params[:phone]
+            add_field mappings[:customer][:mobile_phone], params[:mobile_phone]
+            add_field mappings[:customer][:working_phone], params[:working_phone]
+            add_field mappings[:customer][:birth_date], params[:birth_date]
+          end
+
+          mapping :account,           'STOREID'
+          mapping :amount,            'AMOUNT'
+          mapping :cancel_return_url, 'URL'
+
+
+          mapping :customer, :name          => 'CNAME',
+                             :email         => 'CEMAIL',
+                             :phone         => 'CHPHONE',
+                             :mobile_phone  => 'CMPHONE',
+                             :working_phone => 'CWPHONE',
+                             :birth_date    => 'BIRTHDATE'
+
+          mapping :billing_address, :city     => 'CCITY',
+                                    :address1 => 'CADDRESS',
+                                    :state    => 'CSTATE',
+                                    :zip      => 'CZIPCODE',
+                                    :country  => 'CCOUNTRY'
+
+          mapping :shipping_address,  :city     => 'SCITY',
+                                      :address1 => 'SADDRESS',
+                                      :state    => 'SSTATE',
+                                      :zip      => 'SZIPCODE',
+                                      :country  => 'SCOUNTRY'
+          private
+
+          def basket
+            "Checkout #{@transidmerchant},#{@fields['AMOUNT']},1,#{@fields['AMOUNT']}"
+          end
+
+          def words
+            @words ||= Digest::SHA1.hexdigest("#{ @fields['AMOUNT'] }#{ @shared_key }#{ @transidmerchant }")
+          end
+
+          def add_address(key, params)
+            return if mappings[key].nil?
+
+            code = lookup_country_code(params.delete(:country), :numeric)
+            add_field(mappings[key][:country], code)
+            add_fields(key, params)
+          end
+
+        end
+      end
+    end
+  end
+end