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

22
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,7 +197,8 @@
</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">
@@ -205,10 +207,14 @@
<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"
ng-if="order.closed > '0000-00-00 00:00:00'">Заказ
закрыт:
{{order.closed}} {{order.closed}}
</div> </div>
<p>Сумма заказа: {{order.order_sum | curr}} BYN <span ng-if="order.discount > 0">(Скидка: {{order.sale_sum | curr}} BYN)</span></p> <p>Сумма заказа: {{order.order_sum | curr}} BYN <span
ng-if="order.discount > 0">(Скидка: {{order.sale_sum | curr}} BYN)</span>
</p>
</a> </a>
</div> </div>
@@ -251,7 +257,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="padding" ng-if="isCreateNewGroup"> <div class="padding" ng-if="isCreateNewGroup">
<div class="box"> <div class="box">
@@ -311,7 +317,8 @@
<label class="col-sm-3 form-control-label">Выберите группу</label> <label class="col-sm-3 form-control-label">Выберите группу</label>
<div class="col-sm-9"> <div class="col-sm-9">
<select ng-model="newBarcode.group_id" class="form-control" ng-required="true"> <select ng-model="newBarcode.group_id" class="form-control" ng-required="true">
<option ng-repeat="group in groups" value="{{ group.id }}">{{group.name}}</option> <option ng-repeat="group in groups" value="{{ group.id }}">{{group.name}}
</option>
</select> </select>
</div> </div>
</div> </div>
@@ -359,7 +366,7 @@
<div class="box-tool"> <div class="box-tool">
<div class="pull-right"> <div class="pull-right">
<a class="btn btn-sm white" ng-click=""> <a class="btn btn-sm white" ng-click="closeCard()">
<i class="material-icons">clear</i> <i class="material-icons">clear</i>
</a> </a>
</div> </div>
@@ -428,6 +435,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="modal fade" id="edit-client" data-backdrop="true" ng-if="!readonlyMode"> <div class="modal fade" id="edit-client" data-backdrop="true" ng-if="!readonlyMode">
<div ui-include="'../views/clients/edit_client.html'"></div> <div ui-include="'../views/clients/edit_client.html'"></div>