git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update sale for request

Browse Source
This commit is contained in:
Aung Myo
2018-02-20 14:33:36 +06:30
parent a7dbb4442d
commit 20103a54a5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/sale.rb
View File

@@ -157,7 +157,7 @@ class Sale < ApplicationRecord
@sale = Sale.new @sale = Sale.new
sale_order=SaleOrder.new sale_order=SaleOrder.new
if shift = ShiftSale.current_open_shift(current_user.id) if !ShiftSale.current_shift.nil?
order_id = order.order_id # order_id order_id = order.order_id # order_id
bk_order = BookingOrder.find_by_order_id(order_id) bk_order = BookingOrder.find_by_order_id(order_id)
check_booking = Booking.find_by_booking_id(bk_order.booking_id) check_booking = Booking.find_by_booking_id(bk_order.booking_id)
@@ -166,7 +166,7 @@ class Sale < ApplicationRecord
# Create Sale if it doesn't exist # Create Sale if it doesn't exist
# puts "current_login_employee" # puts "current_login_employee"
# puts current_login_employee.name # puts current_login_employee.name
@status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, cashier = nil) @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee,current_user)
@sale_data = Sale.find_by_sale_id(@sale_id) @sale_data = Sale.find_by_sale_id(@sale_id)
@sale_items = SaleItem.where("sale_id=?",@sale_id) @sale_items = SaleItem.where("sale_id=?",@sale_id)
else else
@@ -175,8 +175,8 @@ class Sale < ApplicationRecord
end end
# Bind shift sale id to sale # Bind shift sale id to sale
@sale_data.shift_sale_id = shift.id # @sale_data.shift_sale_id = shift.id
@sale_data.save # @sale_data.save
# Promotion Activation # Promotion Activation
Promotion.promo_activate(@sale) Promotion.promo_activate(@sale)