activemerchant 1.21.0 → 1.22.0

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

@@ -0,0 +1,17 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Robokassa
+        class Return < ActiveMerchant::Billing::Integrations::Return
+          def item_id
+            @params['InvId']
+          end
+
+          def amount
+            @params['OutSum']
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,9 +6,31 @@ module ActiveMerchant #:nodoc:
         autoload 'Return', File.dirname(__FILE__) + '/two_checkout/return'
         autoload 'Notification', File.dirname(__FILE__) + '/two_checkout/notification'
        
-        mattr_accessor :service_url
-        self.service_url = 'https://www.2checkout.com/checkout/purchase'
-
+        mattr_accessor :payment_routine
+        self.payment_routine = :multi_page
+        
+        def self.service_url
+          case self.payment_routine
+          when :multi_page
+            'https://www.2checkout.com/checkout/purchase'  
+          when :single_page
+            'https://www.2checkout.com/checkout/spurchase'
+          else
+            raise StandardError, "Integration payment routine set to an invalid value: #{self.payment_routine}"
+          end
+        end
+        
+        def self.service_url=(service_url)
+          # Note: do not use this method, it is here for backward compatibility
+          # Use the payment_routine method to change service_url
+          if service_url =~ /spurchase/
+            self.payment_routine = :single_page
+          else
+            self.payment_routine = :multi_page
+          end
+        end
+        
+        
         def self.notification(post, options = {})
           Notification.new(post)
         end  

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

@@ -21,6 +21,7 @@ module ActiveMerchant #:nodoc:
           # a unique order id from your program. (128 characters max)
           mapping :order, 'cart_order_id'
 
+          mapping :mode, 'mode'
 
           mapping :customer, :email      => 'email',
                              :phone      => 'phone'
@@ -52,6 +53,20 @@ module ActiveMerchant #:nodoc:
             add_field(mappings[:customer][:phone], params[:phone])
             add_field('card_holder_name', "#{params[:first_name]} #{params[:last_name]}")
           end
+          
+          def line_item(params = {})
+            max_existing_line_item_id = form_fields.keys.map do |key| 
+              match = key.to_s.match(/li_(\d+)_/)
+              if match
+                match[1]
+              end
+            end.reject(&:nil?).max.to_i
+            
+            line_item_id = max_existing_line_item_id + 1
+            params.each do |key, value|
+              add_field("li_#{line_item_id}_#{key}", value)
+            end
+          end
         end
       end
     end

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

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/verkkomaksut/helper.rb'
+require File.dirname(__FILE__) + '/verkkomaksut/notification.rb'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      
+      # Usage, see the blog post here: http://blog.kiskolabs.com/post/22374612968/understanding-active-merchant-integrations and E1 API documentation here: http://docs.verkkomaksut.fi/
+      module Verkkomaksut 
+       
+        mattr_accessor :service_url
+        self.service_url = 'https://payment.verkkomaksut.fi/'
+
+        def self.notification(post)
+          Notification.new(post)
+        end  
+      end
+    end
+  end
+end

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

@@ -0,0 +1,87 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Verkkomaksut
+        class Helper < ActiveMerchant::Billing::Integrations::Helper
+          
+          # Fetches the md5secret and adds MERCHANT_ID and API TYPE to the form
+          def initialize(order, account, options = {})
+            md5secret options.delete(:credential2)
+            super
+            add_field("MERCHANT_ID", account)
+            add_field("TYPE", "E1")
+          end          
+          
+          def md5secret(value)
+            @md5secret = value
+          end
+          
+          # Adds the AUTHCODE to the form
+          def form_fields
+            @fields.merge("AUTHCODE" => generate_md5string)
+          end
+          
+          # Calculates the AUTHCODE
+          def generate_md5string
+            fields = [@md5secret, @fields["MERCHANT_ID"], @fields["ORDER_NUMBER"], @fields["REFERENCE_NUMBER"], @fields["ORDER_DESCRIPTION"], @fields["CURRENCY"], @fields["RETURN_ADDRESS"], @fields["CANCEL_ADDRESS"], @fields["PENDING_ADDRESS"],
+                      @fields["NOTIFY_ADDRESS"], @fields["TYPE"], @fields["CULTURE"], @fields["PRESELECTED_METHOD"], @fields["MODE"], @fields["VISIBLE_METHODS"], @fields["GROUP"], @fields["CONTACT_TELNO"], @fields["CONTACT_CELLNO"],
+                      @fields["CONTACT_EMAIL"], @fields["CONTACT_FIRSTNAME"], @fields["CONTACT_LASTNAME"], @fields["CONTACT_COMPANY"], @fields["CONTACT_ADDR_STREET"], @fields["CONTACT_ADDR_ZIP"], @fields["CONTACT_ADDR_CITY"], @fields["CONTACT_ADDR_COUNTRY"], @fields["INCLUDE_VAT"],
+                      @fields["ITEMS"]]
+                      
+            (0..@fields["ITEMS"].to_i-1).each do |i|
+              fields += [@fields["ITEM_TITLE[#{i}]"], @fields["ITEM_NO[#{i}]"], @fields["ITEM_AMOUNT[#{i}]"], @fields["ITEM_PRICE[#{i}]"], @fields["ITEM_TAX[#{i}]"], @fields["ITEM_DISCOUNT[#{i}]"], @fields["ITEM_TYPE[#{i}]"]]
+            end
+                      
+            fields = fields.join("|")
+            
+            return Digest::MD5.hexdigest(fields).upcase
+          end
+          
+          # Mappings
+          mapping :merchant_id, "MERCHANT_ID"
+          mapping :order, "ORDER_NUMBER"
+          mapping :reference_number, "REFERENCE_NUMBER"
+          mapping :customer, :first_name => "CONTACT_FIRSTNAME",
+                             :last_name  => "CONTACT_LASTNAME",
+                             :email      => "CONTACT_EMAIL",
+                             :phone      => "CONTACT_CELLNO",
+                             :tellno     => "CONTACT_TELLNO",
+                             :company    => "CONTACT_COMPANY"
+              
+          
+          mapping :billing_address, :city     => "CONTACT_ADDR_CITY",
+                                    :address1 => "CONTACT_ADDR_STREET",
+                                    :address2 => "",
+                                    :state    => "",
+                                    :zip      => "CONTACT_ADDR_ZIP",
+                                    :country  => "CONTACT_ADDR_COUNTRY"
+
+          mapping :notify_url, "NOTIFY_ADDRESS"
+          mapping :currency, "CURRENCY"
+          mapping :return_url, "RETURN_ADDRESS"
+          mapping :cancel_return_url, "CANCEL_ADDRESS"
+          mapping :description, "ORDER_DESCRIPTION"
+          mapping :tax, ""
+          mapping :shipping, ""
+          mapping :include_vat, "INCLUDE_VAT"
+          mapping :pending_address, "PENDING_ADDRESS"
+          mapping :culture, "CULTURE"
+          mapping :items, "ITEMS"
+          mapping :preselected_method, "PRESELECTED_METHOD"
+          mapping :mode, "MODE"
+          mapping :visible_methods, "VISIBLE_METHODS"
+          mapping :group, "GROUP"
+          
+          (0..499.to_i).each do |i|
+            mapping "item_no_#{i}".to_sym, "ITEM_NO[#{i}]"
+            mapping "item_amount_#{i}".to_sym, "ITEM_AMOUNT[#{i}]"
+            mapping "item_price_#{i}".to_sym, "ITEM_PRICE[#{i}]"
+            mapping "item_tax_#{i}".to_sym, "ITEM_TAX[#{i}]"
+            mapping "item_discount_#{i}".to_sym, "ITEM_DISCOUNT[#{i}]"
+            mapping "item_type_#{i}".to_sym, "ITEM_TYPE[#{i}]"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+require 'net/http'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Verkkomaksut
+        class Notification < ActiveMerchant::Billing::Integrations::Notification
+
+          # Is the payment complete or not. Verkkomaksut only has two statuses: random string or 0000000000 which means pending
+          def complete?
+            params['PAID'] != "0000000000"
+          end 
+          
+          # Order id
+          def order_id
+            params['ORDER_NUMBER']
+          end
+          
+          # Payment method used
+          def method
+            params['METHOD']
+          end
+          
+          # When was this payment received by the client. 
+          def received_at
+            params['TIMESTAMP']
+          end
+          
+          # Security key got from Verkkomaksut
+          def security_key
+            params['RETURN_AUTHCODE']
+          end
+          
+          # Another way of asking the payment status
+          def status
+            if complete?
+              "PAID"
+            else
+              "PENDING"
+            end
+          end
+          
+          # Acknowldges the payment. If the authcodes match, returns true.
+          def acknowledge(authcode)
+            return_authcode = [params["ORDER_NUMBER"], params["TIMESTAMP"], params["PAID"], params["METHOD"], authcode].join("|")
+            Digest::MD5.hexdigest(return_authcode).upcase == params["RETURN_AUTHCODE"]
+          end
+ private
+ 
+          def parse(post)
+            post.each do |key, value|
+              params[key] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.21.0"
+  VERSION = "1.22.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.22.0
   prerelease: 
 platform: ruby
 authors:
@@ -50,11 +50,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152126080 !ruby/object:Gem::Requirement
+  requirement: &2153311280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -62,10 +62,10 @@ dependencies:
         version: 2.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *2152126080
+  version_requirements: *2153311280
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2152125500 !ruby/object:Gem::Requirement
+  requirement: &2153310640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -73,21 +73,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152125500
+  version_requirements: *2153310640
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &2152124420 !ruby/object:Gem::Requirement
+  requirement: &2153310060 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <=
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152124420
+  version_requirements: *2153310060
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2152123920 !ruby/object:Gem::Requirement
+  requirement: &2153309500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -95,10 +95,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152123920
+  version_requirements: *2153309500
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152123260 !ruby/object:Gem::Requirement
+  requirement: &2153309000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -106,10 +106,10 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152123260
+  version_requirements: *2153309000
 - !ruby/object:Gem::Dependency
   name: active_utils
-  requirement: &2152122720 !ruby/object:Gem::Requirement
+  requirement: &2153324800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,10 +117,21 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152122720
+  version_requirements: *2153324800
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2153324160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2153324160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152122340 !ruby/object:Gem::Requirement
+  requirement: &2153323500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -128,21 +139,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152122340
+  version_requirements: *2153323500
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152121880 !ruby/object:Gem::Requirement
+  requirement: &2153322880 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.3
   type: :development
   prerelease: false
-  version_requirements: *2152121880
+  version_requirements: *2153322880
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152121340 !ruby/object:Gem::Requirement
+  requirement: &2153322200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -150,10 +161,10 @@ dependencies:
         version: 2.3.11
   type: :development
   prerelease: false
-  version_requirements: *2152121340
+  version_requirements: *2153322200
 - !ruby/object:Gem::Dependency
   name: rubigen
-  requirement: &2152143380 !ruby/object:Gem::Requirement
+  requirement: &2153321560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -161,7 +172,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152143380
+  version_requirements: *2153321560
 description: Active Merchant is a simple payment abstraction library used in and sponsored
   by Shopify. It is written by Tobias Luetke, Cody Fauser, and contributors. The aim
   of the project is to feel natural to Ruby users and to abstract as many parts as
@@ -173,6 +184,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG
+- README.md
 - MIT-LICENSE
 - CONTRIBUTORS
 - gem-public_cert.pem
@@ -218,13 +230,17 @@ files:
 - lib/active_merchant/billing/gateways/inspire.rb
 - lib/active_merchant/billing/gateways/instapay.rb
 - lib/active_merchant/billing/gateways/iridium.rb
+- lib/active_merchant/billing/gateways/itransact.rb
 - lib/active_merchant/billing/gateways/jetpay.rb
 - lib/active_merchant/billing/gateways/linkpoint.rb
 - lib/active_merchant/billing/gateways/merchant_e_solutions.rb
 - lib/active_merchant/billing/gateways/merchant_ware.rb
+- lib/active_merchant/billing/gateways/migs/migs_codes.rb
+- lib/active_merchant/billing/gateways/migs.rb
 - lib/active_merchant/billing/gateways/modern_payments.rb
 - lib/active_merchant/billing/gateways/modern_payments_cim.rb
 - lib/active_merchant/billing/gateways/moneris.rb
+- lib/active_merchant/billing/gateways/moneris_us.rb
 - lib/active_merchant/billing/gateways/nab_transact.rb
 - lib/active_merchant/billing/gateways/net_registry.rb
 - lib/active_merchant/billing/gateways/netaxept.rb
@@ -247,6 +263,7 @@ files:
 - lib/active_merchant/billing/gateways/payment_express.rb
 - lib/active_merchant/billing/gateways/paypal/paypal_common_api.rb
 - lib/active_merchant/billing/gateways/paypal/paypal_express_response.rb
+- lib/active_merchant/billing/gateways/paypal/paypal_recurring_api.rb
 - lib/active_merchant/billing/gateways/paypal.rb
 - lib/active_merchant/billing/gateways/paypal_ca.rb
 - lib/active_merchant/billing/gateways/paypal_digital_goods.rb
@@ -282,6 +299,7 @@ files:
 - lib/active_merchant/billing/gateways/usa_epay_transaction.rb
 - lib/active_merchant/billing/gateways/verifi.rb
 - lib/active_merchant/billing/gateways/viaklix.rb
+- lib/active_merchant/billing/gateways/vindicia.rb
 - lib/active_merchant/billing/gateways/wirecard.rb
 - lib/active_merchant/billing/gateways/worldpay.rb
 - lib/active_merchant/billing/gateways.rb
@@ -306,6 +324,10 @@ files:
 - lib/active_merchant/billing/integrations/directebanking/notification.rb
 - lib/active_merchant/billing/integrations/directebanking/return.rb
 - lib/active_merchant/billing/integrations/directebanking.rb
+- lib/active_merchant/billing/integrations/dotpay/helper.rb
+- lib/active_merchant/billing/integrations/dotpay/notification.rb
+- lib/active_merchant/billing/integrations/dotpay/return.rb
+- lib/active_merchant/billing/integrations/dotpay.rb
 - lib/active_merchant/billing/integrations/dwolla/helper.rb
 - lib/active_merchant/billing/integrations/dwolla/notification.rb
 - lib/active_merchant/billing/integrations/dwolla/return.rb
@@ -313,6 +335,9 @@ files:
 - lib/active_merchant/billing/integrations/e_payment_plans/helper.rb
 - lib/active_merchant/billing/integrations/e_payment_plans/notification.rb
 - lib/active_merchant/billing/integrations/e_payment_plans.rb
+- lib/active_merchant/billing/integrations/epay/helper.rb
+- lib/active_merchant/billing/integrations/epay/notification.rb
+- lib/active_merchant/billing/integrations/epay.rb
 - lib/active_merchant/billing/integrations/gestpay/common.rb
 - lib/active_merchant/billing/integrations/gestpay/helper.rb
 - lib/active_merchant/billing/integrations/gestpay/notification.rb
@@ -342,6 +367,11 @@ files:
 - lib/active_merchant/billing/integrations/quickpay/notification.rb
 - lib/active_merchant/billing/integrations/quickpay.rb
 - lib/active_merchant/billing/integrations/return.rb
+- lib/active_merchant/billing/integrations/robokassa/common.rb
+- lib/active_merchant/billing/integrations/robokassa/helper.rb
+- lib/active_merchant/billing/integrations/robokassa/notification.rb
+- lib/active_merchant/billing/integrations/robokassa/return.rb
+- lib/active_merchant/billing/integrations/robokassa.rb
 - lib/active_merchant/billing/integrations/sage_pay_form/encryption.rb
 - lib/active_merchant/billing/integrations/sage_pay_form/helper.rb
 - lib/active_merchant/billing/integrations/sage_pay_form/notification.rb
@@ -356,6 +386,9 @@ files:
 - lib/active_merchant/billing/integrations/valitor/response_fields.rb
 - lib/active_merchant/billing/integrations/valitor/return.rb
 - lib/active_merchant/billing/integrations/valitor.rb
+- lib/active_merchant/billing/integrations/verkkomaksut/helper.rb
+- lib/active_merchant/billing/integrations/verkkomaksut/notification.rb
+- lib/active_merchant/billing/integrations/verkkomaksut.rb
 - lib/active_merchant/billing/integrations/world_pay/helper.rb
 - lib/active_merchant/billing/integrations/world_pay/notification.rb
 - lib/active_merchant/billing/integrations/world_pay.rb