Correção de conflito do merge
adriano
|
|
@ -106,10 +106,7 @@ export const update = async (
|
|||
const { farewellMessage } = whatsapp;
|
||||
|
||||
if (farewellMessage) {
|
||||
await SendWhatsAppMessage({
|
||||
body: farewellMessage,
|
||||
ticket
|
||||
});
|
||||
await SendWhatsAppMessage({ body: farewellMessage, ticket });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ export const initWbot = async (whatsapp: Whatsapp): Promise<Session> => {
|
|||
resolve(wbot);
|
||||
});
|
||||
} catch (err) {
|
||||
logger.error(err);
|
||||
logger.error(`${err}`);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
|
@ -160,6 +160,6 @@ export const removeWbot = (whatsappId: number): void => {
|
|||
sessions.splice(sessionIndex, 1);
|
||||
}
|
||||
} catch (err) {
|
||||
logger.error(err);
|
||||
logger.error(`${err}`);
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -20,10 +20,9 @@ export const StartWhatsAppSession = async (
|
|||
const wbot = await initWbot(whatsapp);
|
||||
wbotMessageListener(wbot);
|
||||
wbotMonitor(wbot, whatsapp);
|
||||
} catch (err) {
|
||||
|
||||
console.error(err )
|
||||
logger.error(err);
|
||||
} catch (err) {
|
||||
|
||||
logger.error(`${err}`);
|
||||
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 638 B After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
|
@ -1,18 +1,18 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>GrupoHit</title>
|
||||
<title>OmniHit</title>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
|
||||
/>
|
||||
<link rel="apple-touch-icon" href="%PUBLIC_URL%/apple-touch-icon.png" />
|
||||
|
||||
<!--<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />-->
|
||||
<link rel="icon" href="http://www.hittelco.com/images/favicon.png" />
|
||||
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
|
||||
<!--<link rel="icon" href="https://www.hittelco.com/images/favicon.png" />-->
|
||||
|
||||
<!--<link rel=”shortcut icon” href=”%PUBLIC_URL%/favicon.ico”>-->
|
||||
<link rel="shortcut icon" href="http://www.hittelco.com/images/favicon.png" />
|
||||
<link rel=”shortcut icon” href=”%PUBLIC_URL%/favicon.ico”>
|
||||
<!--<link rel="shortcut icon" href="http://www.hittelco.com/images/favicon.png" />-->
|
||||
|
||||
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"short_name": "GrupoHit",
|
||||
"name": "GrupoHit",
|
||||
"short_name": "OmniHit",
|
||||
"name": "OmniHit",
|
||||
"icons": [
|
||||
{
|
||||
"src": "favicon.ico",
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ const TicketActionButtons = ({ ticket }) => {
|
|||
>
|
||||
{i18n.t("messagesList.header.buttons.return")}
|
||||
</ButtonWithSpinner>
|
||||
|
||||
<ButtonWithSpinner
|
||||
loading={loading}
|
||||
size="small"
|
||||
|
|
@ -91,6 +92,7 @@ const TicketActionButtons = ({ ticket }) => {
|
|||
>
|
||||
{i18n.t("messagesList.header.buttons.resolve")}
|
||||
</ButtonWithSpinner>
|
||||
|
||||
<IconButton onClick={handleOpenTicketOptionsMenu}>
|
||||
<MoreVert />
|
||||
</IconButton>
|
||||
|
|
|
|||
|
|
@ -218,9 +218,9 @@ const LoggedInLayout = ({ children }) => {
|
|||
color="inherit"
|
||||
noWrap
|
||||
className={classes.title}
|
||||
>
|
||||
|
||||
BETAGROUP
|
||||
>
|
||||
|
||||
OMNIHIT
|
||||
|
||||
</Typography>
|
||||
{user.id && <NotificationsPopOver />}
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ const Login = () => {
|
|||
component={RouterLink}
|
||||
to="/signup"
|
||||
>
|
||||
{i18n.t("login.buttons.register")}
|
||||
{/* {i18n.t("login.buttons.register")} */}
|
||||
</Link>
|
||||
|
||||
</Grid>
|
||||
|
|
|
|||