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

Added ordering invoice as in house BOD-101

Browse Source
This commit is contained in:
Patrick Fic
2020-05-11 13:41:58 -07:00
parent 3af8b28764
commit fc4e07bb32
28 changed files with 631 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
View File

@@ -1,4 +1,4 @@
import { Table } from "antd";
import { Table, Button } from "antd";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
@@ -7,7 +7,7 @@ import { alphaSort } from "../../utils/sorters";
export default function CourtesyCarsList({ loading, courtesycars }) {
const [state, setState] = useState({
sortedInfo: {},
filteredInfo: { text: "" }
filteredInfo: { text: "" },
});
const { t } = useTranslation();
@@ -19,7 +19,7 @@ export default function CourtesyCarsList({ loading, courtesycars }) {
key: "fleetnumber",
sorter: (a, b) => alphaSort(a.fleetnumber, b.fleetnumber),
sortOrder:
state.sortedInfo.columnKey === "fleetnumber" && state.sortedInfo.order
state.sortedInfo.columnKey === "fleetnumber" && state.sortedInfo.order,
},
{
title: t("courtesycars.fields.vin"),
@@ -29,7 +29,7 @@ export default function CourtesyCarsList({ loading, courtesycars }) {
sortOrder: state.sortedInfo.columnKey === "vin" && state.sortedInfo.order,
render: (text, record) => (
<Link to={`/manage/courtesycars/${record.id}`}>{record.vin}</Link>
)
),
},
{
title: t("courtesycars.fields.status"),
@@ -38,21 +38,23 @@ export default function CourtesyCarsList({ loading, courtesycars }) {
sorter: (a, b) => alphaSort(a.status, b.status),
sortOrder:
state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
render: (text, record) => t(record.status)
render: (text, record) => t(record.status),
},
{
title: t("courtesycars.fields.year"),
dataIndex: "year",
key: "year",
sorter: (a, b) => alphaSort(a.year, b.year),
sortOrder: state.sortedInfo.columnKey === "year" && state.sortedInfo.order
sortOrder:
state.sortedInfo.columnKey === "year" && state.sortedInfo.order,
},
{
title: t("courtesycars.fields.make"),
dataIndex: "make",
key: "make",
sorter: (a, b) => alphaSort(a.make, b.make),
sortOrder: state.sortedInfo.columnKey === "make" && state.sortedInfo.order
sortOrder:
state.sortedInfo.columnKey === "make" && state.sortedInfo.order,
},
{
title: t("courtesycars.fields.model"),
@@ -60,8 +62,8 @@ export default function CourtesyCarsList({ loading, courtesycars }) {
key: "model",
sorter: (a, b) => alphaSort(a.model, b.model),
sortOrder:
state.sortedInfo.columnKey === "model" && state.sortedInfo.order
}
state.sortedInfo.columnKey === "model" && state.sortedInfo.order,
},
];
const handleTableChange = (pagination, filters, sorter) => {
@@ -71,9 +73,14 @@ export default function CourtesyCarsList({ loading, courtesycars }) {
return (
<Table
loading={loading}
title={() => (
<Link to={`/manage/courtesycars/new`}>
<Button>{t("courtesycars.actions.new")}</Button>
</Link>
)}
size="small"
pagination={{ position: "top" }}
columns={columns.map(item => ({ ...item }))}
columns={columns.map((item) => ({ ...item }))}
rowKey="id"
dataSource={courtesycars}
onChange={handleTableChange}

4
client/src/components/invoices-list-table/invoices-list-table.component.jsx
View File

@@ -64,7 +64,9 @@ export default function InvoicesListTableComponent({
dataIndex: "actions",
key: "actions",
render: (text, record) => (
<Link to={`/manage/invoices/${record.id}`}>
<Link
to={`/manage/invoices?invoiceid=${record.id}&vendorid=${record.vendorid}`}
>
<Button>{t("invoices.actions.edit")}</Button>
</Link>
),

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

@@ -1,12 +1,12 @@
import { DeleteFilled } from "@ant-design/icons";
import { DatePicker, Form, Input, Radio } from "antd";
import { DatePicker, Form, Input, Radio, InputNumber } from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
export default function PartsOrderModalComponent({
vendorList,
sendTypeState
sendTypeState,
}) {
const [sendType, setSendType] = sendTypeState;
@@ -20,8 +20,8 @@ export default function PartsOrderModalComponent({
rules={[
{
required: true,
message: t("general.validation.required")
}
message: t("general.validation.required"),
},
]}
>
<VendorSearchSelect options={vendorList} />
@@ -31,8 +31,8 @@ export default function PartsOrderModalComponent({
rules={[
{
required: true,
message: t("general.validation.required")
}
message: t("general.validation.required"),
},
]}
label={t("parts_orders.fields.deliver_by")}
>
@@ -54,8 +54,8 @@ export default function PartsOrderModalComponent({
rules={[
{
required: true,
message: t("general.validation.required")
}
message: t("general.validation.required"),
},
]}
>
<Input />
@@ -81,6 +81,13 @@ export default function PartsOrderModalComponent({
>
<CurrencyInput />
</Form.Item>
<Form.Item
label={t("parts_orders.fields.quantity")}
key={`${index}quantity`}
name={[field.name, "quantity"]}
>
<InputNumber />
</Form.Item>
<DeleteFilled
onClick={() => {
remove(field.name);
@@ -95,7 +102,7 @@ export default function PartsOrderModalComponent({
</Form.List>
<Radio.Group
defaultValue={sendType}
onChange={e => setSendType(e.target.value)}
onChange={(e) => setSendType(e.target.value)}
>
<Radio value={"e"}>{t("parts_orders.labels.email")}</Radio>
<Radio value={"p"}>{t("parts_orders.labels.print")}</Radio>

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

@@ -8,6 +8,7 @@ import { EmailSettings } from "../../emails/constants";
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 { INSERT_NEW_INVOICE } from "../../graphql/invoices.queries";
import { setEmailOptions } from "../../redux/email/email.actions";
import { toggleModalVisible } from "../../redux/modals/modals.actions";
import { selectPartsOrder } from "../../redux/modals/modals.selectors";
@@ -52,8 +53,11 @@ export function PartsOrderModalContainer({
});
const [insertPartOrder] = useMutation(INSERT_NEW_PARTS_ORDERS);
const [updateJobLines] = useMutation(UPDATE_JOB_LINE_STATUS);
const [insertInvoice] = useMutation(INSERT_NEW_INVOICE);
const handleFinish = async (values) => {
//Check if this was actuall an inhouse invoice
const handleFinish = (values) => {
insertPartOrder({
variables: {
po: [
@@ -77,6 +81,39 @@ export function PartsOrderModalContainer({
notification["success"]({
message: t("parts_orders.successes.created"),
});
if (values.vendorid === bodyshop.inhousevendorid) {
console.log("Inhouse Invoice needs to be psoted.");
let invoiceToPost = {
vendorid: bodyshop.inhousevendorid,
jobid: jobId,
total: 0,
invoice_number: `${jobId}`, //TODO Add INhouse invoice generation?
federal_tax_rate:
bodyshop.invoice_tax_rates.federal_tax_rate || 0,
state_tax_rate: bodyshop.invoice_tax_rates.state_tax_rate || 0,
local_tax_rate: bodyshop.invoice_tax_rates.local_tax_rate || 0,
invoicelines: {
data: values.parts_order_lines.data.map((p) => {
return {
joblineid: p.job_line_id,
actual_price: 0,
actual_cost: 0,
line_desc: p.line_desc,
quantity: p.quantity || 1,
cost_center:
bodyshop.md_responsibility_centers.defaults.PAO ||
"Other*",
};
}),
},
};
const invoiceResult = insertInvoice({
variables: { invoice: invoiceToPost },
});
}
if (refetch) refetch();
toggleModalVisible();
@@ -84,10 +121,6 @@ export function PartsOrderModalContainer({
//TODO Remove hardcoding
setEmailOptions({
messageOptions: {
from: {
name: bodyshop.shopname || EmailSettings.fromNameDefault,
address: EmailSettings.fromAddress,
},
to:
data.vendors.filter((item) => item.id === values.id)[0] ||
null,
@@ -127,6 +160,7 @@ export function PartsOrderModalContainer({
oem_partno: value.oem_partno,
db_price: value.db_price,
act_price: value.act_price,
quantity: value.part_qty,
job_line_id: value.id,
status: bodyshop.md_order_statuses.default_ordered || "Ordered*",
});

2
client/src/components/vendors-form/vendors-form.container.jsx
View File

@@ -25,7 +25,7 @@ function VendorsFormContainer({ selectedVendor, refetch, bodyshop }) {
const { loading, error, data } = useQuery(QUERY_VENDOR_BY_ID, {
variables: { id: (selectedVendor && selectedVendor.id) || null },
fetchPolicy: "network-only",
skip: !selectedVendor
skip: !!!selectedVendor
});
const [updateVendor] = useMutation(UPDATE_VENDOR);
const [insertvendor] = useMutation(INSERT_NEW_VENDOR);

7
client/src/components/vendors-list/vendors-list.container.jsx
View File

@@ -6,14 +6,13 @@ import VendorsListComponent from "./vendors-list.component";
export default function VendorsListContainer({ selectedVendorState }) {
const [selectedVendor, setSelectedVendor] = selectedVendorState;
const { loading, error, data } = useQuery(QUERY_ALL_VENDORS, {
fetchPolicy: "network-only"
});
const { loading, error, data } = useQuery(QUERY_ALL_VENDORS);
const handleNewVendor = () => {
setSelectedVendor({});
};
const handleOnRowClick = record => {
const handleOnRowClick = (record) => {
if (record) {
setSelectedVendor(record);
} else setSelectedVendor(null);