Addded parts order modal updates & translations

This commit is contained in:
Patrick Fic
2020-12-09 15:53:17 -08:00
parent 5a502c4d1b
commit 1ca2e16e73
8 changed files with 139 additions and 3 deletions

View File

@@ -21932,6 +21932,27 @@
<folder_node>
<name>jobs</name>
<children>
<concept_node>
<name>all_job_notes</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>appointment_reminder</name>
<definition_loaded>false</definition_loaded>
@@ -21953,6 +21974,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>casl_authorization</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>casl_work_authorization</name>
<definition_loaded>false</definition_loaded>
@@ -21974,6 +22016,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>cover_sheet</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>coversheet</name>
<definition_loaded>false</definition_loaded>
@@ -22016,6 +22079,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>fippa_authorization</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>fippa_work_authorization</name>
<definition_loaded>false</definition_loaded>
@@ -22058,6 +22142,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>window_tag</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>work_authorization</name>
<definition_loaded>false</definition_loaded>

View File

@@ -130,6 +130,7 @@ export function PartsOrderModalContainer({
actual_price: 0,
actual_cost: 0,
line_desc: p.line_desc,
line_remarks: p.line_remarks,
quantity: p.quantity || 1,
cost_center:
bodyshop.md_responsibility_centers.defaults.PAO || "Other*",
@@ -147,10 +148,15 @@ export function PartsOrderModalContainer({
toggleModalVisible();
if (sendType === "e") {
const matchingVendor = data.vendors.filter(
(item) => item.id === values.vendorid
)[0];
setEmailOptions({
messageOptions: {
to: [data.vendors.filter((item) => item.id === values.id)[0]] || null,
to: matchingVendor ? [matchingVendor.email] : null,
replyTo: bodyshop.email,
subject: TemplateList("job", bodyshop.shopname)
.parts_order_confirmation.subject,
},
template: {
name: isReturn

View File

@@ -47,7 +47,11 @@ function VendorsFormContainer({ refetch, bodyshop }) {
message: t("vendors.successes.deleted"),
});
//TODO Better way to reset the field decorators?
if (refetch) refetch().then((r) => form.resetFields());
if (refetch)
refetch().then((r) => {
form.resetFields();
form.resetFields();
});
setFormLoading(false);
})
.catch((error) => {
@@ -71,7 +75,11 @@ function VendorsFormContainer({ refetch, bodyshop }) {
message: t("vendors.successes.saved"),
});
//TODO Better way to reset the field decorators?
if (refetch) refetch().form.resetFields();
if (refetch)
refetch().then(() => {
form.resetFields();
form.resetFields();
});
setFormLoading(false);
})
.catch((error) => {

View File

@@ -74,6 +74,7 @@ export const QUERY_ALL_VENDORS_FOR_ORDER = gql`
id
favorite
discount
email
}
jobs(where: { id: { _eq: $jobId } }) {
v_make_desc

View File

@@ -1343,12 +1343,17 @@
"nocontexttype": "No context type set."
},
"jobs": {
"all_job_notes": "All Job Notes",
"appointment_reminder": "Appointment Reminder",
"casl_authorization": "CASL Authorization",
"casl_work_authorization": "CASL Work Authorization",
"cover_sheet": "Cover Sheet",
"coversheet": "Coversheet",
"estimate_detail": "Estimate Details",
"fippa_authorization": "FIPPA Authorization",
"fippa_work_authorization": "FIPPA Work Authorization",
"job_totals": "Job Totals Only",
"window_tag": "Window Tag",
"work_authorization": "Work Authorization"
},
"labels": {

View File

@@ -1343,12 +1343,17 @@
"nocontexttype": ""
},
"jobs": {
"all_job_notes": "",
"appointment_reminder": "",
"casl_authorization": "",
"casl_work_authorization": "",
"cover_sheet": "",
"coversheet": "",
"estimate_detail": "",
"fippa_authorization": "",
"fippa_work_authorization": "",
"job_totals": "",
"window_tag": "",
"work_authorization": ""
},
"labels": {

View File

@@ -1343,12 +1343,17 @@
"nocontexttype": ""
},
"jobs": {
"all_job_notes": "",
"appointment_reminder": "",
"casl_authorization": "",
"casl_work_authorization": "",
"cover_sheet": "",
"coversheet": "",
"estimate_detail": "",
"fippa_authorization": "",
"fippa_work_authorization": "",
"job_totals": "",
"window_tag": "",
"work_authorization": ""
},
"labels": {

View File

@@ -72,6 +72,7 @@ export const TemplateList = (type, object) => {
description: "Parts order template including part details",
drivingId: "partsorder",
key: "parts_order_confirmation",
subject: `Parts Order for ${object}`,
},
cover_sheet_landscape: {