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

IO-233 CDK Updates.

Browse Source
This commit is contained in:
Patrick Fic
2021-12-02 13:11:23 -08:00
parent 39ec9d92ec
commit 8d3c2f7af6
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,7 +251,10 @@ function BillEnterModalContainer({
keyboard="false" keyboard="false"
onOk={() => form.submit()} onOk={() => form.submit()}
onCancel={handleCancel} onCancel={handleCancel}
afterClose={() => form.resetFields()} afterClose={() => {
form.resetFields();
setLoading(false);
}}
footer={ footer={
<Space> <Space>
<Button onClick={handleCancel}>{t("general.actions.cancel")}</Button> <Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>

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

@@ -7,14 +7,14 @@ import {
Select, Select,
Space, Space,
Switch, Switch,
Table, Table
} from "antd"; } from "antd";
import React from "react"; import React from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import { selectBodyshop } from "../../redux/user/user.selectors"; import { selectBodyshop } from "../../redux/user/user.selectors";
import CiecaSelect, { GetPartTypeName } from "../../utils/Ciecaselect"; import CiecaSelect from "../../utils/Ciecaselect";
import BillLineSearchSelect from "../bill-line-search-select/bill-line-search-select.component"; import BillLineSearchSelect from "../bill-line-search-select/bill-line-search-select.component";
import CurrencyInput from "../form-items-formatted/currency-form-item.component"; import CurrencyInput from "../form-items-formatted/currency-form-item.component";
@@ -74,7 +74,7 @@ export function BillEnterModalLinesComponent({
actual_price: opt.cost, 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
? GetPartTypeName(opt.part_type) ? opt.part_type
: responsibilityCenters.defaults && : responsibilityCenters.defaults &&
(responsibilityCenters.defaults.costs[ (responsibilityCenters.defaults.costs[
opt.part_type opt.part_type