diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php index 20e37cc..d4cf24a 100644 --- a/backend/components/AdminMenuStructure.php +++ b/backend/components/AdminMenuStructure.php @@ -58,7 +58,7 @@ class AdminMenuStructure{ $items[] = ['label' => 'Kedvezmények', 'url' => ['/discount/index'] ]; $items[] = ['label' => 'Termék kategóriák', 'url' => ['/product-category/index'] ]; $items[] = ['label' => 'Bérlet típusok', 'url' => ['/ticket-type/index'] ]; - $items[] = ['label' => 'Kulcsok', 'url' =>['/key/index']]; +// $items[] = ['label' => 'Kulcsok', 'url' =>['/key/index']]; // $items[] = ['label' => 'Pénznem', 'url' => ['/currency/index'] ]; $this->menuItems[] = ['label' => 'Törszadatok', 'url' =>$this->emptyUrl, 'items' => $items diff --git a/backend/config/main.php b/backend/config/main.php index 70d7514..af688c7 100644 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -17,7 +17,6 @@ return [ 'request' => [ 'csrfParam' => '_backendCSRF', 'csrfCookie' => [ - 'httpOnly' => true, 'path' => '/backend/web', ], ], @@ -26,8 +25,7 @@ return [ 'enableAutoLogin' => true, 'identityCookie' => [ 'name' => '_backendUser', // unique for backend - 'path'=>'/backend/web', // correct path for the backend app. - 'httpOnly' => true, +// 'path' => '/backend/web', ] ], 'session' => [ diff --git a/backend/models/ProductSearch.php b/backend/models/ProductSearch.php index 44319eb..f49d2f6 100644 --- a/backend/models/ProductSearch.php +++ b/backend/models/ProductSearch.php @@ -20,7 +20,7 @@ class ProductSearch extends Product { return [ [[ 'id_product_category', 'id_account', 'status'], 'integer'], - [['product_number', 'barcode' ], 'safe'], + [['product_number', 'barcode' ,'name'], 'safe'], ]; } @@ -68,7 +68,8 @@ class ProductSearch extends Product ]); $query->andFilterWhere(['like', 'product_number', $this->product_number]) - ->andFilterWhere(['like', 'barcode', $this->barcode]); + ->andFilterWhere(['like', 'barcode', $this->barcode]) + ->andFilterWhere(['like', 'name', $this->name]); return $dataProvider; } diff --git a/backend/views/product/_search.php b/backend/views/product/_search.php index 5186a56..51364ad 100644 --- a/backend/views/product/_search.php +++ b/backend/views/product/_search.php @@ -19,11 +19,11 @@ function mkOptions($options){ return $o; } -$statusOptions = mkOptions( Product::statuses() ); +$statusOptions = ['' => "Mind"] + ( Product::statuses() ); -$productCategories = mkOptions( ArrayHelper::map( ProductCategory::read(null) ,'id_product_category','name') ); +$productCategories = ['' => "Mind"] + ArrayHelper::map( ProductCategory::read(null) ,'id_product_category','name') ; -$accounts = mkOptions( ArrayHelper::map( Account::read(null) ,'id_account','name')); +$accounts = ['' => "Mind"] + ( ArrayHelper::map( Account::read(null) ,'id_account','name')); ?>