v.2.27
Fixed reports
This commit is contained in:
miroman-afk
@@ -4,26 +4,49 @@
|
||||
<h5 class="modal-title">Редактирование клиента</h5>
|
||||
</div>
|
||||
<div class="modal-body p-lg">
|
||||
<form role="form" class="ng-pristine ng-valid container">
|
||||
<form role="form" class="ng-pristine ng-valid container" ng-submit="updateClient(contextGroup)">
|
||||
<div class="form-group row">
|
||||
<div class="col-sm-12">
|
||||
<span>Группа: </span>
|
||||
<select name="group" class="form-control input-c" ng-options="opt.id as opt.name for opt in groups" ng-model="contextGroup"></select>
|
||||
<span>Имя: </span><input class="form-control" placeholder="Название" type="text" ng-model="contextElement.name">
|
||||
<span>Телефон: </span><input class="form-control" type="text" ng-model="contextElement.phone" ui-mask="+375 (99) 999-99-99">
|
||||
<span>Адрес: </span><input class="form-control" placeholder="Введите email" type="text" ng-model="contextElement.address">
|
||||
<span>Email: </span><input class="form-control" placeholder="Введите адрес" type="text" ng-model="contextElement.email">
|
||||
<span>Штрих код: </span><input class="form-control" placeholder="Введите штрих код" type="text" ng-model="contextElement.barcode">
|
||||
</div>
|
||||
<span>Группа: </span>
|
||||
<select name="group" class="form-control input-c"
|
||||
ng-options="opt.id as opt.name for opt in groups" ng-model="contextGroup"></select>
|
||||
<span>Имя: </span><input class="form-control" placeholder="Название" type="text"
|
||||
ng-model="contextElement.name">
|
||||
<span>Телефон: </span><input class="form-control" type="text" ng-model="contextElement.phone"
|
||||
ui-mask="+375 (99) 999-99-99">
|
||||
<span>Адрес: </span><input class="form-control" placeholder="Введите email" type="text"
|
||||
ng-model="contextElement.address">
|
||||
<span>Email: </span><input class="form-control" placeholder="Введите адрес" type="text"
|
||||
ng-model="contextElement.email">
|
||||
<span>Штрих код: </span><input class="form-control" placeholder="Введите штрих код" type="text"
|
||||
ng-model="contextElement.barcode">
|
||||
<p>
|
||||
<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="contextElement.special_price" ng-checked="contextElement.special_price">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group form-group-inline row">
|
||||
<label class="col-sm-3 form-group-label" for="employeeCheck">Сотрудник</label>
|
||||
<div class="col-sm-9">
|
||||
<input class="form-group-input" type="checkbox" value="" id="employeeCheck"
|
||||
ng-model="contextElement.employee" ng-checked="contextElement.employee">
|
||||
</div>
|
||||
</div>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn dark-white p-x-md" data-dismiss="modal">Отмена</button>
|
||||
<button type="submit" class="btn success p-x-md">Сохранить</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn danger p-x-md pull-left" data-toggle="modal" data-target="#client-confirm-delete"><i class="material-icons"></i></button>
|
||||
|
||||
<button type="button" class="btn dark-white p-x-md" data-dismiss="modal">Отмена</button>
|
||||
<button type="button" class="btn success p-x-md" ng-click="updateClient(contextGroup)">Сохранить</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -103,44 +103,57 @@
|
||||
<div class="p-a-md">
|
||||
<div class="row m-t">
|
||||
<div class="col-sm-12">
|
||||
<a href="" class="pull-left m-r-md">
|
||||
<div class="col-sm-11">
|
||||
<a href="" class="pull-left m-r-md">
|
||||
<span class="avatar w-96">
|
||||
<img src="../views/clients/images/client.png">
|
||||
<i class="on b-white"></i>
|
||||
</span>
|
||||
</a>
|
||||
<div class="clear m-b">
|
||||
<h3 class="m-0 m-b-xs">{{currentClient.name}}</h3>
|
||||
<p class="text-muted">
|
||||
</a>
|
||||
<div class="clear m-b">
|
||||
<h3 class="m-0 m-b-xs">{{currentClient.name}} <span ng-if="currentClient.info.is_block">(КЛИЕНТ ЗАБЛОКИРОВАН)</span></h3>
|
||||
<p class="text-muted">
|
||||
<span class="m-r">
|
||||
<i class="fa fa-phone m-r-sm text-muted"></i>{{currentClient.info.phone}}
|
||||
</span>
|
||||
<small>
|
||||
<i class="fa fa-map-marker m-r-xs"></i>{{currentClient.info.address}}
|
||||
</small>
|
||||
</p>
|
||||
<small>
|
||||
<i class="fa fa-map-marker m-r-xs"></i>{{currentClient.info.address}}
|
||||
</small>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<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 | curr}} BYN</span>
|
||||
<small class="text-xs text-muted">Сумма заказов</small>
|
||||
</a>
|
||||
<a href="" class="inline p-x b-l text-center">
|
||||
<span class="h5 block m-0">{{currentClient.info.order_count}}</span>
|
||||
<small class="text-xs text-muted">Кол-во заказов</small>
|
||||
</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 | 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">
|
||||
<span class="h5 block m-0">{{currentClient.info.bonus}}</span>
|
||||
<small class="text-xs text-muted">Бонусы</small>
|
||||
</a>
|
||||
<div class="col-sm-1">
|
||||
<div class="dropdown inline">
|
||||
<button class="btn white dropdown-toggle" data-toggle="dropdown"
|
||||
aria-expanded="true"><i class="fa fa-bars"></i></button>
|
||||
<div class="dropdown-menu dropdown-menu-scale pull-right">
|
||||
<a class="dropdown-item" href="" ng-if="!currentClient.info.is_block" ng-click="lockClient(currentClient)">Заблокировать</a>
|
||||
<a class="dropdown-item" href="" ng-if="currentClient.info.is_block" ng-click="unlockClient(currentClient)">Разблокировать</a>
|
||||
<a class="dropdown-item" data-toggle="modal"
|
||||
data-target="#client-confirm-delete">Удалить</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<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 | curr}} BYN</span>
|
||||
<small class="text-xs text-muted">Сумма заказов</small>
|
||||
</a>
|
||||
<a href="" class="inline p-x b-l text-center">
|
||||
<span class="h5 block m-0">{{currentClient.info.order_count}}</span>
|
||||
<small class="text-xs text-muted">Кол-во заказов</small>
|
||||
</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 | 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">
|
||||
<span class="h5 block m-0">{{currentClient.info.bonus}}</span>
|
||||
<small class="text-xs text-muted">Бонусы</small>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -148,17 +161,17 @@
|
||||
<div class="row">
|
||||
<div class="col-lg-12 col-sm-9">
|
||||
<div class="p-y-md clearfix nav-active-primary">
|
||||
<ul class="nav nav-pills nav-sm">
|
||||
<ul class="nav nav-pills nav-sm" id="client_tab">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link active" href="" data-toggle="tab" data-target="#tab_1"
|
||||
<a class="nav-link active" id="actions_tab" href="" data-toggle="tab" data-target="#actions"
|
||||
aria-expanded="true">Журнал действий</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="" data-toggle="tab" data-target="#tab_2"
|
||||
<a class="nav-link" id="orders_tab" href="" data-toggle="tab" data-target="#orders"
|
||||
aria-expanded="false" ng-click="getOrders(currentClient.id)">Заказы</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="" data-toggle="tab" data-target="#tab_3"
|
||||
<a class="nav-link" id="info_tab" href="" data-toggle="tab" data-target="#info"
|
||||
aria-expanded="false">Информация</a>
|
||||
</li>
|
||||
</ul>
|
||||
@@ -170,19 +183,14 @@
|
||||
<div class="row">
|
||||
<div class="col-sm-8 col-lg-12">
|
||||
<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="actions" aria-expanded="true">
|
||||
<div class="streamline b-l m-b m-l"
|
||||
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-content" ng-if="clientLog.type == 2">
|
||||
<div class="sl-content">
|
||||
<div class="sl-date text-muted">{{clientLog.time}}</div>
|
||||
<p>{{clientLog.action}} на сумму {{clientLog.value | curr}} BYN
|
||||
пользователем {{clientLog.who}}</p>
|
||||
</div>
|
||||
<div class="sl-content" ng-if="clientLog.type == 1">
|
||||
<div class="sl-date text-muted">{{clientLog.time}}</div>
|
||||
<p>{{clientLog.action}} в количестве {{clientLog.value}} шт</p>
|
||||
<p>{{clientLog.action}}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -195,7 +203,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tab-pane p-v-sm" id="tab_2" aria-expanded="true">
|
||||
<div class="tab-pane p-v-sm" id="orders" aria-expanded="true">
|
||||
<div class="streamline b-l m-b m-l"
|
||||
style="width:auto;max-height:350px;overflow-y: auto;"
|
||||
ng-if="orders.length > 0">
|
||||
@@ -231,7 +239,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tab-pane p-v-sm" id="tab_3">
|
||||
<div class="tab-pane p-v-sm" id="info">
|
||||
<div class="row m-b">
|
||||
<div class="col-xs-10">
|
||||
<small class="text-muted">Телефон:</small>
|
||||
@@ -418,6 +426,14 @@
|
||||
ng-model="newClient.special_price">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group form-group-inline row">
|
||||
<label class="col-sm-3 form-group-label" for="employeeCheck">Сотрудник</label>
|
||||
<div class="col-sm-9">
|
||||
<input class="form-group-input" type="checkbox" value="" id="employeeCheck"
|
||||
ng-model="newClient.employee">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="dker p-a">
|
||||
@@ -466,7 +482,7 @@
|
||||
|
||||
<div class="confirm-box-footer">
|
||||
<button type="button" class="btn dark-white p-x-md" data-dismiss="modal">Нет</button>
|
||||
<button type="button" class="btn danger p-x-md" ng-click="removeClient()">Да</button>
|
||||
<button type="button" class="btn danger p-x-md" ng-click="removeClient(currentClient)">Да</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user