Merge pull request #486 from bummzack/fix-payments-table

Merged #486
silvershop · Apr 22, 2016 · c480035 · c480035
2 parents afdd145 + 69668dc
commit c480035
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/templates/order/Order_Payments.ss b/templates/order/Order_Payments.ss
@@ -1,14 +1,13 @@
 <table id="PaymentTable" class="infotable">
 	<thead>
 		<tr class="gap mainHeader">
-				<th colspan="5" class="left"><%t Payment.PaymentsHeadline "Payment(s)" %></th>
+            <th colspan="4" class="left"><%t Payment.PaymentsHeadline "Payment(s)" %></th>
 		</tr>
 		<tr>
 			<th scope="row" class="twoColHeader"><%t Payment.Date "Date" %></th>
 			<th scope="row"  class="twoColHeader"><%t Payment.Amount "Amount" %></th>
-			<th scope="row"  class="twoColHeader"><%t Payment.Status "Payment Status" %></th>
-			<th scope="row" class="twoColHeader"><%t Payment.Method "Method" %></th>
-			<th scope="row" class="twoColHeader"><%t Payment.Note "Note" %></th>
+			<th scope="row"  class="twoColHeader"><%t Payment.db_Status "Payment Status" %></th>
+			<th scope="row" class="twoColHeader"><%t Payment.db_Gateway "Method" %></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -18,12 +17,11 @@
 				<td class="price">$Amount.Nice $Currency</td>
 				<td class="price">$PaymentStatus</td>
 				<td class="price">$GatewayTitle</td>
-				<td class="price">$Message.NoHTML</td>
 			</tr>
 			<% if $ShowMessages %>
 				<% loop $Messages %>
 					<tr>
-						<td colspan="5">
+						<td colspan="4">
 							$ClassName $Message $User.Name
 						</td>
 					</tr>