IO-1914 Schema for inventory and basic adding to inventory.

client/src/components/bill-form/bill-form.component.jsx

@@ -48,6 +48,7 @@ export function BillFormComponent({
   disableInvNumber,
   job,
   loadOutstandingReturns,
+  loadInventory,
 }) {
   const { t } = useTranslation();
   const client = useApolloClient();
@@ -61,6 +62,7 @@ export function BillFormComponent({
     setDiscount(opt.discount);
 
     opt &&
+      !billEdit &&
       loadOutstandingReturns({
         variables: {
           jobId: form.getFieldValue("jobid"),
@@ -86,7 +88,7 @@ export function BillFormComponent({
     const jobId = form.getFieldValue("jobid");
     if (jobId) {
       loadLines({ variables: { id: jobId } });
-      if (form.getFieldValue("is_credit_memo") && vendorId) {
+      if (form.getFieldValue("is_credit_memo") && vendorId && !billEdit) {
         loadOutstandingReturns({
           variables: {
             jobId: jobId,
@@ -95,12 +97,19 @@ export function BillFormComponent({
         });
       }
     }
+
+    if (vendorId === bodyshop.inhousevendorid) {
+      loadInventory();
+    }
   }, [
     form,
+    billEdit,
     loadOutstandingReturns,
+    loadInventory,
     setDiscount,
     vendorAutoCompleteOptions,
     loadLines,
+    bodyshop.inhousevendorid,
   ]);
 
   return (
@@ -425,6 +434,7 @@ export function BillFormComponent({
           form={form}
           responsibilityCenters={responsibilityCenters}
           disabled={disabled}
+          billEdit={billEdit}
         />
       )}
 

client/src/components/bill-form/bill-form.container.jsx

@@ -8,6 +8,9 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import BillFormComponent from "./bill-form.component";
 import BillCmdReturnsTableComponent from "../bill-cm-returns-table/bill-cm-returns-table.component";
 import { QUERY_UNRECEIVED_LINES } from "../../graphql/parts-orders.queries";
+import BillInventoryTable from "../bill-inventory-table/bill-inventory-table.component";
+import { QUERY_OUTSTANDING_INVENTORY } from "../../graphql/inventory.queries";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -20,6 +23,12 @@ export function BillFormContainer({
   disabled,
   disableInvNumber,
 }) {
+  const { Simple_Inventory } = useTreatments(
+    ["Simple_Inventory"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
+
   const { data: VendorAutoCompleteData } = useQuery(
     SEARCH_VENDOR_AUTOCOMPLETE,
     { fetchPolicy: "network-only", nextFetchPolicy: "network-only" }
@@ -31,6 +40,8 @@ export function BillFormContainer({
 
   const [loadOutstandingReturns, { loading: returnLoading, data: returnData }] =
     useLazyQuery(QUERY_UNRECEIVED_LINES);
+  const [loadInventory, { loading: inventoryLoading, data: inventoryData }] =
+    useLazyQuery(QUERY_OUTSTANDING_INVENTORY);
 
   return (
     <>
@@ -47,6 +58,7 @@ export function BillFormContainer({
         responsibilityCenters={bodyshop.md_responsibility_centers || null}
         disableInvNumber={disableInvNumber}
         loadOutstandingReturns={loadOutstandingReturns}
+        loadInventory={loadInventory}
       />
       {!billEdit && (
         <BillCmdReturnsTableComponent
@@ -56,6 +68,14 @@ export function BillFormContainer({
           returnData={returnData}
         />
       )}
+      {!billEdit && Simple_Inventory.treatment === "on" && (
+        <BillInventoryTable
+          form={form}
+          inventoryLoading={inventoryLoading}
+          inventoryData={inventoryData}
+          billEdit={billEdit}
+        />
+      )}
     </>
   );
 }

client/src/components/bill-form/bill-form.lines.component.jsx

@@ -8,7 +8,7 @@ import {
   Space,
   Switch,
   Table,
-  Tooltip
+  Tooltip,
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -18,6 +18,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import CiecaSelect from "../../utils/Ciecaselect";
 import BillLineSearchSelect from "../bill-line-search-select/bill-line-search-select.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
+import BilllineAddInventory from "../billline-add-inventory/billline-add-inventory.component";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -34,6 +35,7 @@ export function BillEnterModalLinesComponent({
   discount,
   form,
   responsibilityCenters,
+  billEdit,
 }) {
   const { t } = useTranslation();
   const { setFieldsValue, getFieldsValue, getFieldValue } = form;
@@ -477,9 +479,20 @@ export function BillEnterModalLinesComponent({
 
         dataIndex: "actions",
         render: (text, record) => (
-          <Button disabled={disabled} onClick={() => remove(record.name)}>
-            <DeleteFilled />
-          </Button>
+          <Space wrap>
+            <Button disabled={disabled} onClick={() => remove(record.name)}>
+              <DeleteFilled />
+            </Button>
+            <Form.Item shouldUpdate noStyle>
+              {() => (
+                <BilllineAddInventory
+                  disabled={!billEdit || form.isFieldsTouched()}
+                  billline={getFieldValue("billlines")[record.fieldKey]}
+                  jobid={getFieldValue("jobid")}
+                />
+              )}
+            </Form.Item>
+          </Space>
         ),
       },
     ];

client/src/components/bill-form/bill-form.totals.utility.js

@@ -18,6 +18,7 @@ export const CalculateBillTotal = (invoice) => {
         amount: Math.round((i.actual_cost || 0) * 100),
       }).multiply(i.quantity || 1);
 
+      console.log(i, itemTotal.toFormat);
       subtotal = subtotal.add(itemTotal);
       if (i.applicable_taxes.federal) {
         federalTax = federalTax.add(