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

Let current_order plugin play nicer with stock articles

This commit is contained in:
wvengen 2016-06-07 00:37:00 +02:00
parent f08d131842
commit 0c9d20e01c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/current_orders/app/views/current_orders/articles/_article_info.html.haml
View File

@ -5,11 +5,11 @@
-# @todo unduplicate from group_orders's order_article_info -# @todo unduplicate from group_orders's order_article_info
%p %p
- if order_article.article.manufacturer.blank? - if order_article.article.manufacturer.blank?
= raw t '.supplied_by', supplier: content_tag(:em, supplier_link(order_article.article.supplier)) = raw t '.supplied_by', supplier: content_tag(:em, supplier_link(order_article.order))
- elsif order_article.article.supplier.name == order_article.article.manufacturer - elsif order_article.article.supplier && order_article.article.supplier.name == order_article.article.manufacturer
= raw t '.supplied_and_made_by', manufacturer: content_tag(:em, supplier_link(order_article.article.supplier)) = raw t '.supplied_and_made_by', manufacturer: content_tag(:em, supplier_link(order_article.order))
- else - else
= raw t '.supplied_by_made_by', supplier: content_tag(:em, supplier_link(order_article.article.supplier)), manufacturer: content_tag(:em, order_article.article.manufacturer) = raw t '.supplied_by_made_by', supplier: content_tag(:em, supplier_link(order_article.order)), manufacturer: content_tag(:em, order_article.article.manufacturer)
- unless order_article.article.origin.blank? - unless order_article.article.origin.blank?
= raw t '.origin_in', origin: content_tag(:em, order_article.article.origin) = raw t '.origin_in', origin: content_tag(:em, order_article.article.origin)