From 54e14e02f4136df6080bcb2607c21ea88b566a62 Mon Sep 17 00:00:00 2001
From: Moe Su <moesu@code2lab.com>
Date: Thu, 8 Jun 2017 18:22:19 +0630
Subject: [PATCH] Add payment method

---
 .../origami/others_payments_controller.rb     | 45 +++++++++++--------
 .../origami/others_payments/index.html.erb    | 12 ++---
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb
index 497b37d3..a5177b06 100644
--- a/app/controllers/origami/others_payments_controller.rb
+++ b/app/controllers/origami/others_payments_controller.rb
@@ -4,25 +4,32 @@ class Origami::OthersPaymentsController < BaseOrigamiController
   def index
   	@membership_rebate_balance = 0
   	@sale_id = params[:sale_id]
-  	sale_data = Sale.find_by_sale_id(@sale_id)
-  	customer_data= Customer.find_by_customer_id(sale_data.customer_id)
-  	@membership_id = customer_data.membership_id
-  	if !@membership_id.nil?
-  		membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
-	  	membership_data = SalePayment.get_paypar_account(membership_setting.gateway_url,membership_setting.auth_token,@membership_id)
-	  	if membership_data["status"]==true
-	  		membership_account_data = membership_data["data"];
-	  		membership_account_data.each do |acc_data|
-	  			if acc_data["accountable_type"] == "REBATEACCOUNT"
-	  				@membership_rebate_balance=acc_data["balance"]
-	  			else
-	  				@membership_rebate_balance = 0
-	  			end
-	  		end
-	  	else
-	  		@membership_rebate_balance = 0
-	  	end
-	end
+  	@payment_method_setting = PaymentMethodSetting.all
+  	# @sale_id = params[:sale_id]
+  	# sale_data = Sale.find_by_sale_id(@sale_id)
+
+ #  	if sale_data.customer_id
+ #  		customer_data= Customer.find_by_customer_id(sale_data.customer_id)
+	#   	@membership_id = customer_data.membership_id
+	#   	if !@membership_id.nil?
+	#   		membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
+	# 	  	membership_data = SalePayment.get_paypar_account(membership_setting.gateway_url,membership_setting.auth_token,@membership_id)
+	# 	  	if membership_data["status"]==true
+	# 	  		membership_account_data = membership_data["data"];
+	# 	  		membership_account_data.each do |acc_data|
+	# 	  			if acc_data["accountable_type"] == "REBATEACCOUNT"
+	# 	  				@membership_rebate_balance=acc_data["balance"]
+	# 	  			else
+	# 	  				@membership_rebate_balance = 0
+	# 	  			end
+	# 	  		end
+	# 	  	else
+	# 	  		@membership_rebate_balance = 0
+	# 	  	end
+	# 	end
+	# else
+
+ #  	end
   end
 
   def create
diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb
index 094c90c9..bf89660a 100644
--- a/app/views/origami/others_payments/index.html.erb
+++ b/app/views/origami/others_payments/index.html.erb
@@ -2,11 +2,11 @@
 	
 	<div class="col-lg-5 col-md-5 col-sm-3">
 			<div class="card">
-				<% if @membership_id!=0 %>
-				<div class="col-md-5">
-		            <div class="col-md-12 long purple " id="redeem_account">Redim Amount</div>
-		         </div>
-		         <% end %>
+				<% @payment_method_setting.each do |payment_method|%>
+					<div class="col-md-5">
+		            	<div class="col-md-12 long purple " id="<%= payment_method.payment_method%>"><%= payment_method.payment_method %></div>
+		         	</div>
+				<% end %> 
 			</div>
 	</div>
 	
@@ -134,7 +134,7 @@ $(document).on('click', '.cashier_number', function(event){
         }
 });
 	  
-$("#redeem_account").click(function(){
+$("#REDIMREBATE").click(function(){
 		$('.rebate-form').removeAttr("hidden");
 });