remove conflict text

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

@@ -1,11 +1,11 @@
 
 <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,@category, @settings_menu_item]) do |f| %>
     <%= f.error_notification %>
 
     <div class="col-md- panel">
-      <div class="form-group">
+      <div class="form-group p-l-15">
       <div class="col-md-">
           <%= f.input :item_code %>
           <%= f.input :name %>
@@ -50,13 +50,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">
         <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>

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>

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,16 +46,26 @@
         <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><%= 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' %></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") %>
+                </button>
+
+                <span class="hidden" id="delete_text">
+                    <h6>Are you sure you want to delete this row ?</h6>
+                    <h6>This action can't be undo. </h6> 
+                </span>
+          </td>
         </tr>
       </tbody>
     </table>
+    </div>
   </div>
 </div>
 
@@ -73,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>
@@ -88,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>
@@ -105,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>