moss_generator 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1462fa3751817e880b7dbb132fa79995f0bd81a78b486f072df43488ea50165
-  data.tar.gz: 66ce0390a72a02f1e37658dbee109a0987e487320be9bb62504222cedbc9b097
+  metadata.gz: ad1ddceb7b906a75ee7db040f6f02daa81743a0740ee9f3c060d6ec91b4fdf29
+  data.tar.gz: 94c9ba93ab8d08a7db9829cadd1c9e2cc5770777d09015e6bbbfa085aa207cd5
 SHA512:
-  metadata.gz: 291d9960062859955bb3591eebd0f74bae82c661353c6ffe37e12d5376ca9a0a4ff2c868a1ab23a7760aa09a3e495e01c2d3ad1a7e00484c8314078a4cc3e707
-  data.tar.gz: 729c6a64c26bf282d8eef6f7f2a14cff28ea479b1249c29488c870a8c9b26ea30115e94107e5e11a1391eed4e90052778f8822f38a81f931bb336d09e0cf95c3
+  metadata.gz: 2c550595f24be6127e4555c58320e6e48c331cd17a8e74000ea57fbf7939d53c73c31bb390b3d7f71d84f7b0768f7c823e519a93b2b90bc226f30b6945bbb8af
+  data.tar.gz: d803e9ec37eceb859a5d726d0a5376659a979039add06b84a2d8ce47dc2cb19a55adbc2be9f7cad0f4f88a7ed00095b430a3dbe641811996f7fbe87fded1f378

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    moss_generator (0.1.3)
+    moss_generator (0.1.5)
 
 GEM
   remote: https://rubygems.org/

data/lib/moss_generator/stripe.rb

@@ -45,8 +45,11 @@ module MossGenerator
 
     def group_charges_rows
       charges_rows = charges.map do |charge|
-        MossGenerator::StripeChargeRow.new(charge)
-      end
+        charge_row = MossGenerator::StripeChargeRow.new(charge)
+        next if charge_row.skippable?
+
+        charge_row
+      end.compact
       charges_rows.group_by(&:country_code)
     end
 

data/lib/moss_generator/stripe_charge_row.rb

@@ -22,7 +22,7 @@ module MossGenerator
     end
 
     def amount
-      charge.dig('balance_transaction', 'amount')
+      amount_without_vat
     end
 
     def vat_rate
@@ -33,15 +33,42 @@ module MossGenerator
       amount * vat_rate_calculatable_percent
     end
 
+    def skippable?
+      company? || not_completed? || refunded?
+    end
+
     private
 
+    def company?
+      charge.dig('metadata', 'vat_number').nil? ? false : true
+    end
+
+    def not_completed?
+      charge['status'] != 'succeeded'
+    end
+
+    def refunded?
+      charge['refunded']
+    end
+
+    def amount_without_vat
+      amount_with_vat * percent_without_vat
+    end
+
+    def amount_with_vat
+      charge.dig('balance_transaction', 'amount')
+    end
+
+    def percent_without_vat
+      1 / (vat_rate_calculatable_percent + 1)
+    end
+
     def vat_rate_calculatable_percent
       (vat_rate.to_f / 100)
     end
 
     def fetch_country_code
-      charge.dig('payment_method_details', 'card', 'country') ||
-        charge.dig('billing_details', 'address', 'country')
+      charge.dig('payment_method_details', 'card', 'country')
     end
   end
 end

data/lib/moss_generator/version.rb

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

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: moss_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - frdrkolsson
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
 date: 2021-01-15 00:00:00.000000000 Z
@@ -43,7 +43,7 @@ metadata:
   homepage_uri: https://github.com/standout/moss_generator
   source_code_uri: https://github.com/standout/moss_generator
   changelog_uri: https://github.com/standout/moss_generator
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -58,8 +58,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.2.3
+signing_key: 
 specification_version: 4
 summary: Skatteverket Mini One Stop Shop(MOSS) generator.
 test_files: []