Pull from master

2018-05-18 16:26:03 +06:30
parent 610d39847e
commit c1525be826
12 changed files with 58 additions and 32 deletions
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -116,6 +116,7 @@ class OrderQueueStation < ApplicationRecord
    order = Order.find(order_id)
    order_items = order.order_items

+    Order.pay_process_order_queue(order_id,table_id)
    if table_id.to_i > 0
      # get dining    
      dining = DiningFacility.find(table_id)