From b546d90c9e71ce865b5196c2483e0769394ec9ea Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 26 Jan 2022 08:46:44 -0800
Subject: [PATCH] IO-1651 add estimates written/converted.
---
README.MD | 2 +-
bodyshop_translations.babel | 21 +++++++++++++++++++
.../chat-send-message.component.jsx | 5 +----
client/src/translations/en_us/common.json | 1 +
client/src/translations/es/common.json | 1 +
client/src/translations/fr/common.json | 1 +
client/src/utils/TemplateConstants.js | 18 ++++++++++++++++
7 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/README.MD b/README.MD
index 910584faf..d0c3915f8 100644
--- a/README.MD
+++ b/README.MD
@@ -10,7 +10,7 @@ npx hasura migrate apply --endpoint https://db.imex.online/ --admin-secret 'Prod
npx hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret 'Test-ImEXOnlineBySnaptSoftware!'
NGROK TEsting:
-./ngrok.exe http http://localhost:5000 -host-header="localhost:5000"
+./ngrok.exe http http://localhost:4000 -host-header="localhost:4000"
Finding deadfiles - run from client directory
npx deadfile ./src/index.js --exclude build templates
diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 38857c3ad..797cb30cd 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -37167,6 +37167,27 @@
+
+ estimates_written_converted
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
estimator_detail
false
diff --git a/client/src/components/chat-send-message/chat-send-message.component.jsx b/client/src/components/chat-send-message/chat-send-message.component.jsx
index 6ac7cb6b4..9526dc91b 100644
--- a/client/src/components/chat-send-message/chat-send-message.component.jsx
+++ b/client/src/components/chat-send-message/chat-send-message.component.jsx
@@ -48,10 +48,7 @@ function ChatSendMessageComponent({
if (message === "" || !message) return;
logImEXEvent("messaging_send_message");
const selectedImages = selectedMedia.filter((i) => i.isSelected);
- console.log(
- "🚀 ~ file: chat-send-message.component.jsx ~ line 52 ~ selectedImages",
- selectedImages
- );
+
if (selectedImages.length < 11) {
sendMessage({
to: conversation.phone_num,
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 2ec4ddfb9..6dbd52a40 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2220,6 +2220,7 @@
"attendance_summary": "Attendance Summary (All Employees)",
"credits_not_received_date": "Credits not Received by Date",
"csi": "CSI Responses",
+ "estimates_written_converted": "Estimates Written/Converted",
"estimator_detail": "Jobs by Estimator (Detail)",
"estimator_summary": "Jobs by Estimator (Summary)",
"export_payables": "Export Log - Payables",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 59983bd51..44632a0ff 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2220,6 +2220,7 @@
"attendance_summary": "",
"credits_not_received_date": "",
"csi": "",
+ "estimates_written_converted": "",
"estimator_detail": "",
"estimator_summary": "",
"export_payables": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index f20e02e42..fbeb51ce4 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2220,6 +2220,7 @@
"attendance_summary": "",
"credits_not_received_date": "",
"csi": "",
+ "estimates_written_converted": "",
"estimator_detail": "",
"estimator_summary": "",
"export_payables": "",
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index 1c7fe6558..38f99163d 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -1466,6 +1466,24 @@ export const TemplateList = (type, context) => {
},
group: "customers",
},
+ estimates_written_converted: {
+ title: i18n.t("reportcenter.templates.estimates_written_converted"),
+ description: "",
+ subject: i18n.t(
+ "reportcenter.templates.estimates_written_converted"
+ ),
+ key: "estimates_written_converted",
+ //idtype: "vendor",
+ disabled: false,
+ rangeFilter: {
+ object: i18n.t("reportcenter.labels.objects.jobs"),
+ field:
+ i18n.t("jobs.fields.date_open") +
+ "/" +
+ i18n.t("jobs.fields.date_invoiced"), // Also date invoice.
+ },
+ group: "sales",
+ },
}
: {}),
...(!type || type === "courtesycarcontract"