origin pull master

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

@@ -1,10 +1,11 @@
-<%= simple_form_for([:settings,:menu_category, @settings_menu_item]) do |f| %>
+<%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %>
   <%= f.error_notification %>
 
   <div class="form-inputs">
     <%= f.input :item_code %>
     <%= f.input :name %>
     <%= f.input :alt_name %>
+    <%= f.input :type %>
     <%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %>
     <%= f.input :min_qty %>
     <%= f.input :min_selectable_item %>

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

@@ -1,17 +1,14 @@
 <!-- <h1>Editing Settings Menu Item</h1>
 
-<%= render 'form', settings_menu_item: @settings_menu_item %>
-
-<%= link_to 'Show', @settings_menu_item %> |
-<%= link_to 'Back', settings_menu_items_path %> -->
+<%= render 'form', settings_menu_item: @settings_menu_item %>-->
 
 <div class="span12">
 		<div class="page-header">
 		 <ul class="breadcrumb">
 		   	<li><a href="<%= root_path %>">Home</a></li>
-  			<li><a href="<%= settings_menu_items_path %>">Menu Items</a></li>
+  			<li><a href="<%= settings_menu_category_simple_menu_items_path(@category) %>">Menu Category</a></li>
 		  	<li>Edit</li>
 		 </ul>
 		</div>
-    <%= render 'form', settings_menu_item: @settings_menu_item %>
+    <%= render 'form', settings_simple_menu_item: @settings_menu_item %>
 </div>

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

@@ -1,11 +1,11 @@
 <div class="page-header">
  <ul class="breadcrumb">
   <li><a href="<%=  %>">Home</a></li>
-  <li>Settings</li>
+  <li><a href="<%= settings_menu_categories_path %>">Menus Categories</a></li>
 
   <li>Menu Items</li>
   <span style="float: right">
-    <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_category_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
+    <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_category_simple_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
   </span>
  </ul>
 </div>
@@ -40,7 +40,12 @@
 <br/>
 <div class="card">
   <div class="card-block">
-    <h4 class="card-title">Menu Items</h4>
+    <h4 class="card-title">Menu Items
+      <span style="float: right">
+        <%= link_to "New Simple Menu Item",new_settings_menu_category_simple_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
+        <%= link_to "New Set Menu Item",new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
+
+      </span></h4>
     <table class="table">
       <thead>
         <tr>
@@ -67,9 +72,15 @@
             <td><%= settings_menu_item.created_by %></td>
             <td><%=l settings_menu_item.created_at, :format => :short %></td>
 
-            <td><%= link_to 'Show', settings_menu_category_menu_item_path(@category, settings_menu_item ) %></td>
-            <td><%= link_to 'Edit', edit_settings_menu_category_menu_item_path(@category, settings_menu_item) %></td>
-            <td><%= link_to 'Destroy', settings_menu_category_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+            <% if settings_menu_item.type == "SimpleMenuItem" %>
+            <td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %></td>
+            <td><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %></td>
+            <td><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+            <% else %>
+            <td><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %></td>
+            <td><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %></td>
+            <td><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+            <% end %>
           </tr>
         <% end %>
       </tbody>
@@ -78,3 +89,4 @@
   </div>
 
 </div>
+ <%= paginate @settings_menu_items, param_name: :page, :outer_window => 3 %> 

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

@@ -9,7 +9,7 @@
 		<div class="page-header">
 		 <ul class="breadcrumb">
 		   	<li><a href="<%= root_path %>">Home</a></li>
-  			<li><!-- <a href="<%= settings_menu_items_path %>"> -->Menu Items<!-- </a> --></li>
+  			<li><a href="<%= settings_menu_category_simple_menu_items_path(@category) %>">Menu Category</a></li>
 		  	<li>New</li>
 		 </ul>
 		</div>

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

@@ -2,14 +2,13 @@
 <div class="page-header">
  <ul class="breadcrumb">
   <li><a href="<%=  %>">Home</a></li>
-  <li>Settings</li>
+  <li><a href="<%= settings_menu_category_simple_menu_items_path(@category) %>">Menu Category</a></li>
   <li>Menu Item Option</li>
   <span style="float: right">
   </span>
  </ul>
 </div>
 
-<br/>
 <div class="card">
   <div class="card-block">
     <h4 class="card-title">Menu Item </h4>
@@ -36,17 +35,103 @@
           <td><%= @settings_menu_item.name  rescue "-" %></td>
           <td><%= @settings_menu_item.alt_name %></td>
           <td><%= @settings_menu_item.type %></td>
-          <td><%= @settings_menu_item.menu_category %></td>
-          <td><%= @settings_menu_item.menu_item %></td>
-          <td><%= @settings_menu_item.menu_qty %></td>
+          <td><%= @settings_menu_item.menu_category_id %></td>
+          <td><%= @settings_menu_item.menu_item_id %></td>
+          <td><%= @settings_menu_item.min_qty %></td>
           <td><%= @settings_menu_item.min_selectable_item %></td>
           <td><%= @settings_menu_item.max_selectable_item %></td>
           <td><%=l @settings_menu_item.created_at, format: :short %></td>
-          <td><%= link_to 'Edit', edit_settings_menu_menu_item_path(@settings_menu_category, @settings_menu_category) %></td>
+          <td><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, @settings_menu_item) %></td>
         </tr>
       </tbody>
     </table>
   </div>
 </div>
+<br>
+<div class="card">
+  <div class="card-block">
+    <h4 class="card-title">Sub Menu Items </h4>
+    <table class="table">
+      <thead>
+        <tr>
+          <th>Item code</th>
+          <th>Name</th>
+          <th>Alt name</th>
+          <th>Type</th>
+          <th>Parent Item</th>
+          <th>Created by</th>
+          <th>Created at</th>
 
+          <th colspan="3"></th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <% @sub_menu.each do |settings_menu_item| %>
+          <tr>
+            <td><%= settings_menu_item.item_code %></td>
+            <td><%= settings_menu_item.name %></td>
+            <td><%= settings_menu_item.alt_name %></td>
+            <td><%= settings_menu_item.type %></td>
+            <td><%= settings_menu_item.parent.name rescue "-" %></td>
+            <td><%= settings_menu_item.created_by %></td>
+            <td><%=l settings_menu_item.created_at, :format => :short %></td>
+
+            <% if settings_menu_item.type == "SimpleMenuItem" %>
+            <td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %></td>
+            <td><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %></td>
+            <td><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+            <% else %>
+            <td><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %></td>
+            <td><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %></td>
+            <td><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+            <% end %>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>
+ <%= paginate @sub_menu, param_name: :page, :outer_window => 3 %>
+
+ <br>
+<div class="card">
+  <div class="card-block">
+    <h4 class="card-title">Menu Item Instances
+      <span style="float: right">
+        <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_item_menu_item_instance_path(@settings_menu_item),:class => 'btn btn-primary btn-sm' %>
+      </span>
+
+    </h4>
+    <table class="table">
+      <thead>
+        <tr>
+          <th>Menu Item Id</th>
+          <th>item_instance_code</th>
+          <th>item_attributes</th>
+          <th>price</th>
+          <th>is_on_promotion</th>
+          <th>promotion_price</th>
+          <th>Created at</th>
+
+          <th colspan="3"></th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <% @menu_item_instance.each do |settings_menu_item| %>
+          <tr>
+            <td><%= settings_menu_item.menu_item_id %></td>
+            <td><%= settings_menu_item.item_instance_code %></td>
+            <td><%= settings_menu_item.item_attributes %></td>
+            <td><%= settings_menu_item.price %></td>
+            <td><%= settings_menu_item.is_on_promotion %></td>
+            <td><%= settings_menu_item.promotion_price %></td>
+            <td><%=l settings_menu_item.created_at, :format => :short %></td> 
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>
 </div>