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

Merged in release/2022-12-30 (pull request #649)

Browse Source 
Release/2022 12 30
This commit is contained in:
Patrick Fic
2022-12-30 19:30:25 +00:00
parent 8a0281fb43 b0755a0cde
commit d69ce2d2a9
7 changed files with 88 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
bodyshop_translations.babel
View File

@@ -1,4 +1,4 @@
<babeledit_project version="1.2" be_version="2.7.1"> <babeledit_project be_version="2.7.1" version="1.2">
<!-- <!--
BabelEdit project file BabelEdit project file
@@ -42077,6 +42077,48 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>returns_grouped_by_vendor_detailed</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>returns_grouped_by_vendor_summary</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>schedule</name> <name>schedule</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

5
client/src/App/App.styles.scss
View File

@@ -148,3 +148,8 @@
.ant-table-tbody > tr.ant-table-row:hover > td { .ant-table-tbody > tr.ant-table-row:hover > td {
background: #eaeaea !important; background: #eaeaea !important;
} }
.job-line-manual{
color: tomato;
font-style: italic;
}

1
client/src/components/job-detail-lines/job-lines.component.jsx
View File

@@ -103,6 +103,7 @@ export function JobLinesComponent({
fixed: "left", fixed: "left",
key: "line_desc", key: "line_desc",
sorter: (a, b) => alphaSort(a.line_desc, b.line_desc), sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
onCell: (record) => ({ className: record.manual_line && "job-line-manual" }),
sortOrder: sortOrder:
state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order, state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
ellipsis: true, ellipsis: true,

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

@@ -2482,6 +2482,8 @@
"purchases_by_vendor_summary_date_range": "Purchases by Vendor - Summary", "purchases_by_vendor_summary_date_range": "Purchases by Vendor - Summary",
"purchases_grouped_by_vendor_detailed": "Purchases Grouped by Vendor - Detailed", "purchases_grouped_by_vendor_detailed": "Purchases Grouped by Vendor - Detailed",
"purchases_grouped_by_vendor_summary": "Purchases Grouped by Vendor - Summary", "purchases_grouped_by_vendor_summary": "Purchases Grouped by Vendor - Summary",
"returns_grouped_by_vendor_detailed": "Returns Grouped by Vendor - Detailed",
"returns_grouped_by_vendor_summary": "Returns Grouped by Vendor - Summary",
"schedule": "Appointment Schedule", "schedule": "Appointment Schedule",
"scoreboard_detail": "Scoreboard Detail", "scoreboard_detail": "Scoreboard Detail",
"scoreboard_summary": "Scoreboard Summary", "scoreboard_summary": "Scoreboard Summary",

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

@@ -2482,6 +2482,8 @@
"purchases_by_vendor_summary_date_range": "", "purchases_by_vendor_summary_date_range": "",
"purchases_grouped_by_vendor_detailed": "", "purchases_grouped_by_vendor_detailed": "",
"purchases_grouped_by_vendor_summary": "", "purchases_grouped_by_vendor_summary": "",
"returns_grouped_by_vendor_detailed": "",
"returns_grouped_by_vendor_summary": "",
"schedule": "", "schedule": "",
"scoreboard_detail": "", "scoreboard_detail": "",
"scoreboard_summary": "", "scoreboard_summary": "",

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

@@ -2482,6 +2482,8 @@
"purchases_by_vendor_summary_date_range": "", "purchases_by_vendor_summary_date_range": "",
"purchases_grouped_by_vendor_detailed": "", "purchases_grouped_by_vendor_detailed": "",
"purchases_grouped_by_vendor_summary": "", "purchases_grouped_by_vendor_summary": "",
"returns_grouped_by_vendor_detailed": "",
"returns_grouped_by_vendor_summary": "",
"schedule": "", "schedule": "",
"scoreboard_detail": "", "scoreboard_detail": "",
"scoreboard_summary": "", "scoreboard_summary": "",

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

@@ -1702,6 +1702,38 @@ export const TemplateList = (type, context) => {
}, },
group: "jobs", group: "jobs",
}, },
returns_grouped_by_vendor_summary: {
title: i18n.t(
"reportcenter.templates.returns_grouped_by_vendor_summary"
),
subject: i18n.t(
"reportcenter.templates.returns_grouped_by_vendor_summary"
),
key: "returns_grouped_by_vendor_summary",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.parts_orders"),
field: i18n.t("parts_orders.fields.order_date"),
},
group: "jobs",
},
returns_grouped_by_vendor_detailed: {
title: i18n.t(
"reportcenter.templates.returns_grouped_by_vendor_detailed"
),
subject: i18n.t(
"reportcenter.templates.returns_grouped_by_vendor_detailed"
),
key: "returns_grouped_by_vendor_detailed",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.parts_orders"),
field: i18n.t("parts_orders.fields.order_date"),
},
group: "jobs",
},
} }
: {}), : {}),
...(!type || type === "courtesycarcontract" ...(!type || type === "courtesycarcontract"