Added vendor search in report center IO-688

This commit is contained in:
Patrick Fic
2021-02-22 13:54:40 -08:00
parent 639cf20941
commit 02a274b8c9
6 changed files with 138 additions and 14 deletions

View File

@@ -9728,6 +9728,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>updated</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>
</children>
</folder_node>
</children>
@@ -26020,6 +26041,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>vendor</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>
</children>
</folder_node>
<folder_node>
@@ -26088,6 +26130,48 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>purchases_by_vendor_detailed_date_range</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>purchases_by_vendor_summary_date_range</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>schedule</name>
<definition_loaded>false</definition_loaded>

View File

@@ -50,9 +50,11 @@ const VendorSearchSelect = (
<Col span={4}>
<HeartOutlined />
</Col>
<Col span={4}>
<Tag color="green">{`${o.discount * 100}%`}</Tag>
</Col>
{o.discount && (
<Col span={4}>
<Tag color="green">{`${o.discount * 100}%`}</Tag>
</Col>
)}
</Row>
</Option>
))
@@ -62,9 +64,11 @@ const VendorSearchSelect = (
<Option key={o.id} value={o.id} name={o.name} discount={o.discount}>
<Row>
<Col span={20}>{o.name}</Col>
<Col span={4}>
<Tag color="green">{`${o.discount * 100}%`}</Tag>
</Col>
{o.discount && (
<Col span={4}>
<Tag color="green">{`${o.discount * 100}%`}</Tag>
</Col>
)}
</Row>
</Option>
))

View File

@@ -634,7 +634,8 @@
},
"successes": {
"delete": "Document deleted successfully.",
"insert": "Uploaded document successfully. "
"insert": "Uploaded document successfully. ",
"updated": "Document updated successfully. "
}
},
"emails": {
@@ -1586,12 +1587,15 @@
"labels": {
"dates": "Dates",
"generateasemail": "Generate as Email?",
"key": "Report"
"key": "Report",
"vendor": "Vendor"
},
"templates": {
"payments_by_date_type": "Payments by Date Range",
"purchases_by_date_range_detail": "Purchases by Date - Detail",
"purchases_by_date_range_summary": "Purchases by Date - Summary",
"purchases_by_vendor_detailed_date_range": "Purchases By Vendor - Detailed",
"purchases_by_vendor_summary_date_range": "Purchases by Vendor - Summary",
"schedule": "Appointment Schedule",
"timetickets": "Time Tickets"
}

View File

@@ -634,7 +634,8 @@
},
"successes": {
"delete": "Documento eliminado con éxito.",
"insert": "Documento cargado con éxito."
"insert": "Documento cargado con éxito.",
"updated": ""
}
},
"emails": {
@@ -1586,12 +1587,15 @@
"labels": {
"dates": "",
"generateasemail": "",
"key": ""
"key": "",
"vendor": ""
},
"templates": {
"payments_by_date_type": "",
"purchases_by_date_range_detail": "",
"purchases_by_date_range_summary": "",
"purchases_by_vendor_detailed_date_range": "",
"purchases_by_vendor_summary_date_range": "",
"schedule": "",
"timetickets": ""
}

View File

@@ -634,7 +634,8 @@
},
"successes": {
"delete": "Le document a bien été supprimé.",
"insert": "Document téléchargé avec succès."
"insert": "Document téléchargé avec succès.",
"updated": ""
}
},
"emails": {
@@ -1586,12 +1587,15 @@
"labels": {
"dates": "",
"generateasemail": "",
"key": ""
"key": "",
"vendor": ""
},
"templates": {
"payments_by_date_type": "",
"purchases_by_date_range_detail": "",
"purchases_by_date_range_summary": "",
"purchases_by_vendor_detailed_date_range": "",
"purchases_by_vendor_summary_date_range": "",
"schedule": "",
"timetickets": ""
}

View File

@@ -292,14 +292,38 @@ export const TemplateList = (type, context) => {
disabled: false,
},
timetickets: {
title: i18n.t("printcenter.timetickets.timetickets"),
title: i18n.t("reportcenter.templates.timetickets"),
description: "Est Detail",
subject: `${i18n.t("printcenter.timetickets.timetickets")} - ${
subject: `${i18n.t("reportcenter.templates.timetickets")} - ${
context && context.job && context.job.ro_number
}`,
key: "timetickets",
disabled: false,
},
purchases_by_vendor_detailed_date_range: {
title: i18n.t(
"reportcenter.templates.purchases_by_vendor_detailed_date_range"
),
description: "Est Detail",
subject: `${i18n.t(
"reportcenter.templates.purchases_by_vendor_detailed_date_range"
)} - ${context && context.job && context.job.ro_number}`,
key: "purchases_by_vendor_detailed_date_range",
idtype: "vendor",
disabled: false,
},
purchases_by_vendor_summary_date_range: {
title: i18n.t(
"reportcenter.templates.purchases_by_vendor_summary_date_range"
),
description: "Est Detail",
subject: `${i18n.t(
"reportcenter.templates.purchases_by_vendor_summary_date_range"
)} - ${context && context.job && context.job.ro_number}`,
key: "purchases_by_vendor_summary_date_range",
idtype: "vendor",
disabled: false,
},
}
: {}),
...(!type || type === "courtesycarcontract"