moss_generator 0.4.1.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5a596216f6d84e6178eed61ca60146695d1442651cd4d1193b8d430a061d01e
-  data.tar.gz: 511e5e30a8e24910c05abd028a977fcebb039353073476ca3afaa05a4975a4f5
+  metadata.gz: b22a165ad650e03060e839cd9ea483817eec530a42836fc8f5e9d935aa2cebd5
+  data.tar.gz: 3989024f80875480c50112e1360d6100e14d75cfceff9ab99a569a447de1becb
 SHA512:
-  metadata.gz: b9c353f6e72d5586820db41c452ecf1b3d6f9c2db7ff1713ffc4ffe5fe03a5e0a0bfb3872c5d4959bec6aad36b0e64fe75836d152eec0923c32e45bc410acc81
-  data.tar.gz: d3f0b382e87bcf84e3473811d1ff54da883cebe614b81d6ce46aad7ad63822bb9c6adcc5e449da0d7ef14d80bde0e1e7ea552c20f7d641c395bf91ecec78f0ec
+  metadata.gz: 45da0e44d80d6f5f04f762c948af8e91127b2deedd6d67ea23b77a8f731797a98e5674272d8084e9bfbff391803d18cefcbe0716ef802d000dc15aac58420416
+  data.tar.gz: 3ab6c4be61713bf7032db78373d156c7a397a41d8ee1173097316d059229dfa7133e2416c01b1b60e29ad6fef43545cc3fe218e2553eda2ac42f6173a7da9eae

data/.rubocop.yml

@@ -10,9 +10,15 @@ AllCops:
 Layout/LineLength:
   Max: 80
 
+Metrics/ClassLength:
+  Max: 120
+
+Metrics/ParameterLists:
+  Max: 6
+
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
 
 RSpec/NestedGroups:
-  Max: 5
+  Max: 6

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    moss_generator (0.4.1.1)
-      countries (~> 3.1)
+    moss_generator (0.6.0)
+      countries (~> 4.0)
       money (~> 6.14)
       valvat (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     akami (1.3.1)
       gyoku (>= 0.4.0)
@@ -18,24 +18,27 @@ GEM
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    countries (3.1.0)
-      i18n_data (~> 0.11.0)
+    concurrent-ruby (1.1.9)
+    countries (4.0.1)
+      i18n_data (~> 0.13.0)
       sixarm_ruby_unaccent (~> 1.1)
-      unicode_utils (~> 1.4)
     diff-lcs (1.4.4)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    httpi (2.4.5)
+    httpi (2.5.0)
       rack
       socksify
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.11.0)
+    i18n_data (0.13.0)
     method_source (1.0.0)
-    money (6.14.1)
+    mini_portile2 (2.6.1)
+    money (6.16.0)
       i18n (>= 0.6.4, <= 2)
-    nokogiri (1.11.3-x86_64-darwin)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
     nori (2.6.0)
     parallel (1.20.1)
@@ -48,7 +51,7 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.13.0)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rainbow (3.0.0)
     rake (13.0.3)
@@ -98,8 +101,7 @@ GEM
     sixarm_ruby_unaccent (1.2.0)
     socksify (1.7.1)
     unicode-display_width (1.7.0)
-    unicode_utils (1.4.0)
-    valvat (1.1.0)
+    valvat (1.1.2)
       savon (>= 2.3.0)
     wasabi (3.6.1)
       addressable
@@ -107,6 +109,7 @@ GEM
       nokogiri (>= 1.4.2)
 
 PLATFORMS
+  ruby
   x86_64-darwin-19
 
 DEPENDENCIES

data/lib/moss_generator/stripe.rb

@@ -8,18 +8,19 @@ module MossGenerator
   class Stripe
     class NoTurnoverCountryError < StandardError; end
 
-    attr_reader :charges, :vat_number, :period, :year, :rates
+    attr_reader :charges, :vat_number, :period, :year, :rates, :sale_type
 
-    def initialize(charges, vat_number, period, year, rates)
+    def initialize(charges, vat_number, period, year, rates, sale_type)
       @charges = charges
       @vat_number = vat_number
       @period = period
       @year = year
       @rates = rates
+      @sale_type = sale_type
     end
 
-    def self.call(charges, vat_number, period, year, rates)
-      new(charges, vat_number, period, year, rates).call
+    def self.call(charges, vat_number, period, year, rates, sale_type)
+      new(charges, vat_number, period, year, rates, sale_type).call
     end
 
     def call
@@ -33,7 +34,7 @@ module MossGenerator
     private
 
     def first_row
-      ['MOSS_001']
+      ['OSS_001']
     end
 
     def second_row
@@ -67,10 +68,11 @@ module MossGenerator
 
     def country_row(country, charges, vat)
       [turnover_country,
-       country,
+       country_code(country),
        format_to_two_decimals(vat),
        format_to_two_decimals(charges.sum(&:amount_without_vat)),
-       format_to_two_decimals(charges.sum(&:vat_amount))]
+       format_to_two_decimals(charges.sum(&:vat_amount)),
+       sale_type]
     end
 
     def csv_options
@@ -85,6 +87,12 @@ module MossGenerator
       ';'
     end
 
+    def country_code(country)
+      return 'EL' if country == 'GR'
+
+      country
+    end
+
     def format_to_two_decimals(number)
       format('%.2f', number).sub('.', ',')
     end

data/lib/moss_generator/stripe_charge_row.rb

@@ -98,7 +98,37 @@ module MossGenerator
     end
 
     def fetch_country_code
-      charge.dig('payment_method_details', 'card', 'country')
+      source_country || payment_method_country || fallback_country
+    end
+
+    def source_country
+      return source_owner_country if source_type.nil?
+
+      charge.dig('source', source_type, 'country') ||
+        charge.dig('source', source_type, 'address_country')
+    end
+
+    def payment_method_country
+      return if payment_type.nil?
+
+      charge.dig('payment_method_details', payment_type, 'country') ||
+        charge.dig('payment_method_details', payment_type, 'address_country')
+    end
+
+    def source_type
+      charge.dig('source', 'type') || charge.dig('source', 'object')
+    end
+
+    def source_owner_country
+      charge.dig('source', 'owner', 'address', 'country')
+    end
+
+    def payment_type
+      charge.dig('payment_method_details', 'type')
+    end
+
+    def fallback_country
+      charge.dig('shipping', 'address', 'country')
     end
 
     def amount_with_vat

data/lib/moss_generator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MossGenerator
-  VERSION = '0.4.1.1'
+  VERSION = '0.6.0'
 end

data/moss_generator.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['frdrkolsson']
   spec.email         = ['fredrik.olsson@standout.se']
 
-  spec.summary       = 'Skatteverket Mini One Stop Shop (MOSS) generator.'
+  spec.summary       = 'Skatteverket One Stop Shop (OSS) generator.'
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/standout/moss_generator'
   spec.license       = 'MIT'
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # spec.add_dependency to register a new dependency of your gem
-  spec.add_dependency 'countries', '~> 3.1'
+  spec.add_dependency 'countries', '~> 4.0'
   spec.add_dependency 'money', '~> 6.14'
   spec.add_dependency 'valvat', '~> 1.1'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moss_generator
 version: !ruby/object:Gem::Version
-  version: 0.4.1.1
+  version: 0.6.0
 platform: ruby
 authors:
 - frdrkolsson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-14 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Skatteverket Mini One Stop Shop (MOSS) generator.
+description: Skatteverket One Stop Shop (OSS) generator.
 email:
 - fredrik.olsson@standout.se
 executables: []
@@ -115,8 +115,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
-summary: Skatteverket Mini One Stop Shop (MOSS) generator.
+summary: Skatteverket One Stop Shop (OSS) generator.
 test_files: []