Resolve more Phone Lib issues.
This commit is contained in:
@@ -32872,6 +32872,27 @@
|
|||||||
<folder_node>
|
<folder_node>
|
||||||
<name>templates</name>
|
<name>templates</name>
|
||||||
<children>
|
<children>
|
||||||
|
<concept_node>
|
||||||
|
<name>anticipated_revenue</name>
|
||||||
|
<definition_loaded>false</definition_loaded>
|
||||||
|
<description></description>
|
||||||
|
<comment></comment>
|
||||||
|
<default_text></default_text>
|
||||||
|
<translations>
|
||||||
|
<translation>
|
||||||
|
<language>en-US</language>
|
||||||
|
<approved>false</approved>
|
||||||
|
</translation>
|
||||||
|
<translation>
|
||||||
|
<language>es-MX</language>
|
||||||
|
<approved>false</approved>
|
||||||
|
</translation>
|
||||||
|
<translation>
|
||||||
|
<language>fr-CA</language>
|
||||||
|
<approved>false</approved>
|
||||||
|
</translation>
|
||||||
|
</translations>
|
||||||
|
</concept_node>
|
||||||
<concept_node>
|
<concept_node>
|
||||||
<name>attendance_detail</name>
|
<name>attendance_detail</name>
|
||||||
<definition_loaded>false</definition_loaded>
|
<definition_loaded>false</definition_loaded>
|
||||||
|
|||||||
@@ -61,8 +61,12 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
|
|||||||
{
|
{
|
||||||
name: values.key,
|
name: values.key,
|
||||||
variables: {
|
variables: {
|
||||||
...(start ? { start: moment(start).format("YYYY-MM-DD") } : {}),
|
...(start
|
||||||
...(end ? { end: moment(end).format("YYYY-MM-DD") } : {}),
|
? { start: moment(start).startOf("day").format("YYYY-MM-DD") }
|
||||||
|
: {}),
|
||||||
|
...(end
|
||||||
|
? { end: moment(end).endOf("day").format("YYYY-MM-DD") }
|
||||||
|
: {}),
|
||||||
...(id ? { id: id } : {}),
|
...(id ? { id: id } : {}),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1982,6 +1982,7 @@
|
|||||||
"vendor": "Vendor"
|
"vendor": "Vendor"
|
||||||
},
|
},
|
||||||
"templates": {
|
"templates": {
|
||||||
|
"anticipated_revenue": "Anticipated Revenue",
|
||||||
"attendance_detail": "Attendance (All Employees)",
|
"attendance_detail": "Attendance (All Employees)",
|
||||||
"attendance_employee": "Employee Attendance",
|
"attendance_employee": "Employee Attendance",
|
||||||
"attendance_summary": "Attendance Summary (All Employees)",
|
"attendance_summary": "Attendance Summary (All Employees)",
|
||||||
|
|||||||
@@ -1982,6 +1982,7 @@
|
|||||||
"vendor": ""
|
"vendor": ""
|
||||||
},
|
},
|
||||||
"templates": {
|
"templates": {
|
||||||
|
"anticipated_revenue": "",
|
||||||
"attendance_detail": "",
|
"attendance_detail": "",
|
||||||
"attendance_employee": "",
|
"attendance_employee": "",
|
||||||
"attendance_summary": "",
|
"attendance_summary": "",
|
||||||
|
|||||||
@@ -1982,6 +1982,7 @@
|
|||||||
"vendor": ""
|
"vendor": ""
|
||||||
},
|
},
|
||||||
"templates": {
|
"templates": {
|
||||||
|
"anticipated_revenue": "",
|
||||||
"attendance_detail": "",
|
"attendance_detail": "",
|
||||||
"attendance_employee": "",
|
"attendance_employee": "",
|
||||||
"attendance_summary": "",
|
"attendance_summary": "",
|
||||||
|
|||||||
@@ -1238,6 +1238,18 @@ export const TemplateList = (type, context) => {
|
|||||||
field: i18n.t("scoreboard.fields.date"),
|
field: i18n.t("scoreboard.fields.date"),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
anticipated_revenue: {
|
||||||
|
title: i18n.t("reportcenter.templates.anticipated_revenue"),
|
||||||
|
description: "",
|
||||||
|
subject: i18n.t("reportcenter.templates.anticipated_revenue"),
|
||||||
|
key: "anticipated_revenue",
|
||||||
|
//idtype: "vendor",
|
||||||
|
disabled: false,
|
||||||
|
rangeFilter: {
|
||||||
|
object: i18n.t("reportcenter.labels.objects.jobs"),
|
||||||
|
field: i18n.t("jobs.fields.scheduled_completion"), // Also date invoice.
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
: {}),
|
: {}),
|
||||||
...(!type || type === "courtesycarcontract"
|
...(!type || type === "courtesycarcontract"
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ exports.receive = (req, res) => {
|
|||||||
client
|
client
|
||||||
.request(queries.FIND_BODYSHOP_BY_MESSAGING_SERVICE_SID, {
|
.request(queries.FIND_BODYSHOP_BY_MESSAGING_SERVICE_SID, {
|
||||||
mssid: req.body.MessagingServiceSid,
|
mssid: req.body.MessagingServiceSid,
|
||||||
phone: phone(req.body.From)[0],
|
phone: phone(req.body.From).phoneNumber,
|
||||||
})
|
})
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
console.log("re", req.body);
|
console.log("re", req.body);
|
||||||
@@ -45,7 +45,7 @@ exports.receive = (req, res) => {
|
|||||||
newMessage.conversation = {
|
newMessage.conversation = {
|
||||||
data: {
|
data: {
|
||||||
bodyshopid: response.bodyshops[0].id,
|
bodyshopid: response.bodyshops[0].id,
|
||||||
phone_num: phone(req.body.From)[0],
|
phone_num: phone(req.body.From).phoneNumber,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
} else if (response.bodyshops[0].conversations.length === 1) {
|
} else if (response.bodyshops[0].conversations.length === 1) {
|
||||||
@@ -80,13 +80,13 @@ exports.receive = (req, res) => {
|
|||||||
const uniqueTokens = [...new Set(allTokens)];
|
const uniqueTokens = [...new Set(allTokens)];
|
||||||
var message = {
|
var message = {
|
||||||
notification: {
|
notification: {
|
||||||
title: `SMS - ${phone(req.body.From)[0]}`,
|
title: `SMS - ${phone(req.body.From).phoneNumber}`,
|
||||||
body: req.body.Body,
|
body: req.body.Body,
|
||||||
click_action: "TEST CLICK ACTION",
|
click_action: "TEST CLICK ACTION",
|
||||||
},
|
},
|
||||||
data: {
|
data: {
|
||||||
jobid: "1234",
|
jobid: "1234",
|
||||||
title: `New SMS From ${phone(req.body.From)[0]}`,
|
title: `New SMS From ${phone(req.body.From).phoneNumber}`,
|
||||||
body: req.body.Body,
|
body: req.body.Body,
|
||||||
},
|
},
|
||||||
tokens: uniqueTokens,
|
tokens: uniqueTokens,
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ exports.send = (req, res) => {
|
|||||||
.create({
|
.create({
|
||||||
body: body,
|
body: body,
|
||||||
messagingServiceSid: messagingServiceSid,
|
messagingServiceSid: messagingServiceSid,
|
||||||
to: phone(to)[0],
|
to: phone(to).phoneNumber,
|
||||||
mediaUrl: selectedMedia.map((i) => i.src),
|
mediaUrl: selectedMedia.map((i) => i.src),
|
||||||
})
|
})
|
||||||
.then((message) => {
|
.then((message) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user