' +
+ template: '
' +
'' +
' ' +
'{1} ' +
diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb
index 387b7bf8..4b58e52d 100755
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -46,7 +46,8 @@ class Api::BillController < Api::ApiController
Promotion.promo_activate(@sale)
- BillBroadcastJob.perform_later(table)
+ #BillBroadcastJob.perform_later(table)
+ ActionCable.server.broadcast "bill_channel",table: table
else
@status = false
@error_message = "No Current Open Shift"
diff --git a/app/controllers/api/call_waiters_controller.rb b/app/controllers/api/call_waiters_controller.rb
index bfb1023a..7cf80a5d 100644
--- a/app/controllers/api/call_waiters_controller.rb
+++ b/app/controllers/api/call_waiters_controller.rb
@@ -5,7 +5,8 @@ class Api::CallWaitersController < ActionController::API
@table_id = params[:dining_id]
@time = params[:time]
@table = DiningFacility.find(@table_id)
- CallWaiterJob.perform_later(@table,@time)
+ # CallWaiterJob.perform_later(@table,@time)
+ ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time
# get printer info
@shop = Shop::ShopDetail
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index b924702e..f8bef2de 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -10,7 +10,9 @@ class Oqs::EditController < BaseOqsController
qty_weight = params[:qty_weight]
remarks = params[:remarks]
- order_item = OrderItem.find(order_items_id);
+ order_item = OrderItem.find(order_items_id)
+ before_updated_qty = order_item.qty
+
order_item.item_order_by = current_user.name
order_item.qty = qty_weight
order_item.remark = remarks
@@ -45,7 +47,7 @@ class Oqs::EditController < BaseOqsController
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, oqs, order_item.order_id, order_items_id, print_status=" (Updated)" )
+ order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty )
end
end
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 5ecd6920..471169a8 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -1,7 +1,7 @@
class Oqs::HomeController < BaseOqsController
def index
- @queue_stations = OrderQueueStation.all
+
# Query for OQS with delivery status false
# @queue_items_details = queue_items_query(false)
@@ -11,26 +11,28 @@ class Oqs::HomeController < BaseOqsController
@filter = params[:filter]
+ @queue_stations = OrderQueueStation.all
+
@queue_completed_item = completed_order(@filter)
- if !@queue_completed_item.empty?
- @queue_completed_item.each do |queue_item|
- if !queue_item.set_menu_items.nil?
- instance_item_sets = JSON.parse(JSON.parse(queue_item.set_menu_items))
- arr_instance_item_sets = Array.new
- instance_item_sets.each do |instance_item|
- item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
- arr_instance_item_sets.push(item_instance_name)
- end
- queue_item.set_menu_items = arr_instance_item_sets
- end
- end
- end
+ # if !@queue_completed_item.empty?
+ # @queue_completed_item.each do |queue_item|
+ # if !queue_item.set_menu_items.nil?
+ # instance_item_sets = JSON.parse(JSON.parse(queue_item.set_menu_items))
+ # arr_instance_item_sets = Array.new
+ # instance_item_sets.each do |instance_item|
+ # item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+ # arr_instance_item_sets.push(item_instance_name)
+ # end
+ # queue_item.set_menu_items = arr_instance_item_sets
+ # end
+ # end
+ # end
if !@filter.nil?
@count = queue_items_count_query(false,@filter)
- @count.each do |count|
+ #@count.each do |count|
- end
+ #end
end
# @queue_stations_items=Array.new
@@ -99,7 +101,6 @@ class Oqs::HomeController < BaseOqsController
end
end
end
-
render :json => items.to_json
end
@@ -194,18 +195,35 @@ class Oqs::HomeController < BaseOqsController
# completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true');
end
+ # def queue_items_count_query(status,filter)
+ # query = AssignedOrderItem.select("count(odt.item_code) as total,oqs.id as 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 order_items as odt ON odt.item_instance_code = assigned_order_items.instance_code AND odt.order_id = assigned_order_items.order_id
+ # left join customers as cus ON cus.customer_id = od.customer_id
+ # left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
+ # left join bookings as bk on bk.booking_id = bo.booking_id
+ # left join dining_facilities as df on df.id = bk.dining_facility_id")
+ # .where("assigned_order_items.delivery_status = #{status} AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' ")
+ # query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
+ # .group("oqs.id")
+
+ # end
+
def queue_items_count_query(status,filter)
- query = AssignedOrderItem.select("count(odt.item_code) as total,oqs.id as 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 order_items as odt ON odt.item_instance_code = assigned_order_items.instance_code AND odt.order_id = assigned_order_items.order_id
+ # query = OrderQueueStation.all
+ query = OrderQueueStation.select("order_queue_stations.id as station_id,
+ (case when (count(odt.item_code)>0) then count(odt.item_code) else 0 end) as total")
+ .joins(" left join assigned_order_items as aoi on aoi.order_queue_station_id= order_queue_stations.id
+ left join orders as od ON od.order_id = aoi.order_id
+ left join order_items as odt ON odt.item_instance_code = aoi.instance_code AND odt.order_id = aoi.order_id
left join customers as cus ON cus.customer_id = od.customer_id
- left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
+ left join booking_orders as bo on bo.order_id = aoi.order_id
left join bookings as bk on bk.booking_id = bo.booking_id
left join dining_facilities as df on df.id = bk.dining_facility_id")
- .where("assigned_order_items.delivery_status = #{status} AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' ")
+ .where("aoi.delivery_status = #{status} AND aoi.created_at >= '#{Time.now.beginning_of_day.utc}' ")
query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
- .group("oqs.id")
+ .group("order_queue_stations.id")
end
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index c78dbc10..5f973c7a 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -38,7 +38,7 @@ class Oqs::PrintController < ApplicationController
# 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,oqs, assigned_item.order_id, order_item.order_items_id, print_status, options )
+ order_queue_printer.print_order_item(print_settings,oqs, assigned_item.order_id, order_item.order_items_id, print_status, "", options )
# update print status for completed same order items
assigned_items.each do |ai|
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index cc8aaaef..f739eb1b 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -6,7 +6,7 @@ class Origami::HomeController < BaseOrigamiController
@tables = Table.all.active.order('status desc')
@rooms = Room.all.active.order('status desc')
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
- @orders = Order.all.order('date desc')
+ @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
@shop = Shop::ShopDetail
# @shift = ShiftSale.current_open_shift(current_user.id)
@@ -17,7 +17,7 @@ class Origami::HomeController < BaseOrigamiController
@tables = Table.all.active.order('status desc')
@rooms = Room.all.active.order('status desc')
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
- @orders = Order.all.order('date desc')
+ @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
@status_order = ""
@status_sale = ""
@@ -26,7 +26,33 @@ class Origami::HomeController < BaseOrigamiController
@shop = Shop::ShopDetail
@membership = MembershipSetting::MembershipSetting
@payment_methods = PaymentMethodSetting.all
-
+
+ @order_items_count = Hash.new
+ bookings = Booking.all
+ if !bookings.nil?
+ bookings.each do |booking|
+ if booking.sale_id.nil? && booking.booking_status != 'moved'
+ if !booking.booking_orders.empty?
+ booking.booking_orders.each do |booking_order|
+ order = Order.find(booking_order.order_id)
+ if !order.order_items.empty?
+ if !@order_items_count.key?(booking.dining_facility_id)
+ @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+ end
+ end
+ end
+ end
+ else
+ sale = Sale.find(booking.sale_id)
+ if sale.sale_status !='completed'
+ if !@order_items_count.key?(booking.dining_facility_id)
+ @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+ end
+ end
+ end
+ end
+ end
+
@dining.bookings.active.each do |booking|
if booking.sale_id.nil? && booking.booking_status != 'moved'
@order_items = Array.new
@@ -65,7 +91,6 @@ class Origami::HomeController < BaseOrigamiController
else
sale = Sale.find(booking.sale_id)
if sale.sale_status != "completed" && sale.sale_status != 'void'
-
@sale_array.push(sale)
if @status_order == 'order'
@status_order = 'sale'
diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index c2670184..ea976ffd 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -3,7 +3,7 @@ class Origami::OrdersController < BaseOrigamiController
@tables = Table.all.active.order('status desc')
@rooms = Room.all.active.order('status desc')
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
- @orders = Order.all.order('status desc')
+ @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
@order = Order.find(params[:order_id])
sale_order = SaleOrder.find_by_order_id(@order.order_id)
if sale_order
@@ -12,6 +12,32 @@ class Origami::OrdersController < BaseOrigamiController
@sale_status = sale.sale_status
end
end
+
+ @order_items_count = Hash.new
+ bookings = Booking.all
+ if !bookings.nil?
+ bookings.each do |booking|
+ if booking.sale_id.nil? && booking.booking_status != 'moved'
+ if !booking.booking_orders.empty?
+ booking.booking_orders.each do |booking_order|
+ order = Order.find(booking_order.order_id)
+ if !order.order_items.empty?
+ if !@order_items_count.key?(booking.dining_facility_id)
+ @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+ end
+ end
+ end
+ end
+ else
+ sale = Sale.find(booking.sale_id)
+ if sale.sale_status !='completed'
+ if !@order_items_count.key?(booking.dining_facility_id)
+ @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+ end
+ end
+ end
+ end
+ end
end
#Shop Name in Navbor
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index e65d9550..adb67963 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -45,8 +45,8 @@ class Origami::PaymentsController < BaseOrigamiController
rebate = MembershipSetting.find_by_rebate(1)
if customer.membership_id != nil && rebate
member_info = Customer.get_member_account(customer)
- # current_balance = SaleAudit.paymal_search(sale_id)
- current_balance = 0
+ current_balance = SaleAudit.paymal_search(sale_id)
+ # current_balance = 0
end
# get printer info
print_settings=PrintSetting.find_by_unique_code(unique_code)
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 13769860..cbf5fdae 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -3,7 +3,7 @@ class Origami::RoomsController < BaseOrigamiController
@tables = Table.all.active.order('status desc')
@rooms = Room.all.active.order('status desc')
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
- @orders = Order.all.order('date desc')
+ @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
# @shift = ShiftSale.current_open_shift(current_user.id)
end
@@ -11,7 +11,7 @@ class Origami::RoomsController < BaseOrigamiController
@tables = Table.all.active.order('status desc')
@rooms = Room.all.active.order('status desc')
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
- @orders = Order.all.order('date desc')
+ @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
@room = DiningFacility.find(params[:room_id])
@@ -22,6 +22,32 @@ class Origami::RoomsController < BaseOrigamiController
@shop = Shop::ShopDetail
@membership = MembershipSetting::MembershipSetting
@payment_methods = PaymentMethodSetting.all
+
+ @order_items_count = Hash.new
+ bookings = Booking.all
+ if !bookings.nil?
+ bookings.each do |booking|
+ if booking.sale_id.nil? && booking.booking_status != 'moved'
+ if !booking.booking_orders.empty?
+ booking.booking_orders.each do |booking_order|
+ order = Order.find(booking_order.order_id)
+ if !order.order_items.empty?
+ if !@order_items_count.key?(booking.dining_facility_id)
+ @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+ end
+ end
+ end
+ end
+ else
+ sale = Sale.find(booking.sale_id)
+ if sale.sale_status !='completed'
+ if !@order_items_count.key?(booking.dining_facility_id)
+ @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+ end
+ end
+ end
+ end
+ end
@room.bookings.active.each do |booking|
if booking.sale_id.nil? && booking.booking_status != 'moved'
diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb
index e57d2ca0..c522f9e7 100755
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -3,7 +3,7 @@ class Origami::SalesController < BaseOrigamiController
@tables = Table.all.active.order('status desc')
@rooms = Room.all.active.order('status desc')
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
- @orders = Order.all.order('date desc')
+ @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
@sale = Sale.find(params[:sale_id])
@order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
@booking = BookingOrder.find_by_order_id(@order).booking_id
diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb
index c4da3475..c897b278 100755
--- a/app/models/dining_facility.rb
+++ b/app/models/dining_facility.rb
@@ -155,6 +155,14 @@ class DiningFacility < ApplicationRecord
def self.check_in_booking(table_id)
table = DiningFacility.find(table_id)
#Send to background job for processing
- CheckInBookingJob.perform_later(table)
+ # CheckInBookingJob.perform_later(table)
+ ActionCable.server.broadcast "check_in_booking_channel",table: table
+ end
+
+ def self.checkin_time
+ table = DiningFacility.get_checkin_booking
+ if table.length > 0
+ ActionCable.server.broadcast "checkin_channel",table: table
+ end
end
end
diff --git a/app/models/order.rb b/app/models/order.rb
index 6c22cb92..5b1601d8 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -278,16 +278,42 @@ class Order < ApplicationRecord
#Process order items and send to order queue
def process_order_queue
#Send to background job for processing
- OrderQueueProcessorJob.perform_later(self.id, self.table_id)
- end
+ cup_status = `#{"sudo service cups status"}`
+ print_status = check_cup_status(cup_status)
+
+ if print_status
+ OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+ else
+ cup_start = `#{"sudo service cups start"}`
+ cup_status = `#{"sudo service cups status"}`
+ print_status = check_cup_status(cup_status)
+
+ if print_status
+ OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+ else
+ msg = ' Print Error ! Please contact to service'
+ ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error'
+ OrderQueueProcessorJob.perform_later(self.id, self.table_id)
+ end
+ end
+
+ end
+
+ def check_cup_status(status)
+ if status.include? "Active: active (running)" || "Active: active (exited)" #"Cup Server is already running"
+ return true
+ end
+ return false
+ end
#send order items and send to order queue
def send_order_broadcast(booking)
table = DiningFacility.find(booking.dining_facility_id)
type = 'order'
#Send to background job for processing
- OrderBroadcastJob.perform_later(table,type)
+ # OrderBroadcastJob.perform_later(table,type)
+ ActionCable.server.broadcast "order_channel",table: table,type:type
end
#Origami: Cashier : to view order Table
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 85264737..4a8b1653 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -1,6 +1,6 @@
class Printer::OrderQueuePrinter < Printer::PrinterWorker
- def print_order_item(print_settings,oqs, order_id, order_item_id, print_status, options="")
+ def print_order_item(print_settings,oqs, order_id, order_item_id, print_status, before_updated_qty="", options="")
#Use CUPS service
#Generate PDF
#Print
@@ -14,7 +14,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
filename = "tmp/order_item_#{order_id}_#{order_item_id}" + ".pdf"
- pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+ pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
# check for item not to show
# if order_item[0].price != 0
@@ -22,15 +22,15 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
order_slim_pdf.each do |order_item_slim|
if order_item_slim[0] == 'OrderSlimPdf'
if order_item_slim[1] == '1'
- pdf = OrderItemSlimPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+ pdf = OrderItemSlimPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
else
- pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+ pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
end
elsif order_item_slim[0] == 'OrderSetPdf'
if order_item_slim[1] == '1'
- pdf = OrderSetItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+ pdf = OrderSetItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
else
- pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+ pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
end
end
end
@@ -52,7 +52,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
end
# Query for per order
- def print_order_summary(print_settings,oqs, order_id, order_items, print_status)
+ def print_order_summary(print_settings,oqs, order_id, order_items, print_status, before_updated_qty="", options="")
#Use CUPS service
#Generate PDF
#Print
@@ -76,20 +76,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
# check for item not to show
#if odi.price != 0
- pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+ pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
if !order_slim_pdf.empty?
order_slim_pdf.each do |order_item_slim|
if order_item_slim[0] == 'OrderSlimPdf'
if order_item_slim[1] == '1'
- pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+ pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
else
- pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+ pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
end
elsif order_item_slim[0] == 'OrderSetPdf'
if order_item_slim[1] == '1'
- pdf = OrderSetItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+ pdf = OrderSetItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
else
- pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+ pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
end
end
end
@@ -109,20 +109,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
# For Print Order Summary
else
filename = "tmp/order_summary_#{order_id}" + ".pdf"
- pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+ pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
if !order_slim_pdf.empty?
order_slim_pdf.each do |order_summary_slim|
if order_summary_slim[0] == 'OrderSlimPdf'
if order_summary_slim[1] == '1'
- pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+ pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
else
- pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+ pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
end
elsif order_summary_slim[0] == 'OrderSetPdf'
if order_summary_slim[1] == '1'
- pdf = OrderSummarySetPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+ pdf = OrderSummarySetPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
else
- pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+ pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
end
end
end
@@ -143,7 +143,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
end
# Print for orders in booking
- def print_booking_summary(print_settings,oqs, booking_id, print_status)
+ def print_booking_summary(print_settings,oqs, booking_id, print_status,before_updated_qty="")
# Must be one print
if print_settings.print_copies == 0
print_settings.print_copies = 1
@@ -162,20 +162,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
# check for item not to show
#if odi.price != 0
- pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)
+ pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)
if !order_slim_pdf.empty?
order_slim_pdf.each do |order_item_slim|
if order_item_slim[0] == 'OrderSlimPdf'
if order_item_slim[1] == '1'
- pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)
+ pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)
else
- pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)
+ pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)
end
elsif order_item_slim[0] == 'OrderSetPdf'
if order_item_slim[1] == '1'
- pdf = OrderSetItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)
+ pdf = OrderSetItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)
else
- pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)
+ pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)
end
end
end
@@ -198,20 +198,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
# For Print Order Summary
else
filename = "tmp/booking_summary_#{booking_id}" + ".pdf"
- pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+ pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
if !order_slim_pdf.empty?
order_slim_pdf.each do |order_summary_slim|
if order_summary_slim[0] == 'OrderSlimPdf'
if order_summary_slim[1] == '1'
- pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+ pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
else
- pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+ pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
end
elsif order_summary_slim[0] == 'OrderSetPdf'
if order_summary_slim[1] == '1'
- pdf = OrderSummarySetPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+ pdf = OrderSummarySetPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
else
- pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+ pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
end
end
end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index f6aed95e..f42b62a0 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -128,7 +128,9 @@ class Sale < ApplicationRecord
booking.checkout_by = requested_by.name
booking.save
- InventoryJob.perform_now(self.id)
+ # InventoryJob.perform_now(self.id)
+ saleObj = Sale.find(self.id)
+ InventoryDefinition.calculate_product_count(saleObj)
return true, self.id
end
@@ -137,6 +139,41 @@ class Sale < ApplicationRecord
end
+ #fOR Quick Service pay and create
+ def self.request_bill(order,current_user,current_login_employee)
+ @sale = Sale.new
+ sale_order=SaleOrder.new
+
+ if shift = ShiftSale.current_open_shift(current_user.id)
+ order_id = order.order_id # order_id
+ bk_order = BookingOrder.find_by_order_id(order_id)
+ check_booking = Booking.find_by_booking_id(bk_order.booking_id)
+
+ if check_booking.sale_id.nil?
+ # Create Sale if it doesn't exist
+ # puts "current_login_employee"
+ # puts current_login_employee.name
+ @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, cashier = nil)
+ @sale_data = Sale.find_by_sale_id(@sale_id)
+ @sale_items = SaleItem.where("sale_id=?",@sale_id)
+ else
+ @sale_data = Sale.find_by_sale_id(check_booking.sale_id)
+ @sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id)
+ end
+
+ # Bind shift sale id to sale
+ @sale_data.shift_sale_id = shift.id
+ @sale_data.save
+
+ # Promotion Activation
+ Promotion.promo_activate(@sale)
+ @status = true
+ return @status, @sale
+ else
+ @status = false
+ @message = "No Current Open Shift for This Employee"
+ end
+ end
#This is when spilt bill is request - then we cannot link order to invoice
#Cos there will be multiple orders - and items are spilt from there.
#Unless order is spilt by then it is possible.
@@ -706,7 +743,7 @@ def self.get_item_query()
query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code,i.account_id as account_id, " +
"SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item,i.qty as qty," +
"i.remark as status_type,"+
- " i.unit_price as unit_price,i.price as price,i.product_name as product_name, mc.name as" +
+ " mii.price as unit_price,i.price as price,i.product_name as product_name, mc.name as" +
" menu_category_name,mc.id as menu_category_id ")
query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id" +
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index ed1b9170..661eb57b 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -335,7 +335,7 @@ class SalePayment < ApplicationRecord
#record an payment in sale-audit
remark = "#{response} Rebate- for Customer #{self.sale.customer_id} | Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
- sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, 1)
+ sale_audit = SaleAudit.record_paymal(sObj.sale_id, remark, 1)
if !response.nil?
if response["status"] == true
@@ -398,6 +398,7 @@ class SalePayment < ApplicationRecord
end
else
status = false
+ sale_count += 1
end
end
end
@@ -408,7 +409,8 @@ class SalePayment < ApplicationRecord
type = 'payment'
#Send to background job for processing
- OrderBroadcastJob.perform_later(table,type)
+ # OrderBroadcastJob.perform_later(table,type)
+ ActionCable.server.broadcast "order_channel",table: table,type:type
end
end
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 9483b847..26253b6e 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -1,7 +1,7 @@
class OrderItemPdf < Prawn::Document
include ActionView::Helpers::NumberHelper
attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
- def initialize(print_settings,order_item, print_status, options, alt_name)
+ def initialize(print_settings,order_item, print_status, options, alt_name, before_updated_qty)
self.page_width = print_settings.page_width
self.page_height = print_settings.page_height
self.margin = 0
@@ -46,7 +46,7 @@ class OrderItemPdf < Prawn::Document
order_info(order_item.order_id, order_item.order_by,order_item.order_at)
# order items
- order_items(order_item, options, alt_name, print_settings.precision)
+ order_items(order_item, options, alt_name, print_settings.precision, before_updated_qty)
end
# Write Order Information to PDF
@@ -74,7 +74,7 @@ class OrderItemPdf < Prawn::Document
end
# Write Order items to PDF
- def order_items(order_item, options, alt_name, precision)
+ def order_items(order_item, options, alt_name, precision, before_updated_qty)
y_position = cursor
#Add Order Item
@@ -82,6 +82,7 @@ class OrderItemPdf < Prawn::Document
dash(1, :space => 1, :phase => 1)
stroke_horizontal_line 0, (self.page_width - self.margin)
+ add_updated_qty_text(before_updated_qty, order_item.qty, precision)
move_down 5
end
@@ -127,4 +128,17 @@ class OrderItemPdf < Prawn::Document
end
+ #add updated qty text
+ def add_updated_qty_text(before_updated_qty, updated_qty, precision)
+ if before_updated_qty.to_i > 0 && !before_updated_qty.nil?
+ move_down 5
+
+ # add option
+ y_position = cursor
+ bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+ text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+ end
+ end
+ end
+
end
diff --git a/app/pdf/order_item_slim_pdf.rb b/app/pdf/order_item_slim_pdf.rb
index 6887d201..f419f185 100644
--- a/app/pdf/order_item_slim_pdf.rb
+++ b/app/pdf/order_item_slim_pdf.rb
@@ -1,7 +1,7 @@
class OrderItemSlimPdf < Prawn::Document
include ActionView::Helpers::NumberHelper
attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
- def initialize(print_settings,order_item_slim, print_status, options, alt_name)
+ def initialize(print_settings,order_item_slim, print_status, options, alt_name, before_updated_qty)
self.page_width = print_settings.page_width
self.page_height = print_settings.page_height
self.margin = 0
@@ -46,7 +46,7 @@ class OrderItemSlimPdf < Prawn::Document
order_info(order_item_slim.order_id, order_item_slim.order_by,order_item_slim.order_at)
# order items slim
- order_items_slim(order_item_slim, options, alt_name, print_settings.precision)
+ order_items_slim(order_item_slim, options, alt_name, print_settings.precision, before_updated_qty)
end
# Write Order Information to PDF
@@ -74,7 +74,7 @@ class OrderItemSlimPdf < Prawn::Document
end
# Write Order items to PDF
- def order_items_slim(order_item_slim, options, alt_name, precision)
+ def order_items_slim(order_item_slim, options, alt_name, precision, before_updated_qty)
y_position = cursor
#Add Order Item
@@ -82,6 +82,7 @@ class OrderItemSlimPdf < Prawn::Document
dash(1, :space => 1, :phase => 1)
stroke_horizontal_line 0, (self.page_width - self.margin)
+ add_updated_qty_text(before_updated_qty, order_item_slim.qty, precision)
move_down 1
end
@@ -126,4 +127,17 @@ class OrderItemSlimPdf < Prawn::Document
end
+ #add updated qty text
+ def add_updated_qty_text(before_updated_qty, updated_qty, precision)
+ if before_updated_qty.to_i > 0 && !before_updated_qty.nil?
+ move_down 1
+
+ # add option
+ y_position = cursor
+ bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+ text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+ end
+ end
+ end
+
end
diff --git a/app/pdf/order_set_item_pdf.rb b/app/pdf/order_set_item_pdf.rb
index 30a800b4..8f915ad0 100644
--- a/app/pdf/order_set_item_pdf.rb
+++ b/app/pdf/order_set_item_pdf.rb
@@ -1,7 +1,7 @@
class OrderSetItemPdf < Prawn::Document
include ActionView::Helpers::NumberHelper
attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
- def initialize(print_settings,order_set_item, print_status, options, alt_name)
+ def initialize(print_settings,order_set_item, print_status, options, alt_name, before_updated_qty)
self.page_width = print_settings.page_width
self.page_height = print_settings.page_height
self.margin = 0
@@ -46,7 +46,7 @@ class OrderSetItemPdf < Prawn::Document
order_info(order_set_item.order_id, order_set_item.order_by,order_set_item.order_at)
# order items
- order_set_items(order_set_item, options, alt_name, print_settings.precision)
+ order_set_items(order_set_item, options, alt_name, print_settings.precision, before_updated_qty)
end
# Write Order Information to PDF
@@ -74,7 +74,7 @@ class OrderSetItemPdf < Prawn::Document
end
# Write Order items to PDF
- def order_set_items(order_set_item, options, alt_name, precision)
+ def order_set_items(order_set_item, options, alt_name, precision, before_updated_qty)
y_position = cursor
#Add Order Item
@@ -82,6 +82,7 @@ class OrderSetItemPdf < Prawn::Document
dash(1, :space => 1, :phase => 1)
stroke_horizontal_line 0, (self.page_width - self.margin)
+ add_updated_qty_text(before_updated_qty, order_set_item.qty, precision)
move_down 5
end
@@ -143,4 +144,17 @@ class OrderSetItemPdf < Prawn::Document
end
+ #add updated qty text
+ def add_updated_qty_text(before_updated_qty, updated_qty, precision)
+ if before_updated_qty.to_i > 0 && !before_updated_qty.nil?
+ move_down 5
+
+ # add option
+ y_position = cursor
+ bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+ text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+ end
+ end
+ end
+
end
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index eb1bdecd..104c4c67 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -155,7 +155,7 @@
<% if !(@total_payment_methods.nil?) %>
<% @total_payment_methods.each do |payment| %>
<% if !@sale_data[0].empty? %>
- <% if payment.payment_method != 'mpu' && payment.payment_method != 'visa' && payment.payment_method != 'master' && payment.payment_method != 'jcb' %>
+ <% if payment.payment_method != 'mpu' && payment.payment_method != 'visa' && payment.payment_method != 'master' && payment.payment_method != 'jcb' && payment.payment_method != 'unionpay' %>
| <%= payment.payment_method.to_s.capitalize %> Sale : |
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index f9ac6d79..a4e8d653 100755
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -77,6 +77,7 @@
-->
<%end%>
+
|