From 4a85039170062deed1a94aaa88682f004cc71446 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 5 Sep 2017 14:07:20 +0630
Subject: [PATCH] update oqs action cable for order cahnnel and oqs channel

---
 app/assets/javascripts/OQS.js                          | 5 ++++-
 app/assets/javascripts/channels/order_queue_station.js | 5 +++--
 app/assets/stylesheets/OQS.scss                        | 2 ++
 app/controllers/oqs/home_controller.rb                 | 1 +
 app/views/oqs/home/index.html.erb                      | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 1588ac0f..ed5defe3 100644
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -23,6 +23,9 @@ $(document).ready(function(){
 	// setTimeout(function(){
 	//    window.location.reload(1);
 	// }, 10000);
+	// $oqs_count = document.getElementById("oqsBox").style.order =1;
+	// $("#oqsBox").css("order", 1);
+
 	$(".nav-completed").on("click", function(){
        $("#completed").removeClass('hide')
        $(".oqs_append").addClass('hide')
@@ -54,7 +57,7 @@ $(document).ready(function(){
 	        for(var field in data) {
 	          var price = parseFloat(data[field].price).toFixed(2);
 
-	          if (data[field]["options"] == "[]") {
+	          if (data[field]["options"] == "[]" || data[field]["options"] == "") {
 	           var options = "";
 	          }else{
 	           var options = data.options;
diff --git a/app/assets/javascripts/channels/order_queue_station.js b/app/assets/javascripts/channels/order_queue_station.js
index 45a59b1d..5c7c710a 100644
--- a/app/assets/javascripts/channels/order_queue_station.js
+++ b/app/assets/javascripts/channels/order_queue_station.js
@@ -11,7 +11,7 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
   	items = data.order;
   	for(var field in items) {
   		var price = parseFloat(items[field].price).toFixed(2);
-  		if (items[field]["options"] == "[]") {
+  		if (items[field]["options"] == "[]" || data[field]["options"] == "") {
   			var options = "";
   		}else{
   			var options = items.options;
@@ -33,7 +33,8 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
   		var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
 
   		if (oqs_id == items[field]["order_queue_station_id"]) {
-  			row ='<div class="card queue_station">'
+
+  			row ='<div class="card queue_station" id="oqsBox" style="order: initial;">'
 		  		+'<div class="card-block">'
 		  		+'<h4 class="card-title">'
 		  		+'<span class="order-zone-type">'+items[field]["table_type"]+'- </span>'
diff --git a/app/assets/stylesheets/OQS.scss b/app/assets/stylesheets/OQS.scss
index 74a8032f..108c7541 100644
--- a/app/assets/stylesheets/OQS.scss
+++ b/app/assets/stylesheets/OQS.scss
@@ -25,3 +25,5 @@
 	font-size: 18px;
 	margin: 0px 0px 5px 0px;	
 }
+
+
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index dae8b02f..af843c7e 100644
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -131,6 +131,7 @@ class Oqs::HomeController < BaseOqsController
               left join dining_facilities as df on df.id = bk.dining_facility_id")
     .where("assigned_order_items.delivery_status = #{status}  AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs} ")
     query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
+    .order("assigned_order_items.assigned_order_item_id desc")
     .group("assigned_order_items.assigned_order_item_id")
 
   end
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 001c901f..79e0e69f 100644
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -37,7 +37,7 @@
                 <a class="nav-link" data-id="<%= qsi.id  %>" data-toggle="tab" href="" role="tab" <%= status %>>
                   <%= qsi.station_name %>
                   <% if @filter.nil? %>
-                    <span class="badge badge-pill badge-default oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>"> <%= qsi.assigned_order_items.where("delivery_status=0").count %>                
+                    <span class="badge badge-pill badge-default oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>"> <%= qsi.assigned_order_items.where("delivery_status=0 AND created_at >= '#{Time.now.beginning_of_day.utc}'").count %>                
                     </span> 
                   <%else%>
                     <span class="badge badge-pill badge-default" data-id="<%= qsi.id  %>">