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

fixed conflict request_bill and order model

Browse Source
This commit is contained in:
Aung Myo
2017-06-04 16:25:25 +06:30
parent 3679fe10b8 e3f9d62bce
commit af02a63263
8 changed files with 244 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/origami/request_bills_controller.rb
View File

@@ -2,13 +2,14 @@ class Origami::RequestBillsController < BaseOrigamiController
def show
@sale = Sale.new
check_order = Order.find_by_id(params[:id])
if check_order
@order_details = OrderItem.get_order_items_details(check_order.id)
@order_details = OrderItem.get_order_items_details(check_order.id)
@status, @sale_id = @sale.generate_invoice_from_order(check_order.id, nil,current_login_employee.name)
@sale_data = Sale.find_by_id(@sale_id)
@sale_items = SaleItem.where("sale_id=?",@sale_id)
booking_id = params[:id]
check_booking = Booking.find_by_id(booking_id)
if check_booking.sale_id.nil?
#check if it doesn't exist
@status = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee.name)
@sale_data = Sale.find_by_id(check_booking.sale_id)
@sale_items = SaleItem.where("sale_id=?",check_booking.sale_id)
end
unique_code="ReceiptBillPdf"