From 785541e438974c98bfa05e7d98326e8816b0e37d Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 28 Nov 2017 14:16:25 +0630
Subject: [PATCH 1/2] change report filter UI and check focus for datepicker

---
 app/assets/javascripts/application.js         |  2 +-
 .../_commission_report_filter.html.erb        | 30 +++++++++----------
 .../_shift_sale_report_filter.html.erb        |  6 ++--
 .../_shift_sale_report_filter.html.erb        |  6 ++--
 .../_shift_sale_report_filter.html.erb        |  6 ++--
 .../_shift_sale_report_filter.html.erb        |  6 ++--
 .../_stock_check_report_filter.html.erb       |  4 +--
 .../_shift_sale_report_filter.html.erb        |  6 ++--
 8 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 249a933f..cc1317a5 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -107,7 +107,7 @@ $(document).ready(function() {
     }
   });
 
-  $('form:first *:input[type!=hidden]:first').focus();
+  $('form:first *input[data-behaviour!=datepicker]:input[type!=hidden]:first').focus();
 
 // $(document).on("focus", "[data-behaviour~='datepicker']", function(e){
 //   $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true});
diff --git a/app/views/reports/commission/_commission_report_filter.html.erb b/app/views/reports/commission/_commission_report_filter.html.erb
index 0e2f71f8..d7d41eb6 100755
--- a/app/views/reports/commission/_commission_report_filter.html.erb
+++ b/app/views/reports/commission/_commission_report_filter.html.erb
@@ -1,7 +1,7 @@
 <div class="p-l-15">
-<%= form_tag report_path, :method => :get, :id => "frm_report", :class => "form" do %>
+  <%= form_tag report_path, :method => :get, :id => "frm_report", :class => "form" do %>
   <% if period_type != false %>
-    <div class="row">
+  <div class="row">
 
         <!-- <div class="col-lg-2 col-md-2 col-sm-2">
           <label class="">Select Date Range</label>
@@ -12,17 +12,17 @@
           <% end %>
         </div> -->
         <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 m-t-3" name="from" id="from" type="text" placeholder="From date">
-      </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 m-t-3" name="to" id="to" type="text" placeholder="To date">
-      </div>
+          <!-- <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 m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 34px;">
+        </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 m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 34px;">
+        </div>
         <div class="col-lg-2 col-md-2 col-sm-2">
           <label class="font-14"><%= t :commissioner %></label>
-          <select class="form-control" name="commissioner" id="commissioner">
+          <select class="form-control" name="commissioner" id="commissioner" style="height: 37px;">
             <option value=""></option>
             <% @commissioner.each do |c| %>
             <% if @com_id == c.id %>
@@ -34,16 +34,16 @@
           </select>
         </div>
         <div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
-        <br>
+          <br>
           <input type="submit" value="Generate Report" class='btn btn-info wave-effects'>
         </div>
         <!-- <div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
           <input type="button" value="Clear Filter" id="clear_filter" class='btn btn-danger'>
         </div> -->
+      </div>
+      <% end %>
+      <% end %>
     </div>
-  <% end %>
-<% end %>
-</div>
 <!-- <script type="text/javascript">
 
     $(document).ready(function () {
diff --git a/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb b/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb
index 6fb6dbf9..bcf12b6b 100755
--- a/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb
@@ -22,15 +22,15 @@
 				<div class="form-group col-md-2">					
 					<!-- <label class="">Select Shift Period</label> -->
 					<label class="font-20">From</label>
-					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
+					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 34px;">
 				</div>
 				<div class="form-group col-md-2">
 					<label class="font-20">To</label>
-					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
+					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 34px;">
 				</div>
 				<div class="form-group col-md-3">
 					<label class="font-20">All Shift</label>
-					<select class="form-control select" name="shift_name" id="shift_name" >
+					<select class="form-control select" name="shift_name" id="shift_name" style="height: 37px;">
 					</select>
 				</div>
 				<div class="form-group col-md-1 ">
diff --git a/app/views/reports/payment_method/_shift_sale_report_filter.html.erb b/app/views/reports/payment_method/_shift_sale_report_filter.html.erb
index 3a7f93c3..30463ed2 100755
--- a/app/views/reports/payment_method/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/payment_method/_shift_sale_report_filter.html.erb
@@ -27,15 +27,15 @@
 		<div class="col-lg-2 col-md-2 col-sm-2">					
 			<!-- <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 m-t-3 from" name="from" id="from" type="text" placeholder="From date">
+			<input data-behaviour='datepicker' class="form-control datepicker m-t-3 from" name="from" id="from" type="text" placeholder="From date" style="height: 34px;">
 		</div>
 		<div class="col-lg-2 col-md-2 col-sm-2">
 			<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
-			<input data-behaviour='datepicker' class="form-control datepicker m-t-3 to" name="to" id="to" type="text" placeholder="To date">
+			<input data-behaviour='datepicker' class="form-control datepicker m-t-3 to" name="to" id="to" type="text" placeholder="To date" style="height: 34px;">
 		</div>
 		<div class="col-lg-2 col-md-2 col-sm-2">
 			<label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label>
-			<select class="form-control select" name="shift_name" id="shift_name" >
+			<select class="form-control select" name="shift_name" id="shift_name" style="height: 37px;" >
 			</select>
 		</div>
 		<div class="col-lg-1 col-md-1 col-sm-1 margin-top-20">
diff --git a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
index d791852f..2534eba0 100755
--- a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
@@ -27,15 +27,15 @@
 		<div class="col-lg-2 col-md-2 col-sm-2">					
 			<!-- <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 m-t-3" name="from" id="from" type="text" placeholder="From date">
+			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 33.5px;">
 		</div>
 		<div class="col-lg-2 col-md-2 col-sm-2">
 			<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
-			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
+			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 33.5;">
 		</div>
 		<div class="col-lg-2 col-md-2 col-sm-2">
 			<label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label>
-			<select class="form-control select" name="shift_name" id="shift_name" >
+			<select class="form-control select" name="shift_name" id="shift_name" style="height: 36px;" >
 			</select>
 		</div>
 		<div class="col-lg-1 col-md-1 col-sm-1 margin-top-20">
diff --git a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
index 34b324a6..8e6a87a0 100755
--- a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
@@ -21,15 +21,15 @@
 				<div class="col-lg-3 col-md-3 col-sm-3">					
 					<!-- <label class="font-14">Select Shift Period</label> -->
 					<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
-					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
+					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 34px;">
 				</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 m-t-3" name="to" id="to" type="text" placeholder="To date">
+					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 34px;">
 				</div>
 				<div class="col-lg-2 col-md-2 col-sm-2">
 					<label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label>
-					<select class="form-control select" name="shift_name" id="shift_name" >
+					<select class="form-control select" name="shift_name" id="shift_name" style="height: 37px;" >
 					</select>
 				</div>
 				<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20"><br>
diff --git a/app/views/reports/stock_check/_stock_check_report_filter.html.erb b/app/views/reports/stock_check/_stock_check_report_filter.html.erb
index b7bb304d..a058d442 100755
--- a/app/views/reports/stock_check/_stock_check_report_filter.html.erb
+++ b/app/views/reports/stock_check/_stock_check_report_filter.html.erb
@@ -14,11 +14,11 @@
             <div class="col-lg-3 col-md-3 col-sm-3">          
                 <!-- <label class="">Select Shift Period</label> -->
                 <label class="font-14">From</label>
-                <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
+                <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 35px;">
             </div>
             <div class="col-lg-3 col-md-3 col-sm-3">
                 <label class="font-14">To</label>
-                <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
+                <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 35px;">
             </div>
             <div class="form-group col-md-4">
                 <label class="font-14">Definition Item</label>
diff --git a/app/views/reports/void_sale/_shift_sale_report_filter.html.erb b/app/views/reports/void_sale/_shift_sale_report_filter.html.erb
index 46bf04eb..94c8a012 100755
--- a/app/views/reports/void_sale/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/void_sale/_shift_sale_report_filter.html.erb
@@ -22,15 +22,15 @@
 			<div class="form-group col-lg-2 col-md-2 col-sm-2">					
 				<!-- <label class="">Select Shift Period</label> -->
 				<label class="font-20"><%= t("views.right_panel.detail.from") %></label>
-				<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
+				<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 34px;">
 			</div>
 			<div class="form-group col-lg-2 col-md-2 col-sm-2">
 				<label class="font-20"><%= t("views.right_panel.detail.to") %></label>
-				<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
+				<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 34px;">
 			</div>
 			<div class="form-group col-lg-3 col-md-3 col-sm-3">
 				<label class="font-20"><%= t("views.right_panel.detail.all_shift") %></label>
-				<select class="form-control select" name="shift_name" id="shift_name" >
+				<select class="form-control select" name="shift_name" id="shift_name" style="height: 37px;">
 				</select>
 			</div>
 			<div class=" col-lg-1 col-md-1 col-sm-1 margin-top-20">

From f669101d3cd79397626f5dfb6a406f0c776545a1 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 28 Nov 2017 14:57:18 +0630
Subject: [PATCH 2/2] remove blank in collection select for menu item and menu
 item instance

---
 app/views/settings/menu_item_instances/_form.html.erb | 2 +-
 app/views/settings/set_menu_items/_form.html.erb      | 2 +-
 app/views/settings/simple_menu_items/_form.html.erb   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/settings/menu_item_instances/_form.html.erb b/app/views/settings/menu_item_instances/_form.html.erb
index ceadea31..58c82852 100755
--- a/app/views/settings/menu_item_instances/_form.html.erb
+++ b/app/views/settings/menu_item_instances/_form.html.erb
@@ -11,7 +11,7 @@
             <%= f.input :item_instance_name %>
             <%= f.input :price %>
 
-            <%= f.input :item_attributes, collection: @item.item_attributes%>
+            <%= f.input :item_attributes, collection: @item.item_attributes, include_blank: false, include_hidden: false%>
 
             <%= f.input :is_on_promotion %>
             <%= f.input :promotion_price %>      
diff --git a/app/views/settings/set_menu_items/_form.html.erb b/app/views/settings/set_menu_items/_form.html.erb
index 21e86e85..4b7d570e 100755
--- a/app/views/settings/set_menu_items/_form.html.erb
+++ b/app/views/settings/set_menu_items/_form.html.erb
@@ -10,7 +10,7 @@
           <%= 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, :collection => ["SimpleMenuItem","SetMenuItem"], :input_html => {:class => "col-md-9"},:input_html => {:class => "col-md-9"} %>
+          <%= f.input :type, :collection => ["SimpleMenuItem","SetMenuItem"], :input_html => {:class => "col-md-9"},:input_html => {:class => "col-md-9"}, include_blank: false, include_hidden: false %>
           <%= 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"} %> 
 
diff --git a/app/views/settings/simple_menu_items/_form.html.erb b/app/views/settings/simple_menu_items/_form.html.erb
index 4e953ccd..7fd4b353 100755
--- a/app/views/settings/simple_menu_items/_form.html.erb
+++ b/app/views/settings/simple_menu_items/_form.html.erb
@@ -10,7 +10,7 @@
               <%= 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, :collection => ["SimpleMenuItem","SetMenuItem"], :input_html => {:class => "col-md-9"} %>
+              <%= f.input :type, :collection => ["SimpleMenuItem","SetMenuItem"], :input_html => {:class => "col-md-9"}, include_blank: false, include_hidden: false %>
               <%= 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"} %>