From fcc757122375c0d31ffecb45712fe08069e092b4 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 21 Dec 2017 15:46:48 +0630
Subject: [PATCH] check current balance for rebate member & change firstbill
 fun:

---
 app/assets/javascripts/origami.js             | 78 +++++++++----------
 .../origami/payments_controller.rb            |  3 +-
 2 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index c11df647..e15794c2 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -15,6 +15,45 @@
 //= require BSBMaterial/demo.js
 //= require custom.js
 
+/* start check first bill or not funs: */
+function checkReceiptNoInFirstBillData(receipt_no) {
+	var status = false;
+	if((receipt_no!=undefined) && (receipt_no!="")){
+		var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
+		if((arr_data!=undefined) && (arr_data!=null)){
+			var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
+			if((arr_data.length) > (json_data.length)){
+				status = true;
+			}
+		}
+	}
+
+	return status;
+}
+
+function createReceiptNoInFirstBillData(receipt_no) {
+	var arr_data = [];
+	var json_data = [];
+	var receipt_lists = localStorage.getItem("receipt_lists");
+	if((receipt_lists!=undefined) && (receipt_lists!=null) && (receipt_lists!="")){
+		arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
+		json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no });
+	}
+	if(((arr_data.length == 0) && (json_data.length == 0)) || ((arr_data.length > 0) && (json_data.length == 0))){
+		arr_data.push({receipt_no});
+		localStorage.setItem("receipt_lists",JSON.stringify(arr_data));
+	}
+}
+
+function deleteReceiptNoInFirstBillData(receipt_no) {
+	var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
+	if((arr_data!=undefined) && (arr_data!=null)){
+		var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
+		localStorage.setItem("receipt_lists",JSON.stringify(json_data));
+	}
+}
+/* end check first bill or not funs: */
+
 $(document).on('turbolinks:load', function() {
 	$('.datetimepicker').bootstrapMaterialDatePicker({
 	  format: 'DD-MM-YYYY - HH:mm',
@@ -143,42 +182,3 @@ $(document).on('turbolinks:load', function() {
 		return false;
 	});
 });
-
-/* start check first bill or not funs: */
-function checkReceiptNoInFirstBillData(receipt_no) {
-	var status = false;
-	if((receipt_no!=undefined) && (receipt_no!="")){
-		var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
-		if((arr_data!=undefined) && (arr_data!=null)){
-			var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
-			if((arr_data.length) > (json_data.length)){
-				status = true;
-			}
-		}
-	}
-
-	return status;
-}
-
-function createReceiptNoInFirstBillData(receipt_no) {
-	var arr_data = [];
-	var json_data = [];
-	var receipt_lists = localStorage.getItem("receipt_lists");
-	if((receipt_lists!=undefined) && (receipt_lists!=null) && (receipt_lists!="")){
-		arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
-		json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no });
-	}
-	if(((arr_data.length == 0) && (json_data.length == 0)) || ((arr_data.length > 0) && (json_data.length == 0))){
-		arr_data.push({receipt_no});
-		localStorage.setItem("receipt_lists",JSON.stringify(arr_data));
-	}
-}
-
-function deleteReceiptNoInFirstBillData(receipt_no) {
-	var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
-	if((arr_data!=undefined) && (arr_data!=null)){
-		var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
-		localStorage.setItem("receipt_lists",JSON.stringify(json_data));
-	}
-}
-/* end check first bill or not funs: */
\ No newline at end of file
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index d307cc5d..d58af5ad 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -45,7 +45,8 @@ class Origami::PaymentsController < BaseOrigamiController
     rebate = MembershipSetting.find_by_rebate(1)
     if customer.membership_id != nil && rebate
       member_info = Customer.get_member_account(customer)
-      current_balance = SaleAudit.paymal_search(sale_id)
+      # current_balance = SaleAudit.paymal_search(sale_id)
+      current_balance = 0
     end
     # get printer info
     print_settings=PrintSetting.find_by_unique_code(unique_code)