From e3e41bd64e2721a37ec0d6527594ff1e01063904 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Sun, 4 Jun 2017 10:12:33 +0630
Subject: [PATCH] Update

---
 Gemfile                         | 4 ++--
 Gemfile.lock                    | 4 ++--
 app/jobs/order_broadcast_job.rb | 8 ++++++++
 app/models/order.rb             | 6 +++---
 app/models/order_item.rb        | 3 ++-
 5 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 app/jobs/order_broadcast_job.rb

diff --git a/Gemfile b/Gemfile
index d42da647..d64ba992 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,8 +9,8 @@ end
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.1.0'
 # Use mysql as the database for Active Record
-gem 'mysql2', '>= 0.3.18', '< 0.5'
-#gem 'pg'
+#gem 'mysql2', '>= 0.3.18', '< 0.5'
+gem 'pg'
 # Use Puma as the app server
 gem 'puma', '~> 3.0'
 # Use SCSS for stylesheets
diff --git a/Gemfile.lock b/Gemfile.lock
index 6936e5f1..c47d6574 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -96,11 +96,11 @@ GEM
     mini_portile2 (2.1.0)
     minitest (5.10.2)
     multi_json (1.12.1)
-    mysql2 (0.4.6)
     nio4r (2.1.0)
     nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
     pdf-core (0.7.0)
+    pg (0.20.0)
     prawn (2.2.2)
       pdf-core (~> 0.7.0)
       ttfunk (~> 1.5)
@@ -232,7 +232,7 @@ DEPENDENCIES
   jbuilder (~> 2.5)
   jquery-rails
   listen (~> 3.0.5)
-  mysql2 (>= 0.3.18, < 0.5)
+  pg
   prawn
   prawn-table
   puma (~> 3.0)
diff --git a/app/jobs/order_broadcast_job.rb b/app/jobs/order_broadcast_job.rb
new file mode 100644
index 00000000..95d14f56
--- /dev/null
+++ b/app/jobs/order_broadcast_job.rb
@@ -0,0 +1,8 @@
+class OrderBroadcastJob < ApplicationJob
+  queue_as :default
+
+  def perform(message)
+  	order = Order.find(message) # message come as order_id
+  #  ApplicationCable.server.broadcast "order_queue_station_channel", order: order
+  end
+end
diff --git a/app/models/order.rb b/app/models/order.rb
index 273cd62c..fbbc70c5 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -211,7 +211,7 @@ class Order < ApplicationRecord
         left join dining_facilities on dining_facilities.id = bookings.dining_facility_id
         left join order_items on order_items.order_id = orders.id")
         .where("dining_facilities.type=? and orders.order_type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,"dine_in",true)
-        .group("orders.id") 
+        .group("orders.id,order_items.id,dining_facilities.name")
   end
    #Origami: Cashier : to view order type Room
   def self.get_order_rooms
@@ -222,7 +222,7 @@ class Order < ApplicationRecord
           left join dining_facilities on dining_facilities.id = bookings.dining_facility_id
           left join order_items on order_items.order_id = orders.id")
           .where("dining_facilities.type=? and orders.order_type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,"dine_in",true)
-          .group("orders.id")
+          .group("orders.id,order_items.id,dining_facilities.name")
   end
   #Origami: Cashier : to view orders
   def self.get_orders
@@ -233,6 +233,6 @@ class Order < ApplicationRecord
           left join dining_facilities on dining_facilities.id = bookings.dining_facility_id
           left join order_items on order_items.order_id = orders.id")
           .where("dining_facilities.is_active=?",true)
-          .group("orders.id")
+          .group("orders.id,order_items.id,dining_facilities.name")
   end
 end
diff --git a/app/models/order_item.rb b/app/models/order_item.rb
index f839ad99..0e95b0b3 100644
--- a/app/models/order_item.rb
+++ b/app/models/order_item.rb
@@ -37,6 +37,7 @@ class OrderItem < ApplicationRecord
   def self.get_order_items_details(order_id)
     order_details = OrderItem.select("order_items.item_name,order_items.qty,order_items.price,(order_items.qty*order_items.price) as total_price")
          .joins("left join orders on orders.id = order_items.order_id")
-         .where("order_items.order_id=?",order_id)     
+         .where("order_items.order_id=?",order_id)
+          
   end
 end