Add title to email overlay to prevent close button overlap.

ARMS Update
CI fix.
2022-11-03 16:37:09 -07:00 · 2022-11-03 11:44:37 -07:00 · 2022-11-03 10:12:46 -07:00 · 2022-11-03 10:12:15 -07:00 · 2022-11-03 10:01:39 -07:00 · 2022-11-01 09:04:41 -07:00
7 changed files with 27 additions and 3 deletions
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -14191,6 +14191,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
+                                    <concept_node>
+                                        <name>emailpreview</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>generatingemail</name>
                                        <definition_loaded>false</definition_loaded>
--- a/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx
+++ b/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx
@@ -1,6 +1,5 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { Button, Card, Form, Input, Table } from "antd";
-import Dinero from "dinero.js";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
--- a/client/src/components/email-overlay/email-overlay.container.jsx
+++ b/client/src/components/email-overlay/email-overlay.container.jsx
@@ -178,6 +178,7 @@ export function EmailOverlayContainer({
      maskClosable={false}
      width={"80%"}
      onOk={() => form.submit()}
+      title={t("emails.labels.emailpreview")}
      onCancel={() => {
        toggleEmailOverlayVisible();
      }}
@@ -198,7 +199,7 @@ export function EmailOverlayContainer({
      <div>
        <div
          style={{
-            marginTop: "1rem",
+            //   marginTop: "3rem",
            display: "flex",
            justifyContent: "flex-end",
          }}
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -881,6 +881,7 @@
 			"labels": {
 				"attachments": "Attachments",
 				"documents": "Documents",
+				"emailpreview": "Email Preview",
 				"generatingemail": "Generating email...",
 				"pdfcopywillbeattached": "A PDF copy of this email will be attached when it is sent.",
 				"preview": "Email Preview"
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -881,6 +881,7 @@
 			"labels": {
 				"attachments": "",
 				"documents": "",
+				"emailpreview": "",
 				"generatingemail": "",
 				"pdfcopywillbeattached": "",
 				"preview": ""
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -881,6 +881,7 @@
 			"labels": {
 				"attachments": "",
 				"documents": "",
+				"emailpreview": "",
 				"generatingemail": "",
 				"pdfcopywillbeattached": "",
 				"preview": ""
--- a/server/data/arms.js
+++ b/server/data/arms.js
@@ -271,7 +271,7 @@ exports.default = async (req, res) => {
                CompanyName:
                  process.env.NODE_ENV === "production"
                    ? bodyshop.shopname
-                    : "IMEX Test Shop",
+                    : "IMEX Test Canadian Shop",
                IDInfo: {
                  IDQualifierCode: "US",
                  IDNum: bodyshop.entegral_id,
Author	SHA1	Message	Date
Patrick Fic	6c5d684218	Add title to email overlay to prevent close button overlap.	2022-11-03 16:37:09 -07:00
Patrick Fic	a62796b12f	ARMS Update	2022-11-03 11:44:37 -07:00
Patrick Fic	6a49457382	CI fix.	2022-11-03 10:12:46 -07:00
Patrick Fic	24d71413c1	Revert "IO-2086 Use new grid gallery and lightbox for performance." This reverts commit `089fc0b0f7`.	2022-11-03 10:12:15 -07:00
Patrick Fic	3354afe380	Merge branch 'feature/pbs-ap' into release/2022-11-04 * feature/pbs-ap: Minor bug fixes. Add notification of complete export. AP changes based on validation testing. WIP PBS AP. WIP PBS AP.	2022-11-03 10:01:39 -07:00
Patrick Fic	089fc0b0f7	IO-2086 Use new grid gallery and lightbox for performance.	2022-11-01 09:04:41 -07:00
Patrick Fic	33dea8638c	Merged in release/2022-10-31 (pull request #608 ) Improved LR tracking.	2022-10-31 18:31:03 +00:00