This commit is contained in:
Nweni
2017-06-09 13:52:36 +06:30
parent 8b99f4844e
commit 82de95ca22
7 changed files with 27 additions and 31 deletions

View File

@@ -16,7 +16,6 @@ class Sale < ApplicationRecord
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)
puts "get invoice from booking"
booking = Booking.find(booking_id)
status = false
Rails.logger.debug "Booking -> " + booking.id.to_s

View File

@@ -16,11 +16,8 @@ class SaleOrder < ApplicationRecord
private
def generate_sale_order_id
puts "create slae order id"
self.class.name
saleOrderId = SeedGenerator.generate_id(self.class.name, "SOI")
puts saleOrderId
self.sale_order_id = saleOrderId
puts "create sale order id"
end
end

View File

@@ -205,12 +205,22 @@ class SalePayment < ApplicationRecord
end
def sale_update_payment_status(paid_amount)
puts "sale update"
#update amount_outstanding
self.sale.amount_received = self.sale.amount_received.to_f + paid_amount.to_f
self.sale.amount_changed = paid_amount.to_f - self.sale.amount_received.to_f
if (self.sale.grand_total <= self.sale.amount_received.to_f && self.sale.amount_changed.to_f > 0)
all_received_amount = 0.0
sObj = self.sale
sObj.sale_payments.each do |spay|
puts spay
puts spay.payment_amount
all_received_amount += spay.payment_amount.to_f
end
puts all_received_amount
puts self.sale.grand_total
if (self.sale.grand_total <= all_received_amount)
puts " sale update ......"
self.sale.payment_status = "paid"
self.sale.sale_status = "completed"

View File

@@ -2,19 +2,15 @@ class SeedGenerator < ApplicationRecord
def self.generate_id(model, prefix)
seed = SeedGenerator.find_by_model(model)
puts "found seed"
puts seed
new_receipt_no = 0
if (seed.nil?)
puts "seed is null"
seed = SeedGenerator.new()
seed.model = model
new_receipt_no = seed.next
seed.save
else
puts "seed is not null"
current_no = seed.next
seed.next = seed.next + seed.increase_by
seed.current = current_no
@@ -22,8 +18,6 @@ class SeedGenerator < ApplicationRecord
end
padding_len = 15 - prefix.length
puts prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0')
puts "this is actural sale orde"
saleOrderId = prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0')
return saleOrderId