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

partial #2250 - Settlement

Browse Source 
- I think the components should not be visible initially, and we should see a list of just the restaurants with their total amounts. This will allow me to quickly see if there are any problems.
- Also helpful would be to display JUST the refunded orders (for EVERY restaurant at once), but no other orders, so I could quickly review all of those)
This commit is contained in:
Daniel Camargo 2014-06-23 13:35:03 -03:00
parent 72866d856e
commit 15b5e23c94
3 changed files with 94 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
include/views/default/cockpit2/frontend/settlement-restaurants.phtml
View File

@ -88,25 +88,102 @@
</tbody>
</table>
<ul class="ul-inputs box-content" ng-if="total_payments">
<li class="li-input">
<button class="button button-big save" ng-click="schedule();">Pay Restaurants</button>
</li>
</ul>
</div>
<table class="tb-grid tb-zebra">
<thead>
<tr>
<td class="td-medium">Restaurant</td>
<td class="td-medium">Total Due</td>
<td></td>
</tr>
</thead>
<tbody>
<tr ng-repeat="restaurant in result.restaurants">
<td>{{restaurant.name}}</td>
<td>$ {{restaurant.total_due | formatPrice}}</td>
<td><span class="link details orange" ng-click="show_details(restaurant.id_restaurant)">Details</span></td>
</tr>
</tbody>
</table>
<ul class="ul-inputs box-content" ng-if="total_payments">
<li class="li-input">
<button class="button button-big save" ng-click="schedule();">Pay Restaurants</button>
</li>
</ul>
<br/><br/>
<h2 class="title" id="refunded-orders">
<span>Refunded Orders</span>
</h2>
<div>
<table class="tb-grid tb-zebra">
<thead>
<tr>
<td></td>
<td>#</td>
<td class="td-medium">Restaurant</td>
<td class="td-medium">Name</td>
<td>Amount</td>
<td>Payment</td>
<td class="td-medium">Date</td>
<td></td>
<td></td>
<td></td>
</tr>
</thead>
<tbody ng-repeat="restaurant in result.restaurants">
<tr ng-repeat="order in restaurant.orders" ng-if="order.refunded">
<td></td>
<td ng-class="{ 'excluded': !order.included }">{{order.id_order}}</td>
<td ng-class="{ 'excluded': !order.included }">{{restaurant.name}}</td>
<td ng-class="{ 'excluded': !order.included }">{{order.name}}</td>
<td ng-class="{ 'excluded': !order.included }">$ {{order.total | formatPrice}}</td>
<td ng-class="{ 'excluded': !order.included }">{{order.pay_type}}</td>
<td ng-class="{ 'excluded': !order.included }">{{order.date}}</td>
<td>
<span ng-if="order.pay_type == 'Cash'">
<span class="pointer orange" ng-click="reimburse_cash_order( order.id_order, 1 )" ng-if="!order.reimburse_cash_order">
<i class="fa fa-square-o"></i> Reimburse cash order?
</span>
<span class="pointer" ng-click="reimburse_cash_order( order.id_order, 0 )" ng-if="order.reimburse_cash_order">
<i class="fa fa-check-square-o"></i> Reimbursed!
</span>
</span>
<span ng-if="order.refunded && order.pay_type == 'Card'">
<span class="pointer orange" ng-click="pay_if_refunded( order.id_order, 1 )" ng-if="!order.pay_if_refunded">
<i class="fa fa-square-o"></i> Refunded. Include?
</span>
<span class="pointer" ng-click="pay_if_refunded( order.id_order, 0 )" ng-if="order.pay_if_refunded">
<i class="fa fa-check-square-o"></i> Refunded. Included!
</span>
</span>
</td>
<td>
</td>
</tr>
</tbody>
</table>
</div>
<br/><br/>
<h2 class="title">
<span>Restaurants Details</span>
</h2>
<div class="box-content" ng-repeat="restaurant in result.restaurants">
<span class="link details orange" ng-click="restaurant.show_details=!restaurant.show_details">Details</span>
<h2 class="title" ng-class="{ 'excluded': !restaurant.pay }">
<span>{{restaurant.name}}</span> <strong>$ {{restaurant.total_due | formatPrice}}</strong>
<h2 id="restaurant-{{restaurant.id_restaurant}}" class="title" ng-class="{ 'excluded': !restaurant.pay }">
<span>{{restaurant.name}}</span></strong>
</h2>
<div class="divider"></div>
<div ng-show="restaurant.show_details">
<div>
<h3 class="title" ng-if="restaurant.last_payment">
Last payment #{{restaurant.last_payment.id_payment}}: <strong positive-or-negative-color="{{restaurant.last_payment.amount}}">$ {{restaurant.last_payment.amount | formatPrice}}</strong> on <strong>{{restaurant.last_payment.date}}</strong>

6
www/assets/cockpit/js/controllers.settlement.js
View File

@ -170,6 +170,12 @@ NGApp.controller('SettlementRestaurantsCtrl', function ( $scope, $filter, Settle
$scope.total_reimburse_cash_orders = total_reimburse_cash_orders;
}
$scope.show_details = function( id_restaurant ){
var el = angular.element( '#restaurant-' + id_restaurant );
var walkTo = ( $('.snap-content-inner').scrollTop() + el.offset().top ) - 80;
$( 'html, body, .snap-content-inner' ).animate( { scrollTop: walkTo }, '500');
}
// Just run if the user is loggedin
if( $scope.account.isLoggedIn() ){
range();

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

@ -868,7 +868,6 @@ input {
}
.neutral{
color: #CCC;
text-decoration: line-through;
}
.summary{
font-weight: bold;