From dd19b52ebd31231ae9ccd181bf4361fb5b5df242 Mon Sep 17 00:00:00 2001
From: Phyo <phyo.theingi@code2lab.com>
Date: Thu, 31 Aug 2017 14:03:43 +0630
Subject: [PATCH] Promotion Index View Change

---
 app/views/settings/promotions/index.html.erb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/views/settings/promotions/index.html.erb b/app/views/settings/promotions/index.html.erb
index b0cfd599..3274fae1 100644
--- a/app/views/settings/promotions/index.html.erb
+++ b/app/views/settings/promotions/index.html.erb
@@ -39,7 +39,13 @@
           <td><%= pro.promo_end_hour.utc.strftime("%I:%M %P") rescue "-" %></td>
           <td><%= pro.promo_day %></td>
           <td>
-            <%= MenuItem.find_by_item_code(pro.original_product).name  rescue "-"%>
+            <% item = MenuItemInstance.find_by_item_instance_code(pro.original_product)%>
+            <% if item.nil? %>
+              <%= Product.find_by_item_code(pro.original_product).name rescue "-" %>
+            <% else %>
+              <%= item.menu_item.name rescue "-" %>
+               - <%= item.item_instance_name rescue "-" %>
+            <% end %>
           </td>
           <% if Employee.exists?(pro.created_by) %>
           <td><%= Employee.find(pro.created_by).name %></td>