Adapted the code for the invoice subdir changes
This commit is contained in:
parent
2f36d30873
commit
2b0fb9631d
|
@ -845,11 +845,11 @@ module StopTime::Controllers
|
||||||
@input = @invoice.attributes
|
@input = @invoice.attributes
|
||||||
render :invoice
|
render :invoice
|
||||||
elsif @format == "tex"
|
elsif @format == "tex"
|
||||||
tex_file = PUBLIC_DIR + "#{@number}.tex"
|
tex_file = PUBLIC_DIR + "invoices/#{@number}.tex"
|
||||||
_generate_invoice_tex(@number) unless tex_file.exist?
|
_generate_invoice_tex(@number) unless tex_file.exist?
|
||||||
redirect(Static, tex_file.basename)
|
redirect(Static, tex_file.basename)
|
||||||
elsif @format == "pdf"
|
elsif @format == "pdf"
|
||||||
pdf_file = PUBLIC_DIR + "#{@number}.pdf"
|
pdf_file = PUBLIC_DIR + "invoices/#{@number}.pdf"
|
||||||
_generate_invoice_pdf(@number) unless pdf_file.exist?
|
_generate_invoice_pdf(@number) unless pdf_file.exist?
|
||||||
redirect(Static, pdf_file.basename)
|
redirect(Static, pdf_file.basename)
|
||||||
end
|
end
|
||||||
|
@ -870,7 +870,7 @@ module StopTime::Controllers
|
||||||
# Generates a LaTex document for the invoice with the given _number_.
|
# Generates a LaTex document for the invoice with the given _number_.
|
||||||
def _generate_invoice_tex(number)
|
def _generate_invoice_tex(number)
|
||||||
template = TEMPLATE_DIR + "invoice.tex.erb"
|
template = TEMPLATE_DIR + "invoice.tex.erb"
|
||||||
tex_file = PUBLIC_DIR + "#{number}.tex"
|
tex_file = PUBLIC_DIR + "invoices/#{number}.tex"
|
||||||
|
|
||||||
I18n.with_locale :nl do
|
I18n.with_locale :nl do
|
||||||
erb = ERB.new(File.read(template))
|
erb = ERB.new(File.read(template))
|
||||||
|
@ -881,7 +881,7 @@ module StopTime::Controllers
|
||||||
# Generates a PDF document for the invoice with the given _number_
|
# Generates a PDF document for the invoice with the given _number_
|
||||||
# via _generate_invoice_tex.
|
# via _generate_invoice_tex.
|
||||||
def _generate_invoice_pdf(number)
|
def _generate_invoice_pdf(number)
|
||||||
tex_file = PUBLIC_DIR + "#{@number}.tex"
|
tex_file = PUBLIC_DIR + "invoices/#{@number}.tex"
|
||||||
_generate_invoice_tex(number) unless tex_file.exist?
|
_generate_invoice_tex(number) unless tex_file.exist?
|
||||||
|
|
||||||
# FIXME: remove rubber depend, use pdflatex directly
|
# FIXME: remove rubber depend, use pdflatex directly
|
||||||
|
|
Loading…
Reference in New Issue