polish_invoicer 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3f7e001192f272c399b89003c67319860952016
-  data.tar.gz: 81fbc5378c8c2d768116b0ad2f0c7286330e1ea1
+  metadata.gz: 644beb638eed958e59e1975f1c05c01c925622f5
+  data.tar.gz: b8b85f18b71cce1b17f039af4d03df5eb28f4c4e
 SHA512:
-  metadata.gz: d3445e63f58a3fa8a665fb7eef10a846a046f1e4d13d66aab1591aa3426b20d7cb2a0bac769e9ed28b1e3c243bc67c38cfd66aee7261876d9d2ae1a425f338e4
-  data.tar.gz: 477e55cf5e6a946ab513a4a7ffa5f1f82ae99e0d1de72bee6e99211d4ec7c40ca68af436ff3bc2d0395eebde24f536815d26544af8cfda8bcb141fe8d8212139
+  metadata.gz: 392e24d56f6e06c8c584da31b42292a653db624f59796ea809cdb17f62f534179b296fab8b2ccba018841f7f5de89e01ab0ebcfd1f69c7e43f85ebbd3ca935eb
+  data.tar.gz: b046255d9abd0474c8a4289ae96fbe36f7643965216dfe46ac8905f390cda8c45e121b912da87abc24ce2ba2140e7a188cf455da1f45dc85db5c0afc109ebeb3

data/README.md

@@ -91,10 +91,12 @@ invoice.save_to_pdf('/path/to/invoice.pdf')
                           # wartość domyślna: false
     :payment_type,        # rodzaj płatności (string)
                           # wartość domyślna: 'Przelew'
-    :foreign_buyer,       # nabywcą jest firma spoza Polski
-                          # wartość domyślna: false (boolean)
-    :reverse_charge       # faktura z odwrotnym obciążeniem VAT
-                          # wartość domyślna: false (boolean)
+    :foreign_buyer,       # nabywcą jest firma spoza Polski (boolean)
+                          # wartość domyślna: false
+    :reverse_charge       # faktura z odwrotnym obciążeniem VAT (boolean)
+                          # wartość domyślna: false
+    :currency             # waluta rozliczeniowa (string)
+                          # wartość domyślna: PLN                      
 
 ### Parametry dodatkowe
 

data/doc/invoice.rb

@@ -19,7 +19,8 @@ invoice = PolishInvoicer::Invoice.new(
   # proforma: true,
   # paid: false,
   foreign_buyer: true,
-  reverse_charge: true
+  reverse_charge: true,
+  currency: 'USD'
 )
 invoice.save_to_html('/tmp/invoice.html')
 invoice.save_to_pdf('/tmp/invoice.pdf')

data/lib/polish_invoicer/invoice.rb

@@ -22,7 +22,8 @@ module PolishInvoicer
       :proforma,          # znacznik faktury pro-forma, domyślnie: false (boolean)
       :no_vat_reason,     # podstawa prawna zwolnienia z VAT (string)
       :foreign_buyer,     # nabywcą jest firma spoza Polski, domyślnie: false (boolean)
-      :reverse_charge     # faktura z odwrotnym obciążeniem VAT
+      :reverse_charge,    # faktura z odwrotnym obciążeniem VAT
+      :currency           # waluta rozliczeniowa, domyślnie: PLN (string)
     ].freeze
 
     attr_accessor(*AVAILABLE_PARAMS)
@@ -88,6 +89,7 @@ module PolishInvoicer
       @proforma = false
       @foreign_buyer = false
       @reverse_charge = false
+      @currency = 'PLN'
       @recipient = []
     end
 

data/lib/polish_invoicer/validator.rb

@@ -18,6 +18,7 @@ module PolishInvoicer
       check_vat
       check_proforma
       check_create_and_payment_date
+      check_currency
       @errors.empty?
     end
 
@@ -40,6 +41,7 @@ module PolishInvoicer
     def check_not_nil
       @errors[:gross_price] = 'Konieczne jest ustawienie znacznika rodzaju ceny (netto/brutto)' if @invoice.gross_price.nil?
       @errors[:paid] = 'Konieczne jest ustawienie znacznika opłacenia faktury' if @invoice.paid.nil?
+      @errors[:currency] = 'Konieczne jest ustawienie waluty rozliczeniowej' if @invoice.currency.nil?
     end
 
     def check_arrays
@@ -102,6 +104,12 @@ module PolishInvoicer
       @errors[:payment_date] = 'Termin płatności nie może być wcześniejszy niż data wystawienia'
     end
 
+    def check_currency
+      return if @errors[:currency]
+      return if %w[PLN EUR USD GBP].include?(@invoice.currency)
+      @errors[:currency] = 'Nieznana waluta'
+    end
+
     def blank?(value)
       value.to_s.strip == ''
     end

data/lib/polish_invoicer/vat.rb

@@ -1,35 +1,27 @@
 module PolishInvoicer
   class Vat
     def self.rates
-      [23, 8, 5, 0, -1] # -1 oznacza zwolniony z VAT
+      (0..27)
     end
 
     def self.valid?(rate)
+      return true if zw?(rate)
       rates.include?(rate)
     end
 
     # Czy stawka VAT to "zwolniony"?
     def self.zw?(rate)
-      rate == -1
+      rate == -1 # -1 oznacza zwolniony z VAT
     end
 
     def self.to_s(rate)
-      hash.invert[rate]
+      return 'zw.' if zw?(rate)
+      "#{rate}%"
     end
 
     # Potrzebne do obliczeń netto/vat/brutto
     def self.to_i(rate)
-      rate != -1 ? rate : 0
-    end
-
-    def self.hash
-      h = {}
-      rates.each do |r|
-        name = "#{r}%"
-        name = 'zw.' if r == -1
-        h[name] = r
-      end
-      h
+      zw?(rate) ? 0 : rate
     end
   end
 end

data/lib/polish_invoicer/version.rb

@@ -1,3 +1,3 @@
 module PolishInvoicer
-  VERSION = '0.0.19'.freeze
+  VERSION = '0.0.20'.freeze
 end

data/test/invoice_test.rb

@@ -26,26 +26,41 @@ module PolishInvoicer
     end
 
     def test_net_value
-      i = Invoice.new(price: 123.45, gross_price: false, vat: 23)
+      i = Invoice.new(price: 123.45, gross_price: false)
+      i.vat = 23
       assert_in_delta 123.45, i.net_value, 0.01
+
       i.gross_price = true
+      i.vat = 23
       assert_in_delta 100.37, i.net_value, 0.01
+      i.vat = 5.5
+      assert_in_delta 117.01, i.net_value, 0.01
       i.vat = 0
       assert_in_delta 123.45, i.net_value, 0.01
       i.vat = -1
       assert_in_delta 123.45, i.net_value, 0.01
+
       i.gross_price = false
       i.vat = 0
       assert_in_delta 123.45, i.net_value, 0.01
       i.vat = -1
       assert_in_delta 123.45, i.net_value, 0.01
+      i.vat = 5.5
+      assert_in_delta 123.45, i.net_value, 0.01
     end
 
     def test_vat_value
-      i = Invoice.new(price: 123.45, gross_price: false, vat: 23)
+      i = Invoice.new(price: 123.45, gross_price: false)
+      i.vat = 23
       assert_in_delta 28.39, i.vat_value, 0.01
+      i.vat = 5.5
+      assert_in_delta 6.79, i.vat_value, 0.01
+
       i.gross_price = true
+      i.vat = 23
       assert_in_delta 23.08, i.vat_value, 0.01
+      i.vat = 5.5
+      assert_in_delta 6.44, i.vat_value, 0.01
       i.vat = 0
       assert_equal 0.00, i.vat_value
       i.vat = -1
@@ -53,15 +68,23 @@ module PolishInvoicer
     end
 
     def test_gross_value
-      i = Invoice.new(price: 123.45, gross_price: false, vat: 23)
+      i = Invoice.new(price: 123.45, gross_price: false)
+      i.vat = 23
       assert_in_delta 151.84, i.gross_value, 0.01
+
       i.gross_price = true
+      i.vat = 23
+      assert_in_delta 123.45, i.gross_value, 0.01
+      i.vat = 5.5
       assert_in_delta 123.45, i.gross_value, 0.01
       i.vat = 0
       assert_in_delta 123.45, i.gross_value, 0.01
       i.vat = -1
       assert_in_delta 123.45, i.gross_value, 0.01
+
       i.gross_price = false
+      i.vat = 5.5
+      assert_in_delta 130.24, i.gross_value, 0.01
       i.vat = 0
       assert_in_delta 123.45, i.gross_value, 0.01
       i.vat = -1

data/test/validator_test.rb

@@ -142,6 +142,21 @@ module PolishInvoicer
       assert_nil v.errors[:payment_date]
     end
 
+    def test_currency
+      @invoice.currency = nil
+      v = Validator.new(@invoice)
+      v.valid?
+      assert v.errors[:currency]
+      @invoice.currency = 'XYZ'
+      v = Validator.new(@invoice)
+      v.valid?
+      assert v.errors[:currency]
+      @invoice.currency = 'EUR'
+      v = Validator.new(@invoice)
+      v.valid?
+      refute v.errors[:currency]
+    end
+
     private
 
     def check_error(field, value = nil)

data/test/vat_test.rb

@@ -4,22 +4,35 @@ module PolishInvoicer
   class VatTest < Minitest::Test
     def test_valid
       assert Vat.valid?(23)
+      assert Vat.valid?(27)
+      assert Vat.valid?(2)
+      assert Vat.valid?(5.5)
+      assert Vat.valid?(4.8)
       assert Vat.valid?(0)
       assert Vat.valid?(-1)
-      assert_equal false, Vat.valid?(123)
-      assert_equal false, Vat.valid?(-10)
-      assert_equal false, Vat.valid?('test')
+      refute Vat.valid?(123)
+      refute Vat.valid?(-10)
+      refute Vat.valid?('test')
+      refute Vat.valid?('2,1')
+      refute Vat.valid?('2.1')
     end
 
     def test_zw
       assert Vat.zw?(-1)
-      assert_equal false, Vat.zw?(23)
+      refute Vat.zw?(23)
     end
 
     def test_to_s
       assert_equal '23%', Vat.to_s(23)
+      assert_equal '5.5%', Vat.to_s(5.5)
       assert_equal '0%', Vat.to_s(0)
       assert_equal 'zw.', Vat.to_s(-1)
     end
+
+    def test_to_i
+      assert_equal 0, Vat.to_i(-1)
+      assert_equal 5.5, Vat.to_i(5.5)
+      assert_equal 20, Vat.to_i(20)
+    end
   end
 end

data/tpl/invoice-en.slim

@@ -151,7 +151,7 @@ html
               .small
                 em Total to pay:
             .col-xs-6
-              b = "#{reverse_charge == true ? net_value : gross_value} PLN"
+              b = "#{reverse_charge == true ? net_value : gross_value} #{currency}"
           .row
             .col-xs-6
               | Zapłacono:
@@ -159,9 +159,9 @@ html
                 em Amount paid:
             .col-xs-6
               - if paid
-                = "#{reverse_charge == true ? net_value : gross_value} PLN"
+                = "#{reverse_charge == true ? net_value : gross_value} #{currency}"
               - else
-                | 0,00 PLN
+                = "0,00 #{currency}"
           .row
             .col-xs-6
               | Zostało do zapłaty:
@@ -169,9 +169,9 @@ html
                 em Left to pay:
             .col-xs-6
               - if paid
-                | 0,00 PLN
+                = "0,00 #{currency}"
               - else
-                = "#{reverse_charge == true ? net_value : gross_value} PLN"
+                = "#{reverse_charge == true ? net_value : gross_value} #{currency}"
 
         .col-xs-6
           - if comments.any?

data/tpl/invoice.slim

@@ -103,17 +103,17 @@ html
           br
           | Zostało do zapłaty:
         .col-xs-3
-          b = "#{gross_value} PLN"
+          b = "#{gross_value} #{currency}"
           br
           - if paid
-            = "#{gross_value} PLN"
+            = "#{gross_value} #{currency}"
           - else
-            | 0,00 PLN
+            = "0,00 #{currency}"
           br
           - if paid
-            | 0,00 PLN
+            = "0,00 #{currency}"
           - else
-            = "#{gross_value} PLN"
+            = "#{gross_value} #{currency}"
         - if comments.any?
           .col-xs-6
             b Uwagi:

data/tpl/proforma-en.slim

@@ -136,7 +136,7 @@ html
               .small
                 em Total to pay:
             .col-xs-6
-              b = "#{reverse_charge == true ? net_value : gross_value} PLN"
+              b = "#{reverse_charge == true ? net_value : gross_value} #{currency}"
           .row
             .col-xs-6
               | Zapłacono:
@@ -144,9 +144,9 @@ html
                 em Amount paid:
             .col-xs-6
               - if paid
-                = "#{reverse_charge == true ? net_value : gross_value} PLN"
+                = "#{reverse_charge == true ? net_value : gross_value} #{currency}"
               - else
-                | 0,00 PLN
+                = "0,00 #{currency}"
           .row
             .col-xs-6
               | Zostało do zapłaty:
@@ -154,9 +154,9 @@ html
                 em Left to pay:
             .col-xs-6
               - if paid
-                | 0,00 PLN
+                = "0,00 #{currency}"
               - else
-                = "#{reverse_charge == true ? net_value : gross_value} PLN"
+                = "#{reverse_charge == true ? net_value : gross_value} #{currency}"
 
         .col-xs-6
           - if comments.any?

data/tpl/proforma.slim

@@ -95,17 +95,17 @@ html
           br
           | Zostało do zapłaty:
         .col-xs-3
-          b = "#{gross_value} PLN"
+          b = "#{gross_value} #{currency}"
           br
           - if paid
-            = "#{gross_value} PLN"
+            = "#{gross_value} #{currency}"
           - else
-            | 0,00 PLN
+            = "0,00 #{currency}"
           br
           - if paid
-            | 0,00 PLN
+            = "0,00 #{currency}"
           - else
-            = "#{gross_value} PLN"
+            = "#{gross_value} #{currency}"
         - if comments.any?
           .col-xs-6
             b Uwagi:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polish_invoicer
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Piotr Macuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler