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

IO-1824 Allow posting to closed ROs.

Browse Source
This commit is contained in:
Patrick Fic
2022-04-13 15:02:07 -07:00
parent 1eacf43669
commit 5167668958
8 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bodyshop_translations.babel
View File

@@ -3654,6 +3654,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>bill_allow_post_to_closed</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> <concept_node>
<name>bill_federal_tax_rate</name> <name>bill_federal_tax_rate</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

2
client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
View File

@@ -177,8 +177,6 @@ export function BillDetailEditcontainer({
useEffect(() => { useEffect(() => {
if (search.billid && data) { if (search.billid && data) {
form.resetFields(); form.resetFields();
form.resetFields();
form.setFieldsValue(transformData(data));
} }
}, [form, search.billid, data]); }, [form, search.billid, data]);

1
client/src/components/bill-form/bill-form.component.jsx
View File

@@ -229,6 +229,7 @@ export function BillFormComponent({
({ getFieldValue }) => ({ ({ getFieldValue }) => ({
validator(rule, value) { validator(rule, value) {
if ( if (
!bodyshop.bill_allow_post_to_closed &&
(job.status === bodyshop.md_ro_statuses.default_invoiced || (job.status === bodyshop.md_ro_statuses.default_invoiced ||
job.status === bodyshop.md_ro_statuses.default_exported || job.status === bodyshop.md_ro_statuses.default_exported ||
job.status === bodyshop.md_ro_statuses.default_void) && job.status === bodyshop.md_ro_statuses.default_void) &&

7
client/src/components/shop-info/shop-info.general.component.jsx
View File

@@ -558,6 +558,13 @@ export default function ShopInfoGeneral({ form }) {
> >
<Switch /> <Switch />
</Form.Item> </Form.Item>
<Form.Item
name={["bill_allow_post_to_closed"]}
label={t("bodyshop.fields.bill_allow_post_to_closed")}
valuePropName="checked"
>
<Switch />
</Form.Item>
<Form.Item <Form.Item
name={["md_ded_notes"]} name={["md_ded_notes"]}
label={t("bodyshop.fields.md_ded_notes")} label={t("bodyshop.fields.md_ded_notes")}

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

@@ -105,6 +105,7 @@ export const QUERY_BODYSHOP = gql`
md_from_emails md_from_emails
last_name_first last_name_first
md_parts_order_comment md_parts_order_comment
bill_allow_post_to_closed
employees { employees {
user_email user_email
id id
@@ -207,6 +208,7 @@ export const UPDATE_SHOP = gql`
md_from_emails md_from_emails
last_name_first last_name_first
md_parts_order_comment md_parts_order_comment
bill_allow_post_to_closed
employees { employees {
id id
first_name first_name

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

@@ -233,6 +233,7 @@
}, },
"appt_length": "Default Appointment Length", "appt_length": "Default Appointment Length",
"attach_pdf_to_email": "Attach PDF copy to sent emails?", "attach_pdf_to_email": "Attach PDF copy to sent emails?",
"bill_allow_post_to_closed": "Allow Bills to be posted to Closed Jobs",
"bill_federal_tax_rate": "Bills - Federal Tax Rate %", "bill_federal_tax_rate": "Bills - Federal Tax Rate %",
"bill_local_tax_rate": "Bill - Provincial/State Tax Rate %", "bill_local_tax_rate": "Bill - Provincial/State Tax Rate %",
"bill_state_tax_rate": "Bill - Provincial/State Tax Rate %", "bill_state_tax_rate": "Bill - Provincial/State Tax Rate %",

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

@@ -233,6 +233,7 @@
}, },
"appt_length": "", "appt_length": "",
"attach_pdf_to_email": "", "attach_pdf_to_email": "",
"bill_allow_post_to_closed": "",
"bill_federal_tax_rate": "", "bill_federal_tax_rate": "",
"bill_local_tax_rate": "", "bill_local_tax_rate": "",
"bill_state_tax_rate": "", "bill_state_tax_rate": "",

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

@@ -233,6 +233,7 @@
}, },
"appt_length": "", "appt_length": "",
"attach_pdf_to_email": "", "attach_pdf_to_email": "",
"bill_allow_post_to_closed": "",
"bill_federal_tax_rate": "", "bill_federal_tax_rate": "",
"bill_local_tax_rate": "", "bill_local_tax_rate": "",
"bill_state_tax_rate": "", "bill_state_tax_rate": "",