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

Merged in feature/IO-2561-Return-Items-Modal (pull request #2131)

Browse Source 
Feature/IO-2561 Return Items Modal

Approved-by: Dave Richer
This commit is contained in:
Allan Carr
2025-02-28 17:36:37 +00:00
committed by Dave Richer
parent 459af4f537 9a71779cfe
commit 32813032e6
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
client/src/components/parts-order-modal/parts-order-modal.component.jsx
View File

@@ -1,17 +1,16 @@
import { DeleteFilled, DownOutlined, WarningFilled } from "@ant-design/icons"; import { DeleteFilled, DownOutlined, WarningFilled } from "@ant-design/icons";
import { useSplitTreatments } from "@splitsoftware/splitio-react"; import { useSplitTreatments } from "@splitsoftware/splitio-react";
import { Checkbox, Divider, Dropdown, Form, Input, InputNumber, Radio, Select, Space, Tag } from "antd"; import { Checkbox, Divider, Dropdown, Form, Input, InputNumber, Radio, Select, Space, Tag } from "antd";
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 DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
import CurrencyInput from "../form-items-formatted/currency-form-item.component"; import CurrencyInput from "../form-items-formatted/currency-form-item.component";
import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component"; import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
import LayoutFormRow from "../layout-form-row/layout-form-row.component"; import LayoutFormRow from "../layout-form-row/layout-form-row.component";
import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component"; import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
import PartsOrderModalPriceChange from "./parts-order-modal-price-change.component"; import PartsOrderModalPriceChange from "./parts-order-modal-price-change.component";
import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop bodyshop: selectBodyshop
@@ -33,7 +32,7 @@ export function PartsOrderModalComponent({ bodyshop, vendorList, sendTypeState,
}); });
const { t } = useTranslation(); const { t } = useTranslation();
const handleClick = ({ item, key, keyPath }) => { const handleClick = ({ item }) => {
form.setFieldsValue({ comments: item.props.value }); form.setFieldsValue({ comments: item.props.value });
}; };
@@ -98,17 +97,18 @@ export function PartsOrderModalComponent({ bodyshop, vendorList, sendTypeState,
<Checkbox /> <Checkbox />
</Form.Item> </Form.Item>
)} )}
{!isReturn && (
<Form.Item name="order_type" initialValue="parts_order" label={t("parts_orders.labels.order_type")}> <Form.Item name="order_type" initialValue="parts_order" label={t("parts_orders.labels.order_type")}>
<Radio.Group disabled={sendType === "oec"}> <Radio.Group disabled={sendType === "oec"}>
<Radio value={"parts_order"}>{t("parts_orders.labels.parts_order")}</Radio> <Radio value={"parts_order"}>{t("parts_orders.labels.parts_order")}</Radio>
<Radio value={"sublet"}>{t("parts_orders.labels.sublet_order")}</Radio> <Radio value={"sublet"}>{t("parts_orders.labels.sublet_order")}</Radio>
</Radio.Group> </Radio.Group>
</Form.Item> </Form.Item>
)}
</LayoutFormRow> </LayoutFormRow>
<Divider orientation="left">{t("parts_orders.labels.inthisorder")}</Divider> <Divider orientation="left">{t("parts_orders.labels.inthisorder")}</Divider>
<Form.List name={["parts_order_lines", "data"]}> <Form.List name={["parts_order_lines", "data"]}>
{(fields, { add, remove, move }) => { {(fields, { remove, move }) => {
return ( return (
<div> <div>
{fields.map((field, index) => ( {fields.map((field, index) => (

6
server/opensearch/os-handler.js
View File

@@ -204,7 +204,7 @@ async function OpenSearchSearchHandler(req, res) {
: process.env.BODY_SHOP_ID_MATCH_OVERRIDE; : process.env.BODY_SHOP_ID_MATCH_OVERRIDE;
const { body } = await osClient.search({ const { body } = await osClient.search({
...(index ? { index } : {}), ...(index ? { index } : { index: ["jobs", "vehicles", "owners", "bills", "payments"] }),
body: { body: {
size: 100, size: 100,
query: { query: {
@@ -248,8 +248,8 @@ async function OpenSearchSearchHandler(req, res) {
"*ownr_fn^8", "*ownr_fn^8",
"*ownr_co_nm^8", "*ownr_co_nm^8",
"*ownr_ph1^8", "*ownr_ph1^8",
"*ownr_ph2^8", "*ownr_ph2^8"
"*" // "*"
] ]
} }
} }