update setting admin pages

2017-10-24 18:16:03 +06:30
parent 85e2c48e5e
commit 34a4e485af
31 changed files with 263 additions and 181 deletions
--- a/app/views/settings/item_sets/index.html.erb
+++ b/app/views/settings/item_sets/index.html.erb
@@ -11,7 +11,19 @@


 <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-2 col-lg-2">
+   <div class="card">
+    <ul class="list-group">
+     <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
+       <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
+    </ul>
+  </div>
+</div>
+  <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
    <div class="m-b-10 clearfix">
      <%= link_to t("views.btn.new"),new_settings_item_set_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
    </div>
--- a/app/views/settings/menu_categories/index.html.erb
+++ b/app/views/settings/menu_categories/index.html.erb
@@ -11,11 +11,12 @@
  <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
   <div class="card">
    <ul class="list-group">
-      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+     <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
+       <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
-      <!-- <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
    </ul>
  </div>
 </div>
@@ -44,7 +45,7 @@
        <td><%= settings_menu_category.order_by rescue ''%></td>
        <td><%= settings_menu_category.parent.name rescue ''%></td>
        <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_path(settings_menu_category),:class => 'btn btn-info btn-sm waves-effect' %> 
-         <%= link_to t("views.btn.delete"), settings_menu_category_path(settings_menu_category), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %></td></td>
+       </td></td>
       </tr>
       <% end %>
     </tbody>
--- a/app/views/settings/menu_categories/show.html.erb
+++ b/app/views/settings/menu_categories/show.html.erb
@@ -12,13 +12,14 @@
 <div class="row">
    <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
     <div class="card">
-      <ul class="list-group">
-        <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
-        <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
-        <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
-        <!-- <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-        <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li> -->
-      </ul>
+     <ul class="list-group">
+     <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
+      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
+    </ul>
    </div>
  </div>
  <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
@@ -31,8 +32,8 @@
              <th>Menu</th>
              <th>Name</th>
              <th>Alt name</th>
-              <th>Is Available</th>
-              <th>Order by</th>
+              <th>Available</th>
+              <!-- <th>Order by</th> -->
              <th>Created At</th>
              <th>Actions</th>
            </tr>
@@ -44,10 +45,10 @@
              <td><%= @settings_menu_category.name  rescue "-" %></td>
              <td><%= @settings_menu_category.alt_name %></td>
              <td><%= settings_menu_category.is_available rescue false%></td>
-              <td><%= @settings_menu_category.order_by %></td>
+              <!-- <td><%= @settings_menu_category.order_by %></td> -->
              <td><%= @settings_menu_category.created_at.utc.getlocal.strftime("%Y-%m-%d")  %></td>
-              <td><%= link_to t("views.btn.edit"), edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category),:class => 'btn btn-primary btn-sm waves-effect' %></td>
-              <td>
+              <td><%= link_to t("views.btn.edit"), edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category),:class => 'btn btn-primary btn-sm waves-effect' %>
+              
                <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_category_path(@settings_menu_category)%>" data-method="delete">
                  <%= t("views.btn.delete") %>
                </button>
--- a/app/views/settings/menu_item_attributes/index.html.erb
+++ b/app/views/settings/menu_item_attributes/index.html.erb
@@ -12,11 +12,12 @@
   <div class="card">

    <ul class="list-group">
-      <li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li>
+      <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
+      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
    </ul>
  </div>
 </div>
--- a/app/views/settings/menu_item_instances/_form.html.erb
+++ b/app/views/settings/menu_item_instances/_form.html.erb
@@ -1,12 +1,12 @@
 <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-8 col-lg-8">

    <%= simple_form_for([:settings,@item, @settings_menu_item_instances]) do |f| %>

    <%= f.error_notification %>

    <div class="col-md- panel">
-      <div class="form-group">
+      <div class="form-group p-l-15">
        <%= f.input :item_instance_code %>
        <%= f.input :item_instance_name %>
        <%= f.input :price %>
@@ -28,13 +28,13 @@
        </div>
      </div>

-      <div class="form-actions">
+      <div class="form-actions p-l-15">
         <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
      </div>
    </div>
    <% end %>
  </div>
-  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
    <div class="card">
      <div class="body">
        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
--- a/app/views/settings/menu_item_instances/index.html.erb
+++ b/app/views/settings/menu_item_instances/index.html.erb
@@ -83,13 +83,13 @@
            <td><%=l settings_menu_item.created_at, :format => :short %></td>

            <% if settings_menu_item.type == "SimpleMenuItem" %>
-            <td><%= link_to t("views.btn.show"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %></td>
-            <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %></td>
-            <td><%= link_to t("views.btn.delete"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+            <td><%= link_to t("views.btn.show"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ),:class=>"btn btn-primary waves-effect btn-sm" %></td>
+            <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item),:class=>"btn btn-info waves-effect btn-sm" %></td>
+            <td><%= link_to t("views.btn.delete"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class=>"btn btn-danger waves-effect btn-sm" %></td>
            <% else %>
-            <td><%= link_to t("views.btn.show"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %></td>
-            <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %></td>
-            <td><%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+            <td><%= link_to t("views.btn.show"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ),,:class=>"btn btn-primary waves-effect btn-sm" %></td>
+            <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item),,:class=>"btn btn-info waves-effect btn-sm" %></td>
+            <td><%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },,:class=>"btn btn-danger waves-effect btn-sm" %></td>
            <% end %>
          </tr>
        <% end %>
--- a/app/views/settings/menu_item_instances/show.html.erb
+++ b/app/views/settings/menu_item_instances/show.html.erb
@@ -28,30 +28,37 @@
  <div class="card-block">
    <h4 class="card-title">Menu Item Instance</h4>
    <table class="table">
-      <thead>
-        <tr>
-          <th>Item Instance code</th>
-          <th>Name</th>
-          <th>Price</th>
-          <th>On Promotion</th>
-          <th>Promotion Price</th>
-          <th>Available</th>
-          <th>Is Default</th>
-          <th>Created At</th>   
-        </tr>
-      </thead>
-
      <tbody>
-        <tr>
-
+        
+          <tr><th>Item Instance code</th>
          <td><%= @settings_menu_item_instances.item_instance_code %></td>
+          </tr>
+          <tr><th>Name</th>
          <td><%= @settings_menu_item_instances.item_instance_name  rescue "-" %></td>
+          </tr>
+          <tr><th>Price</th>
          <td><%= @settings_menu_item_instances.price %></td>
+          </tr>
+          <tr><th>On Promotion</th>
          <td><%= @settings_menu_item_instances.is_on_promotion %></td>
+          </tr>
+          <tr><th>Promotion Price</th>
          <td><%= @settings_menu_item_instances.promotion_price %></td>
+          </tr>
+          <tr><th>Available</th>
          <td><%= @settings_menu_item_instances.is_available %></td>
+          </tr>
+          <tr><th>Is Default</th>
          <td><%= @settings_menu_item_instances.is_default %></td>
+          </tr>
+          <tr><th>Created At</th>   
          <td><%= @settings_menu_item_instances.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
+          </tr>
+        
+      </tbody>
+
+      
+          
          <% if params[:simple_menu_item_id] %>
          <!-- td><%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@item,@settings_menu_item_instances) %></td> 
          <td><button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_simple_menu_item_menu_item_instance_path(@item, @settings_menu_item_instances)%>" data-method="delete">
@@ -76,8 +83,7 @@
          </td>-->
          <% end %>

-        </tr>
-      </tbody>
+     
    </table>
  </div>
 </div>
--- a/app/views/settings/menu_item_options/index.html.erb
+++ b/app/views/settings/menu_item_options/index.html.erb
@@ -13,11 +13,12 @@
   <div class="card">

    <ul class="list-group">
-      <li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li>
+     <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
+      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
    </ul>
  </div>
 </div>
--- a/app/views/settings/menus/index.html.erb
+++ b/app/views/settings/menus/index.html.erb
@@ -12,11 +12,12 @@
   <br><br>
   <div class="card">
    <ul class="list-group">
+     <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
-      <!-- <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
    </ul>
  </div>
 </div>
--- a/app/views/settings/menus/show.html.erb
+++ b/app/views/settings/menus/show.html.erb
@@ -12,11 +12,14 @@
  <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
   <div class="card">
    <ul class="list-group">
+      <ul class="list-group">
+     <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
-      <!-- <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
+    </ul>
    </ul>
  </div>
 </div>
@@ -33,7 +36,7 @@
            <th>Valid To</th>
            <th>Created By</th>
            <th>Created At</th> 
-            <th colspan="2">Actions</th>
+            <th >Actions</th>
          </tr>
        </thead>
        <tbody>
@@ -43,9 +46,8 @@
            <td><%= @settings_menu.valid_time_from.strftime("%H:%M") rescue "-" %></td>
            <td><%= @settings_menu.valid_time_to.strftime("%H:%M") rescue "-" %></td>
            <td><%= @settings_menu.created_by %></td>
-            <td><%= @settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
-            <td><%= link_to t("views.btn.edit"), edit_settings_menu_path(@settings_menu),:class => 'btn btn-primary btn-sm waves-effect' %></td>
-            <td>
+            <td><%= @settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d") %></td>
+            <td><%= link_to t("views.btn.edit"), edit_settings_menu_path(@settings_menu),:class => 'btn btn-primary btn-sm waves-effect' %>
              <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_path(@settings_menu)%>" data-method="delete">
                <%= t("views.btn.delete") %>
              </button>
--- a/app/views/settings/set_menu_items/index.html.erb
+++ b/app/views/settings/set_menu_items/index.html.erb
@@ -23,11 +23,12 @@
  <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
   <div class="card">
    <ul class="list-group">
-      <li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li>
+      <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
+      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
    </ul>
  </div>
 </div>
--- a/app/views/settings/set_menu_items/show.html.erb
+++ b/app/views/settings/set_menu_items/show.html.erb
@@ -13,11 +13,12 @@
  <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
   <div class="card">
    <ul class="list-group">
-      <li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li>
+     <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
+      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
    </ul>
  </div>
 </div>
@@ -25,15 +26,16 @@
    <div class="card">
  <div class="card-block">
    <h4 class="card-title">Menu Item </h4>
-    <table class="table">
+    <div class="body table-responsive">
+      <table class="table">
      <thead>
        <tr>
          <th>Item code</th>
          <th>Name</th>
-          <th>Alt name</th>
+          <!-- <th>Alt name</th> -->
          <th>Type</th>
          <th>Account Type</th>
-          <th>Menu category</th>
+          <!-- <th>Menu category</th> -->
          <th>Min qty</th>
          <th>Created At</th>
          <th>Action</th>
@@ -44,12 +46,12 @@
        <tr>
          <td><%= @settings_menu_item.item_code %></td>
          <td><%= @settings_menu_item.name  rescue "-" %></td>
-          <td><%= @settings_menu_item.alt_name %></td>
+          <!-- <td><%= @settings_menu_item.alt_name %></td> -->
          <td><%= @settings_menu_item.type %></td>
          <td><%= @settings_menu_item.account.title %></td>
-          <td><%= @settings_menu_item.menu_category_id %></td>
+          <!-- <td><%= @settings_menu_item.menu_category_id %></td> -->
          <td><%= @settings_menu_item.min_qty %></td>
-          <td><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p")  %></td>
+          <td><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d")  %></td>
          <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-info btn-sm waves-effect' %>
            <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_category_set_menu_item_path(@category, @settings_menu_item)%>" data-method="delete">
                  <%= t("views.btn.delete") %>
@@ -63,6 +65,7 @@
        </tr>
      </tbody>
    </table>
+    </div>
  </div>
 </div>

@@ -82,8 +85,8 @@
          <th>Instance name</th>
          <th>Attributes</th>
          <th>price</th>
-          <th>Promotion</th>
-          <th>promotion price</th>
+         <!--  <th>Promotion</th>
+          <th>promotion price</th> -->
          <!-- <th>Created at</th> -->

          <th>Actions</th>
@@ -97,13 +100,13 @@
            <td><%= settings_menu_item.item_instance_code %></td>
            <td><%= settings_menu_item.item_instance_name %></td>
            <td><%= settings_menu_item.item_attributes %></td>
-            <td><%= settings_menu_item.price %></td>
+            <td><%= settings_menu_item.price %></td><!-- 
            <td><%= settings_menu_item.is_on_promotion %></td>
-            <td><%= settings_menu_item.promotion_price %></td>
+            <td><%= settings_menu_item.promotion_price %></td> -->
           <!--  <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p")  %></td> -->
            <td><%= link_to 'Show', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
            <%= link_to t("views.btn.edit"), edit_settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
-            <%= link_to t("views.btn.delete"), settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %></td>
+           <!--  <%= link_to t("views.btn.delete"), settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %>--></td>
          </tr>
        <% end %>
      </tbody>
@@ -114,10 +117,7 @@
 <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
    <div class="card">
      <div class="body">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+          
      </div>
    </div>  
  </div>
--- a/app/views/settings/simple_menu_items/index.html.erb
+++ b/app/views/settings/simple_menu_items/index.html.erb
@@ -24,11 +24,12 @@
  <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
   <div class="card">
    <ul class="list-group">
-      <li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li>
+      <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
+      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
    </ul>
  </div>
 </div>
--- a/app/views/settings/simple_menu_items/show.html.erb
+++ b/app/views/settings/simple_menu_items/show.html.erb
@@ -14,11 +14,12 @@
  <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
   <div class="card">
    <ul class="list-group">
-      <li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
-      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li>
+     <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
+      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
    </ul>
  </div>
 </div>
@@ -26,17 +27,18 @@
  <div class="card">
    <div class="card-block">
      <h4 class="card-title">Menu Item </h4>
+      <div class="body table-responsive">
      <table class="table">
        <thead>
          <tr>
            <th>Item code</th>
            <th>Name</th>
-            <th>Alt name</th>
+            <!-- <th>Alt name</th> -->
            <th>Type</th>
            <th>Accout</th>
-            <th>Menu category</th>
+           <!--  <th>Menu category</th> -->
            <!-- <th>Menu item</th> -->
-            <th>Min qty</th>
+            <!-- <th>Min qty</th> -->
          <!-- <th>Min selectable item</th>
          <th>Max selectable item</th> -->
          <th>Created At</th>
@@ -48,15 +50,15 @@
        <tr>
          <td><%= @settings_menu_item.item_code %></td>
          <td><%= @settings_menu_item.name  rescue "-" %></td>
-          <td><%= @settings_menu_item.alt_name %></td>
+         <!--  <td><%= @settings_menu_item.alt_name %></td> -->
          <td><%= @settings_menu_item.type %></td>
          <td><%= @settings_menu_item.account.title %></td>
-          <td><%= @settings_menu_item.menu_category_id %></td>
-          <td><%= @settings_menu_item.min_qty %></td>
+         <!--  <td><%= @settings_menu_item.menu_category_id %></td> -->
+         <!--  <td><%= @settings_menu_item.min_qty %></td> -->

          <td><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d")  %></td>

-          <td colspan="2">
+          <td colspan="">
            <%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-primary btn-lg waves-effect' %>
            <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_category_simple_menu_item_path(@category)%>" data-method="delete">
              <%= t("views.btn.delete") %>
@@ -70,6 +72,7 @@
        </tr>
      </tbody>
    </table>
+    </div>
  </div>
 </div>

@@ -110,8 +113,8 @@

          <!-- <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p")  %></td> -->

-          <td><%= link_to 'Show', settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-lg waves-effect' %>
-          <%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-lg waves-effect' %>
+          <td><%= link_to 'Show', settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
+          <%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
          </td>
        </tr>
        <% end %>
--- a/app/views/settings/tax_profiles/_form.html.erb
+++ b/app/views/settings/tax_profiles/_form.html.erb
@@ -5,14 +5,14 @@
    <%= simple_form_for([:settings, @settings_tax_profile ]) do |f| %>
    <%= f.error_notification %>

-    <div class="form-inputs">
+    <div class="form-inputs p-l-15">
      <%= f.input :name %>
      <%= f.input :rate %>
      <%= f.input :inclusive %>
      <%= f.input :order_by %>
    </div>

-    <div class="form-actions">
+    <div class="form-actions p-l-15">
      <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
    </div>
    <% end %>
--- a/app/views/settings/tax_profiles/index.html.erb
+++ b/app/views/settings/tax_profiles/index.html.erb
@@ -35,7 +35,7 @@
              <td><%= settings_tax_profile.order_by %></td>
              <td><%= settings_tax_profile.created_by %></td>
              <td><%= link_to t("views.btn.show"), settings_tax_profile_path(settings_tax_profile), :class => "btn btn-info btn-sm waves-effect" %>
-              <%= link_to t("views.btn.edit"), edit_settings_tax_profile_path(settings_tax_profile),:class => 'btn btn-info btn-lg waves-effect' %></td>
+              <%= link_to t("views.btn.edit"), edit_settings_tax_profile_path(settings_tax_profile),:class => 'btn btn-info btn-sm waves-effect' %></td>
            </tr>
            <% end %>
          </tbody>
--- a/app/views/settings/tax_profiles/new.html.erb
+++ b/app/views/settings/tax_profiles/new.html.erb
@@ -1,4 +1,4 @@
-<%= link_to 'Back', settings_tax_profiles_path %> -->
+
 <div class="page-header">
  <ol class="breadcrumb">
    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
--- a/app/views/settings/tax_profiles/show.html.erb
+++ b/app/views/settings/tax_profiles/show.html.erb
@@ -1,10 +1,10 @@
 <div class="page-header">
  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= settings_tax_profile_path %>">Home</a></li>
-    <li class="breadcrumb-item"><a href="<%= settings_tax_profile_path %>">Tax Profiles</a></li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_tax_profiles_path %>">Tax Profiles</a></li>
    <li class="breadcrumb-item active">Details</li>
    <span class="float-right">
-      <%= link_to t('.back', :default => t("views.btn.back")), settings_tax_profile_path %>
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_tax_profiles_path %>
    </span>
  </ol>
 </div>