From c23f726cb398fb4e5f94f51b935e3363770946b2 Mon Sep 17 00:00:00 2001
From: Moe Su <moesu@code2lab.com>
Date: Fri, 9 Jun 2017 02:40:35 +0630
Subject: [PATCH] redeem process

---
 app/models/sale_payment.rb                      | 15 ++++++++++-----
 .../origami/others_payments/index.html.erb      | 17 ++++++++---------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 3d9855ba..834dba1f 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -79,17 +79,22 @@ class SalePayment < ApplicationRecord
   end
 
   def self.redeem(paypar_url,token,membership_id,received_amount,sale_id,campaign_type_id)
-      url = paypar_url.to_s + "/api/redeem".to_s
-      response = HTTParty.post(url,
+      membership_actions_data = Settings::MembershipAction.find_by_membership_type("redeem_url");
+      if !membership_actions_data.nil?
+        url = paypar_url.to_s + membership_actions_data.gateway_url.to_s
+        campaign_type_id = 1
+        response = HTTParty.post(url,
                 :body => { generic_customer_id:membership_id,total_amount:received_amount,receipet_no:sale_id,campaign_type_id:campaign_type_id,account_no:""}.to_json,
                 :headers => {
                           'Content-Type' => 'application/json',
                           'Accept' => 'application/json'
                 }
           )
-      puts "RRRRRRRR"
-      puts response.to_json
-        return response;
+      else
+        response =false;
+      end
+      
+      return response;
       
   end
 
diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb
index abb2388f..77c06904 100644
--- a/app/views/origami/others_payments/index.html.erb
+++ b/app/views/origami/others_payments/index.html.erb
@@ -99,9 +99,9 @@
 </div>
 <script type="text/javascript">
 $(document).on('click', '.cashier_number', function(event){
-        event.stopPropagation();
-        event.preventDefault();
-        if(event.handled !== true) {
+        // event.stopPropagation();
+        // event.preventDefault();
+        // if(event.handled !== true) {
             var original_value;
             original_value = $('#used_amount').text();
 
@@ -128,10 +128,10 @@ $(document).on('click', '.cashier_number', function(event){
              		break;
 
           		}
-          	event.handled = true;
-        } else {
-            return false;
-        }
+          	// event.handled = true;
+        // } else {
+        //     return false;
+        // }
 });
 	  
 $("#REDIMREBATE").click(function(){
@@ -141,7 +141,7 @@ $("#REDIMREBATE").click(function(){
 		$.ajax({
 			type: "GET",
 			url:  "../../../../settings/membership_actions",
-			data: {type:"redeem_url",gateway_url:gateway_url,sale_id:sale_id},
+			data: {type:"get_account_balance_url",gateway_url:gateway_url,sale_id:sale_id},
 			success: function(result){
 				$("#valid_amount").val(result[1]);
 			}
@@ -153,7 +153,6 @@ $("#REDIMREBATE").click(function(){
 $("#redeem").click(function(){
 	valid_amount = $("#valid_amount").val();
 	sale_id = $("#REDIMREBATE").attr("data-sale-id");
-	alert(sale_id);
 	membership_id = $(this).attr("data-member-value");
 	redeem_amount = parseInt($("#used_amount").text());
 	if(redeem_amount<=0){