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

v.2.15

Browse Source 
Discounts block update
This commit is contained in:
miroman-afk
2022-04-28 23:55:53 +03:00
parent 53dfb77d7a
commit 2d148e3eb5
9 changed files with 169 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,7 +143,7 @@
<div class="box-tool box-tool-white">
<ul class="nav">
<li class="nav-item">
<a ng-click="getMore('discount')">
<a ng-click="getMoreDiscount()">
<i class="fa fa-eye"></i>
</a>
</li>
@@ -531,20 +531,6 @@
</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="menus.data" chart-labels="menus.labels" chart-options="menus.options"></canvas>
</div>
</div>
</div>
</div>
<div class="col-md-12 col-xl-4">
<div class="box">
<div class="box-header">

4
web/views/dashboard/items/items-discount.html
View File

@@ -14,6 +14,7 @@
<th>Блюдо (со скидкой)</th>
<th>Количество</th>
<th class="text-right">Цена, BYN</th>
<th class="text-right">Cкидка, BYN</th>
<th class="text-right">Сумма, BYN</th>
</tr>
</thead>
@@ -21,8 +22,9 @@
<tr ng-repeat="item in order.items">
<td>{{ item.name }} ({{ item.discount }}%)</td>
<td>{{ item.count }}</td>
<td class="text-right">{{ item.sale_price | curr }}</td>
<td class="text-right">{{ item.sum | curr }}</td>
<td class="text-right">{{ (item.sum * item.discount) / 100 | curr }}</td>
<td class="text-right">{{ item.sale_price | curr }}</td>
</tr>
</tbody>
<thead>

5
web/views/dashboard/items/items-total.html
View File

@@ -99,6 +99,8 @@
<!--Разбиение заказа-->
<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">
@@ -122,7 +124,10 @@
<!--Объединение заказа-->
<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>

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

@@ -17,7 +17,7 @@
</thead>
<tbody>
<tr ng-repeat="order in moreData.orders" ng-click="getItems('discount', order)">
<tr ng-repeat="order in moreData.orders" ng-click="getItemsDiscount(order)">
<td>{{ order.number }}</td>
<td class="text-right">{{ order.full_sum | curr }}</td>
<td class="text-right">{{ order.sale_sum | curr }}</td>