skv_report 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c31bd0550e519a43a66dd68769bc31ff1fe7b0b31bcbedb00ceb347c2f0aa85c
-  data.tar.gz: b207e0835e2775c0715ac331a8e76ca9f3eb7418af1ecd1f06addb6ea90f4e2b
+  metadata.gz: 256f62be78009098636a7a70508bdead8d7b6bf8ca42446de579b06fc754a29f
+  data.tar.gz: 064b150c1c4cb7ad01afe76f09a49fb21d1273be15ffc1f769a8ef53c6224af4
 SHA512:
-  metadata.gz: 8ff058a181aacd7bd378aa29b92671b9f1899a6d9839d8818621c682f217066fea9f439efbdc9258d2fc923a1b9af76762cee6774a0b1524ae80e2c5c88dc800
-  data.tar.gz: c3b3244deca7946db8709cdca43b1b15dfa732837b3c900d49591dc378848c522569977fc20fa15d71e69ca46aa120593a3390d85ecfa1f5b1cb11f3ea3689cf
+  metadata.gz: 5bbf13c9b1b83e368c8b983429ebd6b0b3f6ec794c7eccd8822c0779062f89a02626a16fa50e295b320f5b4740a6cdd8be2ca6665f973e413d4435266a5fa12b
+  data.tar.gz: 5fb0719b5815e59230ab3e8b9b19c5bc38e8b959489c165ffc443971e8a5537376b795f818487051a9f91f93ce80a2fc2ba21649fee7e8e2e7e626c365c9d85b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    skv_report (0.3.0)
+    skv_report (0.3.1)
       money (~> 6.14)
       valvat (~> 1.1)
 

data/lib/skv_report/stripe.rb

@@ -6,8 +6,6 @@ require 'skv_report/stripe_charge_row'
 module SKVReport
   # Generate SKV CSV string from Stripe charge
   class Stripe
-    class NoTurnoverCountryError < StandardError; end
-
     class UndefinedTypeOfSalesError < StandardError; end
 
     attr_reader :charges, :period, :year, :company_information, :rates

data/lib/skv_report/stripe_charge_row.rb

@@ -19,7 +19,7 @@ module SKVReport
     #
     def initialize(charge, exchange_rates)
       @charge = charge
-      @buyer_vat_number = charge.dig('customer', 'tax_info', 'tax_id') || ''
+      @buyer_vat_number = vat_number
       @exchange_rates = exchange_rates
     end
 
@@ -28,11 +28,23 @@ module SKVReport
     end
 
     def skippable?
-      swedish_buyer? || !valid_vat_number? || not_completed? || refunded?
+      buyer_vat_number.nil? ||
+        swedish_buyer? ||
+        !valid_vat_number? ||
+        not_completed? ||
+        refunded?
     end
 
     private
 
+    def vat_number
+      tax_object = charge.dig('customer', 'tax_ids', 'data').find do |tax_data|
+        tax_data['type'].casecmp?('eu_vat')
+      end
+
+      tax_object&.fetch('value', '')
+    end
+
     def swedish_buyer?
       buyer_vat_number[0...2].casecmp?('SE')
     end

data/lib/skv_report/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SKVReport
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skv_report
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - frdrkolsson