From 19160a96308623723a12e5124de17a48a333fd67 Mon Sep 17 00:00:00 2001
From: Moe Su <moesu@code2lab.com>
Date: Tue, 13 Jun 2017 17:41:50 +0630
Subject: [PATCH] Change redeem name

---
 app/views/origami/redeem_payments/index.html.erb | 4 ++--
 config/routes.rb                                 | 2 +-
 db/seeds.rb                                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb
index ae714bea..50ae6ee1 100644
--- a/app/views/origami/redeem_payments/index.html.erb
+++ b/app/views/origami/redeem_payments/index.html.erb
@@ -5,14 +5,14 @@
 				<div class="rebate-form">
 		    		<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 Redeem Amount</label>
+			      			<label class="col-lg-4 col-md-4 col-sm-4">Valid Rebate 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%>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
 			    		</div>
 			    		<hr>
 			    	</div>
 			    	<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">Used Amount</label>
+			      			<label class="col-lg-4 col-md-4 col-sm-4">Redeem Amount</label>
 			      			<div id="used_amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
 			    		</div>
 			    		<hr>
diff --git a/config/routes.rb b/config/routes.rb
index c4592d6d..697b4741 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -95,7 +95,7 @@ Rails.application.routes.draw do
 
     get 'sale/:sale_id/payment/others_payment/MPU' => "mpu#index"
     post 'payment/mpu' => "mpu#create"
-    get 'sale/:sale_id/payment/others_payment/REDEEM' => "redeem_payments#index"
+    get 'sale/:sale_id/payment/others_payment/Redeem' => "redeem_payments#index"
 
     #---------Add Customer --------------#
     #resources :customers
diff --git a/db/seeds.rb b/db/seeds.rb
index 1e3e30b1..4d241119 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -156,7 +156,7 @@ member_actions= MembershipAction.create([{membership_type:"get_account_balance",
 
 payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http//192.168.1.47:3006"})
 
-payment_methods = PaymentMethodSetting.create({payment_method:"REDEEM",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"})
+payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"})
 
 
 # shop = Shop.create(