polish_invoicer 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83d6168d0e9d3dee433a2d9a0e7b6444120ea67834543ea6faf56ba4bf97d573
-  data.tar.gz: 12ce7534dd021a52e3b78efd9cb07e2f8872fd2b97c731c672785e68560b03fb
+  metadata.gz: e50ba77f3a3539b5a75c12e3213dd8e0f56bc7788c7ab74d43ec661ef8e12d94
+  data.tar.gz: 9193da0b3dd714fa51ac52e06a2b87191a493f7539132b41115ce89c86851632
 SHA512:
-  metadata.gz: 78c45cea18508cdabaef2d83a67b622135b1270b251f7ae9fa291ef31818ba0368784a28a1800ceaa811b6fdb470993dbf0815e41e443050a65146ffb7e5b6fb
-  data.tar.gz: 2ea922f4e34e5b20a27204ef7ca3a189a211cf1d8cb31da26c74310a6d8a468214ebf5902f0b5020783832397b4885c90ff181252440bbe39ee78b8289dced83
+  metadata.gz: f0839922dbbab96b6e580f5c63ca86d4b2789c6b3f771d0195c5251cb48e9c6ef3b23fccd22ebfe3fb8f603ba007836d073f71a33f876af85a77f4e7e5a7d38d
+  data.tar.gz: 3f608c82265282b14e5c1af278e3b38fefb9830005ea0bf3c9517c552dc5a76e5c10052f684f056a180db45f7d5599a2bc4b12d25ef4901c2ab3858f73272ef5

data/README.md

@@ -87,8 +87,6 @@ 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)
@@ -110,6 +108,7 @@ invoice.save_to_pdf('/path/to/invoice.pdf')
     :pkwiu,               # numer PKWiU (string)
     :no_vat_reason,       # podstawa prawna zwolnienia z VAT (string)
     :footer,              # treść umieszczana w stopce faktury (string)
+    :price_paid,          # kwota częściowego opłacenia faktury w złotych (float)
 
 ### Parametry systemowe
 

data/lib/polish_invoicer/invoice.rb

@@ -11,7 +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)
+      :price_paid,        # kwota częściowego opłacenia faktury w złotych
       :gross_price,       # znacznik rodzaju ceny (netto/brutto), domyślnie: true (boolean)
       :vat,               # stawka vat, domyślnie: 23 (integer)
       :pkwiu,             # numer PKWiU (string)
@@ -90,11 +90,11 @@ module PolishInvoicer
     end
 
     def paid_value
-      paid ? total_to_pay_value : price_paid
+      paid ? total_to_pay_value : price_paid.to_f
     end
 
     def to_pay_value
-      paid ? 0 : (total_to_pay_value - price_paid)
+      paid ? 0 : (total_to_pay_value - price_paid.to_f)
     end
 
     private
@@ -104,7 +104,6 @@ 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/validator.rb

@@ -84,7 +84,9 @@ module PolishInvoicer
     end
 
     def check_price_paid
+      return if @invoice.price_paid.nil?
       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

data/lib/polish_invoicer/version.rb

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

data/test/invoice_test.rb

@@ -142,6 +142,7 @@ module PolishInvoicer
     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 0, Invoice.new(price: 123, paid: false).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
@@ -150,6 +151,7 @@ module PolishInvoicer
     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 123, Invoice.new(price: 123, paid: false).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

data/test/validator_test.rb

@@ -56,7 +56,7 @@ module PolishInvoicer
 
     def test_price_paid_validation
       @invoice.price = 200
-      check_error(:price_paid)
+      check_ok(:price_paid)
       check_error(:price_paid, 'test')
       check_error(:price_paid, '100')
       check_error(:price_paid, -10)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polish_invoicer
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Piotr Macuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Creates polish invoices and proforms as HTML or PDF files