activemerchant 1.58.0 → 1.59.0

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

@@ -8,6 +8,7 @@ module ActiveMerchant #:nodoc:
       self.money_format = :cents
       self.supported_countries = %w(HK GB AU AD BE CH CY CZ DE DK ES FI FR GI GR HU IE IL IT LI LU MC MT NL NO NZ PL PT SE SG SI SM TR UM VA)
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :maestro, :laser, :switch]
+      self.currencies_without_fractions = %w(HUF IDR ISK JPY KRW)
       self.homepage_url = 'http://www.worldpay.com/'
       self.display_name = 'Worldpay Global'
 
@@ -136,7 +137,7 @@ module ActiveMerchant #:nodoc:
       def build_authorization_request(money, payment_method, options)
         build_request do |xml|
           xml.tag! 'submit' do
-            xml.tag! 'order', {'orderCode' => options[:order_id], 'installationId' => @options[:inst_id]}.reject{|_,v| !v} do
+            xml.tag! 'order', order_tag_attributes(options) do
               xml.description(options[:description].blank? ? "Purchase" : options[:description])
               add_amount(xml, money, options)
               if options[:order_content]
@@ -151,6 +152,10 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def order_tag_attributes(options)
+        { 'orderCode' => options[:order_id], 'installationId' => options[:inst_id] || @options[:inst_id] }.reject{|_,v| !v}
+      end
+
       def build_capture_request(money, authorization, options)
         build_order_modify_request(authorization) do |xml|
           xml.tag! 'capture' do
@@ -177,12 +182,11 @@ module ActiveMerchant #:nodoc:
 
       def add_amount(xml, money, options)
         currency = options[:currency] || currency(money)
-        amount   = localized_amount(money, currency)
 
         amount_hash = {
-          :value => amount,
+          :value => amount(money),
           'currencyCode' => currency,
-          'exponent' => 2
+          'exponent' => non_fractional_currency?(currency) ? 0 : 2
         }
 
         if options[:debit_credit_indicator]
@@ -337,13 +341,6 @@ module ActiveMerchant #:nodoc:
         credentials = "#{@options[:login]}:#{@options[:password]}"
         "Basic #{[credentials].pack('m').strip}"
       end
-
-      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
   end
 end

data/lib/active_merchant/billing/network_tokenization_credit_card.rb

@@ -27,6 +27,10 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def credit_card?
+        true
+      end
+
       def type
         "network_tokenization"
       end

data/lib/active_merchant/country.rb

@@ -181,7 +181,6 @@ module ActiveMerchant #:nodoc:
       { alpha2: 'KI', name: 'Kiribati', alpha3: 'KIR', numeric: '296' },
       { alpha2: 'KP', name: 'Korea, Democratic People\'s Republic of', alpha3: 'PRK', numeric: '408' },
       { alpha2: 'KR', name: 'Korea, Republic of', alpha3: 'KOR', numeric: '410' },
-      { alpha2: 'KV', name: 'Kosovo', alpha3: 'KSV', numeric: '377' },
       { alpha2: 'KW', name: 'Kuwait', alpha3: 'KWT', numeric: '414' },
       { alpha2: 'KG', name: 'Kyrgyzstan', alpha3: 'KGZ', numeric: '417' },
       { alpha2: 'LA', name: 'Lao People\'s Democratic Republic', alpha3: 'LAO', numeric: '418' },
@@ -220,7 +219,6 @@ module ActiveMerchant #:nodoc:
       { alpha2: 'NR', name: 'Nauru', alpha3: 'NRU', numeric: '520' },
       { alpha2: 'NP', name: 'Nepal', alpha3: 'NPL', numeric: '524' },
       { alpha2: 'NL', name: 'Netherlands', alpha3: 'NLD', numeric: '528' },
-      { alpha2: 'AN', name: 'Netherlands Antilles', alpha3: 'ANT', numeric: '530' },
       { alpha2: 'NC', name: 'New Caledonia', alpha3: 'NCL', numeric: '540' },
       { alpha2: 'NZ', name: 'New Zealand', alpha3: 'NZL', numeric: '554' },
       { alpha2: 'NI', name: 'Nicaragua', alpha3: 'NIC', numeric: '558' },

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.58.0"
+  VERSION = "1.59.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.58.0
+  version: 1.59.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -177,6 +177,7 @@ files:
 - lib/active_merchant/billing/gateways/beanstream/beanstream_core.rb
 - lib/active_merchant/billing/gateways/beanstream_interac.rb
 - lib/active_merchant/billing/gateways/blue_pay.rb
+- lib/active_merchant/billing/gateways/blue_snap.rb
 - lib/active_merchant/billing/gateways/bogus.rb
 - lib/active_merchant/billing/gateways/borgun.rb
 - lib/active_merchant/billing/gateways/bpoint.rb
@@ -223,6 +224,7 @@ files:
 - lib/active_merchant/billing/gateways/flo2cash_simple.rb
 - lib/active_merchant/billing/gateways/forte.rb
 - lib/active_merchant/billing/gateways/garanti.rb
+- lib/active_merchant/billing/gateways/global_collect.rb
 - lib/active_merchant/billing/gateways/global_transport.rb
 - lib/active_merchant/billing/gateways/hdfc.rb
 - lib/active_merchant/billing/gateways/hps.rb
@@ -239,6 +241,7 @@ files:
 - lib/active_merchant/billing/gateways/itransact.rb
 - lib/active_merchant/billing/gateways/jetpay.rb
 - lib/active_merchant/billing/gateways/komoju.rb
+- lib/active_merchant/billing/gateways/latitude19.rb
 - lib/active_merchant/billing/gateways/linkpoint.rb
 - lib/active_merchant/billing/gateways/litle.rb
 - lib/active_merchant/billing/gateways/maxipago.rb
@@ -346,9 +349,11 @@ files:
 - lib/active_merchant/billing/gateways/vanco.rb
 - lib/active_merchant/billing/gateways/verifi.rb
 - lib/active_merchant/billing/gateways/viaklix.rb
+- lib/active_merchant/billing/gateways/visanet_peru.rb
 - lib/active_merchant/billing/gateways/webpay.rb
 - lib/active_merchant/billing/gateways/wepay.rb
 - lib/active_merchant/billing/gateways/wirecard.rb
+- lib/active_merchant/billing/gateways/world_net.rb
 - lib/active_merchant/billing/gateways/worldpay.rb
 - lib/active_merchant/billing/gateways/worldpay_online_payments.rb
 - lib/active_merchant/billing/gateways/worldpay_us.rb