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

v.2.27

Browse Source 
Fixed reports
This commit is contained in:
miroman-afk
2023-05-02 15:21:54 +03:00
parent 70120653f7
commit fb46c8e739
78 changed files with 21233 additions and 1892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
web/views/dashboard/dashboard.html
View File

@@ -16,12 +16,29 @@
<div class="padding">
<div class="margin">
<h5 class="m-b-0 _300">{{update_time}}
<i title="Данные о текущей смене скоро обновятся. Обновите страницу через несколько минут" class="fa fa-spinner fa-spin text-success" ng-if="need_update"></i>
</h5>
<small class="text-muted">Данные по филиалу
<strong>{{globals.currentUser.organization.name}}</strong>
</small>
<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">
@@ -113,7 +130,7 @@
<div class="box-tool box-tool-white">
<ul class="nav">
<li class="nav-item">
<a ng-click="getMore('delete')">
<a ng-click="getMoreDeleted()">
<i class="fa fa-eye"></i>
</a>
</li>
@@ -171,7 +188,7 @@
<div class="box-tool box-tool-white">
<ul class="nav">
<li class="nav-item">
<a ng-click="getMore('guests')">
<a ng-click="getMoreGuests()">
<i class="fa fa-eye"></i>
</a>
</li>
@@ -402,7 +419,7 @@
</div>
<div class="row">
<div class="col-md-12 col-xl-8" style="max-height: 620px; overflow-y: hidden;">
<div class="col-md-12 col-xl-8" style="max-height: 620px; "><!--overflow-y: hidden;-->
<div class="box">
<div class="box-header">
<h3>Топ продаваемых товаров</h3>
@@ -548,13 +565,13 @@
<div ui-include="'../views/dashboard/add.html'"></div>
</div>
<div class="modal fade" id="get-more-delete">
<div ui-include="'../views/dashboard/items/more-delete.html'"></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 class="modal my-modal fade" id="get-more-newyear">
<div ui-include="'../views/dashboard/items/more-newyear.html'"></div>
</div>
</div>-->
<div class="modal fade" id="get-more-guests">
<div ui-include="'../views/dashboard/items/more-guests.html'"></div>
@@ -592,8 +609,8 @@
<div ui-include="'../views/dashboard/items/items-staff.html'"></div>
</div>
<div class="modal fade" id="items-delete">
<div ui-include="'../views/dashboard/items/items-delete.html'"></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">

2
web/views/dashboard/items/items-delete.html → web/views/dashboard/items/items-deleted.html
View File

@@ -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-delete" ng-click="returnModal('delete')">
<button type="button" class="close" data-toggle="modal" data-target="#items-deleted" ng-click="returnModal('deleted')">
<i class="material-icons md-24">arrow_back</i>
</button>
<h5 class="modal-title">Подробнее об удалениях в заказе № {{ order.code }}</h5>

5
web/views/dashboard/items/more-delete.html → web/views/dashboard/items/more-deleted.html
View File

@@ -17,7 +17,7 @@
</thead>
<tbody>
<tr ng-repeat="deleted_order in moreData.deleted_orders" ng-click="getItems('delete', deleted_order)">
<tr ng-repeat="deleted_order in moreData.deleted_orders" ng-click="getItemsDeleted(deleted_order)">
<td class="text-right">{{ deleted_order.number }}</td>
<td class="text-right">{{ deleted_order.opened }}</td>
<td class="text-right">{{ getClosedDate(deleted_order.closed) }}</td>
@@ -36,4 +36,5 @@
<div class="text-muted">Удаленных позиций нет</div>
</div>
</div>
</div>
</div>
</div>

7
web/views/dashboard/items/more-discount.html
View File

@@ -27,8 +27,8 @@
<thead>
<tr>
<th>Всего: {{ discounts }} {{ GetCountTotalOrders(discounts) }}</th>
<th class="text-right">на сумму {{ moreData.amount | curr }}</th>
<th class="text-right">со скидой в: {{discounts_sum | curr }}</th>
<th class="text-right">на сумму: {{ moreData.amount | curr }}</th>
<th class="text-right">со скидкой: {{discounts_sum | curr }}</th>
<th class="text-right">Итого: {{ moreData.total_sum | curr }} BYN</th>
</tr>
</thead>
@@ -40,4 +40,5 @@
</div>
</div>
</div>
</div>
</div>

16
web/views/dashboard/items/more-guests.html
View File

@@ -15,12 +15,13 @@
</tr>
</thead>
<tbody>
<tr ng-click="getItems('guests', client)">
<td class="text-right" style="width: 20%;">Заказ № {{ client.number }}</td>
<td class="text-right" style="width: 30%;">Открыт {{ client.opened }}</td>
<td class="text-right" style="width: 30%;">{{ client.closed }}</td>
<td class="text-right" style="width: 20%;">{{ client.sum | curr }} BYN</td>
<tbody ng-repeat="order in client.orders">
<tr ng-click="getItems('guests', order)">
<td class="text-right" style="width: 20%;">Заказ № {{ order.number }}</td>
<td class="text-right" style="width: 30%;">Открыт {{ order.opened }}</td>
<td ng-if="order.closed" class="text-right" style="width: 30%;">Закрыт {{ order.closed }}</td>
<td ng-if="!order.closed" class="text-right" style="width: 30%;">Не закрыт</td>
<td class="text-right" style="width: 20%;">{{ order.sum | curr }} BYN</td>
</tr>
</tbody>
</table>
@@ -31,4 +32,5 @@
<div class="text-muted">Заказов от именованных гостей нет</div>
</div>
</div>
</div>
</div>
</div>