change order reservation -not finished

app/models/order_reservation.rb

@@ -199,6 +199,11 @@ class OrderReservation < ApplicationRecord
     	if !remark.nil?
     		order_reservation.order_remark = remark
     	end
+
+    	if status == "delivered"
+    		order_reservation.payment_status = "paid"
+    	end
+
     	order_reservation.save
 
     	if !order_reservation.sale_id.nil? && status == "rejected"
@@ -245,7 +250,14 @@ class OrderReservation < ApplicationRecord
     end
 
     def self.get_count_on_order
-    	order_reservation = OrderReservation.select("COUNT(order_reservation_id) as count, status").group("status")
+    	order_reservation = OrderReservation.select("COUNT(order_reservation_id) as count, status")
+    						.where("status != 'delivered'")
+    						.group("status")
+    end
+
+    def self.get_count_on_completed
+    	order_reservation = OrderReservation.select("COUNT(order_reservation_id) as count")
+    						.where("created_at BETWEEN '#{DateTime.now.beginning_of_day}' AND '#{DateTime.now.end_of_day}' AND status = 'delivered'").first()
     end
 
     def self.get_pending_orders
@@ -294,7 +306,9 @@ class OrderReservation < ApplicationRecord
       end
     end
 
-    query = OrderReservation.joins(" JOIN deliveries on deliveries.order_reservation_id = order_reservations.order_reservation_id")
+    query = OrderReservation.select("order_reservations.*, deliveries.provider, deliveries.delivery_fee, customers.name, customers.email")
+    						.joins(" JOIN deliveries on deliveries.order_reservation_id = order_reservations.order_reservation_id")
+    						.joins(" JOIN customers on customers.customer_id = order_reservations.customer_id")
     						.joins(" JOIN sales on sales.sale_id = order_reservations.sale_id")
     if shift.present?
       query = query.where("sales.shift_sale_id in (?) #{provider} and sales.sale_status= 'completed' and sale_payments.payment_amount != 0", shift.to_a)