diff --git a/views/order/_form.php b/views/order/_form.php
index f5e77e1..2d99f30 100755
--- a/views/order/_form.php
+++ b/views/order/_form.php
@@ -566,10 +566,6 @@ JS;
],
[
'class' => 'delete-button',
- // 'data' => [
- // 'confirm' => 'Вы уверены, что хотите удалить этот элемент?',
- // 'method' => 'GET',
- // ],
]
);
}
diff --git a/views/order/view.php b/views/order/view.php
index 09c051a..de8f3a1 100755
--- a/views/order/view.php
+++ b/views/order/view.php
@@ -1,11 +1,13 @@
orderPayment->lang->title;
}
+ $js = <<< JS
+ $('[data-toggle="popover"]').popover();
+JS;
+ $this->registerJs($js, View::POS_READY);
+
?>
@@ -155,12 +162,91 @@
[
'class' => SerialColumn::className(),
],
- 'product_name',
- 'name',
'sku',
+ [
+ 'attribute' => 'product_name',
+ 'content' => function (OrderProduct $model) {
+ if (!empty( $model->product_name )) {
+
+ if (empty( $model->productVariant )) {
+ return '';
+ }
+
+ return Html::a(
+ StringHelper::truncate($model->product_name, 10, '...'),
+ '#',
+ [
+ 'onclick' => 'event.preventDefault();',
+ 'data-toggle' => 'popover',
+ 'data-placement' => 'right',
+ 'data-html' => 'true',
+ 'data-content' => Html::img(
+ $model->productVariant->imageUrl,
+ [
+ 'class' => 'img-rounded',
+ ]
+ ) . Html::tag('p', $model->product_name),
+ ]
+ );
+ } else {
+ return '';
+ }
+ },
+ ],
+ [
+ 'attribute' => 'productVariant.product.brand.lang.title',
+ 'label' => 'Брэнд',
+ ],
+ [
+ 'attribute' => 'productVariant.lang.title',
+ 'label' => \Yii::t('app', 'Цвет'),
+ 'content' => function (OrderProduct $model) {
+
+ if (empty( $model->productVariant )) {
+ return '';
+ }
+
+ if (preg_match('@.*\.(png|jpg|gif)@i', $model->productVariant->lang->title)) {
+ return '';
+ } else {
+ return $model->productVariant->lang->title;
+ }
+ },
+ ],
+ [
+ 'attribute' => 'productVariant.size',
+ 'label' => 'Размер',
+ ],
'price',
'count',
'sum_cost',
+ 'booking',
+ 'status',
+ 'return',
+ [
+ 'content' => function (OrderProduct $model) {
+
+ if (empty( $model->productVariant )) {
+ return '
';
+ }
+
+ $content = '
Склад | кол. |
';
+ foreach ($model->productVariant->variantStocks as $stock) {
+ $content .= '' . $stock->stock->title . ' | ' . $stock->quantity . ' |
';
+ }
+ return Html::a(
+ '',
+ '#',
+ [
+ 'onclick' => 'event.preventDefault();',
+ 'data-toggle' => 'popover',
+ 'data-placement' => 'left',
+ 'data-html' => 'true',
+ 'data-content' => $content . '
',
+ ]
+ );
+ },
+ ],
],
]
);
--
libgit2 0.21.4