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

Merge branch 'test-AIO' into feature/IO-2458-RO-Closer

Browse Source 
# Conflicts:
#	client/src/components/job-bills-total/job-bills-total.component.jsx
#	client/src/components/job-costing-statistics/job-costing-statistics.component.jsx
#	client/src/components/job-lifecycle/job-lifecycle.component.jsx
#	client/src/components/job-payments/job-payments.component.jsx
#	client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
#	client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx
#	client/src/components/shop-info/shop-info.component.jsx
#	client/src/graphql/bodyshop.queries.js
#	client/src/graphql/jobs.queries.js
#	client/src/pages/jobs-close/jobs-close.component.jsx
#	client/src/utils/instanceRenderMgr.js
This commit is contained in:
Patrick Fic
2024-04-04 11:12:49 -07:00
parent 5e63ce7271 926c13569d
commit c4d39cf3d3
878 changed files with 101740 additions and 115371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
client/src/components/job-bills-total/job-bills-total.component.jsx
View File

@@ -1,7 +1,7 @@
import { Alert, Card, Col, Row, Space, Statistic, Tooltip, Typography } from 'antd';
import { Alert, Card, Col, Row, Space, Statistic, Tooltip, Typography } from 'antd';
import Dinero from 'dinero.js';
import React from 'react';
import { useTranslation } from 'react-i18next';
import { useTranslation } from 'react-i18next';
import InstanceRenderManager from '../../utils/instanceRenderMgr';
import AlertComponent from '../alert/alert.component';
import LoadingSkeleton from '../loading-skeleton/loading-skeleton.component';
@@ -39,7 +39,7 @@ export default function JobBillsTotalComponent({
if (p.return) {
totalReturns = totalReturns.add(
Dinero({
amount: Math.round((pol.act_price || 0) * 100),
amount: Math.round((pol.act_price || 0) * 100)
}).multiply(pol.quantity)
);
@@ -50,13 +50,13 @@ export default function JobBillsTotalComponent({
if (pol.cm_received === false) {
totalReturnsMarkedNotReceived = totalReturnsMarkedNotReceived.add(
Dinero({
amount: Math.round((pol.act_price || 0) * 100),
amount: Math.round((pol.act_price || 0) * 100)
}).multiply(pol.quantity)
);
} else {
totalReturnsMarkedReceived = totalReturnsMarkedReceived.add(
Dinero({
amount: Math.round((pol.act_price || 0) * 100),
amount: Math.round((pol.act_price || 0) * 100)
}).multiply(pol.quantity)
);
}
@@ -70,20 +70,20 @@ export default function JobBillsTotalComponent({
if (!i.is_credit_memo) {
billTotals = billTotals.add(
Dinero({
amount: Math.round((il.actual_price || 0) * 100),
amount: Math.round((il.actual_price || 0) * 100)
}).multiply(il.quantity)
);
} else {
billCms = billCms.add(
Dinero({
amount: Math.round((il.actual_price || 0) * 100),
amount: Math.round((il.actual_price || 0) * 100)
}).multiply(il.quantity)
);
}
if (il.deductedfromlbr) {
lbrAdjustments = lbrAdjustments.add(
Dinero({
amount: Math.round((il.actual_price || 0) * 100),
amount: Math.round((il.actual_price || 0) * 100)
}).multiply(il.quantity)
);
}
@@ -98,7 +98,7 @@ export default function JobBillsTotalComponent({
InstanceRenderManager({
imex: Dinero(),
rome: Dinero(totals.additional.additionalCosts),
promanager: 'USE_ROME',
promanager: "USE_ROME"
})
); // Additional costs were captured for Rome, but not imex.