From c585186a88daf335519dbdeb737fcbeb0c6647bf Mon Sep 17 00:00:00 2001 From: jitendra Date: Tue, 23 Apr 2019 10:33:10 +0530 Subject: [PATCH 1/3] Issue #840 fixed --- .../Webkul/Admin/src/DataGrids/CustomerDataGrid.php | 11 ++++++----- .../Admin/src/Providers/AdminServiceProvider.php | 1 - .../src/Resources/views/customers/index.blade.php | 1 + .../Shop/src/Http/Controllers/HomeController.php | 2 +- packages/Webkul/Shop/src/Http/routes.php | 4 +++- .../Webkul/Shop/src/Providers/ShopServiceProvider.php | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php index 52cbcd608..4d8407eab 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php @@ -21,12 +21,13 @@ class CustomerDataGrid extends DataGrid public function prepareQueryBuilder() { - $queryBuilder = DB::table('customers as custs') - ->addSelect('custs.id as customer_id', 'custs.email', 'cg.name') - ->addSelect(DB::raw('CONCAT(custs.first_name, " ", custs.last_name) as full_name'))->leftJoin('customer_groups as cg', 'custs.customer_group_id', '=', 'cg.id'); + $queryBuilder = DB::table('customers') + ->leftJoin('customer_groups', 'customers.customer_group_id', '=', 'customer_groups.id') + ->addSelect('customers.id as customer_id', 'customers.email', 'customer_groups.name') + ->addSelect(DB::raw('CONCAT(customers.first_name, " ", customers.last_name) as full_name')); - $this->addFilter('customer_id', 'custs.id'); - $this->addFilter('full_name', DB::raw('CONCAT(custs.first_name, " ", custs.last_name)')); + $this->addFilter('customer_id', 'customers.id'); + $this->addFilter('full_name', DB::raw('CONCAT(customers.first_name, " ", customers.last_name)')); $this->setQueryBuilder($queryBuilder); } diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php index baa5d19f1..413f99dcb 100755 --- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php @@ -23,7 +23,6 @@ class AdminServiceProvider extends ServiceProvider */ public function boot() { - // include __DIR__ . '/../Http/routes.php'; $this->loadRoutesFrom(__DIR__ . '/../Http/routes.php'); $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'admin'); diff --git a/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php index 9c3c6b8d2..86714f9d5 100755 --- a/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php @@ -27,6 +27,7 @@
@inject('customerGrid','Webkul\Admin\DataGrids\CustomerDataGrid') + {!! $customerGrid->render() !!}
diff --git a/packages/Webkul/Shop/src/Http/Controllers/HomeController.php b/packages/Webkul/Shop/src/Http/Controllers/HomeController.php index dc477744c..dd4856c1a 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/HomeController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/HomeController.php @@ -33,7 +33,7 @@ use Webkul\Core\Repositories\SliderRepository; */ public function index() { - if (request()->route('any')) + if (request()->route()->getName() != 'shop.home.index') abort(404); $currentChannel = core()->getCurrentChannel(); diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index 71de55fdc..c3e5f4df9 100755 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -275,5 +275,7 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function }); //customer routes end here - Route::get('/{any?}', 'Webkul\Shop\Http\Controllers\HomeController@index'); + // Route::get('/{any?}', 'Webkul\Shop\Http\Controllers\HomeController@index'); + + Route::fallback('Webkul\Shop\Http\Controllers\HomeController@index'); }); diff --git a/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php b/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php index a34d29844..35d962c5c 100755 --- a/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php +++ b/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php @@ -26,7 +26,7 @@ class ShopServiceProvider extends ServiceProvider */ public function boot(Router $router) { - include __DIR__ . '/../Http/routes.php'; + $this->loadRoutesFrom(__DIR__ . '/../Http/routes.php'); $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'shop'); From e18fd4e5c4e20b29500b79e0389dd2fc36d44db6 Mon Sep 17 00:00:00 2001 From: jitendra Date: Tue, 23 Apr 2019 11:03:05 +0530 Subject: [PATCH 2/3] Issue #855 fixed --- .../Product/src/Listeners/ProductFlat.php | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Product/src/Listeners/ProductFlat.php b/packages/Webkul/Product/src/Listeners/ProductFlat.php index cba08a127..16b219840 100644 --- a/packages/Webkul/Product/src/Listeners/ProductFlat.php +++ b/packages/Webkul/Product/src/Listeners/ProductFlat.php @@ -184,8 +184,8 @@ class ProductFlat if (in_array($attribute->code, ['short_description', 'tax_category_id', 'meta_title', 'meta_keywords', 'meta_description', 'width', 'height'])) continue; - // if (! Schema::hasColumn('product_flat', $attribute->code)) - // continue; + if (! Schema::hasColumn('product_flat', $attribute->code)) + continue; if ($attribute->value_per_channel) { if ($attribute->value_per_locale) { @@ -217,6 +217,24 @@ class ProductFlat $productFlat->{$attribute->code . '_label'} = $attributeOption->admin_name; } } + } elseif ($attribute->type == 'multiselect') { + $attributeOptionIds = explode(',', $product->{$attribute->code}); + + if (count($attributeOptionIds)) { + $attributeOptions = $this->attributeOptionRepository->findWhereIn('id', $attributeOptionIds); + + $optionLabels = []; + + foreach ($attributeOptions as $attributeOption) { + if ($attributeOptionTranslation = $attributeOption->translate($locale->code)) { + $optionLabels[] = $attributeOptionTranslation->label; + } else { + $optionLabels[] = $attributeOption->admin_name; + } + } + + $productFlat->{$attribute->code . '_label'} = implode(', ', $optionLabels); + } } } From 9d6503077908595eea98a566bc70fde628217826 Mon Sep 17 00:00:00 2001 From: jitendra Date: Tue, 23 Apr 2019 11:16:34 +0530 Subject: [PATCH 3/3] Issue #851 fixed --- packages/Webkul/Product/src/Helpers/ProductImage.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/Webkul/Product/src/Helpers/ProductImage.php b/packages/Webkul/Product/src/Helpers/ProductImage.php index 778995166..16c906027 100755 --- a/packages/Webkul/Product/src/Helpers/ProductImage.php +++ b/packages/Webkul/Product/src/Helpers/ProductImage.php @@ -52,12 +52,9 @@ class ProductImage extends AbstractProduct */ public function getProductBaseImage($product) { - if (! $product) - return []; - - $images = $product->images; + $images = $product ? $product->images : null; - if ($images->count()) { + if ($images && $images->count()) { $image = [ 'small_image_url' => url('cache/small/' . $images[0]->path), 'medium_image_url' => url('cache/medium/' . $images[0]->path),