moss_generator 0.4.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad3786bac36f09eb868b05288e7cf8303f296f717d0c6e0cfdc4679d5340f687
-  data.tar.gz: e39c8296c61fec69eb1bf102743767e4171ce36a8f3dac140cbb95b58121f2f0
+  metadata.gz: 7f95b7ed0d7074f3ca87040394af09e0ba85bdd2f68eb70dcec3166027c2b204
+  data.tar.gz: 8f333d25b73c6c3b03941bd15e7dd0ee8b96d35f0ad7469c99e8ca2512bfa142
 SHA512:
-  metadata.gz: 976a67a9a004a2e6c2c3613826cd5ba8670b08064985426f6aa47b00838e1037e0088890e9a0a626cdf6a91ddbbc8318eb35c4454cce362f49bd6c777b084ccb
-  data.tar.gz: e4d6e7b8976351ad93433c843d41176358ca43f60950b546e89600a992d75e00c091ed9d602c3490fecd3057a403bd0cdc3dc077f0da7fdf91fcae6bf7f7a7ec
+  metadata.gz: a2d2cdc21fa1fc84da5561cf73b506d79f25c034d3f12d68eea7b4e9bca20fb46a2c7a2709c6d7ad9dce49b717308dabfaf251f7fdb8f6e476750b026ac67eda
+  data.tar.gz: ba490e2a77965cbf52957977482e85ba6011f2374fa9c223abb8f528311d56a4f677f6b6f6841fa1b2d83978698739d7c787ca072b619af00a324343c0ca3936

data/.rubocop.yml

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

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    moss_generator (0.4.1)
-      countries (~> 3.1)
+    moss_generator (0.5.2)
+      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
@@ -51,24 +52,27 @@ module MossGenerator
 
         charge_row
       end.compact
-      charges_rows.group_by(&:country_code)
+      charges_rows.group_by do |row|
+        [row.country_code, row.vat_rate]
+      end
     end
 
     def build_charges_rows
-      group_charges_rows.map do |country, charges|
+      group_charges_rows.map do |(country, vat), charges|
         next if country == 'SE' && turnover_country == 'SE'
-        next if charges.first.vat_rate.nil?
+        next if vat.nil?
 
-        country_row(country, charges)
+        country_row(country, charges, vat)
       end.compact
     end
 
-    def country_row(country, charges)
+    def country_row(country, charges, vat)
       [turnover_country,
-       country,
-       format_to_two_decimals(charges.first.vat_rate),
+       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
@@ -83,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

@@ -36,7 +36,7 @@ module MossGenerator
     end
 
     def vat_rate
-      @vat_rate = MossGenerator::VatRate.for(country_code)
+      @vat_rate = special_vat_rate_for_2021_quarter_one
     end
 
     def vat_amount
@@ -56,6 +56,17 @@ module MossGenerator
 
     private
 
+    def special_vat_rate_for_2021_quarter_one
+      if fetch_country_code.casecmp?('IE')
+        changeover_day = Date.parse('2021-03-01').to_time
+        return 23 if Time.at(charge['created']) >= changeover_day
+
+        21
+      else
+        MossGenerator::VatRate.for(country_code)
+      end
+    end
+
     def company?
       return false if charge.dig('metadata', 'vat_number').nil?
 

data/lib/moss_generator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MossGenerator
-  VERSION = '0.4.1'
+  VERSION = '0.5.2'
 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
+  version: 0.5.2
 platform: ruby
 authors:
 - frdrkolsson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-14 00:00:00.000000000 Z
+date: 2022-01-04 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: []