git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check status

Browse Source
This commit is contained in:
phyusin
2018-10-02 11:24:32 +06:30
parent 9731e676b4
commit b8c87fda6c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/order_reserve/order_reservation_controller.rb
View File

@@ -131,7 +131,7 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
result = {:status=> false, :message => "Status :: "+order_reservation.status+" cann't get FOC!" } result = {:status=> false, :message => "Status :: "+order_reservation.status+" cann't get FOC!" }
end end
elsif status == 'VOID' 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) OrderReservation.update_order_reservation(order_reservation_id, nil, nil,nil,reason)
result = {:status=> true, :message => "VOID successfully" } result = {:status=> true, :message => "VOID successfully" }
else else

4
app/views/origami/reservation/index.html.erb
View File

@@ -136,10 +136,10 @@
<div class="col-xs-9 col-sm-9 col-md-9 col-lg-9"> <div class="col-xs-9 col-sm-9 col-md-9 col-lg-9">
<div class="card font-13"> <div class="card font-13">
<div class="row clearfix"> <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>
<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>
</div> </div>