From 9f9c83ab7fc504f5e13709e317580fd1e33b2106 Mon Sep 17 00:00:00 2001
From: Moe Su <moesu@code2lab.com>
Date: Sun, 11 Jun 2017 13:01:03 +0630
Subject: [PATCH] pay par payment

---
 app/assets/javascripts/orgiami.js                         | 2 +-
 app/controllers/origami/others_payments_controller.rb     | 1 +
 app/controllers/origami/paypar_payments_controller.rb     | 1 -
 app/controllers/settings/membership_actions_controller.rb | 2 +-
 app/views/origami/others_payments/index.html.erb          | 7 ++++---
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/orgiami.js b/app/assets/javascripts/orgiami.js
index 92bdcbf3..20ac5b26 100644
--- a/app/assets/javascripts/orgiami.js
+++ b/app/assets/javascripts/orgiami.js
@@ -145,7 +145,7 @@ $(document).ready(function(){
 	// Payment for Bill
 	$('#pay').click(function() {
 		var sale_id=$(".selected-item").find(".orders-id").text();
-		if(order_id!=""){
+		if(sale_id!=""){
 			window.location.href = '/origami/sale/'+ sale_id  + "/payment"
 		}
 		else {
diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb
index a5177b06..c050c3f3 100644
--- a/app/controllers/origami/others_payments_controller.rb
+++ b/app/controllers/origami/others_payments_controller.rb
@@ -5,6 +5,7 @@ class Origami::OthersPaymentsController < BaseOrigamiController
   	@membership_rebate_balance = 0
   	@sale_id = params[:sale_id]
   	@payment_method_setting = PaymentMethodSetting.all
+
   	# @sale_id = params[:sale_id]
   	# sale_data = Sale.find_by_sale_id(@sale_id)
 
diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb
index af5ce55f..67850117 100644
--- a/app/controllers/origami/paypar_payments_controller.rb
+++ b/app/controllers/origami/paypar_payments_controller.rb
@@ -8,7 +8,6 @@ class Origami::PayparPaymentsController < BaseOrigamiController
 			saleObj = Sale.find(sale_id)
       		sale_payment = SalePayment.new
       		status,msg =sale_payment.process_payment(saleObj, @user, redeem_amount,payment_method)
-   
       		if status == true
       			@out = true, "Success!"
       		else
diff --git a/app/controllers/settings/membership_actions_controller.rb b/app/controllers/settings/membership_actions_controller.rb
index 6db1a45b..86292258 100644
--- a/app/controllers/settings/membership_actions_controller.rb
+++ b/app/controllers/settings/membership_actions_controller.rb
@@ -24,7 +24,7 @@ class Settings::MembershipActionsController < ApplicationController
                     membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id)
                     if membership_data["status"]==true
                         @membership_rebate_balance=membership_data["balance"]
-                        @out = true, @membership_rebate_balance
+                        @out = true, @membership_rebate_balance,@membership_id
                     else
                         @out = false, 0
                     end
diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb
index 77c06904..4a43dd1e 100644
--- a/app/views/origami/others_payments/index.html.erb
+++ b/app/views/origami/others_payments/index.html.erb
@@ -86,7 +86,7 @@
 	               </div>
 	             </div>
 	             <div class="col-md-5">
-	                <div class="col-md-12 cashier_number long purple" id="redeem" data-value="<%=@sale_id %>" data-member-value = "<%= @membership_id %>">PAY</div>
+	                <div class="col-md-12 cashier_number long purple" id="redeem" data-member-value = "">PAY</div>
 	             </div>
 	           </div>
 	      </div>
@@ -143,6 +143,7 @@ $("#REDIMREBATE").click(function(){
 			url:  "../../../../settings/membership_actions",
 			data: {type:"get_account_balance_url",gateway_url:gateway_url,sale_id:sale_id},
 			success: function(result){
+				$("#redeem").attr("data-member-value",result[2]);
 				$("#valid_amount").val(result[1]);
 			}
 		})
@@ -152,8 +153,8 @@ $("#REDIMREBATE").click(function(){
 
 $("#redeem").click(function(){
 	valid_amount = $("#valid_amount").val();
-	sale_id = $("#REDIMREBATE").attr("data-sale-id");
-	membership_id = $(this).attr("data-member-value");
+	sale = "<%=@sale_id %>";
+	membership_id = $(this).attr('data-member-value');
 	redeem_amount = parseInt($("#used_amount").text());
 	if(redeem_amount<=0){
 		alert(" Insufficient Amount!")