Merged in release/2022-05-27 (pull request #491)

release/2022-05-27

Approved-by: Patrick Fic

bodyshop_translations.babel

@@ -32076,6 +32076,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>note</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>ownr_addr1</name>
                                         <definition_loaded>false</definition_loaded>

client/src/components/accounting-payables-table/accounting-payables-table.component.jsx

@@ -14,6 +14,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
+import BillMarkSelectedExported from "../payable-mark-selected-exported/payable-mark-selected-exported.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -28,7 +29,12 @@ export default connect(
   mapDispatchToProps
 )(AccountingPayablesTableComponent);
 
-export function AccountingPayablesTableComponent({ bodyshop, loading, bills, refetch }) {
+export function AccountingPayablesTableComponent({
+  bodyshop,
+  loading,
+  bills,
+  refetch,
+}) {
   const { t } = useTranslation();
   const [selectedBills, setSelectedBills] = useState([]);
   const [transInProgress, setTransInProgress] = useState(false);
@@ -143,15 +149,13 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, bills, ref
       sorter: (a, b) => a.clm_total - b.clm_total,
 
       render: (text, record) => (
-        <div>
-          <PayableExportButton
-            billId={record.id}
-            disabled={transInProgress || !!record.exported}
-            loadingCallback={setTransInProgress}
-            setSelectedBills={setSelectedBills}
-            refetch={refetch}
-          />
-        </div>
+        <PayableExportButton
+          billId={record.id}
+          disabled={transInProgress || !!record.exported}
+          loadingCallback={setTransInProgress}
+          setSelectedBills={setSelectedBills}
+          refetch={refetch}
+        />
       ),
     },
   ];
@@ -177,6 +181,13 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, bills, ref
     <Card
       extra={
         <Space wrap>
+          <BillMarkSelectedExported
+            billids={selectedBills}
+            disabled={transInProgress || selectedBills.length === 0}
+            loadingCallback={setTransInProgress}
+            completedCallback={setSelectedBills}
+            refetch={refetch}
+          />
           <PayableExportAll
             billids={selectedBills}
             disabled={transInProgress || selectedBills.length === 0}

client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx

@@ -10,7 +10,7 @@ export default function CABCpvrtCalculator({ disabled, form }) {
 
   const handleFinish = async (values) => {
     logImEXEvent("job_ca_bc_pvrt_calculate");
-    form.setFieldsValue({ ca_bc_pvrt: (values.rate * values.days).toFixed(2) });
+    form.setFieldsValue({ ca_bc_pvrt: ((values.rate||0) * (values.days||0)).toFixed(2) });
     setVisibility(false);
   };
 

client/src/components/owner-detail-form/owner-detail-form.component.jsx

@@ -14,7 +14,6 @@ export default function OwnerDetailFormComponent({ form, loading }) {
   return (
     <div>
       <FormFieldsChanged form={form} />
-
       <LayoutFormRow header={t("owners.forms.name")}>
         <Form.Item label={t("owners.fields.ownr_title")} name="ownr_title">
           <Input />
@@ -29,7 +28,6 @@ export default function OwnerDetailFormComponent({ form, loading }) {
           <Input />
         </Form.Item>
       </LayoutFormRow>
-
       <LayoutFormRow header={t("owners.forms.address")}>
         <Form.Item label={t("owners.fields.ownr_addr1")} name="ownr_addr1">
           <Input />
@@ -50,7 +48,6 @@ export default function OwnerDetailFormComponent({ form, loading }) {
           <Input />
         </Form.Item>
       </LayoutFormRow>
-
       <LayoutFormRow header={t("owners.forms.contact")}>
         <Form.Item
           label={t("owners.fields.allow_text_message")}
@@ -98,6 +95,9 @@ export default function OwnerDetailFormComponent({ form, loading }) {
           <Input />
         </Form.Item>
       </LayoutFormRow>
+      <Form.Item label={t("owners.fields.note")} name="note">
+        <Input.TextArea rows={4} />
+      </Form.Item>
     </div>
   );
 }

client/src/components/owner-find-modal/owner-find-modal.component.jsx

@@ -59,6 +59,14 @@ export default function OwnerFindModalComponent({
         <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
       ),
     },
+    {
+      title: t("owners.fields.note"),
+      dataIndex: "note",
+      key: "note",
+      render: (text, record) => (
+        <span style={{ whiteSpace: "pre" }}>{record.note}</span>
+      ),
+    },
   ];
 
   const handleOnRowClick = (record) => {

client/src/components/parts-order-modal/parts-order-modal.container.jsx

@@ -101,6 +101,7 @@ export function PartsOrderModalContainer({
         po: [
           {
             ...values,
+            order_date: moment().format("YYYY-MM-DD"),
             orderedby: currentUser.email,
             jobid: jobId,
             user_email: currentUser.email,

client/src/components/parts-receive-modal/parts-receive-modal.container.jsx

@@ -1,6 +1,6 @@
 import { useMutation } from "@apollo/client";
 import { Form, Modal, notification } from "antd";
-import React, { useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -31,7 +31,7 @@ export function PartsReceiveModalContainer({
   bodyshop,
 }) {
   const { t } = useTranslation();
-
+  const [loading, setLoading] = useState(false);
   const { visible, context, actions } = partsReceiveModal;
   const { partsorderlines } = context;
 
@@ -42,7 +42,7 @@ export function PartsReceiveModalContainer({
 
   const handleFinish = async (values) => {
     logImEXEvent("parts_order_receive");
-
+    setLoading(true);
     const result = await Promise.all(
       values.partsorderlines.map((li) => {
         return receivePartsLine({
@@ -75,7 +75,7 @@ export function PartsReceiveModalContainer({
     notification["success"]({
       message: t("parts_orders.successes.received"),
     });
-
+    setLoading(false);
     if (refetch) refetch();
     toggleModalVisible();
   };
@@ -96,6 +96,7 @@ export function PartsReceiveModalContainer({
       title={t("parts_orders.labels.receive")}
       onCancel={() => toggleModalVisible()}
       onOk={() => form.submit()}
+      okButtonProps={{ loading: loading }}
       destroyOnClose
       forceRender
       width="50%"

client/src/components/payable-mark-selected-exported/payable-mark-selected-exported.component.jsx

@@ -0,0 +1,79 @@
+import { gql, useMutation } from "@apollo/client";
+import { Button, notification } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import {
+  selectAuthLevel,
+  selectBodyshop,
+} from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  authLevel: selectAuthLevel,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(BillMarkSelectedExported);
+
+export function BillMarkSelectedExported({
+  billids,
+  disabled,
+  loadingCallback,
+  completedCallback,
+  refetch,
+}) {
+  const { t } = useTranslation();
+  const [loading, setLoading] = useState(false);
+
+  const [updateBill] = useMutation(gql`
+    mutation UPDATE_BILL($billIds: [uuid!]!) {
+      update_bills(where: { id: { _in: $billIds } }, _set: { exported: true }) {
+        returning {
+          id
+          exported
+          exported_at
+        }
+      }
+    }
+  `);
+
+  const handleUpdate = async () => {
+    setLoading(true);
+    loadingCallback(true);
+    const result = await updateBill({
+      variables: { billIds: billids },
+      update(cache){
+          
+      }
+    });
+
+    if (!result.errors) {
+      notification["success"]({
+        message: t("bills.successes.markexported"),
+      });
+    } else {
+      notification["error"]({
+        message: t("bills.errors.saving", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+    loadingCallback(false);
+    completedCallback && completedCallback([]);
+    setLoading(false);
+    refetch && refetch();
+  };
+
+  return (
+    <Button loading={loading} disabled={disabled} onClick={handleUpdate}>
+      {t("bills.labels.markexported")}
+    </Button>
+  );
+}

client/src/components/production-list-columns/production-list-columns.add.component.jsx

@@ -42,17 +42,24 @@ export function ProductionColumnsComponent({
   };
 
   const columnKeys = columns.map((i) => i.key);
-
+  const cols = dataSource({
+    technician,
+    state: tableState,
+    activeStatuses: bodyshop.md_ro_statuses.active_statuses,
+  });
   const menu = (
-    <Menu onClick={handleAdd}>
-      {dataSource({
-        technician,
-        state: tableState,
-        activeStatuses: bodyshop.md_ro_statuses.active_statuses,
-      })
+    <Menu
+      onClick={handleAdd}
+      style={{
+        columnCount: Math.max(Math.floor(cols.length / 10), 1),
+      }}
+    >
+      {cols
         .filter((i) => !columnKeys.includes(i.key))
         .map((item) => (
-          <Menu.Item key={item.key}>{item.title}</Menu.Item>
+          <Menu.Item key={item.key} style={{ breakInside: "avoid" }}>
+            {item.title}
+          </Menu.Item>
         ))}
     </Menu>
   );

client/src/graphql/owners.queries.js

@@ -15,6 +15,7 @@ export const QUERY_SEARCH_OWNER_BY_IDX = gql`
       ownr_st
       ownr_zip
       id
+      note
     }
   }
 `;
@@ -65,6 +66,7 @@ export const QUERY_OWNER_BY_ID = gql`
       ownr_title
       ownr_zip
       preferred_contact
+      note
       jobs {
         id
         ro_number

client/src/translations/en_us/common.json

@@ -1893,6 +1893,7 @@
 				"address": "Address",
 				"allow_text_message": "Permission to Text?",
 				"name": "Name",
+				"note": "Owner Note",
 				"ownr_addr1": "Address",
 				"ownr_addr2": "Address 2",
 				"ownr_city": "City",

client/src/translations/es/common.json

@@ -1893,6 +1893,7 @@
 				"address": "Dirección",
 				"allow_text_message": "Permiso de texto?",
 				"name": "Nombre",
+				"note": "",
 				"ownr_addr1": "Dirección",
 				"ownr_addr2": "Dirección 2",
 				"ownr_city": "ciudad",

client/src/translations/fr/common.json

@@ -1893,6 +1893,7 @@
 				"address": "Adresse",
 				"allow_text_message": "Autorisation de texte?",
 				"name": "Prénom",
+				"note": "",
 				"ownr_addr1": "Adresse",
 				"ownr_addr2": "Adresse 2 ",
 				"ownr_city": "Ville",

hasura/metadata/tables.yaml

@@ -3823,32 +3823,36 @@
                 - active:
                     _eq: true
         columns:
-          - id
+          - accountingid
+          - allow_text_message
           - created_at
-          - updated_at
-          - ownr_fn
-          - ownr_ln
+          - id
+          - note
           - ownr_addr1
           - ownr_addr2
           - ownr_city
-          - ownr_st
-          - ownr_zip
+          - ownr_co_nm
           - ownr_ctry
           - ownr_ea
+          - ownr_fn
+          - ownr_ln
           - ownr_ph1
-          - preferred_contact
-          - allow_text_message
-          - shopid
           - ownr_ph2
-          - ownr_co_nm
+          - ownr_st
           - ownr_title
-          - accountingid
+          - ownr_zip
+          - preferred_contact
+          - shopid
+          - updated_at
   select_permissions:
     - role: user
       permission:
         columns:
-          - allow_text_message
           - accountingid
+          - allow_text_message
+          - created_at
+          - id
+          - note
           - ownr_addr1
           - ownr_addr2
           - ownr_city
@@ -3863,10 +3867,8 @@
           - ownr_title
           - ownr_zip
           - preferred_contact
-          - created_at
-          - updated_at
-          - id
           - shopid
+          - updated_at
         filter:
           bodyshop:
             associations:
@@ -3881,8 +3883,11 @@
     - role: user
       permission:
         columns:
-          - allow_text_message
           - accountingid
+          - allow_text_message
+          - created_at
+          - id
+          - note
           - ownr_addr1
           - ownr_addr2
           - ownr_city
@@ -3897,10 +3902,8 @@
           - ownr_title
           - ownr_zip
           - preferred_contact
-          - created_at
-          - updated_at
-          - id
           - shopid
+          - updated_at
         filter:
           bodyshop:
             associations:

hasura/migrations/1653589931102_alter_table_public_owners_add_column_note/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."owners" add column "note" text
+--  null;

hasura/migrations/1653589931102_alter_table_public_owners_add_column_note/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."owners" add column "note" text
+ null;