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

v.2.26

Browse Source 
Small fix
This commit is contained in:
miroman-afk
2022-12-22 13:15:54 +03:00
parent 723e9a8768
commit 70120653f7
4 changed files with 177 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -3,3 +3,4 @@ temp/
vendor/ vendor/
build.zip build.zip
places.xml places.xml
*.log

2
composer.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "hrc-admin/hello-world", "name": "hrc-admin/hello-world",
"version": "2.25", "version": "2.26",
"require": { "require": {
"horeca/admin-php-module-core": "dev-master", "horeca/admin-php-module-core": "dev-master",
"guzzlehttp/guzzle": "^7.4", "guzzlehttp/guzzle": "^7.4",

4
module.ini
View File

@@ -1,5 +1,5 @@
[info] [info]
name=V1 name=V1
version=2.25 version=2.26
[build] [build]
version=2.25 version=2.26

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

@@ -172,7 +172,8 @@
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane p-v-sm active" id="tab_1" aria-expanded="true"> <div class="tab-pane p-v-sm active" id="tab_1" aria-expanded="true">
<div class="streamline b-l m-b m-l" <div class="streamline b-l m-b m-l"
style="width:auto;max-height:350px;overflow-y: auto;" ng-if="clientLogs.length > 0"> style="width:auto;max-height:350px;overflow-y: auto;"
ng-if="clientLogs.length > 0">
<div class="sl-item b-success" ng-repeat="clientLog in clientLogs"> <div class="sl-item b-success" ng-repeat="clientLog in clientLogs">
<div class="sl-content" ng-if="clientLog.type == 2"> <div class="sl-content" ng-if="clientLog.type == 2">
<div class="sl-date text-muted">{{clientLog.time}}</div> <div class="sl-date text-muted">{{clientLog.time}}</div>
@@ -196,19 +197,24 @@
</div> </div>
<div class="tab-pane p-v-sm" id="tab_2" aria-expanded="true"> <div class="tab-pane p-v-sm" id="tab_2" aria-expanded="true">
<div class="streamline b-l m-b m-l" <div class="streamline b-l m-b m-l"
style="width:auto;max-height:350px;overflow-y: auto;" ng-if="orders.length > 0"> style="width:auto;max-height:350px;overflow-y: auto;"
ng-if="orders.length > 0">
<div class="sl-item b-success" ng-repeat="order in orders"> <div class="sl-item b-success" ng-repeat="order in orders">
<div class="row align-items-center" style="margin-right: 0px;"> <div class="row align-items-center" style="margin-right: 0px;">
<div class="sl-content"> <div class="sl-content">
<div class="col-lg-12 col-sm-6"> <div class="col-lg-12 col-sm-6">
<a ng-click="getItems(order.code, order.opened, order.closed)"> <a ng-click="getItems(order.code, order.opened, order.closed)">
<div class="sl-date text-muted">Заказ открыт: <div class="sl-date text-muted">Заказ открыт:
{{order.opened}} {{order.opened}}
</div> </div>
<div class="sl-date text-muted" ng-if="order.closed > '0000-00-00 00:00:00'">Заказ закрыт: <div class="sl-date text-muted"
{{order.closed}} ng-if="order.closed > '0000-00-00 00:00:00'">Заказ
</div> закрыт:
<p>Сумма заказа: {{order.order_sum | curr}} BYN <span ng-if="order.discount > 0">(Скидка: {{order.sale_sum | curr}} BYN)</span></p> {{order.closed}}
</div>
<p>Сумма заказа: {{order.order_sum | curr}} BYN <span
ng-if="order.discount > 0">(Скидка: {{order.sale_sum | curr}} BYN)</span>
</p>
</a> </a>
</div> </div>
@@ -251,178 +257,180 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="padding" ng-if="isCreateNewGroup">
<div class="box">
<div class="box-header">
<h3>Создание новой группы</h3>
</div>
<div class="box-tool"> <div class="padding" ng-if="isCreateNewGroup">
<div class="pull-right"> <div class="box">
<a class="btn btn-sm white" ng-click="closeCard()"> <div class="box-header">
<i class="material-icons">clear</i> <h3>Создание новой группы</h3>
</a>
</div> </div>
</div>
<form name="createGroupForm" ng-submit="createGroup()"> <div class="box-tool">
<div class="box-body"> <div class="pull-right">
<div class="form-group row"> <a class="btn btn-sm white" ng-click="closeCard()">
<label class="col-sm-3 form-control-label">Название</label> <i class="material-icons">clear</i>
<div class="col-sm-9"> </a>
<input type="text" class="form-control" ng-model="newGroup.name" required>
</div>
</div> </div>
</div> </div>
<div class="dker p-a"> <form name="createGroupForm" ng-submit="createGroup()">
<div class="row"> <div class="box-body">
<div class="col-sm-12"> <div class="form-group row">
<button type="submit" class="btn success p-x-md pull-right" <label class="col-sm-3 form-control-label">Название</label>
ng-disabled="createGroupForm.$invalid">Создать <div class="col-sm-9">
</button> <input type="text" class="form-control" ng-model="newGroup.name" required>
</div>
</div> </div>
</div> </div>
</div>
</form>
<div class="dker p-a">
<div class="row">
<div class="col-sm-12">
<button type="submit" class="btn success p-x-md pull-right"
ng-disabled="createGroupForm.$invalid">Создать
</button>
</div>
</div>
</div>
</form>
</div>
</div> </div>
</div>
<div class="padding" ng-if="isCreateNewBarcode"> <div class="padding" ng-if="isCreateNewBarcode">
<div class="box"> <div class="box">
<div class="box-header"> <div class="box-header">
<h3>Создание дисконтных карт</h3> <h3>Создание дисконтных карт</h3>
</div>
<div class="box-tool">
<div class="pull-right">
<a class="btn btn-sm white" ng-click="closeCard()">
<i class="material-icons">clear</i>
</a>
</div>
</div>
<form name="createBarcodeForm" ng-submit="createBarcode()">
<div class="box-body">
<div class="form-group row">
<label class="col-sm-3 form-control-label">Выберите группу</label>
<div class="col-sm-9">
<select ng-model="newBarcode.group_id" class="form-control" ng-required="true">
<option ng-repeat="group in groups" value="{{ group.id }}">{{group.name}}
</option>
</select>
</div>
</div>
</div>
<div class="box-body">
<div class="form-group row">
<label class="col-sm-3 form-control-label">Первый штрих код</label>
<div class="col-sm-9">
<input type="text" class="form-control" ng-model="newBarcode.start"
placeholder="200000000001" required>
</div>
</div>
</div>
<div class="box-body">
<div class="form-group row">
<label class="col-sm-3 form-control-label">Последний штрих код</label>
<div class="col-sm-9">
<input type="text" class="form-control" ng-model="newBarcode.end"
placeholder="200000000999" required>
</div>
</div>
</div>
<div class="dker p-a">
<div class="row">
<div class="col-sm-12">
<button type="submit" class="btn success p-x-md pull-right"
ng-disabled="createBarcodeForm.$invalid">Создать
</button>
</div>
</div>
</div>
</form>
</div> </div>
<div class="box-tool">
<div class="pull-right">
<a class="btn btn-sm white" ng-click="closeCard()">
<i class="material-icons">clear</i>
</a>
</div>
</div>
<form name="createBarcodeForm" ng-submit="createBarcode()">
<div class="box-body">
<div class="form-group row">
<label class="col-sm-3 form-control-label">Выберите группу</label>
<div class="col-sm-9">
<select ng-model="newBarcode.group_id" class="form-control" ng-required="true">
<option ng-repeat="group in groups" value="{{ group.id }}">{{group.name}}</option>
</select>
</div>
</div>
</div>
<div class="box-body">
<div class="form-group row">
<label class="col-sm-3 form-control-label">Первый штрих код</label>
<div class="col-sm-9">
<input type="text" class="form-control" ng-model="newBarcode.start"
placeholder="200000000001" required>
</div>
</div>
</div>
<div class="box-body">
<div class="form-group row">
<label class="col-sm-3 form-control-label">Последний штрих код</label>
<div class="col-sm-9">
<input type="text" class="form-control" ng-model="newBarcode.end"
placeholder="200000000999" required>
</div>
</div>
</div>
<div class="dker p-a">
<div class="row">
<div class="col-sm-12">
<button type="submit" class="btn success p-x-md pull-right"
ng-disabled="createBarcodeForm.$invalid">Создать
</button>
</div>
</div>
</div>
</form>
</div> </div>
</div>
<div class="padding" ng-if="isCreateNewClient"> <div class="padding" ng-if="isCreateNewClient">
<div class="box"> <div class="box">
<div class="box-header"> <div class="box-header">
<h3>Создание нового гостя</h3> <h3>Создание нового гостя</h3>
</div>
<div class="box-tool">
<div class="pull-right">
<a class="btn btn-sm white" ng-click="closeCard()">
<i class="material-icons">clear</i>
</a>
</div>
</div>
<form name="createClientForm" ng-submit="createClient()">
<div class="box-body">
<div class="form-group row">
<label class="col-sm-3 form-control-label">Имя</label>
<div class="col-sm-9">
<input type="text" class="form-control" ng-model="newClient.name" required>
</div>
</div>
<div class="form-group row">
<label class="col-sm-3 form-control-label">Телефон</label>
<div class="col-sm-9">
<input type="text" class="form-control" ng-model="newClient.phone"
ui-mask="+375 (99) 999-99-99">
</div>
</div>
<div class="form-group row">
<label class="col-sm-3 form-control-label">Адрес</label>
<div class="col-sm-9">
<input type="text" class="form-control" ng-model="newClient.address">
</div>
</div>
<div class="form-group row">
<label class="col-sm-3 form-control-label">Email</label>
<div class="col-sm-9">
<input type="text" class="form-control" ng-model="newClient.email">
</div>
</div>
<div class="form-group row">
<label class="col-sm-3 form-control-label">Штрих код</label>
<div class="col-sm-9">
<input type="text" class="form-control" ng-model="newClient.barcode">
</div>
</div>
<div class="form-group form-group-inline row">
<label class="col-sm-3 form-group-label" for="specialPriceCheck">Скидка по
себестоимости </label>
<div class="col-sm-9">
<input class="form-group-input" type="checkbox" value="" id="specialPriceCheck"
ng-model="newClient.special_price">
</div>
</div>
</div>
<div class="dker p-a">
<div class="row">
<div class="col-sm-12">
<button type="submit" class="btn success p-x-md pull-right"
ng-disabled="createClientForm.$invalid">Создать
</button>
</div>
</div>
</div>
</form>
</div> </div>
<div class="box-tool">
<div class="pull-right">
<a class="btn btn-sm white" ng-click="">
<i class="material-icons">clear</i>
</a>
</div>
</div>
<form name="createClientForm" ng-submit="createClient()">
<div class="box-body">
<div class="form-group row">
<label class="col-sm-3 form-control-label">Имя</label>
<div class="col-sm-9">
<input type="text" class="form-control" ng-model="newClient.name" required>
</div>
</div>
<div class="form-group row">
<label class="col-sm-3 form-control-label">Телефон</label>
<div class="col-sm-9">
<input type="text" class="form-control" ng-model="newClient.phone"
ui-mask="+375 (99) 999-99-99">
</div>
</div>
<div class="form-group row">
<label class="col-sm-3 form-control-label">Адрес</label>
<div class="col-sm-9">
<input type="text" class="form-control" ng-model="newClient.address">
</div>
</div>
<div class="form-group row">
<label class="col-sm-3 form-control-label">Email</label>
<div class="col-sm-9">
<input type="text" class="form-control" ng-model="newClient.email">
</div>
</div>
<div class="form-group row">
<label class="col-sm-3 form-control-label">Штрих код</label>
<div class="col-sm-9">
<input type="text" class="form-control" ng-model="newClient.barcode">
</div>
</div>
<div class="form-group form-group-inline row">
<label class="col-sm-3 form-group-label" for="specialPriceCheck">Скидка по
себестоимости </label>
<div class="col-sm-9">
<input class="form-group-input" type="checkbox" value="" id="specialPriceCheck"
ng-model="newClient.special_price">
</div>
</div>
</div>
<div class="dker p-a">
<div class="row">
<div class="col-sm-12">
<button type="submit" class="btn success p-x-md pull-right"
ng-disabled="createClientForm.$invalid">Создать
</button>
</div>
</div>
</div>
</form>
</div> </div>
</div> </div>
</div> </div>