origami changes

app/models/booking.rb

@@ -1,5 +1,7 @@
 
 class Booking < ApplicationRecord
+
+
   self.primary_key = "booking_id"
 
   #primary key - need to be unique

app/models/dining_facility.rb

@@ -1,6 +1,7 @@
 class DiningFacility < ApplicationRecord
   belongs_to :zone
-
+  has_many :bookings
+  
   TABLE_TYPE = "Table"
   ROOM_TYPE = "Room"
 
@@ -9,8 +10,8 @@ class DiningFacility < ApplicationRecord
   scope :active, -> {where(is_active: true)}
 
   def get_current_booking
-    puts "enter booking"    
-    booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and checkout_at is null").limit(1)    
+    puts "enter booking"
+    booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and checkout_at is null").limit(1)
 
     if booking.count > 0 then
       return booking[0].booking_id
@@ -21,10 +22,10 @@ class DiningFacility < ApplicationRecord
 
   def get_new_booking
     # query for new
-    # if status      
+    # if status
       # to ask when req bill booking_status?
       booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and sale_id is null and checkout_at is null").limit(1)
-    # else 
+    # else
     #   booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and sale_id not null").limit(1)
     # end
 

app/models/order.rb

@@ -231,7 +231,7 @@ class Order < ApplicationRecord
                     .joins("left join orders on orders.order_id = booking_orders.order_id")
                     .joins("left join sales on sales.sale_id = bookings.sale_id")
                     .where("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::TABLE_TYPE,true)
-                    .group("bookings.booking_id")
+                    .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id")
                     # For PG
                     # booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true
                     # sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id
@@ -262,7 +262,7 @@ class Order < ApplicationRecord
                     .joins("left join orders on orders.order_id = booking_orders.order_id")
                     .joins("left join sales on sales.sale_id = bookings.sale_id")
                     .where("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::ROOM_TYPE,true)
-                    .group("bookings.booking_id")
+                    .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id")
                     # For PG
                     # booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true
                     # sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id

app/models/room.rb

@@ -1,3 +1,4 @@
 class Room < DiningFacility
 
+  # has_many :bookings, :foreign_key => 'dining_facility_id'
 end

app/models/table.rb

@@ -1,4 +1,4 @@
 class Table < DiningFacility
   has_many :dining_ins
-
+  # has_many :bookings, :foreign_key => 'dining_facility_id'
 end

app/models/table_booking.rb

@@ -1,3 +1,3 @@
 class TableBooking < Booking
-  
+  belongs_to :sale
 end