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

Added vendor search in report center IO-688

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

84
bodyshop_translations.babel
View File

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

16
client/src/components/vendor-search-select/vendor-search-select.component.jsx
View File

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

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

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

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

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

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

@@ -634,7 +634,8 @@
}, },
"successes": { "successes": {
"delete": "Le document a bien été supprimé.", "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": { "emails": {
@@ -1586,12 +1587,15 @@
"labels": { "labels": {
"dates": "", "dates": "",
"generateasemail": "", "generateasemail": "",
"key": "" "key": "",
"vendor": ""
}, },
"templates": { "templates": {
"payments_by_date_type": "", "payments_by_date_type": "",
"purchases_by_date_range_detail": "", "purchases_by_date_range_detail": "",
"purchases_by_date_range_summary": "", "purchases_by_date_range_summary": "",
"purchases_by_vendor_detailed_date_range": "",
"purchases_by_vendor_summary_date_range": "",
"schedule": "", "schedule": "",
"timetickets": "" "timetickets": ""
} }

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

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