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

Merged in development (pull request #38) SIT 2 Bug Fixes IO-764 IO-766 IO-762 IO-761 IO-757

Browse Source
This commit is contained in:
Patrick Fic
2021-03-18 17:37:35 +00:00
parent 2d08d368f1 62738c50a9
commit 024bb48062
42 changed files with 2887 additions and 31131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
.eslintrc.json
View File

@@ -1,21 +1,20 @@
{
env: {
es6: true,
node: true,
"env": {
"es6": true,
"node": true
},
extends: "eslint:recommended",
globals: {
Atomics: "readonly",
SharedArrayBuffer: "readonly",
"extends": "eslint:recommended",
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly"
},
parserOptions: {
ecmaVersion: 2018,
sourceType: "module",
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module"
},
// plugins: [],
rules: {
"rules": {
"no-console": "off"
},
settings: {},
};
"settings": {}
}

63
bodyshop_translations.babel
View File

@@ -14885,6 +14885,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>scanimport</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>totalscalc</name>
<definition_loaded>false</definition_loaded>
@@ -19471,6 +19492,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>diskscan</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>documents</name>
<definition_loaded>false</definition_loaded>
@@ -24188,6 +24230,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>cost</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>db_price</name>
<definition_loaded>false</definition_loaded>

26887
client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

1
client/src/components/bills-list-table/bills-list-table.component.jsx
View File

@@ -288,6 +288,7 @@ export function BillsListTableComponent({
line_desc: i.line_desc,
// db_price: i.actual_price,
act_price: i.actual_price,
cost: i.actual_cost,
quantity: i.quantity,
joblineid: i.joblineid,
};

159
client/src/components/jobs-available-scan/jobs-available-scan.component.jsx Normal file
View File

@@ -0,0 +1,159 @@
import { DownloadOutlined, SyncOutlined } from "@ant-design/icons";
import { Button, Input, notification, Space, Table } from "antd";
import axios from "axios";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { selectPartnerVersion } from "../../redux/application/application.selectors";
import { alphaSort } from "../../utils/sorters";
const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser
partnerVersion: selectPartnerVersion,
});
const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language))
});
export default connect(mapStateToProps, mapDispatchToProps)(JobsAvailableScan);
export function JobsAvailableScan({ partnerVersion, refetch }) {
const [estimatesOnDisk, setEstimatesOnDisk] = useState([]);
const [loading, setLoading] = useState(false);
const [searchText, setSearchText] = useState("");
const [state, setState] = useState({
sortedInfo: {},
filteredInfo: { text: "" },
});
const { t } = useTranslation();
const handleTableChange = (pagination, filters, sorter) => {
setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
};
const handleImport = async (filepath) => {
setLoading(true);
const response = await axios.post("http://localhost:1337/import/", {
filepath,
});
if (response.data.success) {
//Came through
if(refetch) refetch()
} else {
notification["error"]({ message: t("jobs.errors.scanimport", {message: response.data.error}) });
}
setLoading(false);
};
const columns = [
{
title: t("jobs.fields.cieca_id"),
dataIndex: "cieca_id",
key: "cieca_id",
sorter: (a, b) => alphaSort(a, b),
sortOrder:
state.sortedInfo.columnKey === "cieca_id" && state.sortedInfo.order,
},
{
title: t("jobs.fields.owner"),
dataIndex: "owner",
key: "owner",
ellipsis: true,
sorter: (a, b) => alphaSort(a.owner, b.owner),
sortOrder:
state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
},
{
title: t("jobs.fields.vehicle"),
dataIndex: "vehicle",
key: "vehicle",
sorter: (a, b) => alphaSort(a.vehicle, b.vehicle),
sortOrder:
state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
},
{
title: t("jobs.fields.clm_no"),
dataIndex: "clm_no",
key: "clm_no",
sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
sortOrder:
state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
},
{
title: t("jobs.fields.ins_co_nm"),
dataIndex: "ins_co_nm",
key: "ins_co_nm",
sorter: (a, b) => alphaSort(a.ins_co_nm, b.ins_co_nm),
sortOrder:
state.sortedInfo.columnKey === "ins_co_nm" && state.sortedInfo.order,
},
{
title: t("general.labels.actions"),
key: "actions",
render: (text, record) => (
<Button onClick={() => handleImport(record.filepath)}>
<DownloadOutlined />
</Button>
),
},
];
const scanEstimates = async () => {
setLoading(true);
const estimatesOnDiskResponse = await axios.post(
"http://localhost:1337/scan/"
);
setEstimatesOnDisk(estimatesOnDiskResponse.data);
setLoading(false);
};
const data = estimatesOnDisk
? searchText
? estimatesOnDisk.filter(
(j) =>
(j.owner || "").toLowerCase().includes(searchText.toLowerCase()) ||
(j.vehicle || "")
.toLowerCase()
.includes(searchText.toLowerCase()) ||
(j.clm_no || "").toLowerCase().includes(searchText.toLowerCase())
)
: estimatesOnDisk
: [];
return (
<Table
loading={loading}
title={() => {
return (
<div className="imex-table-header">
<Space>
<strong>{t("jobs.labels.diskscan")}</strong>
<Button
loading={loading}
disabled={!partnerVersion}
onClick={() => {
scanEstimates();
}}
>
<SyncOutlined />
</Button>
</Space>
<div className="imex-table-header__search">
<Input.Search
placeholder={t("general.labels.search")}
onChange={(e) => {
setSearchText(e.currentTarget.value);
}}
/>
</div>
</div>
);
}}
size="small"
pagination={{ position: "top" }}
columns={columns}
rowKey="id"
dataSource={data}
onChange={handleTableChange}
/>
);
}

2
client/src/components/jobs-available-table/jobs-available-table.container.jsx
View File

@@ -30,6 +30,7 @@ import {
selectCurrentUser,
} from "../../redux/user/user.selectors";
import AlertComponent from "../alert/alert.component";
import JobsAvailableScan from "../jobs-available-scan/jobs-available-scan.component";
import JobsFindModalContainer from "../jobs-find-modal/jobs-find-modal.container";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
import OwnerFindModalContainer from "../owner-find-modal/owner-find-modal.container";
@@ -364,6 +365,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
addJobAsNew={addJobAsNew}
addJobAsSupp={addJobAsSupp}
/>
<JobsAvailableScan refetch={refetch} />
</LoadingSpinner>
);
}

22
client/src/components/partner-ping/partner-ping.component.jsx
View File

@@ -3,16 +3,34 @@ import axios from "axios";
import React, { useEffect } from "react";
import { useTranslation } from "react-i18next";
export default function PartnerPingComponent() {
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { setPartnerVersion } from "../../redux/application/application.actions";
const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser
});
const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language))
setPartnerVersion: (version) => dispatch(setPartnerVersion(version)),
});
export default connect(
mapStateToProps,
mapDispatchToProps
)(PartnerPingComponent);
export function PartnerPingComponent({ setPartnerVersion }) {
const { t } = useTranslation();
useEffect(() => {
// Create an scoped async function in the hook
async function checkPartnerStatus() {
try {
if (process.env.NODE_ENV === "development") return;
//if (process.env.NODE_ENV === "development") return;
const PartnerResponse = await axios.post("http://localhost:1337/ping/");
const { appver, qbpath } = PartnerResponse.data;
console.log("SETTING PARTNER VERSION.");
setPartnerVersion(appver);
console.log({ appver, qbpath });
if (!qbpath) {
notification["error"]({

21
client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
View File

@@ -185,6 +185,10 @@ export function PartsOrderListTableComponent({
setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
};
const selectedPartsOrderRecord = parts_orders.find(
(r) => r.id === selectedpartsorder
);
const rowExpander = (record) => {
const columns = [
{
@@ -206,6 +210,7 @@ export function PartsOrderListTableComponent({
<CurrencyFormatter>{record.db_price}</CurrencyFormatter>
),
},
{
title: t("parts_orders.fields.act_price"),
dataIndex: "act_price",
@@ -217,7 +222,21 @@ export function PartsOrderListTableComponent({
<CurrencyFormatter>{record.act_price}</CurrencyFormatter>
),
},
...(selectedPartsOrderRecord && selectedPartsOrderRecord.isReturn
? [
{
title: t("parts_orders.fields.cost"),
dataIndex: "cost",
key: "cost",
sorter: (a, b) => a.cost - b.cost,
sortOrder:
state.sortedInfo.columnKey === "cost" && state.sortedInfo.order,
render: (text, record) => (
<CurrencyFormatter>{record.cost}</CurrencyFormatter>
),
},
]
: []),
{
title: t("parts_orders.fields.oem_partno"),
dataIndex: "oem_partno",

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

@@ -98,6 +98,16 @@ export default function PartsOrderModalComponent({
>
<CurrencyInput />
</Form.Item>
{isReturn && (
<Form.Item
label={t("parts_orders.fields.cost")}
key={`${index}cost`}
name={[field.name, "cost"]}
>
<CurrencyInput />
</Form.Item>
)}
<Form.Item
label={t("parts_orders.fields.quantity")}
key={`${index}quantity`}

1
client/src/components/parts-order-modal/parts-order-modal.container.jsx
View File

@@ -212,6 +212,7 @@ export function PartsOrderModalContainer({
oem_partno: value.oem_partno,
db_price: value.db_price,
act_price: value.act_price,
cost: value.cost,
quantity: value.part_qty,
job_line_id: isReturn ? value.joblineid : value.id,
});

14
client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
View File

@@ -10,7 +10,7 @@ import { useTranslation } from "react-i18next";
import ProductionSubletsManageComponent from "../production-sublets-manage/production-sublets-manage.component";
import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
export default function ProductionBoardCard(card) {
export default function ProductionBoardCard(technician, card) {
const { t } = useTranslation();
const menu = (
<div>
@@ -86,9 +86,15 @@ export default function ProductionBoardCard(card) {
<div className="imex-flex-row imex-flex-row__flex-space-around">
<ProductionAlert record={card} key="alert" />
<ProductionSubletsManageComponent subletJobLines={card.subletLines} />
<Link to={`/manage/jobs/${card.id}`}>
<EyeFilled />
</Link>
{technician ? (
<Link to={`/tech/joblookup?selected=${card.id}`}>
<EyeFilled />
</Link>
) : (
<Link to={`/manage/jobs/${card.id}`}>
<EyeFilled />
</Link>
)}
</div>
</Card>
</Dropdown>

7
client/src/components/production-board-kanban/production-board-kanban.component.jsx
View File

@@ -13,12 +13,13 @@ import { createBoardData } from "./production-board-kanban.utils.js";
import IndefiniteLoading from "../indefinite-loading/indefinite-loading.component";
import { logImEXEvent } from "../../firebase/firebase.utils";
import ProductionBoardFilters from "../production-board-filters/production-board-filters.component";
import { selectTechnician } from "../../redux/tech/tech.selectors";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
technician: selectTechnician,
});
export function ProductionBoardKanbanComponent({ data, bodyshop }) {
export function ProductionBoardKanbanComponent({ data, bodyshop, technician }) {
const [boardLanes, setBoardLanes] = useState({
columns: [{ id: "Loading...", title: "Loading...", cards: [] }],
});
@@ -119,7 +120,7 @@ export function ProductionBoardKanbanComponent({ data, bodyshop }) {
<Board
children={boardLanes}
disableCardDrag={isMoving}
renderCard={ProductionBoardCard}
renderCard={(card) => ProductionBoardCard(technician, card)}
onCardDragEnd={handleDragEnd}
/>
</div>

20
client/src/components/production-list-columns/production-list-columns.add.component.jsx
View File

@@ -2,7 +2,23 @@ import React from "react";
import { Button, Dropdown, Menu } from "antd";
import dataSource from "./production-list-columns.data";
import { useTranslation } from "react-i18next";
export default function ProductionColumnsComponent({ columnState }) {
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { selectTechnician } from "../../redux/tech/tech.selectors";
const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser
technician: selectTechnician,
});
const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language))
});
export default connect(
mapStateToProps,
mapDispatchToProps
)(ProductionColumnsComponent);
export function ProductionColumnsComponent({ columnState, technician }) {
const [columns, setColumns] = columnState;
const { t } = useTranslation();
@@ -14,7 +30,7 @@ export default function ProductionColumnsComponent({ columnState }) {
const menu = (
<Menu onClick={handleAdd}>
{dataSource
{dataSource({ technician })
.filter((i) => !columnKeys.includes(i.key))
.map((item) => (
<Menu.Item key={item.key}>{item.title}</Menu.Item>

457
client/src/components/production-list-columns/production-list-columns.data.js
View File

@@ -9,239 +9,246 @@ import ProductionSubletsManageComponent from "../production-sublets-manage/produ
import ProductionListColumnAlert from "./production-list-columns.alert.component";
import ProductionListColumnBodyPriority from "./production-list-columns.bodypriority.component";
import ProductionListDate from "./production-list-columns.date.component";
import ProductionListColumnDetailPriority from "./production-list-columns.detailpriority.component";
import ProductionListColumnPaintPriority from "./production-list-columns.paintpriority.component";
import ProductionListColumnNote from "./production-list-columns.productionnote.component";
import ProductionListColumnStatus from "./production-list-columns.status.component";
import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component";
import ProductionListColumnDetailPriority from "./production-list-columns.detailpriority.component";
const r = [
{
title: i18n.t("jobs.actions.viewdetail"),
dataIndex: "viewdetail",
key: "viewdetail",
ellipsis: true,
render: (text, record) => (
<Link to={{ search: `?selected=${record.id}` }}>
{i18n.t("general.labels.view")}
</Link>
),
},
{
title: i18n.t("jobs.fields.ro_number"),
dataIndex: "ro_number",
key: "ro_number",
ellipsis: true,
sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
render: (text, record) => (
<Link to={`/manage/jobs/${record.id}`}>{record.ro_number}</Link>
),
},
{
title: i18n.t("jobs.fields.owner"),
dataIndex: "ownr",
key: "ownr",
ellipsis: true,
render: (text, record) => (
<span>{`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
record.ownr_co_nm || ""
}`}</span>
),
sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
},
{
title: i18n.t("jobs.fields.vehicle"),
dataIndex: "vehicle",
key: "vehicle",
ellipsis: true,
render: (text, record) => (
<span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
record.v_model_desc || ""
} ${record.v_color || ""} ${record.plate_no || ""}`}</span>
),
},
{
title: i18n.t("jobs.fields.actual_in"),
dataIndex: "actual_in",
key: "actual_in",
ellipsis: true,
sorter: (a, b) => a.actual_in - b.actual_in,
render: (text, record) => (
<DateFormatter>{record.actual_in || ""}</DateFormatter>
),
},
{
title: i18n.t("jobs.fields.scheduled_completion"),
dataIndex: "scheduled_completion",
key: "scheduled_completion",
ellipsis: true,
sorter: (a, b) => a.scheduled_completion - b.scheduled_completion,
render: (text, record) => (
<ProductionListDate record={record} field="scheduled_completion" />
),
},
{
title: i18n.t("jobs.fields.scheduled_delivery"),
dataIndex: "scheduled_delivery",
key: "scheduled_delivery",
ellipsis: true,
sorter: (a, b) => a.scheduled_delivery - b.scheduled_delivery,
render: (text, record) => (
<ProductionListDate record={record} field="scheduled_delivery" />
),
},
{
title: i18n.t("jobs.fields.ins_co_nm"),
dataIndex: "ins_co_nm",
key: "ins_co_nm",
ellipsis: true,
sorter: (a, b) => alphaSort(a.ins_co_nm, b.ins_co_nm),
},
{
title: i18n.t("jobs.fields.clm_no"),
dataIndex: "clm_no",
key: "clm_no",
ellipsis: true,
sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
},
{
title: i18n.t("jobs.fields.clm_total"),
dataIndex: "clm_total",
key: "clm_total",
ellipsis: true,
sorter: (a, b) => a.clm_total - b.clm_total,
render: (text, record) => (
<CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
),
},
{
title: i18n.t("jobs.fields.owner_owing"),
dataIndex: "owner_owing",
key: "owner_owing",
ellipsis: true,
sorter: (a, b) => a.owner_owing - b.owner_owing,
render: (text, record) => (
<CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
),
},
{
title: i18n.t("jobs.fields.ownr_ph1"),
dataIndex: "ownr_ph1",
key: "ownr_ph1",
ellipsis: true,
render: (text, record) => (
<PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
),
},
{
title: i18n.t("jobs.fields.specialcoveragepolicy"),
dataIndex: "special_coverage_policy",
key: "special_coverage_policy",
ellipsis: true,
},
{
title: i18n.t("jobs.fields.csr"),
dataIndex: "csr",
key: "csr",
ellipsis: true,
sorter: (a, b) => alphaSort(a.csr, b.csr),
},
{
title: i18n.t("jobs.fields.alt_transport"),
dataIndex: "alt_transport",
key: "alt_transport",
ellipsis: true,
sorter: (a, b) => alphaSort(a.alt_transport, b.alt_transport),
},
{
title: i18n.t("jobs.fields.status"),
dataIndex: "status",
key: "status",
ellipsis: true,
sorter: (a, b) => alphaSort(a.status, b.status),
render: (text, record) => <ProductionListColumnStatus record={record} />,
},
{
title: i18n.t("production.labels.bodyhours"),
dataIndex: "labhrs",
key: "labhrs",
sorter: (a, b) =>
a.labhrs.aggregate.sum.mod_lb_hrs - b.labhrs.aggregate.sum.mod_lb_hrs,
render: (text, record) => record.labhrs.aggregate.sum.mod_lb_hrs,
},
{
title: i18n.t("production.labels.refinishhours"),
dataIndex: "larhrs",
key: "larhrs",
sorter: (a, b) =>
a.larhrs.aggregate.sum.mod_lb_hrs - b.larhrs.aggregate.sum.mod_lb_hrs,
render: (text, record) => record.larhrs.aggregate.sum.mod_lb_hrs,
},
{
title: i18n.t("production.labels.alert"),
dataIndex: "alert",
key: "alert",
render: (text, record) => <ProductionListColumnAlert record={record} />,
},
{
title: i18n.t("production.labels.note"),
dataIndex: "note",
key: "note",
ellipsis: true,
render: (text, record) => <ProductionListColumnNote record={record} />,
},
{
title: i18n.t("production.labels.touchtime"),
dataIndex: "tt",
key: "tt",
render: (text, record) => {
return <ProductionlistColumnTouchTime job={record} />;
const r = ({ technician }) => {
return [
{
title: i18n.t("jobs.actions.viewdetail"),
dataIndex: "viewdetail",
key: "viewdetail",
ellipsis: true,
render: (text, record) => (
<Link to={{ search: `?selected=${record.id}` }}>
{i18n.t("general.labels.view")}
</Link>
),
},
},
{
title: i18n.t("production.labels.bodypriority"),
dataIndex: "bodypriority",
key: "bodypriority",
{
title: i18n.t("jobs.fields.ro_number"),
dataIndex: "ro_number",
key: "ro_number",
ellipsis: true,
sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
render: (text, record) =>
technician ? (
<Link to={`/tech/joblookup?selected=${record.id}`}>
{record.ro_number}
</Link>
) : (
<Link to={`/manage/jobs/${record.id}`}>{record.ro_number}</Link>
),
},
{
title: i18n.t("jobs.fields.owner"),
dataIndex: "ownr",
key: "ownr",
ellipsis: true,
render: (text, record) => (
<span>{`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
record.ownr_co_nm || ""
}`}</span>
),
sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
},
{
title: i18n.t("jobs.fields.vehicle"),
dataIndex: "vehicle",
key: "vehicle",
ellipsis: true,
render: (text, record) => (
<span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
record.v_model_desc || ""
} ${record.v_color || ""} ${record.plate_no || ""}`}</span>
),
},
{
title: i18n.t("jobs.fields.actual_in"),
dataIndex: "actual_in",
key: "actual_in",
ellipsis: true,
sorter: (a, b) => a.actual_in - b.actual_in,
render: (text, record) => (
<DateFormatter>{record.actual_in || ""}</DateFormatter>
),
},
{
title: i18n.t("jobs.fields.scheduled_completion"),
dataIndex: "scheduled_completion",
key: "scheduled_completion",
ellipsis: true,
sorter: (a, b) => a.scheduled_completion - b.scheduled_completion,
render: (text, record) => (
<ProductionListDate record={record} field="scheduled_completion" />
),
},
{
title: i18n.t("jobs.fields.scheduled_delivery"),
dataIndex: "scheduled_delivery",
key: "scheduled_delivery",
ellipsis: true,
sorter: (a, b) => a.scheduled_delivery - b.scheduled_delivery,
render: (text, record) => (
<ProductionListDate record={record} field="scheduled_delivery" />
),
},
{
title: i18n.t("jobs.fields.ins_co_nm"),
dataIndex: "ins_co_nm",
key: "ins_co_nm",
ellipsis: true,
sorter: (a, b) => alphaSort(a.ins_co_nm, b.ins_co_nm),
},
{
title: i18n.t("jobs.fields.clm_no"),
dataIndex: "clm_no",
key: "clm_no",
ellipsis: true,
sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
},
{
title: i18n.t("jobs.fields.clm_total"),
dataIndex: "clm_total",
key: "clm_total",
ellipsis: true,
sorter: (a, b) => a.clm_total - b.clm_total,
render: (text, record) => (
<CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
),
},
{
title: i18n.t("jobs.fields.owner_owing"),
dataIndex: "owner_owing",
key: "owner_owing",
ellipsis: true,
sorter: (a, b) => a.owner_owing - b.owner_owing,
render: (text, record) => (
<CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
),
},
{
title: i18n.t("jobs.fields.ownr_ph1"),
dataIndex: "ownr_ph1",
key: "ownr_ph1",
ellipsis: true,
render: (text, record) => (
<PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
),
},
{
title: i18n.t("jobs.fields.specialcoveragepolicy"),
dataIndex: "special_coverage_policy",
key: "special_coverage_policy",
ellipsis: true,
},
{
title: i18n.t("jobs.fields.csr"),
dataIndex: "csr",
key: "csr",
ellipsis: true,
sorter: (a, b) => alphaSort(a.csr, b.csr),
},
{
title: i18n.t("jobs.fields.alt_transport"),
dataIndex: "alt_transport",
key: "alt_transport",
ellipsis: true,
sorter: (a, b) => alphaSort(a.alt_transport, b.alt_transport),
},
{
title: i18n.t("jobs.fields.status"),
dataIndex: "status",
key: "status",
ellipsis: true,
sorter: (a, b) => alphaSort(a.status, b.status),
render: (text, record) => <ProductionListColumnStatus record={record} />,
},
{
title: i18n.t("production.labels.bodyhours"),
dataIndex: "labhrs",
key: "labhrs",
sorter: (a, b) =>
a.labhrs.aggregate.sum.mod_lb_hrs - b.labhrs.aggregate.sum.mod_lb_hrs,
render: (text, record) => record.labhrs.aggregate.sum.mod_lb_hrs,
},
{
title: i18n.t("production.labels.refinishhours"),
dataIndex: "larhrs",
key: "larhrs",
sorter: (a, b) =>
a.larhrs.aggregate.sum.mod_lb_hrs - b.larhrs.aggregate.sum.mod_lb_hrs,
render: (text, record) => record.larhrs.aggregate.sum.mod_lb_hrs,
},
{
title: i18n.t("production.labels.alert"),
dataIndex: "alert",
key: "alert",
sorter: (a, b) =>
((a.production_vars && a.production_vars.bodypriority) || 11) -
((b.production_vars && b.production_vars.bodypriority) || 11),
render: (text, record) => (
<ProductionListColumnBodyPriority record={record} />
),
},
{
title: i18n.t("production.labels.paintpriority"),
dataIndex: "paintpriority",
key: "paintpriority",
render: (text, record) => <ProductionListColumnAlert record={record} />,
},
{
title: i18n.t("production.labels.note"),
dataIndex: "note",
key: "note",
ellipsis: true,
render: (text, record) => <ProductionListColumnNote record={record} />,
},
{
title: i18n.t("production.labels.touchtime"),
dataIndex: "tt",
key: "tt",
render: (text, record) => {
return <ProductionlistColumnTouchTime job={record} />;
},
},
{
title: i18n.t("production.labels.bodypriority"),
dataIndex: "bodypriority",
key: "bodypriority",
sorter: (a, b) =>
((a.production_vars && a.production_vars.paintpriority) || 11) -
((b.production_vars && b.production_vars.paintpriority) || 11),
render: (text, record) => (
<ProductionListColumnPaintPriority record={record} />
),
},
{
title: i18n.t("production.labels.detailpriority"),
dataIndex: "detailpriority",
key: "detailpriority",
sorter: (a, b) =>
((a.production_vars && a.production_vars.bodypriority) || 11) -
((b.production_vars && b.production_vars.bodypriority) || 11),
render: (text, record) => (
<ProductionListColumnBodyPriority record={record} />
),
},
{
title: i18n.t("production.labels.paintpriority"),
dataIndex: "paintpriority",
key: "paintpriority",
sorter: (a, b) =>
((a.production_vars && a.production_vars.detailpriority) || 11) -
((b.production_vars && b.production_vars.detailpriority) || 11),
render: (text, record) => (
<ProductionListColumnDetailPriority record={record} />
),
},
{
title: i18n.t("production.labels.sublets"),
dataIndex: "sublets",
key: "sublets",
render: (text, record) => (
<ProductionSubletsManageComponent subletJobLines={record.subletLines} />
),
},
];
sorter: (a, b) =>
((a.production_vars && a.production_vars.paintpriority) || 11) -
((b.production_vars && b.production_vars.paintpriority) || 11),
render: (text, record) => (
<ProductionListColumnPaintPriority record={record} />
),
},
{
title: i18n.t("production.labels.detailpriority"),
dataIndex: "detailpriority",
key: "detailpriority",
sorter: (a, b) =>
((a.production_vars && a.production_vars.detailpriority) || 11) -
((b.production_vars && b.production_vars.detailpriority) || 11),
render: (text, record) => (
<ProductionListColumnDetailPriority record={record} />
),
},
{
title: i18n.t("production.labels.sublets"),
dataIndex: "sublets",
key: "sublets",
render: (text, record) => (
<ProductionSubletsManageComponent subletJobLines={record.subletLines} />
),
},
];
};
export default r;

6
client/src/components/production-list-table/production-list-table.container.jsx
View File

@@ -3,17 +3,19 @@ import React, { useState } from "react";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { SUBSCRIPTION_JOBS_IN_PRODUCTION } from "../../graphql/jobs.queries";
import { selectTechnician } from "../../redux/tech/tech.selectors";
import { selectBodyshop } from "../../redux/user/user.selectors";
import ProductionListColumns from "../production-list-columns/production-list-columns.data";
import ProductionListTable from "./production-list-table.component";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
technician: selectTechnician,
});
export default connect(mapStateToProps, null)(ProductionListTableContainer);
export function ProductionListTableContainer({ bodyshop }) {
export function ProductionListTableContainer({ bodyshop, technician }) {
const { loading, data } = useSubscription(SUBSCRIPTION_JOBS_IN_PRODUCTION, {
// variables: {
// statusList: bodyshop.md_ro_statuses.production_statuses || [],
@@ -24,7 +26,7 @@ export function ProductionListTableContainer({ bodyshop }) {
(bodyshop.production_config &&
bodyshop.production_config.columnKeys.map((k) => {
return {
...ProductionListColumns.find((e) => e.key === k.key),
...ProductionListColumns({ technician }).find((e) => e.key === k.key),
width: k.width,
};
})) ||

22
client/src/components/user-request-pw-reset/user-request-reset-pw.component.jsx
View File

@@ -4,7 +4,10 @@ import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import ImEXOnlineLogo from "../../assets/logo192.png";
import { sendPasswordReset } from "../../redux/user/user.actions";
import {
sendPasswordReset,
sendPasswordResetAgain,
} from "../../redux/user/user.actions";
import { selectPasswordReset } from "../../redux/user/user.selectors";
import AlertComponent from "../alert/alert.component";
import "./user-request-pw-reset.styles.scss";
@@ -14,9 +17,14 @@ const mapStateToProps = createStructuredSelector({
});
const mapDispatchToProps = (dispatch) => ({
sendPasswordReset: (email) => dispatch(sendPasswordReset(email)),
sendPasswordResetAgain: (email) => dispatch(sendPasswordResetAgain(email)),
});
export function UserRequestResetPw({ passwordReset, sendPasswordReset }) {
export function UserRequestResetPw({
passwordReset,
sendPasswordReset,
sendPasswordResetAgain,
}) {
const handleFinish = (values) => {
try {
sendPasswordReset(values.email);
@@ -35,7 +43,8 @@ export function UserRequestResetPw({ passwordReset, sendPasswordReset }) {
extra={[
<Button
key="send-again"
onClick={() => sendPasswordReset(passwordReset.email)}
onClick={() => sendPasswordResetAgain(passwordReset.email)}
loading={passwordReset.loading}
>
{t("general.labels.sendagain")}
</Button>,
@@ -68,7 +77,12 @@ export function UserRequestResetPw({ passwordReset, sendPasswordReset }) {
{passwordReset.error ? (
<AlertComponent message={passwordReset.error} type="warning" />
) : null}
<Button className="login-btn" type="primary" htmlType="submit">
<Button
className="login-btn"
type="primary"
htmlType="submit"
loading={passwordReset.loading}
>
{t("general.actions.submit")}
</Button>
</Form>

29
client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx
View File

@@ -1,15 +1,17 @@
import { LockOutlined } from "@ant-design/icons";
import { Button, Form, Input, Result, Typography } from "antd";
import React from "react";
import React, { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { Link } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import ImEXOnlineLogo from "../../assets/logo192.png";
import { auth } from "../../firebase/firebase.utils";
import { validatePasswordResetStart } from "../../redux/user/user.actions";
import { selectPasswordReset } from "../../redux/user/user.selectors";
import AlertComponent from "../alert/alert.component";
import "./user-validate-pw-reset.styles.scss";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
const mapStateToProps = createStructuredSelector({
passwordReset: selectPasswordReset,
@@ -25,11 +27,34 @@ export function UserValidatePwReset({
oobCode,
}) {
const { t } = useTranslation();
const [codeValid, setCodeValid] = useState({ loading: true });
const handleFinish = (values) => {
validatePasswordReset({ code: oobCode, password: values.password });
};
useEffect(() => {
async function checkCodeValid() {
try {
const codeValid = await auth.checkActionCode(oobCode);
console.log("codeValid :>> ", codeValid);
setCodeValid({ loading: false, ...codeValid });
} catch (error) {
console.log("error :>> ", error);
setCodeValid({ loading: false, ...error });
}
}
checkCodeValid();
}, [oobCode]);
if (codeValid.loading) return <LoadingSpinner />;
if (codeValid.code)
return (
<div>
<Result status="error" title={codeValid.message} />
</div>
);
if (passwordReset.success)
return (
<Result

1
client/src/graphql/bills.queries.js
View File

@@ -92,6 +92,7 @@ export const QUERY_BILLS_BY_JOBID = gql`
line_remarks
quantity
job_line_id
cost
jobline {
id
part_type

1
client/src/pages/bills/bills.page.component.jsx
View File

@@ -158,6 +158,7 @@ export function BillsListPage({
line_desc: i.line_desc,
// db_price: i.actual_price,
act_price: i.actual_price,
cost: i.actual_cost,
quantity: i.quantity,
joblineid: i.joblineid,
};

1
client/src/pages/jobs-available/jobs-available.page.container.jsx
View File

@@ -32,7 +32,6 @@ export function JobsAvailablePageContainer({
return (
<RbacWrapper action="jobs:available-list">
<div>
<Link to="/manage/jobs/new">
<Button>{t("jobs.actions.manualnew")}</Button>
</Link>

5
client/src/redux/application/application.actions.js
View File

@@ -43,3 +43,8 @@ export const setJobReadOnly = (bool) => ({
type: ApplicationActionTypes.SET_JOB_READONLY,
payload: bool,
});
export const setPartnerVersion = (version) => ({
type: ApplicationActionTypes.SET_PARTNER_VERSION,
payload: version,
});

4
client/src/redux/application/application.reducer.js
View File

@@ -11,6 +11,7 @@ const INITIAL_STATE = {
error: null,
},
jobReadOnly: false,
partnerVersion: null,
};
const applicationReducer = (state = INITIAL_STATE, action) => {
@@ -67,6 +68,9 @@ const applicationReducer = (state = INITIAL_STATE, action) => {
case ApplicationActionTypes.SET_JOB_READONLY:
return { ...state, jobReadOnly: action.payload };
case ApplicationActionTypes.SET_PARTNER_VERSION:
return { ...state, partnerVersion: action.payload };
default:
return state;
}

4
client/src/redux/application/application.selectors.js
View File

@@ -21,6 +21,10 @@ export const selectScheduleLoad = createSelector(
[selectApplication],
(application) => application.scheduleLoad.load
);
export const selectPartnerVersion = createSelector(
[selectApplication],
(application) => application.partnerVersion
);
export const selectScheduleLoadCalculating = createSelector(
[selectApplication],

1
client/src/redux/application/application.types.js
View File

@@ -8,5 +8,6 @@ const ApplicationActionTypes = {
ADD_RECENT_ITEM: "ADD_RECENT_ITEM",
SET_SELECTED_HEADER: "SET_SELECTED_HEADER",
SET_JOB_READONLY: "SET_JOB_READONLY",
SET_PARTNER_VERSION: "SET_PARTNER_VERSION",
};
export default ApplicationActionTypes;

6
client/src/redux/user/user.actions.js
View File

@@ -77,6 +77,12 @@ export const sendPasswordReset = (email) => ({
type: UserActionTypes.SEND_PASSWORD_RESET_EMAIL_START,
payload: email,
});
export const sendPasswordResetAgain = (email) => ({
type: UserActionTypes.SEND_PASSWORD_RESET_EMAIL_START_AGAIN,
payload: email,
});
export const sendPasswordResetFailure = (error) => ({
type: UserActionTypes.SEND_PASSWORD_RESET_EMAIL_FAILURE,
payload: error,

18
client/src/redux/user/user.reducer.js
View File

@@ -13,6 +13,7 @@ const INITIAL_STATE = {
email: null,
error: null,
success: false,
loading: false,
},
authLevel: 0,
};
@@ -33,6 +34,17 @@ const userReducer = (state = INITIAL_STATE, action) => {
email: action.payload,
error: null,
success: false,
loading: true,
},
};
case UserActionTypes.SEND_PASSWORD_RESET_EMAIL_START_AGAIN:
return {
...state,
passwordreset: {
email: action.payload,
error: null,
success: true,
loading: true,
},
};
case UserActionTypes.VALIDATE_PASSWORD_RESET_FAILURE:
@@ -42,7 +54,11 @@ const userReducer = (state = INITIAL_STATE, action) => {
case UserActionTypes.SEND_PASSWORD_RESET_EMAIL_SUCCESS:
return {
...state,
passwordreset: { ...state.passwordreset, success: true },
passwordreset: {
...state.passwordreset,
success: true,
loading: false,
},
};
case UserActionTypes.SIGN_IN_SUCCESS:
return {

5
client/src/redux/user/user.sagas.js
View File

@@ -170,6 +170,10 @@ export function* onSendPasswordResetStart() {
UserActionTypes.SEND_PASSWORD_RESET_EMAIL_START,
sendPasswordResetEmail
);
yield takeLatest(
UserActionTypes.SEND_PASSWORD_RESET_EMAIL_START_AGAIN,
sendPasswordResetEmail
);
}
export function* sendPasswordResetEmail({ payload }) {
try {
@@ -191,6 +195,7 @@ export function* onValidatePasswordResetStart() {
}
export function* validatePasswordResetStart({ payload: { password, code } }) {
try {
auth.checkActionCode(code);
yield auth.confirmPasswordReset(code, password);
yield put(validatePasswordResetSuccess());
} catch (error) {

5
client/src/redux/user/user.types.js
View File

@@ -21,11 +21,16 @@ const UserActionTypes = {
SET_INSTANCE_CONFLICT: "SET_INSTANCE_CONFLICT",
SET_LOCAL_FINGERPRINT: "SET_LOCAL_FINGERPRINT",
SEND_PASSWORD_RESET_EMAIL_START: "SEND_PASSWORD_RESET_EMAIL_START",
SEND_PASSWORD_RESET_EMAIL_START_AGAIN:
"SEND_PASSWORD_RESET_EMAIL_START_AGAIN",
SEND_PASSWORD_RESET_EMAIL_FAILURE: "SEND_PASSWORD_RESET_EMAIL_FAILURE",
SEND_PASSWORD_RESET_EMAIL_SUCCESS: "SEND_PASSWORD_RESET_EMAIL_SUCCESS",
VALIDATE_PASSWORD_RESET_START: "VALIDATE_PASSWORD_RESET_START",
VALIDATE_PASSWORD_RESET_SUCCESS: "VALIDATE_PASSWORD_RESET_SUCCESS",
VALIDATE_PASSWORD_RESET_FAILURE: "VALIDATE_PASSWORD_RESET_FAILURE",
SET_AUTH_LEVEL: "SET_AUTH_LEVEL",
CHECK_ACTION_CODE_START: "CHECK_ACTION_CODE_START",
CHECK_ACTION_CODE_SUCCESS: "CHECK_ACTION_CODE_SUCCESS",
CHECK_ACTION_CODE_FAILURE: "CHECK_ACTION_CODE_FAILURE",
};
export default UserActionTypes;

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

@@ -944,6 +944,7 @@
"noowner": "No owner associated.",
"novehicle": "No vehicle associated.",
"saving": "Error encountered while saving record.",
"scanimport": "Error importing job. {{message}}",
"totalscalc": "Error while calculating new job totals.",
"updating": "Error while updating job(s). {{error}}",
"validation": "Please ensure all fields are entered correctly.",
@@ -1180,6 +1181,7 @@
"deleteconfirm": "Are you sure you want to delete this job? This cannot be undone. ",
"deliverchecklist": "Deliver Checklist",
"difference": "Difference",
"diskscan": "Scan Disk for Estimates",
"documents": "Documents",
"documents-images": "Images",
"documents-other": "Other Documents",
@@ -1461,6 +1463,7 @@
"act_price": "Price",
"backordered_eta": "B.O. ETA",
"backordered_on": "B.O. On",
"cost": "Cost",
"db_price": "List Price",
"deliver_by": "Date",
"job_line_id": "Job Line Id",

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

@@ -944,6 +944,7 @@
"noowner": "Ningún propietario asociado.",
"novehicle": "No hay vehículo asociado.",
"saving": "Se encontró un error al guardar el registro.",
"scanimport": "",
"totalscalc": "",
"updating": "",
"validation": "Asegúrese de que todos los campos se ingresen correctamente.",
@@ -1180,6 +1181,7 @@
"deleteconfirm": "",
"deliverchecklist": "",
"difference": "",
"diskscan": "",
"documents": "documentos",
"documents-images": "",
"documents-other": "",
@@ -1461,6 +1463,7 @@
"act_price": "",
"backordered_eta": "",
"backordered_on": "",
"cost": "",
"db_price": "",
"deliver_by": "",
"job_line_id": "",

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

@@ -944,6 +944,7 @@
"noowner": "Aucun propriétaire associé.",
"novehicle": "Aucun véhicule associé.",
"saving": "Erreur rencontrée lors de la sauvegarde de l'enregistrement.",
"scanimport": "",
"totalscalc": "",
"updating": "",
"validation": "Veuillez vous assurer que tous les champs sont correctement entrés.",
@@ -1180,6 +1181,7 @@
"deleteconfirm": "",
"deliverchecklist": "",
"difference": "",
"diskscan": "",
"documents": "Les documents",
"documents-images": "",
"documents-other": "",
@@ -1461,6 +1463,7 @@
"act_price": "",
"backordered_eta": "",
"backordered_on": "",
"cost": "",
"db_price": "",
"deliver_by": "",
"job_line_id": "",

2
firebase/functions/.eslintrc.json → firebase/functions/.eslintrc.jsonx
View File

@@ -1,3 +1,5 @@
//FILE WAS RENAMED AS BABELEDIT TRIES TO PICK IT UP AND CANNOT READ IT WITH THE COMMENTS.
{
"root": true,
"parserOptions": {

5
hasura/migrations/1616085067839_alter_table_public_parts_order_lines_add_column_cost/down.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."parts_order_lines" DROP COLUMN "cost";
type: run_sql

5
hasura/migrations/1616085067839_alter_table_public_parts_order_lines_add_column_cost/up.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."parts_order_lines" ADD COLUMN "cost" numeric NULL;
type: run_sql

41
hasura/migrations/1616085078098_update_permission_user_public_table_parts_order_lines/down.yaml Normal file
View File

@@ -0,0 +1,41 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_insert_permission
- args:
permission:
check:
parts_order:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- act_price
- backordered_eta
- backordered_on
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- part_type
- quantity
- status
- updated_at
set: {}
role: user
table:
name: parts_order_lines
schema: public
type: create_insert_permission

42
hasura/migrations/1616085078098_update_permission_user_public_table_parts_order_lines/up.yaml Normal file
View File

@@ -0,0 +1,42 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_insert_permission
- args:
permission:
check:
parts_order:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- act_price
- backordered_eta
- backordered_on
- cost
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- part_type
- quantity
- status
- updated_at
set: {}
role: user
table:
name: parts_order_lines
schema: public
type: create_insert_permission

42
hasura/migrations/1616085088148_update_permission_user_public_table_parts_order_lines/down.yaml Normal file
View File

@@ -0,0 +1,42 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- act_price
- backordered_eta
- backordered_on
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- part_type
- quantity
- status
- updated_at
computed_fields: []
filter:
parts_order:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: parts_order_lines
schema: public
type: create_select_permission

43
hasura/migrations/1616085088148_update_permission_user_public_table_parts_order_lines/up.yaml Normal file
View File

@@ -0,0 +1,43 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- act_price
- backordered_eta
- backordered_on
- cost
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- part_type
- quantity
- status
- updated_at
computed_fields: []
filter:
parts_order:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: parts_order_lines
schema: public
type: create_select_permission

41
hasura/migrations/1616085543945_update_permission_user_public_table_parts_order_lines/down.yaml Normal file
View File

@@ -0,0 +1,41 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_update_permission
- args:
permission:
columns:
- act_price
- backordered_eta
- backordered_on
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- part_type
- quantity
- status
- updated_at
filter:
parts_order:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
set: {}
role: user
table:
name: parts_order_lines
schema: public
type: create_update_permission

42
hasura/migrations/1616085543945_update_permission_user_public_table_parts_order_lines/up.yaml Normal file
View File

@@ -0,0 +1,42 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_update_permission
- args:
permission:
columns:
- act_price
- backordered_eta
- backordered_on
- cost
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- part_type
- quantity
- status
- updated_at
filter:
parts_order:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
set: {}
role: user
table:
name: parts_order_lines
schema: public
type: create_update_permission

3
hasura/migrations/metadata.yaml
View File

@@ -3354,6 +3354,7 @@ tables:
- act_price
- backordered_eta
- backordered_on
- cost
- created_at
- db_price
- id
@@ -3373,6 +3374,7 @@ tables:
- act_price
- backordered_eta
- backordered_on
- cost
- created_at
- db_price
- id
@@ -3403,6 +3405,7 @@ tables:
- act_price
- backordered_eta
- backordered_on
- cost
- created_at
- db_price
- id

5944
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff