Issue krayin#720 fixed

jitendra-webkul · Nov 19, 2021 · 1a592e0 · 1a592e0
1 parent a3340c0
commit 1a592e0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/packages/Webkul/Admin/src/Resources/views/activities/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/activities/edit.blade.php
@@ -126,6 +126,9 @@ class="control"
 
                                 <input name="location" class="control" value="{{ old('location') ?: $activity->location }}"/>
                             </div>
+
+                            <div class="form-group video-conference">
+                            </div>
 
                             <div class="form-group">
                                 <label for="comment">{{ __('admin::app.activities.description') }}</label>

diff --git a/packages/Webkul/Admin/src/Resources/views/leads/view/activity-action.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/view/activity-action.blade.php
@@ -146,6 +146,9 @@ class="control"
                             <input name="location" class="control"/>
                         </div>
 
+                        <div class="form-group video-conference">
+                        </div>
+
                         <div class="form-group">
                             <label for="comment">{{ __('admin::app.leads.description') }}</label>
 

diff --git a/packages/Webkul/Admin/src/Resources/views/leads/view/activity-list.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/view/activity-list.blade.php
@@ -85,8 +85,7 @@
                             </a>
                         </div>
 
-                        <div class="comment" v-if="activity.comment">
-                            @{{ activity.comment }}
+                        <div class="comment" v-if="activity.comment" v-html="activity.comment">
                         </div>
 
                         <div class="info">

diff --git a/packages/Webkul/Workflow/src/Helpers/Entity/Activity.php b/packages/Webkul/Workflow/src/Helpers/Entity/Activity.php
@@ -120,6 +120,12 @@ public function getAttributes($entityType, $skipAttributes = [])
                         'name' => 'File',
                     ],
                 ]),
+            ], [
+                'id'          => 'location',
+                'type'        => 'text',
+                'name'        => 'Location',
+                'lookup_type' => null,
+                'options'     => collect([]),
             ], [
                 'id'          => 'comment',
                 'type'        => 'textarea',