From 44389d485a4ac3ec4866e7546f523ed51b129eea Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 13 Mar 2018 17:38:25 +0630
Subject: [PATCH] update request bill reload in quick service

---
 app/controllers/origami/request_bills_controller.rb | 8 +++++---
 app/views/origami/pending_order/show.html.erb       | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index 409177fe..f6dd4e14 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -8,9 +8,7 @@ class Origami::RequestBillsController < ApplicationController
     if !ShiftSale.current_shift.nil?
       order_id = params[:id] # order_id
       bk_order = BookingOrder.find_by_order_id(order_id)
-      puts params[:id]
-      puts bk_order
-      puts bk_order.booking_id
+      order = Order.find(order_id)
       check_booking = Booking.find_by_booking_id(bk_order.booking_id)
       
       if check_booking.sale_id.nil?
@@ -29,6 +27,10 @@ class Origami::RequestBillsController < ApplicationController
 
       # Promotion Activation
       Promotion.promo_activate(@sale)
+      if order.source == "quick_service"
+        result = {:status=> @status, :data => @sale.sale_id }
+          render :json => result.to_json
+      end
     else
       @status = false
       @error_message = "No Current Open Shift for This Employee"
diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb
index fade7ccb..d7c929f7 100644
--- a/app/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -203,11 +203,12 @@ $(document).ready(function(){
           url: ajax_url,
           // data: 'order_id='+ order_id,
           success: function (result) {
+            console.log(result)
               if (!result.status) {
                 swal("Information!", result.error_message);
               }
               else {              
-                location.reload();
+                window.location.href = '../pending_order/'+ result.data;
               }
           }
       });