Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Some language fixes. Finished migration path.

Browse source
This commit is contained in:
Benjamin Meichsner 2009-03-01 18:45:34 +01:00
parent 857475af1b
commit a29053b4e9
9 changed files with 172 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/article_price.rb
View file

@ -34,11 +34,11 @@ class ArticlePrice < ActiveRecord::Base
# The financial gross, net plus tax and deposit.
def gross_price
((price + deposit) * (tax / 100 + 1))
((price + deposit) * (tax / 100 + 1)).round(2)
end
# The price for the foodcoop-member.
def fc_price
(gross_price * (APP_CONFIG[:price_markup] / 100 + 1))
(gross_price * (APP_CONFIG[:price_markup] / 100 + 1)).round(2)
end
end

8
app/views/ordering/my_order_result.haml
View file

@ -2,7 +2,7 @@
#element_navigation
= link_to_unless @order.previous == @order, "<< #{@order.previous.name}", :action => "my_order_result", :id => @order.previous
|
= link_to _("Overview"), :controller => 'ordering'
= link_to "Übersicht", :controller => 'ordering'
|
= link_to_unless @order.next == @order, "#{@order.next.name} >>", :action => "my_order_result", :id => @order.next
@ -30,9 +30,9 @@
%b=h number_to_currency(@group_order.price)
- else
%b Du hast nicht bestellt.
%p
= "Abgerechnet von #{@order.updated_by.nick}" if @order.finished?
= "<b>Bestellung</b>" if @order.closed?
- if @order.closed?
%p
= "Abgerechnet von #{@order.updated_by.nick}"
= link_to "Kommentare lesen/schreiben", "#comments"
// directly switch to active orders

10
app/views/ordering/order.rhtml
View file

@ -39,7 +39,7 @@
<tr class="<%= cycle('even', 'odd', :name => 'articles') %>" valign="top">
<td class="name">
<% unless order_article.article.note.blank? %>
<%= order_article.article.name %> <%= image_tag "lamp_grey.png", {:alt => _("Show note"), :size => "15x16", :border => "0", :onmouseover => "$('note_#{i}').show();", :onmouseout => "$('note_#{i}').hide();" }%>
<%= order_article.article.name %> <%= image_tag "lamp_grey.png", {:alt => "Notiz zeigen", :size => "15x16", :border => "0", :onmouseover => "$('note_#{i}').show();", :onmouseout => "$('note_#{i}').hide();" }%>
<% else %>
<%= order_article.article.name %>
<% end %>
@ -81,20 +81,20 @@
<tfoot>
<tr>
<td colspan="6"></td>
<td colspan="3" class="currency"><%=_ "Total amount" %>: <span id="total_price"><%= total %></span> €</td>
<td colspan="3" class="currency">Gesamtbetrag: <span id="total_price"><%= total %></span> €</td>
</tr>
<tr>
<td colspan="6"></td>
<td colspan="3" class="currency"><%=_ "Credit available"%>: <%= number_to_currency(@availableFunds) %></td>
<td colspan="3" class="currency">Verfügbares Guthaben: <%= number_to_currency(@availableFunds) %></td>
</tr>
<tr>
<td colspan="6"></td>
<td colspan="3" class="currency"><%=_ "New account balance"%>: <strong><span id="new_balance"><%= @ordergroup.account_balance - total %></span> €</strong></td>
<td colspan="3" class="currency">Neuer Kontostand: <strong><span id="new_balance"><%= @ordergroup.account_balance - total %></span> €</strong></td>
</tr>
<tr>
<td style="text-align:left;"><%= link_to_top %></td>
<td colspan="5"></td>
<td colspan="3" style="text-align:right;"><span style="font-size:1.2em"><%= submit_tag( _("Save order"), :id => 'submit_button' ) %></span> | <%= link_to _("Cancel"), :controller => 'ordering' %></td>
<td colspan="3" style="text-align:right;"><span style="font-size:1.2em"><%= submit_tag( "Bestellung speichern", :id => 'submit_button' ) %></span> | <%= link_to "Abbrechen", :controller => 'ordering' %></td>
</tr>
</tfoot>
</table>

2
app/views/orders/_form.html.haml
View file

@ -67,7 +67,7 @@
%tr
%td{:colspan => "6"}
= check_box_tag 'checkall', "1", false, { :onclick => "checkUncheckAll(this)" }
=_ "Select all"
Alle auswählen
- if (@template_orders && !@template_orders.empty?)
= render :partial => 'template_orders_script'

4
app/views/orders/edit.html.haml
View file

@ -2,6 +2,6 @@
- form_for @order do |form|
= render :partial => 'form', :locals => { :form => form }
= submit_tag _("Save")
= submit_tag "Speichern"
|
= link_to _("Cancel"), :action => 'show', :id => @order
= link_to "Abbrechen", :action => 'show', :id => @order

8
app/views/orders/index.haml
View file

@ -5,7 +5,7 @@
- form_tag do
Neue Bestellung anlegen für
%select{:onchange => "redirectTo(this)", :style => "font-size: 0.9em;margin-left:1em;"}
%option{:selected => 'selected'}=_ "Choose a supplier..."
%option{:selected => 'selected'} Lieferant auswählen...
= options_for_suppliers_to_select
%br/
.left_column{:style => "width:55em"}
@ -27,13 +27,13 @@
%td=h order.name
%td=h format_time(order.ends) unless order.ends.nil?
%td=h truncate(order.note)
%td= link_to "Beenden", finish_order_path(order), :confirm => _("Are you really sure to finish the order?"), :method => :post
%td= link_to "Beenden", finish_order_path(order), :confirm => "Bist Du sicher die Bestellung zu beenden?", :method => :post
%td
= link_to "Anzeigen", order
= link_to icon(:edit), edit_order_path(order)
= link_to icon(:delete), order, :confirm => _("Are you really sure you want to destroy the order?"), :method => :delete
= link_to icon(:delete), order, :confirm => "Bist Du sicher die Bestellung zu beenden?", :method => :delete
- else
=_ "There aren't open orders at the moment."
Derzeit gibt es keine laufende Bestellungen.
.left_column{:style => "width:75em"}
.box_title

10
app/views/orders/matrixPdf.pdf.prawn
View file

@ -18,13 +18,13 @@ pdf.text "Insgesamt #{order_articles.size} Artikel", :size => 8
pdf.move_down 10
order_articles_data = order_articles.collect do |a|
[a.article.name, a.article.unit, a.price.unit_quantity, a.price.fc_price, a.units_to_order]
[a.article.name, a.article.unit, a.price.unit_quantity, number_with_precision(a.price.fc_price), a.units_to_order]
end
pdf.table order_articles_data,
:font_size => 8,
:border_style => :grid,
:vertical_padding => 3,
:headers => ["Artikel", "Einheit", "Gebinde", "Preis", "Menge"],
:headers => ["Artikel", "Einheit", "Gebinde", "FC-Preis", "Menge"],
:align => { 3 => :right }
@ -46,15 +46,15 @@ while (page_number * max_order_articles_per_page < total_num_order_articles) do
header = [""]
for header_article in current_order_articles
name = header_article.article.name.split("-").join(" ").split(".").join(". ").split("/").join(" ")
name = name.split.collect { |w| truncate(w, 8, "..") }.join(" ")
header << truncate(name, 30, " ..")
name = name.split.collect { |w| truncate(w, :length => 8, :omission => "..") }.join(" ")
header << truncate(name, :length => 30, :omission => " ..")
end
# Collect group results
groups_data = []
for group_order in @order.group_orders.all(:include => :ordergroup)
group_result = [truncate(group_order.ordergroup.name, 20)]
group_result = [truncate(group_order.ordergroup.name, :length => 20)]
for order_article in current_order_articles
# get the Ordergroup result for this order_article

6
app/views/orders/show.haml
View file

@ -2,7 +2,7 @@
#element_navigation
= link_to_unless @order.previous == @order, "<< #{@order.previous.name}", @order.previous
|
= link_to _("Overview"), orders_path
= link_to "Übersicht", orders_path
|
= link_to_unless @order.next == @order, "#{@order.next.name} >>", @order.next
@ -13,7 +13,7 @@
.column_content
- if @order.finished? and !@order.closed?
%p
%b{:style => "color:red"}=_ "Order isn't closed yet"
%b{:style => "color:red"} Bestellung wurde noch nicht abgerechnet.
%p
Lieferant:
%b=h @order.name
@ -33,7 +33,7 @@
= "[#{@order.group_orders.find(:all, :include => :ordergroup).collect{|g| g.ordergroup.name}.join(', ')}]"
%p
Netto/Bruttosumme aller Artikel
Netto/Bruttosumme aller Artikel:
%b= "#{number_to_currency(@order.sum(:net))} / #{number_to_currency(@order.sum(:gross))}"
%p
Bestellte Artikel: