check order for booking status moved
This commit is contained in:
@@ -28,4 +28,13 @@ $(function(){
|
||||
|
||||
});
|
||||
/*new customer UI func:*/
|
||||
});
|
||||
});
|
||||
|
||||
/*customer UI tab btn*/
|
||||
function nextTab(elem) {
|
||||
$(elem).parent().next().find('a[data-toggle="tab"]').click();
|
||||
}
|
||||
function prevTab(elem) {
|
||||
$(elem).parent().prev().find('a[data-toggle="tab"]').click();
|
||||
}
|
||||
/*customer UI tab btn*/
|
||||
@@ -32,7 +32,7 @@ class Origami::HomeController < BaseOrigamiController
|
||||
@shop = shop_detail
|
||||
@membership = MembershipSetting::MembershipSetting
|
||||
@payment_methods = PaymentMethodSetting.all
|
||||
@dining_booking = @dining.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ")
|
||||
@dining_booking = @dining.bookings.active #.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ")
|
||||
#@dining_booking = @dining.bookings.active.where("created_at between '#{DateTime.now.utc - 12.hours}' and '#{DateTime.now.utc}'")
|
||||
@order_items = Array.new
|
||||
@dining_booking.each do |booking|
|
||||
|
||||
@@ -35,7 +35,7 @@ class Transactions::BookingsController < ApplicationController
|
||||
def show
|
||||
|
||||
@booking = Booking.find(params[:id])
|
||||
@order = []
|
||||
@order = nil
|
||||
@order_items = []
|
||||
@booking.booking_orders.each do |booking_order|
|
||||
@order = Order.find(booking_order.order_id)
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<div class="connecting-line border-right"></div>
|
||||
<a href="#step1" class="nav-link active" data-toggle="tab" aria-controls="reservation" role="tab" title="Reservation">
|
||||
<span class="round-tab">
|
||||
1s
|
||||
1
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
@@ -76,7 +76,7 @@
|
||||
</div>
|
||||
<div class="row text-center">
|
||||
<div class="form-group col-sm-12 col-md-12 col-lg-12">
|
||||
<button class="btn bg-blue btn-lg waves-effect">CHECK AVAILABLE</button>
|
||||
<button class="btn bg-blue btn-lg waves-effect next-step">CHECK AVAILABLE</button>
|
||||
</div>
|
||||
</div>
|
||||
</div><!-- .end.tab-content .reservation -->
|
||||
@@ -91,7 +91,9 @@
|
||||
</div>
|
||||
<div class="col-xs-5 col-sm-5 col-md-5 col-lg-5">
|
||||
<div class="card font-13">
|
||||
|
||||
<div class="row">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
|
||||
|
||||
Reference in New Issue
Block a user