horeca/admin-php-module
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v.2.15

Browse Source 
Обновление отчета по персоналу
This commit is contained in:
miroman-afk
2022-06-14 12:22:42 +03:00
parent ebd1180d89
commit 7fdcbcc9e8
8 changed files with 403 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web/controllers/dashboard.js
View File

@@ -323,7 +323,7 @@
$scope.total = data.total;
});
smartRequest.get('dashboard/online/staff', function (data) {
smartRequest.get('v1/onlinestaff?method=dashboard', function (data) {
$scope.personals = data.staff;
});
@@ -503,7 +503,7 @@
$scope.total = data.total;
});
smartRequest.get('dashboard/online/staff', function (data) {
smartRequest.get('v1/onlinestaff?method=dashboard', function (data) {
$scope.personals = data.staff;
});
@@ -730,6 +730,14 @@
});
};
$scope.getItemsStaff = function (order) {
$('#get-more-staff').modal('toggle');
smartRequest.get('v1/onlinestaff?method=items&order=' + order.number, function (data) {
$scope.order = data;
$('#items-staff').modal('toggle');
});
};
$scope.getItemsDiscount = function (order) {
$('#get-more-discount').modal('toggle');
smartRequest.get('v1/discountitems?order=' + order.number, function (data) {

2
web/controllers/reports.js
View File

@@ -89,7 +89,7 @@
};
$scope.reportStaff = function() {
smartRequest.get('report/staff?start_date=' + encodeURIComponent($scope.start_date) + '&end_date=' + encodeURIComponent($scope.end_date), function(data) {
smartRequest.get('v1/datareport?type=staff&start_date=' + encodeURIComponent($scope.start_date) + '&end_date=' + encodeURIComponent($scope.end_date), function(data) {
$scope.staffs = data.staffs;
$('#report-staff').modal();
}, function(data) {

2
web/controllers/shifts.js
View File

@@ -150,7 +150,7 @@
};
$scope.reportStaff = function (shift) {
smartRequest.get('report/staff?shift_id=' + shift.id, function (data) {
smartRequest.get('v1/datareport?type=staff&shift_id=' + shift.id, function (data) {
$scope.staffs = data.staffs;
$scope.start_date = shift.opened;
$scope.end_date = shift.closed;

2
web/views/dashboard/items/more-staff.html
View File

@@ -19,7 +19,7 @@
</thead>
<tbody>
<tr ng-repeat="order in staff.orders" ng-click="getItems('staff', order)">
<tr ng-repeat="order in staff.orders" ng-click="getItemsStaff(order)">
<td>{{order.number}}</td>
<td>{{order.opened}}</td>
<td>{{ getClosedDate(order.closed) }}</td>

54
web/views/reports/items/staff.html
View File

@@ -10,40 +10,26 @@
<span class="text-muted">{{start_date}} - {{end_date}}</span>
</div>
<div class="modal-body p-lg">
<div class="col-md-6" ng-repeat="staff in staffs">
<div class="table-responsive">
<table class="table table-border">
<thead>
<th>{{ staff.name }}</th>
</thead>
<tbody>
<tr ng-if="staff.input_count > 0">
<td>{{staff.input_count}} внесений в кассу на сумму {{staff.input_sum | curr}} BYN</td>
</tr>
<tr ng-if="staff.output_count > 0">
<td>{{staff.output_count}} выдач из кассы на сумму {{staff.output_sum | curr}} BYN</td>
</tr>
<tr ng-if="staff.payment_count > 0">
<td>{{staff.payment_count}} платежных документов на сумму {{staff.payment_sum | curr}} BYN</td>
</tr>
<tr ng-if="staff.opened_count > 0">
<td>Открыто {{staff.opened_count}} документов на сумму {{staff.opened_sum | curr}} BYN</td>
</tr>
<tr ng-if="staff.input_presale_count > 0">
<td>Внесено {{staff.input_presale_count}} авансов на сумму {{staff.input_presale_sum | curr} BYN</td>
</tr>
<tr ng-if="staff.output_presale_count > 0">
<td>Выдано {{staff.output_presale_count}} авансов на сумму {{staff.output_presale_sum | curr}} BYN</td>
</tr>
<tr ng-if="staff.correct_count > 0">
<td>Внесено {{staff.correct_count}} корекций на сумму {{staff.correct_sum | curr}} BYN</td>
</tr>
<tr ng-if="staff.return_count > 0">
<td>{{staff.return_count}} возвратов на сумму {{staff.return_sum | curr}} BYN</td>
</tr>
</tbody>
</table>
</div>
<div class="table-responsive" ng-repeat="staff in staffs">
<table class="table table-border">
<thead>
<th>
{{ staff.name }}
</th>
</thead>
<tbody>
<td>
<p ng-if="staff.input_count > 0">{{staff.input_count}} внесений в кассу на сумму {{staff.input_sum | curr}} BYN</p>
<p ng-if="staff.output_count > 0">{{staff.output_count}} выплат из кассы на сумму {{staff.output_sum | curr}} BYN</p>
<p ng-if="staff.opened_count > 0">Открыто {{staff.opened_count}} заказов на сумму {{staff.opened_sum | curr}} BYN</p>
<p ng-if="staff.closed_count > 0">Закрыто {{staff.closed_count}} заказов на сумму {{staff.closed_sum | curr}} BYN</p>
<p ng-if="staff.return_count > 0">{{staff.return_count}} возвратов на сумму {{staff.return_sum | curr}} BYN</p>
<p ng-if="staff.annul_count > 0">{{staff.annul_count}} аннулирований на сумму {{staff.annul_sum | curr}} BYN</p>
<p ng-if="staff.deleted_count > 0">{{staff.deleted_count}} удалений на сумму {{staff.deleted_sum | curr}} BYN</p>
</td>
</tbody>
</table>
</hr>
</div>
</div>
</div>

35
web/views/terminals/reports/delete.html
View File

@@ -1,35 +0,0 @@
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h5 class="modal-title">Отчет по удалениям</h5>
</div>
<div class="modal-body p-lg">
<div class="table-responsive" ng-if="report_delete.length > 0">
<table class="table table-bordered m-a-" ng-repeat="report in report_delete">
<thead>
<th>Заказ #{{ report.order_code }}</th>
</thead>
<tbody>
<tr ng-repeat="item in report.items">
<td>
<h6>{{ item.dish_name }} <small>(<strong>{{ item.count }}</strong> на сумму <strong>{{ item.sum }} BYN</strong>)</small></h6>
<p>
Удалил: <strong>{{ item.who }}</strong><br/>
Подтвердил: <strong>{{ item.approved }}</strong><br/>
Причина: <strong>{{ item.reason }}</strong>
</p>
</td>
</tr>
</tbody>
</table>
</div>
<div ng-if="report_delete.length == 0">
<p>Удаления отсутствуют</p>
</div>
</div>
</div>
</div>