Merged in feature/IO-3322-intellipay-refund (pull request #2457)

IO-3332 Add error message to intellipay refund error.

Approved-by: Dave Richer

bodyshop_translations.babel

@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -8472,6 +8472,27 @@
                                                             </translation>
                                                         </translations>
                                                     </concept_node>
+                                                    <concept_node>
+                                                        <name>responsibilitycenter</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>templates</name>
                                                         <definition_loaded>false</definition_loaded>
@@ -65702,7 +65723,7 @@
     <primary_language>en-US</primary_language>
     <configuration>
         <definitions>.</definitions>
-        <indent>tab</indent>
+        <indent>space2</indent>
         <format>namespaced-json</format>
         <support_arrays>true</support_arrays>
     </configuration>

client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.component.jsx

@@ -46,8 +46,8 @@ function JobsDocumentsImgproxyComponent({
   const [modalState, setModalState] = useState({ open: false, index: 0 });
 
   const fetchThumbnails = useCallback(() => {
-    fetchImgproxyThumbnails({ setStateCallback: setGalleryImages, jobId, billId });
-  }, [jobId, billId, setGalleryImages]);
+    fetchImgproxyThumbnails({ setStateCallback: setGalleryImages, jobId });
+  }, [jobId, setGalleryImages]);
 
   useEffect(() => {
     if (data) {
@@ -208,8 +208,8 @@ function JobsDocumentsImgproxyComponent({
 
 export default connect(mapStateToProps, mapDispatchToProps)(JobsDocumentsImgproxyComponent);
 
-export const fetchImgproxyThumbnails = async ({ setStateCallback, jobId, billId, imagesOnly }) => {
-  const result = await axios.post("/media/imgproxy/thumbnails", { jobid: jobId, billid: billId });
+export const fetchImgproxyThumbnails = async ({ setStateCallback, jobId, imagesOnly }) => {
+  const result = await axios.post("/media/imgproxy/thumbnails", { jobid: jobId });
   const documents = result.data.reduce(
     (acc, value) => {
       if (value.type.startsWith("image")) {

client/src/components/payment-expanded-row/payment-expanded-row.component.jsx

@@ -16,10 +16,10 @@ import { useNotification } from "../../contexts/Notifications/notificationContex
 
 const { confirm } = Modal;
 
-const openNotificationWithIcon = (type, t, notification) => {
+const openNotificationWithIcon = (type, t, notification, message) => {
   notification[type]({
     message: t("job_payments.notifications.error.title"),
-    description: t("job_payments.notifications.error.description")
+    description: t("job_payments.notifications.error.description", { message: message || "Unknown error." })
   });
 };
 
@@ -99,7 +99,7 @@ const PaymentExpandedRowComponent = ({ record, bodyshop }) => {
         });
 
         if (refundResponse.data.status < 0) {
-          openNotificationWithIcon("error", t, notification);
+          openNotificationWithIcon("error", t, notification, refundResponse.data.message);
           return;
         }
 

client/src/translations/en_us/common.json

@@ -1455,9 +1455,9 @@
       },
       "notifications": {
         "error": {
-          "description": "Please try again. Make sure the refund amount does not exceeds the payment amount.",
+          "description": "An error has occurred processing the refund: {{message}}",
           "openingip": "Error connecting to IntelliPay service.",
-          "title": "Error placing refund"
+          "title": "Error issuing refund"
         }
       },
       "titles": {

server/graphql-client/queries.js

@@ -2846,26 +2846,6 @@ exports.GET_DOCUMENTS_BY_JOB = `
       }
     }
   }`;
-exports.GET_DOCUMENTS_BY_BILL = `
-query GET_DOCUMENTS_BY_BILL($billId: uuid!) {
-  documents_aggregate(where: {billid: {_eq: $billId}}) {
-    aggregate {
-      sum {
-        size
-      }
-    }
-  }
-  documents(order_by: {takenat: desc}, where: {billid: {_eq: $billId}}) {
-    id
-    name
-    key
-    type
-    size
-    takenat
-    extension
-  }
-}
-`;
 
 exports.QUERY_TEMPORARY_DOCS = `  query QUERY_TEMPORARY_DOCS {
     documents(where: { jobid: { _is_null: true } }, order_by: { takenat: desc }) {

server/media/imgproxy-media.js

@@ -18,7 +18,6 @@ const {
   GET_DOCUMENTS_BY_JOB,
   QUERY_TEMPORARY_DOCS,
   GET_DOCUMENTS_BY_IDS,
-  GET_DOCUMENTS_BY_BILL,
   DELETE_MEDIA_DOCUMENTS
 } = require("../graphql-client/queries");
 const yazl = require("yazl");
@@ -91,11 +90,9 @@ const getThumbnailUrls = async (req, res) => {
     //Delayed as the key structure may change slightly from what it is currently and will require evaluating mobile components.
     const client = req.userGraphQLClient;
     //If there's no jobid and no billid, we're in temporary documents.
-    const data = await (
-      billid ? client.request(GET_DOCUMENTS_BY_BILL, { billId: billid }) :
-        jobid
-          ? client.request(GET_DOCUMENTS_BY_JOB, { jobId: jobid })
-          : client.request(QUERY_TEMPORARY_DOCS));
+    const data = await (jobid
+      ? client.request(GET_DOCUMENTS_BY_JOB, { jobId: jobid })
+      : client.request(QUERY_TEMPORARY_DOCS));
 
     const thumbResizeParams = `rs:fill:250:250:1/g:ce`;
     const s3client = new S3Client({ region: InstanceRegion() });