From 6a4acb71e81d7ab0d840df9d8ebeceae35080fe1 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 23 Nov 2017 18:24:01 +0630
Subject: [PATCH] change UI for promotions

---
 app/views/settings/promotions/_form.html.erb | 16 ++++++++--------
 app/views/settings/promotions/index.html.erb | 20 +++++++++++---------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb
index 979f129a..6150eff8 100755
--- a/app/views/settings/promotions/_form.html.erb
+++ b/app/views/settings/promotions/_form.html.erb
@@ -148,11 +148,11 @@
             <div class="card">
               <div class="p-l-25 p-t-10 ">
                 <div class="row">
-                  <div class="col-md-2 p-t-10">Item Code</div>
-                  <div class="col-md-2 p-t-10">Item Instance</div>
-                  <div class="col-md-2 p-t-10">Qualified Qty</div>
+                  <div class="col-md-3 p-t-10">Item Code</div>
+                  <div class="col-md-3 p-t-10">Item Instance</div>
+                  <div class="col-md-1 p-t-10">Qty</div>
                   <div class="col-md-1 p-t-10">Net off</div>
-                  <div class="col-md-2 p-t-10">Net Price</div>
+                  <div class="col-md-1 p-t-10">Net Price</div>
                   <div class="col-md-2 p-t-10">Percentage</div>
                   <div class="col-md-1 p-t-10"></div>
                 </div>
@@ -164,7 +164,7 @@
                     <% Product.order("name desc").pluck(:name,:item_code).each do |p| %>
                     <% arr.push(p) %>
                     <% end %>
-                    <div class="col-md-2 menu_item_choose form-group">
+                    <div class="col-md-3 menu_item_choose form-group">
                       <select class="form-control item_code_place1">
                         <option value="">Choose Something</option>
                         <% arr.each do |a| %>
@@ -174,17 +174,17 @@
                     </div>
                     <!-- <% sample = [] %> -->
 
-                    <div class="col-md-2">
+                    <div class="col-md-3">
                       <%= pro.input :item_code, :class => 'promoproduct', collection:[],input_html: { selected: 2 }, label: false %>
                     </div>
 
-                    <div class="col-md-2">
+                    <div class="col-md-1">
                       <%= pro.input :min_qty , label: false, :input_html => {:style => 'height: 37px'}%>
                     </div>
                     <div class="col-md-1">
                       <%= pro.input :net_off , label: false, :input_html => {:style => 'height: 37px'} %>
                     </div>
-                    <div class="col-md-2"><%= pro.input :net_price , label: false, :input_html => {:style => 'height: 37px'} %></div>
+                    <div class="col-md-1"><%= pro.input :net_price , label: false, :input_html => {:style => 'height: 37px'} %></div>
                     <div class="col-md-2"><%= pro.input :percentage , label: false, :input_html => {:style => 'height: 37px'} %></div>
                     <div class="col-md-1"><%= pro.link_to_remove "X" ,:class=>"btn-primary btn m-r-45", :style => 'width: 25px'%></div>
                   </div>
diff --git a/app/views/settings/promotions/index.html.erb b/app/views/settings/promotions/index.html.erb
index 54210902..d2f896fd 100755
--- a/app/views/settings/promotions/index.html.erb
+++ b/app/views/settings/promotions/index.html.erb
@@ -43,19 +43,21 @@
             <td>
               <% item = MenuItemInstance.find_by_item_instance_code(pro.original_product)%>
               <% if item.nil? %>
-              <%= Product.find_by_item_code(pro.original_product).name rescue "-" %>
+                <%= Product.find_by_item_code(pro.original_product).name rescue "-" %>
               <% else %>
-              <%= item.menu_item.name rescue "-" %>
-              - <%= item.item_instance_name rescue "-" %>
+                <%= item.menu_item.name rescue "-" %>
+                - <%= item.item_instance_name rescue "-" %>
+              <% end %>
+            </td>
+            <td style="padding: 2px">
+              <% if Employee.exists?(pro.created_by) %>
+                <%= Employee.find(pro.created_by).name %>
+              <% else %>
+                <%= pro.created_by %>
               <% end %>
             </td>
-            <% if Employee.exists?(pro.created_by) %>
-            <td><%= Employee.find(pro.created_by).name %></td>
-            <% else %>
-            <td><%= pro.created_by %></td>
-            <% end %>
             <td><%= pro.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
-            <td><%= link_to t("views.btn.edit"), edit_settings_promotion_path(pro),:class => 'btn btn-info btn-sm waves-effect' %>
+            <td><%= link_to t("views.btn.edit"), edit_settings_promotion_path(pro),:class => 'btn btn-primary btn-sm waves-effect' %>
             </td>
           </tr>
           <% end %>