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

v.2.25

Browse Source 
Small fix
This commit is contained in:
miroman-afk
2022-12-22 12:52:42 +03:00
parent d24bba305f
commit 723e9a8768
15 changed files with 213 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web/views/clients/index.html
View File

@@ -123,7 +123,7 @@
<div class="p-y text-center text-sm-center col-sm-12">
<a href="" class="inline p-x text-center">
<span class="h5 block m-0">{{currentClient.info.order_sum}} BYN</span>
<span class="h5 block m-0">{{currentClient.info.order_sum | curr}} BYN</span>
<small class="text-xs text-muted">Сумма заказов</small>
</a>
<a href="" class="inline p-x b-l text-center">
@@ -132,7 +132,7 @@
</a>
<a href="" class="inline p-x b-l b-r text-center"
ng-if="currentClient.info.presale > 0">
<span class="h5 block m-0">{{currentClient.info.presale}} BYN</span>
<span class="h5 block m-0">{{currentClient.info.presale | curr}} BYN</span>
<small class="text-xs text-muted">Аванс</small>
</a>
<a href="" class="inline p-x text-center" ng-if="currentClient.info.bonus > 0">
@@ -201,14 +201,14 @@
<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.id, order.opened, order.closed)">
<a ng-click="getItems(order.code, order.opened, order.closed)">
<div class="sl-date text-muted">Заказ открыт:
{{order.opened}}
</div>
<div class="sl-date text-muted">Заказ закрыт:
<div class="sl-date text-muted" ng-if="order.closed > '0000-00-00 00:00:00'">Заказ закрыт:
{{order.closed}}
</div>
<p>Сумма заказа: {{order.sum | curr}} BYN <span ng-if="order.discount > 0">(Скидка: {{order.discount | curr}} BYN)</span></p>
<p>Сумма заказа: {{order.order_sum | curr}} BYN <span ng-if="order.discount > 0">(Скидка: {{order.sale_sum | curr}} BYN)</span></p>
</a>
</div>

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

@@ -402,7 +402,7 @@
</div>
<div class="row">
<div class="col-md-12 col-xl-8">
<div class="col-md-12 col-xl-8" style="max-height: 620px; overflow-y: hidden;">
<div class="box">
<div class="box-header">
<h3>Топ продаваемых товаров</h3>
@@ -470,7 +470,7 @@
<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">
<div class="table-responsive" ng-if="tables.length > 0" style="max-height: 510px;">
<table class="table table-striped table-hover">
<thead>
<tr>

58
web/views/roommap/index.html
View File

@@ -1,11 +1,21 @@
<div id="container-places" style="bottom: 20px; right: 20px; position: fixed;">
<div class="m-b">
<div class="btn-group">
<button id="create_place" type="button" class="btn info btn-outline b-info" ng-click="createPlace()">Добавить зал</button>
<button id="back" type="button" class="btn info p-x-md pull-left" data-toggle="modal" data-target="#back_places">Назад</button>
<button id="create_table" type="button" class="btn info btn-outline b-info" ng-click="createTable(place_id)">Добавить стол</button>
<button id="save_tables" type="button" class="btn info btn-outline b-info" ng-click="saveTables(place_id, tables)">Сохранить</button>
<button id="save_places" type="button" class="btn info btn-outline b-info" ng-click="savePlaces(roommap)">Сохранить</button>
<button id="create_place" type="button" class="btn info btn-outline b-info" ng-click="createPlace()">
Добавить зал
</button>
<button id="back" type="button" class="btn info p-x-md pull-left" data-toggle="modal"
data-target="#back_places">Назад
</button>
<button id="create_table" type="button" class="btn info btn-outline b-info"
ng-click="createTable(place_id)">Добавить стол
</button>
<button id="save_tables" type="button" class="btn info btn-outline b-info"
ng-click="saveTables(place_id, tables)">Сохранить
</button>
<button id="save_places" type="button" class="btn info btn-outline b-info" ng-click="savePlaces(roommap)">
Сохранить
</button>
</div>
</div>
@@ -19,7 +29,9 @@
<div class="confirm-box-footer">
<button type="button" class="btn dark-white p-x-md" data-dismiss="modal" ng-click="back()">Нет</button>
<button type="button" class="btn danger p-x-md" ng-model="tables" data-dismiss="modal" ng-click="saveTables(place_id, tables)">Да</button>
<button type="button" class="btn danger p-x-md" ng-model="tables" data-dismiss="modal"
ng-click="saveTables(place_id, tables)">Да
</button>
</div>
</div>
</div>
@@ -68,9 +80,10 @@
</div>
<div class="padding" id="background_1" ng-style="{'max-width':(maxWidth) + 'px', 'width':(screenWidth) + 'vw'}">
<div class="box">
<div class="padding" id="background" >
<div class="padding" id="background">
<!--<div id="tables" class="box" ng-style="{'height':(windowHeight) + 'px'}">-->
<div id="tables" class="box" ng-style="{'height':(windowHeight) + 'px'}" data-target="tables_editor" context-menu>
<div id="tables" class="box" ng-style="{'height':(windowHeight) + 'px'}" data-target="tables_editor"
context-menu>
<div class="dropdown" id="tables_editor" style="position: fixed; z-index: 2;">
<ul class="dropdown-menu" role="menu">
<li>
@@ -83,28 +96,38 @@
</div>
<div ng-repeat="table in tables" ng-model="tables" context-menu>
<div ng-if="table.type == 0" id="{{ 'table_' + $index }}" class="demo-div" draggable resize context-menu
<div ng-if="table.type == 0" id="{{ 'table_' + $index }}" class="demo-div" draggable resize
context-menu
data-target="table-{{ $index }}"
ng-mouseup="getCoords($event, $index, table.table_id, table.place_id)"
ng-style="{'width':'' + table.width * percentWidth + 'px', 'height':'' + table.height * percentHeight + 'px', 'top':'calc(' + top + 'px + ' + table.x * percentHeight + 'px)', 'left': 'calc(' + left + 'px + ' + table.y * percentWidth + 'px)'}"
style="position: fixed;cursor: default;font-family: sans-serif;text-align: center;background-color: #FFFFFF;border: 2px solid #183147; z-index: 1; border-radius: 5%">
style="position: fixed;cursor: default;font-family: sans-serif;text-align: center;background-color: #FFFFFF;border: 2px solid #2196f3; z-index: 1; border-radius: 5%">
<div class="box-header">
<small>{{table.name}}</small>
<small>{{table.table_id}}</small>
</div>
</div>
<div ng-if="table.type == 1" id="{{ 'table_' + $index }}" class="demo-div" draggable resize context-menu
<div ng-if="table.type == 1" id="{{ 'table_' + $index }}" class="demo-div" draggable resize
context-menu
data-target="table-{{ $index }}"
ng-mouseup="getCoords($event, $index, table.table_id, table.place_id)"
ng-style="{'width':'' + table.width * percentWidth + 'px', 'height':'' + table.height * percentHeight + 'px', 'top':'calc(' + top + 'px + ' + table.x * percentHeight + 'px)', 'left': 'calc(' + left + 'px + ' + table.y * percentWidth + 'px)'}"
style="position: fixed;cursor: default;font-family: sans-serif;text-align: center;background-color: #FFFFFF;border: 2px solid #183147; z-index: 1; border-radius: 50%">
<div class="box-header">
<small>{{table.name}}</small>
<small>{{table.table_id}}</small>
style="position: fixed;cursor: default;font-family: sans-serif;text-align: center;background-color: #FFFFFF;border: 2px solid #2196f3; z-index: 1; border-radius: 50%">
<div class="box"
ng-style="{'width':'' + table.width * percentWidth + 'px', 'height':'' + table.height * percentHeight + 'px'}"
style="background: transparent; box-shadow: 0 0px 0px transparent;">
<div class="box-header">
<small>{{table.name}}</small>
<small>{{table.table_id}}</small>
</div>
<div class="box-footer"></div>
</div>
</div>
<div class="dropdown" id="table-{{ $index }}" style="position: fixed; z-index: 2;">
<ul class="dropdown-menu" role="menu">
<li>
@@ -131,7 +154,6 @@
</div>
<div class="modal fade" id="table-edit" data-backdrop="true">
<div ui-include="'../views/roommap/items/edit-table.html'"></div>
</div>