v.2.30
Добавлен расширенный отчет по реализации Добавлен монитор активности
This commit is contained in:
miroman-afk
121
web/views/activitymonitor/index.html
Normal file
121
web/views/activitymonitor/index.html
Normal file
File diff suppressed because one or more lines are too long
102
web/views/activitymonitor/items/order.bak.html
Normal file
102
web/views/activitymonitor/items/order.bak.html
Normal file
@@ -0,0 +1,102 @@
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" ng-click="backModal('order', 'orders')">
|
||||
<i class="material-icons md-24">arrow_back</i>
|
||||
</button>
|
||||
|
||||
<p style="margin-bottom: -0.1rem;">Номер заказа: <strong>#{{order.order_id}}</strong><br></p>
|
||||
<p style="margin-bottom: -0.1rem;">Заказ размещен в зале "<strong>{{order.place}}</strong>" на столе №<strong>{{order.table}}</strong><br></p>
|
||||
<p style="margin-bottom: -0.1rem;">Время открытия: <strong>{{order.opened}}</strong><br></p>
|
||||
<p style="margin-bottom: -0.1rem;" ng-if="order.closed">Время закрытия: <strong>{{order.closed}}</strong><br></p>
|
||||
<p style="margin-bottom: -0.1rem;">Заказ открыт пользователем: <strong>{{order.who_open}}</strong><br></p>
|
||||
<p style="margin-bottom: -0.1rem;" ng-if="order.who_close">Заказ закрыт пользователем: <strong>{{order.who_close}}</strong><br></p>
|
||||
<p style="margin-bottom: -0.1rem;">Статус заказа: <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: 80px" ng-if="order.returned_count > 0">Кол-во возвр.</th>
|
||||
<th style="width: 80px" ng-if="order.deleted_count > 0">Кол-во удал.</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 ng-if="order.returned_count > 0">{{item.returned_count * item.cof}}</td>
|
||||
<td ng-if="order.deleted_count > 0">{{item.deleted_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="{{cols - 1}}" class="text-right">
|
||||
<strong ng-if="order.returned_count > 0">Сумма</strong>
|
||||
<strong ng-if="order.returned_count == 0">Итого</strong>
|
||||
</td>
|
||||
<td>{{order.amount | curr}} BYN</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td colspan="{{cols - 1}}" 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 ng-if="order.cash > 0 || order.credit > 0 || order.clearing > 0 || order.presale > 0 || order.self > 0 || order.online > 0">
|
||||
<td colspan="{{cols - 1}}" class="text-right no-border"><strong>Оплачено:</strong></td>
|
||||
</tr>
|
||||
<tr ng-if="order.cash > 0">
|
||||
<td colspan="{{cols}}" class="text-right no-border">Наличные: <strong>{{order.cash
|
||||
| curr}} BYN</strong></td>
|
||||
</tr>
|
||||
<tr ng-if="order.credit > 0">
|
||||
<td colspan="{{cols}}" class="text-right no-border">Кред. карта: <strong>{{order.credit | curr}}
|
||||
BYN</strong></td>
|
||||
</tr>
|
||||
<tr ng-if="order.clearing > 0">
|
||||
<td colspan="{{cols}}" class="text-right no-border">Питание штата: <strong>{{order.clearing | curr}}
|
||||
BYN</strong>
|
||||
</tr>
|
||||
<tr ng-if="order.presale > 0">
|
||||
<td colspan="{{cols}}" class="text-right no-border">Зачтен аванс: <strong>{{order.presale | curr}}
|
||||
BYN</strong></td>
|
||||
</tr>
|
||||
<tr ng-if="order.self > 0">
|
||||
<td colspan="{{cols}}" class="text-right no-border">Безнал: <strong>{{order.self | curr}} BYN</strong>
|
||||
</td>
|
||||
</tr>
|
||||
<tr ng-if="order.online > 0">
|
||||
<td colspan="{{cols}}" class="text-right no-border">Онлайн: <strong>{{order.online | curr}} BYN</strong>
|
||||
</td>
|
||||
</tr>
|
||||
<tr ng-if="order.returned_count > 0">
|
||||
<td colspan="{{cols - 1}}" class="text-right"><strong>Возвращено:</strong></td>
|
||||
</tr>
|
||||
<tr ng-if="order.returned_method.cash > 0">
|
||||
<td colspan="{{cols}}" class="text-right no-border">Наличные: <strong>{{order.returned_method.cash
|
||||
| curr}} BYN</strong></td>
|
||||
</tr>
|
||||
<tr ng-if="order.returned_method.credit > 0">
|
||||
<td colspan="{{cols}}" class="text-right no-border">Кред. карта: <strong>{{order.returned_method.credit | curr}}
|
||||
BYN</strong></td>
|
||||
</tr>
|
||||
<tr ng-if="order.returned_count > 0">
|
||||
<td colspan="{{cols - 1}}" class="text-right"><strong>Итого</strong></td>
|
||||
<td>{{order.amount - order.returned_sum | curr}} BYN</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
232
web/views/activitymonitor/items/order.html
Normal file
232
web/views/activitymonitor/items/order.html
Normal file
@@ -0,0 +1,232 @@
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button ng-if="orders_modal" type="button" class="close" ng-click="backModal('order', 'orders')">
|
||||
<i class="material-icons md-24">arrow_back</i>
|
||||
</button>
|
||||
<button ng-if="clients_modal" type="button" class="close" data-dismiss="modal">×</button>
|
||||
|
||||
<p style="margin-bottom: -0.1rem;">Номер заказа: <strong>#{{order.order_id}}</strong><br></p>
|
||||
<p style="margin-bottom: -0.1rem;">Заказ размещен в зале "<strong>{{order.place}}</strong>" на столе
|
||||
№<strong>{{order.table}}</strong><br></p>
|
||||
<p style="margin-bottom: -0.1rem;">Время открытия: <strong>{{order.opened}}</strong><br></p>
|
||||
<p style="margin-bottom: -0.1rem;" ng-if="order.closed">Время закрытия:
|
||||
<strong>{{order.closed}}</strong><br></p>
|
||||
<p style="margin-bottom: -0.1rem;">Заказ открыт пользователем: <strong>{{order.who_open}}</strong><br></p>
|
||||
<p style="margin-bottom: -0.1rem;" ng-if="order.who_close">Заказ закрыт пользователем: <strong>{{order.who_close}}</strong><br>
|
||||
</p>
|
||||
<p style="margin-bottom: -0.1rem;">Статус заказа: <span
|
||||
class="label success">{{order.order_status}}</span><br></p>
|
||||
</div>
|
||||
<div class="modal-body p-lg">
|
||||
<div>
|
||||
<div class="b-b nav-active-bg">
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link active" href="" data-toggle="tab" data-target="#tab1"
|
||||
aria-expanded="true">Заказ</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="" data-toggle="tab" data-target="#tab2" aria-expanded="false">Журнал
|
||||
заказа</a>
|
||||
</li>
|
||||
<li class="nav-item" ng-if="actions.slice_trigger == 1">
|
||||
<a class="nav-link" href="" data-toggle="tab" data-target="#tab3" aria-expanded="false">История
|
||||
разбиения</a>
|
||||
</li>
|
||||
<li class="nav-item" ng-if="actions.merge_trigger == 1">
|
||||
<a class="nav-link" href="" data-toggle="tab" data-target="#tab4" aria-expanded="false">История
|
||||
объединения</a>
|
||||
</li>
|
||||
<li class="nav-item" ng-if="actions.move_trigger == 1">
|
||||
<a class="nav-link" href="" data-toggle="tab" data-target="#tab5" aria-expanded="false">История
|
||||
переноса</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="tab-content p-a m-b-md">
|
||||
<div class="tab-pane animated fadeIn text-muted active" id="tab1" aria-expanded="true">
|
||||
<!-- Заказ -->
|
||||
<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: 80px" ng-if="order.returned_count > 0">Кол-во возвр.</th>
|
||||
<th style="width: 80px" ng-if="order.deleted_count > 0">Кол-во удал.</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 ng-if="order.returned_count > 0">{{item.returned_count * item.cof}}</td>
|
||||
<td ng-if="order.deleted_count > 0">{{item.deleted_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="{{cols - 1}}" class="text-right">
|
||||
<strong ng-if="order.returned_count > 0">Сумма</strong>
|
||||
<strong ng-if="order.returned_count == 0">Итого</strong>
|
||||
</td>
|
||||
<td>{{order.amount | curr}} BYN</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td colspan="{{cols - 1}}" 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 ng-if="order.cash > 0 || order.credit > 0 || order.clearing > 0 || order.presale > 0 || order.self > 0 || order.online > 0">
|
||||
<td colspan="{{cols - 1}}" class="text-right no-border"><strong>Оплачено:</strong>
|
||||
</td>
|
||||
</tr>
|
||||
<tr ng-if="order.cash > 0">
|
||||
<td colspan="{{cols}}" class="text-right no-border">Наличные: <strong>{{order.cash
|
||||
| curr}} BYN</strong></td>
|
||||
</tr>
|
||||
<tr ng-if="order.credit > 0">
|
||||
<td colspan="{{cols}}" class="text-right no-border">Кред. карта: <strong>{{order.credit
|
||||
| curr}}
|
||||
BYN</strong></td>
|
||||
</tr>
|
||||
<tr ng-if="order.clearing > 0">
|
||||
<td colspan="{{cols}}" class="text-right no-border">Питание штата: <strong>{{order.clearing
|
||||
| curr}}
|
||||
BYN</strong>
|
||||
</tr>
|
||||
<tr ng-if="order.presale > 0">
|
||||
<td colspan="{{cols}}" class="text-right no-border">Зачтен аванс: <strong>{{order.presale
|
||||
| curr}}
|
||||
BYN</strong></td>
|
||||
</tr>
|
||||
<tr ng-if="order.self > 0">
|
||||
<td colspan="{{cols}}" class="text-right no-border">Безнал: <strong>{{order.self |
|
||||
curr}} BYN</strong>
|
||||
</td>
|
||||
</tr>
|
||||
<tr ng-if="order.online > 0">
|
||||
<td colspan="{{cols}}" class="text-right no-border">Онлайн: <strong>{{order.online |
|
||||
curr}} BYN</strong>
|
||||
</td>
|
||||
</tr>
|
||||
<tr ng-if="order.returned_count > 0">
|
||||
<td colspan="{{cols - 1}}" class="text-right"><strong>Возвращено:</strong></td>
|
||||
</tr>
|
||||
<tr ng-if="order.returned_method.cash > 0">
|
||||
<td colspan="{{cols}}" class="text-right no-border">Наличные: <strong>{{order.returned_method.cash
|
||||
| curr}} BYN</strong></td>
|
||||
</tr>
|
||||
<tr ng-if="order.returned_method.credit > 0">
|
||||
<td colspan="{{cols}}" class="text-right no-border">Кред. карта: <strong>{{order.returned_method.credit
|
||||
| curr}}
|
||||
BYN</strong></td>
|
||||
</tr>
|
||||
<tr ng-if="order.returned_count > 0">
|
||||
<td colspan="{{cols - 1}}" class="text-right"><strong>Итого</strong></td>
|
||||
<td>{{order.amount - order.returned_sum | curr}} BYN</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Журнал заказа -->
|
||||
<div class="tab-pane animated fadeIn text-muted" id="tab2" aria-expanded="false">
|
||||
<div class="table-responsive">
|
||||
<table class="table m-a-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Действие</th>
|
||||
<th>Персонал</th>
|
||||
<th>Время</th>
|
||||
<th>Группа</th>
|
||||
<th>Место</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="action in actions.actions">
|
||||
<td>{{ action.action }}</td>
|
||||
<td>{{ action.who }}</td>
|
||||
<td>{{ action.time }}</td>
|
||||
<td>{{ action.workgroup }}</td>
|
||||
<td>{{ action.workcode }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<!--Разбиение заказа-->
|
||||
<div ng-if="actions.slice_trigger == 1" class="tab-pane animated fadeIn text-muted" id="tab3" aria-expanded="false">
|
||||
<div ng-repeat="sliced_order_item in actions.sliced_order_items">
|
||||
<p class="text-muted m-b-0">Время разбиения: <span class="m-b-0">{{ sliced_order_item.time }}</span></p>
|
||||
<p class="text-muted m-b-0">Пользователь: <span class="m-b-0">{{ sliced_order_item.staff }}</span></p>
|
||||
<p class="text-muted m-b-0">Товары перенесенные в заказ №<span class="m-b-0">{{ sliced_order_item.order }}</span></p>
|
||||
<div class="table-responsive">
|
||||
<table class="table m-a-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Наименование</th>
|
||||
<th>Количество</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="item in sliced_order_item.items">
|
||||
<td>{{ item.name }}</td>
|
||||
<td>{{ item.count }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<hr>
|
||||
</div>
|
||||
</div>
|
||||
<!--Объединение заказа-->
|
||||
<div ng-if="actions.merge_trigger == 1" class="tab-pane animated fadeIn text-muted" id="tab4" aria-expanded="false">
|
||||
<div ng-repeat="merged_order_item in actions.merged_order_items">
|
||||
<p class="text-muted m-b-0">Время объединения: <span class="m-b-0">{{ merged_order_item.time }}</span></p>
|
||||
<p class="text-muted m-b-0">Пользователь: <span class="m-b-0">{{ merged_order_item.staff }}</span></p>
|
||||
<p class="text-muted m-b-0">Товары перенесенные из заказа №<span class="m-b-0">{{ merged_order_item.order }}</span></p>
|
||||
|
||||
<div class="table-responsive">
|
||||
<table class="table m-a-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Наименование</th>
|
||||
<th>Количество</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="item in merged_order_item.items">
|
||||
<td>{{ item.name }}</td>
|
||||
<td>{{ item.count }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<hr>
|
||||
</div>
|
||||
</div>
|
||||
<!--Перенос заказа-->
|
||||
<div ng-if="actions.move_trigger == 1" class="tab-pane animated fadeIn text-muted" id="tab5" aria-expanded="false">
|
||||
<div ng-repeat="moved_order in actions.moved_order_data">
|
||||
<p class="m-b-0">Время переноса: <span class="m-b-0">{{ moved_order.time }}</span></p>
|
||||
<p class="m-b-0">Пользователь: <span class="m-b-0">{{ moved_order.staff_name }}</span></p>
|
||||
<p class="m-b-0">{{ moved_order.data }}</span></p>
|
||||
<hr>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
77
web/views/activitymonitor/items/orders.html
Normal file
77
web/views/activitymonitor/items/orders.html
Normal file
@@ -0,0 +1,77 @@
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content" id="ordersInfo">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" ng-click="closeModal('ordersInfo')">×
|
||||
</button>
|
||||
<h6 class="modal-title" ng-if="place_id">{{place_name}} стол №{{place_id}}</h6>
|
||||
<h6 class="modal-title" ng-if="deleted_info">Подробнее об удаленных</h6>
|
||||
<h6 class="modal-title" ng-if="discount_info">Подробнее о заказах со скидками</h6>
|
||||
<h6 class="modal-title" ng-if="!place_id && !guests_info && !deleted_info && !discount_info">Подробнее о выручке <span ng-if="staff_name"> {{staff_name}}</span>
|
||||
</h6>
|
||||
<h6 class="modal-title" ng-if="!place_id && !deleted_info && !discount_info && guests_info">Подробнее о заказах гостей</h6>
|
||||
<p class="modal-title">Отложено заказов: {{waited_count}} на сумму {{waited_sum | curr}} BYN</p>
|
||||
<p class="modal-title">Закрыто заказов: {{closed_count}} на сумму {{closed_sum | curr}} BYN</p>
|
||||
<p class="modal-title">Аннулировано заказов: {{cancellations_count}} на сумму {{cancellations_sum |
|
||||
curr}}BYN</p>
|
||||
<p class="modal-title">Удалено товаров: {{deleted_count}} на сумму {{deleted_sum | curr}} BYN</p>
|
||||
<p class="modal-title">Возвращено товаров: {{returned_count}} на сумму {{returned_sum | curr}} BYN</p>
|
||||
|
||||
</div>
|
||||
<div class="modal-body p-lg"
|
||||
ng-if="(waited_count + closed_count + deleted_count + returned_count + cancellations_count) > 0">
|
||||
<table id="{{ 'tableOrders_' + type }}" class="table table-bordered table-striped table-hover datatable"
|
||||
ui-jq="dataTable" ui-options="dataTablesOpt" ng-style="{'width': 'inherit'}">
|
||||
<thead>
|
||||
<tr>
|
||||
<th ng-style="{'width':'70px', 'text-align':'right'}">#</th>
|
||||
<th ng-style="{ 'display' : (guests_info) ? 'revert' : 'none', 'width':'118px', 'text-align':'right'}">
|
||||
Гость
|
||||
</th>
|
||||
<th ng-style="{'width':'198px', 'text-align':'right'}">Статус</th>
|
||||
<th ng-style="{'width':'210px', 'text-align':'right'}">Открыт</th>
|
||||
<th ng-style="{'width':'210px', 'text-align':'right'}">Закрыт</th>
|
||||
<th ng-style="{'display' : (discount_info) ? 'revert' : 'none', 'width':'140px', 'text-align':'right'}">Сумма, BYN</th>
|
||||
<th ng-style="{'display' : (discount_info) ? 'revert' : 'none', 'width':'140px', 'text-align':'right'}">Скидка, BYN</th>
|
||||
<th ng-style="{'display' : (!deleted_info) ? 'revert' : 'none', 'width':'140px', 'text-align':'right'}">Итого, BYN</th>
|
||||
<th ng-style="{'display' : (deleted_info) ? 'revert' : 'none', 'width':'140px', 'text-align':'right'}">Сумма удалений, BYN</th>
|
||||
</tr>
|
||||
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
<tr ng-repeat="order in orders" sglclick="getOrderInfo(order.id, order.opened, order.closed)">
|
||||
<td>{{ order.id }}</td>
|
||||
<td style="text-align: right" ng-style="{ 'display' : (guests_info) ? 'revert' : 'none' }">{{
|
||||
order.client_name }}
|
||||
</td>
|
||||
<td style="text-align: right">
|
||||
<p style="margin-bottom: 0;">{{ order.status }}
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-outline-danger btn-sm"
|
||||
data-toggle="popover"
|
||||
data-placement="right"
|
||||
data-html="true"
|
||||
data-content={{order.title}}
|
||||
ng-if="order.is_printed_before_edit || order.hasMove || order.hasMerge || order.hasSlice || order.hasDelete"
|
||||
onmouseenter="$(this).popover('show')"
|
||||
onmouseleave="$(this).popover('hide')">
|
||||
‼️
|
||||
</button>
|
||||
<br>
|
||||
<small>Предчеков: {{order.preCheck_count}}</small>
|
||||
</p>
|
||||
</td>
|
||||
<td style="text-align: right">{{ order.opened }} {{ order.who_open }}</td>
|
||||
<td style="text-align: right" ng-if="order.closed">{{ order.closed }} {{ order.who_close }}</td>
|
||||
<td style="text-align: right" ng-if="!order.closed">-</td>
|
||||
<td style="text-align: right" ng-style="{ 'display' : (discount_info) ? 'revert' : 'none' }">{{ order.full_sum | curr}}</td>
|
||||
<td style="text-align: right" ng-style="{ 'display' : (discount_info) ? 'revert' : 'none' }">{{ order.sale_sum | curr}}</td>
|
||||
<td style="text-align: right" ng-style="{ 'display' : (!deleted_info) ? 'revert' : 'none' }">{{ order.sum | curr}}</td>
|
||||
<td style="text-align: right" ng-style="{ 'display' : (deleted_info) ? 'revert' : 'none' }">{{ order.deleted_items_sum | curr}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -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>
|
||||
@@ -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">×</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>
|
||||
618
web/views/dashboard/dashboard-bak.html
Normal file
618
web/views/dashboard/dashboard-bak.html
Normal file
@@ -0,0 +1,618 @@
|
||||
<div id="container-floating">
|
||||
<div class="nd1 nds" data-toggle="tooltip" data-placement="left" title="Обновить" ng-click="updateData()" style="background-color: #d3a411"
|
||||
onmouseenter="$(this).tooltip('show')">
|
||||
<i class="material-icons"></i>
|
||||
</div>
|
||||
|
||||
<div id="floating-button" data-toggle="tooltip" data-placement="left" title="Действия" onmouseenter="$(this).tooltip('show')">
|
||||
<p class="plus">
|
||||
<i class="material-icons"></i>
|
||||
</p>
|
||||
<p class="edit">
|
||||
<i class="material-icons"></i>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="padding">
|
||||
<div class="margin">
|
||||
<div class="row">
|
||||
<div class="col-sm-9">
|
||||
<h5 id="currentTime" class="m-b-0 _300">{{ currentDate | date:'dd.MM.yyyy HH:mm:ss' }}
|
||||
</h5>
|
||||
<small class="text-muted">Данные по филиалу
|
||||
<strong>{{globals.currentUser.organization.name}}</strong>
|
||||
</small>
|
||||
</div>
|
||||
<div class="col-sm-3">
|
||||
<label class="md-switch">
|
||||
<input id="timerCheckbox" type="checkbox" ng-model="timerEnabled" ng-change="toggleTimer()">
|
||||
<i class="blue"></i>
|
||||
<span ng-show="timerEnabled">
|
||||
Автоматическое обновление через: {{ timeRemaining | date:'mm:ss' }}
|
||||
</span>
|
||||
<span ng-show="!timerEnabled">
|
||||
Обновление данных отключено!
|
||||
</span>
|
||||
</label>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-12 col-md-3">
|
||||
<div class="box" style="height: 198px;">
|
||||
<div class="box-header warn">
|
||||
<h3>Смена № {{shiftInfo.z_number}}</h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<div ng-if="!shiftInfo.exists">Информация о смене будет доступна позже</div>
|
||||
<div ng-if="shiftInfo.exists">
|
||||
<span>Открыл: {{shiftInfo.open}} в {{shiftInfo.opened | date:'H:mm d.MM'}}</span>
|
||||
<div ng-if="shiftInfo.closed">
|
||||
<span>Закрыл: {{shiftInfo.close}} в {{shiftInfo.closed | date:'H:mm d.MM'}}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-sm-12 col-md-9">
|
||||
<div class="row">
|
||||
<div class="col-sm-6 col-md-4 one-height" >
|
||||
<div class="box p-a" style="max-height: 75px;">
|
||||
<div class="pull-left m-r">
|
||||
<span class="w-40 {{app.setting.theme.primary}} text-center rounded">
|
||||
<i class="material-icons"></i>
|
||||
</span>
|
||||
</div>
|
||||
<div class="clear">
|
||||
<h4 class="m-a-0 text-md">
|
||||
<a>{{total | curr}}</a>
|
||||
</h4>
|
||||
<small class="text-muted">выручка</small>
|
||||
</div>
|
||||
|
||||
<div class="box-tool">
|
||||
<ul class="nav">
|
||||
<li class="nav-item">
|
||||
<a ng-click="getMore('total')">
|
||||
<i class="fa fa-eye"></i>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-sm-6 col-md-4 one-height">
|
||||
<div class="box-color p-a {{app.setting.theme.primary}}" style="max-height: 75px;">
|
||||
<div class="pull-left m-r">
|
||||
<span class="w-40 dker text-center rounded">
|
||||
<i class="material-icons"></i>
|
||||
</span>
|
||||
</div>
|
||||
<div class="clear">
|
||||
<h4 class="m-a-0 text-md">
|
||||
<a>{{profit | curr}}</a>
|
||||
</h4>
|
||||
<small class="text-muted">валовый доход</small>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-sm-6 col-md-4 one-height">
|
||||
<div class="box-color p-a {{app.setting.theme.accent}}" style="max-height: 75px;">
|
||||
<div class="pull-left m-r">
|
||||
<span class="w-40 dker text-center rounded">
|
||||
<i class="material-icons"></i>
|
||||
</span>
|
||||
</div>
|
||||
<div class="clear">
|
||||
<h4 class="m-a-0 text-md">
|
||||
<a>{{middle | curr}}</a>
|
||||
</h4>
|
||||
<small class="text-muted">средний чек</small>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-6 col-md-4 one-height">
|
||||
<div class="box">
|
||||
<div class="box-header danger">
|
||||
<h3>Удаления: {{deleted}}</h3>
|
||||
</div>
|
||||
|
||||
<div class="box-tool box-tool-white">
|
||||
<ul class="nav">
|
||||
<li class="nav-item">
|
||||
<a ng-click="getMoreDeleted()">
|
||||
<i class="fa fa-eye"></i>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="box-body b-t">
|
||||
<h4 class="m-a-0 text-md" ng-if="deleted > 0">
|
||||
<a>
|
||||
<span class="text-sm lead"><strong>Сумма: {{deleted_sum | curr}} BYN</strong></span>
|
||||
</a>
|
||||
</h4>
|
||||
<span class="text-muted" ng-if="deleted == 0">Удаленных позиций нет</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-sm-6 col-md-4 one-height">
|
||||
<div class="box">
|
||||
<div class="box-header primary">
|
||||
<h3>
|
||||
Заказы со скидками: {{discounts}}
|
||||
</h3>
|
||||
</div>
|
||||
|
||||
<div class="box-tool box-tool-white">
|
||||
<ul class="nav">
|
||||
<li class="nav-item">
|
||||
<a ng-click="getMoreDiscount()">
|
||||
<i class="fa fa-eye"></i>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="box-body b-t">
|
||||
<h4 class="m-a-0 text-md" ng-if="discounts > 0">
|
||||
<a>
|
||||
<span class="text-sm lead"><strong>Сумма: {{tot_disc_sum | curr}} BYN</strong></span>
|
||||
</a>
|
||||
</h4>
|
||||
<span class="text-muted" ng-if="discounts == 0">Заказов со скидками нет</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-sm-6 col-md-4 one-height">
|
||||
<div class="box">
|
||||
<div class="box-header blue">
|
||||
<h3>
|
||||
Гостей: {{guests}}
|
||||
</h3>
|
||||
</div>
|
||||
|
||||
<div class="box-tool box-tool-white">
|
||||
<ul class="nav">
|
||||
<li class="nav-item">
|
||||
<a ng-click="getMoreGuests()">
|
||||
<i class="fa fa-eye"></i>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="box-body b-t">
|
||||
<h4 class="m-a-0 text-md" ng-if="namedGuests > 0">
|
||||
<a>
|
||||
<span class="text-sm lead"><strong>Сумма заказов: {{sumNamedGuests | curr}} BYN</strong></span>
|
||||
</a>
|
||||
</h4>
|
||||
<span class="text-muted" ng-if="namedGuests == 0">Именованных гостей нет</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6 col-xl-4">
|
||||
<div class="box">
|
||||
<div class="box-header">
|
||||
<h3>Текущие заказы</h3>
|
||||
</div>
|
||||
|
||||
<div class="text-center b-t" style="height: 230px">
|
||||
<div class="row-col">
|
||||
<div class="row-cell p-a">
|
||||
<div class="inline m-b">
|
||||
<div ui-jp="easyPieChart" class="easyPieChart" ui-refresh="app.setting.color" data-redraw='true' data-percent="{{ orders_closed.percent }}"
|
||||
ui-options="{
|
||||
lineWidth: 8,
|
||||
trackColor: 'rgba(0,0,0,0.05)',
|
||||
barColor: '{{ app.setting.color.primary }}',
|
||||
scaleColor: 'transparent',
|
||||
size: 100,
|
||||
scaleLength: 0,
|
||||
animate:{
|
||||
duration: 1500,
|
||||
enabled:true
|
||||
}
|
||||
}">
|
||||
<div>
|
||||
<h5>{{ orders_closed.percent }}%</h5>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
Закрытые
|
||||
<small class="block m-b">
|
||||
<strong>{{ orders_closed.total }}</strong> на сумму
|
||||
<strong>{{ orders_closed.sum | curr}}</strong>
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row-cell p-a dker" style="height: 230px">
|
||||
<div class="inline m-b">
|
||||
<div ui-jp="easyPieChart" class="easyPieChart" ui-refresh="app.setting.color" data-redraw='true' data-percent="{{ orders_waited.percent }}"
|
||||
ui-options="{
|
||||
lineWidth: 8,
|
||||
trackColor: 'rgba(0,0,0,0.05)',
|
||||
barColor: '{{ app.setting.color.warn }}',
|
||||
scaleColor: 'transparent',
|
||||
size: 100,
|
||||
scaleLength: 0,
|
||||
animate:{
|
||||
duration: 1500,
|
||||
enabled:true
|
||||
}
|
||||
}">
|
||||
<div>
|
||||
<h5>{{ orders_waited.percent }}%</h5>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
Отложенные
|
||||
<small class="block m-b">
|
||||
<strong>{{ orders_waited.total }}</strong> на сумму
|
||||
<strong>{{ orders_waited.sum | curr}}</strong>
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-6 col-xl-4">
|
||||
<div class="box">
|
||||
<div class="box-header">
|
||||
<h3>Текущие заказы</h3>
|
||||
</div>
|
||||
|
||||
<div class="text-center b-t" style="height: 230px">
|
||||
<div class="row-col">
|
||||
<div class="row-cell p-a">
|
||||
<div class="inline m-b">
|
||||
<div ui-jp="easyPieChart" class="easyPieChart" ui-refresh="app.setting.color" data-redraw='true' data-percent="{{ orders_deleted.percent }}"
|
||||
ui-options="{
|
||||
lineWidth: 8,
|
||||
trackColor: 'rgba(0,0,0,0.05)',
|
||||
barColor: '#f44455',
|
||||
scaleColor: 'transparent',
|
||||
size: 100,
|
||||
scaleLength: 0,
|
||||
animate:{
|
||||
duration: 1500,
|
||||
enabled:true
|
||||
}
|
||||
}">
|
||||
<div>
|
||||
<h5>{{ orders_deleted.percent }}%</h5>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
Удаленные
|
||||
<small class="block m-b">
|
||||
<strong>{{ orders_deleted.total }}</strong> на сумму
|
||||
<strong>{{ orders_deleted.sum | curr}}</strong>
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row-cell p-a dker" style="height: 230px">
|
||||
<div class="inline m-b">
|
||||
<div ui-jp="easyPieChart" class="easyPieChart" ui-refresh="app.setting.color" data-redraw='true' data-percent="{{ orders_returned.percent }}"
|
||||
ui-options="{
|
||||
lineWidth: 8,
|
||||
trackColor: 'rgba(0,0,0,0.05)',
|
||||
barColor: '{{ app.setting.color.accent }}',
|
||||
scaleColor: 'transparent',
|
||||
size: 100,
|
||||
scaleLength: 0,
|
||||
animate:{
|
||||
duration: 1500,
|
||||
enabled:true
|
||||
}
|
||||
}">
|
||||
<div>
|
||||
<h5>{{ orders_returned.percent }}%</h5>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
Возвраты
|
||||
<small class="block m-b">
|
||||
<strong>{{ orders_returned.total }}</strong> на сумму
|
||||
<strong>{{ orders_returned.sum | curr}}</strong>
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-12 col-xl-4">
|
||||
<div class="box">
|
||||
<div class="box-header">
|
||||
<h3>Персонал</h3>
|
||||
</div>
|
||||
|
||||
<div class="box-tool">
|
||||
<ul class="nav">
|
||||
<li class="nav-item">
|
||||
<span bs-tooltip="" title="Кликните по персоналу для просмотра подробной информации" class="text-muted inline p-a-xs m-r-sm">
|
||||
<i class="fa fa-question"></i>
|
||||
</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="scrollable" style="height: 230px">
|
||||
<table class="table table-striped table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<td>ФИО</td>
|
||||
<td class="text-right">Количество заказов</td>
|
||||
<td class="text-right">Сумма, BYN</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="personal in personals" ng-click="getStaffMore(personal)">
|
||||
<td class="text-left">
|
||||
<strong>{{ personal.name }}</strong>
|
||||
</td>
|
||||
<td class="text-right">{{ personal.orders_count }}</td>
|
||||
<td class="text-right">{{ personal.orders_sum | curr}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-xl-6">
|
||||
<div class="box">
|
||||
<div class="box-header">
|
||||
<h3>Гости</h3>
|
||||
</div>
|
||||
|
||||
<div class="box-body">
|
||||
<canvas class="chart chart-bar" chart-data="medianGuests.data" chart-series="medianGuests.series" chart-labels="medianGuests.labels"
|
||||
chart-options="medianGuests.options" chart-colors="colors"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-12 col-xl-6">
|
||||
<div class="box">
|
||||
<div class="box-header">
|
||||
<h3>Финансы</h3>
|
||||
</div>
|
||||
|
||||
<div class="box-body">
|
||||
<canvas class="chart chart-bar" chart-data="medianFinance.data" chart-labels="medianFinance.labels" chart-series="medianFinance.series"
|
||||
chart-options="medianFinance.options" chart-colors="colors"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-xl-8" style="max-height: 620px; "><!--overflow-y: hidden;-->
|
||||
<div class="box">
|
||||
<div class="box-header">
|
||||
<h3>Топ продаваемых товаров</h3>
|
||||
</div>
|
||||
|
||||
<div class="box-tool">
|
||||
<ul class="nav">
|
||||
<li class="nav-item">
|
||||
<span bs-tooltip="" title="< 25%-сверхприбыль 25-35%-прибыль 35-50%-самоокупаемость > 50%-убыток" class="text-muted inline p-a-xs m-r-sm">
|
||||
<i class="fa fa-question"></i>
|
||||
</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped table-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th></th>
|
||||
<th class="text-center">Кол-во</th>
|
||||
<th class="text-center">Сумма,
|
||||
<br> BYN</th>
|
||||
<th class="text-center">Total cost,
|
||||
<br> BYN</th>
|
||||
<th class="text-center">Total cost /
|
||||
<br>Сумма</th>
|
||||
<th class="text-center">Прибыль,
|
||||
<br> BYN</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr class="text-right" ng-repeat="dish in dishes">
|
||||
<td>
|
||||
<strong>{{ dish.name }}</strong>
|
||||
</td>
|
||||
<td>{{ dish.count }}</td>
|
||||
<td>{{ dish.sum | curr}}</td>
|
||||
<td>{{ dish.totalCost | curr}}</td>
|
||||
<td ng-class="getBackClass(dish.percentProffit)">{{ dish.percentProffit }} %</td>
|
||||
<td>{{ dish.proffit | curr}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-12 col-xl-4">
|
||||
<div class="box">
|
||||
<div class="box-header">
|
||||
<h3>Список занятых столов</h3>
|
||||
</div>
|
||||
|
||||
<div class="box-tool">
|
||||
<ul class="nav">
|
||||
<li class="nav-item">
|
||||
<span bs-tooltip="" title="Кликните по столу для просмотра подробной информации" class="text-muted inline p-a-xs m-r-sm">
|
||||
<i class="fa fa-question"></i>
|
||||
</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="box-body">
|
||||
<p class="text-muted text-center" ng-if="tables.length == 0">Занятых столов нет</p>
|
||||
|
||||
<div class="table-responsive" ng-if="tables.length > 0" style="max-height: 510px;">
|
||||
<table class="table table-striped table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Зал</th>
|
||||
<th>Номер стола</th>
|
||||
<th>Количество заказов</th>
|
||||
<th>Сумма, BYN</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="table in tables" ng-click="getTableMore(table)">
|
||||
<td>
|
||||
<strong>{{ table.place_name }}</strong>
|
||||
</td>
|
||||
<td>
|
||||
<strong>{{ table.table_name }}</strong>
|
||||
</td>
|
||||
<td>{{ table.guests_count }}</td>
|
||||
<td class="text-right">{{ table.sum | curr}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-xl-4">
|
||||
<div class="box">
|
||||
<div class="box-header">
|
||||
<h3>Категории товаров</h3>
|
||||
</div>
|
||||
|
||||
<div class="box-body">
|
||||
<div class="box-body">
|
||||
<canvas class="chart chart-pie" chart-data="folders.data" chart-labels="folders.labels" chart-options="folders.options"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-12 col-xl-4">
|
||||
<div class="box">
|
||||
<div class="box-header">
|
||||
<h3>Места продаж</h3>
|
||||
</div>
|
||||
|
||||
<div class="box-body">
|
||||
<div class="box-body">
|
||||
<canvas class="chart chart-pie" chart-data="printers.data" chart-labels="printers.labels" chart-options="printers.options"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-12 col-xl-4">
|
||||
<div class="box">
|
||||
<div class="box-header">
|
||||
<h3>Типы оплат</h3>
|
||||
</div>
|
||||
|
||||
<div class="box-body">
|
||||
<div class="box-body">
|
||||
<canvas class="chart chart-pie" chart-data="payments.data" chart-labels="payments.labels" chart-options="payments.options"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="add-widget">
|
||||
<div ui-include="'../views/dashboard/add.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="get-more-deleted">
|
||||
<div ui-include="'../views/dashboard/items/more-deleted.html'"></div>
|
||||
</div>
|
||||
|
||||
<!--<div class="modal my-modal fade" id="get-more-newyear">
|
||||
<div ui-include="'../views/dashboard/items/more-newyear.html'"></div>
|
||||
</div>-->
|
||||
|
||||
<div class="modal fade" id="get-more-guests">
|
||||
<div ui-include="'../views/dashboard/items/more-guests.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="get-more-discount">
|
||||
<div ui-include="'../views/dashboard/items/more-discount.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="get-more-total">
|
||||
<div ui-include="'../views/dashboard/items/more-total.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="get-more-staff">
|
||||
<div ui-include="'../views/dashboard/items/more-staff.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="get-more-table">
|
||||
<div ui-include="'../views/dashboard/items/more-table.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="items-guests">
|
||||
<div ui-include="'../views/dashboard/items/items-guests.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="items-discount">
|
||||
<div ui-include="'../views/dashboard/items/items-discount.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="items-total">
|
||||
<div ui-include="'../views/dashboard/items/items-total.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="items-staff">
|
||||
<div ui-include="'../views/dashboard/items/items-staff.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="items-deleted">
|
||||
<div ui-include="'../views/dashboard/items/items-deleted.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="preload-modal" data-backdrop="true">
|
||||
<div ui-include="'../views/dashboard/preload.html'"></div>
|
||||
</div>
|
||||
@@ -1,19 +1,3 @@
|
||||
<div id="container-floating">
|
||||
<div class="nd1 nds" data-toggle="tooltip" data-placement="left" title="Обновить" ng-click="updateData()" style="background-color: #d3a411"
|
||||
onmouseenter="$(this).tooltip('show')">
|
||||
<i class="material-icons"></i>
|
||||
</div>
|
||||
|
||||
<div id="floating-button" data-toggle="tooltip" data-placement="left" title="Действия" onmouseenter="$(this).tooltip('show')">
|
||||
<p class="plus">
|
||||
<i class="material-icons"></i>
|
||||
</p>
|
||||
<p class="edit">
|
||||
<i class="material-icons"></i>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="padding">
|
||||
<div class="margin">
|
||||
<div class="row">
|
||||
@@ -72,13 +56,13 @@
|
||||
<h4 class="m-a-0 text-md">
|
||||
<a>{{total | curr}}</a>
|
||||
</h4>
|
||||
<small class="text-muted">выручка</small>
|
||||
<small class="text-muted">заказы</small>
|
||||
</div>
|
||||
|
||||
<div class="box-tool">
|
||||
<ul class="nav">
|
||||
<li class="nav-item">
|
||||
<a ng-click="getMore('total')">
|
||||
<a sglclick="getMoreTotal('total')">
|
||||
<i class="fa fa-eye"></i>
|
||||
</a>
|
||||
</li>
|
||||
@@ -124,7 +108,7 @@
|
||||
<div class="col-sm-6 col-md-4 one-height">
|
||||
<div class="box">
|
||||
<div class="box-header danger">
|
||||
<h3>Удаления: {{deleted}}</h3>
|
||||
<h3>Удалено товаров: {{orders_deleted.total}}</h3>
|
||||
</div>
|
||||
|
||||
<div class="box-tool box-tool-white">
|
||||
@@ -138,12 +122,12 @@
|
||||
</div>
|
||||
|
||||
<div class="box-body b-t">
|
||||
<h4 class="m-a-0 text-md" ng-if="deleted > 0">
|
||||
<h4 class="m-a-0 text-md" ng-if="orders_deleted.total > 0">
|
||||
<a>
|
||||
<span class="text-sm lead"><strong>Сумма: {{deleted_sum | curr}} BYN</strong></span>
|
||||
<span class="text-sm lead"><strong>Сумма: {{orders_deleted.sum | curr}} BYN</strong></span>
|
||||
</a>
|
||||
</h4>
|
||||
<span class="text-muted" ng-if="deleted == 0">Удаленных позиций нет</span>
|
||||
<span class="text-muted" ng-if="orders_deleted.total == 0">Удаленных товаров нет</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -169,7 +153,7 @@
|
||||
<div class="box-body b-t">
|
||||
<h4 class="m-a-0 text-md" ng-if="discounts > 0">
|
||||
<a>
|
||||
<span class="text-sm lead"><strong>Сумма: {{tot_disc_sum | curr}} BYN</strong></span>
|
||||
<span class="text-sm lead"><strong>Сумма: {{tot_disc_sum | curr}} BYN <small>(Сумма скидок: {{discounts_sum | curr}} BYN)</small></strong></span>
|
||||
</a>
|
||||
</h4>
|
||||
<span class="text-muted" ng-if="discounts == 0">Заказов со скидками нет</span>
|
||||
@@ -181,14 +165,14 @@
|
||||
<div class="box">
|
||||
<div class="box-header blue">
|
||||
<h3>
|
||||
Гостей: {{guests}}
|
||||
Именованных гостей: {{namedGuests}}
|
||||
</h3>
|
||||
</div>
|
||||
|
||||
<div class="box-tool box-tool-white">
|
||||
<ul class="nav">
|
||||
<li class="nav-item">
|
||||
<a ng-click="getMoreGuests()">
|
||||
<a sglclick="getMoreGuests('guests')">
|
||||
<i class="fa fa-eye"></i>
|
||||
</a>
|
||||
</li>
|
||||
@@ -275,6 +259,34 @@
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row-cell p-a">
|
||||
<div class="inline m-b">
|
||||
<div ui-jp="easyPieChart" class="easyPieChart" ui-refresh="app.setting.color" data-redraw='true' data-percent="{{ orders_cancellations.percent }}"
|
||||
ui-options="{
|
||||
lineWidth: 8,
|
||||
trackColor: 'rgba(0,0,0,0.05)',
|
||||
barColor: '{{ app.setting.color.primary }}',
|
||||
scaleColor: 'transparent',
|
||||
size: 100,
|
||||
scaleLength: 0,
|
||||
animate:{
|
||||
duration: 1500,
|
||||
enabled:true
|
||||
}
|
||||
}">
|
||||
<div>
|
||||
<h5>{{ orders_cancellations.percent }}%</h5>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
Аннулированные
|
||||
<small class="block m-b">
|
||||
<strong>{{ orders_cancellations.total }}</strong> на сумму
|
||||
<strong>{{ orders_cancellations.sum | curr}}</strong>
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -283,7 +295,7 @@
|
||||
<div class="col-md-6 col-xl-4">
|
||||
<div class="box">
|
||||
<div class="box-header">
|
||||
<h3>Текущие заказы</h3>
|
||||
<h3>Информация о товарах</h3>
|
||||
</div>
|
||||
|
||||
<div class="text-center b-t" style="height: 230px">
|
||||
@@ -337,7 +349,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
Возвраты
|
||||
Возвращенные
|
||||
<small class="block m-b">
|
||||
<strong>{{ orders_returned.total }}</strong> на сумму
|
||||
<strong>{{ orders_returned.sum | curr}}</strong>
|
||||
@@ -375,7 +387,7 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="personal in personals" ng-click="getStaffMore(personal)">
|
||||
<tr ng-repeat="personal in personals" ng-click="getMoreStaff(personal, 'guests')" ng-if="personal.orders_count > 0">
|
||||
<td class="text-left">
|
||||
<strong>{{ personal.name }}</strong>
|
||||
</td>
|
||||
@@ -505,8 +517,8 @@
|
||||
<td>
|
||||
<strong>{{ table.table_name }}</strong>
|
||||
</td>
|
||||
<td>{{ table.guests_count }}</td>
|
||||
<td class="text-right">{{ table.sum | curr}}</td>
|
||||
<td>{{ table.orders_count }}</td>
|
||||
<td class="text-right">{{ table.orders_sum | curr}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@@ -565,54 +577,22 @@
|
||||
<div ui-include="'../views/dashboard/add.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="get-more-deleted">
|
||||
<div ui-include="'../views/dashboard/items/more-deleted.html'"></div>
|
||||
</div>
|
||||
|
||||
<!--<div class="modal my-modal fade" id="get-more-newyear">
|
||||
<div ui-include="'../views/dashboard/items/more-newyear.html'"></div>
|
||||
</div>-->
|
||||
|
||||
<div class="modal fade" id="get-more-guests">
|
||||
<div ui-include="'../views/dashboard/items/more-guests.html'"></div>
|
||||
<div class="modal fade" id="order">
|
||||
<div ui-include="'../views/activitymonitor/items/order.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="get-more-discount">
|
||||
<div ui-include="'../views/dashboard/items/more-discount.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="get-more-total">
|
||||
<div ui-include="'../views/dashboard/items/more-total.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="get-more-staff">
|
||||
<div ui-include="'../views/dashboard/items/more-staff.html'"></div>
|
||||
<div class="modal fade" id="orders">
|
||||
<div ui-include="'../views/activitymonitor/items/orders.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="get-more-table">
|
||||
<div ui-include="'../views/dashboard/items/more-table.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="items-guests">
|
||||
<div ui-include="'../views/dashboard/items/items-guests.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="items-discount">
|
||||
<div ui-include="'../views/dashboard/items/items-discount.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="items-total">
|
||||
<div ui-include="'../views/dashboard/items/items-total.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="items-staff">
|
||||
<div ui-include="'../views/dashboard/items/items-staff.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="items-deleted">
|
||||
<div ui-include="'../views/dashboard/items/items-deleted.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="preload-modal" data-backdrop="true">
|
||||
<div ui-include="'../views/dashboard/preload.html'"></div>
|
||||
</div>
|
||||
@@ -1,7 +1,7 @@
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-toggle="modal" data-target="#items-deleted" ng-click="returnModal('deleted')">
|
||||
<button type="button" class="close" data-toggle="modal" ng-click="backModal('items-deleted', 'get-more-deleted')">
|
||||
<i class="material-icons md-24">arrow_back</i>
|
||||
</button>
|
||||
<h5 class="modal-title">Подробнее об удалениях в заказе № {{ order.code }}</h5>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-toggle="modal" data-target="#items-discount" ng-click="returnModal('discount')">
|
||||
<button type="button" class="close" data-toggle="modal" ng-click="backModal('items-discount', 'get-more-discount')">
|
||||
<i class="material-icons md-24">arrow_back</i>
|
||||
</button>
|
||||
<h5 class="modal-title">Подробнее о заказе № {{ order.title }}</h5>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-toggle="modal" data-target="#items-guests" ng-click="returnModal('guests')">
|
||||
<button type="button" class="close" data-toggle="modal" ng-click="backModal('items-guests', 'get-more-guests')">
|
||||
<i class="material-icons md-24">arrow_back</i>
|
||||
</button>
|
||||
<h5 class="modal-title">{{ order.title }}</h5>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-toggle="modal" data-target="#items-staff" ng-click="returnModal('staff')">
|
||||
<button type="button" class="close" data-toggle="modal" ng-click="backModal('items-staff', 'get-more-staff')">
|
||||
<i class="material-icons md-24">arrow_back</i>
|
||||
</button>
|
||||
<h5 class="modal-title">{{ order.title }}</h5>
|
||||
|
||||
@@ -79,22 +79,22 @@
|
||||
<div class="table-responsive">
|
||||
<table class="table m-a-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Действие</th>
|
||||
<th>Персонал</th>
|
||||
<th>Время</th>
|
||||
<th>Группа</th>
|
||||
<th>Место</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Действие</th>
|
||||
<th>Персонал</th>
|
||||
<th>Время</th>
|
||||
<th>Группа</th>
|
||||
<th>Место</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="action in actions.actions">
|
||||
<td>{{ action.action }}</td>
|
||||
<td>{{ action.who }}</td>
|
||||
<td>{{ action.time }}</td>
|
||||
<td>{{ action.workgroup }}</td>
|
||||
<td>{{ action.workcode }}</td>
|
||||
</tr>
|
||||
<tr ng-repeat="action in actions.actions">
|
||||
<td>{{ action.action }}</td>
|
||||
<td>{{ action.who }}</td>
|
||||
<td>{{ action.time }}</td>
|
||||
<td>{{ action.workgroup }}</td>
|
||||
<td>{{ action.workcode }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@@ -108,16 +108,16 @@
|
||||
<div class="table-responsive">
|
||||
<table class="table m-a-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Наименование</th>
|
||||
<th>Количество</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Наименование</th>
|
||||
<th>Количество</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="item in sliced_order_item.items">
|
||||
<td>{{ item.name }}</td>
|
||||
<td>{{ item.count }}</td>
|
||||
</tr>
|
||||
<tr ng-repeat="item in sliced_order_item.items">
|
||||
<td>{{ item.name }}</td>
|
||||
<td>{{ item.count }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@@ -134,16 +134,16 @@
|
||||
<div class="table-responsive">
|
||||
<table class="table m-a-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Наименование</th>
|
||||
<th>Количество</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Наименование</th>
|
||||
<th>Количество</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="item in merged_order_item.items">
|
||||
<td>{{ item.name }}</td>
|
||||
<td>{{ item.count }}</td>
|
||||
</tr>
|
||||
<tr ng-repeat="item in merged_order_item.items">
|
||||
<td>{{ item.name }}</td>
|
||||
<td>{{ item.count }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
</div>
|
||||
|
||||
<div ng-if="moreData.deleted_orders.length == 0">
|
||||
<div class="text-muted">Удаленных позиций нет</div>
|
||||
<div class="text-muted">Удаленных товаров нет</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
41
web/views/dashboard/items/more-total-bak.html
Normal file
41
web/views/dashboard/items/more-total-bak.html
Normal file
@@ -0,0 +1,41 @@
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||
<h5 class="modal-title">{{ moreData.title }}</h5>
|
||||
</div>
|
||||
<div class="modal-body p-lg">
|
||||
<div class="table-responsive" ng-if="moreData.orders.length > 0">
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Заказ №</th>
|
||||
<th>Открыт</th>
|
||||
<th>Закрыт</th>
|
||||
<th class="text-right">Итого, BYN</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
<tr ng-repeat="order in moreData.orders" ng-click="getTotalItems(order)">
|
||||
<td>{{ order.number }}</td>
|
||||
<td>{{ order.opened }}</td>
|
||||
<td>{{ getClosedDate(order.closed) }}</td>
|
||||
<td class="text-right">{{ order.sum | curr }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-left" colspan="3">Всего: {{ moreData.count }} {{ GetCountTotalOrders(moreData.count) }}</th>
|
||||
<th class="text-right">Итого: {{ moreData.sum | curr }} BYN</th>
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div ng-if="moreData.orders.length == 0">
|
||||
<div class="text-muted">Закрытых заказов нет</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -37,4 +37,5 @@
|
||||
<div class="text-muted">Закрытых заказов нет</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -9,6 +9,7 @@
|
||||
<optgroup label="Основные">
|
||||
<option value="statistics">По статистике</option>
|
||||
<option value="realisation">По реализации</option>
|
||||
<option value="reportRealisationConstruct">Расширенный по реализации</option>
|
||||
<option value="deleted">По удалениям</option>
|
||||
<option value="pay">По отделам и видам оплат</option>
|
||||
<option value="staff">По персоналу</option>
|
||||
@@ -139,6 +140,10 @@
|
||||
<div ui-include="'../views/reports/items/realisation.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="report-construct" data-backdrop="true">
|
||||
<div ui-include="'../views/reports/items/construct.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="report-statistic" data-backdrop="true">
|
||||
<div ui-include="'../views/reports/items/statistic.html'"></div>
|
||||
</div>
|
||||
|
||||
66
web/views/reports/items/construct.html
Normal file
66
web/views/reports/items/construct.html
Normal file
@@ -0,0 +1,66 @@
|
||||
<div class="modal-dialog modal-lg" style="width: 98% !important;
|
||||
height: 92% !important;
|
||||
min-width: 98% !important;
|
||||
min-height: 92% !important;
|
||||
max-width: 98% !important;
|
||||
max-height: 92% !important;
|
||||
padding: 0 !important;">
|
||||
<div class="modal-content" id="reportRealisationConstruct" style=" height: 99% !important;
|
||||
min-height: 99% !important;
|
||||
max-height: 99% !important;">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal"
|
||||
ng-click="closeModal('reportRealisationConstruct')">×
|
||||
</button>
|
||||
<button class="btn btn-icon white" ng-click="printElem('#reportRealisationConstruct')">
|
||||
<i class="fa fa-print"></i>
|
||||
</button>
|
||||
<h4 class="modal-title">{{globals.currentUser.organization.name}}</h4>
|
||||
<h5 class="modal-title">Расширенный отчет</h5>
|
||||
<span class="text-muted">{{start_date}} - {{end_date}}</span>
|
||||
</div>
|
||||
<div id="tableRealisation" class="modal-body p-lg">
|
||||
<!-- <table cellspacing="5" cellpadding="5" border="0">
|
||||
<tbody>
|
||||
<span>Фильтр по времени добавления позиции</span>
|
||||
<tr>
|
||||
<td colspan="1">С:</td>
|
||||
<td colspan="1"><input type="text" id="min" name="min" class="form-control"></td>
|
||||
<td colspan="1">По:</td>
|
||||
<td colspan="1"><input type="text" id="max" name="max" class="form-control"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>-->
|
||||
<!--<table cellspacing="5" cellpadding="5" border="0">
|
||||
<tbody>
|
||||
<span>Фильтр по персоналу: </span>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<select id="staff_filter" class="form-control c-select">
|
||||
<option value="">All</option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<table cellspacing="5" cellpadding="5" border="0">
|
||||
<tbody>
|
||||
<span>Фильтр по размеру скидки: </span>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<select id="discount_filter" class="form-control c-select">
|
||||
<option value="">All</option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>-->
|
||||
<table id="table_orders" class="display table table-striped b-t compact cell-border"
|
||||
style="width:100%"></table>
|
||||
|
||||
<div ng-if="items.length == 0">
|
||||
<p>Реализация отсутсвует</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -59,6 +59,7 @@
|
||||
<a class="dropdown-item" ng-click="reportPay(shift)">По отделам</a>
|
||||
<a class="dropdown-item" ng-click="reportDiscounts(shift)">По скидкам</a>
|
||||
<!-- <a class="dropdown-item" ng-click="reportOrders(shift)">По заказам</a> -->
|
||||
<a class="dropdown-item" ng-click="reportRealisationConstruct(shift)">Расширенный по реализации</a>
|
||||
<a class="dropdown-item" ng-click="reportMerged(shift)">По объединениям</a>
|
||||
<a class="dropdown-item" ng-click="reportSliced(shift)">По разбиениям</a>
|
||||
<a class="dropdown-item" ng-click="reportMoved(shift)">По переносам</a>
|
||||
@@ -104,6 +105,10 @@
|
||||
<div ui-include="'../views/reports/items/realisation.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="report-construct" data-backdrop="true">
|
||||
<div ui-include="'../views/reports/items/construct.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="report-statistic" data-backdrop="true">
|
||||
<div ui-include="'../views/reports/items/statistic.html'"></div>
|
||||
</div>
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
<tbody>
|
||||
<tr ng-repeat="task in active_tasks">
|
||||
<td>{{ task.name }} <span class="label primary m-r-xs left5">{{ task.code }}</span></td>
|
||||
<td>{{ task.name }} <span class="label primary m-r-xs left5">{{ task.code }}</span> <small>Next at: {{task.next_at}}</small></td>
|
||||
<td><input type="number" class="form-control" ng-model="task.period" ng-change="changePeriod(task)" /></td>
|
||||
<td>
|
||||
<label class="ui-switch ui-switch-md m-t-xs">
|
||||
@@ -30,7 +30,7 @@
|
||||
</tr>
|
||||
|
||||
<tr ng-repeat="task in all_tasks" ng-if="isTaskActive(task)">
|
||||
<td>{{ task.name }} <span class="label primary m-r-xs left5">{{ task.code }}</span></td>
|
||||
<td>{{ task.name }} <span class="label primary m-r-xs left5">{{ task.code }}</span> <small>Next at: {{task.next_at}}</small></td>
|
||||
<td><input type="number" class="form-control" ng-model="task.period" ng-change="changePeriod(task)" /></td>
|
||||
<td>
|
||||
<label class="ui-switch ui-switch-md m-t-xs">
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
<div id="container-floating">
|
||||
<div class="nd1 nds" data-toggle="tooltip" data-placement="left" title="Обновить" ng-click="update()" style="background-color: #d3a411"
|
||||
onmouseenter="$(this).tooltip('show')">
|
||||
<div class="nd1 nds" data-toggle="tooltip" data-placement="left" title="Обновить" ng-click="update()"
|
||||
style="background-color: #d3a411"
|
||||
onmouseenter="$(this).tooltip('show')">
|
||||
<i class="material-icons"></i>
|
||||
</div>
|
||||
|
||||
<div id="floating-button" data-toggle="tooltip" data-placement="left" title="Действия" onmouseenter="$(this).tooltip('show')">
|
||||
<div id="floating-button" data-toggle="tooltip" data-placement="left" title="Действия"
|
||||
onmouseenter="$(this).tooltip('show')">
|
||||
<p class="plus">
|
||||
<i class="material-icons"></i>
|
||||
</p>
|
||||
@@ -17,46 +19,58 @@
|
||||
<div class="padding">
|
||||
<div class="box">
|
||||
<!-- <div class="table-responsive"> -->
|
||||
<table class="table table-striped m-a-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
<th>Тип</th>
|
||||
<th>Код рабочей группы</th>
|
||||
<th>Код рабочего места</th>
|
||||
<th>Статус</th>
|
||||
<th>Последняя активность</th>
|
||||
<th style="width: 70px"><i class="material-icons"></i></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="terminal in terminals">
|
||||
<td><strong>{{ terminal.key }}</strong></td>
|
||||
<td><strong>{{ terminal.soft }}</strong></td>
|
||||
<td>{{ terminal.work_group }}</td>
|
||||
<td>{{ terminal.work_code }}</td>
|
||||
<td>
|
||||
<label class="ui-switch ui-switch-md m-t-xs">
|
||||
<input type="checkbox" ng-model="terminal.is_active" ng-change="onLicence(terminal.key, terminal.is_active)">
|
||||
<i></i>
|
||||
</label>
|
||||
</td>
|
||||
<td><span ng-if="terminal.last_activity != '0'">{{ terminal.last_activity }}</span></td>
|
||||
<td>
|
||||
<div class="dropdown inline">
|
||||
<button class="btn btn-sm white dropdown-toggle" data-toggle="dropdown">
|
||||
<i class="material-icons"></i>
|
||||
</button>
|
||||
<div class="dropdown-menu pull-right dropdown-menu-scale">
|
||||
<a class="dropdown-item" ng-click="editTerminal(terminal.key)">Управление синхронизацией</a>
|
||||
<a class="dropdown-item" ng-click="getEquipment(terminal.key)">Принтеры</a>
|
||||
<a class="dropdown-item" ng-click="showLogs(terminal.key)">Журнал</a>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<table class="table table-striped m-a-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
<th>Тип</th>
|
||||
<th>Имя рабочей группы</th>
|
||||
<th>Код рабочей группы</th>
|
||||
<th>Код рабочего места</th>
|
||||
<th>Статус</th>
|
||||
<th>Последняя активность</th>
|
||||
<th style="width: 70px"><i class="material-icons"></i></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="terminal in terminals">
|
||||
<td><strong>{{ terminal.key }}</strong></td>
|
||||
<td><strong>{{ terminal.soft }}</strong></td>
|
||||
<td ng-if="terminal.name" ios-dblclick="terminal.name = null">{{ terminal.name }}</td>
|
||||
<td ng-if="!terminal.name">
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control" ng-model="terminal.newName">
|
||||
<span class="input-group-btn">
|
||||
<button class="btn white" type="button" ng-click="updateTerminal(terminal)" ng-if="terminal.newName"><i class="fa fa-check"></i></button>
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
<td>{{ terminal.work_group }}</td>
|
||||
<td>{{ terminal.work_code }}</td>
|
||||
<td>
|
||||
<label class="ui-switch ui-switch-md m-t-xs">
|
||||
<input type="checkbox" ng-model="terminal.is_active"
|
||||
ng-change="onLicence(terminal.key, terminal.is_active)">
|
||||
<i></i>
|
||||
</label>
|
||||
</td>
|
||||
<td><span ng-if="terminal.last_activity != '0'">{{ terminal.last_activity }}</span></td>
|
||||
<td>
|
||||
<div class="dropdown inline">
|
||||
<button class="btn btn-sm white dropdown-toggle" data-toggle="dropdown">
|
||||
<i class="material-icons"></i>
|
||||
</button>
|
||||
<div class="dropdown-menu pull-right dropdown-menu-scale">
|
||||
<a class="dropdown-item" ng-click="editTerminal(terminal.key)">Управление синхронизацией</a>
|
||||
<a class="dropdown-item" ng-click="getEquipment(terminal.key)">Принтеры</a>
|
||||
<a class="dropdown-item" ng-click="showLogs(terminal.key)">Журнал</a>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<!-- </div> -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user