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

v.2.28

Browse Source
This commit is contained in:
miroman-afk
2023-05-04 10:41:36 +03:00
parent fb46c8e739
commit 5c3a8a464b
13 changed files with 623 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/controllers/reports.js
View File

@@ -182,8 +182,8 @@
};
$scope.reportPay = function () {
smartRequest.get('report/payment?start_date=' + encodeURIComponent($scope.start_date) + '&end_date=' + encodeURIComponent($scope.end_date), function (data) {
$scope.printers = data.printers;
smartRequest.get('v1/datareport?type=payment&start_date=' + encodeURIComponent($scope.start_date) + '&end_date=' + encodeURIComponent($scope.end_date), function (data) {
$scope.printers = data.items;
$('#report-payment').modal();
$scope.update();
});

4
web/controllers/shifts.js
View File

@@ -263,8 +263,8 @@
};
$scope.reportPay = function (shift) {
smartRequest.get('report/payment?shift_id=' + shift.id, function (data) {
$scope.printers = data.printers;
smartRequest.get('v1/datareport?type=payment&shift_id=' + shift.id, function (data) {
$scope.printers = data.items;
$scope.start_date = shift.opened;
$scope.end_date = shift.closed;

35
web/views/reports/items/payment.html
View File

@@ -11,32 +11,45 @@
</div>
<div class="modal-body p-lg">
<div class="col-md-6" ng-repeat="printer in printers">
<div class="table-responsive">
<div class="table-responsive" ng-if="printer.full_sum > 0">
<table class="table table-border">
<thead>
<th colspan="2">{{printer.name}}</th>
<th colspan="2">{{printer.printer_name}}</th>
</thead>
<tbody>
<tr ng-if="printer.cash > 0">
<tr ng-if="printer.payments.cash > 0">
<td>Наличный расчет:</td>
<td class="text-right">{{printer.cash | curr}}</td>
<td class="text-right">{{printer.payments.cash | curr}}</td>
</tr>
<tr ng-if="printer.credit > 0">
<tr ng-if="printer.payments.credit > 0">
<td>Кредитными картами:</td>
<td class="text-right">{{printer.credit | curr}}</td>
<td class="text-right">{{printer.payments.credit | curr}}</td>
</tr>
<tr ng-if="printer.clearing > 0">
<tr ng-if="printer.payments.clearing > 0">
<td>Безналичный расчет: </td>
<td class="text-right">{{printer.clearing | curr}}</td>
<td class="text-right">{{printer.payments.clearing | curr}}</td>
</tr>
<tr ng-if="printer.self_pay > 0">
<tr ng-if="printer.payments.self > 0">
<td>Питание штата: </td>
<td class="text-right"> {{printer.payments.self | curr}}</td>
</tr>
<tr ng-if="printer.payments.emoney > 0">
<td>Иными способами оплаты: </td>
<td class="text-right"> {{printer.payments.emoney | curr}}</td>
</tr>
<tr ng-if="printer.payments.online > 0">
<td>Онлайн: </td>
<td class="text-right"> {{printer.payments.online | curr}}</td>
</tr>
<tr ng-if="printer.payments.presale > 0">
<td>По ранее полученному авансу: </td>
<td class="text-right"> {{printer.self_pay | curr}}</td>
<td class="text-right"> {{printer.payments.presale | curr}}</td>
</tr>
</tbody>
<thead>
<th colspan="2">Итого: {{printer.total | curr}} BYN</th>
<th colspan="2">Итого: {{printer.payments.cash + printer.payments.credit + printer.payments.clearing + printer.payments.self + printer.payments.emoney + printer.payments.online + printer.payments.presale | curr}} BYN</th>
</thead>
</table>
</div>

4
web/views/reports/items/statistic.html
View File

@@ -170,11 +170,11 @@
<td>Иные способы оплаты</td>
<td style="text-align: right">{{ payments.pay_another | curr}} BYN</td>
</tr>
<tr ng-if="pay_delivery > 0">
<tr ng-if="payments.pay_delivery > 0">
<td>Доставка</td>
<td style="text-align: right">{{ payments.pay_delivery | curr}} BYN</td>
</tr>
<tr ng-if="pay_echeck > 0">
<tr ng-if="payments.pay_echeck > 0">
<td>Электронный чек</td>
<td style="text-align: right">{{ payments.pay_echeck | curr}} BYN</td>
</tr>