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

Refactored how in house invoices are created IO-460

Browse Source
This commit is contained in:
Patrick Fic
2021-01-08 11:40:32 -08:00
parent 3ca416c5cf
commit 6f96bcfa7e
15 changed files with 323 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
View File

@@ -183,7 +183,10 @@ function BillEnterModalContainer({
0,
}}
>
<BillFormContainer form={form} />
<BillFormContainer
form={form}
disableInvNumber={billEnterModal.context.disableInvNumber}
/>
</Form>
</Modal>
);

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

@@ -39,6 +39,7 @@ export function BillFormComponent({
responsibilityCenters,
loadLines,
billEdit,
disableInvNumber,
}) {
const { t } = useTranslation();
const client = useApolloClient();
@@ -142,7 +143,15 @@ export function BillFormComponent({
}),
]}
>
<Input disabled={disabled} />
<Input disabled={disabled || disableInvNumber} />
</Form.Item>
<Form.Item
// label={t("bills.fields.isinhouse")}
style={{ display: "none" }}
name="isinhouse"
valuePropName="checked"
>
<Switch />
</Form.Item>
<Form.Item
label={t("bills.fields.date")}
@@ -193,7 +202,6 @@ export function BillFormComponent({
>
<CurrencyInput min={0} />
</Form.Item>
<Form.Item label={t("bills.fields.allpartslocation")} name="location">
<Select style={{ width: "10rem" }} disabled={disabled}>
{bodyshop.md_parts_locations.map((loc, idx) => (

9
client/src/components/bill-form/bill-form.container.jsx
View File

@@ -11,7 +11,13 @@ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
});
export function BillFormContainer({ bodyshop, form, billEdit, disabled }) {
export function BillFormContainer({
bodyshop,
form,
billEdit,
disabled,
disableInvNumber,
}) {
const { data: VendorAutoCompleteData } = useQuery(SEARCH_VENDOR_AUTOCOMPLETE);
const [loadLines, { data: lineData }] = useLazyQuery(
@@ -29,6 +35,7 @@ export function BillFormContainer({ bodyshop, form, billEdit, disabled }) {
loadLines={loadLines}
lineData={lineData ? lineData.joblines : []}
responsibilityCenters={bodyshop.md_responsibility_centers || null}
disableInvNumber={disableInvNumber}
/>
);
}

1
client/src/components/parts-order-modal/parts-order-modal.component.jsx
View File

@@ -81,6 +81,7 @@ export default function PartsOrderModalComponent({
>
<Input />
</Form.Item>
<Form.Item
label={t("parts_orders.fields.act_price")}
key={`${index}act_price`}

78
client/src/components/parts-order-modal/parts-order-modal.container.jsx
View File

@@ -1,29 +1,31 @@
import { useMutation, useQuery } from "@apollo/react-hooks";
import { Form, Modal, notification } from "antd";
import moment from "moment";
import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { INSERT_NEW_BILL } from "../../graphql/bills.queries";
import { logImEXEvent } from "../../firebase/firebase.utils";
import { UPDATE_JOB_LINE_STATUS } from "../../graphql/jobs-lines.queries";
import { INSERT_NEW_PARTS_ORDERS } from "../../graphql/parts-orders.queries";
import { QUERY_ALL_VENDORS_FOR_ORDER } from "../../graphql/vendors.queries";
import { setEmailOptions } from "../../redux/email/email.actions";
import { toggleModalVisible } from "../../redux/modals/modals.actions";
import {
setModalContext,
toggleModalVisible,
} from "../../redux/modals/modals.actions";
import { selectPartsOrder } from "../../redux/modals/modals.selectors";
import {
selectBodyshop,
selectCurrentUser,
} from "../../redux/user/user.selectors";
import AlertComponent from "../alert/alert.component";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
import PartsOrderModalComponent from "./parts-order-modal.component";
import RenderTemplate, {
displayTemplateInWindow,
} from "../../utils/RenderTemplate";
import moment from "moment";
import { TemplateList } from "../../utils/TemplateConstants";
import { logImEXEvent } from "../../firebase/firebase.utils";
import AlertComponent from "../alert/alert.component";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
import PartsOrderModalComponent from "./parts-order-modal.component";
const mapStateToProps = createStructuredSelector({
currentUser: selectCurrentUser,
@@ -34,6 +36,8 @@ const mapStateToProps = createStructuredSelector({
const mapDispatchToProps = (dispatch) => ({
setEmailOptions: (e) => dispatch(setEmailOptions(e)),
toggleModalVisible: () => dispatch(toggleModalVisible("partsOrder")),
setBillEnterContext: (context) =>
dispatch(setModalContext({ context: context, modal: "billEnter" })),
});
export function PartsOrderModalContainer({
@@ -42,6 +46,7 @@ export function PartsOrderModalContainer({
currentUser,
bodyshop,
setEmailOptions,
setBillEnterContext,
}) {
const { t } = useTranslation();
@@ -68,7 +73,6 @@ export function PartsOrderModalContainer({
const [insertPartOrder] = useMutation(INSERT_NEW_PARTS_ORDERS);
const [updateJobLines] = useMutation(UPDATE_JOB_LINE_STATUS);
const [insertBill] = useMutation(INSERT_NEW_BILL);
const handleFinish = async (values) => {
logImEXEvent("parts_order_insert");
@@ -113,37 +117,37 @@ export function PartsOrderModalContainer({
});
if (values.vendorid === bodyshop.inhousevendorid) {
logImEXEvent("parts_order_inhouse_invoice");
let invoiceToPost = {
vendorid: bodyshop.inhousevendorid,
isinhouse: true,
jobid: jobId,
total: 0,
invoice_number: "ih",
federal_tax_rate: bodyshop.bill_tax_rates.federal_tax_rate || 0,
state_tax_rate: bodyshop.bill_tax_rates.state_tax_rate || 0,
local_tax_rate: bodyshop.bill_tax_rates.local_tax_rate || 0,
billlines: {
data: values.parts_order_lines.data.map((p) => {
return {
joblineid: p.job_line_id,
actual_price: p.act_price,
actual_cost: p.act_price,
line_desc: p.line_desc,
line_remarks: p.line_remarks,
quantity: p.quantity || 1,
cost_center:
bodyshop.md_responsibility_centers.defaults.costs.PAO ||
"Other*",
};
}),
setBillEnterContext({
actions: { refetch: refetch },
context: {
disableInvNumber: true,
job: { id: jobId },
bill: {
vendorid: bodyshop.inhousevendorid,
invoice_number: "ih",
isinhouse: true,
date: new moment(),
billlines: values.parts_order_lines.data.map((p) => {
return {
joblineid: p.job_line_id,
actual_price: p.act_price,
actual_cost: p.act_price,
line_desc: p.line_desc,
line_remarks: p.line_remarks,
part_type: p.part_type,
quantity: p.quantity || 1,
applicable_taxes: {
local: false,
state: p.tax_part,
federal: true,
},
};
}),
},
},
};
await insertBill({
variables: { bill: invoiceToPost },
});
toggleModalVisible();
return;
}
if (refetch) refetch();

1
client/src/graphql/jobs-lines.queries.js
View File

@@ -22,6 +22,7 @@ export const GET_JOB_LINES_BY_PK = gql`
status
notes
location
tax_part
parts_order_lines {
id
parts_order {

5
hasura/migrations/1610131746926_alter_table_public_parts_order_lines_add_column_part_type/down.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."parts_order_lines" DROP COLUMN "part_type";
type: run_sql

5
hasura/migrations/1610131746926_alter_table_public_parts_order_lines_add_column_part_type/up.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."parts_order_lines" ADD COLUMN "part_type" text NULL;
type: run_sql

40
hasura/migrations/1610131757812_update_permission_user_public_table_parts_order_lines/down.yaml Normal file
View File

@@ -0,0 +1,40 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_insert_permission
- args:
permission:
check:
parts_order:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- act_price
- backordered_eta
- backordered_on
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- quantity
- status
- updated_at
set: {}
role: user
table:
name: parts_order_lines
schema: public
type: create_insert_permission

41
hasura/migrations/1610131757812_update_permission_user_public_table_parts_order_lines/up.yaml Normal file
View File

@@ -0,0 +1,41 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_insert_permission
- args:
permission:
check:
parts_order:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- act_price
- backordered_eta
- backordered_on
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- part_type
- quantity
- status
- updated_at
set: {}
role: user
table:
name: parts_order_lines
schema: public
type: create_insert_permission

41
hasura/migrations/1610131767244_update_permission_user_public_table_parts_order_lines/down.yaml Normal file
View File

@@ -0,0 +1,41 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- act_price
- backordered_eta
- backordered_on
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- quantity
- status
- updated_at
computed_fields: []
filter:
parts_order:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: parts_order_lines
schema: public
type: create_select_permission

42
hasura/migrations/1610131767244_update_permission_user_public_table_parts_order_lines/up.yaml Normal file
View File

@@ -0,0 +1,42 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- act_price
- backordered_eta
- backordered_on
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- part_type
- quantity
- status
- updated_at
computed_fields: []
filter:
parts_order:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: parts_order_lines
schema: public
type: create_select_permission

40
hasura/migrations/1610131775615_update_permission_user_public_table_parts_order_lines/down.yaml Normal file
View File

@@ -0,0 +1,40 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_update_permission
- args:
permission:
columns:
- act_price
- backordered_eta
- backordered_on
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- quantity
- status
- updated_at
filter:
parts_order:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
set: {}
role: user
table:
name: parts_order_lines
schema: public
type: create_update_permission

41
hasura/migrations/1610131775615_update_permission_user_public_table_parts_order_lines/up.yaml Normal file
View File

@@ -0,0 +1,41 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_update_permission
- args:
permission:
columns:
- act_price
- backordered_eta
- backordered_on
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- part_type
- quantity
- status
- updated_at
filter:
parts_order:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
set: {}
role: user
table:
name: parts_order_lines
schema: public
type: create_update_permission

3
hasura/migrations/metadata.yaml
View File

@@ -3241,6 +3241,7 @@ tables:
- line_remarks
- oem_partno
- orderid
- part_type
- quantity
- status
- updated_at
@@ -3259,6 +3260,7 @@ tables:
- line_remarks
- oem_partno
- orderid
- part_type
- quantity
- status
- updated_at
@@ -3288,6 +3290,7 @@ tables:
- line_remarks
- oem_partno
- orderid
- part_type
- quantity
- status
- updated_at