IO-1600 Number of rental days on contract list.
This commit is contained in:
@@ -10011,6 +10011,27 @@
|
||||
</translation>
|
||||
</translations>
|
||||
</concept_node>
|
||||
<concept_node>
|
||||
<name>length</name>
|
||||
<definition_loaded>false</definition_loaded>
|
||||
<description></description>
|
||||
<comment></comment>
|
||||
<default_text></default_text>
|
||||
<translations>
|
||||
<translation>
|
||||
<language>en-US</language>
|
||||
<approved>false</approved>
|
||||
</translation>
|
||||
<translation>
|
||||
<language>es-MX</language>
|
||||
<approved>false</approved>
|
||||
</translation>
|
||||
<translation>
|
||||
<language>fr-CA</language>
|
||||
<approved>false</approved>
|
||||
</translation>
|
||||
</translations>
|
||||
</concept_node>
|
||||
<concept_node>
|
||||
<name>localtax</name>
|
||||
<definition_loaded>false</definition_loaded>
|
||||
|
||||
@@ -11,6 +11,7 @@ import { setModalContext } from "../../redux/modals/modals.actions";
|
||||
|
||||
import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import moment from "moment";
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
//currentUser: selectCurrentUser
|
||||
});
|
||||
@@ -86,7 +87,9 @@ export function ContractsList({
|
||||
} ${record.courtesycar.make} ${record.courtesycar.model}${
|
||||
record.courtesycar.plate ? ` (${record.courtesycar.plate})` : ""
|
||||
}${
|
||||
record.courtesycar.fleetnumber ? ` (${record.courtesycar.fleetnumber})` : ""
|
||||
record.courtesycar.fleetnumber
|
||||
? ` (${record.courtesycar.fleetnumber})`
|
||||
: ""
|
||||
}`}</Link>
|
||||
),
|
||||
},
|
||||
@@ -133,6 +136,19 @@ export function ContractsList({
|
||||
<DateTimeFormatter>{record.actualreturn}</DateTimeFormatter>
|
||||
),
|
||||
},
|
||||
{
|
||||
title: t("contracts.fields.length"),
|
||||
dataIndex: "length",
|
||||
key: "length",
|
||||
|
||||
render: (text, record) =>
|
||||
(record.actualreturn &&
|
||||
record.start &&
|
||||
`${moment(record.actualreturn)
|
||||
.diff(moment(record.start), "days", true)
|
||||
.toFixed(1)} days`) ||
|
||||
"",
|
||||
},
|
||||
];
|
||||
|
||||
const handleTableChange = (pagination, filters, sorter) => {
|
||||
|
||||
@@ -615,6 +615,7 @@
|
||||
"fuelout": "Fuel Out",
|
||||
"kmend": "Mileage End",
|
||||
"kmstart": "Mileage Start",
|
||||
"length": "Length",
|
||||
"localtax": "Local Taxes",
|
||||
"refuelcharge": "Refuel Charge (per liter/gallon)",
|
||||
"scheduledreturn": "Scheduled Return",
|
||||
|
||||
@@ -615,6 +615,7 @@
|
||||
"fuelout": "",
|
||||
"kmend": "",
|
||||
"kmstart": "",
|
||||
"length": "",
|
||||
"localtax": "",
|
||||
"refuelcharge": "",
|
||||
"scheduledreturn": "",
|
||||
|
||||
@@ -615,6 +615,7 @@
|
||||
"fuelout": "",
|
||||
"kmend": "",
|
||||
"kmstart": "",
|
||||
"length": "",
|
||||
"localtax": "",
|
||||
"refuelcharge": "",
|
||||
"scheduledreturn": "",
|
||||
|
||||
Reference in New Issue
Block a user