From 37f3ef7a0d088c2ea2a703e0914c536f98e54e82 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 30 Mar 2018 15:07:48 +0630
Subject: [PATCH] update customer assign redirect

---
 app/controllers/origami/quick_service_controller.rb |  2 +-
 app/views/origami/customers/index.html.erb          | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb
index 8abcfcc8..d2194bb5 100644
--- a/app/controllers/origami/quick_service_controller.rb
+++ b/app/controllers/origami/quick_service_controller.rb
@@ -12,7 +12,7 @@ class Origami::QuickServiceController < ApplicationController
     day = Date.today.wday
     @menus    = Menu.all
     @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
-    @zone   = Zone.all
+    @zone     = Zone.all
     @customer = Customer.all
     @tables   = Table.all.active.order('status desc')
     @rooms    = Room.all.active.order('status desc')
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index f36ca636..ab67d9fb 100755
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -119,11 +119,13 @@
           <input type="hidden" id="type" name="type" value="<%= @cashier_type %>" />
           <input type="hidden" id="page" name="page" value="<%= @page %>" />
           <%if !@dining_facility.nil?%>
-          <input type="hidden" id="table_id" name="table_id" value="<%= @dining_facility.id %>" />
-          <input type="hidden" id="type" name="type" value="<%= @dining_facility.type %>" />
+           <input type="hidden" id="table_id" name="table_id" value="<%= @dining_facility.id %>" />
+           <input type="hidden" id="type" name="type" value="<%= @dining_facility.type %>" />
+           <input type="hidden" id="table_type" name="table_type" value="<%= @dining_facility.type %>" />
           <%else%>
             <input type="hidden" id="table_id" name="table_id" value="" />
-          <input type="hidden" id="type" name="type" value="" />
+            <input type="hidden" id="type" name="type" value="" />
+           <input type="hidden" id="table_type" name="table_type" value="" />
           <%end%>
           <%= f.error_notification %>
           <%= f.hidden_field :id, :class => "form-control col-md-6 " %>    
@@ -469,7 +471,7 @@
           if(data.status == true)
           {
             var id       = $("#table_id").val();
-            var type     = $("#type").val();
+            var type     = $("#table_type").val();
             var booking_id = "";
             <% if !@booking_order.nil? %>
               booking_id = "<%= @booking_order.booking_id %>";
@@ -502,7 +504,7 @@
 
   $('#back').on('click',function(){
     var id       = $("#table_id").val();
-    var type     = $("#type").val();
+    var type     = $("#table_type").val();
     var sale_id  = $("#sale_id").val();
     if (cashier_type == "quick_service") {
       window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';