From 0778df4e80219eff03fd86a1bb62da62ec99a49c Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 15 Jun 2017 14:44:27 +0630
Subject: [PATCH] order fix for booking

---
 app/controllers/api/orders_controller.rb |  11 +++++------
 app/models/order.rb                      |   2 +-
 dump.rdb                                 | Bin 18819 -> 18312 bytes
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index 7fecf7bf..6cb7117c 100644
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -39,12 +39,11 @@ class Api::OrdersController <  Api::ApiController
         # check booking id is already completed.
         booking = Booking.find(params[:booking_id])
         if !booking.sale_id.nil?
-          if booking.sale.sale_status == "completed"
-            @order.new_booking = true
-          else
-            @order.new_booking = false
-            @order.booking_id = params[:booking_id]
-          end
+          booking.sale.sale_status == "completed"
+          @order.new_booking = true          
+        else
+          @order.new_booking = false
+          @order.booking_id = params[:booking_id]
         end
       end
 
diff --git a/app/models/order.rb b/app/models/order.rb
index a53ba3cf..cd1f9233 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -32,7 +32,7 @@ class Order < ApplicationRecord
       table =  DiningFacility.find(self.table_id)
       table.status = "occupied"
       table.save
-    else
+    else      
       booking = Booking.find(self.booking_id)
     end
 
diff --git a/dump.rdb b/dump.rdb
index 41c567606bc13396e2e153dee67be78b0d7f6794..a449502b3451ef91aa35131327a4a23e02a9363b 100644
GIT binary patch
delta 99
zcmV-p0G$7WlL3g20gx~eRzX5p`UrJ%Wn?XFWo^Qcr;$N?1JWMQk-+y1G&3?aE-^4Q
zIXO5plfwah0mzd<0wV?=!$I0YO_M<ihO_VjLkW{_D~7YQ4v9JeP?J7MJqXLMi8-}I
Fk|;#vB_;p>

delta 384
zcmWm8ze^iY902fpms%4^D7H{RD0~wQS-k7}eeX3Da!IK!MG!$8Y<$Vx)j)pGnBbz6
zQd-<vbKN_3a8oF_rOCgbP@DoCx;hAgQ*r!kpQEqnQ;fdh*?zISb(ie#g@MxwTO;e_
z*gr`8Sv)@;-lnM{+GP||CcSu!4$(07?S+Rh_OHrsVt?k#*|l9sCH|J1_sDZ2aL5^R
zD3>*d^N=|PN7Sj&07o)V2_7jEzlVH!D!2A(-N6%NWptdS<ii}*tR|!qBBESSZnWaq
z3k8Mm&+6UK^unNOdbt;bYmZT;1$U`dm<tU}tG)AUf*>QXB#O9%NlFL>nCf;r-D)el
ziOjpw=S-#3ZwBo`528jp0P}Jh_8YxjD0KXz>=S|t%ai2g@b&M#k2m&uSO+$E@YJ^l
zX|5%c!ey8#iD6(6s@7o%E?``GWHl!C^Wn(ikg~Nre0;wXgev8^gnL3_en!%>MSInb
U&B}cIb|shm`Q!TE#%X5zKQXy*TmS$7