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

Merged in rome/release/2023-11-24 (pull request #1077)

Browse Source 
Rome/release/2023 11 24
This commit is contained in:
Patrick Fic
2023-11-24 12:59:44 +00:00
parent 146a61c9cf f14dc497cf
commit 151c9c0add
7 changed files with 276 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

212
bodyshop_translations.babel
View File

@@ -1,4 +1,4 @@
<babeledit_project version="1.2" be_version="2.7.1"> <babeledit_project be_version="2.7.1" version="1.2">
<!-- <!--
BabelEdit project file BabelEdit project file
@@ -18453,6 +18453,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>tvmode</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>unknown</name> <name>unknown</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -20080,6 +20101,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>create_ppc</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>db_price</name> <name>db_price</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -46941,6 +46983,27 @@
<folder_node> <folder_node>
<name>labels</name> <name>labels</name>
<children> <children>
<concept_node>
<name>allemployeetimetickets</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>asoftodaytarget</name> <name>asoftodaytarget</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -46962,6 +47025,48 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>body</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>bodycharttitle</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>calendarperiod</name> <name>calendarperiod</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -46983,6 +47088,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>combinedcharttitle</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>dailyactual</name> <name>dailyactual</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -47151,6 +47277,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>priorweek</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>productivestatistics</name> <name>productivestatistics</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -47193,6 +47340,48 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>refinish</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>refinishcharttitle</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>targets</name> <name>targets</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -47277,6 +47466,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>timeticketsemployee</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>todateactual</name> <name>todateactual</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

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

@@ -1,4 +1,5 @@
import { useApolloClient, useMutation } from "@apollo/client"; import { useApolloClient, useMutation } from "@apollo/client";
import { useTreatments } from "@splitsoftware/splitio-react";
import { Button, Checkbox, Form, Modal, Space, notification } from "antd"; import { Button, Checkbox, Form, Modal, Space, notification } from "antd";
import _ from "lodash"; import _ from "lodash";
import React, { useEffect, useMemo, useState } from "react"; import React, { useEffect, useMemo, useState } from "react";
@@ -29,7 +30,6 @@ import BillFormContainer from "../bill-form/bill-form.container";
import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility"; import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility"; import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
import { handleUpload } from "../documents-upload/documents-upload.utility"; import { handleUpload } from "../documents-upload/documents-upload.utility";
import { useTreatments } from "@splitsoftware/splitio-react";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
billEnterModal: selectBillEnterModal, billEnterModal: selectBillEnterModal,
@@ -72,6 +72,11 @@ function BillEnterModalContainer({
const formValues = useMemo(() => { const formValues = useMemo(() => {
return { return {
...billEnterModal.context.bill, ...billEnterModal.context.bill,
//Added as a part of IO-2436 for capturing parts price changes.
billlines: billEnterModal.context?.bill?.billlines?.map((line) => ({
...line,
original_actual_price: line.actual_price,
})),
jobid: jobid:
(billEnterModal.context.job && billEnterModal.context.job.id) || null, (billEnterModal.context.job && billEnterModal.context.job.id) || null,
federal_tax_rate: federal_tax_rate:
@@ -120,6 +125,8 @@ function BillEnterModalContainer({
lbr_adjustment, lbr_adjustment,
location: lineLocation, location: lineLocation,
part_type, part_type,
create_ppc,
original_actual_price,
...restI ...restI
} = i; } = i;
@@ -292,6 +299,14 @@ function BillEnterModalContainer({
location: li.location || location, location: li.location || location,
status: status:
bodyshop.md_order_statuses.default_received || "Received*", bodyshop.md_order_statuses.default_received || "Received*",
//Added parts price changes.
...(li.create_ppc &&
li.original_actual_price !== li.actual_price
? {
act_price_before_ppc: li.original_actual_price,
act_price: li.actual_price,
}
: {}),
}, },
}, },
}); });
@@ -440,6 +455,9 @@ function BillEnterModalContainer({
setEnterAgain(false); setEnterAgain(false);
}} }}
> >
<button onClick={() => console.log(form.getFieldsValue("billlines"))}>
get billlines
</button>
<BillFormContainer <BillFormContainer
form={form} form={form}
disableInvNumber={billEnterModal.context.disableInvNumber} disableInvNumber={billEnterModal.context.disableInvNumber}

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

@@ -2,6 +2,7 @@ import { DeleteFilled, DollarCircleFilled } from "@ant-design/icons";
import { useTreatments } from "@splitsoftware/splitio-react"; import { useTreatments } from "@splitsoftware/splitio-react";
import { import {
Button, Button,
Checkbox,
Form, Form,
Input, Input,
InputNumber, InputNumber,
@@ -101,6 +102,7 @@ export function BillEnterModalLinesComponent({
line_desc: opt.line_desc, line_desc: opt.line_desc,
quantity: opt.part_qty || 1, quantity: opt.part_qty || 1,
actual_price: opt.cost, actual_price: opt.cost,
original_actual_price: opt.cost,
cost_center: opt.part_type cost_center: opt.part_type
? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
? opt.part_type !== "PAE" ? opt.part_type !== "PAE"
@@ -227,6 +229,43 @@ export function BillEnterModalLinesComponent({
}} }}
/> />
), ),
additional: (record, index) => (
<Form.Item
dependencies={["billlines", record.name, "actual_price"]}
noStyle
>
{() => {
const billLine = getFieldValue(["billlines", record.name]);
const jobLine = lineData.find(
(line) => line.id === billLine?.joblineid
);
if (
!billEdit &&
billLine &&
jobLine &&
billLine?.actual_price !== jobLine?.act_price
) {
return (
<Space size="small">
<Form.Item
noStyle
label={t("joblines.fields.create_ppc")}
key={`${index}ppc`}
valuePropName="checked"
name={[record.name, "create_ppc"]}
>
<Checkbox />
</Form.Item>
{t("joblines.fields.create_ppc")}
</Space>
);
} else {
return null;
}
}}
</Form.Item>
),
}, },
{ {
title: t("billlines.fields.actual_cost"), title: t("billlines.fields.actual_cost"),
@@ -368,7 +407,7 @@ export function BillEnterModalLinesComponent({
}, },
formInput: (record, index) => <Switch disabled={disabled} />, formInput: (record, index) => <Switch disabled={disabled} />,
additional: (record, index) => ( additional: (record, index) => (
<Form.Item shouldUpdate style={{ display: "inline-block" }}> <Form.Item shouldUpdate noStyle style={{ display: "inline-block" }}>
{() => { {() => {
const price = getFieldValue([ const price = getFieldValue([
"billlines", "billlines",
@@ -673,7 +712,7 @@ const EditableCell = ({
if (additional) if (additional)
return ( return (
<td {...restProps}> <td {...restProps}>
<Space size="small"> <div size="small">
<Form.Item <Form.Item
name={dataIndex} name={dataIndex}
labelCol={{ span: 0 }} labelCol={{ span: 0 }}
@@ -682,7 +721,7 @@ const EditableCell = ({
{(formInput && formInput(record, record.name)) || children} {(formInput && formInput(record, record.name)) || children}
</Form.Item> </Form.Item>
{additional && additional(record, record.name)} {additional && additional(record, record.name)}
</Space> </div>
</td> </td>
); );
if (wrapper) if (wrapper)

1
client/src/translations/en_us/common.json
View File

@@ -1247,6 +1247,7 @@
"act_price": "Retail Price", "act_price": "Retail Price",
"ah_detail_line": "Mark as Detail Labor Line (Autohouse Only)", "ah_detail_line": "Mark as Detail Labor Line (Autohouse Only)",
"assigned_team": "Team {{name}}", "assigned_team": "Team {{name}}",
"create_ppc": "Create PPC?",
"db_price": "List Price", "db_price": "List Price",
"lbr_types": { "lbr_types": {
"LA1": "LA1", "LA1": "LA1",

1
client/src/translations/es/common.json
View File

@@ -1247,6 +1247,7 @@
"act_price": "Precio actual", "act_price": "Precio actual",
"ah_detail_line": "", "ah_detail_line": "",
"assigned_team": "", "assigned_team": "",
"create_ppc": "",
"db_price": "Precio de base de datos", "db_price": "Precio de base de datos",
"lbr_types": { "lbr_types": {
"LA1": "", "LA1": "",

1
client/src/translations/fr/common.json
View File

@@ -1247,6 +1247,7 @@
"act_price": "Prix actuel", "act_price": "Prix actuel",
"ah_detail_line": "", "ah_detail_line": "",
"assigned_team": "", "assigned_team": "",
"create_ppc": "",
"db_price": "Prix de la base de données", "db_price": "Prix de la base de données",
"lbr_types": { "lbr_types": {
"LA1": "", "LA1": "",

3
server/payroll/pay-all.js
View File

@@ -250,8 +250,7 @@ function CalculateExpectedHoursForJob(job, filterToLbrTypes) {
.forEach((jobline) => { .forEach((jobline) => {
if (jobline.convertedtolbr) { if (jobline.convertedtolbr) {
// Line has been converte to labor. Temporarily re-assign the hours. // Line has been converte to labor. Temporarily re-assign the hours.
jobline.mod_lbr_ty = jobline.mod_lbr_ty = jobline.convertedtolbr_data.mod_lbr_ty;
jobline.mod_lbr_ty || jobline.convertedtolbr_data.mod_lbr_ty;
jobline.mod_lb_hrs += jobline.convertedtolbr_data.mod_lb_hrs; jobline.mod_lb_hrs += jobline.convertedtolbr_data.mod_lb_hrs;
} }
if (jobline.mod_lb_hrs != 0) { if (jobline.mod_lb_hrs != 0) {