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

Merged in feature/2021-07-30 (pull request #159)

Browse Source 
feature/2021-07-30

Approved-by: Patrick Fic
This commit is contained in:
Patrick Fic
2021-08-04 00:42:40 +00:00
parent 8fb39f9ea4 3e0385479f
commit ed45347c23
2 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,7 +142,10 @@ export function JobsDetailHeaderActions({
</Menu.Item> </Menu.Item>
<Menu.Item <Menu.Item
key="entertimetickets" key="entertimetickets"
disabled={!job.converted} disabled={
!job.converted ||
(!bodyshop.tt_allow_post_to_invoiced && job.date_invoiced)
}
onClick={() => { onClick={() => {
logImEXEvent("job_header_enter_time_ticekts"); logImEXEvent("job_header_enter_time_ticekts");

56
client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
View File

@@ -89,7 +89,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
> >
<Input onBlur={handleBlur} /> <Input onBlur={handleBlur} />
</Form.Item> </Form.Item>
<Form.Item {/* <Form.Item
label={t( label={t(
"bodyshop.fields.responsibilitycenter_accountnumber" "bodyshop.fields.responsibilitycenter_accountnumber"
)} )}
@@ -103,7 +103,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
]} ]}
> >
<Input onBlur={handleBlur} /> <Input onBlur={handleBlur} />
</Form.Item> </Form.Item> */}
<Form.Item <Form.Item
label={t( label={t(
"bodyshop.fields.responsibilitycenter_accountdesc" "bodyshop.fields.responsibilitycenter_accountdesc"
@@ -119,7 +119,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
> >
<Input onBlur={handleBlur} /> <Input onBlur={handleBlur} />
</Form.Item> </Form.Item>
<Form.Item {/* <Form.Item
label={t( label={t(
"bodyshop.fields.responsibilitycenter_accountitem" "bodyshop.fields.responsibilitycenter_accountitem"
)} )}
@@ -133,7 +133,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
]} ]}
> >
<Input onBlur={handleBlur} /> <Input onBlur={handleBlur} />
</Form.Item> </Form.Item> */}
<DeleteFilled <DeleteFilled
onClick={() => { onClick={() => {
remove(field.name); remove(field.name);
@@ -182,7 +182,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
> >
<Input onBlur={handleBlur} /> <Input onBlur={handleBlur} />
</Form.Item> </Form.Item>
<Form.Item {/* <Form.Item
label={t( label={t(
"bodyshop.fields.responsibilitycenter_accountname" "bodyshop.fields.responsibilitycenter_accountname"
)} )}
@@ -211,7 +211,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
]} ]}
> >
<Input onBlur={handleBlur} /> <Input onBlur={handleBlur} />
</Form.Item> </Form.Item> */}
<Form.Item <Form.Item
label={t( label={t(
"bodyshop.fields.responsibilitycenter_accountdesc" "bodyshop.fields.responsibilitycenter_accountdesc"
@@ -1081,7 +1081,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item {/* <Form.Item
label={t("bodyshop.fields.responsibilitycenter_accountnumber")} label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
rules={[ rules={[
{ {
@@ -1097,8 +1097,8 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
]} ]}
> >
<Input /> <Input />
</Form.Item> </Form.Item> */}
<Form.Item {/* <Form.Item
label={t("bodyshop.fields.responsibilitycenter_accountname")} label={t("bodyshop.fields.responsibilitycenter_accountname")}
rules={[ rules={[
{ {
@@ -1114,7 +1114,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
]} ]}
> >
<Input /> <Input />
</Form.Item> </Form.Item> */}
<Form.Item <Form.Item
label={t("bodyshop.fields.responsibilitycenter_accountdesc")} label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
rules={[ rules={[
@@ -1175,7 +1175,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item {/* <Form.Item
label={t("bodyshop.fields.responsibilitycenter_accountnumber")} label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
rules={[ rules={[
{ {
@@ -1203,7 +1203,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
name={["md_responsibility_centers", "taxes", "state", "accountname"]} name={["md_responsibility_centers", "taxes", "state", "accountname"]}
> >
<Input /> <Input />
</Form.Item> </Form.Item> */}
<Form.Item <Form.Item
label={t("bodyshop.fields.responsibilitycenter_accountdesc")} label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
rules={[ rules={[
@@ -1254,7 +1254,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item {/* <Form.Item
label={t("bodyshop.fields.responsibilitycenter_accountnumber")} label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
rules={[ rules={[
{ {
@@ -1282,7 +1282,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
name={["md_responsibility_centers", "taxes", "local", "accountname"]} name={["md_responsibility_centers", "taxes", "local", "accountname"]}
> >
<Input /> <Input />
</Form.Item> </Form.Item> */}
<Form.Item <Form.Item
label={t("bodyshop.fields.responsibilitycenter_accountdesc")} label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
rules={[ rules={[
@@ -1320,8 +1320,8 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
<InputNumber precision={2} /> <InputNumber precision={2} />
</Form.Item> </Form.Item>
</LayoutFormRow> </LayoutFormRow>
<LayoutFormRow> <LayoutFormRow header={<div>AR</div>}>
<Form.Item {/* <Form.Item
label={t("bodyshop.fields.responsibilitycenters.ar")} label={t("bodyshop.fields.responsibilitycenters.ar")}
rules={[ rules={[
{ {
@@ -1344,7 +1344,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
name={["md_responsibility_centers", "ar", "accountnumber"]} name={["md_responsibility_centers", "ar", "accountnumber"]}
> >
<Input /> <Input />
</Form.Item> </Form.Item> */}
<Form.Item <Form.Item
label={t("bodyshop.fields.responsibilitycenter_accountname")} label={t("bodyshop.fields.responsibilitycenter_accountname")}
rules={[ rules={[
@@ -1357,7 +1357,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item {/* <Form.Item
label={t("bodyshop.fields.responsibilitycenter_accountdesc")} label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
rules={[ rules={[
{ {
@@ -1380,9 +1380,9 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
name={["md_responsibility_centers", "ar", "accountitem"]} name={["md_responsibility_centers", "ar", "accountitem"]}
> >
<Input /> <Input />
</Form.Item> </Form.Item> */}
</LayoutFormRow> </LayoutFormRow>
<LayoutFormRow> {/* <LayoutFormRow>
<Form.Item <Form.Item
label={t("bodyshop.fields.responsibilitycenters.ap")} label={t("bodyshop.fields.responsibilitycenters.ap")}
rules={[ rules={[
@@ -1443,9 +1443,9 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
> >
<Input /> <Input />
</Form.Item> </Form.Item>
</LayoutFormRow> </LayoutFormRow> */}
<LayoutFormRow> <LayoutFormRow header={<div>Refund</div>}>
<Form.Item {/* <Form.Item
label={t("bodyshop.fields.responsibilitycenters.refund")} label={t("bodyshop.fields.responsibilitycenters.refund")}
rules={[ rules={[
{ {
@@ -1456,8 +1456,8 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
name={["md_responsibility_centers", "refund", "name"]} name={["md_responsibility_centers", "refund", "name"]}
> >
<Input /> <Input />
</Form.Item> </Form.Item> */}
<Form.Item {/* <Form.Item
label={t("bodyshop.fields.responsibilitycenter_accountnumber")} label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
rules={[ rules={[
{ {
@@ -1468,8 +1468,8 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
name={["md_responsibility_centers", "refund", "accountnumber"]} name={["md_responsibility_centers", "refund", "accountnumber"]}
> >
<Input /> <Input />
</Form.Item> </Form.Item> */}
<Form.Item {/* <Form.Item
label={t("bodyshop.fields.responsibilitycenter_accountname")} label={t("bodyshop.fields.responsibilitycenter_accountname")}
rules={[ rules={[
{ {
@@ -1492,7 +1492,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
name={["md_responsibility_centers", "refund", "accountdesc"]} name={["md_responsibility_centers", "refund", "accountdesc"]}
> >
<Input /> <Input />
</Form.Item> </Form.Item> */}
<Form.Item <Form.Item
label={t("bodyshop.fields.responsibilitycenter_accountitem")} label={t("bodyshop.fields.responsibilitycenter_accountitem")}
rules={[ rules={[