From 1671fefc4b2dfc3a55cecedd6528dc4b7aefc1bf Mon Sep 17 00:00:00 2001 From: jitendra Date: Fri, 11 Mar 2022 17:01:44 +0530 Subject: [PATCH] Issue #1238 fixed --- .../views/catalog/attributes/edit.blade.php | 12 +++++++ .../views/catalog/products/edit.blade.php | 2 +- .../products/field-types/textarea.blade.php | 2 +- ...ble_wysiwyg_column_in_attributes_table.php | 32 +++++++++++++++++++ .../Webkul/Attribute/src/Models/Attribute.php | 1 + 5 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 packages/Webkul/Attribute/src/Database/Migrations/2022_03_11_133408_add_enable_wysiwyg_column_in_attributes_table.php diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php index c19f3f1fa..2c4ee31eb 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php @@ -93,6 +93,18 @@ + + @if ($attribute->type == 'textarea') +
+ + + +
+ @endif + {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.general.controls.after', ['attribute' => $attribute]) !!} diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php index 606f89d0c..cf360cd2d 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php @@ -236,7 +236,7 @@ }); tinyMCEHelper.initTinyMCE({ - selector: 'textarea#description, textarea#short_description', + selector: 'textarea.enable-wysiwyg, textarea.enable-wysiwyg', height: 200, width: "100%", plugins: 'image imagetools media wordcount save fullscreen code table lists link hr', diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/textarea.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/textarea.blade.php index 872f31628..894e5f95d 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/textarea.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/textarea.blade.php @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/Webkul/Attribute/src/Database/Migrations/2022_03_11_133408_add_enable_wysiwyg_column_in_attributes_table.php b/packages/Webkul/Attribute/src/Database/Migrations/2022_03_11_133408_add_enable_wysiwyg_column_in_attributes_table.php new file mode 100644 index 000000000..406a0d863 --- /dev/null +++ b/packages/Webkul/Attribute/src/Database/Migrations/2022_03_11_133408_add_enable_wysiwyg_column_in_attributes_table.php @@ -0,0 +1,32 @@ +boolean('enable_wysiwyg')->default(0); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('attributes', function (Blueprint $table) { + $table->dropColumn('enable_wysiwyg'); + }); + } +} diff --git a/packages/Webkul/Attribute/src/Models/Attribute.php b/packages/Webkul/Attribute/src/Models/Attribute.php index 4018d5102..3379a8f8a 100755 --- a/packages/Webkul/Attribute/src/Models/Attribute.php +++ b/packages/Webkul/Attribute/src/Models/Attribute.php @@ -20,6 +20,7 @@ class Attribute extends TranslatableModel implements AttributeContract 'code', 'admin_name', 'type', + 'enable_wysiwyg', 'position', 'is_required', 'is_unique',