Исправление стилизации меток и кнопок

diff --git a/erp24/views/marketplace-order-status-history/index.php b/erp24/views/marketplace-order-status-history/index.php
index 6eef9d2e96e3c40ad8a110c33aebd12650f6468f..31d6a0925c9124c4f2875f65dca52e6bd4e4e243 100644 (file)
--- a/erp24/views/marketplace-order-status-history/index.php
+++ b/erp24/views/marketplace-order-status-history/index.php
@@ -52,6 +52,10 @@ $this->params['breadcrumbs'][] = $this->title;
                         $class = 'bg-success text-white';
                     } elseif ($status === 'CANCELLED') {
                         $class = 'bg-danger text-white';
+                    } elseif ($status === 'PROCESSING') {
+                        $class = 'bg-primary text-white';
+                    } else {
+                        $class = 'bg-secondary text-white';
                     }
                     return Html::tag('span', $status, ['class' => "badge $class"]);
                 },

diff --git a/erp24/views/marketplace-orders/index.php b/erp24/views/marketplace-orders/index.php
index 9f3520c4463fe710805892c3db8cb6e8dc371aff..5f1ca3b9900632e2296539f97ae86d3dbc41b8c3 100644 (file)
--- a/erp24/views/marketplace-orders/index.php
+++ b/erp24/views/marketplace-orders/index.php
@@ -51,6 +51,7 @@ YiiAsset::register($this);
                 'format' => 'raw',
                 'value' => function ($model) {
                     $status = $model->status->code ?? '';
+                    $substatus = $model->substatus->code ?? '';
                     $class = '';
                     if ($status === 'DELIVERED') {
                         $class = 'bg-success text-white';
@@ -63,22 +64,25 @@ YiiAsset::register($this);
                     }
 
                     $output = Html::tag('span', $status, ['class' => "badge $class"]);
-
-                    if ($status === 'PROCESSING' ) {
+                    $output .= '<div class="mt-2">';
+                    if ($status === 'PROCESSING') {
                         $readyUrl = Url::to(['update-to-ready-status', 'id' => $model->id]);
                         $cancelUrl = Url::to(['update-to-cancelled-status', 'id' => $model->id]);
-                        $output .= '<div class="mt-2">' .
-                            Html::a('Готов', $readyUrl, [
-                                'class' => 'btn btn-sm btn-success',
-                                'data-method' => 'post',
-                                'data-confirm' => 'Вы уверены, что хотите перевести заказ в статус "Готов к отправке"?',
-                            ]) . ' ' .
-                            Html::a('Отменить', $cancelUrl, [
+                        if ($substatus === 'STARTED') {
+                            $output .= '<div class="mt-2">' .
+                                Html::a('Готов', $readyUrl, [
+                                    'class' => 'btn btn-sm btn-success',
+                                    'data-method' => 'post',
+                                    'data-confirm' => 'Вы уверены, что хотите перевести заказ в статус "Готов к отправке"?',
+                                ]) . ' ';
+                        }
+                            $output .= Html::a('Отменить', $cancelUrl, [
                                 'class' => 'btn btn-sm btn-danger',
                                 'data-method' => 'post',
                                 'data-confirm' => 'Вы уверены, что хотите отменить заказ?',
-                            ]) . '</div>';
+                            ]) . ' ';
                     }
+                    $output .= '</div>';
                     return $output;
                 },
                 'filter' => Html::input('text', 'MarketplaceOrdersSearch[status_code]', $searchModel->status_code, ['class' => 'form-control']),