change crm booking
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
class Origami::RequestBillsController < BaseOrigamiController
|
||||
|
||||
def create
|
||||
def show
|
||||
@sale = Sale.new
|
||||
|
||||
|
||||
|
||||
@@ -218,7 +218,6 @@ class Order < ApplicationRecord
|
||||
left join dining_facilities on dining_facilities.id = bookings.dining_facility_id
|
||||
left join order_items on order_items.order_id = orders.order_id")
|
||||
.where("dining_facilities.type=? and orders.order_type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,"dine_in",true)
|
||||
|
||||
.group("orders.order_id, order_items.order_items_id,dining_facilities.name")
|
||||
end
|
||||
def self.get_booking_order_table
|
||||
@@ -271,7 +270,6 @@ class Order < ApplicationRecord
|
||||
left join sale_orders on sale_orders.order_id = orders.order_id
|
||||
left join sales on sales.sale_id = sale_orders.sale_id")
|
||||
.where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to)
|
||||
|
||||
.group("orders.order_id,order_items.order_items_id,dining_facilities.name,sales.receipt_no,bookings.booking_id,sales.sale_id")
|
||||
|
||||
end
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
if (@booking)
|
||||
json.id @booking.booking_id
|
||||
json.status @booking.booking_status
|
||||
json.checkin_at @booking.checkin_at
|
||||
json.checkin_at @booking.checkin_at.strftime("%d-%m-%Y")
|
||||
json.checkin_by @booking.checkin_by
|
||||
json.table_name @booking.dining_facility.name
|
||||
|
||||
@@ -17,9 +17,9 @@ if (@booking)
|
||||
order_items = []
|
||||
@booking.booking_orders.each do |bo|
|
||||
order = Order.find(bo.order_id)
|
||||
if (order.status == "new")
|
||||
#if (order.status == "new")
|
||||
order_items = order_items + order.order_items
|
||||
end
|
||||
#end
|
||||
end
|
||||
|
||||
json.order_items order_items do |item|
|
||||
|
||||
@@ -40,7 +40,7 @@ $(function(){
|
||||
$(".summary-items tbody tr").remove();
|
||||
$("#cancel").removeAttr("disabled");
|
||||
$("#assign").removeAttr("disabled");
|
||||
var url = $(this).attr('data-ref');alert(url);
|
||||
var url = $(this).attr('data-ref');
|
||||
show_details(url);
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user