From ff32e7d79cd782d43267f0ee6b73dda4dcc2fc64 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 28 Apr 2021 15:05:41 -0700
Subject: [PATCH] IO-826 Payment Reference by email
---
.../ca-bc-etf-table-modal.container.jsx | 3 +--
.../ca-bc-etf-table.modal.component.jsx | 12 +++++++++++-
client/src/utils/TemplateConstants.js | 16 ++++++++--------
3 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table-modal.container.jsx b/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table-modal.container.jsx
index 1ddc88d3b..8f97a3008 100644
--- a/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table-modal.container.jsx
+++ b/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table-modal.container.jsx
@@ -35,7 +35,6 @@ export function ContractsFindModalContainer({
setLoading(true);
const claimNumbers = [];
values.table.split("\n").forEach((row, idx, arr) => {
- console.log("row :>> ", row);
const { 1: claim, 2: shortclaim, 4: amount } = row.split("\t");
if (!claim || !shortclaim) return;
const trimmedShortClaim = shortclaim.trim();
@@ -52,7 +51,7 @@ export function ContractsFindModalContainer({
},
},
{},
- "p"
+ values.sendby === "email" ? "e" : "p"
);
setLoading(false);
};
diff --git a/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table.modal.component.jsx b/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table.modal.component.jsx
index cdee9403a..4fce50ed5 100644
--- a/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table.modal.component.jsx
+++ b/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table.modal.component.jsx
@@ -1,4 +1,4 @@
-import { Form, Input } from "antd";
+import { Form, Input, Radio } from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
@@ -27,6 +27,16 @@ export function PartsReceiveModalComponent({ bodyshop, form }) {
>
+
+
+ {t("general.labels.email")}
+ {t("general.labels.print")}
+
+
);
}
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index 9178ec834..797e262c4 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -499,7 +499,7 @@ export const TemplateList = (type, context) => {
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
- field: i18n.t("jobs.fields.invoice_date"),
+ field: i18n.t("jobs.fields.date_invoiced"),
},
},
@@ -516,7 +516,7 @@ export const TemplateList = (type, context) => {
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
- field: i18n.t("jobs.fields.invoice_date"),
+ field: i18n.t("jobs.fields.date_invoiced"),
},
},
@@ -529,7 +529,7 @@ export const TemplateList = (type, context) => {
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
- field: i18n.t("jobs.fields.invoice_date"),
+ field: i18n.t("jobs.fields.date_invoiced"),
},
},
@@ -546,7 +546,7 @@ export const TemplateList = (type, context) => {
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
- field: i18n.t("jobs.fields.invoice_date"),
+ field: i18n.t("jobs.fields.date_invoiced"),
},
},
@@ -559,7 +559,7 @@ export const TemplateList = (type, context) => {
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
- field: i18n.t("jobs.fields.open_date"),
+ field: i18n.t("jobs.fields.date_open"),
},
},
@@ -576,7 +576,7 @@ export const TemplateList = (type, context) => {
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
- field: i18n.t("jobs.fields.open_date"),
+ field: i18n.t("jobs.fields.date_open"),
},
},
@@ -589,7 +589,7 @@ export const TemplateList = (type, context) => {
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
- field: i18n.t("jobs.fields.open_date"),
+ field: i18n.t("jobs.fields.date_open"),
},
},
@@ -606,7 +606,7 @@ export const TemplateList = (type, context) => {
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
- field: i18n.t("jobs.fields.open_date"),
+ field: i18n.t("jobs.fields.date_open"),
},
},
estimator_detail: {