From b8c87fda6c92bc55c271c93cb0e27a203c62da26 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 2 Oct 2018 11:24:32 +0630
Subject: [PATCH] check status

---
 .../api/order_reserve/order_reservation_controller.rb         | 2 +-
 app/views/origami/reservation/index.html.erb                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb
index fc05fe20..aa157a2c 100644
--- a/app/controllers/api/order_reserve/order_reservation_controller.rb
+++ b/app/controllers/api/order_reserve/order_reservation_controller.rb
@@ -131,7 +131,7 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 					result = {:status=> false, :message => "Status :: "+order_reservation.status+" cann't get FOC!" }
 				end
 			elsif status == 'VOID'
-				if order_reservation.status == "ready_to_delivery"
+				if order_reservation.status == "ready_to_delivery" || order_reservation.status == "delivered"
 					OrderReservation.update_order_reservation(order_reservation_id, nil, nil,nil,reason)
 					result = {:status=> true, :message => "VOID successfully" }
 				else
diff --git a/app/views/origami/reservation/index.html.erb b/app/views/origami/reservation/index.html.erb
index 1374983b..1575b1e5 100644
--- a/app/views/origami/reservation/index.html.erb
+++ b/app/views/origami/reservation/index.html.erb
@@ -136,10 +136,10 @@
     <div class="col-xs-9 col-sm-9 col-md-9 col-lg-9">
       <div class="card font-13">
         <div class="row clearfix">
-          <div class="col-xs-5 col-sm-5 col-md-5 col-lg-5" id="process-reservation-slimscroll" data-height="-80">
+          <div class="col-xs-7 col-sm-7 col-md-7 col-lg-7" id="process-reservation-slimscroll" data-height="-80">
             
           </div>
-          <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4" id="reservation-info-slimscroll" data-height="-80">
+          <div class="col-xs-5 col-sm-5 col-md-5 col-lg-5" id="reservation-info-slimscroll" data-height="-80">
 
           </div>
         </div>