scottk/chatwoot
1
0
Fork 0
mirror of https://github.com/lingble/chatwoot.git synced 2025-11-03 20:48:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Disable form if pre-chat disabled on new conversation (#6813)

Browse Source
This commit is contained in:
Muhsin Keloth
2023-04-03 12:03:58 +05:30
committed by GitHub
parent 44f73e044a
commit 363ffdbde3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/javascript/widget/components/PreChat/Form.vue
View File

@@ -63,12 +63,13 @@ import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
import { isEmptyObject } from 'widget/helpers/utils'; import { isEmptyObject } from 'widget/helpers/utils';
import routerMixin from 'widget/mixins/routerMixin'; import routerMixin from 'widget/mixins/routerMixin';
import darkModeMixin from 'widget/mixins/darkModeMixin'; import darkModeMixin from 'widget/mixins/darkModeMixin';
import configMixin from 'widget/mixins/configMixin';
export default { export default {
components: { components: {
CustomButton, CustomButton,
Spinner, Spinner,
}, },
mixins: [routerMixin, darkModeMixin, messageFormatterMixin], mixins: [routerMixin, darkModeMixin, messageFormatterMixin, configMixin],
props: { props: {
options: { options: {
type: Object, type: Object,
@@ -101,7 +102,7 @@ export default {
return !isEmptyObject(this.activeCampaign); return !isEmptyObject(this.activeCampaign);
}, },
shouldShowHeaderMessage() { shouldShowHeaderMessage() {
return this.hasActiveCampaign || this.options.preChatMessage; return this.hasActiveCampaign || this.preChatFormEnabled;
}, },
headerMessage() { headerMessage() {
if (this.hasActiveCampaign) { if (this.hasActiveCampaign) {
@@ -110,7 +111,7 @@ export default {
return this.options.preChatMessage; return this.options.preChatMessage;
}, },
preChatFields() { preChatFields() {
return this.options?.preChatFields || []; return this.preChatFormEnabled ? this.options.preChatFields : [];
}, },
filteredPreChatFields() { filteredPreChatFields() {
const isUserEmailAvailable = !!this.currentUser.email; const isUserEmailAvailable = !!this.currentUser.email;