finish group_orders i18n + controller
This commit is contained in:
parent
28c66642f5
commit
8d899581bd
9 changed files with 196 additions and 98 deletions
|
@ -20,12 +20,12 @@ class GroupOrdersController < ApplicationController
|
||||||
@group_order = GroupOrder.new(params[:group_order])
|
@group_order = GroupOrder.new(params[:group_order])
|
||||||
begin
|
begin
|
||||||
@group_order.save_ordering!
|
@group_order.save_ordering!
|
||||||
redirect_to group_order_url(@group_order), :notice => 'Die Bestellung wurde gespeichert.'
|
redirect_to group_order_url(@group_order), :notice => I18n.t('group_orders.create.notice')
|
||||||
rescue ActiveRecord::StaleObjectError
|
rescue ActiveRecord::StaleObjectError
|
||||||
redirect_to group_orders_url, :alert => 'In der Zwischenzeit hat jemand anderes auch bestellt, daher konnte die Bestellung nicht aktualisiert werden.'
|
redirect_to group_orders_url, :alert => I18n.t('group_orders.create.error_stale')
|
||||||
rescue => exception
|
rescue => exception
|
||||||
logger.error('Failed to update order: ' + exception.message)
|
logger.error('Failed to update order: ' + exception.message)
|
||||||
redirect_to group_orders_url, :alert => 'Die Bestellung konnte nicht aktualisiert werden, da ein Fehler auftrat.'
|
redirect_to group_orders_url, :alert => I18n.t('group_orders.create.error_general')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -41,12 +41,12 @@ class GroupOrdersController < ApplicationController
|
||||||
@group_order.attributes = params[:group_order]
|
@group_order.attributes = params[:group_order]
|
||||||
begin
|
begin
|
||||||
@group_order.save_ordering!
|
@group_order.save_ordering!
|
||||||
redirect_to group_order_url(@group_order), :notice => 'Die Bestellung wurde gespeichert.'
|
redirect_to group_order_url(@group_order), :notice => I18n.t('group_orders.update.notice')
|
||||||
rescue ActiveRecord::StaleObjectError
|
rescue ActiveRecord::StaleObjectError
|
||||||
redirect_to group_orders_url, :alert => 'In der Zwischenzeit hat jemand anderes auch bestellt, daher konnte die Bestellung nicht aktualisiert werden.'
|
redirect_to group_orders_url, :alert => I18n.t('group_orders.update.error_stale')
|
||||||
rescue => exception
|
rescue => exception
|
||||||
logger.error('Failed to update order: ' + exception.message)
|
logger.error('Failed to update order: ' + exception.message)
|
||||||
redirect_to group_orders_url, :alert => 'Die Bestellung konnte nicht aktualisiert werden, da ein Fehler auftrat.'
|
redirect_to group_orders_url, :alert => I18n.t('group_orders.update.error_general')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -69,7 +69,7 @@ class GroupOrdersController < ApplicationController
|
||||||
def ensure_ordergroup_member
|
def ensure_ordergroup_member
|
||||||
@ordergroup = @current_user.ordergroup
|
@ordergroup = @current_user.ordergroup
|
||||||
if @ordergroup.nil?
|
if @ordergroup.nil?
|
||||||
redirect_to root_url, :alert => "Du bist kein Mitglieder einer Bestellgruppe."
|
redirect_to root_url, :alert => I18n.t('group_orders.errors.no_member')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -77,7 +77,7 @@ class GroupOrdersController < ApplicationController
|
||||||
@order = Order.find((params[:order_id] || params[:group_order][:order_id]),
|
@order = Order.find((params[:order_id] || params[:group_order][:order_id]),
|
||||||
:include => [:supplier, :order_articles])
|
:include => [:supplier, :order_articles])
|
||||||
unless @order.open?
|
unless @order.open?
|
||||||
flash[:notice] = 'Diese Bestellung ist bereits abgeschlossen.'
|
flash[:notice] = I18n.t('group_orders.error_closed')
|
||||||
redirect_to :action => 'index'
|
redirect_to :action => 'index'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -85,7 +85,7 @@ class GroupOrdersController < ApplicationController
|
||||||
def ensure_my_group_order
|
def ensure_my_group_order
|
||||||
@group_order = @ordergroup.group_orders.find(params[:id])
|
@group_order = @ordergroup.group_orders.find(params[:id])
|
||||||
rescue ActiveRecord::RecordNotFound
|
rescue ActiveRecord::RecordNotFound
|
||||||
redirect_to group_orders_url, alert: 'Fehlerhafte URL, das ist nicht Deine Bestellung.'
|
redirect_to group_orders_url, alert: I18n.t('group_orders.errors.notfound')
|
||||||
end
|
end
|
||||||
|
|
||||||
def enough_apples?
|
def enough_apples?
|
||||||
|
|
|
@ -8,29 +8,29 @@
|
||||||
setStockit(#{@order.stockit?});
|
setStockit(#{@order.stockit?});
|
||||||
});
|
});
|
||||||
|
|
||||||
- title "Bestellen", false
|
- title t('.title'), false
|
||||||
|
|
||||||
.row-fluid
|
.row-fluid
|
||||||
.well.pull-left
|
.well.pull-left
|
||||||
%h2= @order.name
|
%h2= @order.name
|
||||||
%dl.dl-horizontal
|
%dl.dl-horizontal
|
||||||
- unless @order.note.blank?
|
- unless @order.note.blank?
|
||||||
%dt Notiz
|
%dt= t '.note'
|
||||||
%dd= @order.note
|
%dd= @order.note
|
||||||
%dt Erstellt von
|
%dt= t '.created_by'
|
||||||
%dd= link_to_user_message_if_valid(@order.created_by)
|
%dd= link_to_user_message_if_valid(@order.created_by)
|
||||||
%dt Ende
|
%dt= t '.ending'
|
||||||
%dd= format_time(@order.ends)
|
%dd= format_time(@order.ends)
|
||||||
- unless @order.stockit? or @order.supplier.min_order_quantity.blank?
|
- unless @order.stockit? or @order.supplier.min_order_quantity.blank?
|
||||||
%dt Mindestbestellmenge
|
%dt= t '.min_quantity'
|
||||||
%dd= @order.supplier.min_order_quantity
|
%dd= @order.supplier.min_order_quantity
|
||||||
%dt Gesamtbestellmenge bisher:
|
%dt= t '.sum_amount'
|
||||||
%dd= number_to_currency @order.sum
|
%dd= number_to_currency @order.sum
|
||||||
%dt Zuletzt bestellt
|
%dt= t '.last_update'
|
||||||
%dd
|
%dd
|
||||||
= @group_order.updated_by.nick if @group_order.updated_by
|
= @group_order.updated_by.nick if @group_order.updated_by
|
||||||
(#{format_time(@group_order.updated_on)})
|
(#{format_time(@group_order.updated_on)})
|
||||||
%dt Guthaben
|
%dt= t '.funds'
|
||||||
%dd= number_to_currency(@ordering_data[:available_funds])
|
%dd= number_to_currency(@ordering_data[:available_funds])
|
||||||
|
|
||||||
.well.pull-right
|
.well.pull-right
|
||||||
|
@ -44,18 +44,18 @@
|
||||||
%table.table.table-hover
|
%table.table.table-hover
|
||||||
%thead
|
%thead
|
||||||
%tr
|
%tr
|
||||||
%th Name
|
%th= t '.name'
|
||||||
%th{style: "width:13px;"}
|
%th{style: "width:13px;"}
|
||||||
%th{style: "width:4.5em;"} Preis
|
%th{style: "width:4.5em;"}= t '.price'
|
||||||
%th{style: "width:4.5em;"} Einheit
|
%th{style: "width:4.5em;"}= t '.unit'
|
||||||
- unless @order.stockit?
|
- unless @order.stockit?
|
||||||
%th{style: "width:70px;"} Fehlende Einheiten
|
%th{style: "width:70px;"}= t '.unit_missing'
|
||||||
%th#col_required Menge
|
%th#col_required= t '.amount'
|
||||||
%th#col_tolerance Toleranz
|
%th#col_tolerance= t '.tolerance'
|
||||||
- else
|
- else
|
||||||
%th(style="width:20px") Verfügbar
|
%th(style="width:20px")= t '.available'
|
||||||
%th#col_required Menge
|
%th#col_required= t '.amount'
|
||||||
%th{style: "width:15px;"} Summe
|
%th{style: "width:15px;"}= t '.sum'
|
||||||
%tbody
|
%tbody
|
||||||
- @order.articles_grouped_by_category.each do |category, order_articles|
|
- @order.articles_grouped_by_category.each do |category, order_articles|
|
||||||
%tr.article-category
|
%tr.article-category
|
||||||
|
@ -98,42 +98,42 @@
|
||||||
.article-info
|
.article-info
|
||||||
.article-name= order_article.article.name
|
.article-name= order_article.article.name
|
||||||
.pull-right
|
.pull-right
|
||||||
Volle Gebinde:
|
= t('.units_full') + ':'
|
||||||
%span{id: "units_#{order_article.id}"}= order_article.units_to_order
|
%span{id: "units_#{order_article.id}"}= order_article.units_to_order
|
||||||
%br/
|
%br/
|
||||||
Gesamt-Einheiten:
|
= t('.units_total') + ':'
|
||||||
%span{id: "q_total_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:quantity] + @ordering_data[:order_articles][order_article.id][:others_quantity]
|
%span{id: "q_total_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:quantity] + @ordering_data[:order_articles][order_article.id][:others_quantity]
|
||||||
%br/
|
%br/
|
||||||
Gesamt-Toleranz:
|
= t('.total_tolerance') + ':'
|
||||||
%span{id: "t_total_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:tolerance] + @ordering_data[:order_articles][order_article.id][:others_tolerance]
|
%span{id: "t_total_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:tolerance] + @ordering_data[:order_articles][order_article.id][:others_tolerance]
|
||||||
%br/
|
%br/
|
||||||
.pull-left
|
.pull-left
|
||||||
Hersteller: #{order_article.article.manufacturer}
|
#{t '.manufacturer'}: #{order_article.article.manufacturer}
|
||||||
%br/
|
%br/
|
||||||
Gebinde: #{@order.stockit? ? order_article.article.quantity_available : @ordering_data[:order_articles][order_article.id][:unit]} * #{h order_article.article.unit}
|
#{t '.units'}: #{@order.stockit? ? order_article.article.quantity_available : @ordering_data[:order_articles][order_article.id][:unit]} * #{h order_article.article.unit}
|
||||||
%br/
|
%br/
|
||||||
Notiz: #{order_article.article.note}
|
#{t '.note'}: #{order_article.article.note}
|
||||||
%br/
|
%br/
|
||||||
#order-footer
|
#order-footer
|
||||||
#info-box
|
#info-box
|
||||||
#total-sum
|
#total-sum
|
||||||
%table
|
%table
|
||||||
%tr
|
%tr
|
||||||
%td Gesamtbetrag:
|
%td= t('.total_sum_amount') + ':'
|
||||||
%td.currency
|
%td.currency
|
||||||
%span#total_price= @group_order.price
|
%span#total_price= @group_order.price
|
||||||
€
|
€
|
||||||
%tr
|
%tr
|
||||||
%td Verfügbares Guthaben:
|
%td= t('.available_funds') + ':'
|
||||||
%td.currency= number_to_currency(@ordering_data[:available_funds])
|
%td.currency= number_to_currency(@ordering_data[:available_funds])
|
||||||
%tr
|
%tr
|
||||||
%td Neuer Kontostand:
|
%td= t('.new_funds') + ':'
|
||||||
%td.currency
|
%td.currency
|
||||||
%strong
|
%strong
|
||||||
%span#new_balance= @ordering_data[:available_funds] - @group_order.price
|
%span#new_balance= @ordering_data[:available_funds] - @group_order.price
|
||||||
€
|
€
|
||||||
#order-button
|
#order-button
|
||||||
= submit_tag( "Bestellung speichern", id: 'submit_button', class: 'btn btn-primary' )
|
= submit_tag( t('.action_save'), id: 'submit_button', class: 'btn btn-primary' )
|
||||||
oder #{link_to "abbrechen", group_orders_path}
|
oder #{link_to t('.cancel'), group_orders_path}
|
||||||
%input#total_balance{name: "total_balance", type: "hidden", value: @ordergroup.account_balance - @group_order.price}/
|
%input#total_balance{name: "total_balance", type: "hidden", value: @ordergroup.account_balance - @group_order.price}/
|
||||||
%input{name: "version", type: "hidden", value: @version}/
|
%input{name: "version", type: "hidden", value: @version}/
|
|
@ -1,9 +1,9 @@
|
||||||
%table.table.table-striped
|
%table.table.table-striped
|
||||||
%thead
|
%thead
|
||||||
%tr
|
%tr
|
||||||
%th Lieferantin
|
%th= t '.supplier'
|
||||||
%th Ende
|
%th= t '.ending'
|
||||||
%th Summe
|
%th= t '.sum'
|
||||||
%tbody
|
%tbody
|
||||||
- for order in orders
|
- for order in orders
|
||||||
- group_order = order.group_order(@ordergroup) # Get GroupOrder if possible
|
- group_order = order.group_order(@ordergroup) # Get GroupOrder if possible
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
- orders = Order.open.reject{ |order| order == current_order }
|
- orders = Order.open.reject{ |order| order == current_order }
|
||||||
- unless orders.empty?
|
- unless orders.empty?
|
||||||
%h2 Laufende Bestellungen
|
%h2= t '.title'
|
||||||
%ul.unstyled
|
%ul.unstyled
|
||||||
- orders.each do |order|
|
- orders.each do |order|
|
||||||
%li
|
%li
|
||||||
= link_to_ordering(order, 'data-confirm_switch_order' => true)
|
= link_to_ordering(order, 'data-confirm_switch_order' => true)
|
||||||
- if order.ends
|
- if order.ends
|
||||||
noch #{time_ago_in_words(order.ends)}
|
= t '.remaining', remaining: time_ago_in_words(order.ends)
|
||||||
|
|
|
@ -1,14 +1,13 @@
|
||||||
- title "Bestellungen der #{@ordergroup.name}"
|
- title t('.title', group: @ordergroup.name)
|
||||||
%p
|
%p
|
||||||
Siehe hier alle
|
= t('.desc', link: link_to(t('.open_orders'), group_orders_path)).html_safe
|
||||||
= link_to "laufenden Bestellungen.", group_orders_path
|
|
||||||
|
|
||||||
.row-fluid
|
.row-fluid
|
||||||
.span6
|
.span6
|
||||||
%h2 beendet/nicht abgerechnet
|
%h2= t '.title_open'
|
||||||
= render :partial => "orders", :locals => {:orders => Order.finished_not_closed, :pagination => false}
|
= render :partial => "orders", :locals => {:orders => Order.finished_not_closed, :pagination => false}
|
||||||
|
|
||||||
.span6
|
.span6
|
||||||
%h2 abgerechnet
|
%h2= t '.title_closed'
|
||||||
#closed_orders
|
#closed_orders
|
||||||
= render :partial => "orders", :locals => {:orders => @closed_orders, :pagination => true}
|
= render :partial => "orders", :locals => {:orders => @closed_orders, :pagination => true}
|
||||||
|
|
|
@ -1,21 +1,21 @@
|
||||||
- title "Bestellüberblick", false
|
- title t('.title'), false
|
||||||
|
|
||||||
- content_for :sidebar do
|
- content_for :sidebar do
|
||||||
.well.well-small
|
.well.well-small
|
||||||
// Ordergroups Account Balance
|
// Ordergroups Account Balance
|
||||||
%h2 Guthaben
|
%h2= t '.funds.title'
|
||||||
%table.table.table-striped
|
%table.table.table-striped
|
||||||
%tr
|
%tr
|
||||||
%td Kontostand:
|
%td= t('.funds.account_balance') + ':'
|
||||||
%td.numeric{:style => "width:5em"}= number_to_currency(@ordergroup.account_balance)
|
%td.numeric{:style => "width:5em"}= number_to_currency(@ordergroup.account_balance)
|
||||||
%tr
|
%tr
|
||||||
%td - laufende Bestellungen:
|
%td= '- ' + t('.funds.open_orders') + ':'
|
||||||
%td.numeric= number_to_currency(@ordergroup.value_of_open_orders)
|
%td.numeric= number_to_currency(@ordergroup.value_of_open_orders)
|
||||||
%tr
|
%tr
|
||||||
%td= "- nicht abgerechnete Bestellungen:"
|
%td= '- ' + t('.funds.finished_orders') + ':'
|
||||||
%td.numeric= number_to_currency(@ordergroup.value_of_finished_orders)
|
%td.numeric= number_to_currency(@ordergroup.value_of_finished_orders)
|
||||||
%tr
|
%tr
|
||||||
%th verfügbares Guthaben:
|
%th= t('.funds.available_funds') + ':'
|
||||||
%th.numeric= number_to_currency(@ordergroup.get_available_funds)
|
%th.numeric= number_to_currency(@ordergroup.get_available_funds)
|
||||||
|
|
||||||
= render :partial => "shared/open_orders", :locals => {:ordergroup => @ordergroup}
|
= render :partial => "shared/open_orders", :locals => {:ordergroup => @ordergroup}
|
||||||
|
@ -23,17 +23,17 @@
|
||||||
// finished orders
|
// finished orders
|
||||||
- unless Order.finished.empty?
|
- unless Order.finished.empty?
|
||||||
%section
|
%section
|
||||||
%h2 Nicht abgerechnete Bestellungen
|
%h2= t '.finished_orders.title'
|
||||||
= render :partial => "orders", :locals => {:orders => Order.finished_not_closed, :pagination => false}
|
= render :partial => "orders", :locals => {:orders => Order.finished_not_closed, :pagination => false}
|
||||||
- if @ordergroup.value_of_finished_orders > 0
|
- if @ordergroup.value_of_finished_orders > 0
|
||||||
%p
|
%p
|
||||||
Gesamtsumme:
|
= t('.finished_orders.total_sum') + ':'
|
||||||
%b= number_to_currency(@ordergroup.value_of_finished_orders)
|
%b= number_to_currency(@ordergroup.value_of_finished_orders)
|
||||||
|
|
||||||
// closed orders
|
// closed orders
|
||||||
- unless Order.closed.empty?
|
- unless Order.closed.empty?
|
||||||
%section
|
%section
|
||||||
%h2 Abgerechnete Bestellungen
|
%h2= t '.closed_orders.title'
|
||||||
= render :partial => "orders", :locals => {:orders => Order.closed.all(:limit => 5), :pagination => false}
|
= render :partial => "orders", :locals => {:orders => Order.closed.all(:limit => 5), :pagination => false}
|
||||||
%br/
|
%br/
|
||||||
= link_to "mehr...", archive_group_orders_path
|
= link_to t('.closed_orders.more'), archive_group_orders_path
|
||||||
|
|
|
@ -6,20 +6,20 @@
|
||||||
- form_tag(:action => 'saveOrder', :id => @order) do
|
- form_tag(:action => 'saveOrder', :id => @order) do
|
||||||
.single_column{:style => "clear:both;margin-bottom:7em;"}
|
.single_column{:style => "clear:both;margin-bottom:7em;"}
|
||||||
.box_title
|
.box_title
|
||||||
%h2 Artikel
|
%h2= t '.title'
|
||||||
.column_content
|
.column_content
|
||||||
%table#order.list
|
%table#order.list
|
||||||
%thead
|
%thead
|
||||||
%tr
|
%tr
|
||||||
%th Name
|
%th= t 'group_orders.form.name'
|
||||||
%th{:style => "width:13px;"}
|
%th{:style => "width:13px;"}
|
||||||
%th{:style => "width:4.5em;"} Preis
|
%th{:style => "width:4.5em;"}= t 'group_orders.form.price'
|
||||||
%th{:style => "width:4.5em;"} Einheit
|
%th{:style => "width:4.5em;"}= t 'group_orders.form.unit'
|
||||||
%th{:style => "width:70px;"} Fehlende Einheiten
|
%th{:style => "width:70px;"}= t 'group_orders.form.unit_missing'
|
||||||
%th#col_required Menge
|
%th#col_required= t 'group_orders.form.amount'
|
||||||
- if not @order.stockit?
|
- if not @order.stockit?
|
||||||
%th#col_tolerance Toleranz
|
%th#col_tolerance= t 'group_orders.form.tolerance'
|
||||||
%th{:style => "width:15px;"} Summe
|
%th{:style => "width:15px;"}= t 'group_orders.form.sum'
|
||||||
%tbody
|
%tbody
|
||||||
- total = 0
|
- total = 0
|
||||||
- i = 0
|
- i = 0
|
||||||
|
@ -68,21 +68,21 @@
|
||||||
.article-info
|
.article-info
|
||||||
%h3= order_article.article.name
|
%h3= order_article.article.name
|
||||||
.right
|
.right
|
||||||
Volle Gebinde:
|
= t('group_orders.form.units_full') + ':'
|
||||||
%span{:id => "units_#{i}"}= order_article.units_to_order
|
%span{:id => "units_#{i}"}= order_article.units_to_order
|
||||||
%br/
|
%br/
|
||||||
Gesamt-Einheiten:
|
= t('group_orders.form.total_units') + ':'
|
||||||
%span{:id => "q_total_#{i}"}= @quantity[i] + @others_quantity[i]
|
%span{:id => "q_total_#{i}"}= @quantity[i] + @others_quantity[i]
|
||||||
%br/
|
%br/
|
||||||
Gesamt-Toleranz:
|
= t('group_orders.form.total_tolerance') + ':'
|
||||||
%span{:id => "t_total_#{i}"}= @tolerance[i] + @others_tolerance[i]
|
%span{:id => "t_total_#{i}"}= @tolerance[i] + @others_tolerance[i]
|
||||||
%br/
|
%br/
|
||||||
.left
|
.left
|
||||||
Hersteller: #{order_article.article.manufacturer}
|
#{t 'group_orders.form.manufacturer'}: #{order_article.article.manufacturer}
|
||||||
%br/
|
%br/
|
||||||
Gebinde: #{@order.stockit? ? order_article.article.quantity_available : @unit[i]} * #{h order_article.article.unit}
|
#{t 'group_orders.form.units'}: #{@order.stockit? ? order_article.article.quantity_available : @unit[i]} * #{h order_article.article.unit}
|
||||||
%br/
|
%br/
|
||||||
Notiz: #{order_article.article.note}
|
#{t 'group_orders.form.note'}: #{order_article.article.note}
|
||||||
%br/
|
%br/
|
||||||
- i = i + 1
|
- i = i + 1
|
||||||
= render "order_footer", :total => total
|
= render "order_footer", :total => total
|
|
@ -4,48 +4,49 @@
|
||||||
$('tr.ignored').hide();
|
$('tr.ignored').hide();
|
||||||
});
|
});
|
||||||
|
|
||||||
- title "Dein Bestellergebnis für #{@order.name}"
|
- title t('.title', order: @order.name)
|
||||||
|
|
||||||
.well
|
.well
|
||||||
// Order summary
|
// Order summary
|
||||||
%dl.dl-horizontal
|
%dl.dl-horizontal
|
||||||
%dt Lieferantin
|
%dt= t '.supplier'
|
||||||
%dd= @order.name
|
%dd= @order.name
|
||||||
%dt Notiz
|
%dt= t '.note'
|
||||||
%dd= @order.note
|
%dd= @order.note
|
||||||
%dt Ende
|
%dt= t '.ending'
|
||||||
%dd= format_time(@order.ends)
|
%dd= format_time(@order.ends)
|
||||||
%dt Bestellsumme
|
%dt= t '.order_sum'
|
||||||
%dd
|
%dd
|
||||||
- if @group_order
|
- if @group_order
|
||||||
= number_to_currency(@group_order.price)
|
= number_to_currency(@group_order.price)
|
||||||
- else
|
- else
|
||||||
Du hast nicht bestellt.
|
= t '.not_ordered'
|
||||||
- if @order.closed?
|
- if @order.closed?
|
||||||
%p Abgerechnet von #{@order.updated_by.nick}
|
%p= t '.closed_by', user: @order.updated_by.nick
|
||||||
= link_to "Kommentare lesen/schreiben", "#comments"
|
= link_to t('.comment'), "#comments"
|
||||||
|
|
||||||
// Article box
|
// Article box
|
||||||
%section
|
%section
|
||||||
%h2 Artikelübersicht
|
%h2= t '.articles.title'
|
||||||
.column_content#result
|
.column_content#result
|
||||||
- if @group_order
|
- if @group_order
|
||||||
%p.pull-right= link_to "Zeige/Verstecke nicht bestellte Artikel", '#', 'data-toggle-this' => 'tr.ignored'
|
%p.pull-right= link_to t('.articles.show_hide'), '#', 'data-toggle-this' => 'tr.ignored'
|
||||||
%p= link_to("Bestellung anpassen", edit_group_order_path(@group_order, order_id: @order.id), class: 'btn btn-primary') if @order.open?
|
%p= link_to(t('.articles.edit_order'), edit_group_order_path(@group_order, order_id: @order.id), class: 'btn btn-primary') if @order.open?
|
||||||
%table.table.table-hover
|
%table.table.table-hover
|
||||||
%thead
|
%thead
|
||||||
%tr
|
%tr
|
||||||
%th{style: "width:40%"} Name
|
%th{style: "width:40%"}= t '.articles.name'
|
||||||
%th Gebinde
|
%th= t '.articles.units'
|
||||||
%th Einzelpreis
|
%th= t '.articles.unit_price'
|
||||||
%th
|
%th
|
||||||
%abbr{title: "Menge + Toleranz"} Bestellt
|
%abbr{title: t('.articles.ordered_title')}= t '.articles.ordered'
|
||||||
%th
|
%th
|
||||||
%abbr{title: "Unter Berücksichtigung der derzeitigen Bestellungen aller Gruppen"}
|
%abbr{title: t('.articles.order_nopen_title')}
|
||||||
- if @order.open?
|
- if @order.open?
|
||||||
Zu
|
= t '.articles.order_open'
|
||||||
Erhalten
|
- else
|
||||||
%th Gesamtpreis
|
= t '.articles.order_not_open'
|
||||||
|
%th= t '.articles.total_price'
|
||||||
%tbody
|
%tbody
|
||||||
- total = 0 #set counter for order-sum
|
- total = 0 #set counter for order-sum
|
||||||
- for category_name, order_articles in @order.articles_grouped_by_category
|
- for category_name, order_articles in @order.articles_grouped_by_category
|
||||||
|
@ -73,20 +74,20 @@
|
||||||
%tr{id: "note_#{oa.id}", class: "note even", style: "display:none"}
|
%tr{id: "note_#{oa.id}", class: "note even", style: "display:none"}
|
||||||
%td{colspan: "6"}=h oa.article.note
|
%td{colspan: "6"}=h oa.article.note
|
||||||
%tr{class: cycle('even', 'odd', name: 'articles')}
|
%tr{class: cycle('even', 'odd', name: 'articles')}
|
||||||
%th{colspan: "5"} Summe
|
%th{colspan: "5"}= t '.articles.sum'
|
||||||
%th= number_to_currency(total)
|
%th= number_to_currency(total)
|
||||||
%br/
|
%br/
|
||||||
= link_to_top
|
= link_to_top
|
||||||
- else
|
- else
|
||||||
- if @order.open?
|
- if @order.open?
|
||||||
Du hast noch nicht bestellt.
|
= t '.articles.not_ordered_msg'
|
||||||
= link_to "Das ist Deine Chance!", action: "order", id: @order
|
= link_to t('.articles.order_now'), action: "order", id: @order
|
||||||
- else
|
- else
|
||||||
Die Bestellung is leider schon zu Ende. Beim nächsten mal früher aufstehen...
|
= t '.articles.order_closed_msg'
|
||||||
|
|
||||||
// Comments box
|
// Comments box
|
||||||
%section
|
%section
|
||||||
%h2 Kommentare
|
%h2= t '.comments.title'
|
||||||
#comments
|
#comments
|
||||||
= render 'shared/comments', comments: @order.comments
|
= render 'shared/comments', comments: @order.comments
|
||||||
#new_comment= render 'order_comments/form', order_comment: @order.comments.build(user: current_user)
|
#new_comment= render 'order_comments/form', order_comment: @order.comments.build(user: current_user)
|
||||||
|
|
98
config/locales/de/de.group_orders.yml
Normal file
98
config/locales/de/de.group_orders.yml
Normal file
|
@ -0,0 +1,98 @@
|
||||||
|
de:
|
||||||
|
group_orders:
|
||||||
|
archive:
|
||||||
|
title: 'Bestellungen der %{group}'
|
||||||
|
desc: 'Siehe hier alle %{link}.'
|
||||||
|
open_orders: 'laufenden Bestellungen'
|
||||||
|
title_open: 'beendet/nicht abgerechnet'
|
||||||
|
title_closed: 'abgerechnet'
|
||||||
|
form:
|
||||||
|
title: 'Bestellen'
|
||||||
|
note: 'Notiz'
|
||||||
|
created_by: 'Erstellt von'
|
||||||
|
ending: 'Ende'
|
||||||
|
min_quantity: 'Mindestbestellmenge'
|
||||||
|
sum_amount: 'Gesamtbestellmenge bisher:'
|
||||||
|
last_update: 'Zuletzt bestellt'
|
||||||
|
funds: 'Guthaben'
|
||||||
|
name: 'Name'
|
||||||
|
price: 'Preis'
|
||||||
|
unit: 'Einheit'
|
||||||
|
unit_missing: 'Fehlende Einheiten'
|
||||||
|
amount: 'Menge'
|
||||||
|
tolerance: 'Toleranz'
|
||||||
|
available: 'Verfügbar'
|
||||||
|
sum: 'Summe'
|
||||||
|
units: 'Gebinde'
|
||||||
|
units_full: 'Volle Gebinde'
|
||||||
|
total_units: 'Gesamt-Einheiten'
|
||||||
|
total_tolerance: 'Gesamt-Toleranz'
|
||||||
|
manufacturer: 'Hersteller'
|
||||||
|
total_sum_amount: 'Gesamtbetrag'
|
||||||
|
available_funds: 'Verfügbares Guthaben'
|
||||||
|
new_funds: 'Neuer Kontostand'
|
||||||
|
action_save: 'Bestellung speichern'
|
||||||
|
cancel: 'abbrechen'
|
||||||
|
index:
|
||||||
|
title: 'Bestellüberblick'
|
||||||
|
funds:
|
||||||
|
title: 'Guthaben'
|
||||||
|
account_balance: 'Kontostand'
|
||||||
|
open_orders: 'laufende Bestellungen'
|
||||||
|
finished_orders: 'nicht abgerechnete Bestellungen'
|
||||||
|
available_funds: 'verfügbares Guthaben'
|
||||||
|
finished_orders:
|
||||||
|
title: 'Nicht abgerechnete Bestellungen'
|
||||||
|
total_sum: 'Gesamtsumme'
|
||||||
|
closed_orders:
|
||||||
|
title: 'Abgerechnete Bestellungen'
|
||||||
|
more: 'mehr...'
|
||||||
|
order:
|
||||||
|
title: 'Artikel'
|
||||||
|
# other fields reference group_orders.form
|
||||||
|
orders: &orders
|
||||||
|
supplier: 'Lieferantin'
|
||||||
|
ending: 'Ende'
|
||||||
|
sum: 'Summe'
|
||||||
|
show:
|
||||||
|
<<: *orders
|
||||||
|
title: 'Dein Bestellergebnis für %{order}'
|
||||||
|
note: 'Notiz'
|
||||||
|
order_sum: 'Bestellsumme'
|
||||||
|
not_ordered: 'Du hast nicht bestellt.'
|
||||||
|
closed_by: 'Abgerechnet von %{user}'
|
||||||
|
comment: 'Kommentare lesen/schreiben'
|
||||||
|
articles:
|
||||||
|
title: 'Artikelübersicht'
|
||||||
|
show_hide: 'Zeige/Verstecke nicht bestellte Artikel'
|
||||||
|
edit_order: 'Bestellung anpassen'
|
||||||
|
name: 'Name'
|
||||||
|
units: 'Gebinde'
|
||||||
|
unit_price: 'Einzelpreis'
|
||||||
|
ordered: 'Bestellt'
|
||||||
|
ordered_title: 'Menge + Toleranz'
|
||||||
|
order_open: 'Zu Erhalten'
|
||||||
|
order_not_open: 'Erhalten'
|
||||||
|
order_nopen_title: 'Unter Berücksichtigung der derzeitigen Bestellungen aller Gruppen'
|
||||||
|
total_price: 'Gesamtpreis'
|
||||||
|
sum: 'Summe'
|
||||||
|
not_ordered_msg: 'Du hast noch nicht bestellt'
|
||||||
|
order_now: 'Das ist Deine Chance!'
|
||||||
|
order_closed_msg: 'Die Bestellung is leider schon zu Ende. Beim nächsten mal früher aufstehen...'
|
||||||
|
comments:
|
||||||
|
title: 'Kommentare'
|
||||||
|
switch_order:
|
||||||
|
title: 'Laufende Bestellungen'
|
||||||
|
remaining: 'noch %{remaining}'
|
||||||
|
|
||||||
|
# used by controller
|
||||||
|
create: &create
|
||||||
|
notice: 'Die Bestellung wurde gespeichert.'
|
||||||
|
error_stale: 'In der Zwischenzeit hat jemand anderes auch bestellt, daher konnte die Bestellung nicht aktualisiert werden.'
|
||||||
|
error_general: 'Die Bestellung konnte nicht aktualisiert werden, da ein Fehler auftrat.'
|
||||||
|
update:
|
||||||
|
<<: *create
|
||||||
|
errors:
|
||||||
|
no_member: 'Du bist kein Mitglieder einer Bestellgruppe.'
|
||||||
|
closed: 'Diese Bestellung ist bereits abgeschlossen.'
|
||||||
|
notfound: 'Fehlerhafte URL, das ist nicht Deine Bestellung.'
|
Loading…
Reference in a new issue