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

Place featurewrapped on bills in job line expander.

Browse Source
This commit is contained in:
Patrick Fic
2024-04-29 12:06:42 -07:00
parent e799417aaf
commit c525b7ea3f
5 changed files with 93 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
bodyshop_translations.babel
View File

@@ -3939,6 +3939,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>returnfrombill</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>savewithdiscrepancy</name> <name>savewithdiscrepancy</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -40798,6 +40819,27 @@
<folder_node> <folder_node>
<name>labels</name> <name>labels</name>
<children> <children>
<concept_node>
<name>notyetdispatched</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>parts_dispatch</name> <name>parts_dispatch</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

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

@@ -12,6 +12,7 @@ import { createStructuredSelector } from "reselect";
import { selectBodyshop } from "../../redux/user/user.selectors"; import { selectBodyshop } from "../../redux/user/user.selectors";
import { QUERY_JOBLINE_TASKS_PAGINATED } from "../../graphql/tasks.queries.js"; import { QUERY_JOBLINE_TASKS_PAGINATED } from "../../graphql/tasks.queries.js";
import TaskListContainer from "../task-list/task-list.container.jsx"; import TaskListContainer from "../task-list/task-list.container.jsx";
import FeatureWrapper from "../feature-wrapper/feature-wrapper.component.jsx";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop bodyshop: selectBodyshop
@@ -98,13 +99,16 @@ export function JobLinesExpander({ jobline, jobid, bodyshop }) {
</Row> </Row>
) )
})) }))
: { : [
{
key: "dispatch-lines", key: "dispatch-lines",
children: t("parts_orders.labels.notyetordered") children: t("parts_dispatch.labels.notyetdispatched")
} }
]
} }
/> />
</Col> </Col>
<FeatureWrapper featureName="bills" noauth={() => null}>
<Col md={24} lg={8}> <Col md={24} lg={8}>
<Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title> <Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title>
<Timeline <Timeline
@@ -147,6 +151,7 @@ export function JobLinesExpander({ jobline, jobid, bodyshop }) {
} }
/> />
</Col> </Col>
</FeatureWrapper>
<Col md={24} lg={24}> <Col md={24} lg={24}>
<TaskListContainer <TaskListContainer
parentJobId={jobid} parentJobId={jobid}

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

@@ -230,7 +230,7 @@
"markexported": "Mark Exported", "markexported": "Mark Exported",
"markforreexport": "Mark for Re-export", "markforreexport": "Mark for Re-export",
"new": "New Bill", "new": "New Bill",
"nobilllines": "This part has not yet been recieved.", "nobilllines": "",
"noneselected": "No bill selected.", "noneselected": "No bill selected.",
"onlycmforinvoiced": "Only credit memos can be entered for any Job that has been invoiced, exported, or voided.", "onlycmforinvoiced": "Only credit memos can be entered for any Job that has been invoiced, exported, or voided.",
"printlabels": "Print Labels", "printlabels": "Print Labels",
@@ -1323,7 +1323,6 @@
"value": "Value" "value": "Value"
}, },
"content": { "content": {
"calculated_based_on": "Calculated based on",
"calculated_based_on": "Calculated based on", "calculated_based_on": "Calculated based on",
"current_status_accumulated_time": "Current Status Accumulated Time", "current_status_accumulated_time": "Current Status Accumulated Time",
"data_unavailable": " There is currently no Lifecycle data for this Job.", "data_unavailable": " There is currently no Lifecycle data for this Job.",
@@ -2408,6 +2407,7 @@
"percent_accepted": "% Accepted" "percent_accepted": "% Accepted"
}, },
"labels": { "labels": {
"notyetdispatched": "This part has not been dispatched.",
"parts_dispatch": "Parts Dispatch" "parts_dispatch": "Parts Dispatch"
} }
}, },

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

@@ -2407,6 +2407,7 @@
"percent_accepted": "" "percent_accepted": ""
}, },
"labels": { "labels": {
"notyetdispatched": "",
"parts_dispatch": "" "parts_dispatch": ""
} }
}, },

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

@@ -2407,6 +2407,7 @@
"percent_accepted": "" "percent_accepted": ""
}, },
"labels": { "labels": {
"notyetdispatched": "",
"parts_dispatch": "" "parts_dispatch": ""
} }
}, },