Skip to content

Commit

Permalink
Add option for namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
@bryszard
bryszard committed Sep 27, 2017
1 parent d74c3cb commit e7ca6bd
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
4 changes: 3 additions & 1 deletion lib/payday/invoice.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ 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,
:translations_namespace

def initialize(options = {})
self.invoice_number = options[:invoice_number] || nil
Expand All @@ -22,6 +23,7 @@ def initialize(options = {})
self.currency = options[:currency] || nil
self.invoice_details = options[:invoice_details] || []
self.invoice_date = options[:invoice_date] || nil
self.translations_namespace = options[:translations_namespace] || 'invoice'
end

# The tax rate that we're applying, as a BigDecimal
Expand Down
24 changes: 12 additions & 12 deletions lib/payday/pdf_renderer.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ def self.bill_to_ship_to(invoice, pdf)

# render bill to
pdf.float do
table = pdf.table([[bold_cell(pdf, I18n.t("payday.invoice.bill_to", default: "Bill To"))],
table = pdf.table([[bold_cell(pdf, I18n.t("payday.#{invoice.translations_namespace}.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"))],
table = pdf.make_table([[bold_cell(pdf, I18n.t("payday.#{invoice.translations_namespace}.ship_to", default: "Ship To"))],
[invoice.ship_to]], column_widths: [200], cell_style: bill_to_cell_style)

pdf.bounding_box([pdf.bounds.width - table.width, pdf.cursor], width: table.width, height: table.height + 2) do
Expand All @@ -122,7 +122,7 @@ def self.invoice_details(invoice, pdf)

# invoice number
if defined?(invoice.invoice_number) && invoice.invoice_number
table_data << [bold_cell(pdf, I18n.t("payday.invoice.invoice_no", default: "Invoice #:")),
table_data << [bold_cell(pdf, I18n.t("payday.#{invoice.translations_namespace}.invoice_no", default: "Invoice #:")),
bold_cell(pdf, invoice.invoice_number.to_s, align: :right)]
end

Expand All @@ -134,7 +134,7 @@ def self.invoice_details(invoice, pdf)
invoice_date = invoice.invoice_date.to_s
end

table_data << [bold_cell(pdf, I18n.t("payday.invoice.invoice_date", default: "Invoice Date:")),
table_data << [bold_cell(pdf, I18n.t("payday.#{invoice.translations_namespace}.invoice_date", default: "Invoice Date:")),
bold_cell(pdf, invoice_date, align: :right)]
end

Expand All @@ -146,7 +146,7 @@ def self.invoice_details(invoice, pdf)
due_date = invoice.due_at.to_s
end

table_data << [bold_cell(pdf, I18n.t("payday.invoice.due_date", default: "Due Date:")),
table_data << [bold_cell(pdf, I18n.t("payday.#{invoice.translations_namespace}.due_date", default: "Due Date:")),
bold_cell(pdf, due_date, align: :right)]
end

Expand All @@ -158,7 +158,7 @@ def self.invoice_details(invoice, pdf)
paid_date = invoice.paid_at.to_s
end

table_data << [bold_cell(pdf, I18n.t("payday.invoice.paid_date", default: "Paid Date:")),
table_data << [bold_cell(pdf, I18n.t("payday.#{invoice.translations_namespace}.paid_date", default: "Paid Date:")),
bold_cell(pdf, paid_date, align: :right)]
end

Expand All @@ -170,7 +170,7 @@ def self.invoice_details(invoice, pdf)
refunded_date = invoice.refunded_at.to_s
end

table_data << [bold_cell(pdf, I18n.t("payday.invoice.refunded_date", default: "Refunded Date:")),
table_data << [bold_cell(pdf, I18n.t("payday.#{invoice.translations_namespace}.refunded_date", default: "Refunded Date:")),
bold_cell(pdf, refunded_date, align: :right)]
end

Expand Down Expand Up @@ -218,13 +218,13 @@ def self.line_items_table(invoice, pdf)
def self.totals_lines(invoice, pdf)
table_data = []
table_data << [
bold_cell(pdf, I18n.t("payday.invoice.subtotal", default: "Subtotal:")),
bold_cell(pdf, I18n.t("payday.#{invoice.translations_namespace}.subtotal", default: "Subtotal:")),
cell(pdf, number_to_currency(invoice.subtotal, invoice), align: :right)
]

if invoice.tax_rate > 0
if invoice.tax_description.nil?
tax_description = I18n.t("payday.invoice.tax", default: "Tax:")
tax_description = I18n.t("payday.#{invoice.translations_namespace}.tax", default: "Tax:")
else
tax_description = invoice.tax_description
end
Expand All @@ -237,7 +237,7 @@ def self.totals_lines(invoice, pdf)
if invoice.shipping_rate > 0
if invoice.shipping_description.nil?
shipping_description =
I18n.t("payday.invoice.shipping", default: "Shipping:")
I18n.t("payday.#{invoice.translations_namespace}.shipping", default: "Shipping:")
else
shipping_description = invoice.shipping_description
end
Expand All @@ -249,7 +249,7 @@ def self.totals_lines(invoice, pdf)
]
end
table_data << [
bold_cell(pdf, I18n.t("payday.invoice.total", default: "Total:"),
bold_cell(pdf, I18n.t("payday.#{invoice.translations_namespace}.total", default: "Total:"),
size: 12),
cell(pdf, number_to_currency(invoice.total, invoice),
size: 12, align: :right)
Expand All @@ -266,7 +266,7 @@ 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"))
pdf.text(I18n.t("payday.#{invoice.translations_namespace}.notes", default: "Notes"))
end
pdf.line_width = 0.5
pdf.stroke_color = "cccccc"
Expand Down

0 comments on commit e7ca6bd

Please sign in to comment.