From 510bf9c1b9bda8fa2cf4cc3e50788011ed7923b5 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Fri, 26 Feb 2021 16:02:59 -0800 Subject: [PATCH] Print IH invoices after creation IO-724 --- .../bills-list-table.component.jsx | 17 +++++++++++++--- .../parts-order-list-table.component.jsx | 13 ++++++++---- .../print-wrapper/print-wrapper.component.jsx | 20 +++++++++++-------- client/src/graphql/bills.queries.js | 4 ++++ .../src/pages/bills/bills.page.component.jsx | 16 +++++++++++++-- 5 files changed, 53 insertions(+), 17 deletions(-) diff --git a/client/src/components/bills-list-table/bills-list-table.component.jsx b/client/src/components/bills-list-table/bills-list-table.component.jsx index a930385b7..d279d33b1 100644 --- a/client/src/components/bills-list-table/bills-list-table.component.jsx +++ b/client/src/components/bills-list-table/bills-list-table.component.jsx @@ -18,7 +18,9 @@ import { setModalContext } from "../../redux/modals/modals.actions"; import CurrencyFormatter from "../../utils/CurrencyFormatter"; import { DateFormatter } from "../../utils/DateFormatter"; import { alphaSort } from "../../utils/sorters"; +import { TemplateList } from "../../utils/TemplateConstants"; import BillDeleteButton from "../bill-delete-button/bill-delete-button.component"; +import PrintWrapperComponent from "../print-wrapper/print-wrapper.component"; const mapStateToProps = createStructuredSelector({ //jobRO: selectJobReadOnly, @@ -49,7 +51,7 @@ export function BillsListTableComponent({ }); const search = queryString.parse(useLocation().search); const selectedBill = search.billid; - + const Templates = TemplateList("bill"); const bills = billsQuery.data ? billsQuery.data.bills : []; const { refetch } = billsQuery; const columns = [ @@ -115,7 +117,7 @@ export function BillsListTableComponent({ dataIndex: "actions", key: "actions", render: (text, record) => ( - + {record.exported ? ( ) : ( @@ -126,6 +128,15 @@ export function BillsListTableComponent({ )} + {record.isinhouse && ( + + )} ), }, @@ -275,7 +286,7 @@ export function BillsListTableComponent({ .map((i) => { return { line_desc: i.line_desc, - // db_price: i.actual_price, + // db_price: i.actual_price, act_price: i.actual_price, quantity: i.quantity, joblineid: i.joblineid, diff --git a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx index f930432be..009597238 100644 --- a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx +++ b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx @@ -40,7 +40,7 @@ export function PartsOrderListTableComponent({ setPartsReceiveContext, }) { const responsibilityCenters = bodyshop.md_responsibility_centers; - + const Templates = TemplateList("partsorder"); const { t } = useTranslation(); const [state, setState] = useState({ sortedInfo: {}, @@ -105,7 +105,7 @@ export function PartsOrderListTableComponent({ dataIndex: "actions", key: "actions", render: (text, record) => ( - + @@ -153,7 +156,7 @@ export function BillsListPage({ linesToOrder: record.billlines.map((i) => { return { line_desc: i.line_desc, - // db_price: i.actual_price, + // db_price: i.actual_price, act_price: i.actual_price, quantity: i.quantity, joblineid: i.joblineid, @@ -167,6 +170,15 @@ export function BillsListPage({ {t("bills.actions.return")} + {record.isinhouse && ( + + )} ), },