From c5eeb9acb7001c204b48171c4f24a039aaa9dbaf Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 2 Jan 2018 18:08:28 +0630
Subject: [PATCH] update extim and extie

---
 app/controllers/api/orders_controller.rb    |  4 ++--
 app/views/origami/addorders/detail.html.erb | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index dd27197c..cd8c7ca2 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -54,9 +54,9 @@ class Api::OrdersController <  Api::ApiController
     extra_time = ''
 
     params[:order_items].each { |i| 
-       if i["item_instance_code"] == 'Exti60' || i["item_instance_code"] == 'Exti30'
+       if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30'
          is_extra_time = true
-         if i["item_instance_code"] == 'Exti30'
+         if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30'
           t = Time.now
            time = 30*60*i["quantity"].to_i
            extra_time = Time.at(time)
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 050a4a18..c8916e44 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -9,7 +9,7 @@
         <ul class="nav nav-tabs flex-column" role="tablist" >
             <% @menu.each do |menu| %>
                 <%   if menu.menu_category_id.nil?%>
-                
+                    <% if menu.code != "Ext001" %>
                       <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
                         <p class="hidden menu-id"><%= menu.id  %></p> 
                         <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
@@ -17,7 +17,16 @@
                           </ul>
                         </a>
                       </li>
-                   
+                    <% end%>
+                    <% if @table.get_checkout_booking.nil? && (menu.code == "Ext001" || menu.code == "Ext002") %>
+                      <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
+                        <p class="hidden menu-id"><%= menu.id  %></p> 
+                        <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
+                           <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
+                          </ul>
+                        </a>
+                      </li>
+                    <% end%>
                   <% end%>
             <%end %>
             <!-- <li class="nav-item menu_category">