From 29cdcfb28d23f157ebe030355565ab4dd07ec227 Mon Sep 17 00:00:00 2001
From: Moe Su <moesu@code2lab.com>
Date: Sun, 11 Jun 2017 16:11:44 +0630
Subject: [PATCH] For Pull

---
 .../origami/redeem_payments_controller.rb     | 31 ++++++++++-------
 .../origami/redeem_payments/index.html.erb    | 34 +++++++++++--------
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb
index 732f969e..fba759bb 100644
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -1,9 +1,9 @@
 class Origami::RedeemPaymentsController < BaseOrigamiController
  	def index
- 		sale_id = params[:sale_id]
+ 		@sale_id = params[:sale_id]
  		payment_method = params[:payment_method]
  		@membership_rebate_balance=0
- 		sale_data = Sale.find_by_sale_id(sale_id)
+ 		sale_data = Sale.find_by_sale_id(@sale_id)
  		if sale_data
  			if sale_data.customer_id
  				customer_data= Customer.find_by_customer_id(sale_data.customer_id)
@@ -12,18 +12,23 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
  					@campaign_type_id =1
  					if !@membership_id.nil?
  						membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
- 						puts 'Hello Hello'
- 						puts membership_setting.to_json
-	                    member_actions =MembershipAction.find_by_membership_type("get_account_balance")
-	                    puts member_actions.to_json
-	                    url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
-	                    puts url 
-
- 						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,@membership_id
+ 						if membership_setting.gateway_url
+ 							member_actions =MembershipAction.find_by_membership_type("get_account_balance")
+ 							if member_actions.gateway_url
+ 								url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
+		 						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,@membership_id
+		 						end
+		 					else
+		 						@out =false,0
+ 							end
+ 						else
+ 							@out = false,0
  						end
+	                    
+	                    
  					else
  						@out = false, 0
  					end
diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb
index 5e336ac4..72c09d4d 100644
--- a/app/views/origami/redeem_payments/index.html.erb
+++ b/app/views/origami/redeem_payments/index.html.erb
@@ -6,7 +6,7 @@
 		    		<div class="row">
 			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
 			      			<label class="col-lg-4 col-md-4 col-sm-4">Valid Amount</label>
-						      	<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@membership_rebate_balance%>">
+						      	<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@membership_rebate_balance%>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
 			    		</div>
 			    		<hr>
 			    	</div>
@@ -77,12 +77,12 @@
 	             <div class="col-md-7">
 	               <div class="row">
 	                 <div class="col-md-3 cashier_number"></div>
-	                 <div class="col-md-3 cashier_number">DEL</div>
-	                 <div class="col-md-3 cashier_number">CLR</div>
+	                 <div class="col-md-3 cashier_number red" data-type="del">DEL</div>
+	                 <div class="col-md-3 cashier_number green" data-type="clr">CLR</div>
 	               </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" >PAY</div>
 	             </div>
 	           </div>
 	      </div>
@@ -95,9 +95,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();
 
@@ -122,22 +122,26 @@ $(document).on('click', '.cashier_number', function(event){
              		case 'clr':
              			$('#used_amount').html("0.0");
              		break;
+             		case 'del' :
+			          var cash=$('#used_amount').text();
+			          $('#used_amount').text(cash.substr(0,cash.length-1));
+			        break;
 
           		}
-          	// event.handled = true;
-        // } else {
-        //     return false;
-        // }
+          	event.handled = true;
+        } else {
+            return false;
+        }
 });
 
 $("#redeem").click(function(){
 	valid_amount = $("#valid_amount").val();
-	sale = "<%=@sale_id %>";
-	membership_id = $(this).attr('data-member-value');
+	sale_id = $("#valid_amount").attr('data-value');
+	membership_id = $("#valid_amount").attr('data-member-value');
 	redeem_amount = parseInt($("#used_amount").text());
-	if(redeem_amount<=0){
+	if(redeem_amount<=0 ){
 		alert(" Insufficient Amount!")
-	}else if(valid_amount< redeem_amount){
+	}else if(valid_amount< redeem_amount || redeem_amount == ""){
 		alert("Please type valid amount");
 	}else{
 		$.ajax({