BOD-17 Added Contracts list page + updates and bugfixes on other pages.

This commit is contained in:
Patrick Fic
2020-04-01 10:48:53 -07:00
parent 28f443277b
commit 2a1cb3fb9f
15 changed files with 253 additions and 16 deletions

View File

@@ -6,7 +6,6 @@ import {
Checkbox,
Descriptions,
Dropdown,
List,
Menu,
notification,
PageHeader,
@@ -16,6 +15,7 @@ import React from "react";
import { useTranslation } from "react-i18next";
import Moment from "react-moment";
import { connect } from "react-redux";
import { Link } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import CarImage from "../../assets/car.svg";
import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -23,7 +23,7 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
import BarcodePopup from "../barcode-popup/barcode-popup.component";
import OwnerTagPopoverComponent from "../owner-tag-popover/owner-tag-popover.component";
import VehicleTagPopoverComponent from "../vehicle-tag-popover/vehicle-tag-popover.component";
import { Link } from "react-router-dom";
import JobsDetailHeaderActions from "../jobs-detail-header-actions/jobs-detail-header-actions.component";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop
@@ -36,7 +36,6 @@ export default connect(
job,
mutationConvertJob,
refetch,
handleFinish,
scheduleModalState,
bodyshop,
updateJobStatus
@@ -99,6 +98,7 @@ export default connect(
>
{t("jobs.actions.convert")}
</Button>,
<JobsDetailHeaderActions key="actions" job={job} />,
<Button type="primary" key="submit" htmlType="submit">
{t("general.actions.save")}
</Button>
@@ -156,7 +156,7 @@ export default connect(
key={item.id}
to={`/manage/courtesycars/contracts/${item.id}`}
>
<div>{`${item.start} - ${item.scheduledreturn}`}</div>
<div>{`${item.agreementnumber} - ${item.start} - ${item.scheduledreturn}`}</div>
</Link>
))}
</Descriptions.Item>