From 8b99f4844e40f83d9d6e3bd82d29f6f1eff45fb6 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Fri, 9 Jun 2017 13:33:12 +0630
Subject: [PATCH] bill api return updated

---
 app/controllers/api/bill_controller.rb         | 6 +++---
 app/controllers/origami/payments_controller.rb | 5 +++++
 app/models/sale_payment.rb                     | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb
index a98c8f3d..193a4a45 100644
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -9,11 +9,11 @@ class Api::BillController < Api::ApiController
     #create Bill by Booking ID
     if (params[:booking_id])
       @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])
       @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
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index c60efdac..fa8135fe 100644
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -18,6 +18,11 @@ class Origami::PaymentsController < BaseOrigamiController
     sale_id = params[:sale_id]
     if Sale.exists?(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
 
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 1d98ba8f..573a2da3 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -211,6 +211,7 @@ class SalePayment < ApplicationRecord
     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)
+      puts " sale update ......"
       self.sale.payment_status = "paid"
       self.sale.sale_status = "completed"
       self.sale.save!