This commit is contained in:
Nweni
2017-06-15 01:33:52 +06:30
parent 883653f8ee
commit 34b1c26b0b
2 changed files with 14 additions and 14 deletions

View File

@@ -13,7 +13,7 @@ class Sale < ApplicationRecord
has_many :sale_payments
has_many :sale_orders
has_many :bookings
scope :open_invoices, -> { where("sale_status = 'new' and receipt_date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") }
def generate_invoice_from_booking(booking_id, requested_by)
@@ -57,11 +57,11 @@ class Sale < ApplicationRecord
self.tax_type = "exclusive"
# set cashier by current login
self.cashier_id = requested_by.id
self.cashier_name = requested_by.name
# TODO: requested_by is string , can't cast to id. error occur. please fix
# self.cashier_id = requested_by.id
self.cashier_name = requested_by
self.requested_by = requested_by
self.requested_by = requested_by.name
self.requested_at = DateTime.now.utc
Rails.logger.debug "Order -> #{order.id} | order_status -> #{order.status}"
@@ -267,7 +267,7 @@ class Sale < ApplicationRecord
def self.search(search)
if search
# find(:all, :conditions => ['name LIKE ? OR contact_no LIKE ?', "%#{search}%", "%#{search}%"])
where("receipt_no LIKE ?", "%#{search}%",)
where("receipt_no LIKE ?", "%#{search}%",)
else
find(:all)
end