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 17:44:18 +06:30
parent e91e15d629
commit 955b9a806f
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@@ -33,6 +33,13 @@ ruby 2.4.1p111
java -jar ~/Documents/Jade.jar http://192.168.1.88:3002
Extra Time
category_code = Ext001
category_code = Ext002
instance_code = Extim30, Extim60 //for morning menu
instance_code = Extie30, Extie60 //for evening menu
* ToDo list
1. Cloud Sync

4
app/controllers/origami/addorders_controller.rb
View File

@@ -67,9 +67,9 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
items_arr = []
JSON.parse(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'
time = 30*60*i["quantity"].to_i
extra_time = Time.at(time)
else

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

@@ -7,16 +7,17 @@
<div class="row m-t--20">
<div class="col-lg-2 col-md-2 col-sm-2">
<ul class="nav nav-tabs flex-column" role="tablist" >
<% @menu.each do |menu| %>
<% @menu.each do |menu| %>
<% if menu.menu_category_id.nil?%>
<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>
<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 %>
<!-- <li class="nav-item menu_category">