diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php index 387b1a9bc..43b3ca664 100644 --- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php @@ -611,6 +611,7 @@ return [ 'type' => 'الصفة نوع', 'text' => 'نص', 'textarea' => 'تيكستاريا', + 'enable-wysiwyg' => 'Enable Wysiwyg Editor', 'price' => 'السعر', 'boolean' => 'قيمة منطقية', 'select' => 'يختار', diff --git a/packages/Webkul/Admin/src/Resources/lang/de/app.php b/packages/Webkul/Admin/src/Resources/lang/de/app.php index 8c48dc6a4..a0ec55261 100755 --- a/packages/Webkul/Admin/src/Resources/lang/de/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/de/app.php @@ -602,6 +602,7 @@ return [ 'type' => 'Attribut-Typ', 'text' => 'Text', 'textarea' => 'Textarea', + 'enable-wysiwyg' => 'Enable Wysiwyg Editor', 'price' => 'Preis', 'boolean' => 'Boolean', 'select' => 'Select', diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 6538653a1..92ccf0a85 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -622,6 +622,7 @@ return [ 'type' => 'Attribute Type', 'text' => 'Text', 'textarea' => 'Textarea', + 'enable-wysiwyg' => 'Enable Wysiwyg Editor', 'price' => 'Price', 'boolean' => 'Boolean', 'select' => 'Select', diff --git a/packages/Webkul/Admin/src/Resources/lang/es/app.php b/packages/Webkul/Admin/src/Resources/lang/es/app.php index 6f0b6c37f..85c5ee636 100644 --- a/packages/Webkul/Admin/src/Resources/lang/es/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/es/app.php @@ -623,6 +623,7 @@ return [ 'type' => 'Tipo de atributo', 'text' => 'Texto', 'textarea' => 'Área de texto', + 'enable-wysiwyg' => 'Enable Wysiwyg Editor', 'price' => 'Precio', 'boolean' => 'Booleano', 'select' => 'Lista de selección', diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php index c4b7402b4..2dd4fb8c3 100644 --- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php @@ -600,6 +600,7 @@ return [ 'type' => 'نوع ویژگی', 'text' => 'Text', 'textarea' => 'Textarea', + 'enable-wysiwyg' => 'Enable Wysiwyg Editor', 'price' => 'قیمت', 'boolean' => 'Boolean', 'select' => 'Select', diff --git a/packages/Webkul/Admin/src/Resources/lang/fr/app.php b/packages/Webkul/Admin/src/Resources/lang/fr/app.php index c635b81a9..2a27b5aff 100644 --- a/packages/Webkul/Admin/src/Resources/lang/fr/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/fr/app.php @@ -622,6 +622,7 @@ return [ 'type' => 'Type d\'attribut', 'text' => 'Texte', 'textarea' => 'Zone de texte', + 'enable-wysiwyg' => 'Enable Wysiwyg Editor', 'price' => 'Prix', 'boolean' => 'booléen', 'select' => 'Sélectionner', diff --git a/packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php b/packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php index 4dfb91689..a8d774e70 100644 --- a/packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php @@ -622,6 +622,7 @@ return [ 'type' => 'विशेषता प्रकार', 'text' => 'मूलपाठ', 'textarea' => 'टेक्सटेरिया', + 'enable-wysiwyg' => 'Enable Wysiwyg Editor', 'price' => 'कीमत', 'boolean' => 'बूलियन', 'select' => 'चुनते हैं', diff --git a/packages/Webkul/Admin/src/Resources/lang/it/app.php b/packages/Webkul/Admin/src/Resources/lang/it/app.php index 43f3f274d..475dceaaa 100644 --- a/packages/Webkul/Admin/src/Resources/lang/it/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/it/app.php @@ -600,6 +600,7 @@ return [ 'type' => 'Attribute Tipo', 'text' => 'Text', 'textarea' => 'Textarea', + 'enable-wysiwyg' => 'Enable Wysiwyg Editor', 'price' => 'Prezzo', 'boolean' => 'Boolean', 'select' => 'Select', diff --git a/packages/Webkul/Admin/src/Resources/lang/nl/app.php b/packages/Webkul/Admin/src/Resources/lang/nl/app.php index 9f3c7c306..f58f226ed 100644 --- a/packages/Webkul/Admin/src/Resources/lang/nl/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/nl/app.php @@ -598,6 +598,7 @@ return [ 'type' => 'Attribute Type', 'text' => 'Text', 'textarea' => 'Textarea', + 'enable-wysiwyg' => 'Enable Wysiwyg Editor', 'price' => 'Prijs', 'boolean' => 'Boolean', 'select' => 'Select', diff --git a/packages/Webkul/Admin/src/Resources/lang/pl/app.php b/packages/Webkul/Admin/src/Resources/lang/pl/app.php index 4113b8743..2d0f493e5 100644 --- a/packages/Webkul/Admin/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pl/app.php @@ -598,6 +598,7 @@ return [ 'type' => 'Rodzaj atrybutu', 'text' => 'Tekst', 'textarea' => 'Pole tekstowe', + 'enable-wysiwyg' => 'Enable Wysiwyg Editor', 'price' => 'Cena', 'boolean' => 'Boolean', 'select' => 'Wybierz', diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php index f618862ee..811a49189 100755 --- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php @@ -597,6 +597,7 @@ return [ 'type' => 'Tipo do Atributo', 'text' => 'Texto', 'textarea' => 'Área de Texto', + 'enable-wysiwyg' => 'Enable Wysiwyg Editor', 'price' => 'Preço', 'boolean' => 'Boleano', 'select' => 'Caixa de Seleção', diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php index 8d274750e..ac9cc9647 100644 --- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php @@ -605,6 +605,7 @@ return [ 'type' => 'Nitelik Tipi', 'text' => 'Text', 'textarea' => 'Textarea', + 'enable-wysiwyg' => 'Enable Wysiwyg Editor', 'price' => 'Fiyat', 'boolean' => 'Boolean', 'select' => 'Seçim', diff --git a/packages/Webkul/Admin/src/Resources/lang/zh_CN/app.php b/packages/Webkul/Admin/src/Resources/lang/zh_CN/app.php index e8e74fac9..600830ef0 100644 --- a/packages/Webkul/Admin/src/Resources/lang/zh_CN/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/zh_CN/app.php @@ -607,6 +607,7 @@ return [ 'type' => '属性类型', 'text' => '文本', 'textarea' => '文本框', + 'enable-wysiwyg' => 'Enable Wysiwyg Editor', 'price' => '价格', 'boolean' => '布尔值', 'select' => '选择', 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 1c2ae527d..87fe97de4 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 @@ -58,6 +58,15 @@ +
+ + + +
+ {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.general.controls.after') !!} @@ -347,6 +356,12 @@ } else { $('#options').parent().removeClass('hide') } + + if (['textarea'].indexOf($(e.target).val()) > -1) { + $('#enable_wysiwyg').parents('.control-group').removeClass('hide') + } else { + $('#enable_wysiwyg').parents('.control-group').addClass('hide') + } }) }); 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', diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php index 953c22159..652b7caec 100755 --- a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php +++ b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php @@ -88,6 +88,8 @@ class AttributeRepository extends Repository Event::dispatch('catalog.attribute.update.before', $id); + $data['enable_wysiwyg'] = ! isset($data['enable_wysiwyg']) ? 0 : 1; + $attribute->update($data); if (in_array($attribute->type, ['select', 'multiselect', 'checkbox'])) { diff --git a/packages/Webkul/BookingProduct/src/Type/Booking.php b/packages/Webkul/BookingProduct/src/Type/Booking.php index 81766d7e1..647d7645e 100644 --- a/packages/Webkul/BookingProduct/src/Type/Booking.php +++ b/packages/Webkul/BookingProduct/src/Type/Booking.php @@ -203,6 +203,7 @@ class Booking extends Virtual $data['quantity'] = $qty; $data['booking']['ticket_id'] = $ticketId; + $data['booking']['slot'] = implode('-', [$bookingProduct->available_from->timestamp, $bookingProduct->available_to->timestamp]); $cartProducts = parent::prepareForCart($data); if (is_string($cartProducts)) {