diff --git a/app/views/reports/card_sale_tran/index.html.erb b/app/views/reports/card_sale_tran/index.html.erb
index 673da3ae..9ac8550e 100644
--- a/app/views/reports/card_sale_tran/index.html.erb
+++ b/app/views/reports/card_sale_tran/index.html.erb
@@ -19,7 +19,7 @@
 			</div>	  			
 
 		<div class="margin-top-20">
-			<div class="card" style="width:115%;">
+			<div class="card" style="width:112%;">
 				<table class="table table-striped" border="0">
 					<thead>
 
@@ -46,7 +46,6 @@
 			                <th><%= t("views.right_panel.detail.Customer_name") %></th>
 			                <th><%= t("views.right_panel.detail.Cashier_name") %></th>
 			                <th><%= t("views.right_panel.detail.detail") %></th>
-			                <th><%= t("views.right_panel.detail.status") %></th>
 			            </tr>
 					</thead>
 					<tbody>
@@ -59,18 +58,32 @@
 			                      	<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>
+			                      		<% 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>
+	                                <td>
+	                                  <% if cardSale.terminal_id != ''  %>
+	                                    TID : <%= cardSale.terminal_id %>
+	                                    <br>
+	                                  <% end %>
+	                                  <% if cardSale.merchant_id != ''  %>  
+	                                    MID : <%= cardSale.merchant_id %>
+	                                    <br>
+	                                  <% end %>
+	                                  <% if cardSale.batch_no != ''  %>  
+	                                    Batch : <%= cardSale.batch_no %>
+	                                    <br>
+	                                  <% end %>
+	                                  <% if cardSale.trace != ''  %>   
+	                                    Trace : <%= cardSale.trace %>
+	                                  <% end %>  
+	                                </td>                  
 		                    	</tr>
 		                  	<% end %>
 		              	<% else %>
diff --git a/app/views/reports/card_sale_tran/index.xls.erb b/app/views/reports/card_sale_tran/index.xls.erb
index 145dce33..decc2c43 100644
--- a/app/views/reports/card_sale_tran/index.xls.erb
+++ b/app/views/reports/card_sale_tran/index.xls.erb
@@ -47,25 +47,39 @@
 			                      	<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>
+			                      		<% 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>
+	                                <td>
+	                                  <% if cardSale.terminal_id != ''  %>
+	                                    TID : <%= cardSale.terminal_id %>
+	                                    <br>
+	                                  <% end %>
+	                                  <% if cardSale.merchant_id != ''  %>  
+	                                    MID : <%= cardSale.merchant_id %>
+	                                    <br>
+	                                  <% end %>
+	                                  <% if cardSale.batch_no != ''  %>  
+	                                    Batch : <%= cardSale.batch_no %>
+	                                    <br>
+	                                  <% end %>
+	                                  <% if cardSale.trace != ''  %>   
+	                                    Trace : <%= cardSale.trace %>
+	                                  <% end %>  
+	                                </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>
+		      	</table>
 			</div>
 		</div>
 	</div>
diff --git a/app/views/transactions/card_sale_trans/index.html.erb b/app/views/transactions/card_sale_trans/index.html.erb
index ce72f578..d7b24af5 100644
--- a/app/views/transactions/card_sale_trans/index.html.erb
+++ b/app/views/transactions/card_sale_trans/index.html.erb
@@ -89,6 +89,8 @@
                       <% 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>
@@ -98,14 +100,23 @@
                                 <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>
+                                  <% if cardSale.terminal_id != ''  %>
+                                    TID : <%= cardSale.terminal_id %>
+                                    <br>
+                                  <% end %>
+                                  <% if cardSale.merchant_id != ''  %>  
+                                    MID : <%= cardSale.merchant_id %>
+                                    <br>
+                                  <% end %>
+                                  <% if cardSale.batch_no != ''  %>  
+                                    Batch : <%= cardSale.batch_no %>
+                                    <br>
+                                  <% end %>
+                                  <% if cardSale.trace != ''  %>   
+                                    Trace : <%= cardSale.trace %>
+                                  <% end %>  
+                                </td>                   
                                 <td><%= cardSale.status %></td>
                             </tr>
                           <% end %>