invoice_printer 2.1.0 → 2.2.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3af0c9fadd39c8a23600e405aa0dcf2d31945f0fef9aa4bb40a13768ea156c7
-  data.tar.gz: 124c1a57d4c11a99da95301ac1be5715f358bfd2654d350345f9e23afefc6035
+  metadata.gz: 73bc8cc15f44b26e3208614d83ee31dbb385b804e7a248723b07d6c9b60e7238
+  data.tar.gz: 5d2ab37a9051dba8ddd0018a4d7bc3d2f6a14949f131679f77ac7a0cd9069981
 SHA512:
-  metadata.gz: f9a788d351c01c97b99bb50653bf883b363909b54d5d0d65d7b0421a6ec444b2886e6ef7bbb18bc332d59977c0f60700c60efe1ec0cc67c62b075edf3306297e
-  data.tar.gz: 3051327dd4011d6ca954981fdfcc05edf2af1ad242355cb029d2c40a29de0e1b18d430b77131b572fe2db975a9ff371c91317a4cf345d7510801d7b594e76257
+  metadata.gz: 3fb1d1f236410e510f79c30b9c817d63285ae9dd49a579ec4930e6596f1ab3c06d8d480c7e4c3f11f14873c14aa9d6b62bbd6e91687cafc052e6387244a791f3
+  data.tar.gz: 2819f38b58b55ec97517c5521cee21a70ab33ad64303d6c71f92ae41186f5c7136f66a88ef8aad9eaea0144c632cc96d71244cff04264a642f8f0cd13437b52a

data/docs/COMMAND_LINE.md

@@ -38,6 +38,7 @@ JSON document with all possible fields filled:
   "purchaser_lines":"Ostravská 1\n747 70  Opava",
   "issue_date":"05/03/2016",
   "due_date":"19/03/2016",
+  "variable_symbol":"198900000001",
   "subtotal":"Kc 10.000",
   "tax":"Kc 2.100",
   "tax2":"",
@@ -99,6 +100,7 @@ All labels:
   "iban":"IBAN",
   "issue_date":"Issue date",
   "due_date": "Due date",
+  "variable_symbol": "Variable symbol",
   "item":"Item",
   "variable":"",
   "quantity":"Quantity",

data/docs/LIBRARY.md

@@ -165,6 +165,7 @@ InvoicePrinter.labels = {
   iban: 'IBAN',
   issue_date: 'Issue date',
   due_date: 'Due date',
+  variable_symbol: 'Variable symbol',
   item: 'Item',
   variable: '',
   quantity: 'Quantity',
@@ -198,6 +199,7 @@ sublabels = {
   account_number: 'Číslo účtu',
   issue_date: 'Datum vydání',
   due_date: 'Datum splatnosti',
+  variable_symbol: 'Variabilní symbol',
   item: 'Položka',
   variable: '',
   quantity: 'Počet',

data/examples/variable_field_invoice.rb

@@ -0,0 +1,96 @@
+#!/usr/bin/env ruby
+# This is an example of a international invoice with Czech labels and English translation.
+
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'invoice_printer'
+
+labels = {
+  name: 'Faktura',
+  provider: 'Prodejce',
+  purchaser: 'Kupující',
+  tax_id: 'IČ',
+  tax_id2: 'DIČ',
+  payment: 'Forma úhrady',
+  payment_by_transfer: 'Platba na následující účet:',
+  account_number: 'Číslo účtu',
+  issue_date: 'Datum vydání',
+  due_date: 'Datum splatnosti',
+  variable_field: 'Variabilní symbol',
+  item: 'Položka',
+  quantity: 'Počet',
+  unit: 'MJ',
+  price_per_item: 'Cena za položku',
+  amount: 'Celkem bez daně',
+  subtotal: 'Cena bez daně',
+  tax: 'DPH 21 %',
+  total: 'Celkem'
+}
+
+# Default English labels as sublabels
+sublabels = InvoicePrinter::PDFDocument::DEFAULT_LABELS
+labels.merge!({ sublabels: sublabels })
+
+first_item = InvoicePrinter::Document::Item.new(
+  name: 'Konzultace',
+  quantity: '2',
+  unit: 'hod',
+  price: 'Kč 500',
+  amount: 'Kč 1.000'
+)
+
+second_item = InvoicePrinter::Document::Item.new(
+  name: 'Programování',
+  quantity: '10',
+  unit: 'hod',
+  price: 'Kč 900',
+  amount: 'Kč 9.000'
+)
+
+provider_address = <<ADDRESS
+Rolnická 1
+747 05  Opava
+Kateřinky
+ADDRESS
+
+purchaser_address = <<ADDRESS
+8648 Acacia Rd.
+Brooklyn, NY 11203
+ADDRESS
+
+invoice = InvoicePrinter::Document.new(
+  number: 'č. 198900000001',
+  provider_name: 'Petr Nový',
+  provider_lines: provider_address,
+  provider_tax_id: '56565656',
+  purchaser_name: 'Adam Black',
+  purchaser_lines: purchaser_address,
+  issue_date: '05/03/2016',
+  due_date: '19/03/2016',
+  variable_symbol: 'VS198900000001',
+  subtotal: 'Kč 10.000',
+  tax: 'Kč 2.100',
+  total: 'Kč 12.100,-',
+  bank_account_number: '156546546465',
+  account_iban: 'IBAN464545645',
+  account_swift: 'SWIFT5456',
+  items: [first_item, second_item],
+  note: 'Osoba je zapsána v živnostenském rejstříku.'
+)
+
+InvoicePrinter.print(
+  document: invoice,
+  labels: labels,
+  font: 'overpass',
+  logo: File.expand_path('../prawn.png', __FILE__),
+  file_name: 'variable_field_invoice.pdf'
+)
+
+InvoicePrinter.print(
+  document: invoice,
+  labels: labels,
+  font: 'overpass',
+  logo: File.expand_path('../prawn.png', __FILE__),
+  file_name: 'variable_field_invoice_a4.pdf',
+  page_size: :a4
+)

data/lib/invoice_printer.rb

@@ -37,6 +37,7 @@ module InvoicePrinter
   #     iban: 'IBAN:',
   #     issue_date: 'Issue date:',
   #     due_date: 'Due date:',
+  #     variable_symbol: 'Variable symbol:'
   #     item: 'Item',
   #     quantity: 'Quantity',
   #     unit: 'Unit',

data/lib/invoice_printer/document.rb

@@ -15,6 +15,7 @@ module InvoicePrinter
   #     purchaser_lines: "Ostravska 2\n747 05 Opava",
   #     issue_date: '19/03/3939',
   #     due_date: '19/03/3939',
+  #     variable_symbol: '198900000001',
   #     subtotal: '$ 150',
   #     tax: '$ 50',
   #     total: '$ 200',
@@ -46,6 +47,7 @@ module InvoicePrinter
                 :purchaser_lines,
                 :issue_date,
                 :due_date,
+                :variable_symbol,
                 # Account details
                 :subtotal,
                 :tax,
@@ -73,6 +75,7 @@ module InvoicePrinter
           purchaser_lines: json['purchaser_lines'],
           issue_date: json['issue_date'],
           due_date: json['due_date'],
+          variable_symbol: json['variable_symbol'],
           subtotal: json['subtotal'],
           tax: json['tax'],
           tax2: json['tax2'],
@@ -99,6 +102,7 @@ module InvoicePrinter
                    purchaser_lines: nil,
                    issue_date: nil,
                    due_date: nil,
+                   variable_symbol: nil,
                    subtotal: nil,
                    tax: nil,
                    tax2: nil,
@@ -121,6 +125,7 @@ module InvoicePrinter
       @purchaser_lines = String(purchaser_lines)
       @issue_date = String(issue_date)
       @due_date = String(due_date)
+      @variable_symbol = String(variable_symbol)
       @subtotal = String(subtotal)
       @tax = String(tax)
       @tax2 = String(tax2)
@@ -149,6 +154,7 @@ module InvoicePrinter
         'purchaser_lines': @purchaser_lines,
         'issue_date': @issue_date,
         'due_date': @due_date,
+        'variable_symbol': @variable_symbol,
         'subtotal': @subtotal,
         'tax': @tax,
         'tax2': @tax2,

data/lib/invoice_printer/pdf_document.rb

@@ -36,6 +36,7 @@ module InvoicePrinter
       iban: 'IBAN',
       issue_date: 'Issue date',
       due_date: 'Due date',
+      variable_symbol: 'Variable symbol',
       item: 'Item',
       variable: '',
       quantity: 'Quantity',
@@ -252,41 +253,6 @@ module InvoicePrinter
             width: x(240)
           )
         end
-      else
-        @pdf.text_box(
-          "#{@document.provider_street}    #{@document.provider_street_number}",
-          size: 10,
-          at: [10, y(620) - @push_down],
-          width: x(240)
-        )
-        @pdf.text_box(
-          @document.provider_postcode,
-          size: 10,
-          at: [10, y(605) - @push_down],
-          width: x(240)
-        )
-        @pdf.text_box(
-          @document.provider_city,
-          size: 10,
-          at: [60, y(605) - @push_down],
-          width: x(240)
-        )
-        unless @document.provider_city_part.empty?
-          @pdf.text_box(
-            @document.provider_city_part,
-            size: 10,
-            at: [60, y(590) - @push_down],
-            width: x(240)
-          )
-        end
-        unless @document.provider_extra_address_line.empty?
-          @pdf.text_box(
-            @document.provider_extra_address_line,
-            size: 10,
-            at: [10, y(575) - @push_down],
-            width: x(240)
-          )
-        end
       end
       unless @document.provider_tax_id.empty?
         @pdf.text_box(
@@ -357,41 +323,6 @@ module InvoicePrinter
             width: x(240)
           )
         end
-      else
-        @pdf.text_box(
-          "#{@document.purchaser_street}    #{@document.purchaser_street_number}",
-          size: 10,
-          at: [x(284), y(620) - @push_down],
-          width: x(240)
-        )
-        @pdf.text_box(
-          @document.purchaser_postcode,
-          size: 10,
-          at: [x(284), y(605) - @push_down],
-          width: x(240)
-        )
-        @pdf.text_box(
-          @document.purchaser_city,
-          size: 10,
-          at: [x(334), y(605) - @push_down],
-          width: x(240)
-        )
-        unless @document.purchaser_city_part.empty?
-          @pdf.text_box(
-            @document.purchaser_city_part,
-            size: 10,
-            at: [x(334), y(590) - @push_down],
-            width: x(240)
-          )
-        end
-        unless @document.purchaser_extra_address_line.empty?
-          @pdf.text_box(
-            @document.purchaser_extra_address_line,
-            size: 10,
-            at: [x(284), y(575) - @push_down],
-            width: x(240)
-          )
-        end
       end
       unless @document.purchaser_tax_id.empty?
         @pdf.text_box(
@@ -440,6 +371,10 @@ module InvoicePrinter
       end
       @payment_box_height = min_height
 
+      if big_info_box?
+        @payment_box_height = 110
+      end
+
       if @document.bank_account_number.empty?
         @pdf.text_box(
           @labels[:payment],
@@ -551,6 +486,7 @@ module InvoicePrinter
           @payment_box_height += 30
           @push_items_table += 18
         end
+
         if min_height > @payment_box_height
           @payment_box_height = min_height
           @push_items_table += 25
@@ -571,6 +507,8 @@ module InvoicePrinter
     #   | Issue date sublabel            |
     #   | Due date:            03/03/2016|
     #   | Due date sublabel              |
+    #   | Variable symbol:     VS12345678|
+    #   | Variable symbol sublabel       |
     #    --------------------------------
     #
     def build_info_box
@@ -590,17 +528,17 @@ module InvoicePrinter
           width: x(146),
           align: :right
         )
-      end
 
-      if used? @labels[:sublabels][:issue_date]
-        position = issue_date_present ? 483 : 498
+        if used? @labels[:sublabels][:issue_date]
+          position = issue_date_present ? 483 : 498
 
-        @pdf.text_box(
-          @labels[:sublabels][:issue_date],
-          size: 10,
-          at: [x(284), y(position) - @push_down],
-          width: x(240)
-        )
+          @pdf.text_box(
+            @labels[:sublabels][:issue_date],
+            size: 10,
+            at: [x(284), y(position) - @push_down],
+            width: x(240)
+          )
+        end
       end
 
       due_date_present = !@document.due_date.empty?
@@ -622,29 +560,83 @@ module InvoicePrinter
           width: x(146),
           align: :right
         )
+
+        if used? @labels[:sublabels][:due_date]
+          position = issue_date_present ? 463 : 478
+          position -= 10 if used? @labels[:sublabels][:issue_date]
+
+          @pdf.text_box(
+            @labels[:sublabels][:due_date],
+            size: 10,
+            at: [x(284), y(position) - @push_down],
+            width: x(240)
+          )
+        end
       end
 
-      if used? @labels[:sublabels][:due_date]
-        position = issue_date_present ? 463 : 478
+      variable_symbol_present = !@document.variable_symbol.empty?
+
+      if variable_symbol_present
+        position = (issue_date_present || due_date_present) ? 483 : 498
+        position = issue_date_present && due_date_present ? 458 : 463
         position -= 10 if used? @labels[:sublabels][:issue_date]
+        position -= 10 if used? @labels[:sublabels][:due_date]
 
         @pdf.text_box(
-          @labels[:sublabels][:due_date],
-          size: 10,
+          @labels[:variable_symbol],
+          size: 11,
           at: [x(284), y(position) - @push_down],
           width: x(240)
         )
+        @pdf.text_box(
+          @document.variable_symbol,
+          size: 13,
+          at: [x(384), y(position) - @push_down],
+          width: x(146),
+          align: :right
+        )
+
+        if used? @labels[:sublabels][:variable_symbol]
+          position = issue_date_present ? 443 : 458
+          position -= 10 if used? @labels[:sublabels][:issue_date]
+          position -= 10 if used? @labels[:sublabels][:due_date]
+
+          @pdf.text_box(
+            @labels[:sublabels][:variable_symbol],
+            size: 10,
+            at: [x(284), y(position) - @push_down],
+            width: x(240)
+          )
+        end
       end
 
-      if issue_date_present || due_date_present
+      if issue_date_present || due_date_present || variable_symbol_present
+        big_box = (issue_date_present && due_date_present && variable_symbol_present && info_box_sublabels_used?)
         height = (issue_date_present && due_date_present) ? 75 : 60
+        height = big_box ? 110 : height
         height = @payment_box_height if @payment_box_height > height
 
         @pdf.stroke_rounded_rectangle([x(274), y(508) - @push_down], x(266), height, 6)
-        @push_items_table += 12 if @push_items_table <= 18
+        @push_items_table += 23 if @push_items_table <= 18
+        @push_items_table += 24 if big_box
+
+        #@push_items_table += 30
       end
     end
 
+    def big_info_box?
+      !@document.issue_date.empty? &&
+      !@document.due_date.empty? &&
+      !@document.variable_symbol.empty? &&
+      info_box_sublabels_used?
+    end
+
+    def info_box_sublabels_used?
+      used?(@labels[:sublabels][:issue_date]) ||
+      used?(@labels[:sublabels][:due_date]) ||
+      used?(@labels[:sublabels][:variable_symbol])
+    end
+
     # Build the following table for document items:
     #
     #   =================================================================

data/lib/invoice_printer/version.rb

@@ -1,3 +1,3 @@
 module InvoicePrinter
-  VERSION = '2.1.0'
+  VERSION = '2.2.0.alpha1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invoice_printer
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0.alpha1
 platform: ruby
 authors:
 - Josef Strzibny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-08 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -111,6 +111,7 @@ files:
 - examples/promo.rb
 - examples/provider_purchaser_lines.rb
 - examples/simple_invoice.rb
+- examples/variable_field_invoice.rb
 - invoice_printer.gemspec
 - invoice_printer_fonts.gemspec
 - invoice_printer_server.gemspec
@@ -148,11 +149,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: Super simple PDF invoicing in pure Ruby