From 53e3b3fa037a110f24be84dbdae6e9382185bf58 Mon Sep 17 00:00:00 2001
From: Allan Carr <allan.carr@thinkimex.com>
Date: Mon, 11 Sep 2023 11:15:50 -0700
Subject: [PATCH] IO-2395 Payment Expansion Formatting

---
 .../payment-expanded-row.component.jsx        | 19 ++++++++++++-------
 client/src/graphql/jobs.queries.js            |  2 +-
 client/src/translations/en_us/common.json     |  1 +
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/client/src/components/payment-expanded-row/payment-expanded-row.component.jsx b/client/src/components/payment-expanded-row/payment-expanded-row.component.jsx
index 6266457a7..a96683b70 100644
--- a/client/src/components/payment-expanded-row/payment-expanded-row.component.jsx
+++ b/client/src/components/payment-expanded-row/payment-expanded-row.component.jsx
@@ -1,15 +1,17 @@
-import React, { useState } from "react";
 import { useMutation, useQuery } from "@apollo/client";
+import { Button, Descriptions, InputNumber, Modal, notification } from "antd";
+import axios from "axios";
+import moment from "moment";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import {
   GET_REFUNDABLE_AMOUNT_BY_JOBID,
   INSERT_PAYMENT_RESPONSE,
   QUERY_PAYMENT_RESPONSE_BY_PAYMENT_ID,
 } from "../../graphql/payment_response.queries";
-import { Button, Descriptions, InputNumber, Modal, notification } from "antd";
-import moment from "moment";
-import axios from "axios";
 import { INSERT_NEW_PAYMENT } from "../../graphql/payments.queries";
-import { useTranslation } from "react-i18next";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
 
 const { confirm } = Modal;
 
@@ -137,10 +139,10 @@ const PaymentExpandedRowComponent = ({ record, bodyshop }) => {
           {payment_response?.response?.nameOnCard ?? ""}
         </Descriptions.Item>
         <Descriptions.Item label={t("job_payments.titles.amount")}>
-          {record.amount}
+          <CurrencyFormatter>{record.amount}</CurrencyFormatter>
         </Descriptions.Item>
         <Descriptions.Item label={t("job_payments.titles.dateOfPayment")}>
-          {moment(record.created_at).format("YYYY-MM-DD HH:mm:ss")}
+          {<DateTimeFormatter>{record.created_at}</DateTimeFormatter>}
         </Descriptions.Item>
         <Descriptions.Item label={t("job_payments.titles.transactionid")}>
           {record.transactionid}
@@ -151,6 +153,9 @@ const PaymentExpandedRowComponent = ({ record, bodyshop }) => {
         <Descriptions.Item label={t("job_payments.titles.paymenttype")}>
           {record.type}
         </Descriptions.Item>
+        <Descriptions.Item label={t("job_payments.titles.paymenttype")}>
+          {record.paymentnum}
+        </Descriptions.Item>
         {payment_response && (
           <Descriptions.Item label={t("job_payments.titles.refundamount")}>
             <InputNumber
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index be7fc56fe..60846e2fa 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -574,7 +574,6 @@ export const GET_JOB_BY_PK = gql`
       est_co_nm
       est_ct_fn
       est_ct_ln
-
       est_ph1
       est_ea
       selling_dealer
@@ -746,6 +745,7 @@ export const GET_JOB_BY_PK = gql`
         jobid
         amount
         payer
+        paymentnum
         created_at
         transactionid
         memo
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 0d4ebbe5e..d1a681b05 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1211,6 +1211,7 @@
 				"payer": "Payer",
 				"payername": "Payer Name",
 				"paymentid": "Payment Reference ID",
+				"paymentnum": "Payment Number",
 				"paymenttype": "Payment Type",
 				"refundamount": "Refund Amount",
 				"transactionid": "Transaction ID"
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 978ad7229..57ee1afdd 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1211,6 +1211,7 @@
 				"payer": "",
 				"payername": "",
 				"paymentid": "",
+				"paymentnum": "",
 				"paymenttype": "",
 				"refundamount": "",
 				"transactionid": ""
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 37ce44d06..3232958fe 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1211,6 +1211,7 @@
 				"payer": "",
 				"payername": "",
 				"paymentid": "",
+				"paymentnum": "",
 				"paymenttype": "",
 				"refundamount": "",
 				"transactionid": ""