From 88bc8d4d0544e9f3cf3c0802cbebd25598b8362d Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 1 Feb 2022 15:09:20 -0800 Subject: [PATCH] IO-1695 Edit time stamp when creating time ticket. --- .../bill-form/bill-form.lines.component.jsx | 12 +++--------- .../time-ticket-modal.component.jsx | 4 ++-- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/client/src/components/bill-form/bill-form.lines.component.jsx b/client/src/components/bill-form/bill-form.lines.component.jsx index f1f3c32dd..1c1b198b9 100644 --- a/client/src/components/bill-form/bill-form.lines.component.jsx +++ b/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"; @@ -339,20 +339,14 @@ export function BillEnterModalLinesComponent({ record.name, "actual_price", ]); - console.log( - "🚀 ~ file: bill-form.lines.component.jsx ~ line 342 ~ columns ~ price", - price - ); + const adjustmentRate = getFieldValue([ "billlines", record.name, "lbr_adjustment", "rate", ]); - console.log( - "🚀 ~ file: bill-form.lines.component.jsx ~ line 348 ~ columns ~ adjustmentRate", - adjustmentRate - ); + if (getFieldValue(["billlines", record.name, "deductedfromlbr"])) return (
diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx index 9c3e1f71e..593891939 100644 --- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx +++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx @@ -208,7 +208,7 @@ export function TimeTicketModalComponent({ > - {isEdit && ( + { <> - )} + }