workarea-klarna 1.0.0.beta1 → 1.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a35826c1d47f935b8d5ebbb1a6f2fc3337be504e7120edf742c647e8d7eb6c7f
-  data.tar.gz: a2648778ca85ad42996fa7f9bf5c730826358b7786b98895d34c0b526b3a5e04
+  metadata.gz: 6841a7473e3e7298fc8a4cc26544a61f93b4631b8bcc62e5631d94e7757b7751
+  data.tar.gz: 87bc257f83535b11edca9b84d92e6f224c19faafd5545fa365670db9a2e3ff9f
 SHA512:
-  metadata.gz: 9272c87153840555efbd07912dd17afa1128997f36b7e7d4525db7e754e95df80195a6673eac3af03469fa5ee55c0eb2263cbb75ced854bc28e50a600b8d7aa2
-  data.tar.gz: 21b70955ce13278c77615cddfdb6e93ad0e1c5d8eed7d857585c8395e6a29ca52ff6b720af761f5efb09ec0f07cc25070956d94bef38b735e60240a42ea9c949
+  metadata.gz: 99c77dc7ab625edf169e108dca137f69c4c2d7d8eaab730ea4b8831bc33bcc9ec5930b0c37f478dc38076363ee6cb3bb2b86dfdfa192c9d1e563f58f94f02ad1
+  data.tar.gz: fb073131ab19afd532b9a661d86ae2b5005cffde5eb64d0b8322ed464b03e110be500bd3b829ddd7f5cc7012a13db3e19d6dd97788344e60361b44dc3211c1a7

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+Workarea Klarna 1.0.0.beta2 (2020-09-22)
+--------------------------------------------------------------------------------
+
+*   bump version
+
+
+    Matt Duffy
+
+*   Include tax in totals for non-NA continents
+
+
+    Matt Duffy
+
+
+
 Workarea Klarna 1.0.0.beta1 (2020-07-28)
 --------------------------------------------------------------------------------
 

data/lib/workarea/klarna/gateway/order.rb

@@ -89,15 +89,24 @@ module Workarea
         def format_item(item)
           view_model = Storefront::OrderItemViewModel.new(item)
           breadcrumbs = Navigation::Breadcrumbs.from_global_id(item.via) if item.via.present?
+
           tax_amount, tax_rate = item_tax_data(item)
+          unit_price = item.current_unit_price.cents
+          total_amount = item.total_price.cents
+
+          if include_tax_in_totals?
+            tax_amount_per_item = tax_amount / item.quantity
+            unit_price += tax_amount_per_item
+            total_amount += tax_amount
+          end
 
           {
             name: view_model.product_name,
             type: item.shipping? ? 'physical' : 'digital',
             reference: item.sku,
             quantity: item.quantity,
-            unit_price: item.current_unit_price.cents,
-            total_amount: item.total_price.cents,
+            unit_price: unit_price,
+            total_amount: total_amount,
             total_tax_amount: tax_amount,
             tax_rate: tax_rate,
             product_url: Workarea::Storefront::Engine.routes.url_helpers.product_url(
@@ -132,6 +141,9 @@ module Workarea
                           .sum(&:amount)
                           .cents
 
+          tax_rate = ((shipping_tax * 1.0 / shipping_total).round(2) * 10000).to_i
+          shipping_total += shipping_tax if include_tax_in_totals?
+
           {
             name: 'Shipping',
             type: 'shipping_fee',
@@ -139,7 +151,7 @@ module Workarea
             unit_price: shipping_total,
             total_amount: shipping_total,
             total_tax_amount: shipping_tax,
-            tax_rate: ((shipping_tax * 1.0 / shipping_total).round(2) * 10000).to_i
+            tax_rate: tax_rate
           }
         end
 
@@ -225,7 +237,11 @@ module Workarea
         end
 
         def include_tax_line?
-          payment.address.country.alpha2 == 'US'
+          payment.address.country.continent == 'North America'
+        end
+
+        def include_tax_in_totals?
+          !include_tax_line?
         end
 
         def remove_inline_tax(hash)

data/lib/workarea/klarna/version.rb

@@ -1,5 +1,5 @@
 module Workarea
   module Klarna
-    VERSION = "1.0.0.beta1".freeze
+    VERSION = "1.0.0.beta2".freeze
   end
 end

data/test/lib/workarea/klarna/gateway/order_test.rb

@@ -90,8 +90,8 @@ module Workarea
           assert_equal('physical', line[:type])
           assert_equal('SKU', line[:reference])
           assert_equal(2, line[:quantity])
-          assert_equal(500, line[:unit_price])
-          assert_equal(1000, line[:total_amount])
+          assert_equal(540, line[:unit_price])
+          assert_equal(1081, line[:total_amount])
           assert_equal(81, line[:total_tax_amount])
           assert_equal(800, line[:tax_rate])
           assert_includes(line[:product_url], '/products/integration-product')
@@ -101,8 +101,8 @@ module Workarea
           assert_equal('Shipping', line[:name])
           assert_equal('shipping_fee', line[:type])
           assert_equal(1, line[:quantity])
-          assert_equal(700, line[:unit_price])
-          assert_equal(700, line[:total_amount])
+          assert_equal(763, line[:unit_price])
+          assert_equal(763, line[:total_amount])
           assert_equal(63, line[:total_tax_amount])
           assert_equal(900, line[:tax_rate])
 

data/test/lib/workarea/klarna/gateway/request_test.rb

@@ -4,7 +4,27 @@ module Workarea
   module Klarna
     class Gateway
       class RequestTest < TestCase
-        setup :configure_klarna_data, :payment
+        setup :clear_env, :configure_klarna_data, :payment
+        teardown :reset_env
+
+        def clear_env
+          @env_na_username = ENV['WORKAREA_KLARNA_NA_USERNAME']
+          @env_na_password = ENV['WORKAREA_KLARNA_NA_PASSWORD']
+          @env_eur_username = ENV['WORKAREA_KLARNA_EUR_USERNAME']
+          @env_eur_password = ENV['WORKAREA_KLARNA_EUR_PASSWORD']
+
+          ENV.delete('WORKAREA_KLARNA_NA_USERNAME')
+          ENV.delete('WORKAREA_KLARNA_NA_PASSWORD')
+          ENV.delete('WORKAREA_KLARNA_EUR_USERNAME')
+          ENV.delete('WORKAREA_KLARNA_EUR_PASSWORD')
+        end
+
+        def reset_env
+          ENV['WORKAREA_KLARNA_NA_USERNAME'] = @env_na_username
+          ENV['WORKAREA_KLARNA_NA_PASSWORD'] = @env_na_password
+          ENV['WORKAREA_KLARNA_EUR_USERNAME'] = @env_eur_username
+          ENV['WORKAREA_KLARNA_EUR_PASSWORD'] = @env_eur_password
+        end
 
         def order
           @order ||= create_order
@@ -43,11 +63,8 @@ module Workarea
           payment.set_address(supported_eur_address)
           assert_equal(Workarea.config.klarna_eur_username, request.username)
 
-          @env_eur_user = ENV['WORKAREA_KLARNA_EUR_USERNAME']
           ENV['WORKAREA_KLARNA_EUR_USERNAME'] = 'env_eur_user'
           assert_equal('env_eur_user', request.username)
-        ensure
-          ENV['WORKAREA_KLARNA_EUR_USERNAME'] = @env_eur_user
         end
 
         def test_password
@@ -62,11 +79,8 @@ module Workarea
           payment.set_address(supported_eur_address)
           assert_equal(Workarea.config.klarna_eur_password, request.password)
 
-          @env_eur_pass = ENV['WORKAREA_KLARNA_EUR_PASSWORD']
           ENV['WORKAREA_KLARNA_EUR_PASSWORD'] = 'env_eur_user'
           assert_equal('env_eur_user', request.password)
-        ensure
-          ENV['WORKAREA_KLARNA_EUR_PASSWORD'] = @env_eur_pass
         end
 
         def test_continent_key

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-klarna
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Matt Duffy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea