From 5539776ab92ddfd06e0c39656e5c36833b9fdd66 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Mon, 21 Dec 2020 14:32:55 +0530 Subject: [PATCH] Channel Table Seeder And Datagrid Updated --- .../Admin/src/DataGrids/ChannelDataGrid.php | 10 +++- ...0200_create_channel_translations_table.php | 4 +- ...151_remove_columns_from_channels_table.php | 37 ++++++++++++++ .../Database/Seeders/ChannelTableSeeder.php | 49 ++++++++++++++++--- 4 files changed, 89 insertions(+), 11 deletions(-) create mode 100644 packages/Webkul/Core/src/Database/Migrations/2020_12_21_140151_remove_columns_from_channels_table.php diff --git a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php index 379199470..2e2e51de9 100755 --- a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php @@ -17,6 +17,11 @@ class ChannelDataGrid extends DataGrid */ protected $sortOrder = 'desc'; + /** + * Filter Locale. + */ + protected $locale = 'all'; + /** * ChannelRepository $channelRepository * @@ -36,13 +41,16 @@ class ChannelDataGrid extends DataGrid { parent::__construct(); + $this->locale = request()->get('locale') ?? app()->getLocale(); + $this->channelRepository = $channelRepository; } public function prepareQueryBuilder() { $queryBuilder = $this->channelRepository->query() - ->addSelect('id', 'code', 'name', 'hostname'); + ->leftJoin('channel_translations', 'channel_translations.channel_id', '=', 'channels.id') + ->addSelect('channels.id', 'channels.code', 'channel_translations.name', 'channels.hostname'); $this->setQueryBuilder($queryBuilder); } diff --git a/packages/Webkul/Core/src/Database/Migrations/2020_12_21_000200_create_channel_translations_table.php b/packages/Webkul/Core/src/Database/Migrations/2020_12_21_000200_create_channel_translations_table.php index 8dfc8ce78..585aa18b0 100644 --- a/packages/Webkul/Core/src/Database/Migrations/2020_12_21_000200_create_channel_translations_table.php +++ b/packages/Webkul/Core/src/Database/Migrations/2020_12_21_000200_create_channel_translations_table.php @@ -1,8 +1,8 @@ dropColumn('name'); + $table->dropColumn('description'); + $table->dropColumn('home_page_content'); + $table->dropColumn('footer_content'); + $table->dropColumn('maintenance_mode_text'); + $table->dropColumn('home_seo'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('channels', function (Blueprint $table) { + // + }); + } +} diff --git a/packages/Webkul/Core/src/Database/Seeders/ChannelTableSeeder.php b/packages/Webkul/Core/src/Database/Seeders/ChannelTableSeeder.php index 7cb0606f0..94deec5d5 100755 --- a/packages/Webkul/Core/src/Database/Seeders/ChannelTableSeeder.php +++ b/packages/Webkul/Core/src/Database/Seeders/ChannelTableSeeder.php @@ -14,19 +14,52 @@ class ChannelTableSeeder extends Seeder DB::table('channels')->insert([ 'id' => 1, 'code' => 'default', - 'name' => 'Default', 'theme' => 'velocity', 'hostname' => config('app.url'), 'root_category_id' => 1, - 'home_page_content' => '

@include("shop::home.slider") @include("shop::home.featured-products") @include("shop::home.new-products")

- ', - 'footer_content' => '
Quick Links
Connect With Us
', - 'name' => 'Default', 'default_locale_id' => 1, 'base_currency_id' => 1, + ]); + + DB::table('channel_translations')->insert([ + 'id' => 1, + 'channel_id' => 1, + 'locale' => 'en', + 'name' => 'Default', + 'home_page_content' => ' +

@include("shop::home.slider") @include("shop::home.featured-products") @include("shop::home.new-products")

+ + ', + 'footer_content' => ' +
+ Quick Links + +
+
+ Connect With Us + +
+ ', 'home_seo' => '{"meta_title": "Demo store", "meta_keywords": "Demo store meta keyword", "meta_description": "Demo store meta description"}', ]);