activemerchant 1.42.4 → 1.42.5

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

@@ -3,14 +3,55 @@ module ActiveMerchant #:nodoc:
     module Integrations #:nodoc:
       module TwoCheckout
         class Return < ActiveMerchant::Billing::Integrations::Return
-          def success?
-            params['credit_card_processed'] == 'Y'
+
+          # card_holder_name - Provides the customer’s name.
+          # city - Provides the customer’s city.
+          # country - Provides the customer’s country.
+          # credit_card_processed - This parameter will always be passed back as Y.
+          # demo - Defines if an order was live, or if the order was a demo order. If the order was a demo, the MD5 hash will fail.
+          # email - Provides the email address the customer provided when placing the order.
+          # fixed - This parameter will only be passed back if it was passed into the purchase routine.
+          # ip_country - Provides the customer’s IP location.
+          # key - An MD5 hash used to confirm the validity of a sale.
+          # lang - Customer language
+          # merchant_order_id - The order ID you had assigned to the order.
+          # order_number - The 2Checkout order number associated with the order.
+          # invoice_id - The 2Checkout invoice number.
+          # pay_method - Provides seller with the customer’s payment method. CC for Credit Card, PPI for PayPal.
+          # phone - Provides the phone number the customer provided when placing the order.
+          # ship_name - Provides the ship to name for the order.
+          # ship_street_address - Provides ship to address.
+          # ship_street_address2 - Provides more detailed shipping address if this information was provided by the customer.
+          # ship_city - Provides ship to city.
+          # ship_state - Provides ship to state.
+          # ship_zip - Ship Zip
+
+          # Pass Through Products Only
+          # li_#_name - Name of the corresponding lineitem.
+          # li_#_quantity - Quantity of the corresponding lineitem.
+          # li_#_price - Price of the corresponding lineitem.
+          # li_#_tangible - Specifies if the corresponding li_#_type is a tangible or intangible. ‘Y’ OR ‘N’
+          # li_#_product_id - ID of the corresponding lineitem.
+          # li_#_product_description - Description of the corresponding lineitem.
+          # li_#_recurrence - # WEEK | MONTH | YEAR – always singular.
+          # li_#_duration - Forever or # WEEK | MONTH | YEAR – always singular, defaults to Forever.
+          # li_#_startup_fee - Amount in account pricing currency.
+          # li_#_option_#_name - Name of option. 64 characters max – cannot include '<' or '>'.
+          # li_#_option_#_value - Name of option. 64 characters max – cannot include '<' or '>'.
+          # li_#_option_#_surcharge - Amount in account pricing currency.
+
+          #Third Party Cart Only
+          # cart_order_id - The order ID you had assigned to the order
+
+          def initialize(query_string, options = {})
+            super
+            @notification = Notification.new(query_string, options)
           end
-          
-          def message
-            
+
+          def success?
+            @notification.status != 'Failed'
           end
-	      end
+        end
       end
     end
   end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.42.4"
+  VERSION = "1.42.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.42.4
+  version: 1.42.5
 platform: ruby
 authors:
 - Tobias Luetke
@@ -38,7 +38,7 @@ cert_chain:
   U1BPVm5oYkZKM3ZTWFkxdWxQL1I2WFc5dm53CjZra1FpMmZIaFUyMHVnTXpw
   ODgxRWl4citUakMwUnZVZXJMRzdnPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUt
   LS0tLQo=
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -255,7 +255,6 @@ files:
 - lib/active_merchant/billing/gateways/braintree_orange.rb
 - lib/active_merchant/billing/gateways/card_save.rb
 - lib/active_merchant/billing/gateways/card_stream.rb
-- lib/active_merchant/billing/gateways/card_stream_modern.rb
 - lib/active_merchant/billing/gateways/cc5.rb
 - lib/active_merchant/billing/gateways/certo_direct.rb
 - lib/active_merchant/billing/gateways/conekta.rb
@@ -412,6 +411,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/doku/helper.rb
+- lib/active_merchant/billing/integrations/doku/notification.rb
+- lib/active_merchant/billing/integrations/doku/return.rb
+- lib/active_merchant/billing/integrations/doku.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

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

@@ -1,156 +0,0 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
-    class CardStreamModernGateway < Gateway
-      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_cardtypes = [:visa, :master, :american_express, :diners_club, :discover, :jcb, :maestro, :solo, :switch]
-      self.homepage_url = 'http://www.cardstream.com/'
-      self.display_name = 'CardStream'
-
-      def initialize(options = {})
-        requires!(options, :login)
-        if(options[:threeDSRequired])
-          @threeDSRequired = options[:threeDSRequired]
-        else
-          @threeDSRequired = 'N'
-        end
-        super
-      end
-
-      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, creditcard, money, options)
-        add_creditcard(post, creditcard)
-        add_address(post, creditcard, options)
-        add_customer_data(post, options)
-        commit('SALE', post)
-      end
-
-      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, options[:currency] || self.default_currency)
-      end
-
-      def add_customer_data(post, options)
-        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, creditcard, options)
-        address = options[:billing_address] || options[:address]
-
-        return if address.nil?
-
-        add_pair(post, :customerAddress, address[:address1] + " " + (address[:address2].nil? ? "" : address[:address2]) )
-        add_pair(post, :customerPostCode, address[:zip])
-      end
-
-      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_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, :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, :cardStartMonth, format(credit_card.start_month, :two_digits))
-          add_pair(post, :cardStartYear, format(credit_card.start_year, :two_digits))
-
-          add_pair(post, :cardIssueNumber, credit_card.issue_number)
-        end
-
-        add_pair(post, :cardCVV, credit_card.verification_value)
-      end
-
-      def parse(body)
-        result = {}
-        pairs = body.split("&")
-        pairs.each do |pair|
-          a = pair.split("=")
-          #Make sure there is a value, else set it to empty string
-          result[a[0].to_sym] = a[1] ? CGI.unescape(a[1]) : ""
-        end
-        result
-      end
-
-      def commit(action, 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],
-          :avs_result => {
-            :street_match => response[:addressCheck],
-            :postal_match => response[:postcodeCheck],
-          },
-          :cvv_result => response[:cv2Check]
-        )
-      end
-
-      def post_data(action, parameters = {})
-        parameters.update(
-          :merchantID => @options[:login],
-          :action => action,
-          :type => '1', #Ecommerce
-          :countryCode => self.supported_countries[0],
-          :threeDSRequired => @threeDSRequired #Disable 3d secure by default
-        )
-        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
-    end
-  end
-end
-