Add pickup date to order_result message
This commit is contained in:
parent
341f86d98e
commit
f15ca8610b
6 changed files with 18 additions and 6 deletions
|
@ -1,5 +1,8 @@
|
||||||
= raw t '.text0', ordergroup: @group_order.ordergroup_name, order: @order.name, when: I18n.l(@order.ends), user: show_user(@order.updated_by)
|
= raw t '.text0', ordergroup: @group_order.ordergroup_name, order: @order.name, when: I18n.l(@order.ends), user: show_user(@order.updated_by)
|
||||||
|
- if @order.pickup
|
||||||
|
= raw t '.text1', pickup: I18n.l(@order.pickup)
|
||||||
|
= raw t '.text2'
|
||||||
- for group_order_article in @group_order.group_order_articles.ordered.includes(:order_article)
|
- for group_order_article in @group_order.group_order_articles.ordered.includes(:order_article)
|
||||||
- article = group_order_article.order_article.article
|
- article = group_order_article.order_article.article
|
||||||
\- #{article.name}: #{group_order_article.result} x #{article.unit} = #{group_order_article.result * article.fc_price}
|
\- #{article.name}: #{group_order_article.result} x #{article.unit} = #{group_order_article.result * article.fc_price}
|
||||||
= raw t '.text1', sum: @group_order.price, order_url: group_order_url(@group_order), foodcoop: FoodsoftConfig[:name]
|
= raw t '.text3', sum: @group_order.price, order_url: group_order_url(@group_order), foodcoop: FoodsoftConfig[:name]
|
||||||
|
|
|
@ -1183,8 +1183,11 @@ de:
|
||||||
Liebe Bestellgruppe %{ordergroup},
|
Liebe Bestellgruppe %{ordergroup},
|
||||||
|
|
||||||
die Bestellung für "%{order}" wurde am %{when} von %{user} beendet.
|
die Bestellung für "%{order}" wurde am %{when} von %{user} beendet.
|
||||||
|
text1: |
|
||||||
|
Sie kann voraussichtlich am %{pickup} abgeholt werden.
|
||||||
|
text2: |
|
||||||
Für euch wurden die folgenden Artikel bestellt:
|
Für euch wurden die folgenden Artikel bestellt:
|
||||||
text1: |-
|
text3: |-
|
||||||
o Gesamtpreis: %{sum}
|
o Gesamtpreis: %{sum}
|
||||||
|
|
||||||
Bestellung online einsehen: %{order_url}
|
Bestellung online einsehen: %{order_url}
|
||||||
|
|
|
@ -1225,8 +1225,11 @@ en:
|
||||||
Dear %{ordergroup},
|
Dear %{ordergroup},
|
||||||
|
|
||||||
The order for "%{order}" has been closed by %{user} on %{when}.
|
The order for "%{order}" has been closed by %{user} on %{when}.
|
||||||
|
text1: |
|
||||||
|
It can be presumable be picked up on %{pickup}.
|
||||||
|
text2: |
|
||||||
The following articles have been ordered for your ordergroup:
|
The following articles have been ordered for your ordergroup:
|
||||||
text1: |-
|
text3: |-
|
||||||
o Total sum: %{sum}
|
o Total sum: %{sum}
|
||||||
|
|
||||||
You can view the order online: %{order_url}
|
You can view the order online: %{order_url}
|
||||||
|
|
|
@ -1056,8 +1056,9 @@ es:
|
||||||
Queridos miebros de %{ordergroup},
|
Queridos miebros de %{ordergroup},
|
||||||
|
|
||||||
El pedido de "%{order}" ha sido cerrado por %{user} en %{when}.
|
El pedido de "%{order}" ha sido cerrado por %{user} en %{when}.
|
||||||
|
text2: |
|
||||||
Los siguientes artículos se han pedido para tu grupo de pedido:
|
Los siguientes artículos se han pedido para tu grupo de pedido:
|
||||||
text1: |-
|
text3: |-
|
||||||
o Suma total: %{sum}
|
o Suma total: %{sum}
|
||||||
|
|
||||||
Puedes ver el pedido online: %{order_url}
|
Puedes ver el pedido online: %{order_url}
|
||||||
|
|
|
@ -897,8 +897,9 @@ fr:
|
||||||
CherEs %{ordergroup},
|
CherEs %{ordergroup},
|
||||||
|
|
||||||
La commande pour "%{order}" a été finalisée le %{when} par %{user}.
|
La commande pour "%{order}" a été finalisée le %{when} par %{user}.
|
||||||
|
text2: |
|
||||||
Voilà la liste des produits qui ont été commandés pour vous:
|
Voilà la liste des produits qui ont été commandés pour vous:
|
||||||
text1: |-
|
text3: |-
|
||||||
Prix total: %{sum}
|
Prix total: %{sum}
|
||||||
Afficher sur le site: %{order_url}
|
Afficher sur le site: %{order_url}
|
||||||
|
|
||||||
|
|
|
@ -1148,8 +1148,9 @@ nl:
|
||||||
Beste %{ordergroup}.
|
Beste %{ordergroup}.
|
||||||
|
|
||||||
De bestelling voor "%{order}" is om %{when} gesloten door %{user}.
|
De bestelling voor "%{order}" is om %{when} gesloten door %{user}.
|
||||||
|
text2: |
|
||||||
De volgende artikelen zijn voor jouw huishouden besteld:
|
De volgende artikelen zijn voor jouw huishouden besteld:
|
||||||
text1: |-
|
text3: |-
|
||||||
o Totaal: %{sum}
|
o Totaal: %{sum}
|
||||||
|
|
||||||
Je kunt de bestelling online bekijken: %{order_url}
|
Je kunt de bestelling online bekijken: %{order_url}
|
||||||
|
|
Loading…
Reference in a new issue