From 0c9d20e01c93f2960131150b81261c49aa7cd7aa Mon Sep 17 00:00:00 2001 From: wvengen Date: Tue, 7 Jun 2016 00:37:00 +0200 Subject: [PATCH] Let current_order plugin play nicer with stock articles --- .../views/current_orders/articles/_article_info.html.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/current_orders/app/views/current_orders/articles/_article_info.html.haml b/plugins/current_orders/app/views/current_orders/articles/_article_info.html.haml index b74bf45c..6b2f0f4c 100644 --- a/plugins/current_orders/app/views/current_orders/articles/_article_info.html.haml +++ b/plugins/current_orders/app/views/current_orders/articles/_article_info.html.haml @@ -5,11 +5,11 @@ -# @todo unduplicate from group_orders's order_article_info %p - if order_article.article.manufacturer.blank? - = raw t '.supplied_by', supplier: content_tag(:em, supplier_link(order_article.article.supplier)) - - elsif 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_by', supplier: content_tag(:em, supplier_link(order_article.order)) + - 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.order)) - 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? = raw t '.origin_in', origin: content_tag(:em, order_article.article.origin)