admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IO-2709 Remove additional committed buttons for non enhanced payroll.

Browse Source
This commit is contained in:
Patrick Fic
2024-03-19 13:39:44 -07:00
parent 926ff3cb6f
commit c2a4e75005
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
View File

@@ -16,7 +16,6 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component"; import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
import {HasRbacAccess} from "../rbac-wrapper/rbac-wrapper.component"; import {HasRbacAccess} from "../rbac-wrapper/rbac-wrapper.component";
import TimeTicketList from "../time-ticket-list/time-ticket-list.component"; import TimeTicketList from "../time-ticket-list/time-ticket-list.component";
import TimeTicketCalculatorComponent from "../time-ticket-calculator/time-ticket-calculator.component";
import {useSplitTreatments} from "@splitsoftware/splitio-react"; import {useSplitTreatments} from "@splitsoftware/splitio-react";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({

7
client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
View File

@@ -178,7 +178,7 @@ export function TimeTicketModalContainer({
onCancel={handleCancel} onCancel={handleCancel}
afterClose={() => form.resetFields()} afterClose={() => form.resetFields()}
footer={ footer={
<span> <Space>
<Button onClick={handleCancel}>{t("general.actions.cancel")}</Button> <Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>
<Button <Button
loading={loading} loading={loading}
@@ -198,7 +198,7 @@ export function TimeTicketModalContainer({
{t("general.actions.saveandnew")} {t("general.actions.saveandnew")}
</Button> </Button>
)} )}
</span> </Space>
} }
destroyOnClose destroyOnClose
> >
@@ -229,9 +229,12 @@ export function TimeTicketModalContainer({
<PageHeader <PageHeader
extra={ extra={
<Space> <Space>
{
Enhanced_Payroll.treatment === 'on' &&
<TimeTicketsCommitToggleComponent <TimeTicketsCommitToggleComponent
timeticket={timeTicketModal.context?.timeticket} timeticket={timeTicketModal.context?.timeticket}
/> />
}
<Button onClick={handleCancel}> <Button onClick={handleCancel}>
{t("general.actions.cancel")} {t("general.actions.cancel")}
</Button> </Button>