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

Add pickup date to order select box in Messages#new

Browse source
This commit is contained in:
Patrick Gansterer 2019-11-15 21:03:19 +01:00
parent 5b04b65cd8
commit 7fcfd75fe3
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/messages/app/views/messages/new.haml
View file

@ -104,7 +104,8 @@
#messagegroup #messagegroup
= f.input :messagegroup_id, :as => :select, include_blank: false, :collection => Messagegroup.undeleted.order(:name) = f.input :messagegroup_id, :as => :select, include_blank: false, :collection => Messagegroup.undeleted.order(:name)
#order #order
= f.input :order_id, :as => :select, include_blank: false, :collection => Order.finished_not_closed.order('pickup DESC').includes(:supplier).limit(25) = f.input :order_id, :as => :select, include_blank: false, :collection => Order.finished_not_closed.order('pickup DESC').includes(:supplier).limit(25),
:label_method => ->(obj){ t('.order_item', supplier_name: obj.supplier.name, pickup: format_date(obj.pickup)) }, :input_html => {class: 'input-xxlarge'}
#recipients #recipients
= f.input :recipient_tokens, :input_html => { 'data-pre' => User.where(id: @message.recipients_ids).map(&:token_attributes).to_json } = f.input :recipient_tokens, :input_html => { 'data-pre' => User.where(id: @message.recipients_ids).map(&:token_attributes).to_json }
= f.input :private, inline_label: t('.hint_private') = f.input :private, inline_label: t('.hint_private')

1
plugins/messages/config/locales/de.yml
View file

@ -92,6 +92,7 @@ de:
wiki: Wiki (Abschnitt Mailing-Liste) wiki: Wiki (Abschnitt Mailing-Liste)
message: Nachricht message: Nachricht
no_user_found: Kein/e Benutzer/in gefunden no_user_found: Kein/e Benutzer/in gefunden
order_item: "%{supplier_name} (Abholung: %{pickup})"
reply_to: Diese Nachricht ist eine Antwort auf eine andere %{link}. reply_to: Diese Nachricht ist eine Antwort auf eine andere %{link}.
search: Suche ... search: Suche ...
search_user: Nach Bernutzer/in suchen search_user: Nach Bernutzer/in suchen

1
plugins/messages/config/locales/en.yml
View file

@ -97,6 +97,7 @@ en:
wiki: Wiki (page Mailing-List) wiki: Wiki (page Mailing-List)
message: message message: message
no_user_found: No user found no_user_found: No user found
order_item: "%{supplier_name} (Pickup: %{pickup})"
reply_to: This message is an reply to an other %{link}. reply_to: This message is an reply to an other %{link}.
search: Search ... search: Search ...
search_user: Search user search_user: Search user