admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/2021-07-30' of bitbucket.org:snaptsoft/bodyshop into feature/2021-07-30

Browse Source
This commit is contained in:
Patrick Fic
2021-07-30 15:11:21 -07:00
parent 7407429344 d3c8b5d731
commit 35782244bf
7 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bodyshop_translations.babel
View File

@@ -32872,6 +32872,27 @@
<folder_node>
<name>templates</name>
<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>
<name>attendance_detail</name>
<definition_loaded>false</definition_loaded>

8
client/src/components/report-center-modal/report-center-modal.component.jsx
View File

@@ -61,8 +61,12 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
{
name: values.key,
variables: {
...(start ? { start: moment(start).format("YYYY-MM-DD") } : {}),
...(end ? { end: moment(end).format("YYYY-MM-DD") } : {}),
...(start
? { start: moment(start).startOf("day").format("YYYY-MM-DD") }
: {}),
...(end
? { end: moment(end).endOf("day").format("YYYY-MM-DD") }
: {}),
...(id ? { id: id } : {}),
},
},

4
client/src/redux/messaging/messaging.sagas.js
View File

@@ -39,7 +39,7 @@ export function* openChatByPhone({ payload }) {
data: { conversations },
} = yield client.query({
query: CONVERSATION_ID_BY_PHONE,
variables: { phone: phone(phone_num)[0] },
variables: { phone: phone(phone_num).phoneNumber },
fetchPolicy: "network-only",
});
@@ -53,7 +53,7 @@ export function* openChatByPhone({ payload }) {
variables: {
conversation: [
{
phone_num: phone(phone_num)[0],
phone_num: phone(phone_num).phoneNumber,
bodyshopid: bodyshop.id,
job_conversations: jobid ? { data: { jobid: jobid } } : null,
},

1
client/src/translations/en_us/common.json
View File

@@ -1982,6 +1982,7 @@
"vendor": "Vendor"
},
"templates": {
"anticipated_revenue": "Anticipated Revenue",
"attendance_detail": "Attendance (All Employees)",
"attendance_employee": "Employee Attendance",
"attendance_summary": "Attendance Summary (All Employees)",

1
client/src/translations/es/common.json
View File

@@ -1982,6 +1982,7 @@
"vendor": ""
},
"templates": {
"anticipated_revenue": "",
"attendance_detail": "",
"attendance_employee": "",
"attendance_summary": "",

1
client/src/translations/fr/common.json
View File

@@ -1982,6 +1982,7 @@
"vendor": ""
},
"templates": {
"anticipated_revenue": "",
"attendance_detail": "",
"attendance_employee": "",
"attendance_summary": "",

12
client/src/utils/TemplateConstants.js
View File

@@ -1238,6 +1238,18 @@ export const TemplateList = (type, context) => {
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"