Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

app/controllers/settings/menus_controller.rb

@@ -167,6 +167,6 @@ class Settings::MenusController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_menu_params
-        params.require(:menu).permit(:name, :is_active, :valid_days, :valid_time_to, :valid_time_from)
+        params.require(:menu).permit(:name, :is_active, :is_ordering, :valid_days, :valid_time_to, :valid_time_from)
     end
 end

app/views/settings/menus/_form.html.erb

@@ -8,6 +8,7 @@
         <div class="form-inputs p-l-25">
           <%= f.input :name,:input_html=>{:class=>"col-md-9"} %>
           <%= f.input :is_active,:input_html=>{:class=>"col-md-9"} %>
+          <%= f.input :is_ordering,:input_html=>{:class=>"col-md-9"} %>
           <div class="row checkboxes ">
                  <div class="col-md-2">
                   <label class="control-label"><abbr title="required">*</abbr> Valid Day</label>