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

Added rate fields to contracts BOD-233

Browse Source
This commit is contained in:
Patrick Fic
2020-07-29 11:52:02 -07:00
parent b19546576c
commit d185db9b41
38 changed files with 878 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
client/src/components/contract-form/contract-form.component.jsx
View File

@@ -254,6 +254,55 @@ export default function ContractFormComponent({ form }) {
<Input />
</Form.Item>
</LayoutFormRow>
<LayoutFormRow>
<Form.Item label={t("contracts.fields.dailyrate")} name="dailyrate">
<InputNumber precision={2} />
</Form.Item>
<Form.Item label={t("contracts.fields.actax")} name="actax">
<InputNumber precision={2} />
</Form.Item>
<Form.Item label={t("contracts.fields.dailyfreekm")} name="dailyfreekm">
<InputNumber precision={2} />
</Form.Item>
<Form.Item
label={t("contracts.fields.refuelcharge")}
name="refuelcharge"
>
<InputNumber precision={2} />
</Form.Item>
<Form.Item
label={t("contracts.fields.excesskmrate")}
name="excesskmrate"
>
<InputNumber precision={2} />
</Form.Item>
<Form.Item
label={t("contracts.fields.cleanupcharge")}
name="cleanupcharge"
>
<InputNumber precision={2} />
</Form.Item>
</LayoutFormRow>
<LayoutFormRow>
<Form.Item
label={t("contracts.fields.damagewaiver")}
name="damagewaiver"
>
<InputNumber precision={2} />
</Form.Item>
<Form.Item label={t("contracts.fields.federaltax")} name="federaltax">
<InputNumber precision={2} />
</Form.Item>
<Form.Item label={t("contracts.fields.statetax")} name="statetax">
<InputNumber precision={2} />
</Form.Item>
<Form.Item label={t("contracts.fields.localtax")} name="localtax">
<InputNumber precision={2} />
</Form.Item>
<Form.Item label={t("contracts.fields.coverage")} name="coverage">
<InputNumber precision={2} />
</Form.Item>
</LayoutFormRow>
</div>
);
}

8
client/src/components/contracts-list/contracts-list.component.jsx
View File

@@ -1,11 +1,11 @@
import { Table, Button, Input } from "antd";
import { SyncOutlined } from "@ant-design/icons";
import { Button, Input, Table } from "antd";
import queryString from "query-string";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { Link, useHistory, useLocation } from "react-router-dom";
import { DateTimeFormatter } from "../../utils/DateFormatter";
import { alphaSort } from "../../utils/sorters";
import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
import queryString from "query-string";
import { SyncOutlined } from "@ant-design/icons";
import TimeTicketsDatesSelector from "../ticket-tickets-dates-selector/time-tickets-dates-selector.component";
export default function ContractsList({ loading, contracts, refetch, total }) {

11
client/src/graphql/cccontracts.queries.js
View File

@@ -68,6 +68,17 @@ export const QUERY_CONTRACT_BY_PK = gql`
driver_zip
id
jobid
dailyrate
actax
dailyfreekm
refuelcharge
excesskmrate
cleanupcharge
damagewaiver
federaltax
statetax
localtax
coverage
job {
id
est_number

11
client/src/translations/en_us/common.json
View File

@@ -199,11 +199,17 @@
"selectjobandcar": "Please ensure both a car and job are selected."
},
"fields": {
"actax": "A/C Tax",
"actualreturn": "Actual Return Date",
"agreementnumber": "Agreement Number",
"cc_cardholder": "Cardholder Name",
"cc_expiry": "Credit Card Expiry Date",
"cc_num": "Credit Card Number",
"cleanupcharge": "Clean Up Charge",
"coverage": "Coverage",
"dailyfreekm": "Daily Free Mileage",
"dailyrate": "Daily Rate",
"damagewaiver": "Damage Waiver",
"driver": "Driver",
"driver_addr1": "Driver Address 1",
"driver_addr2": "Driver Address 2",
@@ -217,10 +223,15 @@
"driver_ph1": "Driver's Phone",
"driver_state": "Driver's State ",
"driver_zip": "Driver's Postal/ZIP Code",
"excesskmrate": "Excess Mileage",
"federaltax": "Federal Taxes",
"kmend": "Mileage End",
"kmstart": "Mileage Start",
"localtax": "Local Taxes",
"refuelcharge": "Refuel Charge (per liter/gallon)",
"scheduledreturn": "Scheduled Return",
"start": "Contract Start",
"statetax": "State Taxes",
"status": "Status"
},
"labels": {

11
client/src/translations/es/common.json
View File

@@ -199,11 +199,17 @@
"selectjobandcar": ""
},
"fields": {
"actax": "",
"actualreturn": "",
"agreementnumber": "",
"cc_cardholder": "",
"cc_expiry": "",
"cc_num": "",
"cleanupcharge": "",
"coverage": "",
"dailyfreekm": "",
"dailyrate": "",
"damagewaiver": "",
"driver": "",
"driver_addr1": "",
"driver_addr2": "",
@@ -217,10 +223,15 @@
"driver_ph1": "",
"driver_state": "",
"driver_zip": "",
"excesskmrate": "",
"federaltax": "",
"kmend": "",
"kmstart": "",
"localtax": "",
"refuelcharge": "",
"scheduledreturn": "",
"start": " ",
"statetax": "",
"status": ""
},
"labels": {

11
client/src/translations/fr/common.json
View File

@@ -199,11 +199,17 @@
"selectjobandcar": ""
},
"fields": {
"actax": "",
"actualreturn": "",
"agreementnumber": "",
"cc_cardholder": "",
"cc_expiry": "",
"cc_num": "",
"cleanupcharge": "",
"coverage": "",
"dailyfreekm": "",
"dailyrate": "",
"damagewaiver": "",
"driver": "",
"driver_addr1": "",
"driver_addr2": "",
@@ -217,10 +223,15 @@
"driver_ph1": "",
"driver_state": "",
"driver_zip": "",
"excesskmrate": "",
"federaltax": "",
"kmend": "",
"kmstart": "",
"localtax": "",
"refuelcharge": "",
"scheduledreturn": "",
"start": "",
"statetax": "",
"status": ""
},
"labels": {