diff --git a/controllers/TaxGroupController.php b/controllers/TaxGroupController.php index b06b045..834c7a8 100755 --- a/controllers/TaxGroupController.php +++ b/controllers/TaxGroupController.php @@ -88,6 +88,7 @@ [ 'model' => $model, 'modelLangs' => $model->modelLangs, + 'level' => $level, ] ); } diff --git a/models/LabelSearch.php b/models/LabelSearch.php index 0a10916..227f8f1 100755 --- a/models/LabelSearch.php +++ b/models/LabelSearch.php @@ -6,7 +6,7 @@ use yii\data\ActiveDataProvider; /** - * LabelSearch represents the model behind the search form about `backend\models\Label`. + * LabelSearch represents the model behind the search form about `artweb\artbox\ecommerce\models\Label`. */ class LabelSearch extends Label { diff --git a/models/ProductFrontendSearch.php b/models/ProductFrontendSearch.php index 97fa735..00a5d1c 100644 --- a/models/ProductFrontendSearch.php +++ b/models/ProductFrontendSearch.php @@ -1,6 +1,6 @@ !empty( $model->imageUrl ) ? \common\components\artboximage\ArtboxImageHelper::getImage($model->imageUrl, 'list') : '', + 'initialPreview' => !empty( $model->imageUrl ) ? ArtboxImageHelper::getImage($model->imageUrl, 'list') : '', 'overwriteInitial' => true, 'showRemove' => false, 'showUpload' => false, @@ -47,7 +48,7 @@ $modelLangs, - 'formView' => '@backend/views/brand/_form_language', + 'formView' => '@artweb/artbox/ecommerce/views/brand/_form_language', 'form' => $form, ]) ?> diff --git a/views/brand/_form_language.php b/views/brand/_form_language.php index 9d4d675..e2d0919 100755 --- a/views/brand/_form_language.php +++ b/views/brand/_form_language.php @@ -1,6 +1,6 @@ !empty( $model->imageUrl ) ? \common\components\artboximage\ArtboxImageHelper::getImage( + 'initialPreview' => !empty( $model->imageUrl ) ? ArtboxImageHelper::getImage( $model->imageUrl, 'list' ) : '', @@ -71,7 +72,7 @@ $modelLangs, - 'formView' => '@backend/views/category/_form_language', + 'formView' => '@artweb/artbox/ecommerce/views/category/_form_language', 'form' => $form, ] ) ?> diff --git a/views/category/_form_language.php b/views/category/_form_language.php index 4f015d5..f48d6f1 100755 --- a/views/category/_form_language.php +++ b/views/category/_form_language.php @@ -1,6 +1,6 @@ title = Yii::t('product', 'Categories'); diff --git a/views/category/update.php b/views/category/update.php index 07cc108..cd8ee36 100755 --- a/views/category/update.php +++ b/views/category/update.php @@ -1,7 +1,7 @@ $modelLangs, - 'formView' => '@backend/views/delivery/_form_language', + 'formView' => '@artweb/artbox/ecommerce/views/delivery/_form_language', 'form' => $form, ]) ?> diff --git a/views/delivery/_form_language.php b/views/delivery/_form_language.php index 2f0795a..8f1641a 100755 --- a/views/delivery/_form_language.php +++ b/views/delivery/_form_language.php @@ -1,6 +1,6 @@ $modelLangs, - 'formView' => '@backend/views/label/_form_language', + 'formView' => '@artweb/artbox/ecommerce/views/label/_form_language', 'form' => $form, ]) ?> diff --git a/views/label/_form_language.php b/views/label/_form_language.php index 5709fd1..c8ce201 100755 --- a/views/label/_form_language.php +++ b/views/label/_form_language.php @@ -1,6 +1,6 @@ $model->id, ] ); diff --git a/views/manage/view.php b/views/manage/view.php index 85e8ee7..c016ec9 100755 --- a/views/manage/view.php +++ b/views/manage/view.php @@ -36,7 +36,7 @@ $variants_string .= Html::a( $variant->lang->title, [ - '/product/variant/view', + 'variant/view', 'id' => $variant->id, ] ) . '
'; @@ -72,7 +72,7 @@ $model->id, ], [ 'class' => 'btn btn-info' ] diff --git a/views/tax-group/_form.php b/views/tax-group/_form.php index 89a6eb6..9931a01 100755 --- a/views/tax-group/_form.php +++ b/views/tax-group/_form.php @@ -7,7 +7,7 @@ use yii\web\View; use yii\widgets\ActiveForm; use artweb\artbox\ecommerce\helpers\ProductHelper; - use artweb\artbox\ecommerce\components\artboxtree\ArtboxTreeHelper; + use artweb\artbox\components\artboxtree\ArtboxTreeHelper; /** * @var View $this diff --git a/views/tax-group/create.php b/views/tax-group/create.php index 3bf2f17..4655907 100755 --- a/views/tax-group/create.php +++ b/views/tax-group/create.php @@ -9,11 +9,15 @@ * @var View $this * @var TaxGroup $model * @var TaxGroupLang[] $modelLangs + * @var int $level */ $this->title = Yii::t('rubrication', 'Create Tax Group'); $this->params[ 'breadcrumbs' ][] = [ 'label' => Yii::t('rubrication', 'Tax Groups'), - 'url' => [ 'index' ], + 'url' => [ + 'index', + 'level' => $level, + ], ]; $this->params[ 'breadcrumbs' ][] = $this->title; ?> @@ -21,9 +25,12 @@

title) ?>

- render('_form', [ - 'model' => $model, - 'modelLangs' => $modelLangs, - ]) ?> + render( + '_form', + [ + 'model' => $model, + 'modelLangs' => $modelLangs, + ] + ) ?> diff --git a/views/tax-group/index.php b/views/tax-group/index.php index 4d1af2d..493bbd9 100755 --- a/views/tax-group/index.php +++ b/views/tax-group/index.php @@ -27,7 +27,7 @@ Yii::t('rubrication', 'Create Group'), Url::to( [ - '/rubrication/tax-group/create', + 'tax-group/create', 'level' => $level, ] ), @@ -38,18 +38,18 @@ $dataProvider, - 'filterModel' => $searchModel, + 'filterModel' => $searchModel, 'columns' => [ [ 'class' => 'yii\grid\SerialColumn' ], 'id', [ 'attribute' => 'is_filter', - 'format' => 'boolean', - 'filter' => \Yii::$app->formatter->booleanFormat, + 'format' => 'boolean', + 'filter' => \Yii::$app->formatter->booleanFormat, ], [ 'attribute' => 'groupName', - 'value' => 'lang.title', + 'value' => 'lang.title', ], [ 'label' => \Yii::t('rubrication', 'Options count'), @@ -85,12 +85,17 @@ ], 'urlCreator' => function ($action, $model, $key, $index) use ($level) { if ($action === 'options') { - $url = '/admin/rubrication/tax-option?group=' . $model->id; + $url = Url::to( + [ + 'tax-option/index', + 'group' => $model->id, + ] + ); return $url; } elseif ($action === 'update') { $url = Url::to( [ - '/rubrication/tax-group/update', + 'tax-group/update', 'level' => $level, 'id' => $model->id, ] @@ -99,7 +104,7 @@ } elseif ($action === 'delete') { $url = Url::to( [ - '/rubrication/tax-group/delete', + 'tax-group/delete', 'level' => $level, 'id' => $model->id, ] diff --git a/views/tax-option/_form.php b/views/tax-option/_form.php index 53fa991..3cd71c1 100755 --- a/views/tax-option/_form.php +++ b/views/tax-option/_form.php @@ -1,5 +1,6 @@ !empty( $model->imageUrl ) ? \artweb\artbox\ecommerce\components\artboximage\ArtboxImageHelper::getImage( + 'initialPreview' => !empty( $model->imageUrl ) ? ArtboxImageHelper::getImage( $model->imageUrl, 'list' ) : '', diff --git a/views/variant/create.php b/views/variant/create.php index f432298..3e35bbb 100755 --- a/views/variant/create.php +++ b/views/variant/create.php @@ -19,12 +19,12 @@ $this->title = Yii::t('product', 'Create Variant'); $this->params[ 'breadcrumbs' ][] = [ 'label' => Yii::t('product', 'Products'), - 'url' => [ '/product/manage/index' ], + 'url' => [ 'manage/index' ], ]; $this->params[ 'breadcrumbs' ][] = [ 'label' => $product->lang->title, 'url' => [ - '/product/manage/view', + 'manage/view', 'id' => $product->id, ], ]; diff --git a/views/variant/index.php b/views/variant/index.php index 2e8cb34..8f50562 100755 --- a/views/variant/index.php +++ b/views/variant/index.php @@ -18,12 +18,12 @@ $this->title = Yii::t('product', 'Variants for ') . $product->lang->title; $this->params[ 'breadcrumbs' ][] = [ 'label' => Yii::t('product', 'Products'), - 'url' => [ '/product/manage/index' ], + 'url' => [ 'manage/index' ], ]; $this->params[ 'breadcrumbs' ][] = [ 'label' => $product->lang->title, 'url' => [ - '/product/manage/view', + 'manage/view', 'id' => $product->id, ], ]; diff --git a/views/variant/update.php b/views/variant/update.php index 85c329f..f936ac4 100755 --- a/views/variant/update.php +++ b/views/variant/update.php @@ -26,12 +26,12 @@ ) . ' ' . $model->lang->title; $this->params[ 'breadcrumbs' ][] = [ 'label' => Yii::t('product', 'Products'), - 'url' => [ '/product/manage/index' ], + 'url' => [ 'manage/index' ], ]; $this->params[ 'breadcrumbs' ][] = [ 'label' => $model->product->lang->title, 'url' => [ - '/product/manage/view', + 'manage/view', 'id' => $model->product->id, ], ]; diff --git a/views/variant/view.php b/views/variant/view.php index 2a707e8..f8fa43f 100755 --- a/views/variant/view.php +++ b/views/variant/view.php @@ -15,18 +15,21 @@ $this->title = $model->lang->title; $this->params[ 'breadcrumbs' ][] = [ 'label' => Yii::t('product', 'Products'), - 'url' => [ 'index' ], + 'url' => [ 'manage/index' ], ]; $this->params[ 'breadcrumbs' ][] = [ 'label' => $model->product->lang->title, 'url' => [ - 'view', + 'manage/view', 'id' => $model->product->id, ], ]; $this->params[ 'breadcrumbs' ][] = [ 'label' => Yii::t('product', 'Variants'), - 'url' => [ '/product/variant?product_id=' . $model->product->id ], + 'url' => [ + 'variant/index', + 'product_id' => $model->product->id, + ], ]; $this->params[ 'breadcrumbs' ][] = $this->title; $properties_string = ''; @@ -83,7 +86,7 @@ 'value' => Html::a( $model->product->fullname, [ - '/product/manage/view', + 'product/manage/view', 'id' => $model->id, ] ), diff --git a/widgets/views/brandsCarousel.php b/widgets/views/brandsCarousel.php index d3e3de7..0795a8f 100755 --- a/widgets/views/brandsCarousel.php +++ b/widgets/views/brandsCarousel.php @@ -2,7 +2,7 @@ /** * @var Brand[] $brands */ - use artweb\artbox\ecommerce\components\artboximage\ArtboxImageHelper; + use artweb\artbox\components\artboximage\ArtboxImageHelper; use artweb\artbox\ecommerce\models\Brand; ?> @@ -10,9 +10,14 @@