From cc3323c55d9fa6d856fc17e56cca10763df9e680 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Mon, 29 Apr 2019 15:51:15 +0530
Subject: [PATCH] issue #891 description issue

---
 .../views/catalog/categories/create.blade.php | 51 ++++++++++++++-----
 .../views/catalog/categories/edit.blade.php   | 49 ++++++++++++++++--
 2 files changed, 82 insertions(+), 18 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php
index a1b838e53..13bffc708 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php
@@ -93,11 +93,7 @@
                                 <span class="control-error" v-if="errors.has('display_mode')">@{{ errors.first('display_mode') }}</span>
                             </div>
 
-                            <div class="control-group" :class="[errors.has('description') ? 'has-error' : '']">
-                                <label for="description" id="descript-label" class="required">{{ __('admin::app.catalog.categories.description') }}</label>
-                                <textarea v-validate="''"  class="control" id="description" name="description" data-vv-as="&quot;{{ __('admin::app.catalog.categories.description') }}&quot;">{{ old('description') }}</textarea>
-                                <span class="control-error" v-if="errors.has('description')">@{{ errors.first('description') }}</span>
-                            </div>
+                            <description></description>
 
                             <div class="control-group">
                                 <label>{{ __('admin::app.catalog.categories.image') }}
@@ -179,6 +175,16 @@
 @push('scripts')
     <script src="{{ asset('vendor/webkul/admin/assets/js/tinyMCE/tinymce.min.js') }}"></script>
 
+    <script type="text/x-template" id="description-template">
+
+        <div class="control-group" :class="[errors.has('description') ? 'has-error' : '']">
+            <label for="description" :class="isRequired ? 'required' : ''">{{ __('admin::app.catalog.categories.description') }}</label>
+            <textarea v-validate="isRequired ? 'required' : ''"  class="control" id="description" name="description" data-vv-as="&quot;{{ __('admin::app.catalog.categories.description') }}&quot;">{{ old('description') }}</textarea>
+            <span class="control-error" v-if="errors.has('description')">@{{ errors.first('description') }}</span>
+        </div>
+
+    </script>
+
     <script>
         $(document).ready(function () {
             tinymce.init({
@@ -189,14 +195,33 @@
                 toolbar1: 'formatselect | bold italic strikethrough forecolor backcolor | link | alignleft aligncenter alignright alignjustify | numlist bullist outdent indent  | removeformat | code',
                 image_advtab: true
             });
-
-            $('#display_mode').on('change', function (e) {
-                if ($('#display_mode').val() != 'products_only') {
-                    $("#descript-label").addClass("required");
-                } else {
-                    $("#descript-label").removeClass("required");
-                }
-            })
         });
+
+        Vue.component('description', {
+
+            template: '#description-template',
+
+            inject: ['$validator'],
+
+            data() {
+                return {
+                    isRequired: true,
+                }
+            },
+
+            created () {
+                var this_this = this;
+
+                $(document).ready(function () {
+                    $('#display_mode').on('change', function (e) {
+                        if ($('#display_mode').val() != 'products_only') {
+                            this_this.isRequired = true;
+                        } else {
+                            this_this.isRequired = false;
+                        }
+                    })
+                });
+            }
+        })
     </script>
 @endpush
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php
index 50c89daaf..9d4635160 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php
@@ -106,11 +106,7 @@
                                 <span class="control-error" v-if="errors.has('display_mode')">@{{ errors.first('display_mode') }}</span>
                             </div>
 
-                            <div class="control-group" :class="[errors.has('{{$locale}}[description]') ? 'has-error' : '']">
-                                <label for="description">{{ __('admin::app.catalog.categories.description') }}</label>
-                                <textarea class="control" id="description" name="{{$locale}}[description]" data-vv-as="&quot;{{ __('admin::app.catalog.categories.description') }}&quot;">{{ old($locale)['description'] ?: $category->translate($locale)['description'] }}</textarea>
-                                <span class="control-error" v-if="errors.has('{{$locale}}[description]')">@{{ errors.first('{!!$locale!!}[description]') }}</span>
-                            </div>
+                            <description></description>
 
                             <div class="control-group">
                                 <label>{{ __('admin::app.catalog.categories.image') }} </label>
@@ -192,6 +188,16 @@
 @push('scripts')
     <script src="{{ asset('vendor/webkul/admin/assets/js/tinyMCE/tinymce.min.js') }}"></script>
 
+    <script type="text/x-template" id="description-template">
+
+        <div class="control-group" :class="[errors.has('{{$locale}}[description]') ? 'has-error' : '']">
+            <label for="description" :class="isRequired ? 'required' : ''">{{ __('admin::app.catalog.categories.description') }}</label>
+            <textarea v-validate="isRequired ? 'required' : ''" class="control" id="description" name="{{$locale}}[description]" data-vv-as="&quot;{{ __('admin::app.catalog.categories.description') }}&quot;">{{ old($locale)['description'] ?: $category->translate($locale)['description'] }}</textarea>
+            <span class="control-error" v-if="errors.has('{{$locale}}[description]')">@{{ errors.first('{!!$locale!!}[description]') }}</span>
+        </div>
+
+    </script>
+
     <script>
         $(document).ready(function () {
             tinymce.init({
@@ -203,5 +209,38 @@
                 image_advtab: true
             });
         });
+
+        Vue.component('description', {
+
+            template: '#description-template',
+
+            inject: ['$validator'],
+
+            data() {
+                return {
+                    isRequired: true,
+                }
+            },
+
+            created () {
+                var this_this = this;
+
+                $(document).ready(function () {
+                    $('#display_mode').on('change', function (e) {
+                        if ($('#display_mode').val() != 'products_only') {
+                            this_this.isRequired = true;
+                        } else {
+                            this_this.isRequired = false;
+                        }
+                    })
+
+                    if ($('#display_mode').val() != 'products_only') {
+                        this_this.isRequired = true;
+                    } else {
+                        this_this.isRequired = false;
+                    }
+                });
+            }
+        })
     </script>
 @endpush
\ No newline at end of file