sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

partial #3765

Browse Source
This commit is contained in:
Daniel Camargo 2014-09-24 19:59:33 -03:00
parent 6662ad3302
commit e4e19341a3
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/views/default/cockpit2/frontend/drivers/drivers-payment.phtml
View File

@ -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>

18
include/views/default/cockpit2/frontend/settlement/settlement-drivers-payment.phtml
View File

@ -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>