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-16 19:28:37 +06:30
parent 885662fbe6 9f3acad10d
commit cd6ec67b94
12 changed files with 60 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ class Api::OrdersController < Api::ApiController
@order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile @order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
@order.items = params[:order_items] @order.items = params[:order_items]
@order.guest = params[:guest_info] @order.guest = params[:guest_info]
@order.table_id = params[:table_id] @order.table_id = params[:table_id] # this is dining facilities's id
@order.new_booking = true @order.new_booking = true
@order.employee_name = current_login_employee.name @order.employee_name = current_login_employee.name
#Create Table Booking or Room Booking #Create Table Booking or Room Booking

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

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

2
app/controllers/settings/order_queue_stations_controller.rb
View File

@@ -71,6 +71,6 @@ class Settings::OrderQueueStationsController < ApplicationController
# Never trust parameters from the scary internet, only allow the white list through. # Never trust parameters from the scary internet, only allow the white list through.
def settings_order_queue_station_params def settings_order_queue_station_params
params.require(:order_queue_station).permit(:station_name, :is_active, :processing_items, :print_copy, :printer_name, :font_size, :cut_per_item, :use_alternate_name, :created_by) params.require(:order_queue_station).permit(:station_name, :is_active, :auto_print, :processing_items, :print_copy, :printer_name, :font_size, :cut_per_item, :use_alternate_name, :created_by)
end end
end end

4
app/jobs/order_queue_processor_job.rb
View File

@@ -1,7 +1,7 @@
class OrderQueueProcessorJob < ApplicationJob class OrderQueueProcessorJob < ApplicationJob
queue_as :default queue_as :default
def perform(order_id) def perform(order_id, table_id)
# Do something later # Do something later
#Order ID #Order ID
order = Order.find(order_id) order = Order.find(order_id)
@@ -10,7 +10,7 @@ class OrderQueueProcessorJob < ApplicationJob
#Execute orders and send to order stations #Execute orders and send to order stations
if order if order
oqs = OrderQueueStation.new oqs = OrderQueueStation.new
oqs.process_order(order) oqs.process_order(order, table_id)
end end
end end

2
app/models/order.rb
View File

@@ -199,7 +199,7 @@ class Order < ApplicationRecord
#Process order items and send to order queue #Process order items and send to order queue
def process_order_queue def process_order_queue
#Send to background job for processing #Send to background job for processing
OrderQueueProcessorJob.perform_later(self.id) OrderQueueProcessorJob.perform_later(self.id, self.table_id)
end end

21
app/models/order_queue_station.rb
View File

@@ -8,8 +8,10 @@ class OrderQueueStation < ApplicationRecord
scope :active, -> {where(is_active: true)} scope :active, -> {where(is_active: true)}
def process_order (order) def process_order (order, table_id)
oqs_stations = OrderQueueStation.active oqs_stations = OrderQueueStation.active
dining=DiningFacility.find(table_id)
oqpbz = OrderQueueProcessByZone.find_by_zone_id(dining.zone_id)
order_items = order.order_items order_items = order.order_items
#Assign OQS id to order Items #Assign OQS id to order Items
@@ -17,16 +19,17 @@ class OrderQueueStation < ApplicationRecord
#Get List of items - #Get List of items -
pq_items = JSON.parse(oqs.processing_items) pq_items = JSON.parse(oqs.processing_items)
#Loop through the processing items if oqs.id == oqpbz.order_queue_station_id
pq_items.each do |pq_item| #Loop through the processing items
#Processing through the looping items pq_items.each do |pq_item|
order_items.each do |order_item| #Processing through the looping items
if (pq_item == order_item.item_code) order_items.each do |order_item|
#Same Order_items can appear in two location. if (pq_item == order_item.item_code)
AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) #Same Order_items can appear in two location.
AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs)
end
end end
end end
end end
end end

33
app/models/printer/order_queue_printer.rb
View File

@@ -1,25 +1,42 @@
class Printer::OrderQueuePrinter < Printer::PrinterWorker class Printer::OrderQueuePrinter < Printer::PrinterWorker
def print_order_item(printer_name,order_id, item_code) def print_order_item(oqs,order_id, item_code)
#Use CUPS service #Use CUPS service
#Generate PDF #Generate PDF
#Print #Print
order_item= print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code) order_item= print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code)
pdf = OrderItemPdf.new(order_item[0]) pdf = OrderItemPdf.new(order_item[0])
pdf.render_file "tmp/receipt.pdf" pdf.render_file "tmp/receipt.pdf"
self.print("tmp/receipt.pdf", printer_name) if oqs.print_copy
self.print("tmp/receipt.pdf", oqs.printer_name)*2
else
self.print("tmp/receipt.pdf", oqs.printer_name)
end
end end
def print_order_summary(printer_name,order_id) def print_order_summary(oqs,order_id)
#Use CUPS service #Use CUPS service
#Generate PDF #Generate PDF
#Print #Print
order=print_query('order_summary',order_id) order=print_query('order_summary',order_id)
filename = "tmp/order_summary_#{order_id}" + ".pdf" # For Print Per Item
pdf = OrderSummaryPdf.new(order) if oqs.cut_per_item
pdf.render_file filename order.each do|odi|
pdf = OrderItemPdf.new(odi)
self.print(filename, printer_name) pdf.render_file "tmp/receipt.pdf"
if oqs.print_copy
self.print("tmp/receipt.pdf", oqs.printer_name)*2
else
self.print("tmp/receipt.pdf", oqs.printer_name)
end
end
# For Print Order Summary
else
filename = "tmp/order_summary_#{order_id}" + ".pdf"
pdf = OrderSummaryPdf.new(order)
pdf.render_file filename
self.print(filename, printer_name)
end
end end
# Query for OQS with status # Query for OQS with status

2
app/pdf/receipt_bill_pdf.rb
View File

@@ -229,7 +229,7 @@ class ReceiptBillPdf < Prawn::Document
stroke_horizontal_rule stroke_horizontal_rule
move_down 5 move_down 5
text "*** Thank You ***", :left_margin => -10, :size => self.header_font_size,:align => :center text "Thank You! See you Again", :left_margin => -10, :size => self.header_font_size,:align => :center
move_down 5 move_down 5
end end

1
app/views/settings/order_queue_stations/_form.html.erb
View File

@@ -4,6 +4,7 @@
<div class="form-inputs"> <div class="form-inputs">
<%= f.input :station_name %> <%= f.input :station_name %>
<%= f.input :is_active %> <%= f.input :is_active %>
<%= f.input :auto_print %>
<%= f.input :printer_name %> <%= f.input :printer_name %>
<%= f.input :font_size %> <%= f.input :font_size %>
<%= f.input :print_copy %> <%= f.input :print_copy %>

2
app/views/settings/order_queue_stations/index.html.erb
View File

@@ -17,6 +17,7 @@
<tr> <tr>
<th>Station name</th> <th>Station name</th>
<th>Is active</th> <th>Is active</th>
<th>Auto Print</th>
<th>Print copy</th> <th>Print copy</th>
<th>Printer name</th> <th>Printer name</th>
<th>Cut per item</th> <th>Cut per item</th>
@@ -31,6 +32,7 @@
<tr> <tr>
<td><%= link_to settings_order_queue_station.station_name, settings_order_queue_station_path(settings_order_queue_station) %></td> <td><%= link_to settings_order_queue_station.station_name, settings_order_queue_station_path(settings_order_queue_station) %></td>
<td><%= settings_order_queue_station.is_active %></td> <td><%= settings_order_queue_station.is_active %></td>
<td><%= settings_order_queue_station.auto_print %></td>
<td><%= settings_order_queue_station.print_copy %></td> <td><%= settings_order_queue_station.print_copy %></td>
<td><%= settings_order_queue_station.printer_name %></td> <td><%= settings_order_queue_station.printer_name %></td>
<td><%= settings_order_queue_station.cut_per_item %></td> <td><%= settings_order_queue_station.cut_per_item %></td>

5
app/views/settings/order_queue_stations/show.html.erb
View File

@@ -18,6 +18,11 @@
<%= @settings_order_queue_station.is_active %> <%= @settings_order_queue_station.is_active %>
</p> </p>
<p>
<strong>Auto Print:</strong>
<%= @settings_order_queue_station.auto_print %>
</p>
<p> <p>
<strong>Processing items:</strong> <strong>Processing items:</strong>
<%= @settings_order_queue_station.processing_items %> <%= @settings_order_queue_station.processing_items %>

4
db/seeds.rb
View File

@@ -147,8 +147,8 @@ admin_employee = Employee.create({name: "Waiter", role: "waiter", password: "111
admin_employee = Employee.create({name: "Waiter 2", role: "waiter", password: "22222", emp_id:"222", created_by: "SYSTEM DEFAULT"}) admin_employee = Employee.create({name: "Waiter 2", role: "waiter", password: "22222", emp_id:"222", created_by: "SYSTEM DEFAULT"})
admin_employee = Employee.create({name: "Cashier", role: "cashier", password: "33333", emp_id:"333", created_by: "SYSTEM DEFAULT"}) admin_employee = Employee.create({name: "Cashier", role: "cashier", password: "33333", emp_id:"333", created_by: "SYSTEM DEFAULT"})
order_station1=PrintSetting.create({name: "OrderItemPdf", unique_code: "OrderItemPdf", printer_name: "EPSON-TM-T82-S-A"}) # order_station1=PrintSetting.create({name: "OrderItemPdf", unique_code: "OrderItemPdf", printer_name: "EPSON-TM-T82-S-A"})
order_station2=PrintSetting.create({name: "Order Summary", unique_code: "OrderSummaryPdf", printer_name: "EPSON-TM-T82-S-A"}) # order_station2=PrintSetting.create({name: "Order Summary", unique_code: "OrderSummaryPdf", printer_name: "EPSON-TM-T82-S-A"})
request_bill_printer=PrintSetting.create({name: "Receipt Bill", unique_code: "ReceiptBillPdf", printer_name: "EPSON-TM-T82-S-A"}) request_bill_printer=PrintSetting.create({name: "Receipt Bill", unique_code: "ReceiptBillPdf", printer_name: "EPSON-TM-T82-S-A"})
crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "EPSON-TM-T82-S-A"}) crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "EPSON-TM-T82-S-A"})
queue_no_printer=PrintSetting.create({name: "Queue No", unique_code: "QueueNoPdf", printer_name: "EPSON-TM-T82-S-A"}) queue_no_printer=PrintSetting.create({name: "Queue No", unique_code: "QueueNoPdf", printer_name: "EPSON-TM-T82-S-A"})