diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx index 5f4bd4385..b4ef464f2 100644 --- a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx +++ b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx @@ -1,7 +1,7 @@ -import { useMutation, useQuery } from "@apollo/client"; -import { Button, Form, Modal, notification, Space } from "antd"; import { PageHeader } from "@ant-design/pro-layout"; -import dayjs from "../../utils/day"; +import { useMutation, useQuery } from "@apollo/client"; +import { useSplitTreatments } from "@splitsoftware/splitio-react"; +import { Button, Form, Modal, notification, Space } from "antd"; import React, { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; @@ -11,9 +11,9 @@ import { INSERT_NEW_TIME_TICKET, UPDATE_TIME_TICKET } from "../../graphql/timeti import { toggleModalVisible } from "../../redux/modals/modals.actions"; import { selectTimeTicket } from "../../redux/modals/modals.selectors"; import { selectBodyshop } from "../../redux/user/user.selectors"; -import TimeTicketModalComponent from "./time-ticket-modal.component"; +import dayjs from "../../utils/day"; import TimeTicketsCommitToggleComponent from "../time-tickets-commit-toggle/time-tickets-commit-toggle.component"; -import { useSplitTreatments } from "@splitsoftware/splitio-react"; +import TimeTicketModalComponent from "./time-ticket-modal.component"; const mapStateToProps = createStructuredSelector({ timeTicketModal: selectTimeTicket, @@ -87,7 +87,7 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible, if (enterAgain) { //Capture the existing information and repopulate it. - const prev = form.getFieldsValue(["date", "employeeid"]); + const prev = form.getFieldsValue(["date", "employeeid", "flat_rate"]); form.resetFields(); diff --git a/server/accounting/pbs/pbs-job-export.js b/server/accounting/pbs/pbs-job-export.js index c2f6b96b7..c38560293 100644 --- a/server/accounting/pbs/pbs-job-export.js +++ b/server/accounting/pbs/pbs-job-export.js @@ -611,7 +611,7 @@ async function InsertFailedExportLog(socket, error) { bodyshopid: socket.JobData.bodyshop.id, jobid: socket.JobData.id, successful: false, - message: [error], + message: JSON.stringify(error), useremail: socket.user.email } }); diff --git a/server/cdk/cdk-job-export.js b/server/cdk/cdk-job-export.js index 7fedbc608..90001fa28 100644 --- a/server/cdk/cdk-job-export.js +++ b/server/cdk/cdk-job-export.js @@ -995,7 +995,7 @@ async function InsertFailedExportLog(socket, error) { bodyshopid: socket.JobData.bodyshop.id, jobid: socket.JobData.id, successful: false, - message: [error], + message: JSON.stringify(error), useremail: socket.user.email } });