polish_invoicer 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9f720394b35d68552ab3e36b2db34f213024797d
-  data.tar.gz: 70e8b6d45d50b0f255d665d9ccea85d5d5dd354f
+SHA256:
+  metadata.gz: 83d6168d0e9d3dee433a2d9a0e7b6444120ea67834543ea6faf56ba4bf97d573
+  data.tar.gz: 12ce7534dd021a52e3b78efd9cb07e2f8872fd2b97c731c672785e68560b03fb
 SHA512:
-  metadata.gz: 9a898a23b93bdc22b4b8acde9d1acc24447551dabef29b8bcaf5fedebeef68ba188f1ec51e1f5bccdb3fb072d218234e1bdbd6c7318871d338876d1917e2e130
-  data.tar.gz: 78870d3a6072be8f966b57f752c8b360aca9bbdedc7bfe3e8056e2eb6de9235e08c5387b527a54f99640c485dd58931263d5d39d945b87ba79502d2deec72673
+  metadata.gz: 78c45cea18508cdabaef2d83a67b622135b1270b251f7ae9fa291ef31818ba0368784a28a1800ceaa811b6fdb470993dbf0815e41e443050a65146ffb7e5b6fb
+  data.tar.gz: 2ea922f4e34e5b20a27204ef7ca3a189a211cf1d8cb31da26c74310a6d8a468214ebf5902f0b5020783832397b4885c90ff181252440bbe39ee78b8289dced83

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2

data/README.md

@@ -87,6 +87,8 @@ invoice.save_to_pdf('/path/to/invoice.pdf')
                           # wartość domyślna: 23
     :paid,                # znacznik opłacenia usługi (boolean)
                           # wartość domyślna: true, czyli opłacona
+    :price_paid,          # kwota częściowego opłacenia faktury w złotych (float)
+                          # wartość domyślna: 0.0
     :proforma,            # znacznik faktury pro-forma (boolean)
                           # wartość domyślna: false
     :payment_type,        # rodzaj płatności (string)

data/lib/polish_invoicer/invoice.rb

@@ -11,6 +11,7 @@ module PolishInvoicer
       :recipient,         # odbiorca faktury (tablica stringów)
       :item_name,         # nazwa usługi (string)
       :price,             # cena w złotych (float)
+      :price_paid,        # kwota częściowego opłacenia faktury w złotych, domyślnie: 0.0 (float)
       :gross_price,       # znacznik rodzaju ceny (netto/brutto), domyślnie: true (boolean)
       :vat,               # stawka vat, domyślnie: 23 (integer)
       :pkwiu,             # numer PKWiU (string)
@@ -84,6 +85,18 @@ module PolishInvoicer
       (vat_value * exchange_rate)
     end
 
+    def total_to_pay_value
+      reverse_charge ? net_value : gross_value
+    end
+
+    def paid_value
+      paid ? total_to_pay_value : price_paid
+    end
+
+    def to_pay_value
+      paid ? 0 : (total_to_pay_value - price_paid)
+    end
+
     private
 
     def set_defaults
@@ -91,6 +104,7 @@ module PolishInvoicer
       @vat = 23
       @payment_type = 'Przelew'
       @paid = true
+      @price_paid = 0.0
       @proforma = false
       @foreign_buyer = false
       @reverse_charge = false

data/lib/polish_invoicer/presenter.rb

@@ -45,7 +45,7 @@ module PolishInvoicer
     end
 
     def format_prices
-      %w[net_value vat_value gross_value exchanged_tax].each do |field|
+      %w[net_value vat_value gross_value exchanged_tax total_to_pay_value paid_value to_pay_value].each do |field|
         v = @invoice.send(field)
         next unless v
         @out[field.to_sym] = sprintf('%02.2f', v).tr('.', ',')

data/lib/polish_invoicer/validator.rb

@@ -15,6 +15,7 @@ module PolishInvoicer
       check_arrays
       check_booleans
       check_price
+      check_price_paid
       check_vat
       check_proforma
       check_create_and_payment_date
@@ -82,6 +83,16 @@ module PolishInvoicer
       end
     end
 
+    def check_price_paid
+      return if @invoice.price.nil?
+      if @invoice.price_paid.is_a?(Numeric)
+        @errors[:price_paid] = 'Kwota zapłacona musi być liczbą dodatnią' unless @invoice.price_paid >= 0
+        @errors[:price_paid] = 'Kwota zapłacona musi być mniejsza lub równa cenie' unless @invoice.price_paid <= @invoice.price
+      else
+        @errors[:price_paid] = 'Kwota zapłacona musi być liczbą'
+      end
+    end
+
     def check_vat
       if Vat.valid?(@invoice.vat)
         if Vat.zw?(@invoice.vat) && blank?(@invoice.no_vat_reason)

data/lib/polish_invoicer/version.rb

@@ -1,3 +1,3 @@
 module PolishInvoicer
-  VERSION = '0.0.23'.freeze
+  VERSION = '0.0.24'.freeze
 end

data/test/invoice_test.rb

@@ -133,5 +133,62 @@ module PolishInvoicer
       assert_equal false, h[:gross_price] # params
       assert_equal '123,45', h[:net_value] # presenter
     end
+
+    def test_total_to_pay_value
+      assert_equal 123, Invoice.new(price: 123).paid_value
+      assert_equal 100, Invoice.new(price: 123, reverse_charge: true).paid_value
+    end
+
+    def test_paid_value
+      assert_equal 123, Invoice.new(price: 123).paid_value
+      assert_equal 123, Invoice.new(price: 123, price_paid: 100).paid_value
+      assert_equal 100, Invoice.new(price: 123, paid: false, price_paid: 100).paid_value
+      assert_equal 100, Invoice.new(price: 123, gross_price: false, paid: false, price_paid: 100).paid_value
+      assert_equal 100, Invoice.new(price: 123, reverse_charge: true, paid: false, price_paid: 100).paid_value
+    end
+
+    def test_to_pay_value
+      assert_equal 0, Invoice.new(price: 123).to_pay_value
+      assert_equal 0, Invoice.new(price: 123, price_paid: 100).to_pay_value
+      assert_equal 23, Invoice.new(price: 123, paid: false, price_paid: 100).to_pay_value
+      assert_equal 23, Invoice.new(price: 100, gross_price: false, paid: false, price_paid: 100).to_pay_value
+      assert_equal 50, Invoice.new(price: 123, reverse_charge: true, paid: false, price_paid: 50).to_pay_value
+    end
+
+    def test_gross_and_net_price
+      gross_invoice = Invoice.new(price: 123, price_paid: 60, paid: false)
+      assert_equal 100, gross_invoice.net_value
+      assert_equal 23, gross_invoice.vat_value
+      assert_equal 123, gross_invoice.gross_value
+      assert_equal 123, gross_invoice.total_to_pay_value
+      assert_equal 60, gross_invoice.paid_value
+      assert_equal 63, gross_invoice.to_pay_value
+
+      net_invoice = Invoice.new(price: 100, price_paid: 60, paid: false, gross_price: false)
+      assert_equal 100, net_invoice.net_value
+      assert_equal 23, net_invoice.vat_value
+      assert_equal 123, net_invoice.gross_value
+      assert_equal 123, net_invoice.total_to_pay_value
+      assert_equal 60, net_invoice.paid_value
+      assert_equal 63, net_invoice.to_pay_value
+    end
+
+    def test_reverse_charge
+      gross_invoice = Invoice.new(price: 123, price_paid: 60, paid: false, reverse_charge: true)
+      assert_equal 100, gross_invoice.net_value
+      assert_equal 23, gross_invoice.vat_value
+      assert_equal 123, gross_invoice.gross_value
+      assert_equal 100, gross_invoice.total_to_pay_value
+      assert_equal 60, gross_invoice.paid_value
+      assert_equal 40, gross_invoice.to_pay_value
+
+      net_invoice = Invoice.new(price: 100, price_paid: 60, paid: false, gross_price: false, reverse_charge: true)
+      assert_equal 100, net_invoice.net_value
+      assert_equal 23, net_invoice.vat_value
+      assert_equal 123, net_invoice.gross_value
+      assert_equal 100, net_invoice.total_to_pay_value
+      assert_equal 60, net_invoice.paid_value
+      assert_equal 40, net_invoice.to_pay_value
+    end
   end
 end

data/test/validator_test.rb

@@ -54,6 +54,16 @@ module PolishInvoicer
       check_ok(:price, 19.99)
     end
 
+    def test_price_paid_validation
+      @invoice.price = 200
+      check_error(:price_paid)
+      check_error(:price_paid, 'test')
+      check_error(:price_paid, '100')
+      check_error(:price_paid, -10)
+      check_error(:price_paid, 300)
+      check_ok(:price_paid, 19.99)
+    end
+
     def test_gross_price_validation
       check_error(:gross_price)
       check_error(:gross_price, 'test')

data/tpl/invoice-en.slim

@@ -127,7 +127,7 @@ html
           - unless reverse_charge
             td.text-center = vat
             td.text-center = vat_value
-            td.text-center = gross_value
+            td.text-center = total_to_pay_value
         tr
           td colspan="#{pkwiu ? 3 : 2}"
             |  
@@ -139,7 +139,7 @@ html
           - unless reverse_charge
             td.text-center = vat
             td.text-center = vat_value
-            th.text-center = gross_value
+            th.text-center = total_to_pay_value
 
       br
 
@@ -151,27 +151,19 @@ html
               .small
                 em Total to pay:
             .col-xs-6
-              b = "#{reverse_charge == true ? net_value : gross_value} #{currency}"
+              b = "#{total_to_pay_value} #{currency}"
           .row
             .col-xs-6
               | Zapłacono:
               .small
                 em Amount paid:
-            .col-xs-6
-              - if paid
-                = "#{reverse_charge == true ? net_value : gross_value} #{currency}"
-              - else
-                = "0,00 #{currency}"
+            .col-xs-6 = "#{paid_value} #{currency}"
           .row
             .col-xs-6
               | Zostało do zapłaty:
               .small
                 em Left to pay:
-            .col-xs-6
-              - if paid
-                = "0,00 #{currency}"
-              - else
-                = "#{reverse_charge == true ? net_value : gross_value} #{currency}"
+            .col-xs-6 = "#{to_pay_value} #{currency}"
           - if currency != 'PLN'
             .row
               .col-xs-6

data/tpl/invoice.slim

@@ -83,7 +83,7 @@ html
           td.text-center = net_value
           td.text-center = vat
           td.text-center = vat_value
-          td.text-center = gross_value
+          td.text-center = total_to_pay_value
         tr
           td colspan="#{pkwiu ? 3 : 2}"
             |  
@@ -91,7 +91,7 @@ html
           td.text-center = net_value
           td.text-center = vat
           td.text-center = vat_value
-          th.text-center = gross_value
+          th.text-center = total_to_pay_value
 
       br
 
@@ -108,17 +108,11 @@ html
             br
             | Podatek w PLN:
         .col-xs-3
-          b = "#{gross_value} #{currency}"
+          b = "#{total_to_pay_value} #{currency}"
           br
-          - if paid
-            = "#{gross_value} #{currency}"
-          - else
-            = "0,00 #{currency}"
+          = "#{paid_value} #{currency}"
           br
-          - if paid
-            = "0,00 #{currency}"
-          - else
-            = "#{gross_value} #{currency}"
+          = "#{to_pay_value} #{currency}"
           - if currency != 'PLN'
             br
             = exchange_rate

data/tpl/proforma-en.slim

@@ -115,7 +115,7 @@ html
               em 1 service
           td.text-center = net_value
           td.text-center = net_value
-          td.text-center = (reverse_charge == true ? net_value : gross_value)
+          td.text-center = total_to_pay_value
         tr
           td colspan="#{pkwiu ? 3 : 2}"
             |  
@@ -124,7 +124,7 @@ html
             .small
               em Total
           td.text-center = net_value
-          th.text-center = (reverse_charge == true ? net_value : gross_value)
+          th.text-center = total_to_pay_value
 
       br
 
@@ -136,27 +136,19 @@ html
               .small
                 em Total to pay:
             .col-xs-6
-              b = "#{reverse_charge == true ? net_value : gross_value} #{currency}"
+              b = "#{total_to_pay_value} #{currency}"
           .row
             .col-xs-6
               | Zapłacono:
               .small
                 em Amount paid:
-            .col-xs-6
-              - if paid
-                = "#{reverse_charge == true ? net_value : gross_value} #{currency}"
-              - else
-                = "0,00 #{currency}"
+            .col-xs-6 = "#{paid_value} #{currency}"
           .row
             .col-xs-6
               | Zostało do zapłaty:
               .small
                 em Left to pay:
-            .col-xs-6
-              - if paid
-                = "0,00 #{currency}"
-              - else
-                = "#{reverse_charge == true ? net_value : gross_value} #{currency}"
+            .col-xs-6 = "#{to_pay_value} #{currency}"
 
         .col-xs-6
           - if comments.any?

data/tpl/proforma.slim

@@ -77,13 +77,13 @@ html
             | 1 usł.
           td.text-center = net_value
           td.text-center = net_value
-          td.text-center = gross_value
+          td.text-center = total_to_pay_value
         tr
           td colspan="#{pkwiu ? 3 : 2}"
             |  
           th.text-center Razem
           td.text-center = net_value
-          th.text-center = gross_value
+          th.text-center = total_to_pay_value
 
       br
 
@@ -95,17 +95,11 @@ html
           br
           | Zostało do zapłaty:
         .col-xs-3
-          b = "#{gross_value} #{currency}"
+          b = "#{total_to_pay_value} #{currency}"
           br
-          - if paid
-            = "#{gross_value} #{currency}"
-          - else
-            = "0,00 #{currency}"
+          = "#{paid_value} #{currency}"
           br
-          - if paid
-            = "0,00 #{currency}"
-          - else
-            = "#{gross_value} #{currency}"
+          = "#{to_pay_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.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Piotr Macuk
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,7 +137,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -152,9 +152,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Creates polish invoices and proforms as HTML or PDF files
 test_files: