change UI for all settings module

app/models/menu_category.rb

@@ -6,7 +6,8 @@ class MenuCategory < ApplicationRecord
   belongs_to :parent, :class_name => "MenuCategory", foreign_key: "menu_category_id", optional: true
   has_many :menu_items
 
-  validates_presence_of :name, :menu, :order_by
+  validates_presence_of :code, :name, :menu, :order_by
+  validates_uniqueness_of :code
 
   default_scope { order('order_by asc') }
   scope :active, -> {where("is_available = 1")}

app/models/menu_item.rb

@@ -13,7 +13,8 @@ class MenuItem < ApplicationRecord
   has_many :menu_item_sets
   has_many :item_sets, through: :menu_item_sets
 
-  validates_presence_of :name, :type, :min_qty, :taxable,:account_id
+  validates_presence_of :item_code, :name, :type, :min_qty, :taxable,:account_id
+  validates_uniqueness_of :item_code
   
   default_scope { order('item_code asc') }
 

app/models/menu_item_instance.rb

@@ -4,6 +4,8 @@ class MenuItemInstance < ApplicationRecord
   has_many :menu_instance_item_sets
   has_many :item_sets, through: :menu_instance_item_sets
   # before_create :generate_menu_item_instance_code
+  validates_presence_of :item_instance_code
+  # validates_uniqueness_of :item_instance_code
 
   def self.findParentCategory(item)
     if item.menu_category_id

app/views/print_settings/_form.html.erb

@@ -1,6 +1,8 @@
 
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+    <div class="card">
+      <div class="body">
         <%= simple_form_for(@print_setting) do |f| %>
         <%= f.error_notification %>
 
@@ -24,6 +26,8 @@
         </div>
         <% end %>
       </div>
+    </div>
+  </div>
   <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
     <div class="card">
       <div class="body">

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

@@ -1,5 +1,7 @@
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+  <div class="card">
+    <div class="body">
       <%= simple_form_for([:settings,@settings_account]) do |f| %>
       <%= f.error_notification %>
       <div class="form-inputs p-l-10">
@@ -14,6 +16,8 @@
         <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
       </div>
       <% end %>
+    </div>  
+  </div>
 </div>
 <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
   <div class="card">

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

@@ -1,5 +1,7 @@
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+    <div class="card">
+      <div class="body">
         <%= simple_form_for([:settings, @settings_cashier_terminal]) do |f| %>
         <%= f.error_notification %>
 
@@ -23,6 +25,8 @@
         </div>
       <% end %>
       </div>
+    </div>
+  </div>
  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">

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

@@ -1,10 +1,9 @@
-
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
-     <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
+    <div class="card">
+      <div class="body">
         <%= simple_form_for([:settings, @commissioner]) do |f| %>
         <%= f.error_notification %>
-
         <div class="form-inputs">
           <%= f.input :name %>
           <%= f.label :emp_id, 'Employee' %>
@@ -15,7 +14,6 @@
 
           <%= f.label :commission_id, 'Commission'%>
           <%= f.select :commission_id, Commission.all.map {|l| [l.name, l.id]}, { :include_blank => 'Choose Commission Product', :selected => ''}, {class: 'form-control'} %>
-            
           <br/>
           <%= f.label :joined_date %><br/>
           <%= f.text_field :joined_date, {class: 'form-control datepicker', id: 'joined_date', readonly: true} %><br/>
@@ -30,6 +28,7 @@
        <% end %>
      </div>
    </div>
+ </div>
  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
   <div class="card">
     <div class="body">
@@ -53,5 +52,5 @@
       </p>
     </div>
   </div>  
-  </div>
+</div>
 </div>

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

@@ -1,7 +1,8 @@
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+    <div class="card">
+      <div class="body">
       <div class="p-l-15">
-
           <%= simple_form_for([:settings,@commission]) do |f| %>
           <%= f.error_notification %>
 
@@ -18,8 +19,10 @@
         <%= f.submit 'Submit', class: 'btn btn-primary wave-effects' %>
       </div>
       <% end %>
-
     </div>
+  </div>
+</div>
+
 </div>
 <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
   <div class="card">

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

@@ -1,5 +1,7 @@
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+    <div class="card">
+      <div class="body">
         <%= simple_form_for([:settings,@employee]) do |f| %>
         <%= f.error_notification %>
 
@@ -14,7 +16,9 @@
         <div class="form-actions p-l-15">
            <%= f.submit t('views.btn.submit'),:class => 'btn btn-primary btn-lg waves-effect' %>
         </div>
-<% end %>
+        <% end %>
+      </div>
+    </div>
   </div>
  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">

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

@@ -2,6 +2,8 @@
 
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+    <div class="card">
+      <div class="body">
         <%= simple_form_for([:settings,@settings_item_set]) do |f| %>
         <%= f.error_notification %>
 
@@ -15,7 +17,9 @@
         <div class="form-actions p-l-15">
            <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
         </div>
-<% end %>
+        <% end %>
+      </div>
+    </div>
   </div>
  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">

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

@@ -1,5 +1,7 @@
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+    <div class="card">
+      <div class="body">
         <%= simple_form_for([:settings, @settings_menu_category]) do |f| %>
         <%= f.error_notification %>
 
@@ -18,6 +20,8 @@
         </div>
         <% end %>
       </div>
+    </div>
+  </div>
   <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">

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

@@ -1,5 +1,7 @@
 <div class="row">
 	<div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+		<div class="card">
+			<div class="body">
 				<%= simple_form_for([:settings, @settings_menu_item_attribute]) do |f| %>
 				<%= f.error_notification %>
 
@@ -14,6 +16,8 @@
 				</div>
 				<% end %>
 			</div>
+		</div>
+	</div>
 	<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
 		<div class="card">
 			<div class="body">

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

@@ -1,8 +1,8 @@
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
-
+    <div class="card">
+      <div class="body">
         <%= simple_form_for([:settings,@item, @settings_menu_item_instances]) do |f| %>
-
         <%= f.error_notification %>
 
         <div class="col-md- panel">
@@ -15,12 +15,7 @@
 
             <%= f.input :is_on_promotion %>
             <%= f.input :promotion_price %>      
-      </div>
-    </div>
           
-    <div class="col-md-">
-      <div class="panel padding-10">
-        <div class="form-group">
             <%= f.input :is_available %>
             <%= f.input :is_default %>
 
@@ -31,9 +26,10 @@
           <div class="form-actions p-l-15">
              <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
           </div>
-    </div>
         <% end %>
         </div>
+      </div>
+    </div>
   <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">

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

@@ -1,5 +1,7 @@
 <div class="row">
 	<div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+		<div class="card">
+			<div class="body">
 				<%= simple_form_for([:settings, @settings_menu_item_option]) do |f| %>
 				<%= f.error_notification %>
 
@@ -15,6 +17,8 @@
 				</div>
 				<% end %>
 			</div>
+		</div>
+	</div>
 	<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
 		<div class="card">
 			<div class="body">

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

@@ -1,5 +1,7 @@
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+    <div class="card">
+      <div class="body">
         <%= simple_form_for([:settings,@settings_menu]) do |f| %>
         <%= f.error_notification %>
 
@@ -41,6 +43,8 @@
         </div>
         <% end %>
       </div>
+    </div>  
+  </div>
   <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">

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

@@ -7,6 +7,8 @@ div.form-inputs span{
 
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+    <div class="card">
+      <div class="body">
         <%= simple_form_for([:settings,@settings_order_queue_station]) do |f| %>
         <%= f.error_notification %>
 
@@ -31,6 +33,8 @@ div.form-inputs span{
         </div>
       <% end %>
       </div>
+    </div>
+  </div>
  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">

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

@@ -1,6 +1,8 @@
 
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+    <div class="card">
+      <div class="body">
         <%= simple_form_for([:settings, @settings_payment_method_setting]) do |f| %>
         <%= f.error_notification %>
 
@@ -19,6 +21,8 @@
         </div>
         <% end %>
       </div>
+    </div>
+  </div>
   <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">

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

@@ -1,6 +1,8 @@
 
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+    <div class="card">
+      <div class="body">
         <%= simple_form_for([:settings,@settings_product]) do |f| %>
         <%= f.error_notification %>
         <div class="form-group p-l-15">
@@ -33,6 +35,8 @@
         </div>
       <% end %>
       </div>
+    </div>
+  </div>
  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">

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

@@ -1,5 +1,7 @@
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+    <div class="card">
+      <div class="body">
         <%= simple_nested_form_for([:settings,@promotion]) do |f| %>
           <%= f.error_notification %>
 
@@ -184,7 +186,7 @@
                     </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 class="col-md-1"><%= pro.link_to_remove "X" ,:class=>"btn-primary btn m-r-45", :style => 'width: 25px'%></div>
                   </div>
                   <% end %>
                   <div class="row">
@@ -201,7 +203,9 @@
           <div class="form-actions">
            <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
          </div>
-<% end %>
+         <% end %>
+      </div>
+    </div>
  </div>
  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
   <div class="card">
@@ -239,13 +243,13 @@
       </p>
     </div>
   </div>  
-  </div>
+</div>
 </div>
 
 <script>
 
 
-$(document).ready(function(){
+  $(document).ready(function(){
 
     $('#promotion_promo_start_hour').on('change', function(event) {
       $('#promotion_promo_start_hour').val($('#promotion_promo_start_hour').val().split(":")[0]+":00");
@@ -280,7 +284,7 @@ $(document).ready(function(){
   var day = "[";*/
 
 
-$(".selectDay").click(function() {
+  $(".selectDay").click(function() {
       // debugger;
       var item_row      = $('.selectDay');
       console.log(item_row);

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

@@ -1,5 +1,7 @@
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+    <div class="card">
+      <div class="body">
         <%= simple_form_for([:settings,@zone,@settings_room]) do |f| %>
         <%= f.error_notification %>
 
@@ -53,6 +55,8 @@
         </div>
       <% end %>
       </div>
+    </div>
+  </div>
  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">

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

@@ -3,13 +3,14 @@
   <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
     <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %>
     <%= f.error_notification %>
+    <div class="card">
     <div class="row">
-      <div class="col-md-6">
+      <div class="col-md-6 panel">
-        <div class="p-l-20">
+        <div class="form- p-l-20">
           <%= 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"} %>
+          <%= f.input :type, :collection => ["SimpleMenuItem","SetMenuItem"], :input_html => {:class => "col-md-9"},:input_html => {:class => "col-md-9"} %>
           <%= 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"} %> 
 
@@ -28,31 +29,29 @@
 
         <%= f.input :item_options, :collection => @item_options, :input_html => { :multiple => true,:class => "form-control item_options col-md-9" } %>
 
-        <div class="panel padding-10">
-          <div class="form-group">
         <div class="menu-item-img">
           <% if f.object.image_path? %>
           <p><%= f.object.name %></p>
           <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %>
           <% else %>
           <p>Menu Item Image</p>
-              <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
+          <%= image_tag "/image/menu_images/default.png", :class => "col-md-4 img-thumbnail" %>
           <% end %>          
         </div>
-            <%= f.file_field :image_path, :class => "img-thumbnail" %>
+        <div class="form-group col-md-10">
+          <%= f.file_field :image_path, :class => "col-md-4 img-thumbnail" %>
+        </div>
+
+        <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true,  :class => "form-control item_sets col-md-9"} %>
       </div>
     </div>
    
-        <div class="panel padding-10">
+    <div class="row">
-          <div class="form-group">
+      <div class="col-md-6 align-right m-l-100 m-t-20 m-b-20">
-            <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true },  :class => "form-control item_sets" %>
+        <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect', :style => "width: 200px" %>
       </div>
     </div>
     
-        <div class="form-actions p-l-15">
-          <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
-        </div>
-      </div>
     </div>
     <% end %>
   </div>

app/views/settings/set_menu_items/edit.html.erb

@@ -15,7 +15,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_menu_category_set_menu_items_path(@category) %>"><%= t("en.set_menu_item") %></a></li>
     <li class="breadcrumb-item active"><%= t("views.btn.edit") %></li>
     <span class="float-right">
-      <%= link_to 'Back', settings_menu_category_set_menu_items_path(@category) %>
+      <%= link_to 'Back', settings_menu_category_path(@category) %>
     </span>
   </ol>
 </div>

app/views/settings/set_menu_items/new.html.erb

@@ -20,7 +20,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_menu_category_set_menu_items_path(@category) %>"><%= t("en.set_menu_item") %></a></li>
     <li class="breadcrumb-item active"><%= t("views.btn.new") %></li>
     <span class="float-right">
-      <%= link_to 'Back', settings_menu_category_set_menu_items_path(@category) %>
+      <%= link_to 'Back', settings_menu_category_path(@category) %>
     </span>
   </ol>
 </div>

app/views/settings/set_menu_items/show.html.erb

@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_menu_category_set_menu_items_path(@category) %>">Menu Category</a></li>
     <li class="breadcrumb-item active">Details</li>
     <span class="float-right">
-      <%= link_to 'Back', settings_menu_category_set_menu_items_path(@category) %>
+      <%= link_to 'Back', settings_menu_category_path(@category) %>
     </span>
   </ol>
 </div>
@@ -119,7 +119,50 @@
  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
     <div class="card">
       <div class="body">
+        <h5><%= t("views.right_panel.header.menu_item") %></h5>
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+        2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.menu_item_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        3) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.type_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+        4) <%= t("views.right_panel.detail.account") %> - <%= t("views.right_panel.detail.account_type_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+        5) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+        6) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+        2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+        </p>
 
+        <h5><%= t("views.right_panel.header.menu_item_instances") %></h5>
+          <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+          <p>
+          1) <%= t("views.right_panel.detail.instance_code") %> - <%= t("views.right_panel.detail.code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+          2) <%= t("views.right_panel.detail.instance_name") %> - <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+          3) <%= t("views.right_panel.detail.item_attributes") %> - <%= t("views.right_panel.detail.item_attributes_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %><br>
+          4) <%= t("views.right_panel.detail.price") %> - <%= t("views.right_panel.detail.price_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+          4) <%= t("views.right_panel.detail.promotion") %> - <%= t("views.right_panel.detail.promotion_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+          5) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+          </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+        2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+        3) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.menu_item_instance_txt") %> <br>
+        </p>
+        -----------------------------------------------------------------
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          3) <%= t("en.accounts") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.accounts_txt") %><br>
+          4) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %><br>
+          5) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
+          6) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+          7) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+          8) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>

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

@@ -3,15 +3,14 @@
   <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
     <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %>
     <%= f.error_notification %>
+      <div class="card">
         <div class="row">
          <div class="col-md-6 panel">
             <div class="form- p-l-20">
               <%= 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"} %>
-              <div style="display: none;">
+              <%= f.input :type, :collection => ["SimpleMenuItem","SetMenuItem"], :input_html => {:class => "col-md-9"} %>
-                <%= 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"} %> 
               
@@ -24,9 +23,9 @@
           </div>
 
           <div class="col-md-6">
-                <%= f.input :item_attributes, :collection => @item_attributes, :input_html => { :multiple => true,:class => "col-md-9 item_attributes" } %>
+            <%= f.input :item_attributes, :collection => @item_attributes, :input_html => { :multiple => true,:class => "form-control item_attributes col-md-9" } %>
 
-                <%= f.input :item_options, :collection => @item_options, :input_html => { :multiple => true,:class => "col-md-9" } %>
+            <%= f.input :item_options, :collection => @item_options, :input_html => { :multiple => true,:class => "form-control item_options col-md-9" } %>
 
             <div class="menu-item-img">
               <% if f.object.image_path? %>
@@ -37,12 +36,16 @@
               <%= image_tag "/image/menu_images/default.png",:input_html => { :class => "col-md-4 img-thumbnail" } %>
               <% end %>          
             </div>
+            <div class="form-group col-md-10">
               <%= f.file_field :image_path,:input_html => { :class => "col-md-4 img-thumbnail" } %>
-
+            </div>
             <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true,:class => "form-control item_sets col-md-9" } %>
+          </div>
+      </div>
 
-            <div class="form-actions">
+      <div class="row">
-              <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
+        <div class="col-md-6 align-right m-l-100 m-t-20 m-b-20">
+          <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect', :style => "width: 200px" %>
         </div>
       </div>
       </div>

app/views/settings/simple_menu_items/edit.html.erb

@@ -16,7 +16,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_menu_category_simple_menu_items_path(@category) %>"><%= t("en.simple_menu_item") %></a></li>
     <li class="breadcrumb-item active"><%= t("views.btn.edit") %></li>
     <span class="float-right">
-      <%= link_to 'Back', settings_menu_category_simple_menu_items_path(@category) %>
+      <%= link_to 'Back', settings_menu_category_path(@category) %>
     </span>
   </ol>
 </div>

app/views/settings/simple_menu_items/index.html.erb

@@ -5,7 +5,7 @@
 
   <li>Menu Items</li>
   <span style="float: right">
-    <%= link_to t("views.btn.new"),new_settings_menu_category_simple_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
+    <%= link_to t("views.btn.new"),settings_menu_category_path(@category),:class => 'btn btn-primary btn-sm' %>
   </span>
  </ul>
 </div> -->

app/views/settings/simple_menu_items/new.html.erb

@@ -20,10 +20,10 @@
 <div class="page-header">
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item"><a href="<%= settings_menu_category_simple_menu_items_path(@category) %>"><%= t("en.simple_menu_item") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_menu_category_path(@category) %>"><%= t("en.simple_menu_item") %></a></li>
     <li class="breadcrumb-item active"><%= t("views.btn.new") %></li>
     <span class="float-right">
-      <%= link_to 'Back', settings_menu_category_simple_menu_items_path(@category) %>
+      <%= link_to 'Back', settings_menu_category_path(@category) %>
     </span>
   </ol>
 </div>

app/views/settings/simple_menu_items/show.html.erb

@@ -1,10 +1,10 @@
 <div class="page-header">
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item"><a href="<%= settings_menu_category_simple_menu_items_path(@category) %>"><%= t("views.right_panel.header.menu_item") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_menu_category_path(@category) %>"><%= t("views.right_panel.header.menu_item") %></a></li>
     <li class="breadcrumb-item active"><%= t :details %></li>
     <span class="float-right">
-      <%= link_to 'Back', settings_menu_category_simple_menu_items_path(@category) %>
+      <%= link_to 'Back', settings_menu_category_path(@category) %>
     </span>
   </ol>
 </div>

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

@@ -1,5 +1,7 @@
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+    <div class="card">
+      <div class="body">
         <%= simple_form_for([:settings,@zone,@settings_table]) do |f| %>
         <%= f.error_notification %>
 
@@ -18,22 +20,31 @@
           <% else %>
             <%  @settings_table.dining_charges.each do |dc| %>
             <div class="card">
-            <div class="">
+              <div class="body">
+                <span class="card-title"><b><u>Dining Charge</u></b></span>
                 <table class="table">
-                <tr><td colspan="2">
+                  <thead>
-                  <div class="col-md-10"><b><u>Dining Charge</u></b></div></td>
+                    <th>Item Code</th>
-                </tr>
+                    <th>Unit Price</th>
+                    <th>Charge Type</th>
+                    <th>Free Time</th>
+                    <th>Charges Block</th>
+                    <th>Time Rounding</th>
+                    <th>Actions</th>
+                  </thead>
+                  <tbody>
                     <tr>
-                  <td class="align-right">Item code :</td>
+                      <td><%= dc.item_code %></td>
-                  <td class="align-left"><%= dc.item_code %></td>
+                      <td><%= dc.unit_price %></td>
-                  <td class="align-right">Unit price : </td>
+                      <td><%= dc.charge_type %></td>
-                  <td class="align-left"><%= dc.unit_price %></td>
+                      <td><%= (dc.minimum_free_time).utc.strftime("%H:%M") %></td>
-                  <td class="align-right">Charge type : </td>
+                      <td><%= (dc.charge_block).utc.strftime("%H:%M") %></td>
-                                    <td class="align-left"><%= dc.charge_type %></td>
+                      <td><%= dc.time_rounding %></td>
                       <td><%= link_to 'Edit Charges', edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc),:class => 'btn bg-deep-purple' %>
-                    <!-- <button class="btn btn-primary" src="<%= edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc) %>">Edit Charge</button> --></td>
+                        <!-- <button class="btn btn-primary" src="<%= edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc) %>">Edit Charge</button> -->
+                      </td>
                     </tr>
-                
+                  </tbody>
                 </table>
               </div>
             </div>
@@ -46,6 +57,8 @@
         </div>
       <% end %>
       </div>
+    </div>
+  </div>
  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
     <div class="card">
       <div class="body">

app/views/settings/tables/show.html.erb

@@ -61,21 +61,31 @@
         </table>
         <%  @table.dining_charges.each do |dc| %>
           <div class="card">
+            <div class="body">
               <h4 class="card-title">Dining Charge</h4>
-            <div class="">
               <table class="table">
-                
+                <thead>
+                  <th>Item Code</th>
+                  <th>Unit Price</th>
+                  <th>Charge Type</th>
+                  <th>Free Time</th>
+                  <th>Charges Block</th>
+                  <th>Time Rounding</th>
+                  <th>Actions</th>
+                </thead>
+                <tbody>
                   <tr>
-                  <td class="align-right">Item code :</td>
+                    <td><%= dc.item_code %></td>
-                  <td class="align-left"><%= dc.item_code %></td>
+                    <td><%= dc.unit_price %></td>
-                  <td class="align-right">Unit price : </td>
+                    <td><%= dc.charge_type %></td>
-                  <td class="align-left"><%= dc.unit_price %></td>
+                    <td><%= (dc.minimum_free_time).utc.strftime("%H:%M") %></td>
-                  <td class="align-right">Charge type : </td>
+                    <td><%= (dc.charge_block).utc.strftime("%H:%M") %></td>
-                  <td class="align-left"><%= dc.charge_type %></td>
+                    <td><%= dc.time_rounding %></td>
                     <td><%= link_to 'Edit Charges', edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc),:class => 'btn bg-deep-purple' %>
-                    <!-- <button class="btn btn-primary" src="<%= edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc) %>">Edit Charge</button> --></td>
+                      <!-- <button class="btn btn-primary" src="<%= edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc) %>">Edit Charge</button> -->
+                    </td>
                   </tr>
-                
+                </tbody>
               </table>
             </div>
           </div>

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

@@ -2,6 +2,8 @@
 
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+    <div class="card">
+      <div class="body">
         <%= simple_form_for([:settings, @settings_tax_profile ]) do |f| %>
         <%= f.error_notification %>
 
@@ -17,6 +19,8 @@
         </div>
         <% end %>
       </div>
+    </div>
+  </div>
   <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
     <div class="card">
       <div class="body">

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

@@ -1,5 +1,7 @@
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
+    <div class="card">
+      <div class="body">
         <%= simple_form_for([:settings,@settings_zone]) do |f| %>
         <%= f.error_notification %>
 
@@ -12,7 +14,9 @@
         <div class="form-group p-l-15">
           <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
         </div>
-<% end %>
+        <% end %>
+      </div>
+    </div>
   </div>
  <div class="col-xs-12 col-sm-12 col-md-5 col-lg-5">
     <div class="card">