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 into adminbsb_material_ui

Browse Source
This commit is contained in:
Aung Myo
2018-01-03 10:02:28 +06:30
parent 7ece8cbb47 84be783d12
commit 76c72d8f54
6 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/api/call_waiters_controller.rb
View File

@@ -8,12 +8,11 @@ class Api::CallWaitersController < ActionController::API
CallWaiterJob.perform_later(@table,@time)
# get printer info
# @shop = Shop::ShopDetail
# unique_code = "CallWaiterPdf"
# print_settings = PrintSetting.find_by_unique_code(unique_code)
# printer = Printer::ReceiptPrinter.new(print_settings)
# printer.print_call_waiter(print_settings,@table,@time,@shop)
@shop = Shop::ShopDetail
unique_code = "CallWaiterPdf"
print_settings = PrintSetting.find_by_unique_code(unique_code)
printer = Printer::ReceiptPrinter.new(print_settings)
printer.print_call_waiter(print_settings,@table,@time,@shop)
end

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

@@ -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)

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