Вывод инфы о статусе и коммента в карточке заказа

parent a24b9a0c
...@@ -633,7 +633,32 @@ input[type="checkbox"] ...@@ -633,7 +633,32 @@ input[type="checkbox"]
resize: none; resize: none;
} }
.b-popup-content button .b-order-status
{ {
margin-bottom: 15px;
}
.b-order-status_status span
{
font-weight: bold;
}
.b-order-status_status span.confirmed
{
color: #337ab7;
}
.b-order-status_status span.rejected
{
color: #D9534F;
}
.b-order-status_comment-inner
{
padding: 5px 10px;
width: 100%;
height: 72px;
border: 1px solid #CCCCCC;
border-radius: 4px;
resize: none;
} }
\ No newline at end of file
...@@ -32,6 +32,7 @@ use App\Model\Users; ...@@ -32,6 +32,7 @@ use App\Model\Users;
use App\Model\Statistics; use App\Model\Statistics;
use App\Model\Providers; use App\Model\Providers;
use App\Model\Feeds\Feeds; use App\Model\Feeds\Feeds;
use App\Model\Feeds\OrdersStatus;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Zend\Diactoros\Response\HtmlResponse; use Zend\Diactoros\Response\HtmlResponse;
...@@ -112,10 +113,29 @@ class ViewId extends Common ...@@ -112,10 +113,29 @@ class ViewId extends Common
if ($feed_item->getClientid() == $userId){ if ($feed_item->getClientid() == $userId){
$feed_id = $request->getAttribute('feedid');
$order_id = $request->getAttribute('id');
/** @var \App\Model\Feeds $ordersStatusModel */
$ordersStatusModel = $this->container->get(OrdersStatus::class);
$ordersStatus = $ordersStatusModel->findOne(['feed_id' => $feed_id, 'order_id' => $order_id]);
if ($ordersStatus) {
$status = array(
'confirmed' => $ordersStatus->getConfirmed(),
'comment' => $ordersStatus->getComment()
);
} else {
$status = array(
'confirmed' => 1,
'comment' => null
);
}
// Статистика-история по клику: // Статистика-история по клику:
$orderIdStats = $stats->getOrderIdStatData($feed_id, $order_id); $orderIdStats = $stats->getOrderIdStatData($feed_id, $order_id);
$data['viewIdStats'] = $orderIdStats; $data['viewIdStats'] = $orderIdStats;
$data['cats'] = self::STAT_CATS_ORDER; $data['cats'] = self::STAT_CATS_ORDER;
$data['status'] = $status;
} else { } else {
$data['error'] = _t('Извините, данный фид закреплен за другим пользователем'); $data['error'] = _t('Извините, данный фид закреплен за другим пользователем');
......
...@@ -47,6 +47,7 @@ $error = $this->error; ...@@ -47,6 +47,7 @@ $error = $this->error;
if (!$error) { if (!$error) {
$viewIdStats = $this->viewIdStats; $viewIdStats = $this->viewIdStats;
$cats = $this->cats; $cats = $this->cats;
$status = $status;
} }
?> ?>
...@@ -75,6 +76,21 @@ if (!$error) { ...@@ -75,6 +76,21 @@ if (!$error) {
<?php else: ?> <?php else: ?>
<?php /* Информация о статусе заказа: */ ?>
<?php if($status): ?>
<div class="b-order-status">
<div class="b-order-status_status">
<label>Статус заказа:</label> <span class="<?= ($status['confirmed']) ? 'confirmed': 'rejected' ?>"><?= ($status['confirmed']) ? _t('подтвержден') : _t('отклонен') ?></span>
</div>
<?php if($status['comment']): ?>
<div class="b-order-status_comment">
<label>Комментарий:</label>
<textarea class="b-order-status_comment-inner" disabled><?= $status['comment'] ?></textarea>
</div>
<?php endif; ?>
</div>
<?php endif; ?>
<?php /* Таблица */ ?> <?php /* Таблица */ ?>
<div id="table-stat" class="b-table_wrapp"> <div id="table-stat" class="b-table_wrapp">
<div class="b-content__loading"></div> <div class="b-content__loading"></div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment