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

IO-975 IO-978 IO-922 Multiple bug fixes.

Browse Source
This commit is contained in:
Patrick Fic
2021-05-03 11:53:23 -07:00
parent bf77bbd4ee
commit 1482786b2c
18 changed files with 1722 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
View File

@@ -86,14 +86,24 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
<ProductionListColumnProductionNote record={job} />
</DataLabel>
)}
{job.special_coverage_policy && (
<Tag color="tomato">
<Space>
<WarningFilled />
<span>{t("jobs.labels.specialcoveragepolicy")}</span>
</Space>
</Tag>
)}
<Space>
{job.special_coverage_policy && (
<Tag color="tomato">
<Space>
<WarningFilled />
<span>{t("jobs.labels.specialcoveragepolicy")}</span>
</Space>
</Tag>
)}
{job.ca_gst_registrant && (
<Tag color="geekblue">
<Space>
<WarningFilled />
<span>{t("jobs.fields.ca_gst_registrant")}</span>
</Space>
</Tag>
)}
</Space>
</div>
</Card>
</Col>

11
client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
View File

@@ -1,4 +1,4 @@
import { Form, Input, InputNumber, Select, Space, Switch } from "antd";
import { Form, Input, InputNumber, Select, Space, Switch, Tooltip } from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
@@ -28,6 +28,14 @@ export function JobsDetailRates({ jobRO, form }) {
>
<CurrencyInput disabled={jobRO} />
</Form.Item>
<Tooltip title={t("jobs.labels.ca_gst_all_if_null")}>
<Form.Item
label={t("jobs.fields.ca_customer_gst")}
name="ca_customer_gst"
>
<CurrencyInput disabled={jobRO} />
</Form.Item>
</Tooltip>
<Form.Item
label={t("jobs.fields.other_amount_payable")}
name="other_amount_payable"
@@ -52,7 +60,6 @@ export function JobsDetailRates({ jobRO, form }) {
>
<CurrencyInput disabled={jobRO} />
</Form.Item>
<Space align="end">
<Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
<CurrencyInput disabled={jobRO} />

2
client/src/graphql/jobs.queries.js
View File

@@ -280,6 +280,7 @@ export const QUERY_JOB_COSTING_DETAILS = gql`
actual_in
status
ca_bc_pvrt
ca_customer_gst
joblines(where: { removed: { _eq: false } }) {
id
unq_seq
@@ -499,6 +500,7 @@ export const GET_JOB_BY_PK = gql`
deliverchecklist
voided
ca_bc_pvrt
ca_customer_gst
joblines(where: { removed: { _eq: false } }, order_by: { line_no: asc }) {
id
line_no

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

@@ -130,7 +130,7 @@
"is_credit_memo": "Credit Memo?",
"local_tax_rate": "Local Tax Rate",
"ro_number": "RO Number",
"state_tax_rate": "State Tax Rate",
"state_tax_rate": "Provincial/State Tax Rate",
"total": "Bill Total",
"vendor": "Vendor",
"vendorname": "Vendor Name"
@@ -156,7 +156,7 @@
"new": "New Bill",
"noneselected": "No bill selected.",
"retailtotal": "Bills Retail Total",
"state_tax": "State Tax",
"state_tax": "Provincial/State Tax",
"subtotal": "Subtotal",
"totalreturns": "Total Returns"
},
@@ -195,8 +195,8 @@
},
"appt_length": "Default Appointment Length",
"bill_federal_tax_rate": "Bills - Federal Tax Rate %",
"bill_local_tax_rate": "Bill - State Tax Rate %",
"bill_state_tax_rate": "Bill - State Tax Rate %",
"bill_local_tax_rate": "Bill - Provincial/State Tax Rate %",
"bill_state_tax_rate": "Bill - Provincial/State Tax Rate %",
"city": "City",
"country": "Country",
"dailybodytarget": "Scoreboard - Daily Body Target",
@@ -216,7 +216,7 @@
},
"invoice_federal_tax_rate": "Invoices - Federal Tax Rate",
"invoice_local_tax_rate": "Invoices - Local Tax Rate",
"invoice_state_tax_rate": "Invoices - State Tax Rate",
"invoice_state_tax_rate": "Invoices - Provincial/State Tax Rate",
"lastnumberworkingdays": "Scoreboard - Last Number of Working Days",
"logo_img_path": "Shop Logo",
"logo_img_path_height": "Logo Image Height",
@@ -231,7 +231,7 @@
"md_ins_co": {
"city": "City",
"name": "Insurance Company Name",
"state": "State/Province",
"state": "Province/State",
"street1": "Street 1",
"street2": "Street 2",
"zip": "Zip/Postal Code"
@@ -369,9 +369,9 @@
"description": "Description",
"federal": "Federal Tax Applies",
"local": "Local Tax Applies",
"state": "State Tax Applies"
"state": "Provincial/State Tax Applies"
},
"state_tax": "State Tax",
"state_tax": "Provincial/State Tax",
"tow": "Towing"
},
"schedule_end_time": "Schedule Ending Time",
@@ -389,8 +389,8 @@
"lt": "Less than (hrs)",
"target": "Target (count)"
},
"state": "State/Province",
"state_tax_id": "State Tax ID (PST, QST)",
"state": "Province/State",
"state_tax_id": "Provincial/State Tax ID (PST, QST)",
"status": "Status Label",
"statuses": {
"active_statuses": "Active Statuses (Filtering for Active Jobs throughout system)",
@@ -519,12 +519,12 @@
"driver_city": "Driver City",
"driver_dlexpiry": "Driver's License Expiration Date",
"driver_dlnumber": "Driver's License Number",
"driver_dlst": "Driver's License State",
"driver_dlst": "Driver's License Province/State",
"driver_dob": "Driver's DOB",
"driver_fn": "Driver's First Name",
"driver_ln": "Driver's Last Name",
"driver_ph1": "Driver's Phone",
"driver_state": "Driver's State ",
"driver_state": "Driver's Province/State ",
"driver_zip": "Driver's Postal/ZIP Code",
"excesskmrate": "Excess Mileage",
"federaltax": "Federal Taxes",
@@ -536,7 +536,7 @@
"refuelcharge": "Refuel Charge (per liter/gallon)",
"scheduledreturn": "Scheduled Return",
"start": "Contract Start",
"statetax": "State Taxes",
"statetax": "Provincial/State Taxes",
"status": "Status"
},
"labels": {
@@ -1030,6 +1030,7 @@
"adjustmenthours": "Adjustment Hours",
"alt_transport": "Alt. Trans.",
"ca_bc_pvrt": "PVRT",
"ca_customer_gst": "Customer Portion of GST",
"ca_gst_registrant": "GST Registrant",
"category": "Category",
"ccc": "CC Cleaning",
@@ -1174,7 +1175,7 @@
"servicing_dealer": "Servicing Dealer",
"servicing_dealer_contact": "Servicing Dealer Contact",
"specialcoveragepolicy": "Special Coverage Policy",
"state_tax_rate": "State Tax Rate",
"state_tax_rate": "Provincial/State Tax Rate",
"status": "Job Status",
"storage_payable": "Storage",
"tax_lbr_rt": "Labor Tax Rate",
@@ -1217,6 +1218,7 @@
"days": "Days",
"rate": "PVRT Rate"
},
"ca_gst_all_if_null": "If the job is marked as a \"GST Registrant\" and this value is set to $0, the customer will be responsible for paying all of the GST by default. ",
"cards": {
"customer": "Customer Information",
"damage": "Area of Damage",
@@ -1326,7 +1328,7 @@
"sales": "Sales",
"scheduledinchange": "The scheduled in is based off the latest appointment. To change this date, please schedule or reschedule the job. ",
"specialcoveragepolicy": "Special Coverage Policy Applies",
"state_tax_amt": "State/Provincial Taxes",
"state_tax_amt": "Provincial/State Taxes",
"subletstotal": "Sublets Total",
"subtotal": "Subtotal",
"supplementnote": "The job had a supplement imported on {{date}} at {{time}}.",
@@ -1518,7 +1520,7 @@
"ownr_fn": "First Name",
"ownr_ln": "Last Name",
"ownr_ph1": "Phone 1",
"ownr_st": "State/Province",
"ownr_st": "Province/State",
"ownr_title": "Title",
"ownr_zip": "Zip/Postal Code",
"preferred_contact": "Preferred Contact Method"
@@ -1647,7 +1649,7 @@
"lastname": "Last Name",
"phone1": "Phone 1",
"phone2": "Phone 2",
"state": "state"
"state": "Province/State"
},
"labels": {
"vendorcategory": "Vendor"
@@ -1791,7 +1793,7 @@
},
"profile": {
"errors": {
"state": "Error reading page state. Please refresh."
"state": "Error reading page state. Please refresh."
},
"labels": {
"activeshop": "Active Shop"
@@ -2131,7 +2133,7 @@
"oem": "OEM",
"phone": "Phone",
"prompt_discount": "Prompt Discount %",
"state": "State/Province",
"state": "Province/State",
"street1": "Street",
"street2": "Address 2",
"taxid": "Tax ID",

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

@@ -1030,6 +1030,7 @@
"adjustmenthours": "",
"alt_transport": "",
"ca_bc_pvrt": "",
"ca_customer_gst": "",
"ca_gst_registrant": "",
"category": "",
"ccc": "",
@@ -1217,6 +1218,7 @@
"days": "",
"rate": ""
},
"ca_gst_all_if_null": "",
"cards": {
"customer": "Información al cliente",
"damage": "Área de Daño",
@@ -1791,7 +1793,7 @@
},
"profile": {
"errors": {
"state": "Error al leer el estado de la página. Porfavor refresca."
"state": "Error al leer el estado de la página. Porfavor refresca."
},
"labels": {
"activeshop": ""

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

@@ -1030,6 +1030,7 @@
"adjustmenthours": "",
"alt_transport": "",
"ca_bc_pvrt": "",
"ca_customer_gst": "",
"ca_gst_registrant": "",
"category": "",
"ccc": "",
@@ -1217,6 +1218,7 @@
"days": "",
"rate": ""
},
"ca_gst_all_if_null": "",
"cards": {
"customer": "Informations client",
"damage": "Zone de dommages",
@@ -1791,7 +1793,7 @@
},
"profile": {
"errors": {
"state": "Erreur lors de la lecture de l'état de la page. Rafraichissez, s'il vous plait."
"state": "Erreur lors de la lecture de l'état de la page. Rafraichissez, s'il vous plait."
},
"labels": {
"activeshop": ""