IO-244 IOU updates.

This commit is contained in:
Patrick Fic
2021-12-17 09:54:47 -08:00
parent 7032975709
commit f42ef0749a
3 changed files with 14 additions and 25 deletions

View File

@@ -110,13 +110,6 @@ export function AccountingReceivablesTableComponent({
sorter: (a, b) => alphaSort(a.clm_no, b.clm_no), sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
sortOrder: sortOrder:
state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order, state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
render: (text, record) => {
return record.clm_no ? (
<span>{record.clm_no}</span>
) : (
t("general.labels.unknown")
);
},
}, },
{ {
title: t("jobs.fields.clm_total"), title: t("jobs.fields.clm_total"),
@@ -126,11 +119,7 @@ export function AccountingReceivablesTableComponent({
sortOrder: sortOrder:
state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order, state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
render: (text, record) => { render: (text, record) => {
return record.clm_total ? ( return <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>;
<CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
) : (
t("general.labels.unknown")
);
}, },
}, },
{ {

View File

@@ -1,10 +1,10 @@
import React, { useState, useEffect } from "react";
import { Input, notification, Space } from "antd";
import { FieldTimeOutlined } from "@ant-design/icons"; import { FieldTimeOutlined } from "@ant-design/icons";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
import { useMutation } from "@apollo/client"; import { useMutation } from "@apollo/client";
import { UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries"; import { Input, notification } from "antd";
import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
export default function JobLineNotePopup({ jobline, disabled }) { export default function JobLineNotePopup({ jobline, disabled }) {
const [editing, setEditing] = useState(false); const [editing, setEditing] = useState(false);
@@ -57,21 +57,21 @@ export default function JobLineNotePopup({ jobline, disabled }) {
); );
return ( return (
<div> <div>
{jobline.ioucreated && (
<Space>
<FieldTimeOutlined />
{t("joblines.labels.ioucreated")}
</Space>
)}
<div <div
style={{ style={{
width: "100%", width: "100%",
minHeight: "2rem", ...(jobline.ioucreated ? {} : { minHeight: "2rem" }),
cursor: "pointer", cursor: "pointer",
}} }}
onClick={() => !disabled && setEditing(true)} onClick={() => !disabled && setEditing(true)}
> >
{jobline.notes} {jobline.ioucreated && (
<div>
<FieldTimeOutlined style={{ margin: 0, padding: 0 }} />
{t("joblines.labels.ioucreated")}
</div>
)}
{jobline.notes || null}
</div> </div>
</div> </div>
); );

View File

@@ -109,7 +109,7 @@ export async function CreateIouForJob(
delete line.id; delete line.id;
delete line.__typename; delete line.__typename;
line.oem_partno = `${line.oem_partno ? `${line.oem_partno} - ` : ``}IOU $${ line.oem_partno = `${line.oem_partno ? `${line.oem_partno} - ` : ``}IOU $${
line.act_price || 0 (line.act_price && line.act_price.toFixed(2)) || 0
}/${line.mod_lb_hrs || 0}hrs`; }/${line.mod_lb_hrs || 0}hrs`;
line.act_price = 0; line.act_price = 0;
line.mod_lb_hrs = 0; line.mod_lb_hrs = 0;