diff --git a/README.md b/README.md index bdd552d95..342bd9d6f 100755 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ It packs in lots of demanding features that allows your business to scale in no * Orders Management System. * Customer Cart, Wishlist, Product Reviews. * Simple and Configurable Products. -* Check out [more....](https://bagisto.com/features/). +* Check out [click here](https://bagisto.com/features/). **For Developers**: Dev guys can take advantage of two of the hottest frameworks used in this project Laravel and Vue.js, both of these frameworks have been used in Bagisto. diff --git a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php index c3726e1c3..000aa96a5 100755 --- a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php @@ -80,7 +80,7 @@ class CategoryDataGrid extends DataGrid 'label' => trans('admin::app.datagrid.no-of-products'), 'type' => 'number', 'sortable' => true, - 'searchable' => true, + 'searchable' => false, ]); } diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php index e7626b969..a73e90e7e 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php @@ -20,11 +20,12 @@ class CustomerReviewDataGrid extends DataGrid public function prepareQueryBuilder() { $queryBuilder = DB::table('product_reviews as pr') - ->leftjoin('products_grid as pg', 'pr.product_id', '=', 'pg.id') - ->addSelect('pr.id as product_review_id', 'pr.title', 'pr.comment', 'pg.name', 'pr.status as product_review_status'); + ->leftjoin('products_grid as pg', 'pr.product_id', '=', 'pg.id') + ->select('pr.id as product_review_id', 'pr.title', 'pr.comment', 'pg.name as product_name', 'pr.status as product_review_status'); $this->addFilter('product_review_id', 'pr.id'); $this->addFilter('product_review_status', 'pr.status'); + $this->addFilter('product_name', 'pg.name'); $this->setQueryBuilder($queryBuilder); } @@ -37,6 +38,7 @@ class CustomerReviewDataGrid extends DataGrid 'type' => 'number', 'searchable' => false, 'sortable' => true, + 'filterable' => false ]); $this->addColumn([ @@ -56,7 +58,7 @@ class CustomerReviewDataGrid extends DataGrid ]); $this->addColumn([ - 'index' => 'name', + 'index' => 'product_name', 'label' => trans('admin::app.datagrid.product-name'), 'type' => 'string', 'searchable' => true, diff --git a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php index d76a9173c..72224940e 100755 --- a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php @@ -35,7 +35,7 @@ class OrderShipmentsDataGrid extends DataGrid $this->addFilter('inventory_source_name', 'is.name'); $this->addFilter('orderdate', 'ors.created_at'); $this->addFilter('shipment_created_at', 'shipments.created_at'); - $this->addFilter('shipped_to', DDB::raw('CONCAT(order_address_shipping.first_name, " ", order_address_shipping.last_name) as shipped_to')); + $this->addFilter('shipped_to', DB::raw('CONCAT(order_address_shipping.first_name, " ", order_address_shipping.last_name)')); $this->setQueryBuilder($queryBuilder); } diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index 357b798cc..b80d2825f 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -17,14 +17,17 @@ class ProductDataGrid extends DataGrid protected $index = 'product_id'; + protected $itemsPerPage = 20; + public function prepareQueryBuilder() { $queryBuilder = DB::table('products_grid') ->leftJoin('products', 'products_grid.product_id', '=', 'products.id') ->leftJoin('attribute_families', 'products.attribute_family_id', '=', 'attribute_families.id') - ->addSelect('products_grid.product_id as product_id', 'products_grid.sku as product_sku', 'products_grid.name', 'products.type as product_type', 'products_grid.status', 'products_grid.price', 'products_grid.quantity', 'attribute_families.name as attribute_family'); + ->select('products_grid.product_id as product_id', 'products_grid.sku as product_sku', 'products_grid.name as productname', 'products.type as product_type', 'products_grid.status', 'products_grid.price', 'products_grid.quantity', 'attribute_families.name as attribute_family'); $this->addFilter('product_id', 'products_grid.product_id'); + $this->addFilter('productname', 'products_grid.name'); $this->addFilter('product_sku', 'products_grid.sku'); $this->addFilter('product_type', 'products.type'); $this->addFilter('attribute_family', 'attribute_families.name'); @@ -52,7 +55,7 @@ class ProductDataGrid extends DataGrid ]); $this->addColumn([ - 'index' => 'name', + 'index' => 'productname', 'label' => trans('admin::app.datagrid.name'), 'type' => 'string', 'searchable' => true, diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php index 1863e2099..600f42a82 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php @@ -6,7 +6,7 @@ @section('content')
-
+
@@ -220,7 +220,7 @@