BOD-53 Created vehicle popover and fixed remnant references to vehicle records.
This commit is contained in:
@@ -1,27 +1,16 @@
|
||||
import { DownCircleFilled } from "@ant-design/icons";
|
||||
import {
|
||||
Avatar,
|
||||
Badge,
|
||||
Button,
|
||||
Checkbox,
|
||||
Descriptions,
|
||||
Dropdown,
|
||||
Menu,
|
||||
notification,
|
||||
PageHeader,
|
||||
Tag
|
||||
} from "antd";
|
||||
import { Avatar, Badge, Button, Checkbox, Descriptions, Dropdown, Menu, notification, PageHeader, Tag } from "antd";
|
||||
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";
|
||||
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";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
bodyshop: selectBodyshop
|
||||
@@ -113,25 +102,7 @@ export default connect(
|
||||
<span key="job-status">
|
||||
{job.status ? <Tag color="blue">{job.status}</Tag> : null}
|
||||
<OwnerTagPopoverComponent job={job} />
|
||||
<Tag color="green">
|
||||
{job.vehicleid ? (
|
||||
<Link to={`/manage/vehicles/${job.vehicleid}`}>
|
||||
{`${job.v_model_yr || t("general.labels.na")}
|
||||
${job.v_make_desc || t("general.labels.na")}
|
||||
${job.v_model_desc || t("general.labels.na")} |
|
||||
${job.plate_no || t("general.labels.na")} |
|
||||
${job.v_vin || t("general.labels.na")}`}
|
||||
</Link>
|
||||
) : (
|
||||
<span>
|
||||
{`${job.v_model_yr || t("general.labels.na")}
|
||||
${job.v_make_desc || t("general.labels.na")}
|
||||
${job.v_model_desc || t("general.labels.na")} |
|
||||
${job.plate_no || t("general.labels.na")} |
|
||||
${job.v_vin || t("general.labels.na")}`}
|
||||
</span>
|
||||
)}
|
||||
</Tag>
|
||||
<VehicleTagPopoverComponent job={job} />
|
||||
<BarcodePopup value={job.id} />
|
||||
</span>
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user