print format updating

app/models/order.rb

@@ -228,10 +228,13 @@ class Order < ApplicationRecord
                         bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name")
                     .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id")
                     .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id")
-                    .joins("left join orders on orders.order_id = booking_orders.order_id")
+                    .joins("left join orders on orders.order_id = booking_orders.order_id")                  
                     .joins("left join sales on sales.sale_id = bookings.sale_id")
-                    .where("booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true)
-                    .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id")
+                    .where("(orders.status = 'new' or orders.status = 'billed')")
+                    .group("bookings.booking_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
   end
 
   #Origami: Cashier : to view booking order Table
@@ -243,7 +246,9 @@ 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("sales.sale_status='completed'")
-                     .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id")
+                    .group("sales.sale_id")
+                    # For PG 
+                    #bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id
   end
 
    #Origami: Cashier : to view order type Room
@@ -255,10 +260,12 @@ class Order < ApplicationRecord
                     .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id")
                     .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id")
                     .joins("left join orders on orders.order_id = booking_orders.order_id")
-                    .joins("left join sale_orders on sale_orders.order_id = orders.order_id")
-                    .joins("left join sales on sales.sale_id = sale_orders.sale_id")
-                    .where("booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true)
-                    .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id")
+                    .joins("left join sales on sales.sale_id = bookings.sale_id")
+                    .where("(orders.status = 'new' or orders.status = 'billed')")
+                    .group("bookings.booking_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
   end
 
    #Origami: Cashier : to view order type Room
@@ -271,24 +278,36 @@ class Order < ApplicationRecord
           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::ROOM_TYPE,"dine_in",true)
           .group("orders.order_id,order_items.order_items_id,dining_facilities.name,sales.receipt_no")
-
   end
 
   #Origami: Cashier : to view orders
   def self.get_orders
     from = Time.now.beginning_of_day.utc
     to = Time.now.end_of_day.utc
-    orders = Order.select("orders.order_id as order_id,sales.receipt_no,orders.status as order_status, sales.sale_status as sale_status,
-               orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id
-              ,bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name")
-          .joins("left join booking_orders on booking_orders.order_id = orders.order_id
-          left join bookings on bookings.booking_id = booking_orders.order_id
-          left join dining_facilities on dining_facilities.id = bookings.dining_facility_id
-          left join order_items on order_items.order_id = orders.order_id
-          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,orders.customer_id")
+    orders=Booking.select("sales.receipt_no, sales.sale_status as sale_status, orders.status as order_status,
+                        orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id,
+                        bookings.booking_id,orders.customer_id as customer_id,
+                        sales.sale_id as sale_id,dining_facilities.name as table_name")
+                    .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id")
+                    .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id")
+                    .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')")                                     
+
+    # orders = Order.select("orders.order_id as order_id,sales.receipt_no,orders.status as order_status, sales.sale_status as sale_status,
+    #            orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id
+    #           ,bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name")
+    #       .joins("left join booking_orders on booking_orders.order_id = orders.order_id
+    #       left join bookings on bookings.booking_id = booking_orders.order_id
+    #       left join dining_facilities on dining_facilities.id = bookings.dining_facility_id
+    #       left join order_items on order_items.order_id = orders.order_id
+    #       left join sale_orders on sale_orders.order_id = orders.order_id
+    #       left join sales on sales.sale_id = sale_orders.sale_id")
+    #       .where("(orders.status = 'new' or orders.status = 'billed')")
+    #       .group("orders.order_id")
+          # For PG 
+          # .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,orders.customer_id")
 
   end
 

app/models/sale.rb

@@ -251,7 +251,7 @@ class Sale < ApplicationRecord
     if self.receipt_no.nil?
       prefix = DateTime.now().utc
       #self.receipt_no = prefix.to_s + "/" + self.shit_id.to_s + "/" + SeedGenerator.new_receipt_no().to_s
-      self.receipt_no = prefix.strftime("%Y%m%d") + "/" + SeedGenerator.new_receipt_no().to_s
+      self.receipt_no = prefix.strftime("%Y%m%d") + "-" + SeedGenerator.new_receipt_no().to_s
 
       self.receipt_date = prefix
       Rails.logger.debug "Receipt No #{self.receipt_no} | Date #{ self.receipt_date.to_s}"