From a772b094981463f5ec4f7cb93e913d659ac27b43 Mon Sep 17 00:00:00 2001 From: Berg Pinheiro Date: Tue, 21 May 2024 12:40:55 -0300 Subject: [PATCH 1/4] Merger Brasil Contacts --- src/components/instance/profile/Privacy.vue | 1 + src/components/instance/settings/Chatwoot.vue | 20 +++++++++++++++++++ src/i18n/en.js | 4 +++- src/i18n/es.js | 2 ++ src/i18n/pt.js | 2 ++ 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/components/instance/profile/Privacy.vue b/src/components/instance/profile/Privacy.vue index 5d4b5ef..c26ed81 100644 --- a/src/components/instance/profile/Privacy.vue +++ b/src/components/instance/profile/Privacy.vue @@ -126,6 +126,7 @@ const defaultObj = () => ({ token: "", sign_msg: true, reopen_conversation: true, + merge_brazil_contacts: true, conversation_pending: false, import_contacts: false, import_messages: false, diff --git a/src/components/instance/settings/Chatwoot.vue b/src/components/instance/settings/Chatwoot.vue index 1748cef..b961264 100644 --- a/src/components/instance/settings/Chatwoot.vue +++ b/src/components/instance/settings/Chatwoot.vue @@ -148,6 +148,23 @@ +
+
+ + + +
({ sign_msg: true, sign_delimiter: "\n", reopen_conversation: true, + merge_brazil_contacts: true, conversation_pending: false, auto_create: undefined, import_contacts: false, @@ -304,6 +322,7 @@ export default { sign_msg: true, sign_delimiter: "\n", reopen_conversation: true, + merge_brazil_contacts: true, conversation_pending: false, import_contacts: false, import_messages: false, @@ -317,6 +336,7 @@ export default { sign_msg: true, sign_delimiter: "\n", reopen_conversation: true, + merge_brazil_contacts: true, conversation_pending: false, import_contacts: false, import_messages: false, diff --git a/src/i18n/en.js b/src/i18n/en.js index c84f9a8..7531cf3 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -74,7 +74,7 @@ export default { title: "Phone not connected", apiGenericError: "Could not load QR Code, if the error persists, restart the API and try again.", qr: "QR Code", - code: "C骴igo", + code: "C锟絛igo", }, options: { title: "Behavior", @@ -103,6 +103,8 @@ export default { signDelimiterHelp: "Delimiter used to separate the signature from the message (\\n for line break)", reopenConversation: "Reopen conversation", reopenConversationHelp: "Reopens the customer's conversation when he starts a new conversation instead of creating a new conversation", + mergeBrazilContacts: "Merge contacts from Brazil", + mergeBrazilContactsHelp: "Unifies phone contacts with the same number without or with the 9", conversationPending: "Start conversation as pending", conversationPendingHelp: "Starts the conversation as pending instead of open", autoCreate: "Create Inbox", diff --git a/src/i18n/es.js b/src/i18n/es.js index b9aac3d..6d68047 100644 --- a/src/i18n/es.js +++ b/src/i18n/es.js @@ -103,6 +103,8 @@ export default { signDelimiterHelp: "Delimitador utilizado para separar la firma del mensaje (\\n para salto de l铆nea)", reopenConversation: "Reabrir conversaci贸n", reopenConversationHelp: "Vuelve a abrir la conversaci贸n del cliente cuando inicia una nueva conversaci贸n en lugar de crear una nueva conversaci贸n.", + mergeBrazilContacts: "Fusionar contactos de Brasil", + mergeBrazilContactsHelp: "Unifica contactos telef贸nicos con el mismo n煤mero sin o con el 9", conversationPending: "Iniciar conversaci贸n en estado pendiente", conversationPendingHelp: "Inicia la conversaci贸n como pendiente en lugar de abierta", autoCreate: "Crear bandeja de entrada", diff --git a/src/i18n/pt.js b/src/i18n/pt.js index 6deca97..e8cbe5a 100644 --- a/src/i18n/pt.js +++ b/src/i18n/pt.js @@ -111,6 +111,8 @@ export default { reopenConversation: "Reabrir conversa", reopenConversationHelp: "Reabre a conversa do cliente quando ele inicia uma nova conversa em vez de criar uma nova conversa", + mergeBrazilContacts: "Mesclar contatos Do Brasil", + mergeBrazilContactsHelp: "Unifica os contatos de telefones do mesmo numero que que esteja sem ou com o 9", conversationPending: "Iniciar conversa como pendente", conversationPendingHelp: "Inicia a conversa como pendente ao inv茅s de aberta", From 4c2253080bdb2f46c318a809f91a5e7bcef3c204 Mon Sep 17 00:00:00 2001 From: Berg Pinheiro Date: Tue, 21 May 2024 12:49:10 -0300 Subject: [PATCH 2/4] =?UTF-8?q?Corre=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/instance/settings/Chatwoot.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/instance/settings/Chatwoot.vue b/src/components/instance/settings/Chatwoot.vue index b961264..2a072d0 100644 --- a/src/components/instance/settings/Chatwoot.vue +++ b/src/components/instance/settings/Chatwoot.vue @@ -148,7 +148,7 @@
-
+
-
+
Date: Tue, 21 May 2024 12:57:55 -0300 Subject: [PATCH 3/4] =?UTF-8?q?corre=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/instance/settings/Chatwoot.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/instance/settings/Chatwoot.vue b/src/components/instance/settings/Chatwoot.vue index 2a072d0..656b264 100644 --- a/src/components/instance/settings/Chatwoot.vue +++ b/src/components/instance/settings/Chatwoot.vue @@ -148,7 +148,7 @@
-
+
Date: Tue, 21 May 2024 13:26:26 -0300 Subject: [PATCH 4/4] Inbox name Chatwoot --- src/components/instance/settings/Chatwoot.vue | 12 ++++++++++++ src/i18n/en.js | 1 + src/i18n/es.js | 1 + src/i18n/pt.js | 1 + 4 files changed, 15 insertions(+) diff --git a/src/components/instance/settings/Chatwoot.vue b/src/components/instance/settings/Chatwoot.vue index 656b264..324b50a 100644 --- a/src/components/instance/settings/Chatwoot.vue +++ b/src/components/instance/settings/Chatwoot.vue @@ -129,6 +129,15 @@ placeholder="\n" style="min-width: 200px" > +
@@ -291,6 +300,7 @@ const defaultObj = () => ({ token: "", sign_msg: true, sign_delimiter: "\n", + name_inbox: "", reopen_conversation: true, merge_brazil_contacts: true, conversation_pending: false, @@ -321,6 +331,7 @@ export default { token: "", sign_msg: true, sign_delimiter: "\n", + name_inbox: "", reopen_conversation: true, merge_brazil_contacts: true, conversation_pending: false, @@ -335,6 +346,7 @@ export default { token: "", sign_msg: true, sign_delimiter: "\n", + name_inbox: "", reopen_conversation: true, merge_brazil_contacts: true, conversation_pending: false, diff --git a/src/i18n/en.js b/src/i18n/en.js index 7531cf3..9e2d605 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -101,6 +101,7 @@ export default { signMsgHelp: "Adds the agent name at the first line of the message", signDelimiter: "Signature delimiter", signDelimiterHelp: "Delimiter used to separate the signature from the message (\\n for line break)", + nameInbox: "Nombre de la bandeja de entrada de Chatwoot", reopenConversation: "Reopen conversation", reopenConversationHelp: "Reopens the customer's conversation when he starts a new conversation instead of creating a new conversation", mergeBrazilContacts: "Merge contacts from Brazil", diff --git a/src/i18n/es.js b/src/i18n/es.js index 6d68047..d645941 100644 --- a/src/i18n/es.js +++ b/src/i18n/es.js @@ -101,6 +101,7 @@ export default { signMsgHelp: "Agrega el nombre del agente en la primera l铆nea del mensaje.", signDelimiter: "Delimitador de firma", signDelimiterHelp: "Delimitador utilizado para separar la firma del mensaje (\\n para salto de l铆nea)", + nameInbox: "Chatwoot Inbox Name", reopenConversation: "Reabrir conversaci贸n", reopenConversationHelp: "Vuelve a abrir la conversaci贸n del cliente cuando inicia una nueva conversaci贸n en lugar de crear una nueva conversaci贸n.", mergeBrazilContacts: "Fusionar contactos de Brasil", diff --git a/src/i18n/pt.js b/src/i18n/pt.js index e8cbe5a..9616b62 100644 --- a/src/i18n/pt.js +++ b/src/i18n/pt.js @@ -108,6 +108,7 @@ export default { signDelimiter: "Separador da assinatura da mensagem", signDelimiterHelp: "Delimitador utilizado para separar a assinatura da mensagem (\\n para quebra de linha)", + nameInbox: "Nome da Caixa no Chatwoot", reopenConversation: "Reabrir conversa", reopenConversationHelp: "Reabre a conversa do cliente quando ele inicia uma nova conversa em vez de criar uma nova conversa",