Merged in feature/IO-2731-Payment-Edit (pull request #1399)

IO-2731 Payment Edit

client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx

@@ -45,6 +45,7 @@ export function BillDetailEditReturn({
       actions: {},
       context: {
         jobId: data.bills_by_pk.jobid,
+        job: data.bills_by_pk.job,
         vendorId: data.bills_by_pk.vendorid,
         returnFromBill: data.bills_by_pk.id,
         invoiceNumber: data.bills_by_pk.invoice_number,

client/src/components/bills-list-table/bills-list-table.component.jsx

@@ -60,7 +60,7 @@ export function BillsListTableComponent({
       )}
       <BillDeleteButton bill={record} jobid={job.id} />
       <BillDetailEditReturnComponent
-        data={{ bills_by_pk: { ...record, jobid: job.id } }}
+        data={{ bills_by_pk: { ...record, jobid: job.id, job: job } }}
         disabled={
           record.is_credit_memo ||
           record.vendorid === bodyshop.inhousevendorid ||

client/src/components/payment-mark-export-button/payment-mark-export-button-component.jsx

@@ -7,10 +7,12 @@ import { createStructuredSelector } from "reselect";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectPayment } from "../../redux/modals/modals.selectors";
 import { selectCurrentUser } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
+  paymentModal: selectPayment,
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -24,6 +26,7 @@ const PaymentMarkForExportButton = ({
   refetch,
   setPaymentContext,
   currentUser,
+  paymentModal,
 }) => {
   const { t } = useTranslation();
   const [insertExportLog, { loading: exportLogLoading }] =
@@ -65,16 +68,22 @@ const PaymentMarkForExportButton = ({
           refetch,
         },
         context: {
+          ...paymentModal.context,
           ...payment,
           exportedat: today,
         },
       });
 
-      if (refetch)
-        refetch(
-          paymentUpdateResponse &&
-            paymentUpdateResponse.data.update_payments.returning[0]
-        );
+      if (refetch) {
+        if (paymentModal.context.refetchRequiresContext) {
+          refetch(
+            paymentUpdateResponse &&
+              paymentUpdateResponse.data.update_payments.returning[0]
+          );
+        } else {
+          refetch();
+        }
+      }
     } else {
       notification["error"]({
         message: t("payments.errors.exporting", {

client/src/components/payment-modal/payment-modal.container.jsx

@@ -96,16 +96,21 @@ function PaymentModalContainer({
         });
 
         if (!!!updatedPayment.errors) {
-          notification["success"]({ message: t("payments.successes.payment") });
+          notification["success"]({ message: t("payments.successes.paymentupdate") });
         } else {
-          notification["error"]({ message: t("payments.errors.payment") });
+          notification["error"]({ message: t("payments.errors.paymentupdate") });
         }
       }
 
-      if (actions.refetch)
-        actions.refetch(
-          updatedPayment && updatedPayment.data.update_payments.returning[0]
-        );
+      if (actions.refetch) {
+        if (context.refetchRequiresContext) {
+          actions.refetch(
+            updatedPayment && updatedPayment.data.update_payments.returning[0]
+          );
+        } else {
+          actions.refetch();
+        }
+      }
 
       if (enterAgain) {
         const prev = form.getFieldsValue(["date"]);

client/src/components/payment-reexport-button/payment-reexport-button.component.jsx

@@ -3,15 +3,25 @@ import { Button, notification } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
 import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectPayment } from "../../redux/modals/modals.selectors";
 
+const mapStateToProps = createStructuredSelector({
+  paymentModal: selectPayment,
+});
 const mapDispatchToProps = (dispatch) => ({
   setPaymentContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "payment" })),
 });
 
-const PaymentReexportButton = ({ payment, refetch, setPaymentContext }) => {
+const PaymentReexportButton = ({
+  paymentModal,
+  payment,
+  refetch,
+  setPaymentContext,
+}) => {
   const { t } = useTranslation();
   const [updatePayment, { loading }] = useMutation(UPDATE_PAYMENT);
 
@@ -35,15 +45,21 @@ const PaymentReexportButton = ({ payment, refetch, setPaymentContext }) => {
           refetch,
         },
         context: {
+          ...paymentModal.context,
           ...payment,
           exportedat: null,
         },
       });
-      if (refetch)
-        refetch(
-          paymentUpdateResponse &&
-            paymentUpdateResponse.data.update_payments.returning[0]
-        );
+      if (refetch) {
+        if (paymentModal.context.refetchRequiresContext) {
+          refetch(
+            paymentUpdateResponse &&
+              paymentUpdateResponse.data.update_payments.returning[0]
+          );
+        } else {
+          refetch();
+        }
+      }
     } else {
       notification["error"]({
         message: t("payments.errors.exporting", {
@@ -64,4 +80,7 @@ const PaymentReexportButton = ({ payment, refetch, setPaymentContext }) => {
   );
 };
 
-export default connect(null, mapDispatchToProps)(PaymentReexportButton);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(PaymentReexportButton);

client/src/components/payments-list-paginated/payment-list-paginated.component.jsx

@@ -14,11 +14,11 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
+import { pageLimit } from "../../utils/config";
 import { alphaSort } from "../../utils/sorters";
 import CaBcEtfTableModalContainer from "../ca-bc-etf-table-modal/ca-bc-etf-table-modal.container";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
-import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -184,7 +184,10 @@ export function PaymentsListPaginated({
                       }
                     : refetch,
                 },
-                context: apolloResults ? apolloResults : record,
+                context: {
+                  ...(apolloResults ? apolloResults : record),
+                  refetchRequiresContext: true,
+                },
               });
             }}
           >

client/src/components/print-center-jobs-labels/print-center-jobs-labels.component.jsx

@@ -6,6 +6,7 @@ import {
   notification,
   Popover,
   Radio,
+  Space,
 } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -115,10 +116,16 @@ export function PrintCenterJobsLabels({ bodyshop, jobId }) {
         >
           <InputNumber min={1} precision={0} max={99} />
         </Form.Item>
-        <Button type="primary" loading={loading} onClick={handleOk}>
-          {t("general.actions.print")}
-        </Button>
-        <Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>
+        <div style={{ display: "flex", justifyContent: "flex-end" }}>
+          <Space>
+            <Button type="primary" loading={loading} onClick={handleOk}>
+              {t("general.actions.print")}
+            </Button>
+            <Button onClick={handleCancel}>
+              {t("general.actions.cancel")}
+            </Button>
+          </Space>
+        </div>
       </Form>
     </Card>
   );

client/src/graphql/jobs-lines.queries.js

@@ -172,6 +172,12 @@ export const UPDATE_JOB_LINE = gql`
         id
         notes
         mod_lbr_ty
+        mod_lb_hrs
+        part_type
+        op_code_desc
+        prt_dsmk_m
+        prt_dsmk_p
+        tax_part
         part_qty
         db_price
         act_price

client/src/translations/en_us/common.json

@@ -2333,6 +2333,7 @@
 				"markexported": "Payment(s) marked exported.",
 				"markreexported": "Payment marked for re-export successfully",
 				"payment": "Payment created successfully. ",
+				"paymentupdate": "Payment updated successfully. ",
 				"stripe": "Credit card transaction charged successfully."
 			}
 		},

client/src/translations/es/common.json

@@ -2331,6 +2331,7 @@
 				"markexported": "",
 				"markreexported": "",
 				"payment": "",
+				"paymentupdate": "",
 				"stripe": ""
 			}
 		},

client/src/translations/fr/common.json

@@ -2331,6 +2331,7 @@
 				"markexported": "",
 				"markreexported": "",
 				"payment": "",
+				"paymentupdate": "",
 				"stripe": ""
 			}
 		},