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

add table and order no in oqs

Browse Source
This commit is contained in:
Yan
2017-06-26 16:23:00 +06:30
parent 813f2ecf2d
commit f60b3d554a
7 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/OQS.js
View File

@@ -26,7 +26,7 @@ $(document).ready(function(){
$('.queue_station').on('click',function(){ $('.queue_station').on('click',function(){
var orderZone=$(this).children().children().children('.order-zone').text().trim(); var orderZone=$(this).children().children().children('.order-zone').text().trim();
// var orderItem=$(this).children().children().children('.order-item').text(); // var orderItem=$(this).children().children().children('.order-item').text();
//var assigned_item_id = $(this).children().find(".assigned-order-item").text(); var assigned_item_id = $(this).children().find(".assigned-order-item").text();
var orderQty = $(this).children().children().children('.order-qty').text(); var orderQty = $(this).children().children().children('.order-qty').text();
var orderBy = $(this).children().children().children().children('.order-by').text(); var orderBy = $(this).children().children().children().children('.order-by').text();
var orderAt = $(this).children().children().children().children('.order-at').text(); var orderAt = $(this).children().children().children().children('.order-at').text();

2
app/controllers/oqs/home_controller.rb
View File

@@ -109,7 +109,7 @@ class Oqs::HomeController < BaseOqsController
# queue_items.push(queue_item) # queue_items.push(queue_item)
# end # end
# return queue_items # return queue_items
AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.station_name, oqs.is_active, df.name as zone, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at") AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.station_name, oqs.is_active, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at")
.joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
left join orders as od ON od.order_id = assigned_order_items.order_id left join orders as od ON od.order_id = assigned_order_items.order_id
left join order_items as odt ON odt.item_code = assigned_order_items.item_code AND odt.order_id = assigned_order_items.order_id left join order_items as odt ON odt.item_code = assigned_order_items.item_code AND odt.order_id = assigned_order_items.order_id

19
app/models/order_queue_station.rb
View File

@@ -22,7 +22,8 @@ class OrderQueueStation < ApplicationRecord
#Assign OQS id to order Items #Assign OQS id to order Items
oqs_stations.each do |oqs| oqs_stations.each do |oqs|
is_auto_printed = false is_auto_printed = false
oqs_order_items = []
#Get List of items - #Get List of items -
pq_items = JSON.parse(oqs.processing_items) pq_items = JSON.parse(oqs.processing_items)
@@ -37,16 +38,16 @@ class OrderQueueStation < ApplicationRecord
# else # else
AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs)
# end oqs_order_items.push(order_item)
# end
# Auto Printing
# ToDo per item per printer
if oqs.auto_print && is_auto_printed == false
print_slip(oqs, order, order_items)
is_auto_printed = true
end
end end
end end
end
# Auto Printing
# ToDo per item per printer
if oqs.auto_print && is_auto_printed == false
print_slip(oqs, order, oqs_order_items)
is_auto_printed = true
end end
end end
end end

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

@@ -103,7 +103,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
# Query for OQS with status # Query for OQS with status
def print_query(type, id) def print_query(type, id)
if type == "order_item" if type == "order_item"
OrderItem.select("order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.name as dining") OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.type, df.name as dining")
.joins("left join orders ON orders.order_id = order_items.order_id .joins("left join orders ON orders.order_id = order_items.order_id
left join booking_orders AS bo ON bo.order_id=order_items.order_id left join booking_orders AS bo ON bo.order_id=order_items.order_id
left join bookings AS b ON b.booking_id = bo.booking_id left join bookings AS b ON b.booking_id = bo.booking_id
@@ -112,7 +112,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
.where("order_items.item_code = '#{ id }'") .where("order_items.item_code = '#{ id }'")
.group("order_items.item_code") .group("order_items.item_code")
elsif type == "order_summary" elsif type == "order_summary"
OrderItem.select("order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.name as dining") OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.type, df.name as dining")
.joins("left join orders ON orders.order_id = order_items.order_id .joins("left join orders ON orders.order_id = order_items.order_id
left join booking_orders AS bo ON bo.order_id=order_items.order_id left join booking_orders AS bo ON bo.order_id=order_items.order_id
left join bookings AS b ON b.booking_id = bo.booking_id left join bookings AS b ON b.booking_id = bo.booking_id
@@ -122,7 +122,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
.group("order_items.order_items_id") .group("order_items.order_items_id")
else else
# order summary for booking # order summary for booking
OrderItem.select("order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.name as dining") OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.type, df.name as dining")
.joins("left join orders ON orders.order_id = order_items.order_id .joins("left join orders ON orders.order_id = order_items.order_id
left join booking_orders AS bo ON bo.order_id=order_items.order_id left join booking_orders AS bo ON bo.order_id=order_items.order_id
left join bookings AS b ON b.booking_id = bo.booking_id left join bookings AS b ON b.booking_id = bo.booking_id

11
app/pdf/order_item_pdf.rb
View File

@@ -21,21 +21,26 @@ class OrderItemPdf < Prawn::Document
self.header_font_size = 14 self.header_font_size = 14
self.item_font_size = 12 self.item_font_size = 12
text "#{ order_item.dining+print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20 text "#{ order_item.type + '-' + order_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
stroke_horizontal_rule stroke_horizontal_rule
move_down 5 move_down 5
#order_info #order_info
order_info(order_item.order_by,order_item.order_at) order_info(order_item.order_id, order_item.order_by,order_item.order_at)
# order items # order items
order_items(order_item, options) order_items(order_item, options)
end end
# Write Order Information to PDF # Write Order Information to PDF
def order_info(order_by, order_at) def order_info(order_no, order_by, order_at)
y_position = cursor y_position = cursor
bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
text "OrderNo: #{order_no} ", :size => self.item_font_size,:align => :left
end
move_down 5
y_position = cursor
bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left
end end

11
app/pdf/order_summary_pdf.rb
View File

@@ -20,12 +20,12 @@ class OrderSummaryPdf < Prawn::Document
self.header_font_size = 12 self.header_font_size = 12
self.item_font_size = 10 self.item_font_size = 10
text "#{ order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20 text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
stroke_horizontal_rule stroke_horizontal_rule
move_down 5 move_down 5
#order_info #order_info
order_info(order[0].order_by,order[0].order_at) order_info(order[0].order_id, order[0].order_by,order[0].order_at)
# order items # order items
order_items(order) order_items(order)
@@ -33,9 +33,14 @@ class OrderSummaryPdf < Prawn::Document
end end
# Write Order Information to PDF # Write Order Information to PDF
def order_info(order_by, order_at) def order_info(order_no, order_by, order_at)
y_position = cursor y_position = cursor
bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
text "OrderNo: #{order_no} ", :size => self.item_font_size,:align => :left
end
move_down 5
y_position = cursor
bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left
end end

24
app/views/oqs/home/index.html.erb
View File

@@ -39,9 +39,11 @@
<div class="card queue_station"> <div class="card queue_station">
<div class="card-block"> <div class="card-block">
<h4 class="card-title"> <h4 class="card-title">
<span class="order-zone"> <span class="order-zone-type"><%= qid.type %> - </span>
<%= qid.zone %> <span class="order-zone"><%= qid.zone %></span>
</span> - <small class="pull-right"><%= qid.order_id %></small>
</h4>
<h4>
<span class="order-item"> <span class="order-item">
<%= qid.item_name %> <%= qid.item_name %>
</span> [x </span> [x
@@ -89,15 +91,13 @@
<div class="card queue_station"> <div class="card queue_station">
<div class="card-block"> <div class="card-block">
<h4 class="card-title"> <h4 class="card-title">
<span class="order-zone"> <span class="order-zone-type"><%= qid.type %> - </span>
<%= qid.zone %> <span class="order-zone"><%= qid.zone %></span>
</span> - <small class="pull-right"><%= qid.order_id %></small>
<span class="order-item"> </h4>
<%= qid.item_name %> <h4>
</span> [x <span class="order-item"><%= qid.item_name %></span> [x
<span class="order-qty"> <span class="order-qty"><%= qid.qty %></span> ]
<%= qid.qty %>
</span> ]
</h4> </h4>
<p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> <p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p>