Merge pull request #757 from jitendra-webkul/master

Issue #710 fixed
krayin · Nov 25, 2021 · 003545e · 003545e
2 parents 488cb25 + c7aa3e9
commit 003545e
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 0 deletions.
diff --git a/packages/Webkul/Activity/src/Models/Activity.php b/packages/Webkul/Activity/src/Models/Activity.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Webkul\User\Models\UserProxy;
+use Webkul\Lead\Models\LeadProxy;
 use Webkul\Activity\Contracts\Activity as ActivityContract;
 
 class Activity extends Model implements ActivityContract
@@ -57,4 +58,12 @@ public function file()
     {
         return $this->hasOne(FileProxy::modelClass(), 'activity_id');
     }
+
+    /**
+     * The leads that belong to the activity.
+     */
+    public function leads()
+    {
+        return $this->belongsToMany(LeadProxy::modelClass(), 'lead_activities');
+    }
 }
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -343,6 +343,7 @@
             'to'                   => 'To',
             'location'             => 'Location',
             'participants'         => 'Participants',
+            'lead'                 => 'Lead',
             'duration-overlapping' => 'Participants have another meeting at this time. Do you want to continue?',
             'file-upload-success'  => 'File(s) uploaded successfully.',
             'file-upload-error'    => 'File(s) can not be uploaded.',

diff --git a/packages/Webkul/Admin/src/Resources/views/activities/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/activities/edit.blade.php
@@ -141,6 +141,30 @@ class="control"
                                 <multi-lookup-component :data='@json($activity->participants)'></multi-lookup-component>
                             </div>
 
+                            <div class="form-group">
+                                <label for="validation">{{ __('admin::app.activities.lead') }}</label>
+
+                                @include('admin::common.custom-attributes.edit.lookup')
+
+                                @php
+                                    $lookUpEntityData = app('Webkul\Attribute\Repositories\AttributeRepository')
+                                        ->getLookUpEntity(
+                                            'leads',
+                                            old('lead_id')
+                                                ?: (
+                                                    ($lead = $activity->leads()->first())
+                                                    ? $lead->id
+                                                    : null
+                                                )
+                                            );
+                                @endphp
+
+                                <lookup-component
+                                    :attribute="{'code': 'lead_id', 'name': 'Lead', 'lookup_type': 'leads'}"
+                                    :data='@json($lookUpEntityData)'
+                                ></lookup-component>
+                            </div>
+
                             {!! view_render_event('admin.activities.edit.form_controls.after', ['activity' => $activity]) !!}
 
                         </div>