Merge pull request #708 from jitendra-webkul/master

Issue #701 fixed
krayin · Nov 15, 2021 · 42ac116 · 42ac116
2 parents d2339af + e637bf0
commit 42ac116
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/packages/Webkul/Admin/src/Resources/views/mail/view.blade.php b/packages/Webkul/Admin/src/Resources/views/mail/view.blade.php
@@ -170,7 +170,7 @@ class="lead-form"
                     <tab name="{{ __('admin::app.leads.contact-person') }}">
                         @include('admin::leads.common.contact', ['formScope' => 'lead-form.'])
 
-                        <contact-component></contact-component>
+                        <contact-component :data='@json(old('person'))'></contact-component>
                     </tab>
 
                     {!! view_render_event('admin.mail.view.actions.leads.create.form_controls.contact_person.after', ['email' => $email]) !!}
@@ -181,7 +181,7 @@ class="lead-form"
                     <tab name="{{ __('admin::app.leads.products') }}">
                         @include('admin::leads.common.products', ['formScope' => 'lead-form.'])
 
-                        <product-list></product-list>
+                        <product-list :data='@json(old('products'))'></product-list>
                     </tab>
 
                     {!! view_render_event('admin.mail.view.actions.leads.create.form_controls.products.after', ['email' => $email]) !!}
@@ -719,6 +719,26 @@ class="control"
                 @endif
             },
 
+            mounted: function() {
+                if (! Array.isArray(window.serverErrors)) {
+                    var self = this;
+
+                    if (("{{ old('lead_pipeline_stage_id') }}")) {
+                        this.$root.openModal('addLeadModal');
+
+                        setTimeout(() => {
+                            self.$root.addServerErrors('lead-form');
+                        });
+                    } else {
+                        this.$root.openModal('addPersonModal');
+
+                        setTimeout(() => {
+                            self.$root.addServerErrors('person-form');
+                        });
+                    }
+                }
+            },
+
             methods: {
                 search: debounce(function (type) {
                     this.is_searching[type] = true;