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

BOD-63 Prevent render of invoice detail when not selected

Browse Source
This commit is contained in:
Patrick Fic
2020-05-05 18:03:07 -07:00
parent 2317d7d385
commit 783d2ef433
8 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/components/invoice-form/invoice-form.component.jsx
View File

@@ -1,13 +1,13 @@
import { DatePicker, Form, Input, Statistic, Switch } from "antd";
import React, { useState, useEffect } from "react";
import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import DocumentsUploadContainer from "../documents-upload/documents-upload.container";
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
import JobSearchSelect from "../job-search-select/job-search-select.component";
import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
import InvoiceFormLines from "./invoice-form.lines.component";
import { CalculateInvoiceTotal } from "./invoice-form.totals.utility";
import "./invoice-form.styles.scss";
import { CalculateInvoiceTotal } from "./invoice-form.totals.utility";
export default function InvoiceFormComponent({
form,

24
client/src/components/invoice-form/invoice-form.container.jsx
View File

@@ -24,17 +24,19 @@ export function InvoiceFormContainer({ bodyshop, form, hideVendor }) {
);
return (
<InvoiceFormComponent
form={form}
hideVendor={hideVendor}
roAutoCompleteOptions={RoAutoCompleteData && RoAutoCompleteData.jobs}
vendorAutoCompleteOptions={
VendorAutoCompleteData && VendorAutoCompleteData.vendors
}
loadLines={loadLines}
lineData={lineData ? lineData.joblines : null}
responsibilityCenters={bodyshop.md_responsibility_centers || null}
/>
<div>
<InvoiceFormComponent
form={form}
hideVendor={hideVendor}
roAutoCompleteOptions={RoAutoCompleteData && RoAutoCompleteData.jobs}
vendorAutoCompleteOptions={
VendorAutoCompleteData && VendorAutoCompleteData.vendors
}
loadLines={loadLines}
lineData={lineData ? lineData.joblines : null}
responsibilityCenters={bodyshop.md_responsibility_centers || null}
/>
</div>
);
}
export default connect(mapStateToProps, null)(InvoiceFormContainer);

12
client/src/components/invoice-form/invoice-form.totals.utility.js
View File

@@ -8,20 +8,20 @@ export const CalculateInvoiceTotal = (invoice) => {
local_tax_rate,
state_tax_rate,
} = invoice;
//TODO Determine why this recalculates so many times.
console.log("Calculating invoice total...");
let subtotal = Dinero({ amount: 0 });
let federalTax = Dinero({ amount: 0 });
let stateTax = Dinero({ amount: 0 });
let localTax = Dinero({ amount: 0 });
if (!!!invoicelines) return null;
invoicelines.map((i) => {
invoicelines.forEach((i) => {
if (!!i) {
const itemTotal = Dinero({ amount: i.actual_cost * 100 || 0 }).multiply(
i.quantity || 1
);
const itemTotal = Dinero({
amount: Math.round((i.actual_cost || 0) * 100) || 0,
}).multiply(i.quantity || 1);
subtotal = subtotal.add(itemTotal);
if (i.applicable_taxes.federal) {
console.log("Adding fed tax.");
federalTax = federalTax.add(
itemTotal.percentage(federal_tax_rate || 0)
);