payday 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6880a9809ee7df8e384b8decd0496858eb7ebb32
-  data.tar.gz: 51bf1bb2e4c33baef16308e4f85b9f2915579d00
+  metadata.gz: c63a9378b3f1a7e552dacce10b9b6261bd0eaec9
+  data.tar.gz: 144ae033085831b2035a185f0e3c3db491be1e19
 SHA512:
-  metadata.gz: 22077148a2506af490538950d278c8afc1bdc755faac7b02e0cf449bab1824481006be542b41b3e6992fb0f651759d7752fd10ea4101c042c75955d2fa264d48
-  data.tar.gz: 5440e42e22b128aef4109c6986e15d73d993562c35df550431864c188fdfb1f9fbe8b9cc6868d749170197b9dc93a8329969b01346d85f8d7e11760be8dfdeb2
+  metadata.gz: cc86262b5750704fd33c9f4aefe8aa3a396bc8da0491e1f58865525688500b70b1233c1189b181ba7d58dc1c9d2970d7ad5e821bf008d9012637d6b58469920d
+  data.tar.gz: a7c8d4b0bf431d03eca023028268ba7faf96a9691b1372edbbd4325ea43fdf525f90807977b23839ae114cb01bd1bc744e3e9d366a7140e566246a5d550aff34

data/.rubocop.yml

@@ -0,0 +1,8 @@
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: double_quotes
+
+Style/AlignParameters:
+  EnforcedStyle: with_first_parameter

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.1.4 (2015-05-29)
+
+* Bumped money gem to 6.5 (was 6.1.1)
+* Bumped i18n gem to 0.7 (was 0.6.11)
+* Added German translation for invoice date.
+
 ## 1.1.3 (2015-01-02)
 
 * Loosened requirements on Money gem.

data/Rakefile

@@ -1,12 +1,12 @@
-require 'bundler'
+require "bundler"
 
-require 'rake'
-require 'rake/testtask'
+require "rake"
+require "rake/testtask"
 
-task :default => :test
+task default: :test
 
 Bundler::GemHelper.install_tasks
 
 Rake::TestTask.new do |t|
-  t.test_files = FileList['test/**/*_test.rb']
-end
+  t.test_files = FileList["test/**/*_test.rb"]
+end

data/lib/generators/payday/setup/setup_generator.rb

@@ -1,5 +1,5 @@
-require 'rails/generators'
-require 'rails/generators/migration'
+require "rails/generators"
+require "rails/generators/migration"
 
 # rails g payday:setup <invoice_name> <line_item_name>
 # Generates models for invoicing with Payday includes prepped
@@ -10,29 +10,29 @@ require 'rails/generators/migration'
 module Payday
   class SetupGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
-    
-    source_root File.expand_path('../templates', __FILE__)
-    
-    class_option :invoice_name, :type => :string, :default => "Invoice"
-    class_option :line_item_name, :type => :string, :default => "LineItem"
-    class_option :skip_migration, :desc => "Does not create the migration file for tables", :type => :boolean
-    
+
+    source_root File.expand_path("../templates", __FILE__)
+
+    class_option :invoice_name, type: :string, default: "Invoice"
+    class_option :line_item_name, type: :string, default: "LineItem"
+    class_option :skip_migration, desc: "Does not create the migration file for tables", type: :boolean
+
     def generate_invoice_model
       template "invoice.rb", "app/models/#{options.invoice_name.underscore}.rb"
     end
-    
+
     def generate_line_item_model
       template "line_item.rb", "app/models/#{options.line_item_name.underscore}.rb"
     end
-    
+
     def generate_migration
       unless options.skip_migration?
-        migration_template 'migration.rb', "db/migrate/create_payday_tables.rb"
+        migration_template "migration.rb", "db/migrate/create_payday_tables.rb"
       end
     end
-    
+
     private
-    
+
     def self.next_migration_number(dirname)
       if ActiveRecord::Base.timestamped_migrations
         Time.now.utc.strftime("%Y%m%d%H%M%S")
@@ -41,4 +41,4 @@ module Payday
       end
     end
   end
-end
+end

data/lib/payday.rb

@@ -1,16 +1,16 @@
 # Not much to see here
-require 'date'
-require 'time'
-require 'bigdecimal'
-require 'prawn'
-require 'prawn-svg'
-require 'money'
+require "date"
+require "time"
+require "bigdecimal"
+require "prawn"
+require "prawn-svg"
+require "money"
 
-require_relative 'payday/version'
-require_relative 'payday/config'
-require_relative 'payday/i18n'
-require_relative 'payday/line_itemable'
-require_relative 'payday/line_item'
-require_relative 'payday/pdf_renderer'
-require_relative 'payday/invoiceable'
-require_relative 'payday/invoice'
+require_relative "payday/version"
+require_relative "payday/config"
+require_relative "payday/i18n"
+require_relative "payday/line_itemable"
+require_relative "payday/line_item"
+require_relative "payday/pdf_renderer"
+require_relative "payday/invoiceable"
+require_relative "payday/invoice"

data/lib/payday/config.rb

@@ -1,5 +1,4 @@
 module Payday
-
   # Configuration for Payday. This is a singleton, so to set the company_name you would call
   # Payday::Config.default.company_name = "Awesome Corp".
   class Config
@@ -19,13 +18,13 @@ module Payday
     #
     # Primarily intended for use in our tests.
     def reset
-        # TODO: Move into specs and make minimal configuration required (company name / details)
-        self.invoice_logo = File.join(File.dirname(__FILE__), "..", "..", "spec", "assets", "default_logo.png")
-        self.company_name = "Awesome Corp"
-        self.company_details = "awesomecorp@commondream.net"
-        self.date_format = "%B %e, %Y"
-        self.currency = "USD"
-        self.page_size = "LETTER"
+      # TODO: Move into specs and make minimal configuration required (company name / details)
+      self.invoice_logo = File.join(File.dirname(__FILE__), "..", "..", "spec", "assets", "default_logo.png")
+      self.company_name = "Awesome Corp"
+      self.company_details = "awesomecorp@commondream.net"
+      self.date_format = "%B %e, %Y"
+      self.currency = "USD"
+      self.page_size = "LETTER"
     end
 
     # Internal: Contruct a new config object.

data/lib/payday/invoice.rb

@@ -1,11 +1,10 @@
 module Payday
-
   # Basically just an invoice. Stick a ton of line items in it, add some details, and then render it out!
   class Invoice
     include Payday::Invoiceable
 
     attr_accessor :invoice_number, :bill_to, :ship_to, :notes, :line_items, :shipping_rate, :shipping_description,
-                  :tax_rate, :tax_description, :due_at, :paid_at, :refunded_at, :currency, :invoice_details, :invoice_date
+      :tax_rate, :tax_description, :due_at, :paid_at, :refunded_at, :currency, :invoice_details, :invoice_date
 
     def initialize(options =  {})
       self.invoice_number = options[:invoice_number] || nil

data/lib/payday/invoiceable.rb

@@ -13,17 +13,16 @@
 # If the +due_at+, +paid_at+, and +refunded_at+ methods are available, {Payday::Invoiceable} will use them to show due dates,
 # paid dates, and refunded dates, as well as stamps showing if the invoice is paid or due.
 module Payday::Invoiceable
-  
   # Who the invoice is being sent to.
   def bill_to
     "Goofy McGoofison\nYour Invoice Doesn't\nHave It's Own BillTo Method"
   end
-  
+
   # Calculates the subtotal of this invoice by adding up all of the line items
   def subtotal
-    line_items.inject(BigDecimal.new("0")) { |result, item| result += item.amount }
+    line_items.reduce(BigDecimal.new("0")) { |result, item| result += item.amount }
   end
-  
+
   # The tax for this invoice, as a BigDecimal
   def tax
     if defined?(tax_rate)
@@ -34,7 +33,7 @@ module Payday::Invoiceable
       0
     end
   end
-  
+
   # TODO Add a per weight unit shipping cost
   # Calculates the shipping
   def shipping
@@ -44,42 +43,41 @@ module Payday::Invoiceable
       0
     end
   end
-  
+
   # Calculates the total for this invoice.
   def total
     subtotal + tax + shipping
   end
-  
+
   def overdue?
     defined?(:due_at) && ((due_at.is_a?(Date) && due_at < Date.today) || (due_at.is_a?(Time) && due_at < Time.now))  && !paid_at
   end
-  
+
   def refunded?
     defined?(:refunded_at) && !!refunded_at
   end
-  
+
   def paid?
     defined?(:paid_at) && !!paid_at
   end
-  
+
   # Renders this invoice to pdf as a string
   def render_pdf
     Payday::PdfRenderer.render(self)
   end
-  
+
   # Renders this invoice to pdf
   def render_pdf_to_file(path)
     Payday::PdfRenderer.render_to_file(self, path)
   end
-  
+
   # Iterates through the details on this invoiceable. The block given should accept
   # two parameters, the detail name and the actual detail value.
   def each_detail(&block)
     return if defined?(invoice_details).nil?
-    
+
     invoice_details.each do |detail|
       block.call(detail[0], detail[1])
     end
   end
 end
-

data/lib/payday/line_item.rb

@@ -6,9 +6,9 @@ module Payday
   # Otherwise, we'll do our best to convert the set values to a +BigDecimal+.
   class LineItem
     include LineItemable
-    
+
     attr_accessor :description, :quantity, :display_quantity, :display_price, :price
-    
+
     # Initializes a new LineItem
     def initialize(options = {})
       self.quantity = options[:quantity] || "1"
@@ -17,15 +17,15 @@ module Payday
       self.price = options[:price] || "0.00"
       self.description = options[:description] || ""
     end
-    
+
     # Sets the quantity of this {LineItem}
     def quantity=(value)
       @quantity = BigDecimal.new(value.to_s)
     end
-    
+
     # Sets the price for this {LineItem}
     def price=(value)
       @price = BigDecimal.new(value.to_s)
     end
   end
-end
+end

data/lib/payday/line_itemable.rb

@@ -5,4 +5,4 @@ module Payday::LineItemable
   def amount
     price * quantity
   end
-end
+end

data/lib/payday/locale/de.yml

@@ -8,6 +8,7 @@ de:
       bill_to: Rechnung an
       ship_to: Versenden an
       invoice_no: "Rechnungsnr.:"
+      invoice_date: "Rechnungsdatum:"
       due_date: "Fälligkeit:"
       paid_date: "Zahlungsdatum:"
       subtotal: "Zwischensumme:"

data/lib/payday/pdf_renderer.rb

@@ -1,9 +1,7 @@
 module Payday
-
   # The PDF renderer. We use this internally in Payday to render pdfs, but really you should just need to call
   # {{Payday::Invoiceable#render_pdf}} to render pdfs yourself.
   class PdfRenderer
-
     # Renders the given invoice as a pdf on disk
     def self.render_to_file(invoice, path)
       pdf(invoice).render_file(path)
@@ -15,280 +13,306 @@ module Payday
     end
 
     private
-      def self.pdf(invoice)
-        pdf = Prawn::Document.new(:page_size => invoice_or_default(invoice, :page_size))
 
-        # set up some default styling
-        pdf.font_size(8)
+    def self.pdf(invoice)
+      pdf = Prawn::Document.new(page_size: invoice_or_default(invoice, :page_size))
 
-        stamp(invoice, pdf)
-        company_banner(invoice, pdf)
-        bill_to_ship_to(invoice, pdf)
-        invoice_details(invoice, pdf)
-        line_items_table(invoice, pdf)
-        totals_lines(invoice, pdf)
-        notes(invoice, pdf)
+      # set up some default styling
+      pdf.font_size(8)
 
-        page_numbers(pdf)
+      stamp(invoice, pdf)
+      company_banner(invoice, pdf)
+      bill_to_ship_to(invoice, pdf)
+      invoice_details(invoice, pdf)
+      line_items_table(invoice, pdf)
+      totals_lines(invoice, pdf)
+      notes(invoice, pdf)
 
-        pdf
-      end
+      page_numbers(pdf)
 
-      def self.stamp(invoice, pdf)
-        stamp = nil
-        if invoice.refunded?
-          stamp = I18n.t 'payday.status.refunded', :default => "REFUNDED"
-        elsif invoice.paid?
-          stamp = I18n.t 'payday.status.paid', :default => "PAID"
-        elsif invoice.overdue?
-          stamp = I18n.t 'payday.status.overdue', :default => "OVERDUE"
-        end
+      pdf
+    end
 
-        if stamp
-          pdf.bounding_box([150, pdf.cursor - 50], :width => pdf.bounds.width - 300) do
-            pdf.font("Helvetica-Bold") do
-              pdf.fill_color "cc0000"
-              pdf.text stamp, :align=> :center, :size => 25, :rotate => 15
-            end
+    def self.stamp(invoice, pdf)
+      stamp = nil
+      if invoice.refunded?
+        stamp = I18n.t "payday.status.refunded", default: "REFUNDED"
+      elsif invoice.paid?
+        stamp = I18n.t "payday.status.paid", default: "PAID"
+      elsif invoice.overdue?
+        stamp = I18n.t "payday.status.overdue", default: "OVERDUE"
+      end
+
+      if stamp
+        pdf.bounding_box([150, pdf.cursor - 50], width: pdf.bounds.width - 300) do
+          pdf.font("Helvetica-Bold") do
+            pdf.fill_color "cc0000"
+            pdf.text stamp, align: :center, size: 25, rotate: 15
           end
         end
-
-        pdf.fill_color "000000"
       end
 
-      def self.company_banner(invoice, pdf)
-        # render the logo
-        image = invoice_or_default(invoice, :invoice_logo)
-        height = nil
-        width = nil
-
-        # Handle images defined with a hash of options
-        if image.is_a?(Hash)
-          data = image
-          image = data[:filename]
-          width, height = data[:size].split("x").map(&:to_f)
-        end
+      pdf.fill_color "000000"
+    end
 
-        if File.extname(image) == ".svg"
-          logo_info = pdf.svg(File.read(image), :at => pdf.bounds.top_left, :width => width, :height => height)
-          logo_height = logo_info[:height]
-        else
-          logo_info = pdf.image(image, :at => pdf.bounds.top_left, :width => width, :height => height)
-          logo_height = logo_info.scaled_height
-        end
+    def self.company_banner(invoice, pdf)
+      # render the logo
+      image = invoice_or_default(invoice, :invoice_logo)
+      height = nil
+      width = nil
+
+      # Handle images defined with a hash of options
+      if image.is_a?(Hash)
+        data = image
+        image = data[:filename]
+        width, height = data[:size].split("x").map(&:to_f)
+      end
 
-        # render the company details
-        table_data = []
-        table_data << [bold_cell(pdf, invoice_or_default(invoice, :company_name).strip, :size => 12)]
+      if File.extname(image) == ".svg"
+        logo_info = pdf.svg(File.read(image), at: pdf.bounds.top_left, width: width, height: height)
+        logo_height = logo_info[:height]
+      else
+        logo_info = pdf.image(image, at: pdf.bounds.top_left, width: width, height: height)
+        logo_height = logo_info.scaled_height
+      end
 
-        invoice_or_default(invoice, :company_details).lines.each { |line| table_data << [line] }
+      # render the company details
+      table_data = []
+      table_data << [bold_cell(pdf, invoice_or_default(invoice, :company_name).strip, size: 12)]
 
-        table = pdf.make_table(table_data, :cell_style => { :borders => [], :padding => 0 })
-        pdf.bounding_box([pdf.bounds.width - table.width, pdf.bounds.top], :width => table.width, :height => table.height + 5) do
-          table.draw
-        end
+      invoice_or_default(invoice, :company_details).lines.each { |line| table_data << [line] }
 
-        pdf.move_cursor_to(pdf.bounds.top - logo_height - 20)
+      table = pdf.make_table(table_data, cell_style: { borders: [], padding: 0 })
+      pdf.bounding_box([pdf.bounds.width - table.width, pdf.bounds.top], width: table.width, height: table.height + 5) do
+        table.draw
       end
 
-      def self.bill_to_ship_to(invoice, pdf)
-        bill_to_cell_style = { :borders => [], :padding => [2, 0]}
-        bill_to_ship_to_bottom = 0
-
-        # render bill to
-        pdf.float do
-          table = pdf.table([[bold_cell(pdf, I18n.t('payday.invoice.bill_to', :default => "Bill To"))],
-              [invoice.bill_to]], :column_widths => [200], :cell_style => bill_to_cell_style)
-          bill_to_ship_to_bottom = pdf.cursor
-        end
-
-        # render ship to
-        if defined?(invoice.ship_to) && !invoice.ship_to.nil?
-          table = pdf.make_table([[bold_cell(pdf, I18n.t('payday.invoice.ship_to', :default => "Ship To"))],
-              [invoice.ship_to]], :column_widths => [200], :cell_style => bill_to_cell_style)
+      pdf.move_cursor_to(pdf.bounds.top - logo_height - 20)
+    end
 
-          pdf.bounding_box([pdf.bounds.width - table.width, pdf.cursor], :width => table.width, :height => table.height + 2) do
-            table.draw
-          end
-        end
+    def self.bill_to_ship_to(invoice, pdf)
+      bill_to_cell_style = { borders: [], padding: [2, 0] }
+      bill_to_ship_to_bottom = 0
 
-        # make sure we start at the lower of the bill_to or ship_to details
-        bill_to_ship_to_bottom = pdf.cursor if pdf.cursor < bill_to_ship_to_bottom
-        pdf.move_cursor_to(bill_to_ship_to_bottom - 20)
+      # render bill to
+      pdf.float do
+        table = pdf.table([[bold_cell(pdf, I18n.t("payday.invoice.bill_to", default: "Bill To"))],
+                           [invoice.bill_to]], column_widths: [200], cell_style: bill_to_cell_style)
+        bill_to_ship_to_bottom = pdf.cursor
       end
 
-      def self.invoice_details(invoice, pdf)
-        # invoice details
-        table_data = []
+      # render ship to
+      if defined?(invoice.ship_to) && !invoice.ship_to.nil?
+        table = pdf.make_table([[bold_cell(pdf, I18n.t("payday.invoice.ship_to", default: "Ship To"))],
+                                [invoice.ship_to]], column_widths: [200], cell_style: bill_to_cell_style)
 
-        # invoice number
-        if defined?(invoice.invoice_number) && invoice.invoice_number
-          table_data << [bold_cell(pdf, I18n.t('payday.invoice.invoice_no', :default => "Invoice #:")),
-              bold_cell(pdf, invoice.invoice_number.to_s, :align => :right)]
-        end
-        
-        # invoice date
-        if defined?(invoice.invoice_date) && invoice.invoice_date
-          if invoice.invoice_date.is_a?(Date) || invoice.invoice_date.is_a?(Time)
-            invoice_date = invoice.invoice_date.strftime(Payday::Config.default.date_format)
-          else
-            invoice_date = invoice.invoice_date.to_s
-          end
-          
-          table_data << [bold_cell(pdf, I18n.t('payday.invoice.invoice_date', :default => "Invoice Date:")),
-              bold_cell(pdf, invoice_date, :align => :right)]
+        pdf.bounding_box([pdf.bounds.width - table.width, pdf.cursor], width: table.width, height: table.height + 2) do
+          table.draw
         end
+      end
 
-        # Due on
-        if defined?(invoice.due_at) && invoice.due_at
-          if invoice.due_at.is_a?(Date) || invoice.due_at.is_a?(Time)
-            due_date = invoice.due_at.strftime(Payday::Config.default.date_format)
-          else
-            due_date = invoice.due_at.to_s
-          end
+      # make sure we start at the lower of the bill_to or ship_to details
+      bill_to_ship_to_bottom = pdf.cursor if pdf.cursor < bill_to_ship_to_bottom
+      pdf.move_cursor_to(bill_to_ship_to_bottom - 20)
+    end
 
-          table_data << [bold_cell(pdf, I18n.t('payday.invoice.due_date', :default => "Due Date:")),
-              bold_cell(pdf, due_date, :align => :right)]
-        end
+    def self.invoice_details(invoice, pdf)
+      # invoice details
+      table_data = []
 
-        # Paid on
-        if defined?(invoice.paid_at) && invoice.paid_at
-          if invoice.paid_at.is_a?(Date) || invoice.due_at.is_a?(Time)
-            paid_date = invoice.paid_at.strftime(Payday::Config.default.date_format)
-          else
-            paid_date = invoice.paid_at.to_s
-          end
+      # invoice number
+      if defined?(invoice.invoice_number) && invoice.invoice_number
+        table_data << [bold_cell(pdf, I18n.t("payday.invoice.invoice_no", default: "Invoice #:")),
+                       bold_cell(pdf, invoice.invoice_number.to_s, align: :right)]
+      end
 
-          table_data << [bold_cell(pdf, I18n.t('payday.invoice.paid_date', :default => "Paid Date:")),
-              bold_cell(pdf, paid_date, :align => :right)]
+      # invoice date
+      if defined?(invoice.invoice_date) && invoice.invoice_date
+        if invoice.invoice_date.is_a?(Date) || invoice.invoice_date.is_a?(Time)
+          invoice_date = invoice.invoice_date.strftime(Payday::Config.default.date_format)
+        else
+          invoice_date = invoice.invoice_date.to_s
         end
 
-        # Refunded on
-        if defined?(invoice.refunded_at) && invoice.refunded_at
-          if invoice.refunded_at.is_a?(Date) || invoice.due_at.is_a?(Time)
-            refunded_date = invoice.refunded_at.strftime(Payday::Config.default.date_format)
-          else
-            refunded_date = invoice.refunded_at.to_s
-          end
+        table_data << [bold_cell(pdf, I18n.t("payday.invoice.invoice_date", default: "Invoice Date:")),
+                       bold_cell(pdf, invoice_date, align: :right)]
+      end
 
-          table_data << [bold_cell(pdf, I18n.t('payday.invoice.refunded_date', :default => "Refunded Date:")),
-              bold_cell(pdf, refunded_date, :align => :right)]
+      # Due on
+      if defined?(invoice.due_at) && invoice.due_at
+        if invoice.due_at.is_a?(Date) || invoice.due_at.is_a?(Time)
+          due_date = invoice.due_at.strftime(Payday::Config.default.date_format)
+        else
+          due_date = invoice.due_at.to_s
         end
 
-        # loop through invoice_details and include them
-        invoice.each_detail do |key, value|
-          table_data << [bold_cell(pdf, key),
-              bold_cell(pdf, value, :align => :right)]
-        end
+        table_data << [bold_cell(pdf, I18n.t("payday.invoice.due_date", default: "Due Date:")),
+                       bold_cell(pdf, due_date, align: :right)]
+      end
 
-        if table_data.length > 0
-          pdf.table(table_data, :cell_style => { :borders => [], :padding => [1, 10, 1, 1] })
+      # Paid on
+      if defined?(invoice.paid_at) && invoice.paid_at
+        if invoice.paid_at.is_a?(Date) || invoice.paid_at.is_a?(Time)
+          paid_date = invoice.paid_at.strftime(Payday::Config.default.date_format)
+        else
+          paid_date = invoice.paid_at.to_s
         end
+
+        table_data << [bold_cell(pdf, I18n.t("payday.invoice.paid_date", default: "Paid Date:")),
+                       bold_cell(pdf, paid_date, align: :right)]
       end
 
-      def self.line_items_table(invoice, pdf)
-        table_data = []
-        table_data << [bold_cell(pdf, I18n.t('payday.line_item.description', :default => "Description"), :borders => []),
-            bold_cell(pdf, I18n.t('payday.line_item.unit_price', :default => "Unit Price"), :align => :center, :borders => []),
-            bold_cell(pdf, I18n.t('payday.line_item.quantity', :default => "Quantity"), :align => :center, :borders => []),
-            bold_cell(pdf, I18n.t('payday.line_item.amount', :default => "Amount"), :align => :center, :borders => [])]
-        invoice.line_items.each do |line|
-          table_data << [line.description,
-                         (line.display_price || number_to_currency(line.price, invoice)),
-                         (line.display_quantity || BigDecimal.new(line.quantity.to_s).to_s("F")),
-                         number_to_currency(line.amount, invoice)]
+      # Refunded on
+      if defined?(invoice.refunded_at) && invoice.refunded_at
+        if invoice.refunded_at.is_a?(Date) || invoice.refunded_at.is_a?(Time)
+          refunded_date = invoice.refunded_at.strftime(Payday::Config.default.date_format)
+        else
+          refunded_date = invoice.refunded_at.to_s
         end
 
-        pdf.move_cursor_to(pdf.cursor - 20)
-        pdf.table(table_data, :width => pdf.bounds.width, :header => true,
-            :cell_style => {:border_width => 0.5, :border_color => "cccccc", :padding => [5, 10]},
-            :row_colors => ["dfdfdf", "ffffff"]) do
-          # left align the number columns
-          columns(1..3).rows(1..row_length - 1).style(:align => :right)
+        table_data << [bold_cell(pdf, I18n.t("payday.invoice.refunded_date", default: "Refunded Date:")),
+                       bold_cell(pdf, refunded_date, align: :right)]
+      end
 
-          # set the column widths correctly
-          natural = natural_column_widths
-          natural[0] = width - natural[1] - natural[2] - natural[3]
+      # loop through invoice_details and include them
+      invoice.each_detail do |key, value|
+        table_data << [bold_cell(pdf, key),
+                       bold_cell(pdf, value, align: :right)]
+      end
 
-          column_widths = natural
-        end
+      if table_data.length > 0
+        pdf.table(table_data, cell_style: { borders: [], padding: [1, 10, 1, 1] })
       end
+    end
 
-      def self.totals_lines(invoice, pdf)
-        table_data = []
-        table_data << [bold_cell(pdf, I18n.t('payday.invoice.subtotal', :default => "Subtotal:")),
-            cell(pdf, number_to_currency(invoice.subtotal, invoice), :align => :right)]
-        if invoice.tax_rate > 0
-          table_data << [bold_cell(pdf,
-              invoice.tax_description.nil? ? I18n.t('payday.invoice.tax', :default => "Tax:") : invoice.tax_description),
-              cell(pdf, number_to_currency(invoice.tax, invoice), :align => :right)]
-        end
-        if invoice.shipping_rate > 0
-          table_data << [bold_cell(pdf,
-              invoice.shipping_description.nil? ? I18n.t('payday.invoice.shipping', :default => "Shipping:") : invoice.shipping_description),
-              cell(pdf, number_to_currency(invoice.shipping, invoice), :align => :right)]
-        end
-        table_data << [bold_cell(pdf, I18n.t('payday.invoice.total', :default => "Total:"), :size => 12),
-            cell(pdf, number_to_currency(invoice.total, invoice), :size => 12, :align => :right)]
-        table = pdf.make_table(table_data, :cell_style => { :borders => [] })
-        pdf.bounding_box([pdf.bounds.width - table.width, pdf.cursor], :width => table.width, :height => table.height + 2) do
-          table.draw
-        end
+    def self.line_items_table(invoice, pdf)
+      table_data = []
+      table_data << [bold_cell(pdf, I18n.t("payday.line_item.description", default: "Description"), borders: []),
+                     bold_cell(pdf, I18n.t("payday.line_item.unit_price", default: "Unit Price"), align: :center, borders: []),
+                     bold_cell(pdf, I18n.t("payday.line_item.quantity", default: "Quantity"), align: :center, borders: []),
+                     bold_cell(pdf, I18n.t("payday.line_item.amount", default: "Amount"), align: :center, borders: [])]
+      invoice.line_items.each do |line|
+        table_data << [line.description,
+                       (line.display_price || number_to_currency(line.price, invoice)),
+                       (line.display_quantity || BigDecimal.new(line.quantity.to_s).to_s("F")),
+                       number_to_currency(line.amount, invoice)]
       end
 
-      def self.notes(invoice, pdf)
-        if defined?(invoice.notes) && invoice.notes
-          pdf.move_cursor_to(pdf.cursor - 30)
-          pdf.font("Helvetica-Bold") do
-            pdf.text(I18n.t('payday.invoice.notes', :default => "Notes"))
-          end
-          pdf.line_width = 0.5
-          pdf.stroke_color = "cccccc"
-          pdf.stroke_line([0, pdf.cursor - 3, pdf.bounds.width, pdf.cursor - 3])
-          pdf.move_cursor_to(pdf.cursor - 10)
-          pdf.text(invoice.notes.to_s)
-        end
+      pdf.move_cursor_to(pdf.cursor - 20)
+      pdf.table(table_data, width: pdf.bounds.width, header: true,
+                cell_style: { border_width: 0.5, border_color: "cccccc",
+                              padding: [5, 10] },
+                row_colors: %w(dfdfdf ffffff)) do
+
+        # left align the number columns
+        columns(1..3).rows(1..row_length - 1).style(align: :right)
+
+        # set the column widths correctly
+        natural = natural_column_widths
+        natural[0] = width - natural[1] - natural[2] - natural[3]
+
+        column_widths = natural
       end
+    end
+
+    def self.totals_lines(invoice, pdf)
+      table_data = []
+      table_data << [
+        bold_cell(pdf, I18n.t("payday.invoice.subtotal", default: "Subtotal:")),
+        cell(pdf, number_to_currency(invoice.subtotal, invoice), align: :right)
+      ]
 
-      def self.page_numbers(pdf)
-        if pdf.page_count > 1
-          pdf.number_pages("<page> / <total>", :at => [pdf.bounds.right - 18, -15])
+      if invoice.tax_rate > 0
+        if invoice.tax_description.nil?
+          tax_description = I18n.t("payday.invoice.tax", default: "Tax:")
+        else
+          tax_description = invoice.tax_description
         end
-      end
 
-      def self.invoice_or_default(invoice, property)
-        if invoice.respond_to?(property) && invoice.send(property)
-          invoice.send(property)
+        table_data << [
+          bold_cell(pdf, tax_description),
+          cell(pdf, number_to_currency(invoice.tax, invoice), align: :right)
+        ]
+      end
+      if invoice.shipping_rate > 0
+        if invoice.shipping_description.nil?
+          shipping_description =
+            I18n.t("payday.invoice.shipping", default: "Shipping:")
         else
-          Payday::Config.default.send(property)
+          shipping_description = invoice.shipping_description
         end
+
+        table_data << [
+          bold_cell(pdf, shipping_description),
+          cell(pdf, number_to_currency(invoice.shipping, invoice),
+               align: :right)
+        ]
+      end
+      table_data << [
+        bold_cell(pdf, I18n.t("payday.invoice.total", default: "Total:"),
+                  size: 12),
+        cell(pdf, number_to_currency(invoice.total, invoice),
+             size: 12, align: :right)
+      ]
+      table = pdf.make_table(table_data, cell_style: { borders: [] })
+      pdf.bounding_box([pdf.bounds.width - table.width, pdf.cursor],
+                       width: table.width, height: table.height + 2) do
+
+        table.draw
       end
+    end
 
-      def self.cell(pdf, text, options = {})
-        Prawn::Table::Cell::Text.make(pdf, text, options)
+    def self.notes(invoice, pdf)
+      if defined?(invoice.notes) && invoice.notes
+        pdf.move_cursor_to(pdf.cursor - 30)
+        pdf.font("Helvetica-Bold") do
+          pdf.text(I18n.t("payday.invoice.notes", default: "Notes"))
+        end
+        pdf.line_width = 0.5
+        pdf.stroke_color = "cccccc"
+        pdf.stroke_line([0, pdf.cursor - 3, pdf.bounds.width, pdf.cursor - 3])
+        pdf.move_cursor_to(pdf.cursor - 10)
+        pdf.text(invoice.notes.to_s)
       end
+    end
 
-      def self.bold_cell(pdf, text, options = {})
-        cell(pdf, "<b>#{text}</b>", options.merge(:inline_format => true))
+    def self.page_numbers(pdf)
+      if pdf.page_count > 1
+        pdf.number_pages("<page> / <total>", at: [pdf.bounds.right - 18, -15])
       end
+    end
 
-      # Converts this number to a formatted currency string
-      def self.number_to_currency(number, invoice)
-        currency = Money::Currency.wrap(invoice_or_default(invoice, :currency))
-        number = number * currency.subunit_to_unit
-        number = number.round unless Money.infinite_precision
-        Money.new(number, currency).format
+    def self.invoice_or_default(invoice, property)
+      if invoice.respond_to?(property) && invoice.send(property)
+        invoice.send(property)
+      else
+        Payday::Config.default.send(property)
       end
+    end
 
-      def self.max_cell_width(cell_proxy)
-        max = 0
-        cell_proxy.each do |cell|
-          if cell.natural_content_width > max
-            max = cell.natural_content_width
-          end
-        end
+    def self.cell(pdf, text, options = {})
+      Prawn::Table::Cell::Text.make(pdf, text, options)
+    end
+
+    def self.bold_cell(pdf, text, options = {})
+      cell(pdf, "<b>#{text}</b>", options.merge(inline_format: true))
+    end
 
-        max
+    # Converts this number to a formatted currency string
+    def self.number_to_currency(number, invoice)
+      currency = Money::Currency.wrap(invoice_or_default(invoice, :currency))
+      number *= currency.subunit_to_unit
+      number = number.round unless Money.infinite_precision
+      Money.new(number, currency).format
+    end
+
+    def self.max_cell_width(cell_proxy)
+      max = 0
+      cell_proxy.each do |cell|
+        max = cell.natural_content_width if cell.natural_content_width > max
       end
+
+      max
+    end
   end
 end