From e4e19341a3ef4b97173295b57737a9937c3ca225 Mon Sep 17 00:00:00 2001
From: Daniel Camargo <pererinha@gmail.com>
Date: Wed, 24 Sep 2014 19:59:33 -0300
Subject: [PATCH] partial #3765

---
 .../frontend/drivers/drivers-payment.phtml     | 17 +++++++++++++----
 .../settlement-drivers-payment.phtml           | 18 ++++++++++++++----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/include/views/default/cockpit2/frontend/drivers/drivers-payment.phtml b/include/views/default/cockpit2/frontend/drivers/drivers-payment.phtml
index cd65daad5..757291ac6 100644
--- a/include/views/default/cockpit2/frontend/drivers/drivers-payment.phtml
+++ b/include/views/default/cockpit2/frontend/drivers/drivers-payment.phtml
@@ -105,10 +105,6 @@
 						<td>Adjustments</td>
 						<td>${{result.adjustment | formatPrice}}</td>
 					</tr>
-					<tr ng-if="result.adjustment_note">
-						<td>Adjustments Note</td>
-						<td>{{result.adjustment_note}}</td>
-					</tr>
 					<tr class="total-due" positive-or-negative-color="{{result.calcs.total_reimburse}}" ng-if="pay_type_reimbursement">
 						<td class="td-medium">Amount</td>
 						<td class="td-medium">${{result.calcs.total_reimburse | formatPrice}}</td>
@@ -117,6 +113,10 @@
 						<td class="td-medium">Amount</td>
 						<td class="td-medium">${{result.calcs.total_payment | formatPrice}}</td>
 					</tr>
+					<tr ng-if="result.adjustment_note">
+						<td>Adjustments Note</td>
+						<td>{{result.adjustment_note}}</td>
+					</tr>
 					<tr>
 						<td>{{result.title}} Notes</td>
 						<td>{{result.note}}</td>
@@ -367,6 +367,15 @@
 					<td></td>
 					<td></td>
 				</tr>
+				<tr class="transparent" ng-if="result.adjustment">
+					<td class="hide-tiny-screen"></td>
+					<td></td>
+					<td>Adjustments Note</td>
+					<td>{{result.adjustment_note}}</td>
+					<td></td>
+					<td></td>
+					<td></td>
+				</tr>
 			</tbody>
 		</table>
 	</div>
diff --git a/include/views/default/cockpit2/frontend/settlement/settlement-drivers-payment.phtml b/include/views/default/cockpit2/frontend/settlement/settlement-drivers-payment.phtml
index 6571720e8..1dd0b9780 100644
--- a/include/views/default/cockpit2/frontend/settlement/settlement-drivers-payment.phtml
+++ b/include/views/default/cockpit2/frontend/settlement/settlement-drivers-payment.phtml
@@ -133,10 +133,6 @@
 					<td>Adjustments</td>
 					<td>${{result.adjustment | formatPrice}}</td>
 				</tr>
-				<tr ng-if="result.adjustment_note">
-					<td>Adjustments Note</td>
-					<td>{{result.adjustment_note}}</td>
-				</tr>
 				<tr class="total-due" positive-or-negative-color="{{result.calcs.total_reimburse}}" ng-if="pay_type_reimbursement">
 					<td class="td-medium">Amount</td>
 					<td class="td-medium">${{result.calcs.total_reimburse | formatPrice}}</td>
@@ -145,6 +141,10 @@
 					<td class="td-medium">Amount</td>
 					<td class="td-medium">${{result.calcs.total_payment | formatPrice}}</td>
 				</tr>
+				<tr ng-if="result.adjustment_note">
+					<td>Adjustments Note</td>
+					<td>{{result.adjustment_note}}</td>
+				</tr>
 				<tr>
 					<td>{{result.title}} Notes</td>
 					<td>{{result.note}}</td>
@@ -383,6 +383,16 @@
 					<td></td>
 					<td></td>
 				</tr>
+				<tr ng-if="result.adjustment_note">
+					<td></td>
+					<td></td>
+					<td>Adjustments Note</td>
+					<td>{{result.adjustment_note}}</td>
+					<td></td>
+					<td></td>
+					<td></td>
+					<td></td>
+				</tr>
 				<tr class="transparent"><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
 			</tbody>
 		</table>