Skip to content

Whats pro #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jrrcdev merged 9 commits into from
May 7, 2020
Merged

Whats pro #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b5fecac
chat restrition
jrrcdev Mar 21, 2020
5787124
fix query
jrrcdev Mar 27, 2020
7c6b84c
log env
jrrcdev Mar 28, 2020
46c0a28
remove logs
jrrcdev Apr 3, 2020
01b1709
Merge pull request #2 from Loop3/develop
jrrcdev Apr 3, 2020
57a3d82
Merge pull request #5 from Loop3/develop
jrrcdev Apr 3, 2020
1f44d2a
Merge branch 'WhatsPro' of https://github.com/loop3/erxes into WhatsPro
jrrcdev Apr 4, 2020
e790917
Update
jrrcdev Apr 4, 2020
5570ec6
Merge branch 'ChatBot' into WhatsPro
jrrcdev Apr 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ui/src/modules/settings/general/graphql/queries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const configsGetEnv = `
query configsGetEnv {
configsGetEnv {
USE_BRAND_RESTRICTIONS
USE_CHAT_RESTRICTIONS
}
}
`;
Expand Down
8 changes: 4 additions & 4 deletions ui/src/modules/settings/integrations/components/store/Entry.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,16 +299,16 @@ function renderCreate(createUrl, createModal) {
);
}

if (createModal === INTEGRATION_KINDS.WHATSAPP) {
if (createModal === INTEGRATION_KINDS.WHATSPRO) {
const trigger = <h6>+ {__('Add')}</h6>;

const content = props => <WhatsappForm {...props} />;
const content = props => <WhatsProForm {...props} />;

return (
<ModalTrigger title="Add WhatsApp" trigger={trigger} content={content} />
<ModalTrigger title="Add WhatsPro" trigger={trigger} content={content} />
);
}

return <Link to={createUrl}>+ {__('Add')}</Link>;
}

Expand Down
2 changes: 1 addition & 1 deletion ui/src/modules/settings/integrations/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export type IntegrationTypes =
| 'smooch-telegram'
| 'smooch-viber'
| 'smooch-line'
| 'smooch-twilio';
| 'smooch-twilio'
| 'whatspro';

export type IntegrationsQueryResponse = {
Expand Down