From 7a3957181c13c46a5119591eb47ad514c96f792d Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Mon, 12 Jun 2017 18:15:19 +0630
Subject: [PATCH] update

---
 app/models/order.rb                      | 6 +++---
 app/models/sale_payment.rb               | 2 +-
 app/views/origami/payments/show.html.erb | 7 ++++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/models/order.rb b/app/models/order.rb
index 04274399..8c0fadbc 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -237,14 +237,14 @@ class Order < ApplicationRecord
 
   #Origami: Cashier : to view booking order Table
   def self.get_completed_order
-    completed_orders = Booking.select("sales.receipt_no,orders.status as order_status,
-                        bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name")
+    completed_orders = Booking.select("sales.receipt_no,orders.status as order_status,orders.order_id,
+                        bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id")
                     .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id")
                     .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id")
                     .joins("left join orders on orders.order_id = booking_orders.order_id")
                     .joins("left join sales on sales.sale_id = bookings.sale_id")
                     .where("sales.sale_status='completed'")
-                    .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status")
+                    .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.customer_id,sales.customer_id,orders.order_id")
 
 
   end
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 8606b44a..386d6ca6 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -60,7 +60,7 @@ class SalePayment < ApplicationRecord
       #record an payment in sale-audit
       remark = "No outstanding Amount - Grand Total [#{invoice.grand_total}] | Due [#{amount_due}] | Paid [#{invoice.amount_received}]"
       sale_audit = SaleAudit.record_payment(invoice.id, remark,action_by)
-
+      
       return false, "No outstanding Amount"
     end
 
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 072446a1..f9ae06b7 100644
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -232,7 +232,12 @@ $( document ).ready(function() {
         url: "<%= origami_payment_cash_path %>",
         data: "cash="+ cash + "&sale_id=" + sale_id,
         success:function(result){
-          alert("Thank you")
+          if($('#balance').text() < 0){
+            alert("Changed amount  " + $('#balance').text() * (-1) )
+          }else{
+            alert("Thank you")
+          }
+
           window.location.href = '/origami';
         }
       });