diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index c561521b1..6a9106248 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -9728,6 +9728,27 @@
+
+ updated
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
@@ -26020,6 +26041,27 @@
+
+ vendor
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
@@ -26088,6 +26130,48 @@
+
+ purchases_by_vendor_detailed_date_range
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ purchases_by_vendor_summary_date_range
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
schedule
false
diff --git a/client/src/components/vendor-search-select/vendor-search-select.component.jsx b/client/src/components/vendor-search-select/vendor-search-select.component.jsx
index 36137ae42..d6a524d23 100644
--- a/client/src/components/vendor-search-select/vendor-search-select.component.jsx
+++ b/client/src/components/vendor-search-select/vendor-search-select.component.jsx
@@ -50,9 +50,11 @@ const VendorSearchSelect = (
-
- {`${o.discount * 100}%`}
-
+ {o.discount && (
+
+ {`${o.discount * 100}%`}
+
+ )}
))
@@ -62,9 +64,11 @@ const VendorSearchSelect = (
))
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 8b6ab8cc0..eaee22fd5 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -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"
}
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index e99b5e84a..68db2552c 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -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": ""
}
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 89751ddf4..c45630be2 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -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": ""
}
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index 6c915824f..7973c5adf 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -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"