From 0b374cf3b264084bb89aed5ac74f86252b76bbc2 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 21 Nov 2017 17:41:05 +0630
Subject: [PATCH] change UI for simple menu item, promotion, setting/OQS

---
 app/views/origami/discounts/index.html.erb    |  4 +-
 .../_shift_sale_report_filter.html.erb        |  4 +-
 .../order_queue_stations/index.html.erb       |  8 ++--
 app/views/settings/promotions/_form.html.erb  | 38 ++++++++++---------
 .../settings/simple_menu_items/_form.html.erb |  4 +-
 5 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index 2549849a..bf629616 100755
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -127,7 +127,7 @@
 				<hr />
 				<div class="p-l-20">
 					<div class="row">
-					<div class="col-md-9">
+					<div class="col-md-8">
 						<div class="row bottom">
 							<div class="col-md-3">
 								<div class="fluid cashier_number" data-value="5" data-type="add">5%</div>
@@ -194,7 +194,7 @@
 						</div>
 					</div>
 
-					<div class="col-md-3">
+					<div class="col-md-4">
 						<div class="form-group">
 							<button id="net" class="btn bg-info fluid action-btn">Nett</button>
 							<button id="percentage" class="btn bg-primary fluid action-btn">Percentage</button>	
diff --git a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb
index 7e82f397..e584bbba 100755
--- a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb
@@ -24,11 +24,11 @@
 			<div class="col-lg-3 col-md-3 col-sm-3">					
 				<!-- <label class="">Select Shift Period</label> -->
 				<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
-				<input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date">
+				<input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date" style="height: 37px;">
 			</div>
 			<div class="col-lg-3 col-md-3 col-sm-3">
 				<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
-				<input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date">
+				<input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date" style="height: 37px;">
 			</div>
 			<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
 			    <label></label><br>
diff --git a/app/views/settings/order_queue_stations/index.html.erb b/app/views/settings/order_queue_stations/index.html.erb
index 529020fb..417654be 100755
--- a/app/views/settings/order_queue_stations/index.html.erb
+++ b/app/views/settings/order_queue_stations/index.html.erb
@@ -30,7 +30,7 @@
             <!-- <th>Created by</th> -->
             <th><%= t("views.right_panel.detail.created_at") %></th>
             <!-- <th>Updated  At</th> -->
-            <th><%= t("views.right_panel.detail.actions") %></th>
+            <th colspan="2"><%= t("views.right_panel.detail.actions") %></th>
           </tr>
         </thead>
 
@@ -46,10 +46,10 @@
               <!-- <td><%= settings_order_queue_station.cut_per_item %></td> -->
               <td><%= settings_order_queue_station.use_alternate_name %></td>
               <!-- <td><%= settings_order_queue_station.created_by %></td> -->
-              <td><%= settings_order_queue_station.created_at.strftime("%m-%d-%Y") %></td>
+              <td width="15%"><%= settings_order_queue_station.created_at.strftime("%m-%d-%Y") %></td>
               <!-- <td><%= settings_order_queue_station.updated_at.strftime("%m-%d-%Y") %></td> -->
-              <td>
-                <%= link_to 'Assign Processing Items', new_settings_order_queue_station_processing_item_path(settings_order_queue_station),:class => 'btn btn-success btn-sm waves-effect' %>
+              <td colspan="2">
+                <%= link_to 'Assign Items', new_settings_order_queue_station_processing_item_path(settings_order_queue_station),:class => 'btn btn-success btn-sm waves-effect' %>
                 &nbsp;&nbsp;
                 <%= link_to t("views.btn.edit"), edit_settings_order_queue_station_path(settings_order_queue_station),:class => 'btn btn-info btn-sm waves-effect' %>
                 
diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb
index ab8172f7..23b6589b 100755
--- a/app/views/settings/promotions/_form.html.erb
+++ b/app/views/settings/promotions/_form.html.erb
@@ -128,7 +128,6 @@
                 <% end %>
               <% end %>
             </select>
-
           </div>
 
           <% sample = [] %>
@@ -141,19 +140,19 @@
           <% end %>
           <div class="col-md-3 form-group"><%= f.input :original_product,collection: sample  %></div>
           <!-- <div class="col-md-6"><%= f.input :original_product,collection: MenuItemInstance.order("item_instance_name desc").pluck(:item_instance_name,:item_instance_code),input_html: { selected: 2 } %></div> -->
-          <div class="col-md-6 form-group"><%= f.input :min_qty ,label: "Qualified Qty" %></div>
+          <div class="col-md-6 form-group"><%= f.input :min_qty ,label: "Qualified Qty", :input_html => {:style => 'height: 37px'} %></div>
         </div>
         <br>
             <div class="card">
             <div class="p-l-25 p-t-10 ">
               <div class="row">
-                <div class="col-md-3" style="text-align:">Item Code</div>
-                <div class="col-md-2" style="text-align:">Item Instance</div>
-                <div class="col-md-2" style="text-align:">Qualified Qty</div>
-                <div class="col-md-1" style="text-align:">Net off</div>
-                <div class="col-md-2" style="text-align:">Net Price</div>
-                <div class="col-md-1" style="text-align:">Percentage</div>
-                <div class="col-md-1" style="text-align:"></div>
+                <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-1 p-t-10">Net off</div>
+                <div class="col-md-2 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>
               <div class="row"></div >
               <%= f.fields_for :promotion_products do |pro| %>
@@ -163,7 +162,7 @@
                   <% Product.order("name desc").pluck(:name,:item_code).each do |p| %>
                     <% arr.push(p) %>
                   <% end %>
-                  <div class="col-md-3 menu_item_choose" style="text-align:">
+                  <div class="col-md-2 menu_item_choose form-group">
                     <select class="form-control item_code_place1">
                       <option value="">Choose Something</option>
                       <% arr.each do |a| %>
@@ -173,20 +172,23 @@
                   </div>
                   <!-- <% sample = [] %> -->
 
-                  <div class="col-md-2" style="text-align:">
+                  <div class="col-md-2">
                       <%= pro.input :item_code, :class => 'promoproduct', collection:[],input_html: { selected: 2 }, label: false %>
                   </div>
 
-                  <div class="col-md-2"><%= pro.input :min_qty , label: false%></div>
-                  <div class="col-md-1"><%= pro.input :net_off , label: false %></div>
-                  <div class="col-md-2"><%= pro.input :net_price , label: false %></div>
-                  <div class="col-md-1"><%= pro.input :percentage , label: false %></div>
-                  <div class="col-md-1" style=""><%= pro.link_to_remove "X" ,:class=>"btn-primary btn m-r-25"%></div>
+                  <div class="col-md-2">
+                      <%= 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-2"><%= pro.input :percentage , label: false, :input_html => {:style => 'height: 37px'} %></div>
+                  <div class="col-md-1 p-t-10"><%= pro.link_to_remove "X" ,:class=>"btn-primary btn m-r-25", :style => 'width: 25px'%></div>
               </div>
               <% end %>
               <div class="row">
-                <div class="col-md-12" style="text-align:right;margin-right: 
-                10px;">
+                <div class="col-md-12 align-right m-r-10">
                 <%= f.link_to_add "Add Product", :promotion_products, :class => 'btn bg-teal addProduct m-r-20' %> 
                 </div>
               </div>
diff --git a/app/views/settings/simple_menu_items/_form.html.erb b/app/views/settings/simple_menu_items/_form.html.erb
index e5ca90c1..18518397 100755
--- a/app/views/settings/simple_menu_items/_form.html.erb
+++ b/app/views/settings/simple_menu_items/_form.html.erb
@@ -9,7 +9,9 @@
               <%= f.input :item_code,:input_html => {:class => "col-md-9"} %>
               <%= f.input :name,:input_html => {:class => "col-md-9"} %>
               <%= f.input :alt_name,:input_html => {:class => "col-md-9"} %>
-              <%= f.input :type,:input_html => {:class => "col-md-9"} %>
+              <div style="display: none;">
+                <%= f.input :type,:input_html => {:class => "col-md-9"} %>
+              </div>
               <%= f.input :min_qty,:input_html => {:class => "col-md-9"} %>
               <%= f.input :account_id, :label => "Account type", :collection => Account.collection,:input_html => {:class => "col-md-9"} %>