diff --git a/app/models/sale.rb b/app/models/sale.rb index dbba754f..ffcb955f 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -50,7 +50,11 @@ class Sale < ApplicationRecord charges = DiningCharge.where('dining_facility_id=?',booking.dining_facility_id).take if !charges.nil? block_count, diningprice = DiningCharge.amount_calculate(charges, booking.checkin_at, booking.checkout_at) - dining_time = booking.checkin_at.strftime('%H:%M %p').to_s + " - " + booking.checkout_at.strftime('%H:%M %p').to_s + if charges.charge_type =='hr' + dining_time = booking.checkin_at.strftime('%H:%M %p').to_s + " - " + booking.checkout_at.strftime('%H:%M %p').to_s + else + dining_time = booking.checkin_at.strftime('%B %d, %H:%M %p').to_s + " - " + booking.checkout_at.strftime('%B %d, %H:%M %p').to_s + end create_saleitem_diningcharges(charges, block_count, diningprice, booking.dining_facility.name, dining_time, order_source) end