diff --git a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php index 8547237f6..312d59df0 100755 --- a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php @@ -2,18 +2,56 @@ namespace Webkul\Admin\DataGrids; -use Illuminate\Support\Facades\DB; use Webkul\Ui\DataGrid\DataGrid; +use Webkul\Core\Repositories\ChannelRepository; class ChannelDataGrid extends DataGrid { + /** + * Assign primary key. + */ protected $index = 'id'; + /** + * Sort order. + */ protected $sortOrder = 'desc'; + /** + * Filter Locale. + */ + protected $locale; + + /** + * ChannelRepository $channelRepository + * + * @var \Webkul\Core\Repositories\ChannelRepository + */ + protected $channelRepository; + + /** + * Create a new datagrid instance. + * + * @param \Webkul\Core\Repositories\ChannelRepository $channelRepository + * @return void + */ + public function __construct( + ChannelRepository $channelRepository + ) + { + parent::__construct(); + + $this->locale = request()->get('locale') ?? app()->getLocale(); + + $this->channelRepository = $channelRepository; + } + public function prepareQueryBuilder() { - $queryBuilder = DB::table('channels')->addSelect('id', 'code', 'name', 'hostname'); + $queryBuilder = $this->channelRepository->query() + ->leftJoin('channel_translations', 'channel_translations.channel_id', '=', 'channels.id') + ->addSelect('channels.id', 'channels.code', 'channel_translations.locale', 'channel_translations.name as translated_name', 'channels.hostname') + ->where('channel_translations.locale', '=', $this->locale); $this->setQueryBuilder($queryBuilder); } @@ -39,7 +77,7 @@ class ChannelDataGrid extends DataGrid ]); $this->addColumn([ - 'index' => 'name', + 'index' => 'translated_name', 'label' => trans('admin::app.datagrid.name'), 'type' => 'string', 'searchable' => true, diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php index 32e86354f..1319ce353 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php @@ -6,8 +6,9 @@ @section('content')
+ @php $locale = request()->get('locale') ?: app()->getLocale(); @endphp -
+

@@ -15,6 +16,18 @@ {{ __('admin::app.settings.channels.edit-title') }}

+ +
+ +
@@ -25,6 +38,7 @@
+
@csrf() @@ -42,15 +56,21 @@ @{{ errors.first('code') }}
-
- - - @{{ errors.first('name') }} +
+ + + @{{ errors.first('{!!$locale!!}[page_title]') }}
- - + +
@@ -97,9 +117,9 @@ locales->pluck('id')->toArray() ?> @@ -110,9 +130,9 @@ default_locale_id ?> @@ -166,13 +186,19 @@
- - + +
- - + +
@@ -191,32 +217,44 @@ @php - $seo = json_decode($channel->home_seo); + $home_seo = $channel->translate($locale)['home_seo'] ?? '{}'; + $seo = json_decode($home_seo); @endphp {{-- home page seo --}}
-
- - - @{{ errors.first('seo_title') }} +
+ + + + + @{{ errors.first('{!!$locale!!}[page_title]') }}
-
- +
+ - + - @{{ errors.first('seo_description') }} + @{{ errors.first('{!!$locale!!}[page_title]') }}
-
- +
+ - + - @{{ errors.first('seo_keywords') }} + @{{ errors.first('{!!$locale!!}[page_title]') }}
@@ -234,8 +272,11 @@
- - + +
diff --git a/packages/Webkul/Core/src/Contracts/ChannelTranslation.php b/packages/Webkul/Core/src/Contracts/ChannelTranslation.php new file mode 100644 index 000000000..b9ca88ae6 --- /dev/null +++ b/packages/Webkul/Core/src/Contracts/ChannelTranslation.php @@ -0,0 +1,7 @@ +id(); + $table->integer('channel_id')->unsigned(); + $table->string('locale')->index(); + $table->string('name'); + $table->text('description')->nullable(); + $table->text('home_page_content')->nullable(); + $table->text('footer_content')->nullable(); + $table->text('maintenance_mode_text')->nullable(); + $table->json('home_seo')->nullable(); + $table->timestamps(); + + $table->unique(['channel_id', 'locale']); + $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('channel_translations'); + } +} diff --git a/packages/Webkul/Core/src/Database/Migrations/2020_12_21_140151_remove_columns_from_channels_table.php b/packages/Webkul/Core/src/Database/Migrations/2020_12_21_140151_remove_columns_from_channels_table.php new file mode 100644 index 000000000..a3804bfd8 --- /dev/null +++ b/packages/Webkul/Core/src/Database/Migrations/2020_12_21_140151_remove_columns_from_channels_table.php @@ -0,0 +1,37 @@ +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..3c587d92b 100755 --- a/packages/Webkul/Core/src/Database/Seeders/ChannelTableSeeder.php +++ b/packages/Webkul/Core/src/Database/Seeders/ChannelTableSeeder.php @@ -2,8 +2,8 @@ namespace Webkul\Core\Database\Seeders; -use Illuminate\Support\Facades\DB; use Illuminate\Database\Seeder; +use Illuminate\Support\Facades\DB; class ChannelTableSeeder extends Seeder { @@ -14,20 +14,175 @@ 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, - 'home_seo' => '{"meta_title": "Demo store", "meta_keywords": "Demo store meta keyword", "meta_description": "Demo store meta description"}', + ]); + + 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"}', + ], [ + 'id' => 2, + 'channel_id' => 1, + 'locale' => 'fr', + '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"}', + ], [ + 'id' => 3, + 'channel_id' => 1, + 'locale' => 'nl', + '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"}', + ], [ + 'id' => 4, + 'channel_id' => 1, + 'locale' => 'tr', + '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"}', + ] ]); DB::table('channel_currencies')->insert([ diff --git a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php index 75dd9e418..fe5895f85 100755 --- a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php +++ b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php @@ -8,7 +8,7 @@ use Webkul\Core\Repositories\ChannelRepository; class ChannelController extends Controller { /** - * Contains route related configuration + * Contains route related configuration. * * @var array */ @@ -61,36 +61,40 @@ class ChannelController extends Controller */ public function store() { - $this->validate(request(), [ - 'code' => ['required', 'unique:channels,code', new \Webkul\Core\Contracts\Validations\Code], - 'name' => 'required', - 'locales' => 'required|array|min:1', - 'default_locale_id' => 'required|in_array:locales.*', - 'currencies' => 'required|array|min:1', - 'base_currency_id' => 'required|in_array:currencies.*', - 'root_category_id' => 'required', - 'logo.*' => 'nullable|mimes:bmp,jpeg,jpg,png,webp', - 'favicon.*' => 'nullable|mimes:bmp,jpeg,jpg,png,webp', - 'seo_title' => 'required|string', - 'seo_description' => 'required|string', - 'seo_keywords' => 'required|string', - 'hostname' => 'unique:channels,hostname', - 'is_maintenance_on' => 'boolean' + $data = $this->validate(request(), [ + /* general */ + 'code' => ['required', 'unique:channels,code', new \Webkul\Core\Contracts\Validations\Code], + 'name' => 'required', + 'description' => 'nullable', + 'inventory_sources' => 'required|array|min:1', + 'root_category_id' => 'required', + 'hostname' => 'unique:channels,hostname', + + /* currencies and locales */ + 'locales' => 'required|array|min:1', + 'default_locale_id' => 'required|in_array:locales.*', + 'currencies' => 'required|array|min:1', + 'base_currency_id' => 'required|in_array:currencies.*', + + /* design */ + 'theme' => 'nullable', + 'home_page_content' => 'nullable', + 'footer_content' => 'nullable', + 'logo.*' => 'nullable|mimes:bmp,jpeg,jpg,png,webp', + 'favicon.*' => 'nullable|mimes:bmp,jpeg,jpg,png,webp', + + /* seo */ + 'seo_title' => 'required|string', + 'seo_description' => 'required|string', + 'seo_keywords' => 'required|string', + + /* maintenance mode */ + 'is_maintenance_on' => 'boolean', + 'maintenance_mode_text' => 'nullable', + 'allowed_ips' => 'nullable' ]); - $data = request()->all(); - - $data['seo']['meta_title'] = $data['seo_title']; - $data['seo']['meta_description'] = $data['seo_description']; - $data['seo']['meta_keywords'] = $data['seo_keywords']; - - unset($data['seo_title']); - unset($data['seo_description']); - unset($data['seo_keywords']); - - $data['home_seo'] = json_encode($data['seo']); - - unset($data['seo']); + $data = $this->setSEOContent($data); Event::dispatch('core.channel.create.before'); @@ -124,32 +128,42 @@ class ChannelController extends Controller */ public function update($id) { - $this->validate(request(), [ - 'code' => ['required', 'unique:channels,code,' . $id, new \Webkul\Core\Contracts\Validations\Code], - 'name' => 'required', - 'locales' => 'required|array|min:1', - 'inventory_sources' => 'required|array|min:1', - 'default_locale_id' => 'required|in_array:locales.*', - 'currencies' => 'required|array|min:1', - 'base_currency_id' => 'required|in_array:currencies.*', - 'root_category_id' => 'required', - 'logo.*' => 'nullable|mimes:bmp,jpeg,jpg,png,webp', - 'favicon.*' => 'nullable|mimes:bmp,jpeg,jpg,png,webp', - 'hostname' => 'unique:channels,hostname,' . $id, - 'is_maintenance_on' => 'boolean' + $locale = request()->get('locale') ?: app()->getLocale(); + + $data = $this->validate(request(), [ + /* general */ + 'code' => ['required', 'unique:channels,code,' . $id, new \Webkul\Core\Contracts\Validations\Code], + $locale . '.name' => 'required', + $locale . '.description' => 'nullable', + 'inventory_sources' => 'required|array|min:1', + 'root_category_id' => 'required', + 'hostname' => 'unique:channels,hostname,' . $id, + + /* currencies and locales */ + 'locales' => 'required|array|min:1', + 'default_locale_id' => 'required|in_array:locales.*', + 'currencies' => 'required|array|min:1', + 'base_currency_id' => 'required|in_array:currencies.*', + + /* design */ + 'theme' => 'nullable', + $locale . '.home_page_content' => 'nullable', + $locale . '.footer_content' => 'nullable', + 'logo.*' => 'nullable|mimes:bmp,jpeg,jpg,png,webp', + 'favicon.*' => 'nullable|mimes:bmp,jpeg,jpg,png,webp', + + /* seo */ + $locale . '.seo_title' => 'nullable', + $locale . '.seo_description' => 'nullable', + $locale . '.seo_keywords' => 'nullable', + + /* maintenance mode */ + 'is_maintenance_on' => 'boolean', + $locale . '.maintenance_mode_text' => 'nullable', + 'allowed_ips' => 'nullable' ]); - $data = request()->all(); - - $data['seo']['meta_title'] = $data['seo_title']; - $data['seo']['meta_description'] = $data['seo_description']; - $data['seo']['meta_keywords'] = $data['seo_keywords']; - - unset($data['seo_title']); - unset($data['seo_description']); - unset($data['seo_keywords']); - - $data['home_seo'] = json_encode($data['seo']); + $data = $this->setSEOContent($data, $locale); Event::dispatch('core.channel.update.before', $id); @@ -190,11 +204,55 @@ class ChannelController extends Controller return response()->json(['message' => true], 200); } catch(\Exception $e) { - // session()->flash('warning', trans($e->getMessage())); session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Channel'])); } } return response()->json(['message' => false], 400); } + + /** + * Set the seo content and return back the updated array. + * + * @param array $data + * @param string $locale + * @return array + */ + private function setSEOContent(array $data, $locale = null) + { + $editedData = $data; + + if ($locale) { + $editedData = $data[$locale]; + } + + $editedData['home_seo']['meta_title'] = $editedData['seo_title']; + $editedData['home_seo']['meta_description'] = $editedData['seo_description']; + $editedData['home_seo']['meta_keywords'] = $editedData['seo_keywords']; + $editedData['home_seo'] = json_encode($editedData['home_seo']); + + $editedData = $this->unsetKeys($editedData, ['seo_title', 'seo_description', 'seo_keywords']); + + if ($locale) { + $data[$locale] = $editedData; + $editedData = $data; + } + + return $editedData; + } + + /** + * Unset keys. + * + * @param array $keys + * @return array + */ + private function unsetKeys($data, $keys) + { + foreach ($keys as $key) { + unset($data[$key]); + } + + return $data; + } } \ No newline at end of file diff --git a/packages/Webkul/Core/src/Models/Channel.php b/packages/Webkul/Core/src/Models/Channel.php index 21e36e813..45741f123 100755 --- a/packages/Webkul/Core/src/Models/Channel.php +++ b/packages/Webkul/Core/src/Models/Channel.php @@ -2,13 +2,13 @@ namespace Webkul\Core\Models; -use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Storage; use Webkul\Category\Models\CategoryProxy; +use Webkul\Core\Eloquent\TranslatableModel; use Webkul\Inventory\Models\InventorySourceProxy; use Webkul\Core\Contracts\Channel as ChannelContract; -class Channel extends Model implements ChannelContract +class Channel extends TranslatableModel implements ChannelContract { protected $fillable = [ 'code', @@ -27,6 +27,15 @@ class Channel extends Model implements ChannelContract 'allowed_ips' ]; + public $translatedAttributes = [ + 'name', + 'description', + 'home_page_content', + 'footer_content', + 'maintenance_mode_text', + 'home_seo', + ]; + /** * Get the channel locales. */ diff --git a/packages/Webkul/Core/src/Models/ChannelTranslation.php b/packages/Webkul/Core/src/Models/ChannelTranslation.php new file mode 100644 index 000000000..864be3de3 --- /dev/null +++ b/packages/Webkul/Core/src/Models/ChannelTranslation.php @@ -0,0 +1,11 @@ +model->create($data); + $model = $this->getModel(); + + foreach (core()->getAllLocales() as $locale) { + foreach ($model->translatedAttributes as $attribute) { + if (isset($data[$attribute])) { + $data[$locale->code][$attribute] = $data[$attribute]; + } + } + } + + $channel = parent::create($data); $channel->locales()->sync($data['locales']); @@ -51,7 +61,7 @@ class ChannelRepository extends Repository { $channel = $this->find($id); - $channel->update($data); + parent::update($data, $id, $attribute); $channel->locales()->sync($data['locales']);