From 0aa853c53d95d6f616130f3dc371f4213c8e6c99 Mon Sep 17 00:00:00 2001 From: Patrick Gansterer Date: Mon, 22 Jun 2020 16:25:20 +0200 Subject: [PATCH] Add information text to the receive view --- app/views/orders/receive.html.haml | 4 +++- config/locales/de.yml | 1 + config/locales/en.yml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/orders/receive.html.haml b/app/views/orders/receive.html.haml index 53105abd..c1f20538 100644 --- a/app/views/orders/receive.html.haml +++ b/app/views/orders/receive.html.haml @@ -11,7 +11,7 @@ contentType: 'application/json; charset=UTF-8' }); }); - + $(document).on('OrderArticle#create', function(e) { $.ajax({ url: '#{receive_on_order_article_create_order_path(@order)}', @@ -24,6 +24,8 @@ - title t('.title', order: @order.name) +%p!= t('.paragraph') + = form_tag(receive_order_path(@order)) do %fieldset#results = render 'edit_amounts' diff --git a/config/locales/de.yml b/config/locales/de.yml index e1af2c8b..7616e18a 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1384,6 +1384,7 @@ de: consider_member_tolerance: Toleranz berücksichtigen notice: 'Bestellung in Empfang genommen: %{msg}' notice_none: Keine neuen Artikel für den Empfang ausgewählt. + paragraph: Wenn die Bestellmenge mit der Liefermenge übereinstimmt, können die entsprechenden Felder frei gelassen werden. Es empfiehlt sich aber dennoch alle Felder auszufüllen, da daurch einfach nachvollziebar ist ob alle Mengen kontrolliert wurden. rest_to_stock: Rest ins Lager submit: Bestellung in Empfang nehmen surplus_options: 'Verteilungsoptionen:' diff --git a/config/locales/en.yml b/config/locales/en.yml index 0011926d..24008622 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1429,6 +1429,7 @@ en: consider_member_tolerance: consider tolerance notice: 'Order received: %{msg}' notice_none: No new articles to receive + paragraph: If the ordered and reveived amount are the same, the corresponding fields can be empty. It's still good practice to all fields, since this provieds an easy way to check if all articles have been checked. rest_to_stock: rest to stock submit: Receive order surplus_options: 'Distribution options:'