taxamo-ns 2.3.5 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1099262fd43990e995e29ddbf20ac25978cd57f
-  data.tar.gz: ad728960e0cc78a323674fb04631203af416fbc7
+  metadata.gz: c555b2d070dc07d9054c8646b2811c6ab1e81ac4
+  data.tar.gz: d4ce2bc63d1fbfb6db88b95f251b0b254d6e06e7
 SHA512:
-  metadata.gz: 5e52926bf9c175ffc57f26de106fd8d8038f674f90dd561880bfabad8981ae4bab9ef742f66dbac6fb92a3e2f0dcdcc5640f5a334fc3095f6d2cab05fa0a933e
-  data.tar.gz: cff2e9df040625abaefddd422fdb9e3ca020deb0726c589d55ad9265b760a1188e6d24055cfe566bae8bdf77d7f87c8fcf3a965ebd1f6ecef013a181430111cc
+  metadata.gz: 5f5a628c0341b84b710ef365665678c8a04fc02e6f0de9bdbb2c0e575c1c85842906fe1b88a43f65d8f8a2a244b9cde214ac3c7c21e63911ad5aa10304efa6a9
+  data.tar.gz: 38027edac38d35227f452e95d7b2e8aba6913f07cfd3b20b2b82585b84ee912e45ad8c8ba56bf9ce373640db5a1b69a437ba38beeac6aa34050c31050dbf15c3

data/README.md

@@ -20,7 +20,7 @@ The library can also be installed directy - just fetch this repository and issue
 
 ```shell
 $ gem build taxamo.gemspec
-$ gem install taxamo-ns-2.3.5.gem
+$ gem install taxamo-ns-2.3.6.gem
 ```
 
 Finally, you can use this github repo and add the following line to your project's `Gemfile` file:
@@ -37,6 +37,9 @@ gem "taxamo", github: "taxamo/taxamo-ruby", '~> 1.1'
 
 ## Changes
 
+2.3.6 (2017-11-09):
+ * add control_flags to transaction class and update calculate_simple_tax with new fields
+
 2.3.5 (2017-11-01):
  * add warnings and tax_entity_additional_id field to the transaction object
 

data/lib/taxamo.rb

@@ -609,8 +609,8 @@ module Taxamo
 
     end
 
-    def calculate_simple_tax (product_type,invoice_address_city,buyer_credit_card_prefix,currency_code,invoice_address_region,unit_price,quantity,buyer_tax_number,force_country_code,order_date,amount,billing_country_code,invoice_address_postal_code,total_amount,tax_deducted,opts={})
-      query_param_keys = [:product_type,:invoice_address_city,:buyer_credit_card_prefix,:currency_code,:invoice_address_region,:unit_price,:quantity,:buyer_tax_number,:force_country_code,:order_date,:amount,:billing_country_code,:invoice_address_postal_code,:total_amount,:tax_deducted]
+    def calculate_simple_tax (product_type,invoice_address_city,buyer_credit_card_prefix,currency_code,invoice_address_region,unit_price,quantity,buyer_tax_number,force_country_code,order_date,amount,billing_country_code,invoice_address_postal_code,total_amount,tax_deducted,b2b_number_service_on_error=nil,b2b_number_service_timeoutms=nil,b2b_number_service_cache_expiry_days=nil,opts={})
+      query_param_keys = [:product_type,:invoice_address_city,:buyer_credit_card_prefix,:currency_code,:invoice_address_region,:unit_price,:quantity,:buyer_tax_number,:force_country_code,:order_date,:amount,:billing_country_code,:invoice_address_postal_code,:total_amount,:tax_deducted,:b2b_number_service_on_error,:b2b_number_service_timeoutms,:b2b_number_service_cache_expiry_days]
 
       # verify existence of params
       raise "currency_code is required" if currency_code.nil?
@@ -630,7 +630,10 @@ module Taxamo
           :billing_country_code => billing_country_code,
           :invoice_address_postal_code => invoice_address_postal_code,
           :total_amount => total_amount,
-          :tax_deducted => tax_deducted}.merge(opts)
+          :tax_deducted => tax_deducted,
+          :b2b_number_service_on_error => b2b_number_service_on_error,
+          :b2b_number_service_timeoutms => b2b_number_service_timeoutms,
+          :b2b_number_service_cache_expiry_days => b2b_number_service_cache_expiry_days}.merge(opts)
 
       #resource path
       path = "/api/v1/tax/calculate".sub('{format}','json')

data/lib/taxamo/models/controlflags.rb

@@ -0,0 +1,68 @@
+# Copyright 2014-2015 Taxamo, Ltd.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at [apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Taxamo
+class ControlFlags
+  attr_accessor :key, :value
+
+  # :internal => :external
+  def self.attribute_map
+    {
+      :key => :key,
+      :value => :value
+
+    }
+  end
+
+  def initialize(attributes = {})
+    return if attributes.nil? or attributes.empty?
+    # Morph attribute keys into undescored rubyish style
+    if attributes.key?("key")
+      @key = attributes["key"]
+        
+    end
+    if attributes.key?("value")
+      @value = attributes["value"]
+        
+    end
+    
+
+  end
+
+  def to_body
+    body = {}
+    self.class.attribute_map.each_pair do |key, value|
+      v = self.send(key)
+      unless v.nil?
+        if v.is_a?(Array)
+          array = Array.new
+          v.each do |item|
+            if item.respond_to?("to_body".to_sym)
+              array.push item.to_body
+            else
+              array.push item
+            end
+          end
+          body[value] = array
+        else
+          if v.respond_to?("to_body".to_sym)
+            body[value] = v.to_body
+          else
+            body[value] = v
+          end
+        end
+      end
+    end
+    body
+  end
+end
+end

data/lib/taxamo/models/inputtransaction.rb

@@ -12,7 +12,7 @@
 
 module Taxamo
 class InputTransaction
-  attr_accessor :order_date_type, :buyer_credit_card_prefix, :custom_data, :buyer_name, :invoice_date, :currency_code, :sub_account_id, :supply_date, :invoice_address, :verification_token, :note, :tax_data, :transaction_lines, :buyer_tax_number, :status, :custom_fields, :force_country_code, :invoice_number, :order_date, :customer_id, :comments, :buyer_ip, :buyer_email, :original_transaction_key, :billing_country_code, :custom_id, :additional_currencies, :invoice_place, :evidence, :description, :tax_deducted, :tax_country_code
+  attr_accessor :order_date_type, :buyer_credit_card_prefix, :custom_data, :buyer_name, :invoice_date, :currency_code, :sub_account_id, :supply_date, :control_flags, :invoice_address, :verification_token, :note, :tax_data, :transaction_lines, :buyer_tax_number, :status, :custom_fields, :force_country_code, :invoice_number, :order_date, :customer_id, :comments, :buyer_ip, :buyer_email, :original_transaction_key, :billing_country_code, :custom_id, :additional_currencies, :invoice_place, :evidence, :description, :tax_deducted, :tax_country_code
 
   # :internal => :external
   def self.attribute_map
@@ -25,6 +25,7 @@ class InputTransaction
       :currency_code => :currency_code,
       :sub_account_id => :sub_account_id,
       :supply_date => :supply_date,
+      :control_flags => :control_flags,
       :invoice_address => :invoice_address,
       :verification_token => :verification_token,
       :note => :note,
@@ -88,6 +89,11 @@ class InputTransaction
       @supply_date = attributes["supply_date"]
         
     end
+    if attributes.key?("control_flags")
+      if (value = attributes["control_flags"]).is_a?(Array)
+          @control_flags = value.map{ |v| ControlFlags.new(v) }
+        end
+      end
     if attributes.key?("invoice_address")
       @invoice_address = InvoiceAddress.new(attributes["invoice_address"])
         

data/lib/taxamo/models/inputtransactionupdate.rb

@@ -12,7 +12,7 @@
 
 module Taxamo
 class InputTransactionUpdate
-  attr_accessor :order_date_type, :buyer_credit_card_prefix, :custom_data, :buyer_name, :invoice_date, :currency_code, :sub_account_id, :supply_date, :invoice_address, :verification_token, :note, :tax_data, :transaction_lines, :buyer_tax_number, :status, :custom_fields, :force_country_code, :invoice_number, :order_date, :customer_id, :comments, :buyer_ip, :buyer_email, :original_transaction_key, :billing_country_code, :custom_id, :additional_currencies, :invoice_place, :evidence, :description, :tax_deducted, :tax_country_code
+  attr_accessor :order_date_type, :buyer_credit_card_prefix, :custom_data, :buyer_name, :invoice_date, :currency_code, :sub_account_id, :supply_date, :control_flags, :invoice_address, :verification_token, :note, :tax_data, :transaction_lines, :buyer_tax_number, :status, :custom_fields, :force_country_code, :invoice_number, :order_date, :customer_id, :comments, :buyer_ip, :buyer_email, :original_transaction_key, :billing_country_code, :custom_id, :additional_currencies, :invoice_place, :evidence, :description, :tax_deducted, :tax_country_code
 
   # :internal => :external
   def self.attribute_map
@@ -25,6 +25,7 @@ class InputTransactionUpdate
       :currency_code => :currency_code,
       :sub_account_id => :sub_account_id,
       :supply_date => :supply_date,
+      :control_flags => :control_flags,
       :invoice_address => :invoice_address,
       :verification_token => :verification_token,
       :note => :note,
@@ -88,6 +89,11 @@ class InputTransactionUpdate
       @supply_date = attributes["supply_date"]
         
     end
+    if attributes.key?("control_flags")
+      if (value = attributes["control_flags"]).is_a?(Array)
+          @control_flags = value.map{ |v| ControlFlags.new(v) }
+        end
+      end
     if attributes.key?("invoice_address")
       @invoice_address = InvoiceAddress.new(attributes["invoice_address"])
         

data/lib/taxamo/models/transaction.rb

@@ -12,7 +12,7 @@
 
 module Taxamo
 class Transaction
-  attr_accessor :confirm_timestamp, :fully_informative, :deducted_tax_amount, :order_date_type, :buyer_credit_card_prefix, :custom_data, :buyer_name, :invoice_date, :create_timestamp, :currency_code, :sub_account_id, :supply_date, :buyer_tax_number_normalized, :invoice_image_url, :key, :buyer_tax_number_format_valid, :tax_number_service, :invoice_address, :buyer_tax_number_valid, :verification_token, :note, :tax_supported, :tax_data, :transaction_lines, :buyer_tax_number, :external_key, :status, :custom_fields, :force_country_code, :countries, :invoice_number, :order_date, :customer_id, :kind, :source, :amount, :comments, :buyer_ip, :buyer_email, :original_transaction_key, :billing_country_code, :custom_id, :tax_amount, :tax_entity_additional_id, :warnings, :additional_currencies, :invoice_place, :total_amount, :tax_entity_name, :evidence, :refunded_tax_amount, :manual, :tax_timezone, :description, :test, :tax_deducted, :tax_country_code, :refunded_total_amount
+  attr_accessor :confirm_timestamp, :fully_informative, :deducted_tax_amount, :order_date_type, :buyer_credit_card_prefix, :custom_data, :buyer_name, :invoice_date, :create_timestamp, :currency_code, :sub_account_id, :supply_date, :buyer_tax_number_normalized, :invoice_image_url, :key, :buyer_tax_number_format_valid, :tax_number_service, :control_flags, :invoice_address, :buyer_tax_number_valid, :verification_token, :note, :tax_supported, :tax_data, :transaction_lines, :buyer_tax_number, :external_key, :status, :custom_fields, :force_country_code, :countries, :invoice_number, :order_date, :customer_id, :kind, :source, :amount, :comments, :buyer_ip, :buyer_email, :original_transaction_key, :billing_country_code, :custom_id, :tax_amount, :tax_entity_additional_id, :warnings, :additional_currencies, :invoice_place, :total_amount, :tax_entity_name, :evidence, :refunded_tax_amount, :manual, :tax_timezone, :description, :test, :tax_deducted, :tax_country_code, :refunded_total_amount
 
   # :internal => :external
   def self.attribute_map
@@ -34,6 +34,7 @@ class Transaction
       :key => :key,
       :buyer_tax_number_format_valid => :buyer_tax_number_format_valid,
       :tax_number_service => :tax_number_service,
+      :control_flags => :control_flags,
       :invoice_address => :invoice_address,
       :buyer_tax_number_valid => :buyer_tax_number_valid,
       :verification_token => :verification_token,
@@ -150,6 +151,11 @@ class Transaction
       @tax_number_service = attributes["tax_number_service"]
         
     end
+    if attributes.key?("control_flags")
+      if (value = attributes["control_flags"]).is_a?(Array)
+          @control_flags = value.map{ |v| ControlFlags.new(v) }
+        end
+      end
     if attributes.key?("invoice_address")
       @invoice_address = InvoiceAddress.new(attributes["invoice_address"])
         

data/lib/taxamo/models/transactions.rb

@@ -12,7 +12,7 @@
 
 module Taxamo
 class Transactions
-  attr_accessor :confirm_timestamp, :fully_informative, :deducted_tax_amount, :order_date_type, :buyer_credit_card_prefix, :custom_data, :buyer_name, :invoice_date, :create_timestamp, :currency_code, :sub_account_id, :supply_date, :buyer_tax_number_normalized, :invoice_image_url, :key, :buyer_tax_number_format_valid, :tax_number_service, :invoice_address, :buyer_tax_number_valid, :verification_token, :note, :tax_supported, :tax_data, :transaction_lines, :buyer_tax_number, :external_key, :status, :custom_fields, :force_country_code, :countries, :invoice_number, :order_date, :customer_id, :kind, :source, :amount, :comments, :buyer_ip, :buyer_email, :original_transaction_key, :billing_country_code, :custom_id, :tax_amount, :tax_entity_additional_id, :warnings, :additional_currencies, :invoice_place, :total_amount, :tax_entity_name, :evidence, :refunded_tax_amount, :manual, :tax_timezone, :description, :test, :tax_deducted, :tax_country_code, :refunded_total_amount
+  attr_accessor :confirm_timestamp, :fully_informative, :deducted_tax_amount, :order_date_type, :buyer_credit_card_prefix, :custom_data, :buyer_name, :invoice_date, :create_timestamp, :currency_code, :sub_account_id, :supply_date, :buyer_tax_number_normalized, :invoice_image_url, :key, :buyer_tax_number_format_valid, :tax_number_service, :control_flags, :invoice_address, :buyer_tax_number_valid, :verification_token, :note, :tax_supported, :tax_data, :transaction_lines, :buyer_tax_number, :external_key, :status, :custom_fields, :force_country_code, :countries, :invoice_number, :order_date, :customer_id, :kind, :source, :amount, :comments, :buyer_ip, :buyer_email, :original_transaction_key, :billing_country_code, :custom_id, :tax_amount, :tax_entity_additional_id, :warnings, :additional_currencies, :invoice_place, :total_amount, :tax_entity_name, :evidence, :refunded_tax_amount, :manual, :tax_timezone, :description, :test, :tax_deducted, :tax_country_code, :refunded_total_amount
 
   # :internal => :external
   def self.attribute_map
@@ -34,6 +34,7 @@ class Transactions
       :key => :key,
       :buyer_tax_number_format_valid => :buyer_tax_number_format_valid,
       :tax_number_service => :tax_number_service,
+      :control_flags => :control_flags,
       :invoice_address => :invoice_address,
       :buyer_tax_number_valid => :buyer_tax_number_valid,
       :verification_token => :verification_token,
@@ -150,6 +151,11 @@ class Transactions
       @tax_number_service = attributes["tax_number_service"]
         
     end
+    if attributes.key?("control_flags")
+      if (value = attributes["control_flags"]).is_a?(Array)
+          @control_flags = value.map{ |v| ControlFlags.new(v) }
+        end
+      end
     if attributes.key?("invoice_address")
       @invoice_address = InvoiceAddress.new(attributes["invoice_address"])
         

data/lib/taxamo/version.rb

@@ -11,7 +11,7 @@
 # limitations under the License.
 
 module Taxamo
-  VERSION = "2.3.5"
+  VERSION = "2.3.6"
 end
 
 

data/test/taxamo/tax_test.rb

@@ -114,6 +114,46 @@ class TaxTest < Test::Unit::TestCase
     assert_equal resp.transaction.transaction_lines[0].tax_rate, 5.5
     assert_equal resp.transaction.transaction_lines[0].total_amount, 105.5
 
+  end
+
+
+   should 'test simple calculate with b2b flags' do
+
+    Swagger.configure do |config|
+      config.api_key = 'SamplePrivateTestKey1'
+    end
+
+    resp = Taxamo.calculate_simple_tax('e-book', #product_type
+                                       nil, #invoice_address_city
+                                       nil, #buyer_credit_card_prefix
+                                       'USD', #currency_code
+                                       nil, #invoice_address_region
+                                       nil, #unit_price
+                                       nil, #quantity
+                                       "PL0000000000", #buyer_tax_number
+                                       nil, #force_country_code
+                                       nil, #order_date
+                                       100, #amount
+                                       'IE', #billing_country_code
+                                       nil, #invoice_address_postal_code
+                                       nil, #total_amount
+                                       nil,  #tax_deducted
+                                       "accept", #b2b_number_service_on_error
+                                       "001", #b2b_number_service_timeoutms
+                                       "0" #b2b_number_service_cache_expiry_days
+                                       )
+
+    assert_equal resp.transaction.buyer_tax_number_valid, true
+    assert_equal resp.transaction.note, "b2b_error_accept"
+    assert_equal resp.transaction.warnings[0].type, "vies-error"
+    assert_equal resp.transaction.warnings[0].message, "Read timed out"
+
+    #assert_equal resp.transaction.tax_country_code, 'PL'
+    assert_equal resp.transaction.amount, 100
+    assert_equal resp.transaction.tax_amount, 0
+    assert_equal resp.transaction.total_amount, 100
+    assert_equal resp.transaction.tax_deducted, true
+
   end
 
   should 'test validate tax number' do

data/test/taxamo/transactions_api_test.rb

@@ -240,7 +240,7 @@ class TransactionsApiTest < Test::Unit::TestCase
 
   end
 
-  should "test custom fields" do
+  should "test custom fields and control flags" do
     resp = Taxamo.create_transaction(
         {'transaction' => {
             'currency_code' => 'USD',
@@ -250,6 +250,8 @@ class TransactionsApiTest < Test::Unit::TestCase
             'order_date' => '2014-06-01',
             'custom_fields' => [{'key' => 'test1', 'value' => 'test2'},
                                 {'key' => 'test1', 'value' => 'test3'}],
+            'control_flags' => [{'key' => 'test4', 'value' => 'test5'},
+                                {'key' => 'test6', 'value' => 'test7'}],
             'transaction_lines' => [{'amount' => 200,
                                      'custom_id' => 'line1',
                                      'custom_fields' => [{'key' => 'test11', 'value' => 'test22'},
@@ -263,6 +265,8 @@ class TransactionsApiTest < Test::Unit::TestCase
     assert_equal resp.transaction.status, 'N'
     assert_equal resp.transaction.custom_fields[0].key, 'test1'
     assert_equal resp.transaction.custom_fields[1].value, 'test3'
+    assert_equal resp.transaction.control_flags[0].key, 'test4'
+    assert_equal resp.transaction.control_flags[1].value, 'test7'
 
     resp = Taxamo.get_transaction(resp.transaction.key)
 
@@ -271,6 +275,8 @@ class TransactionsApiTest < Test::Unit::TestCase
     assert_equal resp.transaction.custom_fields[0].key, 'test1'
     assert_equal resp.transaction.custom_fields[1].value, 'test3'
     assert_equal resp.transaction.transaction_lines[0].custom_fields[1].value, 'test23'
+    assert_equal resp.transaction.control_flags[0].key, 'test4'
+    assert_equal resp.transaction.control_flags[1].value, 'test7'
 
     resp = Taxamo.update_transaction(resp.transaction.key,
                                     {'transaction' =>
@@ -302,6 +308,10 @@ class TransactionsApiTest < Test::Unit::TestCase
     assert_equal resp.transaction.custom_fields[0].key, 'test51'
     assert_equal resp.transaction.custom_fields[1].value, 'test53'
     assert_equal resp.transaction.custom_fields[2].value, 'test63'
+
+    assert_equal resp.transaction.control_flags[0].key, 'test4'
+    assert_equal resp.transaction.control_flags[1].value, 'test7'
+
     assert_equal resp.transaction.transaction_lines[0].custom_fields[1].value, 'test43'
     assert_equal resp.transaction.transaction_lines[1].custom_fields[1].value, 'test83'
 
@@ -331,6 +341,10 @@ class TransactionsApiTest < Test::Unit::TestCase
     assert_equal resp.transactions[0].custom_fields[0].key, 'test51'
     assert_equal resp.transactions[0].custom_fields[1].value, 'test53'
     assert_equal resp.transactions[0].custom_fields[2].value, 'test63'
+
+    assert_equal resp.transactions[0].control_flags[0].key, 'test4'
+    assert_equal resp.transactions[0].control_flags[1].value, 'test7'
+
     assert_equal resp.transactions[0].transaction_lines[0].custom_fields[1].value, 'test43'
     assert_equal resp.transactions[0].transaction_lines[1].custom_fields[1].value, 'test83'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taxamo-ns
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors:
 - Tomek Lipski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -140,6 +140,7 @@ files:
 - lib/taxamo/models/capturepaymentout.rb
 - lib/taxamo/models/confirmtransactionin.rb
 - lib/taxamo/models/confirmtransactionout.rb
+- lib/taxamo/models/controlflags.rb
 - lib/taxamo/models/countries.rb
 - lib/taxamo/models/country.rb
 - lib/taxamo/models/countryschema.rb