From 5b99a8cf650959911cb867fec82061e16ab80ca3 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 13 Mar 2018 10:26:18 +0630
Subject: [PATCH] update reload second display

---
 app/assets/javascripts/addorder.js             | 18 ++++++++++--------
 .../channels/second_display_view.js            | 10 +++++-----
 .../origami/second_display/index.html.erb      |  8 ++++++++
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 1ddde0e4..32054b53 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -776,17 +776,17 @@ $(function() {
     e.preventDefault();
     $("#oqs_loading_wrapper").show();
     
-    type = window.location.href.indexOf("quick_service");
-    if (type != -1) {
+    quick_service = window.location.href.indexOf("quick_service");
+    if (quick_service != -1) {
       type = 'quick_service'
-      var table_type = $('#table_type').text();
+      var table_type  = $('#table_type').text();
       var table_id    = $('#table_id').val();
       var customer_id = $('#customer_id').val();
       var booking_id  = $('#booking_id').text();
       var ajax_url = 'addorders/create';
     }else{
       type = 'cashier'
-      var table_type = $('#table_type').text();
+      var table_type  = $('#table_type').text();
       var table_id    = $('#table_id').text();
       var customer_id = $('#customer_id').text();
       var booking_id  = $('#booking_id').text();
@@ -813,17 +813,19 @@ $(function() {
           data: params,
           dataType: "json",
            success:function(result){ 
-            customer_display_view(null,"reload");
+            console.log(type)
+            console.log(table_type)
               if (type == "quick_service") {
-                  window.location.href = "/origami/quick_service"
+                   window.location.href = "/origami/quick_service"
               }else{
                 if(table_type == "Table"){
-                  window.location.href = "/origami/table/" + table_id
+                   window.location.href = "/origami/table/" + table_id
                 }
                 else {
-                  window.location.href = "/origami/room/" + table_id
+                   window.location.href = "/origami/room/" + table_id
                 } 
               }
+              customer_display_view(null,"reload");
            }
         });
       // }else{
diff --git a/app/assets/javascripts/channels/second_display_view.js b/app/assets/javascripts/channels/second_display_view.js
index 00d4904c..c6ac124c 100644
--- a/app/assets/javascripts/channels/second_display_view.js
+++ b/app/assets/javascripts/channels/second_display_view.js
@@ -10,10 +10,12 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', {
     var tax   = data.tax_profiles;
     var status= data.status
     if (status == "reload") {
-      window.location.reload();
+      jQuery('#s_reload').click();
     }
-    $('#second_display_slider').addClass("hidden")
-    $('#second_display_items').removeClass("hidden")
+      $('#second_display_slider').addClass("hidden")
+      $('#second_display_items').removeClass("hidden")
+    
+    
     // append items
     if (status == "add") {
       for(var i in items) {
@@ -84,8 +86,6 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', {
        var attribute_arr = [];
       var rowCount = $('.second_display_items tbody tr').length+1;
       for(var i in items) {
-
-        
           code          = items[i].code;
           item_code     = items[i].item_code;
           name          = items[i].name;
diff --git a/app/views/origami/second_display/index.html.erb b/app/views/origami/second_display/index.html.erb
index ea97b891..1973363c 100644
--- a/app/views/origami/second_display/index.html.erb
+++ b/app/views/origami/second_display/index.html.erb
@@ -1,4 +1,5 @@
 <div class="container-fluid">
+    <button type="button" class="hidden" id="s_reload">Reload</button>
     <div class="slider" id="second_display_slider">
     	<%= render 'slider' %>
     </div>
@@ -7,5 +8,12 @@
     	<%= render 'second_display' %>
     </div>
 </div>
+<script type="text/javascript">
+	$(document).ready(function () {
+      $('#s_reload').on('click', function () {
+      window.location.href = '/origami/second_display';
+      });
+    });
+</script>