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

Automate Pay Summaries for Drivers in cbtn.io #3234 - iphone adjustments

Browse Source
This commit is contained in:
Daniel Camargo 2014-07-11 17:18:45 -03:00
parent 98d1412bf1
commit fb1280dab6
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,7 +85,7 @@
<td>${{result.calcs.tip | formatPrice}}</td>
</tr>
<tr ng-if="!result.hourly" positive-or-negative-color="{{result.calcs.markup}}">
<td>Cash Markup Owed to CB</td>
<td>CB Cash Fee</td>
<td>${{result.calcs.markup | formatPrice}}</td>
</tr>
<tr ng-if="!result.hourly" positive-or-negative-color="{{result.adjustment}}">

14
include/views/default/cockpit2/frontend/drivers/drivers-summary.phtml
View File

@ -69,13 +69,13 @@
</td>
</tr>
<tr ng-if="summary.earnings.current">
<td>Rembursement so far this week</td>
<td>Reimbursement so far this week</td>
<td positive-or-negative-color="{{summary.earnings.current.total_reimburse}}">
${{summary.earnings.current.total_reimburse | formatPrice}}
</td>
</tr>
<tr ng-if="summary.earnings.previous.payment_status">
<td>Last week's payment</td>
<td>Last week's earnings</td>
<td positive-or-negative-color="{{summary.earnings.previous.payment_status.pending.payment}}">
${{summary.earnings.previous.payment_status.pending.payment | formatPrice}}
</td>
@ -110,10 +110,10 @@
<tbody ng-repeat="week in summary.weeks">
<tr>
<td>
<span class="link" ng-click="week.show_week = !week.show_week">
<div class="link expand-collapse" ng-click="week.show_week = !week.show_week">
<i class="orange fa fa-plus-square-o" ng-show="!week.show_week"></i>
<i class="fa fa-minus-square-o" ng-show="week.show_week"></i>
</span>
</div>
</td>
<td>{{week.period}}</td>
<td positive-or-negative-color="{{week.total_payment}}">
@ -135,10 +135,10 @@
<tbody ng-repeat="day in week.days">
<tr>
<td>
<span class="link" ng-click="day.show_day = !day.show_day">
<div class="link expand-collapse" ng-click="day.show_day = !day.show_day">
<i class="orange fa fa-plus-square-o" ng-show="!day.show_day"></i>
<i class="fa fa-minus-square-o" ng-show="day.show_day"></i>
</span>
</div>
</td>
<td>{{day.day}}</td>
<td positive-or-negative-color="{{day.total_payment}}">
@ -160,7 +160,7 @@
</td>
<td>Tip</td>
<td>Delivery Fee</td>
<td>Cash Markup Owed to CB</td>
<td>CB Cash Fee</td>
<td>Pay</td>
<td class="hide-tiny-screen">&nbsp;</td>
<td>Reimbursement</td>

4
www/assets/cockpit/scss/cockpit.scss
View File

@ -1714,4 +1714,8 @@ b, strong{ font-weight: bold; }
.tb-grid{
font-size: .9em;
}
}
.expand-collapse{
width:25px;
height:25px;
}