diff --git a/app/controllers/reports/card_sale_tran_controller.rb b/app/controllers/reports/card_sale_tran_controller.rb
index 01baa21f..f0e1053f 100644
--- a/app/controllers/reports/card_sale_tran_controller.rb
+++ b/app/controllers/reports/card_sale_tran_controller.rb
@@ -5,7 +5,7 @@ class Reports::CardSaleTranController < BaseReportController
   # GET /transactions/sales.json
   def index
     @payment_method = [["All Payments",''],["MPU Payment","mpu"], ["Visa Payment","visa"], 
-                ["Master Payment","master"], ["JCB Payment","jcb"],["UnionPay Payment","unionpay"], 
+                ["Master Payment","master"], ["JCB Payment","jcb"],["UnionPay Payment","cup"], 
                 ["Alipay Payment","alipay"]]
     @sales = Sale.all
 
diff --git a/app/controllers/reports/card_settle_tran_controller.rb b/app/controllers/reports/card_settle_tran_controller.rb
index ac10d48b..e775e578 100644
--- a/app/controllers/reports/card_settle_tran_controller.rb
+++ b/app/controllers/reports/card_settle_tran_controller.rb
@@ -4,8 +4,8 @@ class Reports::CardSettleTranController < BaseReportController
   # GET /transactions/sales
   # GET /transactions/sales.json
   def index
-    @payment_method = [["All Payments",''],["MPU Payment","mpu"], ["Visa Payment","visa"], 
-                ["Master Payment","master"], ["JCB Payment","jcb"],["UnionPay Payment","unionpay"], 
+    @payment_method = [["All Payments",''],["MPU Payment","mpu"], ["Visa & Master Payment","vmj"], 
+                ["JCB Payment","jcb"],["UnionPay Payment","cup"], 
                 ["Alipay Payment","alipay"]]
     @sales = Sale.all
     payment_type = params[:payment_type]
diff --git a/app/controllers/transactions/card_sale_trans_controller.rb b/app/controllers/transactions/card_sale_trans_controller.rb
index 63a87059..352e4f30 100644
--- a/app/controllers/transactions/card_sale_trans_controller.rb
+++ b/app/controllers/transactions/card_sale_trans_controller.rb
@@ -5,8 +5,8 @@ class Transactions::CardSaleTransController < ApplicationController
   # GET /transactions/sales.json
   def index
     @status = [["All Status",''], ["Approved","Approved"], ["Declined","Declined"]]
-    @payment_method = [["All Payments",''],["MPU Payment","mpu"], ["Visa Payment","visa"], 
-                ["Master Payment","master"], ["JCB Payment","jcb"],["UnionPay Payment","unionpay"], 
+    @payment_method =[["All Payments",''],["MPU Payment","mpu"], ["Visa Payment","visa"], 
+                ["Master Payment","master"], ["JCB Payment","jcb"],["UnionPay Payment","cup"], 
                 ["Alipay Payment","alipay"]]
     @sales = Sale.all
 
diff --git a/app/controllers/transactions/card_settle_trans_controller.rb b/app/controllers/transactions/card_settle_trans_controller.rb
index d08ca786..e2b70c7e 100644
--- a/app/controllers/transactions/card_settle_trans_controller.rb
+++ b/app/controllers/transactions/card_settle_trans_controller.rb
@@ -5,8 +5,8 @@ class Transactions::CardSettleTransController < ApplicationController
   # GET /transactions/sales.json
   def index
     @status = [["All Status",''], ["Approved","Approved"], ["Declined","Declined"]]
-    @payment_method = [["All Payments",''],["MPU Payment","mpu"], ["Visa Payment","visa"], 
-                ["Master Payment","master"], ["JCB Payment","jcb"],["UnionPay Payment","unionpay"], 
+    @payment_method = [["All Payments",''],["MPU Payment","mpu"], ["Visa & Master Payment","vmj"], 
+                ["JCB Payment","jcb"],["UnionPay Payment","cup"], 
                 ["Alipay Payment","alipay"]]
     @sales = Sale.all
 
diff --git a/app/models/card_sale_tran.rb b/app/models/card_sale_tran.rb
index 0aef0952..04ec5155 100644
--- a/app/models/card_sale_tran.rb
+++ b/app/models/card_sale_tran.rb
@@ -12,11 +12,7 @@ class CardSaleTran < ApplicationRecord
 	    if payment_type.blank?
 	    	payment = ''
 	    else
-	    	if payment_type == 'unionpay'
-	    		payment = " app LIKE 'cup'"
-	    	else
-	    		payment = " app LIKE '#{payment_type}'"
-	    	end		
+	    	payment = " app LIKE '#{payment_type}'"
 	    end
 
 	    if status_type.blank?
@@ -45,11 +41,7 @@ class CardSaleTran < ApplicationRecord
 	    if payment_type.blank?
 	    	payment = ''
 	    else
-	    	if payment_type == 'unionpay'
-	    		payment = " app LIKE 'cup'"
-	    	else
-	    		payment = " app LIKE '#{payment_type}'"
-	    	end		
+	    	payment = " app LIKE '#{payment_type}'"	
 	    end
 
 	    if from.present? && to.present?
diff --git a/app/models/card_settle_tran.rb b/app/models/card_settle_tran.rb
index a3166e91..8e2cafb8 100644
--- a/app/models/card_settle_tran.rb
+++ b/app/models/card_settle_tran.rb
@@ -12,11 +12,7 @@ class CardSettleTran < ApplicationRecord
 	    if payment_type.blank?
 	    	payment = ''
 	    else
-	    	if payment_type == 'unionpay'
-	    		payment = " req_type LIKE 'cup'"
-	    	else
-	    		payment = " req_type LIKE '#{payment_type}'"
-	    	end		
+	    	payment = " req_type LIKE '#{payment_type}'"	
 	    end
 
 	    if status_type.blank?
@@ -44,11 +40,7 @@ class CardSettleTran < ApplicationRecord
 	    if payment_type.blank?
 	    	payment = ''
 	    else
-	    	if payment_type == 'unionpay'
-	    		payment = " req_type LIKE 'cup'"
-	    	else
-	    		payment = " req_type LIKE '#{payment_type}'"
-	    	end		
+	    	payment = " req_type LIKE '#{payment_type}'"
 	    end
 
 	    if from.present? && to.present?
diff --git a/app/views/reports/card_sale_tran/index.html.erb b/app/views/reports/card_sale_tran/index.html.erb
index 3f66daf9..673da3ae 100644
--- a/app/views/reports/card_sale_tran/index.html.erb
+++ b/app/views/reports/card_sale_tran/index.html.erb
@@ -59,13 +59,7 @@
 			                      	<td><%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
 			                      	<td><%= cardSale.ref_no %></td>
 			                      	<td><%= cardSale.res_amt %></td>
-			                      	<td>
-				                        <% if cardSale.app == 'cup' %>
-				                            UNION
-				                        <% else %>
-				                            <%= cardSale.app %>
-				                        <% end %>    
-				                    </td>
+			                      	<td><%= cardSale.app %></td>
 			                      	<td><%= cardSale.sale.customer.name rescue '-' %></td>
 			                      	<td><%= cardSale.sale.cashier_name rescue '-' %></td>
 			                      		<td>TID : <%= cardSale.terminal_id %>
diff --git a/app/views/reports/card_sale_tran/index.xls.erb b/app/views/reports/card_sale_tran/index.xls.erb
index 59f32939..145dce33 100644
--- a/app/views/reports/card_sale_tran/index.xls.erb
+++ b/app/views/reports/card_sale_tran/index.xls.erb
@@ -47,13 +47,7 @@
 			                      	<td><%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
 			                      	<td><%= cardSale.ref_no %></td>
 			                      	<td><%= cardSale.res_amt %></td>
-			                      	<td>
-				                        <% if cardSale.app == 'cup' %>
-				                            UNION
-				                        <% else %>
-				                            <%= cardSale.app %>
-				                        <% end %>    
-			                      	</td>
+			                      	<td><%= cardSale.app %></td>
 			                      	<td><%= cardSale.sale.customer.name rescue '-' %></td>
 			                      	<td><%= cardSale.sale.cashier_name rescue '-' %></td>
 			                      		<td>TID : <%= cardSale.terminal_id %>
diff --git a/app/views/reports/card_settle_tran/index.html.erb b/app/views/reports/card_settle_tran/index.html.erb
index 9d11fbc8..0272db0a 100644
--- a/app/views/reports/card_settle_tran/index.html.erb
+++ b/app/views/reports/card_settle_tran/index.html.erb
@@ -19,7 +19,7 @@
 			</div>	  			
 
 		<div class="margin-top-20">
-			<div class="card" style="width:115%;">
+			<div class="card">
 				<table class="table table-striped" border="0">
 					<thead>
 
@@ -46,7 +46,6 @@
 			                <th><%= t("views.right_panel.detail.sale_amount") %></th>
 			                <th><%= t("views.right_panel.detail.void_cnt") %></th>
 			                <th><%= t("views.right_panel.detail.void_amount") %></th>
-			                <th><%= t("views.right_panel.detail.status") %></th>
 			            </tr>
 					</thead>
 					<tbody>
@@ -55,27 +54,15 @@
 			                    <tr>
 			                        <td><%= cardSettle.shift_sale.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> - <%= cardSettle.shift_sale.shift_closed_at ? cardSettle.shift_sale.shift_closed_at.strftime("%e %b %I:%M%p") : '-'  %></td>
 			                        <td><%= cardSettle.req_date %> <%= cardSettle.req_time.utc.getlocal.strftime("%I:%M %p") %></td>
-			                        <td>
-				                        <% if cardSettle.req_type == 'CUP' %>
-				                        UNION
-				                        <% else %>
-				                        	<%= cardSettle.req_type %>
-				                        <% end %>
+			                        <td><%= cardSettle.req_type %>
 				                    </td>
 			                        <td><%= cardSettle.res_date %> <%= cardSettle.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
-			                        <td>
-			                        	<% if cardSettle.res_type == 'CUP' %>
-				                        UNION
-				                        <% else %>
-				                        	<%= cardSettle.res_type %>
-				                        <% end %>
-				                    </td>
+			                        <td><%= cardSettle.res_type %></td>
 			                        <td><%= cardSettle.shift_sale.employee.name %></td>
 			                        <td><%= cardSettle.sale_cnt %></td>
 			                        <td><%= cardSettle.sale_amt %></td>
 			                        <td><%= cardSettle.void_cnt %></td>
 			                        <td><%= cardSettle.void_amt %></td>
-			                        <td><%= cardSettle.status %></td>
 			                    </tr>
 			                <% end %>
 			            <% else %>
diff --git a/app/views/reports/card_settle_tran/index.xls.erb b/app/views/reports/card_settle_tran/index.xls.erb
index 38d3b115..26151cef 100644
--- a/app/views/reports/card_settle_tran/index.xls.erb
+++ b/app/views/reports/card_settle_tran/index.xls.erb
@@ -37,38 +37,26 @@
 			                <th><%= t("views.right_panel.detail.status") %></th>
 			            </tr>
 					</thead>
-					<tbody>
-		              	<% if @cardSettles != 0 %>
-			                <% @cardSettles.each do |cardSettle| %>
-			                    <tr>
-			                        <td><%= cardSettle.shift_sale.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> - <%= cardSettle.shift_sale.shift_closed_at ? cardSettle.shift_sale.shift_closed_at.strftime("%e %b %I:%M%p") : '-'  %></td>
-			                        <td><%= cardSettle.req_date %> <%= cardSettle.req_time.utc.getlocal.strftime("%I:%M %p") %></td>
-			                        <td>
-				                        <% if cardSettle.req_type == 'CUP' %>
-				                        UNION
-				                        <% else %>
-				                        	<%= cardSettle.req_type %>
-				                        <% end %>
-				                    </td>
-			                        <td><%= cardSettle.res_date %> <%= cardSettle.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
-			                        <td>
-			                        	<% if cardSettle.res_type == 'CUP' %>
-				                        UNION
-				                        <% else %>
-				                        	<%= cardSettle.res_type %>
-				                        <% end %>
-				                    </td>
-			                        <td><%= cardSettle.shift_sale.employee.name %></td>
-			                        <td><%= cardSettle.sale_cnt %></td>
-			                        <td><%= cardSettle.sale_amt %></td>
-			                        <td><%= cardSettle.void_cnt %></td>
-			                        <td><%= cardSettle.void_amt %></td>
-			                        <td><%= cardSettle.status %></td>
-			                    </tr>
-			                <% end %>
-			            <% else %>
-			                <tr><td colspan="10"><strong><p style="text-align: center">There is no data for search....</p></strong></td></tr>
-			            <% end %>
+		            <tbody>
+		                    <% if @cardSettles != 0 %>
+		                      <% @cardSettles.each do |cardSettle| %>
+		                          <tr>
+		                              <td><%= cardSettle.shift_sale.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> - <%= cardSettle.shift_sale.shift_closed_at ? cardSettle.shift_sale.shift_closed_at.strftime("%e %b %I:%M%p") : '-'  %></td>
+		                              <td><%= cardSettle.req_date %> <%= cardSettle.req_time.utc.getlocal.strftime("%I:%M %p") %></td>
+		                              <td><%= cardSettle.req_type %></td>
+		                              <td><%= cardSettle.res_date %> <%= cardSettle.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
+		                              <td><%= cardSettle.res_type %></td>
+		                              <td><%= cardSettle.shift_sale.employee.name %></td>
+		                              <td><%= cardSettle.sale_cnt %></td>
+		                              <td><%= cardSettle.sale_amt %></td>
+		                              <td><%= cardSettle.void_cnt %></td>
+		                              <td><%= cardSettle.void_amt %></td>
+		                              <td><%= cardSettle.status %></td>
+		                          </tr>
+		                      <% end %>
+		                  <% else %>
+		                      <tr><td colspan="10"><strong><p style="text-align: center">There is no data for search....</p></strong></td></tr>
+		                  <% end %>
 		            </tbody>
 				</table>
 			</div>
diff --git a/app/views/transactions/card_sale_trans/index.html.erb b/app/views/transactions/card_sale_trans/index.html.erb
index 50948bdb..ce72f578 100644
--- a/app/views/transactions/card_sale_trans/index.html.erb
+++ b/app/views/transactions/card_sale_trans/index.html.erb
@@ -86,42 +86,34 @@
             </thead>
 
             <tbody>
-              <% if @cardSales != 0 %>
-                  <% @cardSales.each do |cardSale| %>
-                    <tr>
-                      <td><%= link_to cardSale.sale_id, transactions_sale_path(cardSale.sale_id) rescue '-' %></td>
-                      <td><%= cardSale.req_date %> <%= cardSale.req_time.utc.getlocal.strftime("%I:%M %p") %></td>
-                      <td><%= cardSale.req_inv_no %></td>
-                      <td><%= cardSale.req_amt %></td>
-                      <td><%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
-                      <td><%= cardSale.ref_no %></td>
-                      <td><%= cardSale.res_amt %></td>
-                      <td>
-                        <% if cardSale.app == 'cup' %>
-                          UNION
-                        <% else %>
-                          <%= cardSale.app %>
-                        <% end %>    
-                      </td>
-                      <td><%= cardSale.sale.customer.name rescue '-' %></td>
-                      <td><%= cardSale.sale.cashier_name rescue '-' %></td>
-
-                      <td>TID : <%= cardSale.terminal_id %>
-                          <br>
-                          MID : <%= cardSale.trace %>
-                          <br>
-                          Batch : <%= cardSale.batch_no %>
-                          <br>
-                          Trace : <%= cardSale.merchant_id %>
-                      </td>                   
-                      <td><%= cardSale.status %></td>
-                    </tr>
-                  <% end %>
-              <% else %>
-                    <tr><td colspan="10"><strong><p style="text-align: center">There is no data for search....</p></strong></td></tr>
-              <% end %>
-            </tbody>
-          </table>
+                      <% if @cardSales != 0 %>
+                          <% @cardSales.each do |cardSale| %>
+                            <tr>
+                                <td><%= cardSale.req_date %> <%= cardSale.req_time.utc.getlocal.strftime("%I:%M %p") %></td>
+                                <td><%= cardSale.req_inv_no %></td>
+                                <td><%= cardSale.req_amt %></td>
+                                <td><%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
+                                <td><%= cardSale.ref_no %></td>
+                                <td><%= cardSale.res_amt %></td>
+                                <td><%= cardSale.app %></td>
+                                <td><%= cardSale.sale.customer.name rescue '-' %></td>
+                                <td><%= cardSale.sale.cashier_name rescue '-' %></td>
+                                  <td>TID : <%= cardSale.terminal_id %>
+                                      <br>
+                                        MID : <%= cardSale.trace %>
+                                      <br>
+                                        Batch : <%= cardSale.batch_no %>
+                                      <br>
+                                        Trace : <%= cardSale.merchant_id %>
+                                  </td>                   
+                                <td><%= cardSale.status %></td>
+                            </tr>
+                          <% end %>
+                      <% else %>
+                          <tr><td colspan="10"><strong><p style="text-align: center">There is no data for search....</p></strong></td></tr>
+                    <% end %>
+                  </tbody>
+            </table>
           <br>
            <% if @cardSales != 0 %>
                <%= paginate @cardSales %>
diff --git a/app/views/transactions/card_settle_trans/index.html.erb b/app/views/transactions/card_settle_trans/index.html.erb
index 248a76c3..7cbc3573 100644
--- a/app/views/transactions/card_settle_trans/index.html.erb
+++ b/app/views/transactions/card_settle_trans/index.html.erb
@@ -90,21 +90,9 @@
                           <tr>
                               <td><%= cardSettle.shift_sale.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> - <%= cardSettle.shift_sale.shift_closed_at ? cardSettle.shift_sale.shift_closed_at.strftime("%e %b %I:%M%p") : '-'  %></td>
                               <td><%= cardSettle.req_date %> <%= cardSettle.req_time.utc.getlocal.strftime("%I:%M %p") %></td>
-                              <td>
-                                <% if cardSettle.req_type == 'CUP' %>
-                                UNION
-                                <% else %>
-                                  <%= cardSettle.req_type %>
-                                <% end %>
-                            </td>
+                              <td><%= cardSettle.req_type %></td>
                               <td><%= cardSettle.res_date %> <%= cardSettle.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
-                              <td>
-                                <% if cardSettle.res_type == 'CUP' %>
-                                UNION
-                                <% else %>
-                                  <%= cardSettle.res_type %>
-                                <% end %>
-                            </td>
+                              <td><%= cardSettle.res_type %></td>
                               <td><%= cardSettle.shift_sale.employee.name %></td>
                               <td><%= cardSettle.sale_cnt %></td>
                               <td><%= cardSettle.sale_amt %></td>