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

bill api return updated

Browse Source
This commit is contained in:
Nweni
2017-06-09 13:33:12 +06:30
parent 9dd96c7187
commit 8b99f4844e
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/api/bill_controller.rb
View File

@@ -9,11 +9,11 @@ class Api::BillController < Api::ApiController
#create Bill by Booking ID #create Bill by Booking ID
if (params[:booking_id]) if (params[:booking_id])
@sale = Sale.new @sale = Sale.new
@status = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name) @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name)
elsif (params[:order_id]) elsif (params[:order_id])
@sale = Sale.new @sale = Sale.new
@status = @sale.generate_invoice_from_order(params[:order_id], current_login_employee.name) @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee.name)
end end
end end

5
app/controllers/origami/payments_controller.rb
View File

@@ -18,6 +18,11 @@ class Origami::PaymentsController < BaseOrigamiController
sale_id = params[:sale_id] sale_id = params[:sale_id]
if Sale.exists?(sale_id) if Sale.exists?(sale_id)
@sale_data = Sale.find_by_sale_id(sale_id) @sale_data = Sale.find_by_sale_id(sale_id)
@sale_date.sale_payments.each do |spay|
if spay.payment_method == "cash"
@cash = spay.payment_amount
end
end
end end
end end

1
app/models/sale_payment.rb
View File

@@ -211,6 +211,7 @@ class SalePayment < ApplicationRecord
self.sale.amount_changed = paid_amount.to_f - self.sale.amount_received.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) if (self.sale.grand_total <= self.sale.amount_received.to_f && self.sale.amount_changed.to_f > 0)
puts " sale update ......"
self.sale.payment_status = "paid" self.sale.payment_status = "paid"
self.sale.sale_status = "completed" self.sale.sale_status = "completed"
self.sale.save! self.sale.save!