MAJOR CHANGE: Renamed invoices to bills BOD-410

client/src/components/job-reconciliation-modal/job-reconciliation-modal.component.jsx

@@ -1,16 +1,16 @@
 import { Col, Row } from "antd";
 import React, { useState } from "react";
-import JobReconciliationInvoicesTable from "../job-reconciliation-invoices-table/job-reconciliation-invoices-table.component";
+import JobReconciliationBillsTable from "../job-reconciliation-bills-table/job-reconciliation-bills-table.component";
 import JobReconciliationPartsTable from "../job-reconciliation-parts-table/job-reconciliation-parts-table.component";
 
-export default function JobReconciliationModalComponent({ job, invoices }) {
+export default function JobReconciliationModalComponent({ job, bills }) {
   const jobLineState = useState([]);
-  const invoiceLineState = useState([]);
+  const billLineState = useState([]);
 
   const invoiceLineData =
-    invoices
+    bills
       .map((i) =>
-        i.invoicelines.map((il) => {
+        i.billlines.map((il) => {
           return { ...il, is_credit_memo: i.is_credit_memo };
         })
       )
@@ -28,9 +28,9 @@ export default function JobReconciliationModalComponent({ job, invoices }) {
           />
         </Col>
         <Col span={12}>
-          <JobReconciliationInvoicesTable
+          <JobReconciliationBillsTable
             invoiceLineData={invoiceLineData}
-            invoiceLineState={invoiceLineState}
+            billLineState={billLineState}
           />
         </Col>
       </Row>

client/src/components/job-reconciliation-modal/job-reconciliation.modal.container.jsx

@@ -5,27 +5,22 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectReconciliation } from "../../redux/modals/modals.selectors";
-import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import JobReconciliationModalComponent from "./job-reconciliation-modal.component";
 
 const mapStateToProps = createStructuredSelector({
   reconciliationModal: selectReconciliation,
-  bodyshop: selectBodyshop,
-  currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("reconciliation")),
 });
 
-function InvoiceEnterModalContainer({
+function JobReconciliationModalContainer({
   reconciliationModal,
   toggleModalVisible,
-  bodyshop,
-  currentUser,
 }) {
   const { t } = useTranslation();
   const { context, visible } = reconciliationModal;
-  const { job, invoices } = context;
+  const { job, bills } = context;
 
   const handleCancel = () => {
     toggleModalVisible();
@@ -39,8 +34,9 @@ function InvoiceEnterModalContainer({
       okText={t("general.actions.save")}
       onOk={handleCancel}
       onCancel={handleCancel}
-      destroyOnClose>
-      <JobReconciliationModalComponent job={job} invoices={invoices} />
+      destroyOnClose
+    >
+      <JobReconciliationModalComponent job={job} bills={bills} />
     </Modal>
   );
 }
@@ -48,4 +44,4 @@ function InvoiceEnterModalContainer({
 export default connect(
   mapStateToProps,
   mapDispatchToProps
-)(InvoiceEnterModalContainer);
+)(JobReconciliationModalContainer);