Добавлен расширенный отчет по реализации
Добавлен монитор активности
This commit is contained in:
miroman-afk
2023-08-03 11:05:15 +03:00
parent 19ad7d1c8a
commit c4dc6e02a0
93 changed files with 13328 additions and 1122 deletions

View File

@@ -211,7 +211,7 @@
<div class="row align-items-center" style="margin-right: 0px;">
<div class="sl-content">
<div class="col-lg-12 col-sm-6">
<a ng-click="getItems(order.code, order.opened, order.closed)">
<a ng-click="getOrderInfo(order.code, order.opened, order.closed)">
<div class="sl-date text-muted">Заказ открыт:
{{order.opened}}
</div>
@@ -488,5 +488,5 @@
</div>
<div class="modal fade" id="order" data-backdrop="true">
<div ui-include="'../views/clients/order.html'"></div>
<div ui-include="'../views/activitymonitor/items/order.html'"></div>
</div>

View File

@@ -1,71 +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>
<p>
Номер заказа: <strong>#{{order.order_id}}</strong><br>
Время закрытия: <strong>{{order.closed}}</strong><br>
Персонал: <strong>{{order.who_close}}</strong><br>
Статус заказа: <span class="label success">{{order.order_status}}</span><br>
</p>
</div>
<div class="modal-body p-lg">
<div class="table-responsive">
<table class="table table-striped white b-a">
<thead>
<tr>
<th>ID</th>
<th>Блюдо</th>
<th style="width: 80px">Кол-во</th>
<th style="width: 140px">Стоимость</th>
<th style="width: 180px">Итог</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in order.items">
<td>{{item.id}}</td>
<td>{{item.name}}</td>
<td>{{item.count * item.cof}}</td>
<td>{{item.price | curr}} BYN</td>
<td>{{item.amount | curr}} BYN <p ng-if="item.discount > 0">
<span>(Скидка: {{item.discount}}%)</span></p></td>
</tr>
<tr>
<td colspan="4" class="text-right"><strong>Итого</strong></td>
<td>{{order.amount | curr}} BYN</td>
</tr>
<tr>
<td colspan="4" class="text-right no-border" ng-if="order.full_price - order.amount > 0">
<strong>Сумма скидки</strong></td>
<td ng-if="order.full_price - order.amount > 0">{{order.full_price - order.amount | curr}} BYN
</td>
</tr>
<tr>
<td colspan="4" class="text-right no-border"><strong>Оплачено:</strong></td>
</tr>
<tr ng-if="order.cash > 0">
<td colspan="5" class="text-right no-border">Наличные: <strong>{{order.cash
| curr}} BYN</strong></td>
</tr>
<tr ng-if="order.credit > 0">
<td colspan="5" class="text-right no-border">Кред. карта: <strong>{{order.credit | curr}}
BYN</strong></td>
</tr>
<tr ng-if="order.clearing > 0">
<td colspan="5" class="text-right no-border">Питание штата: <strong>{{order.clearing | curr}}
BYN</strong>
</tr>
<tr ng-if="order.presale > 0">
<td colspan="5" class="text-right no-border">Зачтен аванс: <strong>{{order.presale | curr}}
BYN</strong></td>
</tr>
<tr ng-if="order.self > 0">
<td colspan="5" class="text-right no-border">Безнал: <strong>{{order.self | curr}} BYN</strong>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>