git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update extim and extie

Browse Source
This commit is contained in:
Aung Myo
2018-01-02 18:08:28 +06:30
parent 955b9a806f
commit c5eeb9acb7
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/api/orders_controller.rb
View File

@@ -54,9 +54,9 @@ class Api::OrdersController < Api::ApiController
extra_time = '' extra_time = ''
params[:order_items].each { |i| 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 is_extra_time = true
if i["item_instance_code"] == 'Exti30' if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30'
t = Time.now t = Time.now
time = 30*60*i["quantity"].to_i time = 30*60*i["quantity"].to_i
extra_time = Time.at(time) extra_time = Time.at(time)

13
app/views/origami/addorders/detail.html.erb
View File

@@ -9,7 +9,7 @@
<ul class="nav nav-tabs flex-column" role="tablist" > <ul class="nav nav-tabs flex-column" role="tablist" >
<% @menu.each do |menu| %> <% @menu.each do |menu| %>
<% if menu.menu_category_id.nil?%> <% if menu.menu_category_id.nil?%>
<% if menu.code != "Ext001" %>
<li class="nav-item menu_category sub_click" data-id="<%=menu.id%>"> <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
<p class="hidden menu-id"><%= menu.id %></p> <p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%> <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
@@ -17,7 +17,16 @@
</ul> </ul>
</a> </a>
</li> </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%>
<%end %> <%end %>
<!-- <li class="nav-item menu_category"> <!-- <li class="nav-item menu_category">