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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Aung Myo
2018-01-15 17:49:21 +06:30
parent fb989572b1 9f7c481270
commit 649e99f176
2 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,22 +54,13 @@ class Api::OrdersController < Api::ApiController
extra_time = '' extra_time = ''
params[:order_items].each { |i| params[:order_items].each { |i|
if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30' || i["item_instance_code"] == 'Extie45' || i["item_instance_code"] == 'Extie15' i["item_instance_code"] = i["item_instance_code"].downcase.to_s
if i["item_instance_code"].include? "ext"
is_extra_time = true is_extra_time = true
if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30' arr_exts = i["item_instance_code"].split("_")
t = Time.now if arr_exts[1].match(/^(\d)+$/)
time = 30*60*i["quantity"].to_i time = arr_exts[1].to_i*60*i["quantity"].to_i
extra_time = Time.at(time) extra_time = Time.at(time)
elsif i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie15'
time = 15*60*i["quantity"].to_i
extra_time = Time.at(time)
elsif i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extie45'
time = 45*60*i["quantity"].to_i
extra_time = Time.at(time)
else
t = Time.now
time = 60*60*i["quantity"].to_i
extra_time = Time.at(time)
end end
end end
} }

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

@@ -67,20 +67,13 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
items_arr = [] items_arr = []
JSON.parse(params[:order_items]).each { |i| JSON.parse(params[:order_items]).each { |i|
if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30' || i["item_instance_code"] == 'Extie45' || i["item_instance_code"] == 'Extie15' i["item_instance_code"] = i["item_instance_code"].downcase.to_s
if i["item_instance_code"].include? "ext"
is_extra_time = true is_extra_time = true
if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30' arr_exts = i["item_instance_code"].split("_")
time = 30*60*i["quantity"].to_i if arr_exts[1].match(/^(\d)+$/)
extra_time = Time.at(time) time = arr_exts[1].to_i*60*i["quantity"].to_i
elsif i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie15' extra_time = Time.at(time)
time = 15*60*i["quantity"].to_i
extra_time = Time.at(time)
elsif i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extie45'
time = 45*60*i["quantity"].to_i
extra_time = Time.at(time)
else
time = 60*60*i["quantity"].to_i
extra_time = Time.at(time)
end end
end end
items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": i["options"]} items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": i["options"]}