Use the new configuration throughout the views, controllers and templates (closes #21e3ae)

This commit is contained in:
Paul van Tilburg 2011-12-23 21:17:44 +01:00
parent 71ee97c34c
commit c8ced1777c
2 changed files with 7 additions and 6 deletions

View File

@ -421,7 +421,8 @@ module StopTime::Models
class HourlyRateSupport < V 1.3 # :nodoc:
def self.up
add_column(Customer.table_name, :hourly_rate, :float,
:null => false, :default => HourlyRate)
:null => false,
:default => @config["hourly_rate"])
end
def self.down
@ -613,7 +614,7 @@ module StopTime::Controllers
# Generates the form to create a new customer object (Models::Customer)
# using Views#customer_form.
def get
@customer = Customer.new(:hourly_rate => HourlyRate)
@customer = Customer.new(:hourly_rate => @config['hourly_rate'])
@input = @customer.attributes
@target = [Customers]
@ -1618,9 +1619,9 @@ module StopTime::Views
td ""
td.right { "€ %.2f" % subtotal }
end
vat = subtotal * VATRate/100.0
vat = subtotal * @config["vat_rate"]/100.0
tr do
td { i "VAT %d%%" % VATRate }
td { i "VAT %d%%" % @config["vat_rate"] }
td ""
td ""
td.right { "€ %.2f" % vat }

View File

@ -78,7 +78,7 @@
\newcommand{\ihsubtotal}[1]{\cmidrule[.0em]{4-4}%
\textit{Subtotaal}&&&\currency~#1\\}
\newcommand{\ihnosubtotal}[1]{\cmidrule[.0em]{4-4}&&&\\}
\newcommand{\ihvat}[1]{\textit{Btw-heffing <%= "%d\\%%" % VATRate %>}&&&\currency~#1\\}
\newcommand{\ihvat}[1]{\textit{Btw-heffing <%= "%d\\%%" % @config["vat_rate"] %>}&&&\currency~#1\\}
\newcommand{\ihtotal}[1]{\cmidrule[.05em]{4-4}%
\textbf{\Totaltext}&&&\textbf{\currency~#1}}
@ -105,7 +105,7 @@
vat = 0 %>
\ihnosubtotal{} <%
else
vat = subtotal * VATRate/100.0 %>
vat = subtotal * @config["vat_rate"]/100.0 %>
\ihsubtotal{<%= number_with_precision(subtotal) %>}
\ihvat{<%= number_with_precision(vat) %>}<%
end %>