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

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

Browse Source
This commit is contained in:
Yan
2017-06-14 16:52:54 +06:30
parent 15c19e0cbb 41e9aec389
commit ac7d99362d
22 changed files with 296 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/oqs/print_controller.rb
View File

@@ -6,10 +6,13 @@ class Oqs::PrintController < ApplicationController
assigned_item=AssignedOrderItem.find(assigned_item_id)
assigned_items=AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
# printer for each stations
printer_name = assigned_item.order_queue_station.printer_name
# print when complete click
print_settings=PrintSetting.find_by_unique_code(unique_code)
order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
order_queue_printer.print_order_item(print_settings,assigned_item.order_id, assigned_item.item_code )
order_queue_printer.print_order_item(printer_name,assigned_item.order_id, assigned_item.item_code )
# update print status for completed same order items
assigned_items.each do |ai|
@@ -25,10 +28,13 @@ class Oqs::PrintController < ApplicationController
assigned_item=AssignedOrderItem.find(assigned_item_id)
assigned_items=AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
# printer for each stations
printer_name = assigned_item.order_queue_station.printer_name
# print when complete click
print_settings=PrintSetting.find_by_unique_code(unique_code)
order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
order_queue_printer.print_order_summary(print_settings,assigned_item.order_id)
order_queue_printer.print_order_summary(printer_name,assigned_item.order_id)
# update print status for completed same order items
assigned_items.each do |ai|

3
app/controllers/origami/home_controller.rb
View File

@@ -11,8 +11,7 @@ class Origami::HomeController < BaseOrigamiController
@selected_item = Order.find(params[:booking_id])
@selected_item_type="Order"
end
end
puts params[:booking_id]
end
@completed_orders = Order.get_completed_order()
@booking_orders = Order.get_booking_order_table()

2
app/controllers/origami/request_bills_controller.rb
View File

@@ -9,7 +9,7 @@ class Origami::RequestBillsController < BaseOrigamiController
check_booking = Booking.find_by_booking_id(booking_id)
if check_booking.sale_id.nil?
# Create Sale if it doesn't exist
@status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee.name)
@status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee)
@sale_data = Sale.find_by_sale_id(@sale_id)
@sale_items = SaleItem.where("sale_id=?",@sale_id)
else