Merged in release/2021-09-24 (pull request #224)

Release/2021 09 24
This commit is contained in:
Patrick Fic
2021-09-24 17:20:52 +00:00
66 changed files with 20889 additions and 11337 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,4 @@
<babeledit_project be_version="2.7.1" version="1.2"> <babeledit_project version="1.2" be_version="2.7.1">
<!-- <!--
BabelEdit project file BabelEdit project file
@@ -1369,6 +1369,69 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>jobnoteadded</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>jobnotedeleted</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>jobnoteupdated</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>jobspartsorder</name> <name>jobspartsorder</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -2779,6 +2842,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>savewithdiscrepancy</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>state_tax</name> <name>state_tax</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -3683,6 +3767,69 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>itc_federal</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>itc_local</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>itc_state</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>mappingname</name> <name>mappingname</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -11032,6 +11179,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>sold</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>
</children> </children>
</folder_node> </folder_node>
<folder_node> <folder_node>
@@ -11204,6 +11372,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>created_at</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>
</children> </children>
</folder_node> </folder_node>
<folder_node> <folder_node>
@@ -33558,6 +33747,37 @@
</concept_node> </concept_node>
</children> </children>
</folder_node> </folder_node>
<folder_node>
<name>subjects</name>
<children>
<folder_node>
<name>jobs</name>
<children>
<concept_node>
<name>parts_order</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>
</children>
</folder_node>
</children>
</folder_node>
<folder_node> <folder_node>
<name>vendors</name> <name>vendors</name>
<children> <children>
@@ -34440,6 +34660,116 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<folder_node>
<name>groups</name>
<children>
<concept_node>
<name>customers</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>jobs</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>payroll</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>purchases</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>sales</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>
</children>
</folder_node>
<concept_node> <concept_node>
<name>key</name> <name>key</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -34506,6 +34836,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>csi</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>exportlogs</name> <name>exportlogs</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -34765,6 +35116,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>csi</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>estimator_detail</name> <name>estimator_detail</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

View File

@@ -4,16 +4,16 @@
"private": true, "private": true,
"proxy": "http://localhost:5000", "proxy": "http://localhost:5000",
"dependencies": { "dependencies": {
"@apollo/client": "^3.4.10", "@apollo/client": "^3.4.13",
"@craco/craco": "^6.2.0", "@craco/craco": "^6.3.0",
"@fingerprintjs/fingerprintjs": "^3.3.0", "@fingerprintjs/fingerprintjs": "^3.3.0",
"@lourenci/react-kanban": "^2.1.0", "@lourenci/react-kanban": "^2.1.0",
"@openreplay/tracker": "^3.3.1", "@openreplay/tracker": "^3.3.1",
"@openreplay/tracker-assist": "^3.1.1", "@openreplay/tracker-assist": "^3.1.1",
"@openreplay/tracker-graphql": "^3.0.0", "@openreplay/tracker-graphql": "^3.0.0",
"@openreplay/tracker-redux": "^3.0.0", "@openreplay/tracker-redux": "^3.0.0",
"@sentry/react": "^6.11.0", "@sentry/react": "^6.13.0",
"@sentry/tracing": "^6.11.0", "@sentry/tracing": "^6.13.0",
"@stripe/react-stripe-js": "^1.4.0", "@stripe/react-stripe-js": "^1.4.0",
"@stripe/stripe-js": "^1.17.1", "@stripe/stripe-js": "^1.17.1",
"@tanem/react-nprogress": "^3.0.79", "@tanem/react-nprogress": "^3.0.79",
@@ -26,17 +26,17 @@
"enquire-js": "^0.2.1", "enquire-js": "^0.2.1",
"env-cmd": "^10.1.0", "env-cmd": "^10.1.0",
"exifr": "^7.1.3", "exifr": "^7.1.3",
"firebase": "^9.0.0", "firebase": "^9.0.2",
"graphql": "^15.5.3", "graphql": "^15.5.3",
"i18next": "^20.4.0", "i18next": "^21.0.0",
"i18next-browser-languagedetector": "^6.1.2", "i18next-browser-languagedetector": "^6.1.2",
"jsoneditor": "^9.5.4", "jsoneditor": "^9.5.4",
"jsreport-browser-client-dist": "^1.3.0", "jsreport-browser-client-dist": "^1.3.0",
"libphonenumber-js": "^1.9.26", "libphonenumber-js": "^1.9.34",
"logrocket": "^2.0.0", "logrocket": "^2.0.0",
"markerjs2": "^2.11.2", "markerjs2": "^2.11.2",
"moment-business-days": "^1.2.0", "moment-business-days": "^1.2.0",
"phone": "^3.1.6", "phone": "^3.1.8",
"preval.macro": "^5.0.0", "preval.macro": "^5.0.0",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"query-string": "^7.0.1", "query-string": "^7.0.1",
@@ -50,7 +50,7 @@
"react-drag-listview": "^0.1.8", "react-drag-listview": "^0.1.8",
"react-grid-gallery": "^0.5.5", "react-grid-gallery": "^0.5.5",
"react-grid-layout": "^1.3.0", "react-grid-layout": "^1.3.0",
"react-i18next": "^11.11.4", "react-i18next": "^11.12.0",
"react-icons": "^4.2.0", "react-icons": "^4.2.0",
"react-number-format": "^4.7.3", "react-number-format": "^4.7.3",
"react-redux": "^7.2.5", "react-redux": "^7.2.5",
@@ -59,29 +59,29 @@
"react-scripts": "^4.0.3", "react-scripts": "^4.0.3",
"react-sublime-video": "^0.2.5", "react-sublime-video": "^0.2.5",
"react-virtualized": "^9.22.3", "react-virtualized": "^9.22.3",
"recharts": "^2.1.2", "recharts": "^2.1.3",
"redux": "^4.1.1", "redux": "^4.1.1",
"redux-persist": "^6.0.0", "redux-persist": "^6.0.0",
"redux-saga": "^1.1.3", "redux-saga": "^1.1.3",
"redux-state-sync": "^3.1.2", "redux-state-sync": "^3.1.2",
"reselect": "^4.0.0", "reselect": "^4.0.0",
"sass": "^1.38.2", "sass": "^1.41.1",
"socket.io-client": "^4.2.0", "socket.io-client": "^4.2.0",
"styled-components": "^5.3.1", "styled-components": "^5.3.1",
"subscriptions-transport-ws": "^0.9.18", "subscriptions-transport-ws": "^0.9.18",
"web-vitals": "^2.1.0", "web-vitals": "^2.1.0",
"workbox-background-sync": "^6.2.4", "workbox-background-sync": "^6.3.0",
"workbox-broadcast-update": "^6.2.4", "workbox-broadcast-update": "^6.3.0",
"workbox-cacheable-response": "^6.2.4", "workbox-cacheable-response": "^6.3.0",
"workbox-core": "^6.2.4", "workbox-core": "^6.3.0",
"workbox-expiration": "^6.2.4", "workbox-expiration": "^6.3.0",
"workbox-google-analytics": "^6.2.4", "workbox-google-analytics": "^6.3.0",
"workbox-navigation-preload": "^6.2.4", "workbox-navigation-preload": "^6.3.0",
"workbox-precaching": "^6.2.4", "workbox-precaching": "^6.3.0",
"workbox-range-requests": "^6.2.4", "workbox-range-requests": "^6.3.0",
"workbox-routing": "^6.2.4", "workbox-routing": "^6.3.0",
"workbox-strategies": "^6.2.4", "workbox-strategies": "^6.3.0",
"workbox-streams": "^6.2.4" "workbox-streams": "^6.3.0"
}, },
"scripts": { "scripts": {
"postinstall": "patch-package", "postinstall": "patch-package",

View File

@@ -11,7 +11,8 @@ import App from "./App";
import trackerGraphQL from "@openreplay/tracker-graphql"; import trackerGraphQL from "@openreplay/tracker-graphql";
//import trackerRedux from "@openreplay/tracker-redux"; //import trackerRedux from "@openreplay/tracker-redux";
import Tracker from "@openreplay/tracker"; import Tracker from "@openreplay/tracker";
//import trackerAssist from "@openreplay/tracker-assist"; import trackerAssist from "@openreplay/tracker-assist";
import { getCurrentUser } from "../firebase/firebase.utils";
moment.locale("en-US"); moment.locale("en-US");
export const tracker = new Tracker({ export const tracker = new Tracker({
@@ -21,12 +22,16 @@ export const tracker = new Tracker({
? { __DISABLE_SECURE_MODE: true } ? { __DISABLE_SECURE_MODE: true }
: {}), : {}),
// beaconSize: 10485760, // beaconSize: 10485760,
onStart: ({ sessionID }) => console.log("ORS SESSION ", sessionID), onStart: async ({ sessionID }) => {
const user = await getCurrentUser();
tracker.setUserID(user.email);
console.log("ORS SESSION ", sessionID, user.email);
},
}); });
// tracker.use( tracker.use(
// trackerAssist({ confirmText: "Technical support is about to assist you." }) trackerAssist({ confirmText: "Technical support is about to assist you." })
// ); // check the list of available options below ); // check the list of available options below
export const recordGraphQL = tracker.use(trackerGraphQL()); export const recordGraphQL = tracker.use(trackerGraphQL());
tracker.start(); tracker.start();
if (process.env.NODE_ENV === "production") LogRocket.init("gvfvfw/bodyshopapp"); if (process.env.NODE_ENV === "production") LogRocket.init("gvfvfw/bodyshopapp");

View File

@@ -8,7 +8,25 @@ import { alphaSort } from "../../utils/sorters";
import JobExportButton from "../jobs-close-export-button/jobs-close-export-button.component"; import JobExportButton from "../jobs-close-export-button/jobs-close-export-button.component";
import JobsExportAllButton from "../jobs-export-all-button/jobs-export-all-button.component"; import JobsExportAllButton from "../jobs-export-all-button/jobs-export-all-button.component";
export default function AccountingReceivablesTableComponent({ loading, jobs }) { import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { selectBodyshop } from "../../redux/user/user.selectors";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
});
const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language))
});
export default connect(
mapStateToProps,
mapDispatchToProps
)(AccountingReceivablesTableComponent);
export function AccountingReceivablesTableComponent({
bodyshop,
loading,
jobs,
}) {
const { t } = useTranslation(); const { t } = useTranslation();
const [selectedJobs, setSelectedJobs] = useState([]); const [selectedJobs, setSelectedJobs] = useState([]);
const [transInProgress, setTransInProgress] = useState(false); const [transInProgress, setTransInProgress] = useState(false);
@@ -180,12 +198,14 @@ export default function AccountingReceivablesTableComponent({ loading, jobs }) {
<Card <Card
extra={ extra={
<Space wrap> <Space wrap>
<JobsExportAllButton {!bodyshop.cdk_dealerid && (
jobIds={selectedJobs} <JobsExportAllButton
disabled={transInProgress || selectedJobs.length === 0} jobIds={selectedJobs}
loadingCallback={setTransInProgress} disabled={transInProgress || selectedJobs.length === 0}
completedCallback={setSelectedJobs} loadingCallback={setTransInProgress}
/> completedCallback={setSelectedJobs}
/>
)}
<Input.Search <Input.Search
value={state.search} value={state.search}
onChange={handleSearch} onChange={handleSearch}

View File

@@ -18,8 +18,10 @@ import {
selectBodyshop, selectBodyshop,
selectCurrentUser, selectCurrentUser,
} from "../../redux/user/user.selectors"; } from "../../redux/user/user.selectors";
import confirmDialog from "../../utils/asyncConfirm";
import AuditTrailMapping from "../../utils/AuditTrailMappings"; import AuditTrailMapping from "../../utils/AuditTrailMappings";
import BillFormContainer from "../bill-form/bill-form.container"; import BillFormContainer from "../bill-form/bill-form.container";
import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
import { handleUpload } from "../documents-upload/documents-upload.utility"; import { handleUpload } from "../documents-upload/documents-upload.utility";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
@@ -48,7 +50,31 @@ function BillEnterModalContainer({
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const client = useApolloClient(); const client = useApolloClient();
const formValues = useMemo(() => {
return {
...billEnterModal.context.bill,
jobid:
(billEnterModal.context.job && billEnterModal.context.job.id) || null,
federal_tax_rate:
(bodyshop.bill_tax_rates && bodyshop.bill_tax_rates.federal_tax_rate) ||
0,
state_tax_rate:
(bodyshop.bill_tax_rates && bodyshop.bill_tax_rates.state_tax_rate) ||
0,
local_tax_rate:
(bodyshop.bill_tax_rates && bodyshop.bill_tax_rates.local_tax_rate) ||
0,
};
}, [billEnterModal, bodyshop]);
const handleFinish = async (values) => { const handleFinish = async (values) => {
let totals = CalculateBillTotal(values);
if (totals.discrepancy.getAmount() !== 0) {
if (!(await confirmDialog(t("bills.labels.savewithdiscrepancy")))) {
return;
}
}
setLoading(true); setLoading(true);
const { upload, location, ...remainingValues } = values; const { upload, location, ...remainingValues } = values;
@@ -190,7 +216,7 @@ function BillEnterModalContainer({
if (enterAgain) { if (enterAgain) {
form.resetFields(); form.resetFields();
form.setFieldsValue({ billlines: [] }); form.setFieldsValue(formValues);
} else { } else {
toggleModalVisible(); toggleModalVisible();
} }
@@ -208,23 +234,6 @@ function BillEnterModalContainer({
if (enterAgain) form.submit(); if (enterAgain) form.submit();
}, [enterAgain, form]); }, [enterAgain, form]);
const formValues = useMemo(() => {
return {
...billEnterModal.context.bill,
jobid:
(billEnterModal.context.job && billEnterModal.context.job.id) || null,
federal_tax_rate:
(bodyshop.bill_tax_rates && bodyshop.bill_tax_rates.federal_tax_rate) ||
0,
state_tax_rate:
(bodyshop.bill_tax_rates && bodyshop.bill_tax_rates.state_tax_rate) ||
0,
local_tax_rate:
(bodyshop.bill_tax_rates && bodyshop.bill_tax_rates.local_tax_rate) ||
0,
};
}, [billEnterModal, bodyshop]);
useEffect(() => { useEffect(() => {
if (billEnterModal.visible) { if (billEnterModal.visible) {
form.setFieldsValue(formValues); form.setFieldsValue(formValues);

View File

@@ -13,6 +13,7 @@ const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
ref={ref} ref={ref}
showSearch showSearch
optionFilterProp="line_desc" optionFilterProp="line_desc"
notFoundContent={"Removed."}
{...restProps} {...restProps}
> >
<Select.Option key={null} value={"noline"} cost={0} line_desc={""}> <Select.Option key={null} value={"noline"} cost={0} line_desc={""}>
@@ -21,14 +22,18 @@ const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
{options {options
? options.map((item) => ( ? options.map((item) => (
<Option <Option
disabled={item.removed}
key={item.id} key={item.id}
value={item.id} value={item.id}
cost={item.act_price ? item.act_price : 0} cost={item.act_price ? item.act_price : 0}
part_type={item.part_type} part_type={item.part_type}
line_desc={item.line_desc} line_desc={item.line_desc}
part_qty={item.part_qty} part_qty={item.part_qty}
style={{
...(item.removed ? { textDecoration: "line-through" } : {}),
}}
> >
{`${item.line_desc}${ {`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
item.oem_partno ? ` - ${item.oem_partno}` : "" item.oem_partno ? ` - ${item.oem_partno}` : ""
}`} }`}
</Option> </Option>

View File

@@ -8,6 +8,7 @@ import { selectSelectedConversation } from "../../redux/messaging/messaging.sele
import PhoneFormatter from "../../utils/PhoneFormatter"; import PhoneFormatter from "../../utils/PhoneFormatter";
import "./chat-conversation-list.styles.scss"; import "./chat-conversation-list.styles.scss";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { TimeAgoFormatter } from "../../utils/DateFormatter";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
selectedConversation: selectSelectedConversation, selectedConversation: selectSelectedConversation,
@@ -60,13 +61,18 @@ export function ChatConversationListComponent({
) : ( ) : (
<PhoneFormatter>{item.phone_num}</PhoneFormatter> <PhoneFormatter>{item.phone_num}</PhoneFormatter>
)} )}
{item.job_conversations.length > 0 <div sryle={{ display: "inline-block" }}>
? item.job_conversations.map((j, idx) => ( <div>
<Tag key={idx} className="ro-number-tag"> {item.job_conversations.length > 0
{j.job.ro_number} ? item.job_conversations.map((j, idx) => (
</Tag> <Tag key={idx} className="ro-number-tag">
)) {j.job.ro_number}
: null} </Tag>
))
: null}
</div>
<TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>
</div>
<Badge count={item.messages_aggregate.aggregate.count || 0} /> <Badge count={item.messages_aggregate.aggregate.count || 0} />
</List.Item> </List.Item>
)} )}

View File

@@ -1,4 +1,5 @@
import Icon from "@ant-design/icons"; import Icon from "@ant-design/icons";
import { Tooltip } from "antd";
import i18n from "i18next"; import i18n from "i18next";
import moment from "moment"; import moment from "moment";
import React, { useEffect, useRef } from "react"; import React, { useEffect, useRef } from "react";
@@ -9,6 +10,7 @@ import {
CellMeasurerCache, CellMeasurerCache,
List, List,
} from "react-virtualized"; } from "react-virtualized";
import { DateTimeFormatter } from "../../utils/DateFormatter";
import "./chat-message-list.styles.scss"; import "./chat-message-list.styles.scss";
export default function ChatMessageListComponent({ messages }) { export default function ChatMessageListComponent({ messages }) {
@@ -85,17 +87,22 @@ export default function ChatMessageListComponent({ messages }) {
const MessageRender = (message) => { const MessageRender = (message) => {
return ( return (
<div> <Tooltip title={DateTimeFormatter({ children: message.created_at })}>
{message.image_path && <div>
message.image_path.map((i, idx) => ( {message.image_path &&
<div key={idx} style={{ display: "flex", justifyContent: "center" }}> message.image_path.map((i, idx) => (
<a href={i} target="__blank"> <div
<img alt="Received" className="message-img" src={i} /> key={idx}
</a> style={{ display: "flex", justifyContent: "center" }}
</div> >
))} <a href={i} target="__blank">
<div>{message.text}</div> <img alt="Received" className="message-img" src={i} />
</div> </a>
</div>
))}
<div>{message.text}</div>
</div>
</Tooltip>
); );
}; };

View File

@@ -31,6 +31,9 @@ const CourtesyCarStatusComponent = ({ value, onChange }, ref) => {
<Option value="courtesycars.status.out"> <Option value="courtesycars.status.out">
{t("courtesycars.status.out")} {t("courtesycars.status.out")}
</Option> </Option>
<Option value="courtesycars.status.sold">
{t("courtesycars.status.sold")}
</Option>
</Select> </Select>
); );
}; };

View File

@@ -45,6 +45,10 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
text: t("courtesycars.status.out"), text: t("courtesycars.status.out"),
value: "courtesycars.status.out", value: "courtesycars.status.out",
}, },
{
text: t("courtesycars.status.sold"),
value: "courtesycars.status.sold",
},
], ],
onFilter: (value, record) => value.includes(record.status), onFilter: (value, record) => value.includes(record.status),
sortOrder: sortOrder:

View File

@@ -1,4 +1,4 @@
import { Button, Table, Typography } from "antd"; import { Button, Card, Table, Typography } from "antd";
import React, { useState, useEffect } from "react"; import React, { useState, useEffect } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
@@ -21,15 +21,16 @@ export default connect(
mapDispatchToProps mapDispatchToProps
)(DmsAllocationsSummary); )(DmsAllocationsSummary);
export function DmsAllocationsSummary({ socket, bodyshop, jobId }) { export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
const { t } = useTranslation(); const { t } = useTranslation();
const [allocationsSummary, setAllocationsSummary] = useState([]); const [allocationsSummary, setAllocationsSummary] = useState([]);
useEffect(() => { useEffect(() => {
if (socket.connected) { if (socket.connected) {
socket.emit("cdk-calculate-allocations", jobId, (ack) => socket.emit("cdk-calculate-allocations", jobId, (ack) => {
setAllocationsSummary(ack) setAllocationsSummary(ack);
); socket.allocationsSummary = ack;
});
} }
}, [socket, socket.connected, jobId]); }, [socket, socket.connected, jobId]);
@@ -75,8 +76,9 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId }) {
]; ];
return ( return (
<Table <Card
title={() => ( title={title}
extra={
<Button <Button
onClick={() => { onClick={() => {
socket.emit("cdk-calculate-allocations", jobId, (ack) => socket.emit("cdk-calculate-allocations", jobId, (ack) =>
@@ -86,43 +88,48 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId }) {
> >
<SyncOutlined /> <SyncOutlined />
</Button> </Button>
)} }
pagination={{ position: "top", defaultPageSize: 50 }} >
columns={columns} <Table
rowKey="center" pagination={{ position: "top", defaultPageSize: 50 }}
dataSource={allocationsSummary} columns={columns}
summary={() => { rowKey="center"
const totals = allocationsSummary.reduce( dataSource={allocationsSummary}
(acc, val) => { summary={() => {
return { const totals = allocationsSummary.reduce(
totalSale: acc.totalSale.add(Dinero(val.sale)), (acc, val) => {
totalCost: acc.totalCost.add(Dinero(val.cost)), return {
}; totalSale: acc.totalSale.add(Dinero(val.sale)),
}, totalCost: acc.totalCost.add(Dinero(val.cost)),
{ };
totalSale: Dinero(), },
totalCost: Dinero(), {
} totalSale: Dinero(),
); totalCost: Dinero(),
}
);
return ( return (
<Table.Summary.Row> <Table.Summary.Row>
<Table.Summary.Cell> <Table.Summary.Cell>
<Typography.Title level={4}> <Typography.Title level={4}>
{t("general.labels.totals")} {t("general.labels.totals")}
</Typography.Title> </Typography.Title>
</Table.Summary.Cell> </Table.Summary.Cell>
<Table.Summary.Cell> <Table.Summary.Cell>
{totals.totalSale.toFormat()} {totals.totalSale.toFormat()}
</Table.Summary.Cell> </Table.Summary.Cell>
<Table.Summary.Cell> <Table.Summary.Cell>
{totals.totalCost.toFormat()} {
</Table.Summary.Cell> // totals.totalCost.toFormat()
<Table.Summary.Cell></Table.Summary.Cell> }
<Table.Summary.Cell></Table.Summary.Cell> </Table.Summary.Cell>
</Table.Summary.Row> <Table.Summary.Cell></Table.Summary.Cell>
); <Table.Summary.Cell></Table.Summary.Cell>
}} </Table.Summary.Row>
/> );
}}
/>
</Card>
); );
} }

View File

@@ -1,11 +1,11 @@
import { useLazyQuery } from "@apollo/client";
import { Button, Input, Modal, Table } from "antd";
import React, { useState } from "react"; import React, { useState } from "react";
import { Modal, Button, Table, Input } from "antd"; 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 { useTranslation } from "react-i18next";
import { useLazyQuery } from "@apollo/client";
import { SEARCH_DMS_VEHICLES } from "../../graphql/dms.queries"; import { SEARCH_DMS_VEHICLES } from "../../graphql/dms.queries";
import { selectBodyshop } from "../../redux/user/user.selectors";
import AlertComponent from "../alert/alert.component"; import AlertComponent from "../alert/alert.component";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
@@ -26,31 +26,27 @@ export function DmsCdkVehicles({ bodyshop, form, socket, job }) {
useLazyQuery(SEARCH_DMS_VEHICLES); useLazyQuery(SEARCH_DMS_VEHICLES);
const columns = [ const columns = [
{ {
title: t("jobs.fields.dms.make"), title: t("vehicles.fields.v_make_desc"),
dataIndex: "make", dataIndex: "make",
key: "make", key: "make",
}, },
{ {
title: t("jobs.fields.dms.model"), title: t("vehicles.fields.v_model_desc"),
dataIndex: "model", dataIndex: "model",
key: "model", key: "model",
}, },
{ {
title: t("jobs.fields.dms.makecode"), title: t("jobs.fields.dms.dms_make"),
dataIndex: "makecode", dataIndex: "makecode",
key: "makecode", key: "makecode",
}, },
{ {
title: t("jobs.fields.dms.modelcode"), title: t("jobs.fields.dms.dms_model"),
dataIndex: "modelcode", dataIndex: "modelcode",
key: "modelcode", key: "modelcode",
}, },
]; ];
console.log(
"🚀 ~ file: dms-cdk-makes.component.jsx ~ line 95 ~ selectedModel",
selectedModel
);
return ( return (
<div> <div>
<Modal <Modal
@@ -102,7 +98,7 @@ export function DmsCdkVehicles({ bodyshop, form, socket, job }) {
}); });
}} }}
> >
{t("jobs.actions.dms.getmakes")} {t("jobs.actions.dms.findmakemodelcode")}
</Button> </Button>
</div> </div>
); );

View File

@@ -4,6 +4,7 @@ import React, { useState } from "react";
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 { useTranslation } from "react-i18next";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser //currentUser: selectCurrentUser
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
@@ -15,6 +16,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(DmsCdkMakesRefetch);
export function DmsCdkMakesRefetch({ bodyshop, form, socket }) { export function DmsCdkMakesRefetch({ bodyshop, form, socket }) {
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const { t } = useTranslation();
const handleRefetch = async () => { const handleRefetch = async () => {
setLoading(true); setLoading(true);
const response = await axios.post("/cdk/getvehicles", { const response = await axios.post("/cdk/getvehicles", {
@@ -26,7 +28,7 @@ export function DmsCdkMakesRefetch({ bodyshop, form, socket }) {
}; };
return ( return (
<Button loading={loading} onClick={handleRefetch}> <Button loading={loading} onClick={handleRefetch}>
Refetch Models {t("jobs.actions.dms.refetchmakesmodels")}
</Button> </Button>
); );
} }

View File

@@ -1,4 +1,4 @@
import { Button, Table } from "antd"; import { Button, Table, Col , Checkbox} from "antd";
import React, { useState } from "react"; import React, { useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
@@ -32,6 +32,7 @@ export function DmsCustomerSelector({ bodyshop }) {
const onUseSelected = () => { const onUseSelected = () => {
setVisible(false); setVisible(false);
socket.emit("cdk-selected-customer", selectedCustomer); socket.emit("cdk-selected-customer", selectedCustomer);
setSelectedCustomer(null);
}; };
const onUseGeneric = () => { const onUseGeneric = () => {
@@ -40,23 +41,36 @@ export function DmsCustomerSelector({ bodyshop }) {
"cdk-selected-customer", "cdk-selected-customer",
bodyshop.cdk_configuration.generic_customer_number bodyshop.cdk_configuration.generic_customer_number
); );
setSelectedCustomer(null);
}; };
const onCreateNew = () => { const onCreateNew = () => {
setVisible(false); setVisible(false);
socket.emit("cdk-selected-customer", null); socket.emit("cdk-selected-customer", null);
setSelectedCustomer(null);
}; };
const columns = [ const columns = [
{ {
title: t("dms.fields.name1"), title: t("jobs.fields.dms.id"),
dataIndex: ["id", "value"],
key: "id",
},
{
title: t("jobs.fields.dms.vinowner"),
dataIndex: "vinOwner",
key: "vinOwner",
render: (text, record) => <Checkbox disabled checked={record.vinOwner}/>
},
{
title: t("jobs.fields.dms.name1"),
dataIndex: ["name1", "fullName"], dataIndex: ["name1", "fullName"],
key: "name1", key: "name1",
sorter: (a, b) => alphaSort(a.name1?.fullName, b.name1?.fullName), sorter: (a, b) => alphaSort(a.name1?.fullName, b.name1?.fullName),
}, },
{ {
title: t("dms.fields.address"), title: t("jobs.fields.dms.address"),
//dataIndex: ["name2", "fullName"], //dataIndex: ["name2", "fullName"],
key: "address", key: "address",
render: (record, value) => render: (record, value) =>
@@ -66,40 +80,42 @@ export function DmsCustomerSelector({ bodyshop }) {
if (!visible) return <></>; if (!visible) return <></>;
return ( return (
<Table <Col span={24}>
title={() => ( <Table
<div> title={() => (
<Button onClick={onUseSelected} disabled={!selectedCustomer}> <div>
{t("jobs.actions.dms.useselected")} <Button onClick={onUseSelected} disabled={!selectedCustomer}>
</Button> {t("jobs.actions.dms.useselected")}
<Button </Button>
onClick={onUseGeneric} <Button
disabled={ onClick={onUseGeneric}
!( disabled={
bodyshop.cdk_configuration && !(
bodyshop.cdk_configuration.generic_customer_number bodyshop.cdk_configuration &&
) bodyshop.cdk_configuration.generic_customer_number
} )
> }
{t("jobs.actions.dms.usegeneric")} >
</Button> {t("jobs.actions.dms.usegeneric")}
<Button onClick={onCreateNew}> </Button>
{t("jobs.actions.dms.createnewcustomer")} <Button onClick={onCreateNew}>
</Button> {t("jobs.actions.dms.createnewcustomer")}
</div> </Button>
)} </div>
pagination={{ position: "top" }} )}
columns={columns} pagination={{ position: "top" }}
rowKey={(record) => record.id.value} columns={columns}
dataSource={customerList} rowKey={(record) => record.id.value}
//onChange={handleTableChange} dataSource={customerList}
rowSelection={{ //onChange={handleTableChange}
onSelect: (props) => { rowSelection={{
setSelectedCustomer(props.id.value); onSelect: (props) => {
}, setSelectedCustomer(props.id.value);
type: "radio", },
selectedRowKeys: [selectedCustomer], type: "radio",
}} selectedRowKeys: [selectedCustomer],
/> }}
/>
</Col>
); );
} }

View File

@@ -1,24 +1,28 @@
import { DeleteFilled } from "@ant-design/icons"; import { DeleteFilled } from "@ant-design/icons";
import { import {
Button, Button,
Card,
Divider,
Form, Form,
Input, Input,
InputNumber, InputNumber,
Select, Select,
Space, Space,
Statistic, Statistic,
Typography,
} from "antd"; } from "antd";
import Dinero from "dinero.js";
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 { determineDmsType } from "../../pages/dms/dms.container";
import { selectBodyshop } from "../../redux/user/user.selectors"; import { selectBodyshop } from "../../redux/user/user.selectors";
import DmsCdkMakes from "../dms-cdk-makes/dms-cdk-makes.component"; import DmsCdkMakes from "../dms-cdk-makes/dms-cdk-makes.component";
import CurrencyInput from "../form-items-formatted/currency-form-item.component"; import CurrencyInput from "../form-items-formatted/currency-form-item.component";
import LayoutFormRow from "../layout-form-row/layout-form-row.component"; import LayoutFormRow from "../layout-form-row/layout-form-row.component";
import Dinero from "dinero.js";
import { determineDmsType } from "../../pages/dms/dms.container";
import DmsCdkMakesRefetch from "../dms-cdk-makes/dms-cdk-makes.refetch.component"; import DmsCdkMakesRefetch from "../dms-cdk-makes/dms-cdk-makes.refetch.component";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
}); });
@@ -58,24 +62,90 @@ export function DmsPostForm({ bodyshop, socket, job }) {
}; };
return ( return (
<Form form={form} layout="vertical" onFinish={handleFinish}> <Card title={t("jobs.labels.dms.postingform")}>
<LayoutFormRow> <Form
<Form.Item form={form}
name="journal" layout="vertical"
label={t("jobs.fields.dms.journal")} onFinish={handleFinish}
initialValue={ initialValues={{
bodyshop.cdk_configuration && story: t("jobs.labels.dms.defaultstory", {
bodyshop.cdk_configuration.default_journal ro_number: job.ro_number,
} area_of_damage: job.area_of_damage && job.area_of_damage.impact1,
rules={[ }).substr(0, 239),
{ }}
required: true, >
//message: t("general.validation.required"), <LayoutFormRow grow>
}, <Form.Item
]} name="journal"
> label={t("jobs.fields.dms.journal")}
<Input /> initialValue={
</Form.Item> bodyshop.cdk_configuration &&
bodyshop.cdk_configuration.default_journal
}
rules={[
{
required: true,
//message: t("general.validation.required"),
},
]}
>
<Input />
</Form.Item>
<Form.Item
name="kmin"
label={t("jobs.fields.kmin")}
initialValue={job && job.kmin}
rules={[
{
required: true,
//message: t("general.validation.required"),
},
]}
>
<InputNumber disabled />
</Form.Item>
<Form.Item
name="kmout"
label={t("jobs.fields.kmout")}
initialValue={job && job.kmout}
rules={[
{
required: true,
//message: t("general.validation.required"),
},
]}
>
<InputNumber disabled />
</Form.Item>
</LayoutFormRow>
<LayoutFormRow style={{ justifyContent: "center" }} grow>
<Form.Item
name="dms_make"
label={t("jobs.fields.dms.dms_make")}
rules={[
{
required: true,
},
]}
>
<Input disabled />
</Form.Item>
<Form.Item
name="dms_model"
label={t("jobs.fields.dms.dms_model")}
rules={[
{
required: true,
},
]}
>
<Input disabled />
</Form.Item>
<DmsCdkMakes form={form} socket={socket} job={job} />
<DmsCdkMakesRefetch />
</LayoutFormRow>
<Form.Item <Form.Item
name="story" name="story"
label={t("jobs.fields.dms.story")} label={t("jobs.fields.dms.story")}
@@ -85,224 +155,186 @@ export function DmsPostForm({ bodyshop, socket, job }) {
}, },
]} ]}
> >
<Input.TextArea /> <Input.TextArea maxLength={240} />
</Form.Item> </Form.Item>
<Form.Item <Divider />
name="kmin" <Form.List name={["payers"]}>
label={t("jobs.fields.kmin")} {(fields, { add, remove }) => {
initialValue={job && job.kmin} return (
rules={[ <div>
{ {fields.map((field, index) => (
required: true, <Form.Item key={field.key}>
//message: t("general.validation.required"), <Space wrap>
}, <Form.Item
]} label={t("jobs.fields.dms.payer.name")}
> key={`${index}name`}
<InputNumber disabled /> name={[field.name, "name"]}
</Form.Item> rules={[
<Form.Item {
name="kmout" required: true,
label={t("jobs.fields.kmout")} },
initialValue={job && job.kmout} ]}
rules={[
{
required: true,
//message: t("general.validation.required"),
},
]}
>
<InputNumber disabled />
</Form.Item>
<Form.Item
name="dms_make"
label={t("jobs.fields.dms.dms_make")}
rules={[
{
required: true,
},
]}
>
<Input disabled />
</Form.Item>
<Form.Item
name="dms_model"
label={t("jobs.fields.dms.dms_model")}
rules={[
{
required: true,
},
]}
>
<Input disabled />
</Form.Item>
<DmsCdkMakes form={form} socket={socket} job={job} />
<DmsCdkMakesRefetch />
</LayoutFormRow>
<Form.List name={["payers"]}>
{(fields, { add, remove }) => {
return (
<div>
{fields.map((field, index) => (
<Form.Item key={field.key}>
<LayoutFormRow>
<Form.Item
label={t("jobs.fields.dms.payer.name")}
key={`${index}name`}
name={[field.name, "name"]}
rules={[
{
required: true,
},
]}
>
<Select
onSelect={(value) => handlePayerSelect(value, index)}
> >
{bodyshop.cdk_configuration && <Select
bodyshop.cdk_configuration.payers && style={{ minWidth: "15rem" }}
bodyshop.cdk_configuration.payers.map((payer) => ( onSelect={(value) => handlePayerSelect(value, index)}
<Select.Option key={payer.name}> >
{payer.name} {bodyshop.cdk_configuration &&
</Select.Option> bodyshop.cdk_configuration.payers &&
))} bodyshop.cdk_configuration.payers.map((payer) => (
</Select> <Select.Option key={payer.name}>
</Form.Item> {payer.name}
</Select.Option>
))}
</Select>
</Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.dms.payer.dms_acctnumber")} label={t("jobs.fields.dms.payer.dms_acctnumber")}
key={`${index}dms_acctnumber`} key={`${index}dms_acctnumber`}
name={[field.name, "dms_acctnumber"]} name={[field.name, "dms_acctnumber"]}
rules={[ rules={[
{ {
required: true, required: true,
}, },
]} ]}
> >
<Input disabled /> <Input disabled />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.dms.payer.amount")} label={t("jobs.fields.dms.payer.amount")}
key={`${index}amount`} key={`${index}amount`}
name={[field.name, "amount"]} name={[field.name, "amount"]}
rules={[ rules={[
{ {
required: true, required: true,
}, },
]} ]}
> >
<CurrencyInput min={0} /> <CurrencyInput min={0} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.dms.payer.controlnumber")} label={t("jobs.fields.dms.payer.controlnumber")}
key={`${index}controlnumber`} key={`${index}controlnumber`}
name={[field.name, "controlnumber"]} name={[field.name, "controlnumber"]}
rules={[ rules={[
{ {
required: true, required: true,
}, },
]} ]}
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item shouldUpdate> <Form.Item shouldUpdate>
{() => { {() => {
const payers = form.getFieldValue("payers"); const payers = form.getFieldValue("payers");
const row = payers && payers[index]; const row = payers && payers[index];
const cdkPayer = const cdkPayer =
bodyshop.cdk_configuration.payers && bodyshop.cdk_configuration.payers &&
bodyshop.cdk_configuration.payers.find( bodyshop.cdk_configuration.payers.find(
(i) => i && row && i.name === row.name (i) => i && row && i.name === row.name
);
return (
<div>
{cdkPayer &&
t(`jobs.fields.${cdkPayer.control_type}`)}
</div>
); );
}}
</Form.Item>
return ( <DeleteFilled
<div> onClick={() => {
{cdkPayer && remove(field.name);
t(`jobs.fields.${cdkPayer.control_type}`)} }}
</div> />
); </Space>
}} </Form.Item>
</Form.Item> ))}
<Form.Item>
<DeleteFilled <Button
onClick={() => { type="dashed"
remove(field.name); disabled={!(fields.length < 3)}
}} onClick={() => {
/> if (fields.length < 3) add();
</LayoutFormRow> }}
style={{ width: "100%" }}
>
{t("jobs.actions.dms.addpayer")}
</Button>
</Form.Item> </Form.Item>
))} </div>
<Form.Item> );
<Button }}
type="dashed" </Form.List>
disabled={!(fields.length < 3)} <Form.Item shouldUpdate>
onClick={() => { {() => {
if (fields.length < 3) add(); //Perform Calculation to determine discrepancy.
}} let totalAllocated = Dinero();
style={{ width: "100%" }}
>
{t("dms.actions.addpayer")}
</Button>
</Form.Item>
</div>
);
}}
</Form.List>
<Form.Item shouldUpdate>
{() => {
//Perform Calculation to determine discrepancy.
let totalAllocated = Dinero();
const payers = form.getFieldValue("payers"); const payers = form.getFieldValue("payers");
payers && payers &&
payers.forEach((payer) => { payers.forEach((payer) => {
totalAllocated = totalAllocated.add( totalAllocated = totalAllocated.add(
Dinero({ amount: Math.round((payer?.amount || 0) * 100) }) Dinero({ amount: Math.round((payer?.amount || 0) * 100) })
);
});
const totals =
socket.allocationsSummary &&
socket.allocationsSummary.reduce(
(acc, val) => {
return {
totalSale: acc.totalSale.add(Dinero(val.sale)),
totalCost: acc.totalCost.add(Dinero(val.cost)),
};
},
{
totalSale: Dinero(),
totalCost: Dinero(),
}
); );
}); const discrep = totals
const discrep = Dinero(job.job_totals.totals.total_repairs).subtract( ? totals.totalSale.subtract(totalAllocated)
totalAllocated : Dinero();
); return (
return ( <Space size="large" wrap align="center">
<Space> <Statistic
<Statistic title={t("jobs.labels.subtotal")}
title={t("jobs.labels.dms.totalallocated")} value={(totals ? totals.totalSale : Dinero()).toFormat()}
value={totalAllocated.toFormat()} />
/> <Typography.Title>-</Typography.Title>
<Statistic <Statistic
title={t("jobs.fields.subtotal")} title={t("jobs.labels.dms.totalallocated")}
value={Dinero(job.job_totals.totals.total_repairs).toFormat()} value={totalAllocated.toFormat()}
/> />
<Statistic <Typography.Title>=</Typography.Title>
title={t("jobs.labels.dms.notallocated")} <Statistic
valueStyle={{ title={t("jobs.labels.dms.notallocated")}
color: discrep.getAmount() === 0 ? "green" : "red", valueStyle={{
}} color: discrep.getAmount() === 0 ? "green" : "red",
value={discrep.toFormat()} }}
/> value={discrep.toFormat()}
<Button //disabled={discrep.getAmount() !== 0} //TODO: REMOVE THIS COMMENT. />
htmlType="submit" <Button
> disabled={
{t("jobs.actions.dms.post")} !socket.allocationsSummary || discrep.getAmount() !== 0
</Button> }
<Button htmlType="submit"
onClick={() => { >
socket.emit(`${determineDmsType(bodyshop)}-export-job`, { {t("jobs.actions.dms.post")}
jobid: job.id, </Button>
}); </Space>
}} );
> }}
Bypass </Form.Item>
</Button> </Form>
</Space> </Card>
);
}}
</Form.Item>
</Form>
); );
} }

View File

@@ -9,6 +9,7 @@ import {
selectBodyshop, selectBodyshop,
selectCurrentUser, selectCurrentUser,
} from "../../redux/user/user.selectors"; } from "../../redux/user/user.selectors";
import { tracker } from "../../App/App.container";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
currentUser: selectCurrentUser, currentUser: selectCurrentUser,
@@ -36,6 +37,7 @@ class ErrorBoundary extends React.Component {
componentDidCatch(error, info) { componentDidCatch(error, info) {
console.log("Exception Caught by Error Boundary.", error, info); console.log("Exception Caught by Error Boundary.", error, info);
this.setState({ ...this.state, error, info }); this.setState({ ...this.state, error, info });
tracker.event("error_boundary", error, true);
} }
handleErrorSubmit = () => { handleErrorSubmit = () => {

View File

@@ -400,7 +400,7 @@ export function JobLinesComponent({
setState({ setState({
...state, ...state,
filteredInfo: { filteredInfo: {
part_type: ["PAN,PAC,PAR,PAL,PAA,PAM,PAP,PAS,PASL"], part_type: ["PAN,PAC,PAR,PAL,PAA,PAM,PAP,PAS,PASL,PAG"],
}, },
}); });
}} }}
@@ -435,7 +435,7 @@ export function JobLinesComponent({
columns={columns} columns={columns}
rowKey="id" rowKey="id"
loading={loading} loading={loading}
pagination={{ position: "top", defaultPageSize: 50 }} pagination={false}
dataSource={jobLines} dataSource={jobLines}
onChange={handleTableChange} onChange={handleTableChange}
scroll={{ scroll={{

View File

@@ -21,7 +21,8 @@ export default function JobReconciliationBillsTable({
title: t("billlines.fields.line_desc"), title: t("billlines.fields.line_desc"),
dataIndex: "line_desc", dataIndex: "line_desc",
key: "line_desc", key: "line_desc",
width: "35%", ellipsis: true,
minWidth: "65rem",
sorter: (a, b) => alphaSort(a.line_desc, b.line_desc), sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
sortOrder: sortOrder:
state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order, state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
@@ -30,7 +31,7 @@ export default function JobReconciliationBillsTable({
title: t("billlines.labels.from"), title: t("billlines.labels.from"),
dataIndex: "from", dataIndex: "from",
key: "from", key: "from",
width: "20%",
ellipsis: true, ellipsis: true,
render: (text, record) => render: (text, record) =>
`${record.bill.vendor && record.bill.vendor.name} / ${ `${record.bill.vendor && record.bill.vendor.name} / ${
@@ -42,6 +43,7 @@ export default function JobReconciliationBillsTable({
dataIndex: "actual_price", dataIndex: "actual_price",
key: "actual_price", key: "actual_price",
sorter: (a, b) => a.actual_price - b.actual_price, sorter: (a, b) => a.actual_price - b.actual_price,
width: "7rem",
sortOrder: sortOrder:
state.sortedInfo.columnKey === "actual_price" && state.sortedInfo.order, state.sortedInfo.columnKey === "actual_price" && state.sortedInfo.order,
render: (text, record) => ( render: (text, record) => (
@@ -53,6 +55,7 @@ export default function JobReconciliationBillsTable({
dataIndex: "actual_cost", dataIndex: "actual_cost",
key: "actual_cost", key: "actual_cost",
sorter: (a, b) => a.actual_cost - b.actual_cost, sorter: (a, b) => a.actual_cost - b.actual_cost,
width: "7rem",
sortOrder: sortOrder:
state.sortedInfo.columnKey === "actual_cost" && state.sortedInfo.order, state.sortedInfo.columnKey === "actual_cost" && state.sortedInfo.order,
render: (text, record) => ( render: (text, record) => (
@@ -64,6 +67,7 @@ export default function JobReconciliationBillsTable({
dataIndex: "quantity", dataIndex: "quantity",
key: "quantity", key: "quantity",
sorter: (a, b) => a.quantity - b.quantity, sorter: (a, b) => a.quantity - b.quantity,
width: "4rem",
sortOrder: sortOrder:
state.sortedInfo.columnKey === "quantity" && state.sortedInfo.order, state.sortedInfo.columnKey === "quantity" && state.sortedInfo.order,
}, },
@@ -72,9 +76,11 @@ export default function JobReconciliationBillsTable({
dataIndex: "is_credit_memo", dataIndex: "is_credit_memo",
key: "is_credit_memo", key: "is_credit_memo",
sorter: (a, b) => a.bill.is_credit_memo - b.bill.is_credit_memo, sorter: (a, b) => a.bill.is_credit_memo - b.bill.is_credit_memo,
width: "8rem",
sortOrder: sortOrder:
state.sortedInfo.columnKey === "is_credit_memo" && state.sortedInfo.columnKey === "is_credit_memo" &&
state.sortedInfo.order, state.sortedInfo.order,
render: (text, record) => ( render: (text, record) => (
<Checkbox disabled checked={record.bill.is_credit_memo} /> <Checkbox disabled checked={record.bill.is_credit_memo} />
), ),
@@ -94,7 +100,7 @@ export default function JobReconciliationBillsTable({
<Table <Table
pagination={false} pagination={false}
size="small" size="small"
scroll={{ y: "80vh", x: true }} scroll={{ y: "60vh" }}
columns={columns} columns={columns}
rowKey="id" rowKey="id"
dataSource={invoiceLineData} dataSource={invoiceLineData}

View File

@@ -1,12 +1,12 @@
.imex-reconciliation-modal { .imex-reconciliation-modal {
top: 20px; top: 20px;
.ant-modal-content { // .ant-modal-content {
height: 95vh; // height: 95vh;
display: flex; // display: flex;
flex-direction: column; // flex-direction: column;
.ant-modal-body { // .ant-modal-body {
display: flex; // display: flex;
flex: 1; // flex: 1;
} // }
} // }
} }

View File

@@ -23,6 +23,7 @@ export default function JobReconcilitionPartsTable({
dataIndex: "line_desc", dataIndex: "line_desc",
key: "line_desc", key: "line_desc",
sorter: (a, b) => alphaSort(a.line_desc, b.line_desc), sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
ellipses: true,
sortOrder: sortOrder:
state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order, state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
}, },
@@ -57,6 +58,7 @@ export default function JobReconcilitionPartsTable({
dataIndex: "act_price", dataIndex: "act_price",
key: "act_price", key: "act_price",
sorter: (a, b) => a.act_price - b.act_price, sorter: (a, b) => a.act_price - b.act_price,
width: "7rem",
sortOrder: sortOrder:
state.sortedInfo.columnKey === "act_price" && state.sortedInfo.order, state.sortedInfo.columnKey === "act_price" && state.sortedInfo.order,
@@ -68,10 +70,12 @@ export default function JobReconcilitionPartsTable({
title: t("joblines.fields.part_qty"), title: t("joblines.fields.part_qty"),
dataIndex: "part_qty", dataIndex: "part_qty",
key: "part_qty", key: "part_qty",
width: "4rem",
}, },
{ {
title: t("joblines.fields.total"), title: t("joblines.fields.total"),
dataIndex: "total", dataIndex: "total",
width: "7rem",
key: "total", key: "total",
sorter: (a, b) => a.act_price * a.part_qty - b.act_price * b.part_qty, sorter: (a, b) => a.act_price * a.part_qty - b.act_price * b.part_qty,
sortOrder: sortOrder:
@@ -89,6 +93,7 @@ export default function JobReconcilitionPartsTable({
dataIndex: "status", dataIndex: "status",
key: "status", key: "status",
sorter: (a, b) => alphaSort(a.status, b.status), sorter: (a, b) => alphaSort(a.status, b.status),
width: "6rem",
sortOrder: sortOrder:
state.sortedInfo.columnKey === "status" && state.sortedInfo.order, state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
}, },
@@ -108,7 +113,7 @@ export default function JobReconcilitionPartsTable({
pagination={false} pagination={false}
columns={columns} columns={columns}
size="small" size="small"
scroll={{ y: "80vh", x: true }} scroll={{ y: "60vh" }}
rowKey="id" rowKey="id"
dataSource={jobLineData} dataSource={jobLineData}
onChange={handleTableChange} onChange={handleTableChange}

View File

@@ -29,6 +29,7 @@ import {
selectBodyshop, selectBodyshop,
selectCurrentUser, selectCurrentUser,
} from "../../redux/user/user.selectors"; } from "../../redux/user/user.selectors";
import confirmDialog from "../../utils/asyncConfirm";
import AuditTrailMapping from "../../utils/AuditTrailMappings"; import AuditTrailMapping from "../../utils/AuditTrailMappings";
import AlertComponent from "../alert/alert.component"; import AlertComponent from "../alert/alert.component";
import JobsAvailableScan from "../jobs-available-scan/jobs-available-scan.component"; import JobsAvailableScan from "../jobs-available-scan/jobs-available-scan.component";
@@ -394,14 +395,6 @@ function replaceEmpty(someObj, replaceValue = null) {
return JSON.parse(temp); return JSON.parse(temp);
} }
function confirmDialog(msg) {
return new Promise(function (resolve, reject) {
let confirmed = window.confirm(msg);
return confirmed ? resolve(true) : resolve(false);
});
}
async function CheckTaxRates(estData, bodyshop) { async function CheckTaxRates(estData, bodyshop) {
//LKQ Check //LKQ Check
if ( if (

View File

@@ -13,6 +13,7 @@ import {
} from "../../redux/user/user.selectors"; } from "../../redux/user/user.selectors";
import { logImEXEvent } from "../../firebase/firebase.utils"; import { logImEXEvent } from "../../firebase/firebase.utils";
import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries"; import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
import { useHistory } from "react-router-dom";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
@@ -26,11 +27,17 @@ export function JobsCloseExportButton({
disabled, disabled,
setSelectedJobs, setSelectedJobs,
}) { }) {
const history = useHistory();
const { t } = useTranslation(); const { t } = useTranslation();
const [updateJob] = useMutation(UPDATE_JOB); const [updateJob] = useMutation(UPDATE_JOB);
const [insertExportLog] = useMutation(INSERT_EXPORT_LOG); const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const handleQbxml = async () => { const handleQbxml = async () => {
if (bodyshop.cdk_dealerid) {
history.push(`/manage/dms?jobId=${jobId}`);
return;
}
logImEXEvent("jobs_close_export"); logImEXEvent("jobs_close_export");
setLoading(true); setLoading(true);
@@ -159,12 +166,7 @@ export function JobsCloseExportButton({
}; };
return ( return (
<Button <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
onClick={handleQbxml}
loading={loading}
disabled={disabled}
type="dashed"
>
{t("jobs.actions.export")} {t("jobs.actions.export")}
</Button> </Button>
); );

View File

@@ -76,6 +76,9 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
{job.ins_co_nm} {job.ins_co_nm}
</DataLabel> </DataLabel>
<DataLabel label={t("jobs.fields.clm_no")}>{job.clm_no}</DataLabel> <DataLabel label={t("jobs.fields.clm_no")}>{job.clm_no}</DataLabel>
<DataLabel label={t("jobs.fields.ponumber")} hideIfNull>
{job.po_number}
</DataLabel>
<DataLabel label={t("jobs.fields.repairtotal")}> <DataLabel label={t("jobs.fields.repairtotal")}>
<CurrencyFormatter>{job.clm_total}</CurrencyFormatter> <CurrencyFormatter>{job.clm_total}</CurrencyFormatter>
<span style={{ margin: "0rem .5rem" }}>/</span> <span style={{ margin: "0rem .5rem" }}>/</span>

View File

@@ -13,6 +13,7 @@ import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import { selectJobReadOnly } from "../../redux/application/application.selectors"; import { selectJobReadOnly } from "../../redux/application/application.selectors";
import { selectBodyshop } from "../../redux/user/user.selectors";
import CABCpvrtCalculator from "../ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component"; import CABCpvrtCalculator from "../ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component";
import CurrencyInput from "../form-items-formatted/currency-form-item.component"; import CurrencyInput from "../form-items-formatted/currency-form-item.component";
import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component"; import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
@@ -22,9 +23,10 @@ import JobsDetailRatesParts from "./jobs-detail-rates.parts.component";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
jobRO: selectJobReadOnly, jobRO: selectJobReadOnly,
bodyshop: selectBodyshop,
}); });
export function JobsDetailRates({ jobRO, form, job }) { export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<div> <div>
@@ -77,7 +79,7 @@ export function JobsDetailRates({ jobRO, form, job }) {
label={t("jobs.fields.adjustment_bottom_line")} label={t("jobs.fields.adjustment_bottom_line")}
name="adjustment_bottom_line" name="adjustment_bottom_line"
> >
<CurrencyInput disabled={jobRO} /> <CurrencyInput disabled={jobRO || bodyshop.cdk_dealerid} />
</Form.Item> </Form.Item>
<Space align="end"> <Space align="end">
<Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt"> <Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">

View File

@@ -130,13 +130,10 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
ellipsis: true, ellipsis: true,
sorter: true, //(a, b) => alphaSort(a.clm_no, b.clm_no), sorter: true, //(a, b) => alphaSort(a.clm_no, b.clm_no),
sortOrder: sortcolumn === "clm_no" && sortorder, sortOrder: sortcolumn === "clm_no" && sortorder,
render: (text, record) => { render: (text, record) =>
return record.clm_no ? ( `${record.clm_no || ""}${
<span>{record.clm_no}</span> record.po_number ? ` (PO: ${record.po_number})` : ""
) : ( }`,
t("general.labels.unknown")
);
},
}, },
{ {
title: t("jobs.fields.ins_co_nm"), title: t("jobs.fields.ins_co_nm"),

View File

@@ -208,6 +208,10 @@ export function JobsList({ bodyshop }) {
sorter: (a, b) => alphaSort(a.clm_no, b.clm_no), sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
sortOrder: sortOrder:
state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order, state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
render: (text, record) =>
`${record.clm_no || ""}${
record.po_number ? ` (PO: ${record.po_number})` : ""
}`,
}, },
{ {
title: t("jobs.fields.ins_co_nm"), title: t("jobs.fields.ins_co_nm"),

View File

@@ -10,8 +10,21 @@ import {
QUERY_NOTES_BY_JOB_PK, QUERY_NOTES_BY_JOB_PK,
} from "../../graphql/notes.queries"; } from "../../graphql/notes.queries";
import JobNotesComponent from "./jobs.notes.component"; import JobNotesComponent from "./jobs.notes.component";
import { insertAuditTrail } from "../../redux/application/application.actions";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import AuditTrailMapping from "../../utils/AuditTrailMappings";
export default function JobNotesContainer({ jobId }) { const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser
});
const mapDispatchToProps = (dispatch) => ({
insertAuditTrail: ({ jobid, operation }) =>
dispatch(insertAuditTrail({ jobid, operation })),
});
export default connect(mapStateToProps, mapDispatchToProps)(JobNotesContainer);
export function JobNotesContainer({ jobId, insertAuditTrail }) {
const { loading, error, data, refetch } = useQuery(QUERY_NOTES_BY_JOB_PK, { const { loading, error, data, refetch } = useQuery(QUERY_NOTES_BY_JOB_PK, {
variables: { id: jobId }, variables: { id: jobId },
fetchPolicy: "network-only", fetchPolicy: "network-only",
@@ -32,6 +45,10 @@ export default function JobNotesContainer({ jobId }) {
notification["success"]({ notification["success"]({
message: t("notes.successes.deleted"), message: t("notes.successes.deleted"),
}); });
insertAuditTrail({
jobid: jobId,
operation: AuditTrailMapping.jobnotedeleted(),
});
}); });
setDeleteLoading(false); setDeleteLoading(false);
}; };

View File

@@ -57,6 +57,7 @@ export function LaborAllocationsTable({
sorter: (a, b) => alphaSort(a.cost_center, b.cost_center), sorter: (a, b) => alphaSort(a.cost_center, b.cost_center),
sortOrder: sortOrder:
state.sortedInfo.columnKey === "cost_center" && state.sortedInfo.order, state.sortedInfo.columnKey === "cost_center" && state.sortedInfo.order,
render: (text, record) => `${record.cost_center} (${record.mod_lbr_ty})`,
}, },
{ {
title: t("jobs.labels.hrs_total"), title: t("jobs.labels.hrs_total"),

View File

@@ -16,6 +16,7 @@ export const CalculateAllocationsTotals = (
const r = { const r = {
opcode: value, opcode: value,
cost_center: responsibilitycenters.defaults.costs[value], cost_center: responsibilitycenters.defaults.costs[value],
mod_lbr_ty: value,
total: joblines.reduce((acc2, val2) => { total: joblines.reduce((acc2, val2) => {
return val2.mod_lbr_ty === value ? acc2 + val2.mod_lb_hrs : acc2; return val2.mod_lbr_ty === value ? acc2 + val2.mod_lb_hrs : acc2;
}, 0), }, 0),

View File

@@ -10,6 +10,8 @@ import { selectNoteUpsert } from "../../redux/modals/modals.selectors";
import { selectCurrentUser } from "../../redux/user/user.selectors"; import { selectCurrentUser } from "../../redux/user/user.selectors";
import NoteUpsertModalComponent from "./note-upsert-modal.component"; import NoteUpsertModalComponent from "./note-upsert-modal.component";
import { logImEXEvent } from "../../firebase/firebase.utils"; import { logImEXEvent } from "../../firebase/firebase.utils";
import { insertAuditTrail } from "../../redux/application/application.actions";
import AuditTrailMapping from "../../utils/AuditTrailMappings";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
currentUser: selectCurrentUser, currentUser: selectCurrentUser,
@@ -17,12 +19,15 @@ const mapStateToProps = createStructuredSelector({
}); });
const mapDispatchToProps = (dispatch) => ({ const mapDispatchToProps = (dispatch) => ({
toggleModalVisible: () => dispatch(toggleModalVisible("noteUpsert")), toggleModalVisible: () => dispatch(toggleModalVisible("noteUpsert")),
insertAuditTrail: ({ jobid, operation }) =>
dispatch(insertAuditTrail({ jobid, operation })),
}); });
export function NoteUpsertModalContainer({ export function NoteUpsertModalContainer({
currentUser, currentUser,
noteUpsertModal, noteUpsertModal,
toggleModalVisible, toggleModalVisible,
insertAuditTrail,
}) { }) {
const { t } = useTranslation(); const { t } = useTranslation();
const [insertNote] = useMutation(INSERT_NEW_NOTE); const [insertNote] = useMutation(INSERT_NEW_NOTE);
@@ -56,6 +61,10 @@ export function NoteUpsertModalContainer({
notification["success"]({ notification["success"]({
message: t("notes.successes.updated"), message: t("notes.successes.updated"),
}); });
insertAuditTrail({
jobid: context.jobId,
operation: AuditTrailMapping.jobnoteupdated(),
});
}); });
if (refetch) refetch(); if (refetch) refetch();
toggleModalVisible(); toggleModalVisible();
@@ -75,6 +84,10 @@ export function NoteUpsertModalContainer({
notification["success"]({ notification["success"]({
message: t("notes.successes.create"), message: t("notes.successes.create"),
}); });
insertAuditTrail({
jobid: context.jobId,
operation: AuditTrailMapping.jobnoteadded(),
});
}); });
} }
}; };

View File

@@ -176,7 +176,7 @@ export function PartsOrderModalContainer({
if (refetch) refetch(); if (refetch) refetch();
toggleModalVisible(); toggleModalVisible();
const Templates = TemplateList("partsorder"); const Templates = TemplateList("partsorder", context);
if (sendType === "e") { if (sendType === "e") {
const matchingVendor = data.vendors.filter( const matchingVendor = data.vendors.filter(

View File

@@ -1,5 +1,16 @@
import { useLazyQuery } from "@apollo/client"; import { useLazyQuery } from "@apollo/client";
import { Button, DatePicker, Form, Radio, Space } from "antd"; import {
Button,
Card,
Col,
DatePicker,
Form,
Input,
Radio,
Row,
Typography,
} from "antd";
import _ from "lodash";
import moment from "moment"; import moment from "moment";
import React, { useState } from "react"; import React, { useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
@@ -14,7 +25,6 @@ import { TemplateList } from "../../utils/TemplateConstants";
import EmployeeSearchSelect from "../employee-search-select/employee-search-select.component"; import EmployeeSearchSelect from "../employee-search-select/employee-search-select.component";
import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component"; import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
import "./report-center-modal.styles.scss"; import "./report-center-modal.styles.scss";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
reportCenterModal: selectReportCenter, reportCenterModal: selectReportCenter,
}); });
@@ -28,9 +38,14 @@ export default connect(
export function ReportCenterModalComponent({ reportCenterModal }) { export function ReportCenterModalComponent({ reportCenterModal }) {
const [form] = Form.useForm(); const [form] = Form.useForm();
const [search, setSearch] = useState("");
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const { t } = useTranslation(); const { t } = useTranslation();
const Templates = TemplateList("report_center"); const Templates = TemplateList("report_center");
const ReportsList = Object.keys(Templates).map((key) => {
return Templates[key];
});
const { visible } = reportCenterModal; const { visible } = reportCenterModal;
const [callVendorQuery, { data: vendorData, called: vendorCalled }] = const [callVendorQuery, { data: vendorData, called: vendorCalled }] =
@@ -67,6 +82,9 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
...(end ...(end
? { end: moment(end).endOf("day").format("YYYY-MM-DD") } ? { end: moment(end).endOf("day").format("YYYY-MM-DD") }
: {}), : {}),
...(start ? { starttz: moment(start).startOf("day") } : {}),
...(end ? { endtz: moment(end).endOf("day") } : {}),
...(id ? { id: id } : {}), ...(id ? { id: id } : {}),
}, },
}, },
@@ -80,6 +98,17 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
setLoading(false); setLoading(false);
}; };
const FilteredReportsList =
search !== ""
? ReportsList.filter((r) =>
r.title.toLowerCase().includes(search.toLowerCase())
)
: ReportsList;
//Group it, create cards, and then filter out.
const grouped = _.groupBy(FilteredReportsList, "group");
return ( return (
<div> <div>
<Form <Form
@@ -88,6 +117,10 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
layout="vertical" layout="vertical"
form={form} form={form}
> >
<Input.Search
onChange={(e) => setSearch(e.target.value)}
value={search}
/>
<Form.Item <Form.Item
name="key" name="key"
label={t("reportcenter.labels.key")} label={t("reportcenter.labels.key")}
@@ -100,23 +133,42 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
]} ]}
> >
<Radio.Group> <Radio.Group>
<Space {/* {Object.keys(Templates).map((key) => (
direction="vertical"
wrap
size="small"
style={{
maxHeight: "50vh",
}}
>
{Object.keys(Templates).map((key) => (
<Radio key={key} value={key}> <Radio key={key} value={key}>
{Templates[key].title} {Templates[key].title}
</Radio> </Radio>
))} */}
<Row gutter={[16, 16]}>
{Object.keys(grouped).map((key) => (
<Col md={8} sm={12} key={key}>
<Card.Grid
style={{
width: "100%",
height: "100%",
maxHeight: "33vh",
overflowY: "scroll",
}}
>
<Typography.Title level={4}>
{t(`reportcenter.labels.groups.${key}`)}
</Typography.Title>
<ul style={{ columns: "2 auto" }}>
{grouped[key].map((item) => (
<li key={item.key}>
<Radio key={item.key} value={item.key}>
{item.title}
</Radio>
</li>
))}
</ul>
</Card.Grid>
</Col>
))} ))}
</Space> </Row>
</Radio.Group> </Radio.Group>
</Form.Item> </Form.Item>
<Form.Item dependencies={["key"]}> <Form.Item style={{ margin: 0, padding: 0 }} dependencies={["key"]}>
{() => { {() => {
const key = form.getFieldValue("key"); const key = form.getFieldValue("key");
if (!key) return null; if (!key) return null;
@@ -137,14 +189,14 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
shouldUpdate={(prev, cur) => shouldUpdate={(prev, cur) =>
Templates[prev.key]?.idtype !== Templates[cur.key]?.idtype Templates[prev.key]?.idtype !== Templates[cur.key]?.idtype
} }
style={{ display: "none" }} style={{ display: "none", margin: 0, padding: 0 }}
> >
{() => { {() => {
form.setFieldsValue({ id: null }); form.setFieldsValue({ id: null });
return null; return null;
}} }}
</Form.Item> </Form.Item>
<Form.Item dependencies={["key"]}> <Form.Item style={{ margin: 0, padding: 0 }} dependencies={["key"]}>
{() => { {() => {
const key = form.getFieldValue("key"); const key = form.getFieldValue("key");
if (!key) return null; if (!key) return null;
@@ -204,7 +256,7 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
]} ]}
> >
<DatePicker.RangePicker <DatePicker.RangePicker
format="YYYY-MM-DD" format="MM/DD/YYYY"
ranges={DatePIckerRanges} ranges={DatePIckerRanges}
/> />
</Form.Item> </Form.Item>

View File

@@ -91,6 +91,18 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item
label={t("bodyshop.fields.dms.srcco")}
rules={[
{
required: true,
//message: t("general.validation.required"),
},
]}
name={["cdk_configuration", "srcco"]}
>
<Input />
</Form.Item>
<Form.Item <Form.Item
label={t("bodyshop.fields.dms.generic_customer_number")} label={t("bodyshop.fields.dms.generic_customer_number")}
name={["cdk_configuration", "generic_customer_number"]} name={["cdk_configuration", "generic_customer_number"]}
@@ -99,6 +111,12 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("bodyshop.fields.dms.cashierid")} label={t("bodyshop.fields.dms.cashierid")}
rules={[
{
required: true,
//message: t("general.validation.required"),
},
]}
name={["cdk_configuration", "cashierid"]} name={["cdk_configuration", "cashierid"]}
> >
<Input /> <Input />
@@ -113,7 +131,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
<Form.Item key={field.key}> <Form.Item key={field.key}>
<LayoutFormRow noDivider> <LayoutFormRow noDivider>
<Form.Item <Form.Item
label={t("bodyshop.fields.dms.payer.name")} label={t("jobs.fields.dms.payer.name")}
key={`${index}name`} key={`${index}name`}
name={[field.name, "name"]} name={[field.name, "name"]}
rules={[ rules={[
@@ -125,9 +143,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t( label={t("jobs.fields.dms.payer.dms_acctnumber")}
"bodyshop.fields.dms.payer.dms_acctnumber"
)}
key={`${index}dms_acctnumber`} key={`${index}dms_acctnumber`}
name={[field.name, "dms_acctnumber"]} name={[field.name, "dms_acctnumber"]}
rules={[ rules={[
@@ -139,7 +155,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("bodyshop.fields.dms.payer.control_type")} label={t("jobs.fields.dms.payer.control_type")}
key={`${index}control_type`} key={`${index}control_type`}
name={[field.name, "control_type"]} name={[field.name, "control_type"]}
rules={[ rules={[
@@ -455,20 +471,26 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
{fields.map((field, index) => ( {fields.map((field, index) => (
<Form.Item key={field.key}> <Form.Item key={field.key}>
<div> <div>
<Form.Item <LayoutFormRow>
label={t("bodyshop.fields.dms.mappingname")} <Form.Item
key={`${index}name`} label={t("bodyshop.fields.dms.mappingname")}
name={[field.name, "name"]} key={`${index}name`}
rules={[ name={[field.name, "name"]}
{ rules={[
required: true, {
//message: t("general.validation.required"), required: true,
}, //message: t("general.validation.required"),
]} },
> ]}
<Input /> >
</Form.Item> <Input />
</Form.Item>
<DeleteFilled
onClick={() => {
remove(field.name);
}}
/>
</LayoutFormRow>
<LayoutFormRow <LayoutFormRow
header={t("bodyshop.labels.defaultcostsmapping")} header={t("bodyshop.labels.defaultcostsmapping")}
> >
@@ -1611,12 +1633,6 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
</Select> </Select>
</Form.Item> </Form.Item>
</LayoutFormRow> </LayoutFormRow>
<DeleteFilled
onClick={() => {
remove(field.name);
}}
/>
</div> </div>
</Form.Item> </Form.Item>
))} ))}
@@ -2701,7 +2717,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
</Form.Item> </Form.Item>
{bodyshop.cdk_dealerid && ( {bodyshop.cdk_dealerid && (
<Form.Item <Form.Item
label={t("bodyshop.fields.responsibilitycenter_dms_acctnumber")} label={t("bodyshop.fields.dms.dms_acctnumber")}
rules={[ rules={[
{ {
required: true, required: true,
@@ -2799,7 +2815,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
</Form.Item> </Form.Item>
{bodyshop.cdk_dealerid && ( {bodyshop.cdk_dealerid && (
<Form.Item <Form.Item
label={t("bodyshop.fields.responsibilitycenter_dms_acctnumber")} label={t("bodyshop.fields.dms.dms_acctnumber")}
rules={[ rules={[
{ {
required: true, required: true,
@@ -2895,21 +2911,9 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item
label={t("bodyshop.fields.responsibilitycenter_rate")}
rules={[
{
required: true,
//message: t("general.validation.required"),
},
]}
name={["md_responsibility_centers", "taxes", "local", "rate"]}
>
<InputNumber precision={2} />
</Form.Item>
{bodyshop.cdk_dealerid && ( {bodyshop.cdk_dealerid && (
<Form.Item <Form.Item
label={t("bodyshop.fields.responsibilitycenter_dms_acctnumber")} label={t("bodyshop.fields.dms.dms_acctnumber")}
rules={[ rules={[
{ {
required: true, required: true,
@@ -2926,6 +2930,18 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
<Input /> <Input />
</Form.Item> </Form.Item>
)} )}
<Form.Item
label={t("bodyshop.fields.responsibilitycenter_rate")}
rules={[
{
required: true,
//message: t("general.validation.required"),
},
]}
name={["md_responsibility_centers", "taxes", "local", "rate"]}
>
<InputNumber precision={2} />
</Form.Item>
</LayoutFormRow> </LayoutFormRow>
<LayoutFormRow header={<div>AR</div>}> <LayoutFormRow header={<div>AR</div>}>
{/* <Form.Item {/* <Form.Item

View File

@@ -132,8 +132,8 @@ const JobRelatedTicketsTable = ({
return { return {
id: `${item.jobKey}${costCenter}`, id: `${item.jobKey}${costCenter}`,
item, item,
actHrs, actHrs: actHrs.toFixed(1),
prodHrs, prodHrs: prodHrs.toFixed(1),
clockHrs, clockHrs,
}; };
}); });

View File

@@ -153,7 +153,7 @@ export default function VendorsFormComponent({
</LayoutFormRow> </LayoutFormRow>
<LayoutFormRow grow> <LayoutFormRow grow>
<Form.Item label={t("vendors.fields.discount")} name="discount"> <Form.Item label={t("vendors.fields.discount")} name="discount">
<InputNumber min={0} max={1} precision={2} /> <InputNumber min={0} max={1} precision={2} step={0.01} />
</Form.Item> </Form.Item>
<Form.Item label={t("vendors.fields.due_date")} name="due_date"> <Form.Item label={t("vendors.fields.due_date")} name="due_date">
<InputNumber /> <InputNumber />

View File

@@ -1,7 +1,8 @@
import { getAnalytics, logEvent } from "firebase/analytics"; import { getAnalytics, logEvent } from "firebase/analytics";
import { initializeApp } from "firebase/app"; import { initializeApp } from "firebase/app";
import { getAuth } from "firebase/auth"; import { getAuth, updatePassword, updateProfile } from "firebase/auth";
import { getFirestore } from "firebase/firestore"; import { getFirestore } from "firebase/firestore";
import { tracker } from "../App/App.container";
//import { getMessaging } from "firebase/messaging"; //import { getMessaging } from "firebase/messaging";
import { store } from "../redux/store"; import { store } from "../redux/store";
@@ -25,7 +26,7 @@ export const getCurrentUser = () => {
export const updateCurrentUser = (userDetails) => { export const updateCurrentUser = (userDetails) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const unsubscribe = auth.onAuthStateChanged((userAuth) => { const unsubscribe = auth.onAuthStateChanged((userAuth) => {
userAuth.updateProfile(userDetails).then((r) => { updateProfile(userAuth, userDetails).then((r) => {
unsubscribe(); unsubscribe();
resolve(userAuth); resolve(userAuth);
}); });
@@ -36,19 +37,7 @@ export const updateCurrentUser = (userDetails) => {
export const updateCurrentPassword = async (password) => { export const updateCurrentPassword = async (password) => {
const currentUser = await getCurrentUser(); const currentUser = await getCurrentUser();
return currentUser.updatePassword(password); return updatePassword(currentUser, password);
// return new Promise((resolve, reject) => {
// const unsubscribe = auth.onAuthStateChanged(
// (userAuth) => {
// userAuth.updatePassword(password).then((r) => {
// unsubscribe();
// resolve(userAuth);
// });
// },
// (error) => reject(error)
// );
// });
}; };
//let messaging; //let messaging;
@@ -81,6 +70,9 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
eventParams eventParams
); );
logEvent(analytics, eventName, eventParams); logEvent(analytics, eventName, eventParams);
//Log event to OpenReplay server.
tracker.event(eventName, eventParams);
}; };
// if (messaging) { // if (messaging) {

View File

@@ -9,6 +9,7 @@ export const CONVERSATION_LIST_SUBSCRIPTION = gql`
) { ) {
phone_num phone_num
id id
updated_at
job_conversations { job_conversations {
job { job {
id id

View File

@@ -160,7 +160,8 @@ export const UPDATE_JOB_LINE = gql`
export const GET_JOB_LINES_TO_ENTER_BILL = gql` export const GET_JOB_LINES_TO_ENTER_BILL = gql`
query GET_JOB_LINES_TO_ENTER_BILL($id: uuid!) { query GET_JOB_LINES_TO_ENTER_BILL($id: uuid!) {
joblines(where: { jobid: { _eq: $id }, removed: { _eq: false } }) { joblines(where: { jobid: { _eq: $id } }) {
removed
id id
line_desc line_desc
part_type part_type

View File

@@ -31,6 +31,7 @@ export const QUERY_ALL_ACTIVE_JOBS = gql`
id id
ins_co_nm ins_co_nm
clm_no clm_no
po_number
clm_total clm_total
owner_owing owner_owing
ro_number ro_number
@@ -362,6 +363,7 @@ export const GET_JOB_BY_PK = gql`
converted converted
lbr_adjustments lbr_adjustments
ro_number ro_number
po_number
clm_total clm_total
inproduction inproduction
vehicleid vehicleid
@@ -440,6 +442,7 @@ export const GET_JOB_BY_PK = gql`
job_totals job_totals
ownr_fn ownr_fn
ownr_ln ownr_ln
ownr_co_nm
ownr_ea ownr_ea
ownr_addr1 ownr_addr1
ownr_addr2 ownr_addr2
@@ -455,6 +458,7 @@ export const GET_JOB_BY_PK = gql`
id id
ownr_fn ownr_fn
ownr_ln ownr_ln
ownr_co_nm
ownr_ea ownr_ea
ownr_addr1 ownr_addr1
ownr_addr2 ownr_addr2
@@ -674,6 +678,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
inproduction inproduction
production_vars production_vars
ownr_ln ownr_ln
ownr_co_nm
ownr_ph1 ownr_ph1
ownr_ea ownr_ea
ca_gst_registrant ca_gst_registrant
@@ -715,7 +720,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
actual_completion actual_completion
actual_delivery actual_delivery
actual_in actual_in
po_number
id id
ins_co_nm ins_co_nm
ins_ct_fn ins_ct_fn
@@ -1660,6 +1665,7 @@ export const QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED = gql`
clm_total clm_total
owner_owing owner_owing
ro_number ro_number
po_number
scheduled_completion scheduled_completion
scheduled_in scheduled_in
scheduled_delivery scheduled_delivery
@@ -1898,9 +1904,15 @@ export const QUERY_JOB_EXPORT_DMS = gql`
po_number po_number
clm_no clm_no
job_totals job_totals
ownr_fn
ownr_ln
ownr_co_nm
kmin kmin
kmout kmout
v_make_desc
v_model_yr
v_model_desc v_model_desc
area_of_damage
} }
} }
`; `;

View File

@@ -1,10 +1,19 @@
import { useQuery } from "@apollo/client"; import { useQuery } from "@apollo/client";
import { Button, Col, Result, Row, Select, Space } from "antd"; import {
Button,
Card,
Col,
notification,
Result,
Row,
Select,
Space,
} from "antd";
import queryString from "query-string"; import queryString from "query-string";
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { useLocation } from "react-router-dom"; import { useLocation, useHistory } from "react-router-dom";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import SocketIO from "socket.io-client"; import SocketIO from "socket.io-client";
import AlertComponent from "../../components/alert/alert.component"; import AlertComponent from "../../components/alert/alert.component";
@@ -47,7 +56,8 @@ export const socket = SocketIO(
export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) { export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
const { t } = useTranslation(); const { t } = useTranslation();
const [logLevel, setLogLevel] = useState("TRACE"); const [logLevel, setLogLevel] = useState("DEBUG");
const history = useHistory();
const [logs, setLogs] = useState([]); const [logs, setLogs] = useState([]);
const search = queryString.parse(useLocation().search); const search = queryString.parse(useLocation().search);
const { jobId } = search; const { jobId } = search;
@@ -61,6 +71,10 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
document.title = t("titles.dms"); document.title = t("titles.dms");
setSelectedHeader("dms"); setSelectedHeader("dms");
setBreadcrumbs([ setBreadcrumbs([
{
link: "/manage/accounting/receivables",
label: t("titles.bc.accounting-receivables"),
},
{ {
link: "/manage/dms", link: "/manage/dms",
label: t("titles.bc.dms"), label: t("titles.bc.dms"),
@@ -69,9 +83,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
}, [t, setBreadcrumbs, setSelectedHeader]); }, [t, setBreadcrumbs, setSelectedHeader]);
useEffect(() => { useEffect(() => {
socket.on("connected", () => { socket.on("connect", () => socket.emit("set-log-level", logLevel));
console.log("Connected again.");
});
socket.on("reconnect", () => { socket.on("reconnect", () => {
setLogs((logs) => { setLogs((logs) => {
return [ return [
@@ -90,10 +102,14 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
return [...logs, payload]; return [...logs, payload];
}); });
}); });
socket.on("export-success", (payload) => {
notification.success({
message: t("jobs.successes.exported"),
});
history.push("/manage/accounting/receivables");
});
socket.connect(); if (socket.disconnected) socket.connect();
socket.emit("set-log-level", logLevel);
return () => { return () => {
socket.removeAllListeners(); socket.removeAllListeners();
socket.disconnect(); socket.disconnect();
@@ -101,49 +117,74 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, []); }, []);
if (!jobId || !bodyshop.cdk_dealerid || !(data && data.jobs_by_pk))
return <Result status="404" />;
if (loading) return <LoadingSpinner />; if (loading) return <LoadingSpinner />;
if (error) return <AlertComponent message={error.message} type="error" />; if (error) return <AlertComponent message={error.message} type="error" />;
if (!jobId || !bodyshop.cdk_dealerid || !(data && data.jobs_by_pk))
return <Result status="404" />;
return ( return (
<div> <div>
<Row gutter={32}> <Row gutter={[16, 16]}>
<Col span={18}> <Col span={10}>
{data && data.jobs_by_pk && data.jobs_by_pk.ro_number} <DmsAllocationsSummary
<DmsAllocationsSummary socket={socket} jobId={jobId} /> title={`${data && data.jobs_by_pk && data.jobs_by_pk.ro_number} | ${
data.jobs_by_pk.ownr_fn || ""
} ${data.jobs_by_pk.ownr_ln || ""} ${
data.jobs_by_pk.ownr_co_nm || ""
} | ${data.jobs_by_pk.v_model_yr || ""} ${
data.jobs_by_pk.v_make_desc || ""
} ${data.jobs_by_pk.v_model_desc || ""}`}
socket={socket}
jobId={jobId}
/>
</Col>
<Col span={14}>
<DmsPostForm <DmsPostForm
socket={socket} socket={socket}
jobId={jobId} jobId={jobId}
job={data && data.jobs_by_pk} job={data && data.jobs_by_pk}
/> />
</Col> </Col>
<Col span={6}>
<Space> <DmsCustomerSelector />
<Select
placeholder="Log Level" <Col span={24}>
value={logLevel} <Card
onChange={(value) => { title={t("jobs.labels.dms.logs")}
setLogLevel(value); extra={
socket.emit("set-log-level", value); <Space wrap>
}} <Select
> placeholder="Log Level"
<Select.Option key="TRACE">TRACE</Select.Option> value={logLevel}
<Select.Option key="DEBUG">DEBUG</Select.Option> onChange={(value) => {
<Select.Option key="INFO">INFO</Select.Option> setLogLevel(value);
<Select.Option key="WARNING">WARNING</Select.Option> socket.emit("set-log-level", value);
<Select.Option key="ERROR">ERROR</Select.Option> }}
</Select> >
<Button onClick={() => setLogs([])}>Clear Logs</Button> <Select.Option key="TRACE">TRACE</Select.Option>
</Space> <Select.Option key="DEBUG">DEBUG</Select.Option>
<div style={{ maxHeight: "500px", overflowY: "auto" }}> <Select.Option key="INFO">INFO</Select.Option>
<Select.Option key="WARNING">WARNING</Select.Option>
<Select.Option key="ERROR">ERROR</Select.Option>
</Select>
<Button onClick={() => setLogs([])}>Clear Logs</Button>
<Button
onClick={() => {
setLogs([]);
socket.disconnect();
socket.connect();
}}
>
Reconnect
</Button>
</Space>
}
>
<DmsLogEvents socket={socket} logs={logs} /> <DmsLogEvents socket={socket} logs={logs} />
</div> </Card>
</Col> </Col>
</Row> </Row>
<DmsCustomerSelector />
</div> </div>
); );
} }

View File

@@ -218,7 +218,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
}, },
]} ]}
> >
<InputNumber disabled={jobRO} /> <InputNumber precision={0} disabled={jobRO} />
</Form.Item> </Form.Item>
)} )}
{bodyshop.cdk_dealerid && ( {bodyshop.cdk_dealerid && (
@@ -244,7 +244,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
}), }),
]} ]}
> >
<InputNumber disabled={jobRO} /> <InputNumber precision={0} disabled={jobRO} />
</Form.Item> </Form.Item>
)} )}
</LayoutFormRow> </LayoutFormRow>

View File

@@ -90,8 +90,6 @@ export function* onSendMessage() {
} }
export function* sendMessage({ payload }) { export function* sendMessage({ payload }) {
try { try {
yield logImEXEvent("messaging_send_message");
const response = yield call(axios.post, "/sms/send", payload); const response = yield call(axios.post, "/sms/send", payload);
if (response.status === 200) { if (response.status === 200) {
yield put(sendMessageSuccess(payload)); yield put(sendMessageSuccess(payload));

View File

@@ -96,6 +96,9 @@
"jobimported": "Job imported.", "jobimported": "Job imported.",
"jobinproductionchange": "Job production status set to {{inproduction}}", "jobinproductionchange": "Job production status set to {{inproduction}}",
"jobmodifylbradj": "Labor adjustments modified.", "jobmodifylbradj": "Labor adjustments modified.",
"jobnoteadded": "Note added to job.",
"jobnotedeleted": "Note deleted from job.",
"jobnoteupdated": "Note updated on job.",
"jobspartsorder": "Parts order {{order_number}} added to job.", "jobspartsorder": "Parts order {{order_number}} added to job.",
"jobspartsreturn": "Parts return {{order_number}} added to job.", "jobspartsreturn": "Parts return {{order_number}} added to job.",
"jobstatuschange": "Job status changed to {{status}}.", "jobstatuschange": "Job status changed to {{status}}.",
@@ -179,6 +182,7 @@
"noneselected": "No bill selected.", "noneselected": "No bill selected.",
"onlycmforinvoiced": "Only credit memos can be entered for any job that has been invoiced, exported, or voided.", "onlycmforinvoiced": "Only credit memos can be entered for any job that has been invoiced, exported, or voided.",
"retailtotal": "Bills Retail Total", "retailtotal": "Bills Retail Total",
"savewithdiscrepancy": "You are about to save this bill with a discrepancy. The system will continue to use the calculated amount using the bill lines. Press cancel to return to the bill.",
"state_tax": "Provincial/State Tax", "state_tax": "Provincial/State Tax",
"subtotal": "Subtotal", "subtotal": "Subtotal",
"totalreturns": "Total Returns" "totalreturns": "Total Returns"
@@ -237,6 +241,9 @@
"dms_acctnumber": "DMS Account #", "dms_acctnumber": "DMS Account #",
"dms_wip_acctnumber": "DMS W.I.P. Account #", "dms_wip_acctnumber": "DMS W.I.P. Account #",
"generic_customer_number": "Generic Customer Number", "generic_customer_number": "Generic Customer Number",
"itc_federal": "Federal Tax is ITC?",
"itc_local": "Local Tax is ITC?",
"itc_state": "State Tax is ITC?",
"mappingname": "DMS Mapping Name", "mappingname": "DMS Mapping Name",
"srcco": "Source Company #/Dealer #" "srcco": "Source Company #/Dealer #"
}, },
@@ -682,7 +689,8 @@
"status": { "status": {
"in": "Available", "in": "Available",
"inservice": "In Service", "inservice": "In Service",
"out": "Rented" "out": "Rented",
"sold": "Sold"
}, },
"successes": { "successes": {
"saved": "Courtesy Car saved successfully." "saved": "Courtesy Car saved successfully."
@@ -699,7 +707,8 @@
"notfoundtitle": "No survey found." "notfoundtitle": "No survey found."
}, },
"fields": { "fields": {
"completedon": "Completed On" "completedon": "Completed On",
"created_at": "Created At"
}, },
"labels": { "labels": {
"nologgedinuser": "Please log out of ImEX Online", "nologgedinuser": "Please log out of ImEX Online",
@@ -1081,10 +1090,10 @@
"dms": { "dms": {
"addpayer": "Add Payer", "addpayer": "Add Payer",
"createnewcustomer": "Create New Customer", "createnewcustomer": "Create New Customer",
"findmakemodelcode": "", "findmakemodelcode": "Find Make/Model Code",
"getmakes": "Get Makes", "getmakes": "",
"post": "Post", "post": "Post",
"refetchmakesmodels": "", "refetchmakesmodels": "Refetch Make and Model Codes",
"usegeneric": "Use Generic Customer", "usegeneric": "Use Generic Customer",
"useselected": "Use Selected Customer" "useselected": "Use Selected Customer"
}, },
@@ -1146,27 +1155,27 @@
"adjustmenthours": "Adjustment Hours", "adjustmenthours": "Adjustment Hours",
"alt_transport": "Alt. Trans.", "alt_transport": "Alt. Trans.",
"area_of_damage_impact": { "area_of_damage_impact": {
"10": "", "10": "Left Front Side",
"11": "", "11": "Left Front Corner",
"12": "", "12": "Front",
"13": "", "13": "Rollover",
"14": "", "14": "Unknown",
"15": "", "15": "Total Loss",
"16": "", "16": "Non-collision",
"25": "", "25": "Hood",
"26": "", "26": "Deck-lid",
"27": "", "27": "Roof",
"28": "", "28": "Undercarriage",
"34": "", "34": "All Over",
"01": "", "01": "Right Front Corner",
"02": "", "02": "Right Front Side",
"03": "", "03": "Right Side",
"04": "", "04": "Right Rear Side",
"05": "", "05": "Right Rear Corner",
"06": "", "06": "Rear",
"07": "", "07": "Left Rear Corner",
"08": "", "08": "Left Rear Side",
"09": "" "09": "Left Side"
}, },
"ca_bc_pvrt": "PVRT", "ca_bc_pvrt": "PVRT",
"ca_customer_gst": "Customer Portion of GST", "ca_customer_gst": "Customer Portion of GST",
@@ -1199,7 +1208,7 @@
"dms_make": "DMS Make", "dms_make": "DMS Make",
"dms_model": "DMS Model", "dms_model": "DMS Model",
"dms_wip_acctnumber": "Cost WIP DMS Acct #", "dms_wip_acctnumber": "Cost WIP DMS Acct #",
"id": "", "id": "DMS ID",
"journal": "Journal #", "journal": "Journal #",
"name1": "Customer Name", "name1": "Customer Name",
"payer": { "payer": {
@@ -1212,7 +1221,7 @@
"sale": "Sale", "sale": "Sale",
"sale_dms_acctnumber": "Sale DMS Acct #", "sale_dms_acctnumber": "Sale DMS Acct #",
"story": "Story", "story": "Story",
"vinowner": "" "vinowner": "VIN Owner"
}, },
"driveable": "Driveable", "driveable": "Driveable",
"employee_body": "Body", "employee_body": "Body",
@@ -1434,11 +1443,11 @@
"difference": "Difference", "difference": "Difference",
"diskscan": "Scan Disk for Estimates", "diskscan": "Scan Disk for Estimates",
"dms": { "dms": {
"defaultstory": "", "defaultstory": "Bodyshop RO {{ro_number}}. Damage to $t(jobs.fields.area_of_damage_impact.{{area_of_damage}}).",
"kmoutnotgreaterthankmin": "Mileage out must be greater than mileage in.", "kmoutnotgreaterthankmin": "Mileage out must be greater than mileage in.",
"logs": "", "logs": "Logs",
"notallocated": "Not Allocated", "notallocated": "Not Allocated",
"postingform": "", "postingform": "Posting Form",
"totalallocated": "Total Amount Allocated" "totalallocated": "Total Amount Allocated"
}, },
"documents": "Documents", "documents": "Documents",
@@ -2005,6 +2014,11 @@
"payments": { "payments": {
"ca_bc_etf_table": "ICBC ETF Table" "ca_bc_etf_table": "ICBC ETF Table"
}, },
"subjects": {
"jobs": {
"parts_order": "$t(printcenter.jobs.parts_order) PO: {{ro_number}}"
}
},
"vendors": { "vendors": {
"purchases_by_vendor_detailed": "Purchases by Vendor - Detailed", "purchases_by_vendor_detailed": "Purchases by Vendor - Detailed",
"purchases_by_vendor_summary": "Purchases by Vendor - Summary" "purchases_by_vendor_summary": "Purchases by Vendor - Summary"
@@ -2069,10 +2083,18 @@
"employee": "Employee", "employee": "Employee",
"filterson": "Filters on {{object}}: {{field}}", "filterson": "Filters on {{object}}: {{field}}",
"generateasemail": "Generate as Email?", "generateasemail": "Generate as Email?",
"groups": {
"customers": "Customers",
"jobs": "Jobs & Costing",
"payroll": "Payroll",
"purchases": "Purchases",
"sales": "Sales"
},
"key": "Report", "key": "Report",
"objects": { "objects": {
"appointments": "Appointments", "appointments": "Appointments",
"bills": "Bills", "bills": "Bills",
"csi": "CSI",
"exportlogs": "Export Logs", "exportlogs": "Export Logs",
"jobs": "Jobs", "jobs": "Jobs",
"parts_orders": "Parts Orders", "parts_orders": "Parts Orders",
@@ -2088,6 +2110,7 @@
"attendance_employee": "Employee Attendance", "attendance_employee": "Employee Attendance",
"attendance_summary": "Attendance Summary (All Employees)", "attendance_summary": "Attendance Summary (All Employees)",
"credits_not_received_date": "Credits not Received by Date", "credits_not_received_date": "Credits not Received by Date",
"csi": "CSI Responses",
"estimator_detail": "Jobs by Estimator (Detail)", "estimator_detail": "Jobs by Estimator (Detail)",
"estimator_summary": "Jobs by Estimator (Summary)", "estimator_summary": "Jobs by Estimator (Summary)",
"export_payables": "Export Log - Payables", "export_payables": "Export Log - Payables",
@@ -2282,7 +2305,7 @@
"courtesycars-detail": "Courtesy Car {{number}}", "courtesycars-detail": "Courtesy Car {{number}}",
"courtesycars-new": "New Courtesy Car", "courtesycars-new": "New Courtesy Car",
"dashboard": "Dashboard", "dashboard": "Dashboard",
"dms": "", "dms": "DMS Export",
"export-logs": "Export Logs", "export-logs": "Export Logs",
"jobs": "Jobs", "jobs": "Jobs",
"jobs-active": "Active Jobs", "jobs-active": "Active Jobs",
@@ -2321,7 +2344,7 @@
"courtesycars-create": "New Courtesy Car | $t(titles.app)", "courtesycars-create": "New Courtesy Car | $t(titles.app)",
"courtesycars-detail": "Courtesy Car {{id}} | $t(titles.app)", "courtesycars-detail": "Courtesy Car {{id}} | $t(titles.app)",
"dashboard": "Dashboard | $t(titles.app)", "dashboard": "Dashboard | $t(titles.app)",
"dms": "", "dms": "DMS Export | $t(titles.app)",
"export-logs": "Export Logs | $t(titles.app)", "export-logs": "Export Logs | $t(titles.app)",
"jobs": "Active Jobs | $t(titles.app)", "jobs": "Active Jobs | $t(titles.app)",
"jobs-admin": "Job {{ro_number}} - Admin | $t(titles.app)", "jobs-admin": "Job {{ro_number}} - Admin | $t(titles.app)",

View File

@@ -96,6 +96,9 @@
"jobimported": "", "jobimported": "",
"jobinproductionchange": "", "jobinproductionchange": "",
"jobmodifylbradj": "", "jobmodifylbradj": "",
"jobnoteadded": "",
"jobnotedeleted": "",
"jobnoteupdated": "",
"jobspartsorder": "", "jobspartsorder": "",
"jobspartsreturn": "", "jobspartsreturn": "",
"jobstatuschange": "", "jobstatuschange": "",
@@ -179,6 +182,7 @@
"noneselected": "", "noneselected": "",
"onlycmforinvoiced": "", "onlycmforinvoiced": "",
"retailtotal": "", "retailtotal": "",
"savewithdiscrepancy": "",
"state_tax": "", "state_tax": "",
"subtotal": "", "subtotal": "",
"totalreturns": "" "totalreturns": ""
@@ -237,6 +241,9 @@
"dms_acctnumber": "", "dms_acctnumber": "",
"dms_wip_acctnumber": "", "dms_wip_acctnumber": "",
"generic_customer_number": "", "generic_customer_number": "",
"itc_federal": "",
"itc_local": "",
"itc_state": "",
"mappingname": "", "mappingname": "",
"srcco": "" "srcco": ""
}, },
@@ -682,7 +689,8 @@
"status": { "status": {
"in": "", "in": "",
"inservice": "", "inservice": "",
"out": "" "out": "",
"sold": ""
}, },
"successes": { "successes": {
"saved": "" "saved": ""
@@ -699,7 +707,8 @@
"notfoundtitle": "" "notfoundtitle": ""
}, },
"fields": { "fields": {
"completedon": "" "completedon": "",
"created_at": ""
}, },
"labels": { "labels": {
"nologgedinuser": "", "nologgedinuser": "",
@@ -2005,6 +2014,11 @@
"payments": { "payments": {
"ca_bc_etf_table": "" "ca_bc_etf_table": ""
}, },
"subjects": {
"jobs": {
"parts_order": ""
}
},
"vendors": { "vendors": {
"purchases_by_vendor_detailed": "", "purchases_by_vendor_detailed": "",
"purchases_by_vendor_summary": "" "purchases_by_vendor_summary": ""
@@ -2069,10 +2083,18 @@
"employee": "", "employee": "",
"filterson": "", "filterson": "",
"generateasemail": "", "generateasemail": "",
"groups": {
"customers": "",
"jobs": "",
"payroll": "",
"purchases": "",
"sales": ""
},
"key": "", "key": "",
"objects": { "objects": {
"appointments": "", "appointments": "",
"bills": "", "bills": "",
"csi": "",
"exportlogs": "", "exportlogs": "",
"jobs": "", "jobs": "",
"parts_orders": "", "parts_orders": "",
@@ -2088,6 +2110,7 @@
"attendance_employee": "", "attendance_employee": "",
"attendance_summary": "", "attendance_summary": "",
"credits_not_received_date": "", "credits_not_received_date": "",
"csi": "",
"estimator_detail": "", "estimator_detail": "",
"estimator_summary": "", "estimator_summary": "",
"export_payables": "", "export_payables": "",

View File

@@ -96,6 +96,9 @@
"jobimported": "", "jobimported": "",
"jobinproductionchange": "", "jobinproductionchange": "",
"jobmodifylbradj": "", "jobmodifylbradj": "",
"jobnoteadded": "",
"jobnotedeleted": "",
"jobnoteupdated": "",
"jobspartsorder": "", "jobspartsorder": "",
"jobspartsreturn": "", "jobspartsreturn": "",
"jobstatuschange": "", "jobstatuschange": "",
@@ -179,6 +182,7 @@
"noneselected": "", "noneselected": "",
"onlycmforinvoiced": "", "onlycmforinvoiced": "",
"retailtotal": "", "retailtotal": "",
"savewithdiscrepancy": "",
"state_tax": "", "state_tax": "",
"subtotal": "", "subtotal": "",
"totalreturns": "" "totalreturns": ""
@@ -237,6 +241,9 @@
"dms_acctnumber": "", "dms_acctnumber": "",
"dms_wip_acctnumber": "", "dms_wip_acctnumber": "",
"generic_customer_number": "", "generic_customer_number": "",
"itc_federal": "",
"itc_local": "",
"itc_state": "",
"mappingname": "", "mappingname": "",
"srcco": "" "srcco": ""
}, },
@@ -682,7 +689,8 @@
"status": { "status": {
"in": "", "in": "",
"inservice": "", "inservice": "",
"out": "" "out": "",
"sold": ""
}, },
"successes": { "successes": {
"saved": "" "saved": ""
@@ -699,7 +707,8 @@
"notfoundtitle": "" "notfoundtitle": ""
}, },
"fields": { "fields": {
"completedon": "" "completedon": "",
"created_at": ""
}, },
"labels": { "labels": {
"nologgedinuser": "", "nologgedinuser": "",
@@ -2005,6 +2014,11 @@
"payments": { "payments": {
"ca_bc_etf_table": "" "ca_bc_etf_table": ""
}, },
"subjects": {
"jobs": {
"parts_order": ""
}
},
"vendors": { "vendors": {
"purchases_by_vendor_detailed": "", "purchases_by_vendor_detailed": "",
"purchases_by_vendor_summary": "" "purchases_by_vendor_summary": ""
@@ -2069,10 +2083,18 @@
"employee": "", "employee": "",
"filterson": "", "filterson": "",
"generateasemail": "", "generateasemail": "",
"groups": {
"customers": "",
"jobs": "",
"payroll": "",
"purchases": "",
"sales": ""
},
"key": "", "key": "",
"objects": { "objects": {
"appointments": "", "appointments": "",
"bills": "", "bills": "",
"csi": "",
"exportlogs": "", "exportlogs": "",
"jobs": "", "jobs": "",
"parts_orders": "", "parts_orders": "",
@@ -2088,6 +2110,7 @@
"attendance_employee": "", "attendance_employee": "",
"attendance_summary": "", "attendance_summary": "",
"credits_not_received_date": "", "credits_not_received_date": "",
"csi": "",
"estimator_detail": "", "estimator_detail": "",
"estimator_summary": "", "estimator_summary": "",
"export_payables": "", "export_payables": "",

View File

@@ -26,6 +26,9 @@ const AuditTrailMapping = {
i18n.t("audit_trail.messages.jobinproductionchange", { inproduction }), i18n.t("audit_trail.messages.jobinproductionchange", { inproduction }),
jobchecklist: (type, inproduction, status) => jobchecklist: (type, inproduction, status) =>
i18n.t("audit_trail.messages.jobchecklist", { type, inproduction, status }), i18n.t("audit_trail.messages.jobchecklist", { type, inproduction, status }),
jobnoteadded: () => i18n.t("audit_trail.messages.jobnoteadded"),
jobnoteupdated: () => i18n.t("audit_trail.messages.jobnoteupdated"),
jobnotedeleted: () => i18n.t("audit_trail.messages.jobnotedeleted"),
}; };
export default AuditTrailMapping; export default AuditTrailMapping;

View File

@@ -391,7 +391,9 @@ export const TemplateList = (type, context) => {
title: i18n.t("printcenter.jobs.parts_order"), title: i18n.t("printcenter.jobs.parts_order"),
description: "Parts Order", description: "Parts Order",
key: "parts_order", key: "parts_order",
subject: i18n.t("printcenter.jobs.parts_order"), subject: i18n.t("printcenter.subjects.jobs.parts_order", {
ro_number: context && context.job && context.job.ro_number,
}),
disabled: false, disabled: false,
}, },
parts_return_slip: { parts_return_slip: {
@@ -417,222 +419,6 @@ export const TemplateList = (type, context) => {
...(!type || type === "csi" ? {} : {}), ...(!type || type === "csi" ? {} : {}),
...(!type || type === "report_center" ...(!type || type === "report_center"
? { ? {
payments_by_date: {
title: i18n.t("reportcenter.templates.payments_by_date"),
subject: i18n.t("reportcenter.templates.payments_by_date"),
key: "payments_by_date",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.payments"),
field: i18n.t("payments.fields.date"),
},
},
payments_by_date_type: {
title: i18n.t("reportcenter.templates.payments_by_date_type"),
subject: i18n.t("reportcenter.templates.payments_by_date_type"),
key: "payments_by_date_type",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.payments"),
field: i18n.t("payments.fields.date"),
},
},
purchases_by_date_range_detail: {
title: i18n.t(
"reportcenter.templates.purchases_by_date_range_detail"
),
subject: i18n.t(
"reportcenter.templates.purchases_by_date_range_detail"
),
key: "purchases_by_date_range_detail",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.bills"),
field: i18n.t("bills.fields.date"),
},
},
purchases_by_date_range_summary: {
title: i18n.t(
"reportcenter.templates.purchases_by_date_range_summary"
),
subject: i18n.t(
"reportcenter.templates.purchases_by_date_range_summary"
),
key: "purchases_by_date_range_summary",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.bills"),
field: i18n.t("bills.fields.date"),
},
},
purchases_by_vendor_detailed_date_range: {
title: i18n.t(
"reportcenter.templates.purchases_by_vendor_detailed_date_range"
),
subject: i18n.t(
"reportcenter.templates.purchases_by_vendor_detailed_date_range"
),
key: "purchases_by_vendor_detailed_date_range",
idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.bills"),
field: i18n.t("bills.fields.date"),
},
},
purchases_by_vendor_summary_date_range: {
title: i18n.t(
"reportcenter.templates.purchases_by_vendor_summary_date_range"
),
subject: i18n.t(
"reportcenter.templates.purchases_by_vendor_summary_date_range"
),
key: "purchases_by_vendor_summary_date_range",
idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.bills"),
field: i18n.t("bills.fields.date"),
},
},
purchases_by_cost_center_detail: {
title: i18n.t(
"reportcenter.templates.purchases_by_cost_center_detail"
),
description: "",
subject: i18n.t(
"reportcenter.templates.purchases_by_cost_center_detail"
),
key: "purchases_by_cost_center_detail",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.bills"),
field: i18n.t("bills.fields.date"),
},
},
purchases_by_cost_center_summary: {
title: i18n.t(
"reportcenter.templates.purchases_by_cost_center_summary"
),
description: "",
subject: i18n.t(
"reportcenter.templates.purchases_by_cost_center_summary"
),
key: "purchases_by_cost_center_summary",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.bills"),
field: i18n.t("bills.fields.date"),
},
},
purchases_grouped_by_vendor_detailed: {
title: i18n.t(
"reportcenter.templates.purchases_grouped_by_vendor_detailed"
),
description: "",
subject: i18n.t(
"reportcenter.templates.purchases_grouped_by_vendor_detailed"
),
key: "purchases_grouped_by_vendor_detailed",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("bills.fields.date"),
},
},
purchases_grouped_by_vendor_summary: {
title: i18n.t(
"reportcenter.templates.purchases_grouped_by_vendor_summary"
),
description: "",
subject: i18n.t(
"reportcenter.templates.purchases_grouped_by_vendor_summary"
),
key: "purchases_grouped_by_vendor_summary",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("bills.fields.date"),
},
},
schedule: {
title: i18n.t("reportcenter.templates.schedule"),
subject: i18n.t("reportcenter.templates.schedule"),
key: "schedule",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.appointments"),
field: i18n.t("appointments.fields.time"),
},
},
timetickets: {
title: i18n.t("reportcenter.templates.timetickets"),
subject: i18n.t("reportcenter.templates.timetickets"),
key: "timetickets",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.timetickets"),
field: i18n.t("timetickets.fields.date"),
},
},
timetickets_employee: {
title: i18n.t("reportcenter.templates.timetickets_employee"),
subject: i18n.t("reportcenter.templates.timetickets_employee"),
key: "timetickets_employee",
idtype: "employee",
disabled: false,
},
attendance_detail: {
title: i18n.t("reportcenter.templates.attendance_detail"),
subject: i18n.t("reportcenter.templates.attendance_detail"),
key: "attendance_detail",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.timetickets"),
field: i18n.t("timetickets.fields.date"),
},
},
attendance_summary: {
title: i18n.t("reportcenter.templates.attendance_summary"),
subject: i18n.t("reportcenter.templates.attendance_summary"),
key: "attendance_summary",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.timetickets"),
field: i18n.t("timetickets.fields.date"),
},
},
attendance_employee: {
title: i18n.t("reportcenter.templates.attendance_employee"),
subject: i18n.t("reportcenter.templates.attendance_employee"),
key: "attendance_employee",
idtype: "employee",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.timetickets"),
field: i18n.t("timetickets.fields.date"),
},
},
timetickets_summary: {
title: i18n.t("reportcenter.templates.timetickets_summary"),
subject: i18n.t("reportcenter.templates.timetickets_summary"),
key: "timetickets_summary",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.timetickets"),
field: i18n.t("timetickets.fields.date"),
},
},
hours_sold_detail_closed: { hours_sold_detail_closed: {
title: i18n.t("reportcenter.templates.hours_sold_detail_closed"), title: i18n.t("reportcenter.templates.hours_sold_detail_closed"),
description: "", description: "",
@@ -644,6 +430,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "sales",
}, },
hours_sold_detail_closed_ins_co: { hours_sold_detail_closed_ins_co: {
@@ -661,6 +448,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "sales",
}, },
hours_sold_summary_closed: { hours_sold_summary_closed: {
@@ -674,6 +462,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "sales",
}, },
hours_sold_summary_closed_ins_co: { hours_sold_summary_closed_ins_co: {
@@ -691,6 +480,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "sales",
}, },
hours_sold_detail_open: { hours_sold_detail_open: {
@@ -704,6 +494,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"), field: i18n.t("jobs.fields.date_open"),
}, },
group: "sales",
}, },
hours_sold_detail_open_ins_co: { hours_sold_detail_open_ins_co: {
@@ -721,6 +512,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"), field: i18n.t("jobs.fields.date_open"),
}, },
group: "sales",
}, },
hours_sold_summary_open: { hours_sold_summary_open: {
@@ -734,6 +526,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"), field: i18n.t("jobs.fields.date_open"),
}, },
group: "sales",
}, },
hours_sold_summary_open_ins_co: { hours_sold_summary_open_ins_co: {
@@ -751,6 +544,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"), field: i18n.t("jobs.fields.date_open"),
}, },
group: "sales",
}, },
hours_sold_detail_closed_csr: { hours_sold_detail_closed_csr: {
@@ -768,6 +562,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "sales",
}, },
hours_sold_detail_open_csr: { hours_sold_detail_open_csr: {
title: i18n.t("reportcenter.templates.hours_sold_detail_open_csr"), title: i18n.t("reportcenter.templates.hours_sold_detail_open_csr"),
@@ -782,6 +577,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"), field: i18n.t("jobs.fields.date_open"),
}, },
group: "sales",
}, },
hours_sold_summary_closed_csr: { hours_sold_summary_closed_csr: {
title: i18n.t( title: i18n.t(
@@ -798,6 +594,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "sales",
}, },
hours_sold_summary_open_csr: { hours_sold_summary_open_csr: {
title: i18n.t("reportcenter.templates.hours_sold_summary_open_csr"), title: i18n.t("reportcenter.templates.hours_sold_summary_open_csr"),
@@ -812,54 +609,137 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "sales",
}, },
estimator_detail: { purchases_by_date_range_detail: {
title: i18n.t("reportcenter.templates.estimator_detail"), title: i18n.t(
"reportcenter.templates.purchases_by_date_range_detail"
),
subject: i18n.t(
"reportcenter.templates.purchases_by_date_range_detail"
),
key: "purchases_by_date_range_detail",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.bills"),
field: i18n.t("bills.fields.date"),
},
group: "purchases",
},
purchases_by_date_range_summary: {
title: i18n.t(
"reportcenter.templates.purchases_by_date_range_summary"
),
subject: i18n.t(
"reportcenter.templates.purchases_by_date_range_summary"
),
key: "purchases_by_date_range_summary",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.bills"),
field: i18n.t("bills.fields.date"),
},
group: "purchases",
},
purchases_by_vendor_detailed_date_range: {
title: i18n.t(
"reportcenter.templates.purchases_by_vendor_detailed_date_range"
),
subject: i18n.t(
"reportcenter.templates.purchases_by_vendor_detailed_date_range"
),
key: "purchases_by_vendor_detailed_date_range",
idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.bills"),
field: i18n.t("bills.fields.date"),
},
group: "purchases",
},
purchases_by_vendor_summary_date_range: {
title: i18n.t(
"reportcenter.templates.purchases_by_vendor_summary_date_range"
),
subject: i18n.t(
"reportcenter.templates.purchases_by_vendor_summary_date_range"
),
key: "purchases_by_vendor_summary_date_range",
idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.bills"),
field: i18n.t("bills.fields.date"),
},
group: "purchases",
},
purchases_by_cost_center_detail: {
title: i18n.t(
"reportcenter.templates.purchases_by_cost_center_detail"
),
description: "", description: "",
subject: i18n.t("reportcenter.templates.estimator_detail"), subject: i18n.t(
key: "estimator_detail", "reportcenter.templates.purchases_by_cost_center_detail"
),
key: "purchases_by_cost_center_detail",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.bills"),
field: i18n.t("bills.fields.date"),
},
group: "purchases",
},
purchases_by_cost_center_summary: {
title: i18n.t(
"reportcenter.templates.purchases_by_cost_center_summary"
),
description: "",
subject: i18n.t(
"reportcenter.templates.purchases_by_cost_center_summary"
),
key: "purchases_by_cost_center_summary",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.bills"),
field: i18n.t("bills.fields.date"),
},
group: "purchases",
},
purchases_grouped_by_vendor_detailed: {
title: i18n.t(
"reportcenter.templates.purchases_grouped_by_vendor_detailed"
),
description: "",
subject: i18n.t(
"reportcenter.templates.purchases_grouped_by_vendor_detailed"
),
key: "purchases_grouped_by_vendor_detailed",
//idtype: "vendor", //idtype: "vendor",
disabled: false, disabled: false,
rangeFilter: { rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("bills.fields.date"),
}, },
group: "purchases",
}, },
estimator_summary: { purchases_grouped_by_vendor_summary: {
title: i18n.t("reportcenter.templates.estimator_summary"), title: i18n.t(
"reportcenter.templates.purchases_grouped_by_vendor_summary"
),
description: "", description: "",
subject: i18n.t("reportcenter.templates.estimator_summary"), subject: i18n.t(
key: "estimator_summary", "reportcenter.templates.purchases_grouped_by_vendor_summary"
),
key: "purchases_grouped_by_vendor_summary",
//idtype: "vendor", //idtype: "vendor",
disabled: false, disabled: false,
rangeFilter: { rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("bills.fields.date"),
},
},
supplement_ratio_ins_co: {
title: i18n.t("reportcenter.templates.supplement_ratio_ins_co"),
description: "",
subject: i18n.t("reportcenter.templates.supplement_ratio_ins_co"),
key: "supplement_ratio_ins_co",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"),
},
},
credits_not_received_date: {
title: i18n.t("reportcenter.templates.credits_not_received_date"),
description: "",
subject: i18n.t("reportcenter.templates.credits_not_received_date"),
key: "credits_not_received_date",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"),
}, },
group: "purchases",
}, },
job_costing_ro_date_summary: { job_costing_ro_date_summary: {
title: i18n.t("reportcenter.templates.job_costing_ro_date_summary"), title: i18n.t("reportcenter.templates.job_costing_ro_date_summary"),
@@ -874,6 +754,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "jobs",
}, },
job_costing_ro_csr: { job_costing_ro_csr: {
title: i18n.t("reportcenter.templates.job_costing_ro_csr"), title: i18n.t("reportcenter.templates.job_costing_ro_csr"),
@@ -886,6 +767,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"), field: i18n.t("jobs.fields.date_open"),
}, },
group: "jobs",
}, },
job_costing_ro_ins_co: { job_costing_ro_ins_co: {
title: i18n.t("reportcenter.templates.job_costing_ro_ins_co"), title: i18n.t("reportcenter.templates.job_costing_ro_ins_co"),
@@ -898,6 +780,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "jobs",
}, },
job_costing_ro_date_detail: { job_costing_ro_date_detail: {
title: i18n.t("reportcenter.templates.job_costing_ro_date_detail"), title: i18n.t("reportcenter.templates.job_costing_ro_date_detail"),
@@ -912,6 +795,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "jobs",
}, },
job_costing_ro_estimator: { job_costing_ro_estimator: {
title: i18n.t("reportcenter.templates.job_costing_ro_estimator"), title: i18n.t("reportcenter.templates.job_costing_ro_estimator"),
@@ -924,7 +808,165 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "jobs",
}, },
payments_by_date: {
title: i18n.t("reportcenter.templates.payments_by_date"),
subject: i18n.t("reportcenter.templates.payments_by_date"),
key: "payments_by_date",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.payments"),
field: i18n.t("payments.fields.date"),
},
group: "customers",
},
payments_by_date_type: {
title: i18n.t("reportcenter.templates.payments_by_date_type"),
subject: i18n.t("reportcenter.templates.payments_by_date_type"),
key: "payments_by_date_type",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.payments"),
field: i18n.t("payments.fields.date"),
},
group: "customers",
},
schedule: {
title: i18n.t("reportcenter.templates.schedule"),
subject: i18n.t("reportcenter.templates.schedule"),
key: "schedule",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.appointments"),
field: i18n.t("appointments.fields.time"),
},
group: "customers",
},
timetickets: {
title: i18n.t("reportcenter.templates.timetickets"),
subject: i18n.t("reportcenter.templates.timetickets"),
key: "timetickets",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.timetickets"),
field: i18n.t("timetickets.fields.date"),
},
group: "payroll",
},
timetickets_employee: {
title: i18n.t("reportcenter.templates.timetickets_employee"),
subject: i18n.t("reportcenter.templates.timetickets_employee"),
key: "timetickets_employee",
idtype: "employee",
disabled: false,
group: "payroll",
},
attendance_detail: {
title: i18n.t("reportcenter.templates.attendance_detail"),
subject: i18n.t("reportcenter.templates.attendance_detail"),
key: "attendance_detail",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.timetickets"),
field: i18n.t("timetickets.fields.date"),
},
group: "payroll",
},
attendance_summary: {
title: i18n.t("reportcenter.templates.attendance_summary"),
subject: i18n.t("reportcenter.templates.attendance_summary"),
key: "attendance_summary",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.timetickets"),
field: i18n.t("timetickets.fields.date"),
},
group: "payroll",
},
attendance_employee: {
title: i18n.t("reportcenter.templates.attendance_employee"),
subject: i18n.t("reportcenter.templates.attendance_employee"),
key: "attendance_employee",
idtype: "employee",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.timetickets"),
field: i18n.t("timetickets.fields.date"),
},
group: "payroll",
},
timetickets_summary: {
title: i18n.t("reportcenter.templates.timetickets_summary"),
subject: i18n.t("reportcenter.templates.timetickets_summary"),
key: "timetickets_summary",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.timetickets"),
field: i18n.t("timetickets.fields.date"),
},
group: "payroll",
},
estimator_detail: {
title: i18n.t("reportcenter.templates.estimator_detail"),
description: "",
subject: i18n.t("reportcenter.templates.estimator_detail"),
key: "estimator_detail",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"),
},
group: "sales",
},
estimator_summary: {
title: i18n.t("reportcenter.templates.estimator_summary"),
description: "",
subject: i18n.t("reportcenter.templates.estimator_summary"),
key: "estimator_summary",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"),
},
group: "sales",
},
supplement_ratio_ins_co: {
title: i18n.t("reportcenter.templates.supplement_ratio_ins_co"),
description: "",
subject: i18n.t("reportcenter.templates.supplement_ratio_ins_co"),
key: "supplement_ratio_ins_co",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"),
},
group: "sales",
},
credits_not_received_date: {
title: i18n.t("reportcenter.templates.credits_not_received_date"),
description: "",
subject: i18n.t("reportcenter.templates.credits_not_received_date"),
key: "credits_not_received_date",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"),
},
group: "purchases",
},
void_ros: { void_ros: {
title: i18n.t("reportcenter.templates.void_ros"), title: i18n.t("reportcenter.templates.void_ros"),
description: "", description: "",
@@ -936,6 +978,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"), field: i18n.t("jobs.fields.date_open"),
}, },
group: "sales",
}, },
gsr_by_csr: { gsr_by_csr: {
title: i18n.t("reportcenter.templates.gsr_by_csr"), title: i18n.t("reportcenter.templates.gsr_by_csr"),
@@ -948,6 +991,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "sales",
}, },
gsr_by_make: { gsr_by_make: {
title: i18n.t("reportcenter.templates.gsr_by_make"), title: i18n.t("reportcenter.templates.gsr_by_make"),
@@ -960,6 +1004,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "sales",
}, },
gsr_by_delivery_date: { gsr_by_delivery_date: {
title: i18n.t("reportcenter.templates.gsr_by_delivery_date"), title: i18n.t("reportcenter.templates.gsr_by_delivery_date"),
@@ -972,6 +1017,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.actual_delivery"), field: i18n.t("jobs.fields.actual_delivery"),
}, },
group: "sales",
}, },
gsr_by_referral: { gsr_by_referral: {
title: i18n.t("reportcenter.templates.gsr_by_referral"), title: i18n.t("reportcenter.templates.gsr_by_referral"),
@@ -984,6 +1030,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "sales",
}, },
gsr_by_ro: { gsr_by_ro: {
title: i18n.t("reportcenter.templates.gsr_by_ro"), title: i18n.t("reportcenter.templates.gsr_by_ro"),
@@ -996,6 +1043,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "sales",
}, },
gsr_by_ins_co: { gsr_by_ins_co: {
title: i18n.t("reportcenter.templates.gsr_by_ins_co"), title: i18n.t("reportcenter.templates.gsr_by_ins_co"),
@@ -1008,6 +1056,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "sales",
}, },
gsr_by_exported_date: { gsr_by_exported_date: {
title: i18n.t("reportcenter.templates.gsr_by_exported_date"), title: i18n.t("reportcenter.templates.gsr_by_exported_date"),
@@ -1020,6 +1069,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_exported"), field: i18n.t("jobs.fields.date_exported"),
}, },
group: "sales",
}, },
gsr_by_estimator: { gsr_by_estimator: {
@@ -1033,6 +1083,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "sales",
}, },
gsr_labor_only: { gsr_labor_only: {
title: i18n.t("reportcenter.templates.gsr_labor_only"), title: i18n.t("reportcenter.templates.gsr_labor_only"),
@@ -1045,6 +1096,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "sales",
}, },
open_orders: { open_orders: {
title: i18n.t("reportcenter.templates.open_orders"), title: i18n.t("reportcenter.templates.open_orders"),
@@ -1057,6 +1109,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"), field: i18n.t("jobs.fields.date_open"),
}, },
group: "jobs",
}, },
open_orders_csr: { open_orders_csr: {
title: i18n.t("reportcenter.templates.open_orders_csr"), title: i18n.t("reportcenter.templates.open_orders_csr"),
@@ -1069,6 +1122,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"), field: i18n.t("jobs.fields.date_open"),
}, },
group: "jobs",
}, },
open_orders_estimator: { open_orders_estimator: {
title: i18n.t("reportcenter.templates.open_orders_estimator"), title: i18n.t("reportcenter.templates.open_orders_estimator"),
@@ -1081,6 +1135,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"), field: i18n.t("jobs.fields.date_open"),
}, },
group: "jobs",
}, },
open_orders_ins_co: { open_orders_ins_co: {
title: i18n.t("reportcenter.templates.open_orders_ins_co"), title: i18n.t("reportcenter.templates.open_orders_ins_co"),
@@ -1093,6 +1148,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"), field: i18n.t("jobs.fields.date_open"),
}, },
group: "jobs",
}, },
export_payables: { export_payables: {
title: i18n.t("reportcenter.templates.export_payables"), title: i18n.t("reportcenter.templates.export_payables"),
@@ -1105,6 +1161,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.exportlogs"), object: i18n.t("reportcenter.labels.objects.exportlogs"),
field: i18n.t("exportlogs.fields.createdat"), field: i18n.t("exportlogs.fields.createdat"),
}, },
group: "purchases",
}, },
export_payments: { export_payments: {
title: i18n.t("reportcenter.templates.export_payments"), title: i18n.t("reportcenter.templates.export_payments"),
@@ -1117,6 +1174,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.exportlogs"), object: i18n.t("reportcenter.labels.objects.exportlogs"),
field: i18n.t("exportlogs.fields.createdat"), field: i18n.t("exportlogs.fields.createdat"),
}, },
group: "customers",
}, },
export_receivables: { export_receivables: {
title: i18n.t("reportcenter.templates.export_receivables"), title: i18n.t("reportcenter.templates.export_receivables"),
@@ -1129,6 +1187,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.exportlogs"), object: i18n.t("reportcenter.labels.objects.exportlogs"),
field: i18n.t("exportlogs.fields.createdat"), field: i18n.t("exportlogs.fields.createdat"),
}, },
group: "sales",
}, },
parts_backorder: { parts_backorder: {
title: i18n.t("reportcenter.templates.parts_backorder"), title: i18n.t("reportcenter.templates.parts_backorder"),
@@ -1141,6 +1200,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.actual_in"), field: i18n.t("jobs.fields.actual_in"),
}, },
group: "purchases",
}, },
thank_you_date: { thank_you_date: {
title: i18n.t("reportcenter.templates.thank_you_date"), title: i18n.t("reportcenter.templates.thank_you_date"),
@@ -1153,6 +1213,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "customers",
}, },
unclaimed_hrs: { unclaimed_hrs: {
title: i18n.t("reportcenter.templates.unclaimed_hrs"), title: i18n.t("reportcenter.templates.unclaimed_hrs"),
@@ -1165,6 +1226,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"), field: i18n.t("jobs.fields.date_open"),
}, },
group: "payroll",
}, },
work_in_progress_labour: { work_in_progress_labour: {
title: i18n.t("reportcenter.templates.work_in_progress_labour"), title: i18n.t("reportcenter.templates.work_in_progress_labour"),
@@ -1177,6 +1239,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"), field: i18n.t("jobs.fields.date_open"),
}, },
group: "jobs",
}, },
work_in_progress_payables: { work_in_progress_payables: {
title: i18n.t("reportcenter.templates.work_in_progress_payables"), title: i18n.t("reportcenter.templates.work_in_progress_payables"),
@@ -1189,6 +1252,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"), field: i18n.t("jobs.fields.date_open"),
}, },
group: "jobs",
}, },
lag_time: { lag_time: {
title: i18n.t("reportcenter.templates.lag_time"), title: i18n.t("reportcenter.templates.lag_time"),
@@ -1201,6 +1265,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
group: "jobs",
}, },
parts_not_recieved: { parts_not_recieved: {
title: i18n.t("reportcenter.templates.parts_not_recieved"), title: i18n.t("reportcenter.templates.parts_not_recieved"),
@@ -1213,6 +1278,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.parts_orders"), object: i18n.t("reportcenter.labels.objects.parts_orders"),
field: i18n.t("parts_orders.fields.order_date"), field: i18n.t("parts_orders.fields.order_date"),
}, },
group: "purchases",
}, },
scoreboard_detail: { scoreboard_detail: {
title: i18n.t("reportcenter.templates.scoreboard_detail"), title: i18n.t("reportcenter.templates.scoreboard_detail"),
@@ -1225,6 +1291,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.scoreboard"), object: i18n.t("reportcenter.labels.objects.scoreboard"),
field: i18n.t("scoreboard.fields.date"), field: i18n.t("scoreboard.fields.date"),
}, },
group: "payroll",
}, },
scoreboard_summary: { scoreboard_summary: {
title: i18n.t("reportcenter.templates.scoreboard_summary"), title: i18n.t("reportcenter.templates.scoreboard_summary"),
@@ -1237,6 +1304,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.scoreboard"), object: i18n.t("reportcenter.labels.objects.scoreboard"),
field: i18n.t("scoreboard.fields.date"), field: i18n.t("scoreboard.fields.date"),
}, },
group: "payroll",
}, },
anticipated_revenue: { anticipated_revenue: {
title: i18n.t("reportcenter.templates.anticipated_revenue"), title: i18n.t("reportcenter.templates.anticipated_revenue"),
@@ -1249,6 +1317,20 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.scheduled_completion"), // Also date invoice. field: i18n.t("jobs.fields.scheduled_completion"), // Also date invoice.
}, },
group: "sales",
},
csi: {
title: i18n.t("reportcenter.templates.csi"),
description: "",
subject: i18n.t("reportcenter.templates.csi"),
key: "csi",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.csi"),
field: i18n.t("csi.fields.created_at"), // Also date invoice.
},
group: "customers",
}, },
} }
: {}), : {}),

View File

@@ -0,0 +1,9 @@
function confirmDialog(msg) {
return new Promise(function (resolve, reject) {
let confirmed = window.confirm(msg);
return confirmed ? resolve(true) : resolve(false);
});
}
export default confirmDialog;

View File

@@ -36,10 +36,10 @@
lodash "^4.17.21" lodash "^4.17.21"
resize-observer-polyfill "^1.5.0" resize-observer-polyfill "^1.5.0"
"@apollo/client@^3.4.10": "@apollo/client@^3.4.13":
version "3.4.10" version "3.4.13"
resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.4.10.tgz#cee9ed75b1bb7f391c55d79300ecf87096e59792" resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.4.13.tgz#81670c27b376e80e3845ecf6468e534d908fa5b5"
integrity sha512-b+8TT3jBM2BtEJi+V2FuLpvoYDZCY3baNYrgAgEyw4fjnuBCSRPY7qVjqriZAwMaGiTLtyVifGhmdeICQs4Eow== integrity sha512-/nH8z/0X6WJ+wtUREHTlKQGX4lo6u3XkF1hy+k4eCxLZzT5+VRw1rm92iIkj1H85vep/eE/KV3DdRq1x3t9NnQ==
dependencies: dependencies:
"@graphql-typed-document-node/core" "^3.0.0" "@graphql-typed-document-node/core" "^3.0.0"
"@wry/context" "^0.6.0" "@wry/context" "^0.6.0"
@@ -52,7 +52,7 @@
symbol-observable "^4.0.0" symbol-observable "^4.0.0"
ts-invariant "^0.9.0" ts-invariant "^0.9.0"
tslib "^2.3.0" tslib "^2.3.0"
zen-observable-ts "^1.1.0" zen-observable-ts "~1.1.0"
"@babel/code-frame@7.10.4": "@babel/code-frame@7.10.4":
version "7.10.4" version "7.10.4"
@@ -1261,10 +1261,10 @@
exec-sh "^0.3.2" exec-sh "^0.3.2"
minimist "^1.2.0" minimist "^1.2.0"
"@craco/craco@^6.2.0": "@craco/craco@^6.3.0":
version "6.2.0" version "6.3.0"
resolved "https://registry.yarnpkg.com/@craco/craco/-/craco-6.2.0.tgz#93847ae20899f5e810359443f2055bcf2b1a584e" resolved "https://registry.yarnpkg.com/@craco/craco/-/craco-6.3.0.tgz#157ff6387dab526390b47b12e890542c7e7c6437"
integrity sha512-kLc4GSdgR9D5JiZmSxtzbvBKcUFSJqMXImRjjYf5pacwiyAs3XfQwai7T+pExfLQNUnytgkL8jRFUJeYrkVr7g== integrity sha512-SCnfEQxT/6NAbU/3sIWw7gQXtzjjiTp/EZFdJTd8inPURILIy0YajrC2p8qBG2KhFo5cwgOrEDyaGyAFvvuyuA==
dependencies: dependencies:
cross-spawn "^7.0.0" cross-spawn "^7.0.0"
lodash "^4.17.15" lodash "^4.17.15"
@@ -1409,12 +1409,12 @@
"@firebase/util" "1.3.0" "@firebase/util" "1.3.0"
tslib "^2.1.0" tslib "^2.1.0"
"@firebase/auth-compat@0.1.1": "@firebase/auth-compat@0.1.2":
version "0.1.1" version "0.1.2"
resolved "https://registry.yarnpkg.com/@firebase/auth-compat/-/auth-compat-0.1.1.tgz#9baf7b50395ea29a8c3bd20d1c1a3d3cf9004534" resolved "https://registry.yarnpkg.com/@firebase/auth-compat/-/auth-compat-0.1.2.tgz#a971cb7859eb4d45c233043bea102993376d9fca"
integrity sha512-wEGEV+SluDt/SRyLJRG+s32EDHsyahlkp7kXTcRLUs5KGHmK0T0wNrWxdN5eeR4wR/tlrasPNveUeQDyoJVQzw== integrity sha512-0eqWSV4XoyOltT4HVJUzh8hBFNO5f78ZGDplRQImQ97/6wR45x6Q/9R19KTWOd109+3Axw6Orfq2cSNY0opgEA==
dependencies: dependencies:
"@firebase/auth" "0.17.1" "@firebase/auth" "0.17.2"
"@firebase/auth-types" "0.11.0" "@firebase/auth-types" "0.11.0"
"@firebase/component" "0.5.6" "@firebase/component" "0.5.6"
"@firebase/util" "1.3.0" "@firebase/util" "1.3.0"
@@ -1432,10 +1432,10 @@
resolved "https://registry.yarnpkg.com/@firebase/auth-types/-/auth-types-0.11.0.tgz#b9c73c60ca07945b3bbd7a097633e5f78fa9e886" resolved "https://registry.yarnpkg.com/@firebase/auth-types/-/auth-types-0.11.0.tgz#b9c73c60ca07945b3bbd7a097633e5f78fa9e886"
integrity sha512-q7Bt6cx+ySj9elQHTsKulwk3+qDezhzRBFC9zlQ1BjgMueUOnGMcvqmU0zuKlQ4RhLSH7MNAdBV2znVaoN3Vxw== integrity sha512-q7Bt6cx+ySj9elQHTsKulwk3+qDezhzRBFC9zlQ1BjgMueUOnGMcvqmU0zuKlQ4RhLSH7MNAdBV2znVaoN3Vxw==
"@firebase/auth@0.17.1": "@firebase/auth@0.17.2":
version "0.17.1" version "0.17.2"
resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-0.17.1.tgz#4c3dd24ca5a9c47c5e97a9fd1bd4129c46154764" resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-0.17.2.tgz#54ad76cfdc2f6d1201fb780365cf7d362586f3c6"
integrity sha512-+YQM0svb10Q1LwoTj+/unrdY/F/C89bgsjlanY14k2124fiOYVZv0M19t5i7nZx8VnsrgzkFaDfKahdcDxjdpA== integrity sha512-t1iHB5Eg7vAbyOEzMMarsyJNGiO2xP8Zag0hLRVXWVaWymXZnyVKp62sXqyonvz4eVT8+iGBjDySB9zKIb5Pqg==
dependencies: dependencies:
"@firebase/component" "0.5.6" "@firebase/component" "0.5.6"
"@firebase/logger" "0.2.6" "@firebase/logger" "0.2.6"
@@ -1484,13 +1484,13 @@
faye-websocket "0.11.3" faye-websocket "0.11.3"
tslib "^2.1.0" tslib "^2.1.0"
"@firebase/firestore-compat@0.1.1": "@firebase/firestore-compat@0.1.2":
version "0.1.1" version "0.1.2"
resolved "https://registry.yarnpkg.com/@firebase/firestore-compat/-/firestore-compat-0.1.1.tgz#a990cd4b0aef5e0a18972de71d18c35065099f19" resolved "https://registry.yarnpkg.com/@firebase/firestore-compat/-/firestore-compat-0.1.2.tgz#af9e28735376ee04c147ea3ac11b592b3f7a68ac"
integrity sha512-Ag95WVTSh5Q+GK3egd9HBvXerO/lrRulTO67ryYp4EPyoI/ZmnIoMhYgnOXvb1jCH0Ae01XoSxgU2M2SRvph/Q== integrity sha512-xtjj2qOBN0+S5KlXmWa5UozGmYJ1OAGBNT0qkCSvzQitHED5/B2fNwKnpy7Em+Zu3Yc3r/eM94OGx93USFXifg==
dependencies: dependencies:
"@firebase/component" "0.5.6" "@firebase/component" "0.5.6"
"@firebase/firestore" "3.0.1" "@firebase/firestore" "3.0.2"
"@firebase/firestore-types" "2.5.0" "@firebase/firestore-types" "2.5.0"
"@firebase/util" "1.3.0" "@firebase/util" "1.3.0"
tslib "^2.1.0" tslib "^2.1.0"
@@ -1500,10 +1500,10 @@
resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-2.5.0.tgz#16fca40b6980fdb000de86042d7a96635f2bcdd7" resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-2.5.0.tgz#16fca40b6980fdb000de86042d7a96635f2bcdd7"
integrity sha512-I6c2m1zUhZ5SH0cWPmINabDyH5w0PPFHk2UHsjBpKdZllzJZ2TwTkXbDtpHUZNmnc/zAa0WNMNMvcvbb/xJLKA== integrity sha512-I6c2m1zUhZ5SH0cWPmINabDyH5w0PPFHk2UHsjBpKdZllzJZ2TwTkXbDtpHUZNmnc/zAa0WNMNMvcvbb/xJLKA==
"@firebase/firestore@3.0.1": "@firebase/firestore@3.0.2":
version "3.0.1" version "3.0.2"
resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-3.0.1.tgz#0152c6a767e116382fb28a0e62b6ea7fa331cc20" resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-3.0.2.tgz#594130bb125803b6e28611075c2f396f59ba8186"
integrity sha512-HDnmweq9GOrk4AtCyQ50FBj/cRowb7IXeTGOx6/MSGYCodKv+9axviKqKPYlWH7cbyrw2Jf3GJTUdkVghMhn+w== integrity sha512-AWh1pugDifwCXHaQalZHp+Hr/3o+cxYvlbgQrPB35bh1A3do4I1xim/8Pba7gtpTzlClDryd5pK/XbK0TC/2kg==
dependencies: dependencies:
"@firebase/component" "0.5.6" "@firebase/component" "0.5.6"
"@firebase/logger" "0.2.6" "@firebase/logger" "0.2.6"
@@ -1514,13 +1514,13 @@
node-fetch "2.6.1" node-fetch "2.6.1"
tslib "^2.1.0" tslib "^2.1.0"
"@firebase/functions-compat@0.1.1": "@firebase/functions-compat@0.1.2":
version "0.1.1" version "0.1.2"
resolved "https://registry.yarnpkg.com/@firebase/functions-compat/-/functions-compat-0.1.1.tgz#b1afb89750ec4d1b9a1a9a188f20c30b75aa4a93" resolved "https://registry.yarnpkg.com/@firebase/functions-compat/-/functions-compat-0.1.2.tgz#557461ed4f2928747461c6b2d246ac328aea3248"
integrity sha512-HELDScvKEP/tM6eW52u+5ilqweCB/cB8ONiQ0aHw2Hjdm20DQ/VsII2JEtbhnFQfuODdugvWLkWV0RPWTFwYqA== integrity sha512-eisJazUrqOL/pAZJPqamYiaAyV3ch6GQMx8Sso792tvRr8SFsNCFbN9eVun0U0ubWAON5qdLoruoc6npXg6FIg==
dependencies: dependencies:
"@firebase/component" "0.5.6" "@firebase/component" "0.5.6"
"@firebase/functions" "0.7.0" "@firebase/functions" "0.7.1"
"@firebase/functions-types" "0.5.0" "@firebase/functions-types" "0.5.0"
"@firebase/util" "1.3.0" "@firebase/util" "1.3.0"
tslib "^2.1.0" tslib "^2.1.0"
@@ -1530,10 +1530,10 @@
resolved "https://registry.yarnpkg.com/@firebase/functions-types/-/functions-types-0.5.0.tgz#b50ba95ccce9e96f7cda453228ffe1684645625b" resolved "https://registry.yarnpkg.com/@firebase/functions-types/-/functions-types-0.5.0.tgz#b50ba95ccce9e96f7cda453228ffe1684645625b"
integrity sha512-qza0M5EwX+Ocrl1cYI14zoipUX4gI/Shwqv0C1nB864INAD42Dgv4v94BCyxGHBg2kzlWy8PNafdP7zPO8aJQA== integrity sha512-qza0M5EwX+Ocrl1cYI14zoipUX4gI/Shwqv0C1nB864INAD42Dgv4v94BCyxGHBg2kzlWy8PNafdP7zPO8aJQA==
"@firebase/functions@0.7.0": "@firebase/functions@0.7.1":
version "0.7.0" version "0.7.1"
resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.7.0.tgz#d052d01aa6871f5cd518748963792bae94b2081d" resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.7.1.tgz#aa95aaed34649d0656d50df0ed21802f117cca88"
integrity sha512-H0krTllYh5eK7utKoUoNoVvoSdZqaPdqGSdIK7ltr1yWX9UhbRWYZv5B/tWTjQFfDfRQwpn9Q6svoJzYZQiusA== integrity sha512-F6XZVVBpqupCX7/YXpdzyXKYCeLVmHO/jxAKbN9I4B+c8doDqVtGkO23DPzf4ppzR4FuXDiKEEU9ZZ85kqZ1QA==
dependencies: dependencies:
"@firebase/app-check-interop-types" "0.1.0" "@firebase/app-check-interop-types" "0.1.0"
"@firebase/auth-interop-types" "0.1.6" "@firebase/auth-interop-types" "0.1.6"
@@ -1650,13 +1650,13 @@
"@firebase/util" "1.3.0" "@firebase/util" "1.3.0"
tslib "^2.1.0" tslib "^2.1.0"
"@firebase/storage-compat@0.1.1": "@firebase/storage-compat@0.1.2":
version "0.1.1" version "0.1.2"
resolved "https://registry.yarnpkg.com/@firebase/storage-compat/-/storage-compat-0.1.1.tgz#9192cd26595a2a09ebef1bbd3da1b63f4716da37" resolved "https://registry.yarnpkg.com/@firebase/storage-compat/-/storage-compat-0.1.2.tgz#98e6b3516a70799935618c32e6b8937370587929"
integrity sha512-W2ke6KcnrEY1zvlEZ8GOVt8wgUbIhW3ZCBUYMdpsLKB/uFmn/zgdiba+ojwerqlOH5zUe4CSULqBE1hXDm1pMw== integrity sha512-eff0e2qcDX188mqr7aKrqr4TIS25/cE6E7Xo9WRLe3c17nqGgmrYM4DDS3VDttNbf1j5XaoEnZVZafE9/BR3Rg==
dependencies: dependencies:
"@firebase/component" "0.5.6" "@firebase/component" "0.5.6"
"@firebase/storage" "0.8.1" "@firebase/storage" "0.8.2"
"@firebase/storage-types" "0.6.0" "@firebase/storage-types" "0.6.0"
"@firebase/util" "1.3.0" "@firebase/util" "1.3.0"
tslib "^2.1.0" tslib "^2.1.0"
@@ -1666,10 +1666,10 @@
resolved "https://registry.yarnpkg.com/@firebase/storage-types/-/storage-types-0.6.0.tgz#0b1af64a2965af46fca138e5b70700e9b7e6312a" resolved "https://registry.yarnpkg.com/@firebase/storage-types/-/storage-types-0.6.0.tgz#0b1af64a2965af46fca138e5b70700e9b7e6312a"
integrity sha512-1LpWhcCb1ftpkP/akhzjzeFxgVefs6eMD2QeKiJJUGH1qOiows2w5o0sKCUSQrvrRQS1lz3SFGvNR1Ck/gqxeA== integrity sha512-1LpWhcCb1ftpkP/akhzjzeFxgVefs6eMD2QeKiJJUGH1qOiows2w5o0sKCUSQrvrRQS1lz3SFGvNR1Ck/gqxeA==
"@firebase/storage@0.8.1": "@firebase/storage@0.8.2":
version "0.8.1" version "0.8.2"
resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.8.1.tgz#38959b5011df90de4041dbe7277093e010169eba" resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.8.2.tgz#e08c05d070a468f0976a3d0cd32318655f0ae3b7"
integrity sha512-kq6biRi86JUNU3ZQc7UrUYJ+QmPmayER68sXtHmn8Kxw7p/V5MchTPVpE8iFAN5a5PhGTPKSD4cuNyUPU9C0Fg== integrity sha512-I9mVYhQ/DkWI1MKHhYvI4dnguXdXC50S5ryehOcR/JmSwyYjh1+T+IFQp0hHb1VWTixShzWoSGo1PhbrolFmIA==
dependencies: dependencies:
"@firebase/component" "0.5.6" "@firebase/component" "0.5.6"
"@firebase/util" "1.3.0" "@firebase/util" "1.3.0"
@@ -2178,14 +2178,14 @@
estree-walker "^1.0.1" estree-walker "^1.0.1"
picomatch "^2.2.2" picomatch "^2.2.2"
"@sentry/browser@6.12.0": "@sentry/browser@6.13.0":
version "6.12.0" version "6.13.0"
resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.12.0.tgz#970cd68fa117a1e1336fdb373e3b1fa76cd63e2d" resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.13.0.tgz#fddcf1997d47c166a86494a6ea594f4cc60e773d"
integrity sha512-wsJi1NLOmfwtPNYxEC50dpDcVY7sdYckzwfqz1/zHrede1mtxpqSw+7iP4bHADOJXuF+ObYYTHND0v38GSXznQ== integrity sha512-Eh0k2qYhqWiEP3N04AwSrpl4VRD0pzt6SRgJxgiGzSvBT43EOjyNQ3xzMylAechfjSCTWmzZMvwcgT5fNM9cuw==
dependencies: dependencies:
"@sentry/core" "6.12.0" "@sentry/core" "6.13.0"
"@sentry/types" "6.12.0" "@sentry/types" "6.13.0"
"@sentry/utils" "6.12.0" "@sentry/utils" "6.13.0"
tslib "^1.9.3" tslib "^1.9.3"
"@sentry/cli@^1.68.0": "@sentry/cli@^1.68.0":
@@ -2200,69 +2200,69 @@
progress "^2.0.3" progress "^2.0.3"
proxy-from-env "^1.1.0" proxy-from-env "^1.1.0"
"@sentry/core@6.12.0": "@sentry/core@6.13.0":
version "6.12.0" version "6.13.0"
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.12.0.tgz#bc7c5f0785b6a392d9ad47bd9b1fae3f5389996c" resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.13.0.tgz#35df709bb5c1979cc05a4dd0bbe8b15fb973ad6f"
integrity sha512-mU/zdjlzFHzdXDZCPZm8OeCw7c9xsbL49Mq0TrY0KJjLt4CJBkiq5SDTGfRsenBLgTedYhe5Z/J8Z+xVVq+MfQ== integrity sha512-Aw0ljRJx5tq4w6ZXxvcu2Lr9NwD+MJ1SLL5+oB1hh4OlcOJ7OLwDjtJ3+ZOwp75GCAp7phh4+s/Sql6roX3Lpw==
dependencies: dependencies:
"@sentry/hub" "6.12.0" "@sentry/hub" "6.13.0"
"@sentry/minimal" "6.12.0" "@sentry/minimal" "6.13.0"
"@sentry/types" "6.12.0" "@sentry/types" "6.13.0"
"@sentry/utils" "6.12.0" "@sentry/utils" "6.13.0"
tslib "^1.9.3" tslib "^1.9.3"
"@sentry/hub@6.12.0": "@sentry/hub@6.13.0":
version "6.12.0" version "6.13.0"
resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.12.0.tgz#29e323ab6a95e178fb14fffb684aa0e09707197f" resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.13.0.tgz#076a5f9b6d0efb8c1832820e3eecd5e24b5e1706"
integrity sha512-yR/UQVU+ukr42bSYpeqvb989SowIXlKBanU0cqLFDmv5LPCnaQB8PGeXwJAwWhQgx44PARhmB82S6Xor8gYNxg== integrity sha512-BmKgrTyotF008KPfFt1ySyFg0AAMf/ha9Bz9Rmi+usSJjnOLsObzBJQNAozp4Cu6i1kGvj1/R+ymPCD61Gqozw==
dependencies: dependencies:
"@sentry/types" "6.12.0" "@sentry/types" "6.13.0"
"@sentry/utils" "6.12.0" "@sentry/utils" "6.13.0"
tslib "^1.9.3" tslib "^1.9.3"
"@sentry/minimal@6.12.0": "@sentry/minimal@6.13.0":
version "6.12.0" version "6.13.0"
resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.12.0.tgz#cbe20e95056cedb9709d7d5b2119ef95206a9f8c" resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.13.0.tgz#276fc0ee5355954c2a9d9292d914988391f8a1e1"
integrity sha512-r3C54Q1KN+xIqUvcgX9DlcoWE7ezWvFk2pSu1Ojx9De81hVqR9u5T3sdSAP2Xma+um0zr6coOtDJG4WtYlOtsw== integrity sha512-eJQs44sGY2wFuVDznHMDeShR+ZbnM/KS+T5753nJ4QtMqCNTiG9WDlNXAxwFJ6Q3DORtaxcWHyFZdOMUusJiZQ==
dependencies: dependencies:
"@sentry/hub" "6.12.0" "@sentry/hub" "6.13.0"
"@sentry/types" "6.12.0" "@sentry/types" "6.13.0"
tslib "^1.9.3" tslib "^1.9.3"
"@sentry/react@^6.11.0": "@sentry/react@^6.13.0":
version "6.12.0" version "6.13.0"
resolved "https://registry.yarnpkg.com/@sentry/react/-/react-6.12.0.tgz#8ae2680d226fafb0da0f3d8366bb285004ba6c2e" resolved "https://registry.yarnpkg.com/@sentry/react/-/react-6.13.0.tgz#110aada56a5f952b63f8ce94ce0c71792bcffd4a"
integrity sha512-E8Nw9PPzP/EyMy64ksr9xcyYYlBmUA5ROnkPQp7o5wF0xf5/J+nMS1tQdyPnLQe2KUgHlN4kVs2HHft1m7mSYQ== integrity sha512-Pkkq2YQn7uvqHX+OvoGrd9Nq0ixrQyixm2SI0BjptDXkZ6AqlI+fhhP8Mm+ezBgPT9WqO2+BUW/YivyTjVYwHg==
dependencies: dependencies:
"@sentry/browser" "6.12.0" "@sentry/browser" "6.13.0"
"@sentry/minimal" "6.12.0" "@sentry/minimal" "6.13.0"
"@sentry/types" "6.12.0" "@sentry/types" "6.13.0"
"@sentry/utils" "6.12.0" "@sentry/utils" "6.13.0"
hoist-non-react-statics "^3.3.2" hoist-non-react-statics "^3.3.2"
tslib "^1.9.3" tslib "^1.9.3"
"@sentry/tracing@^6.11.0": "@sentry/tracing@^6.13.0":
version "6.12.0" version "6.13.0"
resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.12.0.tgz#a05c8985ee7fed7310b029b147d8f9f14f2a2e67" resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.13.0.tgz#3d9fac18c2d6829ba14178729d4a7ac770462e3e"
integrity sha512-u10QHNknPBzbWSUUNMkvuH53sQd5NaBo6YdNPj4p5b7sE7445Sh0PwBpRbY3ZiUUiwyxV59fx9UQ4yVnPGxZQA== integrity sha512-nTY8UnVK6OUh4ocONtphoaK3WXBZqw0HOFyFpBSzhldo4O1jLad1OEkz8vAxrIE9sXPmLWta5CtKq6PIaFwQSg==
dependencies: dependencies:
"@sentry/hub" "6.12.0" "@sentry/hub" "6.13.0"
"@sentry/minimal" "6.12.0" "@sentry/minimal" "6.13.0"
"@sentry/types" "6.12.0" "@sentry/types" "6.13.0"
"@sentry/utils" "6.12.0" "@sentry/utils" "6.13.0"
tslib "^1.9.3" tslib "^1.9.3"
"@sentry/types@6.12.0": "@sentry/types@6.13.0":
version "6.12.0" version "6.13.0"
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.12.0.tgz#b7395688a79403c6df8d8bb8d81deb8222519853" resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.13.0.tgz#a8ad870c6ecb407cbe9ca883b0688bacb30daacf"
integrity sha512-urtgLzE4EDMAYQHYdkgC0Ei9QvLajodK1ntg71bGn0Pm84QUpaqpPDfHRU+i6jLeteyC7kWwa5O5W1m/jrjGXA== integrity sha512-04ZVmz4txuI3w1KS81eByppvvMfOINj7jZYnO5zX/S3cjHiOpAJiZkN/k9tTi1Ua3td8bEkQLB6Cxrq9MSiH3Q==
"@sentry/utils@6.12.0": "@sentry/utils@6.13.0":
version "6.12.0" version "6.13.0"
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.12.0.tgz#3de261e8d11bdfdc7add64a3065d43517802e975" resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.13.0.tgz#c75647890a5a9dfdb3df321517aa4886c8715b03"
integrity sha512-oRHQ7TH5TSsJqoP9Gqq25Jvn9LKexXfAh/OoKwjMhYCGKGhqpDNUIZVgl9DWsGw5A5N5xnQyLOxDfyRV5RshdA== integrity sha512-e82DBwjYqWkNmafIkHnbqirK4t7WCmqCGaoo1Et6vTRCBS4GthWvS6EzaozY7EKs/TzsfIiDdTLGTbYMQOq9Zw==
dependencies: dependencies:
"@sentry/types" "6.12.0" "@sentry/types" "6.13.0"
tslib "^1.9.3" tslib "^1.9.3"
"@sentry/webpack-plugin@^1.17.1": "@sentry/webpack-plugin@^1.17.1":
@@ -2472,29 +2472,41 @@
resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.3.3.tgz#85bc74ba782fb7aa3a514d11767832b0e3bc6803" resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.3.3.tgz#85bc74ba782fb7aa3a514d11767832b0e3bc6803"
integrity sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow== integrity sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow==
"@types/d3-path@^2": "@types/d3-color@*":
version "2.0.1" version "3.0.2"
resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-2.0.1.tgz#ca03dfa8b94d8add97ad0cd97e96e2006b4763cb" resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-3.0.2.tgz#53f2d6325f66ee79afd707c05ac849e8ae0edbb0"
integrity sha512-6K8LaFlztlhZO7mwsZg7ClRsdLg3FJRzIIi6SZXDWmmSJc2x8dd2VkESbLXdk3p8cuvz71f36S0y8Zv2AxqvQw== integrity sha512-WVx6zBiz4sWlboCy7TCgjeyHpNjMsoF36yaagny1uXfbadc9f+5BeBf7U+lRmQqY3EHbGQpP8UdW8AC+cywSwQ==
"@types/d3-scale@^3.0.0": "@types/d3-interpolate@^3.0.0":
version "3.3.2" version "3.0.1"
resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-3.3.2.tgz#18c94e90f4f1c6b1ee14a70f14bfca2bd1c61d06" resolved "https://registry.yarnpkg.com/@types/d3-interpolate/-/d3-interpolate-3.0.1.tgz#e7d17fa4a5830ad56fe22ce3b4fac8541a9572dc"
integrity sha512-gGqr7x1ost9px3FvIfUMi5XA/F/yAf4UkUDtdQhpH92XCT0Oa7zkkRzY61gPVJq+DxpHn/btouw5ohWkbBsCzQ== integrity sha512-jx5leotSeac3jr0RePOH1KdR9rISG91QIE4Q2PYTu4OymLTZfA3SrnURSLzKH48HmXVUru50b8nje4E79oQSQw==
dependencies: dependencies:
"@types/d3-time" "^2" "@types/d3-color" "*"
"@types/d3-shape@^2.0.0": "@types/d3-path@*":
version "2.1.3" version "3.0.0"
resolved "https://registry.yarnpkg.com/@types/d3-shape/-/d3-shape-2.1.3.tgz#35d397b9e687abaa0de82343b250b9897b8cacf3" resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-3.0.0.tgz#939e3a784ae4f80b1fde8098b91af1776ff1312b"
integrity sha512-HAhCel3wP93kh4/rq+7atLdybcESZ5bRHDEZUojClyZWsRuEMo3A52NGYJSh48SxfxEU6RZIVbZL2YFZ2OAlzQ== integrity sha512-0g/A+mZXgFkQxN3HniRDbXMN79K3CdTpLsevj+PXiTcb2hVyvkZUBg37StmgCQkaD84cUJ4uaDAWq7UJOQy2Tg==
"@types/d3-scale@^4.0.0":
version "4.0.1"
resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-4.0.1.tgz#fbe8238e2eff27af577d2b7d0b933ae50a546970"
integrity sha512-GDuXcRcR6mKcpUVMhPNttpOzHi2dP6YcDqLZYSZHgwTZ+sfCa8e9q0VEBwZomblAPNMYpVqxojnSyIEb4s/Pwg==
dependencies: dependencies:
"@types/d3-path" "^2" "@types/d3-time" "*"
"@types/d3-time@^2": "@types/d3-shape@^3.0.0":
version "2.1.1" version "3.0.2"
resolved "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-2.1.1.tgz#743fdc821c81f86537cbfece07093ac39b4bc342" resolved "https://registry.yarnpkg.com/@types/d3-shape/-/d3-shape-3.0.2.tgz#4b1ca4ddaac294e76b712429726d40365cd1e8ca"
integrity sha512-9MVYlmIgmRR31C5b4FVSWtuMmBHh2mOWQYfl7XAYOa8dsnb7iEmUmRSWSFgXFtkjxO65d7hTUHQC+RhR/9IWFg== integrity sha512-5+ButCmIfNX8id5seZ7jKj3igdcxx+S9IDBiT35fQGTLZUfkFgTv+oBH34xgeoWDKpWcMITSzBILWQtBoN5Piw==
dependencies:
"@types/d3-path" "*"
"@types/d3-time@*":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-3.0.0.tgz#e1ac0f3e9e195135361fa1a1d62f795d87e6e819"
integrity sha512-sZLCdHvBUcNby1cB6Fd3ZBrABbjz3v1Vm90nysCQ6Vt7vd6e/h9Lt7SiJUoEX0l4Dzc7P5llKyhqSi1ycSf1Hg==
"@types/eslint@^7.2.6": "@types/eslint@^7.2.6":
version "7.28.0" version "7.28.0"
@@ -4988,76 +5000,76 @@ cyclist@^1.0.1:
resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
d3-array@2, d3-array@^2.3.0: "d3-array@2 - 3", "d3-array@2.10.0 - 3":
version "2.12.1" version "3.0.4"
resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.12.1.tgz#e20b41aafcdffdf5d50928004ececf815a465e81" resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.0.4.tgz#60550bcc9818be9ace88d269ccd97038fc399b55"
integrity sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ== integrity sha512-ShFl90cxNqDaSynDF/Bik/kTzISqePqU3qo2fv6kSJEvF7y7tDCDpcU6WiT01rPO6zngZnrvJ/0j4q6Qg+5EQg==
dependencies: dependencies:
internmap "^1.0.0" internmap "1 - 2"
d3-array@^1.2.0: d3-array@^1.2.0:
version "1.2.4" version "1.2.4"
resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f" resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f"
integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw== integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==
"d3-color@1 - 2": "d3-color@1 - 3":
version "2.0.0" version "3.0.1"
resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-2.0.0.tgz#8d625cab42ed9b8f601a1760a389f7ea9189d62e" resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.0.1.tgz#03316e595955d1fcd39d9f3610ad41bb90194d0a"
integrity sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ== integrity sha512-6/SlHkDOBLyQSJ1j1Ghs82OIUXpKWlR0hCsw0XrLSQhuUPuCSmLQ1QPH98vpnQxMUQM2/gfAkUEWsupVpd9JGw==
"d3-format@1 - 2": "d3-format@1 - 3":
version "2.0.0" version "3.0.1"
resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-2.0.0.tgz#a10bcc0f986c372b729ba447382413aabf5b0767" resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-3.0.1.tgz#e41b81b2ab79277141ec1404aa5d05001da64084"
integrity sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA== integrity sha512-hdL7+HBIohpgfolhBxr1KX47VMD6+vVD/oEFrxk5yhmzV2prk99EkFKYpXuhVkFpTgHdJ6/4bYcjdLPPXV4tIA==
"d3-interpolate@1.2.0 - 2", d3-interpolate@^2.0.1: "d3-interpolate@1.2.0 - 3", d3-interpolate@^3.0.0:
version "2.0.1" version "3.0.1"
resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-2.0.1.tgz#98be499cfb8a3b94d4ff616900501a64abc91163" resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz#3c47aa5b32c5b3dfb56ef3fd4342078a632b400d"
integrity sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ== integrity sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==
dependencies: dependencies:
d3-color "1 - 2" d3-color "1 - 3"
"d3-path@1 - 2": "d3-path@1 - 3":
version "2.0.0" version "3.0.1"
resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-2.0.0.tgz#55d86ac131a0548adae241eebfb56b4582dd09d8" resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-3.0.1.tgz#f09dec0aaffd770b7995f1a399152bf93052321e"
integrity sha512-ZwZQxKhBnv9yHaiWd6ZU4x5BtCQ7pXszEV9CU6kRgwIQVQGLMv1oiL4M+MK/n79sYzsj+gcgpPQSctJUsLN7fA== integrity sha512-gq6gZom9AFZby0YLduxT1qmrp4xpBA1YZr19OI717WIdKE2OM5ETq5qrHLb301IgxhLwcuxvGZVLeeWc/k1I6w==
d3-polygon@^1.0.3: d3-polygon@^1.0.3:
version "1.0.6" version "1.0.6"
resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.6.tgz#0bf8cb8180a6dc107f518ddf7975e12abbfbd38e" resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.6.tgz#0bf8cb8180a6dc107f518ddf7975e12abbfbd38e"
integrity sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ== integrity sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ==
d3-scale@^3.2.3: d3-scale@^4.0.0:
version "3.3.0" version "4.0.1"
resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-3.3.0.tgz#28c600b29f47e5b9cd2df9749c206727966203f3" resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-4.0.1.tgz#c65aa7a357e4f58954a66e1edacc712bab4b1034"
integrity sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ== integrity sha512-akUAsUujCFnw6Sf1dF7y/FXTxz+VvEIOB3ValKtLhNrzFp8q5wPO3VCAmsbCLJWRTxyJCZDoooodjOI1plFqlw==
dependencies: dependencies:
d3-array "^2.3.0" d3-array "2.10.0 - 3"
d3-format "1 - 2" d3-format "1 - 3"
d3-interpolate "1.2.0 - 2" d3-interpolate "1.2.0 - 3"
d3-time "^2.1.1" d3-time "2.1.1 - 3"
d3-time-format "2 - 3" d3-time-format "2 - 4"
d3-shape@^2.0.0: d3-shape@^3.0.0:
version "2.1.0" version "3.0.1"
resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-2.1.0.tgz#3b6a82ccafbc45de55b57fcf956c584ded3b666f" resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-3.0.1.tgz#9ccdfb28fd9b0d12f2d8aec234cd5c4a9ea27931"
integrity sha512-PnjUqfM2PpskbSLTJvAzp2Wv4CZsnAgTfcVRTwW03QR3MkXF8Uo7B1y/lWkAsmbKwuecto++4NlsYcvYpXpTHA== integrity sha512-HNZNEQoDhuCrDWEc/BMbF/hKtzMZVoe64TvisFLDp2Iyj0UShB/E6/lBsLlJTfBMbYgftHj90cXJ0SEitlE6Xw==
dependencies: dependencies:
d3-path "1 - 2" d3-path "1 - 3"
"d3-time-format@2 - 3": "d3-time-format@2 - 4":
version "4.0.0"
resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-4.0.0.tgz#930ded86a9de761702344760d8a25753467f28b7"
integrity sha512-nzaCwlj+ZVBIlFuVOT1RmU+6xb/7D5IcnhHzHQcBgS/aTa5K9fWZNN5LCXA27LgF5WxoSNJqKBbLcGMtM6Ca6A==
dependencies:
d3-time "1 - 3"
"d3-time@1 - 3", "d3-time@2.1.1 - 3":
version "3.0.0" version "3.0.0"
resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-3.0.0.tgz#df8056c83659e01f20ac5da5fdeae7c08d5f1bb6" resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-3.0.0.tgz#65972cb98ae2d4954ef5c932e8704061335d4975"
integrity sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag== integrity sha512-zmV3lRnlaLI08y9IMRXSDshQb5Nj77smnfpnd2LrBa/2K281Jijactokeak14QacHs/kKq0AQ121nidNYlarbQ==
dependencies: dependencies:
d3-time "1 - 2" d3-array "2 - 3"
"d3-time@1 - 2", d3-time@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-2.1.1.tgz#e9d8a8a88691f4548e68ca085e5ff956724a6682"
integrity sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==
dependencies:
d3-array "2"
d@1, d@^1.0.1: d@1, d@^1.0.1:
version "1.0.1" version "1.0.1"
@@ -6360,10 +6372,10 @@ find-yarn-workspace-root@^2.0.0:
dependencies: dependencies:
micromatch "^4.0.2" micromatch "^4.0.2"
firebase@^9.0.0: firebase@^9.0.2:
version "9.0.1" version "9.0.2"
resolved "https://registry.yarnpkg.com/firebase/-/firebase-9.0.1.tgz#6bc5f9d7bdcd864ef98f2219fa0cd240f2e48b3c" resolved "https://registry.yarnpkg.com/firebase/-/firebase-9.0.2.tgz#092019326f1c9a67ec00ec78d50f80244581c705"
integrity sha512-RMpbXsVlxqMX+s/gYudnUZeSZXPiLCJMdaxbZ0WRiMjLuJc6ZkbpRy7yz7rZQpL0wRD6gN4K5C+JaKEQtN3jAQ== integrity sha512-+wdsD3Sk3fOgplzv4yzBmJ3Pdr01QiFF38Zq+8hzd+Dv6ZKMrgiq5CRljCaWenhZ/j8nuvHlq82u64ZARaXC+w==
dependencies: dependencies:
"@firebase/analytics" "0.7.0" "@firebase/analytics" "0.7.0"
"@firebase/analytics-compat" "0.1.1" "@firebase/analytics-compat" "0.1.1"
@@ -6372,14 +6384,14 @@ firebase@^9.0.0:
"@firebase/app-check-compat" "0.1.1" "@firebase/app-check-compat" "0.1.1"
"@firebase/app-compat" "0.1.1" "@firebase/app-compat" "0.1.1"
"@firebase/app-types" "0.7.0" "@firebase/app-types" "0.7.0"
"@firebase/auth" "0.17.1" "@firebase/auth" "0.17.2"
"@firebase/auth-compat" "0.1.1" "@firebase/auth-compat" "0.1.2"
"@firebase/database" "0.12.0" "@firebase/database" "0.12.0"
"@firebase/database-compat" "0.1.0" "@firebase/database-compat" "0.1.0"
"@firebase/firestore" "3.0.1" "@firebase/firestore" "3.0.2"
"@firebase/firestore-compat" "0.1.1" "@firebase/firestore-compat" "0.1.2"
"@firebase/functions" "0.7.0" "@firebase/functions" "0.7.1"
"@firebase/functions-compat" "0.1.1" "@firebase/functions-compat" "0.1.2"
"@firebase/installations" "0.5.0" "@firebase/installations" "0.5.0"
"@firebase/messaging" "0.9.0" "@firebase/messaging" "0.9.0"
"@firebase/messaging-compat" "0.1.0" "@firebase/messaging-compat" "0.1.0"
@@ -6388,8 +6400,8 @@ firebase@^9.0.0:
"@firebase/polyfill" "0.3.36" "@firebase/polyfill" "0.3.36"
"@firebase/remote-config" "0.2.0" "@firebase/remote-config" "0.2.0"
"@firebase/remote-config-compat" "0.1.0" "@firebase/remote-config-compat" "0.1.0"
"@firebase/storage" "0.8.1" "@firebase/storage" "0.8.2"
"@firebase/storage-compat" "0.1.1" "@firebase/storage-compat" "0.1.2"
"@firebase/util" "1.3.0" "@firebase/util" "1.3.0"
flat-cache@^3.0.4: flat-cache@^3.0.4:
@@ -7081,10 +7093,10 @@ i18next-browser-languagedetector@^6.1.2:
dependencies: dependencies:
"@babel/runtime" "^7.14.6" "@babel/runtime" "^7.14.6"
i18next@^20.4.0: i18next@^21.0.0:
version "20.6.0" version "21.0.0"
resolved "https://registry.yarnpkg.com/i18next/-/i18next-20.6.0.tgz#1021e267c8760b03b1b9fbcc5ef734b28d83ea3c" resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.0.0.tgz#ad730aced7df552515c92b318d16d847c6270612"
integrity sha512-sgt7AkvxUQbW5dsA7p5AYq7tBOIdm9K7c4wAppsbt5l0Hynqs7FTsa0bA0Exy+PUR17+IOcg3KVCaILc1OAOxQ== integrity sha512-17A00z5ASuOJkPUNSUMaZcfL3zOm2qYiN8UBIYhNYNmPbPrcP+IfabGEFEICv8CCStr/cbjF0Jk/IXNX9hj3ZA==
dependencies: dependencies:
"@babel/runtime" "^7.12.0" "@babel/runtime" "^7.12.0"
@@ -7280,10 +7292,10 @@ internal-slot@^1.0.3:
has "^1.0.3" has "^1.0.3"
side-channel "^1.0.4" side-channel "^1.0.4"
internmap@^1.0.0: "internmap@1 - 2":
version "1.0.1" version "2.0.3"
resolved "https://registry.yarnpkg.com/internmap/-/internmap-1.0.1.tgz#0017cc8a3b99605f0302f2b198d272e015e5df95" resolved "https://registry.yarnpkg.com/internmap/-/internmap-2.0.3.tgz#6685f23755e43c524e251d29cbc97248e3061009"
integrity sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw== integrity sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==
invariant@^2.2.4: invariant@^2.2.4:
version "2.2.4" version "2.2.4"
@@ -8487,10 +8499,10 @@ levn@~0.3.0:
prelude-ls "~1.1.2" prelude-ls "~1.1.2"
type-check "~0.3.2" type-check "~0.3.2"
libphonenumber-js@^1.9.26: libphonenumber-js@^1.9.34:
version "1.9.26" version "1.9.34"
resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.9.26.tgz#888aca88a4019d0b108e45db8e0509d55785ae45" resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.9.34.tgz#ddddc778a9b2f53c70500fcf10c9483596e3574f"
integrity sha512-j0brmDsZLSKJCrcli1HjzHYP29VOf5P/Yz+xxe7WmKTe+0XVnKa0J+UEAaT96D21w1mfLPhlm0ZXBQ13EVF+XQ== integrity sha512-gHTNU9xTtVgSp30IDX/57W4pETMXDIYXFfwEOJVXiYosiY7Hc7ogJwlBjOqlCcU04X0aA8DT57hdwUC1sJBJnA==
lie@~3.3.0: lie@~3.3.0:
version "3.3.0" version "3.3.0"
@@ -9807,10 +9819,10 @@ performance-now@^2.1.0:
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
phone@^3.1.6: phone@^3.1.8:
version "3.1.6" version "3.1.8"
resolved "https://registry.yarnpkg.com/phone/-/phone-3.1.6.tgz#eefff0be1ce4ce9f2ee028c67be6b58dc5616ef1" resolved "https://registry.yarnpkg.com/phone/-/phone-3.1.8.tgz#6e348512539c9df81bf07fddb3ed3e2ec7e0c66e"
integrity sha512-46WCdbDG32OKoPsntTg2l0VBaWVWg0A3zvH5dUhApwOupyn7owXRtDBz6vAjsJiZQGTft++WvTxEZeqxlCUv9g== integrity sha512-eyneQKbBwhy6PLYgkioO4CcocMUrFHh4WEfYl1A3PpiQK9tiP0ABKU4yhs7F1URKDbp+oeI8rbJU0+8uMgWfBQ==
picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3: picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3:
version "2.3.0" version "2.3.0"
@@ -11392,10 +11404,10 @@ react-grid-layout@^1.3.0:
react-draggable "^4.0.0" react-draggable "^4.0.0"
react-resizable "^3.0.4" react-resizable "^3.0.4"
react-i18next@^11.11.4: react-i18next@^11.12.0:
version "11.11.4" version "11.12.0"
resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.11.4.tgz#f6f9a1c827e7a5271377de2bf14db04cb1c9e5ce" resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.12.0.tgz#2a053321b9b7a876d5baa7af55a12d986117bffc"
integrity sha512-ayWFlu8Sc7GAxW1PzMaPtzq+yiozWMxs0P1WeITNVzXAVRhC0Httkzw/IiODBta6seJRBCLrtUeFUSXhAIxlRg== integrity sha512-M9BT+hqVG03ywrl+L7CK74ugK+4jIo7AeKJ17+g9BoqJz2+/aVbs8SIVXT4KMQ1rjIdcw+GcSRDy1CXjcz6tLQ==
dependencies: dependencies:
"@babel/runtime" "^7.14.5" "@babel/runtime" "^7.14.5"
html-parse-stringify "^3.0.1" html-parse-stringify "^3.0.1"
@@ -11771,17 +11783,18 @@ recharts-scale@^0.4.4:
dependencies: dependencies:
decimal.js-light "^2.4.1" decimal.js-light "^2.4.1"
recharts@^2.1.2: recharts@^2.1.3:
version "2.1.2" version "2.1.3"
resolved "https://registry.yarnpkg.com/recharts/-/recharts-2.1.2.tgz#ceeb01e53fb46da0d946a1e0f82d783ddf5b9d06" resolved "https://registry.yarnpkg.com/recharts/-/recharts-2.1.3.tgz#f7e82b274a569ca3c9665570bd6d4e78a0e8f24e"
integrity sha512-rwFQT6T4imhLzD1kYtg9ql8YOesbFRdSwZi95KWgi5udbBdLGRCR4SgaPO8kf0URHcC23mdRbLLTMYCnXng7zQ== integrity sha512-M0i8x+NKI2Bu/DTGm0LH3FzOhk0YJ4dmBY43YX/KIV82CXfkwkJ07obkje8yJbjdKMjEPZnS5K0XdP6VLx/hPw==
dependencies: dependencies:
"@types/d3-scale" "^3.0.0" "@types/d3-interpolate" "^3.0.0"
"@types/d3-shape" "^2.0.0" "@types/d3-scale" "^4.0.0"
"@types/d3-shape" "^3.0.0"
classnames "^2.2.5" classnames "^2.2.5"
d3-interpolate "^2.0.1" d3-interpolate "^3.0.0"
d3-scale "^3.2.3" d3-scale "^4.0.0"
d3-shape "^2.0.0" d3-shape "^3.0.0"
eventemitter3 "^4.0.1" eventemitter3 "^4.0.1"
lodash "^4.17.19" lodash "^4.17.19"
react-is "16.10.2" react-is "16.10.2"
@@ -12245,10 +12258,10 @@ sass-loader@^10.0.5:
schema-utils "^3.0.0" schema-utils "^3.0.0"
semver "^7.3.2" semver "^7.3.2"
sass@^1.38.2: sass@^1.41.1:
version "1.39.0" version "1.41.1"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.39.0.tgz#6c64695d1c437767c8f1a4e471288e831f81d035" resolved "https://registry.yarnpkg.com/sass/-/sass-1.41.1.tgz#bca5bed2154192779c29f48fca9c644c60c38d98"
integrity sha512-F4o+RhJkNOIG0b6QudYU8c78ZADKZjKDk5cyrf8XTKWfrgbtyVVXImFstJrc+1pkQDCggyidIOytq6gS4gCCZg== integrity sha512-vIjX7izRxw3Wsiez7SX7D+j76v7tenfO18P59nonjr/nzCkZuoHuF7I/Fo0ZRZPKr88v29ivIdE9BqGDgQD/Nw==
dependencies: dependencies:
chokidar ">=3.0.0 <4.0.0" chokidar ">=3.0.0 <4.0.0"
@@ -14205,13 +14218,13 @@ word-wrap@^1.2.3, word-wrap@~1.2.3:
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
workbox-background-sync@6.2.4, workbox-background-sync@^6.2.4: workbox-background-sync@6.3.0, workbox-background-sync@^6.3.0:
version "6.2.4" version "6.3.0"
resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.2.4.tgz#1e5a4241f985d566a4cba8c67d3a1f4933a96444" resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.3.0.tgz#d661296b4662e40a7589f0308affc2c9096da001"
integrity sha512-uoGgm1PZU6THRzXKlMEntrdA4Xkp6SCfxI7re4heN+yGrtAZq6zMKYhZmsdeW+YGnXS3y5xj7WV03b5TDgLh6A== integrity sha512-79Wznt6oO8xMmLiErRS4zENUEldFHj1/5IiuHsY3NgGRN5rJdvGW6hz+RERhWzoB7rd/vXyAQdKYahGdsiYG1A==
dependencies: dependencies:
idb "^6.0.0" idb "^6.0.0"
workbox-core "6.2.4" workbox-core "6.3.0"
workbox-background-sync@^5.1.4: workbox-background-sync@^5.1.4:
version "5.1.4" version "5.1.4"
@@ -14227,12 +14240,12 @@ workbox-broadcast-update@^5.1.4:
dependencies: dependencies:
workbox-core "^5.1.4" workbox-core "^5.1.4"
workbox-broadcast-update@^6.2.4: workbox-broadcast-update@^6.3.0:
version "6.2.4" version "6.3.0"
resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.2.4.tgz#4cae36f553e2ead833236df1b3c9b7cccaa3ae0c" resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.3.0.tgz#9dd87bb0642c892f8f88dcc9b32d48804fdc198f"
integrity sha512-0EpML2lbxNkiZUoap4BJDA0Hfz36MhtUd/rRhFvF6YWoRbTQ8tc6tMaRgM1EBIUmIN2OX9qQlkqe5SGGt4lfXQ== integrity sha512-hp7Du6GJzK99wak5cQFhcSBxvcS+2fkFcxiMmz/RsQ5GQNxVcbiovq74w5aNCzuv3muQvICyC1XELZhZ4GYRTQ==
dependencies: dependencies:
workbox-core "6.2.4" workbox-core "6.3.0"
workbox-build@^5.1.4: workbox-build@^5.1.4:
version "5.1.4" version "5.1.4"
@@ -14283,17 +14296,17 @@ workbox-cacheable-response@^5.1.4:
dependencies: dependencies:
workbox-core "^5.1.4" workbox-core "^5.1.4"
workbox-cacheable-response@^6.2.4: workbox-cacheable-response@^6.3.0:
version "6.2.4" version "6.3.0"
resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.2.4.tgz#ea4cf588bbb16de9056ef968af878a275d739753" resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.3.0.tgz#9900980035ab8f70f2582711299d3c0ce09d9419"
integrity sha512-KZSzAOmgWsrk15Wu+geCUSGLIyyzHaORKjH5JnR6qcVZAsm0JXUu2m2OZGqjQ+/eyQwrGdXXqAMW+4wQvTXccg== integrity sha512-oYCRGF6PFEmJJkktdxYw/tcrU8N5u/2ihxVSHd+9sNqjNMDiXLqsewcEG544f1yx7gq5/u6VcvUA5N62KzN1GQ==
dependencies: dependencies:
workbox-core "6.2.4" workbox-core "6.3.0"
workbox-core@6.2.4, workbox-core@^6.2.4: workbox-core@6.3.0, workbox-core@^6.3.0:
version "6.2.4" version "6.3.0"
resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.2.4.tgz#0ffb4f0ce6d8e36f10bf4aabd96a6f55705ccd80" resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.3.0.tgz#a7d82bae6f623f342e04028a0a2cef39af71af55"
integrity sha512-Nu8X4R4Is3g8uzEJ6qwbW2CGVpzntW/cSf8OfsQGIKQR0nt84FAKzP2cLDaNLp3L/iV9TuhZgCTZzkMiap5/OQ== integrity sha512-SufToEV3SOLwwz3j+P4pgkfpzLRUlR17sX3p/LrMHP/brYKvJQqjTwtSvaCkkAX0RPHX2TFHmN8xhPP1bpmomg==
workbox-core@^5.1.4: workbox-core@^5.1.4:
version "5.1.4" version "5.1.4"
@@ -14307,13 +14320,13 @@ workbox-expiration@^5.1.4:
dependencies: dependencies:
workbox-core "^5.1.4" workbox-core "^5.1.4"
workbox-expiration@^6.2.4: workbox-expiration@^6.3.0:
version "6.2.4" version "6.3.0"
resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.2.4.tgz#80ff337795d5741ee0f84ae68eb25bcb6a54feb8" resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.3.0.tgz#1d36c456f9282c39cda6b59a32b99732da7c3535"
integrity sha512-EdOBLunrE3+Ff50y7AYDbiwtiLDvB+oEIkL1Wd9G5d176YVqFfgPfMRzJQ7fN+Yy2NfmsFME0Bw+dQruYekWsQ== integrity sha512-teYuYfM3HFbwAD/nlZDw/dCMOrCKjsAiMRhz0uOy9IkfBb7vBynO3xf118lY62X6BfqjZdeahiHh10N0/aYICg==
dependencies: dependencies:
idb "^6.0.0" idb "^6.0.0"
workbox-core "6.2.4" workbox-core "6.3.0"
workbox-google-analytics@^5.1.4: workbox-google-analytics@^5.1.4:
version "5.1.4" version "5.1.4"
@@ -14325,15 +14338,15 @@ workbox-google-analytics@^5.1.4:
workbox-routing "^5.1.4" workbox-routing "^5.1.4"
workbox-strategies "^5.1.4" workbox-strategies "^5.1.4"
workbox-google-analytics@^6.2.4: workbox-google-analytics@^6.3.0:
version "6.2.4" version "6.3.0"
resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.2.4.tgz#dbf8812d2cd10b568945569407b3e19686bf0e1d" resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.3.0.tgz#76eb44010d9059915b49fdded927429757907c29"
integrity sha512-+PWmTouoGGcDupaxM193F2NmgrF597Pyt9eHIDxfed+x+JSSeUkETlbAKwB8rnBHkAjs8JQcvStEP/IpueNKpQ== integrity sha512-6u0y21rtimnrCKpvayTkwh9y4Y5Xdn6X87x895WzwcOcWA2j/Nl7nmCpB0wjjhqU9pMj7B2lChqfypP+xUs5IA==
dependencies: dependencies:
workbox-background-sync "6.2.4" workbox-background-sync "6.3.0"
workbox-core "6.2.4" workbox-core "6.3.0"
workbox-routing "6.2.4" workbox-routing "6.3.0"
workbox-strategies "6.2.4" workbox-strategies "6.3.0"
workbox-navigation-preload@^5.1.4: workbox-navigation-preload@^5.1.4:
version "5.1.4" version "5.1.4"
@@ -14342,12 +14355,12 @@ workbox-navigation-preload@^5.1.4:
dependencies: dependencies:
workbox-core "^5.1.4" workbox-core "^5.1.4"
workbox-navigation-preload@^6.2.4: workbox-navigation-preload@^6.3.0:
version "6.2.4" version "6.3.0"
resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.2.4.tgz#0fdfdb51814296a5a2b52701881cdba08fb91cad" resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.3.0.tgz#a2ae618a53e4941ec09146b94bb9947ac0bca2ff"
integrity sha512-y2dOSsaSdEimqhCmBIFR6kBp+GZbtNtWCBaMFwfKxTAul2uyllKcTKBHnZ9IzxULue6o6voV+I2U8Y8tO8n+eA== integrity sha512-D7bomh9SCn1u6n32FqAWfyHe2dkK6mWbwcTsoeBnFSD0p8Gr9Zq1Mpt/DitEfGIQHck90Zd024xcTFLkjczS/Q==
dependencies: dependencies:
workbox-core "6.2.4" workbox-core "6.3.0"
workbox-precaching@^5.1.4: workbox-precaching@^5.1.4:
version "5.1.4" version "5.1.4"
@@ -14356,14 +14369,14 @@ workbox-precaching@^5.1.4:
dependencies: dependencies:
workbox-core "^5.1.4" workbox-core "^5.1.4"
workbox-precaching@^6.2.4: workbox-precaching@^6.3.0:
version "6.2.4" version "6.3.0"
resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.2.4.tgz#6e8a616b0817a92be01108d260f1e8626b0627b7" resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.3.0.tgz#5dc34161ef03ef3cc23af6d78f0b1583f3d180d0"
integrity sha512-7POznbVc8EG/mkbXzeb94x3B1VJruPgXvXFgS0NJ3GRugkO4ULs/DpIIb+ycs7uJIKY9EzLS7VXvElr3rMSozQ== integrity sha512-bND3rUxiuzFmDfeKywdvOqK0LQ5LLbOPk0eX22PlMQNOOduHRxzglMpgHo/MR6h+8cPJ3GpxT8hZ895/7bHMqQ==
dependencies: dependencies:
workbox-core "6.2.4" workbox-core "6.3.0"
workbox-routing "6.2.4" workbox-routing "6.3.0"
workbox-strategies "6.2.4" workbox-strategies "6.3.0"
workbox-range-requests@^5.1.4: workbox-range-requests@^5.1.4:
version "5.1.4" version "5.1.4"
@@ -14372,19 +14385,19 @@ workbox-range-requests@^5.1.4:
dependencies: dependencies:
workbox-core "^5.1.4" workbox-core "^5.1.4"
workbox-range-requests@^6.2.4: workbox-range-requests@^6.3.0:
version "6.2.4" version "6.3.0"
resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.2.4.tgz#f22b21a7e20d04a5532acb9dee5a1ae67613f3f3" resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.3.0.tgz#3202e8af6c8832db7788d482ab1d8db3d5b62fe7"
integrity sha512-q4jjTXD1QOKbrHnzV3nxdZtIpOiVoIP5QyVmjuJrybVnAZurtyKcqirTQcAcT/zlTvgwm07zcTTk9o/zIB6DmA== integrity sha512-AHnGtfSvc/fBt+8NCVT6jVcshv7oFkiuS94YsedQu2sIN1jKHkxLaj7qMBl818FoY6x7r0jw1WLmG/QDmI1/oA==
dependencies: dependencies:
workbox-core "6.2.4" workbox-core "6.3.0"
workbox-routing@6.2.4, workbox-routing@^6.2.4: workbox-routing@6.3.0, workbox-routing@^6.3.0:
version "6.2.4" version "6.3.0"
resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.2.4.tgz#ab169b3345a91119c0be262af385f4373589507f" resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.3.0.tgz#d21d39883baf66594fd8365af5c72aff44fc98b5"
integrity sha512-jHnOmpeH4MOWR4eXv6l608npD2y6IFv7yFJ1bT9/RbB8wq2vXHXJQ0ExTZRTWGbVltSG22wEU+MQ8VebDDwDeg== integrity sha512-asajX5UPkaoU4PB9pEpxKWKkcpA+KJQUEeYU6NlK0rXTCpdWQ6iieMRDoBTZBjTzUdL3j3s1Zo2qCOSvtXSYGg==
dependencies: dependencies:
workbox-core "6.2.4" workbox-core "6.3.0"
workbox-routing@^5.1.4: workbox-routing@^5.1.4:
version "5.1.4" version "5.1.4"
@@ -14393,12 +14406,12 @@ workbox-routing@^5.1.4:
dependencies: dependencies:
workbox-core "^5.1.4" workbox-core "^5.1.4"
workbox-strategies@6.2.4, workbox-strategies@^6.2.4: workbox-strategies@6.3.0, workbox-strategies@^6.3.0:
version "6.2.4" version "6.3.0"
resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.2.4.tgz#ccf28e91f5c00ab6d57b5080e46a0b840faa4e88" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.3.0.tgz#1d004f42b309cbfa48812c6cc7a8da6458b928c6"
integrity sha512-DKgGC3ruceDuu2o+Ae5qmJy0p0q21mFP+RrkdqKrjyf2u8cJvvtvt1eIt4nevKc5BESiKxmhC2h+TZpOSzUDvA== integrity sha512-SYZt40y+Iu5nA+UEPQOrAuAMMNTxtUBPLCIaMMb4lcADpBYrNP1CD+/s2QsrxzS651a8hfi06REKt+uTp1tqfw==
dependencies: dependencies:
workbox-core "6.2.4" workbox-core "6.3.0"
workbox-strategies@^5.1.4: workbox-strategies@^5.1.4:
version "5.1.4" version "5.1.4"
@@ -14416,13 +14429,13 @@ workbox-streams@^5.1.4:
workbox-core "^5.1.4" workbox-core "^5.1.4"
workbox-routing "^5.1.4" workbox-routing "^5.1.4"
workbox-streams@^6.2.4: workbox-streams@^6.3.0:
version "6.2.4" version "6.3.0"
resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.2.4.tgz#df235f877b82166b53a1421e0115ed99d3e697e1" resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.3.0.tgz#8a9db8016c2933edc8b6559207896da31b13a8dc"
integrity sha512-yG6zV7S2NmYT6koyb7/DoPsyUAat9kD+rOmjP2SbBCtJdLu6ZIi1lgN4/rOkxEby/+Xb4OE4RmCSIZdMyjEmhQ== integrity sha512-CiRsuoXJOytA7IQriRu6kVCa0L4OdNi0DdniiSageu/EZuxTswNXpgVzkGE4IDArU/5jlzgRtwqrqIWCJX+OMA==
dependencies: dependencies:
workbox-core "6.2.4" workbox-core "6.3.0"
workbox-routing "6.2.4" workbox-routing "6.3.0"
workbox-sw@^5.1.4: workbox-sw@^5.1.4:
version "5.1.4" version "5.1.4"
@@ -14648,7 +14661,7 @@ yocto-queue@^0.1.0:
resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
zen-observable-ts@^1.1.0: zen-observable-ts@~1.1.0:
version "1.1.0" version "1.1.0"
resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.1.0.tgz#2d1aa9d79b87058e9b75698b92791c1838551f83" resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.1.0.tgz#2d1aa9d79b87058e9b75698b92791c1838551f83"
integrity sha512-1h4zlLSqI2cRLPJUHJFL8bCWHhkpuXkF+dbGkRaWjgDIG26DmzyshUMrdV/rL3UnR+mhaX4fRq8LPouq0MYYIA== integrity sha512-1h4zlLSqI2cRLPJUHJFL8bCWHhkpuXkF+dbGkRaWjgDIG26DmzyshUMrdV/rL3UnR+mhaX4fRq8LPouq0MYYIA==

View File

@@ -0,0 +1 @@
[]

View File

@@ -0,0 +1,15 @@
- type: run_sql
args:
cascade: false
read_only: false
sql: |-
CREATE OR REPLACE FUNCTION public.update_conversation_on_message()
RETURNS trigger
LANGUAGE plpgsql
AS $function$
BEGIN
UPDATE conversations SET updated_at = now() WHERE id = NEW.conversationid;
RETURN NEW;
END;
$function$
;

View File

@@ -0,0 +1 @@
[]

View File

@@ -0,0 +1,15 @@
- type: run_sql
args:
cascade: false
read_only: false
sql: |-
CREATE OR REPLACE FUNCTION public.update_conversation_on_message()
RETURNS trigger
LANGUAGE plpgsql
AS $function$
BEGIN
UPDATE conversations SET updated_at = now() WHERE conversations.id = NEW.conversationid;
RETURN NEW;
END;
$function$
;

File diff suppressed because one or more lines are too long

View File

@@ -3,8 +3,8 @@
"version": "0.0.1", "version": "0.0.1",
"license": "UNLICENSED", "license": "UNLICENSED",
"engines": { "engines": {
"node": "12.18.3", "node": "16.9.1",
"npm": "6.11.3" "npm": "7.17.0"
}, },
"scripts": { "scripts": {
"setup": "yarn && cd client && yarn", "setup": "yarn && cd client && yarn",
@@ -17,10 +17,10 @@
"start": "node server.js" "start": "node server.js"
}, },
"dependencies": { "dependencies": {
"aws-sdk": "^2.979.0", "aws-sdk": "^2.991.0",
"bluebird": "^3.7.2", "bluebird": "^3.7.2",
"body-parser": "^1.18.3", "body-parser": "^1.18.3",
"cloudinary": "^1.26.2", "cloudinary": "^1.27.0",
"compression": "^1.7.4", "compression": "^1.7.4",
"cookie-parser": "^1.4.5", "cookie-parser": "^1.4.5",
"cors": "2.8.5", "cors": "2.8.5",
@@ -40,13 +40,13 @@
"node-mailjet": "^3.3.4", "node-mailjet": "^3.3.4",
"node-quickbooks": "^2.0.39", "node-quickbooks": "^2.0.39",
"nodemailer": "^6.6.3", "nodemailer": "^6.6.3",
"phone": "^3.1.6", "phone": "^3.1.8",
"query-string": "^7.0.1", "query-string": "^7.0.1",
"soap": "^0.42.0", "soap": "^0.42.0",
"socket.io": "^4.2.0", "socket.io": "^4.2.0",
"ssh2-sftp-client": "^7.0.3", "ssh2-sftp-client": "^7.0.4",
"stripe": "^8.171.0", "stripe": "^8.176.0",
"twilio": "^3.67.1", "twilio": "^3.67.2",
"xmlbuilder2": "^3.0.2" "xmlbuilder2": "^3.0.2"
}, },
"devDependencies": { "devDependencies": {

View File

@@ -48,7 +48,11 @@ exports.default = async (req, res) => {
null null
); );
res.redirect(`http://localhost:3000/manage/accounting/qbo?`); res.redirect(
`http://localhost:3000/manage/accounting/qbo?${queryString.stringify(
params
)}`
);
} }
} catch (e) { } catch (e) {
logger.log("qbo-callback-error", "ERROR", params.state, null, { logger.log("qbo-callback-error", "ERROR", params.state, null, {

View File

@@ -7,7 +7,8 @@ require("dotenv").config({
), ),
}); });
const logger = require("../../utils/logger"); const logger = require("../../utils/logger");
const Dinero = require("dinero.js");
const DineroQbFormat = require("../accounting-constants").DineroQbFormat;
const apiGqlClient = require("../../graphql-client/graphql-client").client; const apiGqlClient = require("../../graphql-client/graphql-client").client;
const queries = require("../../graphql-client/queries"); const queries = require("../../graphql-client/queries");
const { const {
@@ -15,32 +16,30 @@ const {
setNewRefreshToken, setNewRefreshToken,
} = require("./qbo-callback"); } = require("./qbo-callback");
const OAuthClient = require("intuit-oauth"); const OAuthClient = require("intuit-oauth");
var QuickBooks = require("node-quickbooks");
const GraphQLClient = require("graphql-request").GraphQLClient; const GraphQLClient = require("graphql-request").GraphQLClient;
const { generateOwnerTier } = require("../qbxml/qbxml-utils"); const { generateOwnerTier } = require("../qbxml/qbxml-utils");
const oauthClient = new OAuthClient({
clientId: process.env.QBO_CLIENT_ID,
clientSecret: process.env.QBO_SECRET,
environment: process.env.NODE_ENV === "production" ? "production" : "sandbox",
redirectUri: process.env.QBO_REDIRECT_URI,
logging: true,
});
exports.default = async (req, res) => { exports.default = async (req, res) => {
const oauthClient = new OAuthClient({
clientId: process.env.QBO_CLIENT_ID,
clientSecret: process.env.QBO_SECRET,
environment:
process.env.NODE_ENV === "production" ? "production" : "sandbox",
redirectUri: process.env.QBO_REDIRECT_URI,
logging: true,
});
try { try {
//Fetch the API Access Tokens & Set them for the session. //Fetch the API Access Tokens & Set them for the session.
const response = await apiGqlClient.request(queries.GET_QBO_AUTH, { const response = await apiGqlClient.request(queries.GET_QBO_AUTH, {
email: req.user.email, email: req.user.email,
}); });
response.associations[0].qbo_auth;
oauthClient.setToken(response.associations[0].qbo_auth); oauthClient.setToken(response.associations[0].qbo_auth);
if (!oauthClient.token.isAccessTokenValid()) { const getToken = oauthClient.getToken();
await refreshOauthToken(oauthClient, req);
if (!oauthClient.token.isAccessTokenValid()) { await refreshOauthToken(oauthClient, req);
res.sendStatus(401);
}
}
const BearerToken = req.headers.authorization; const BearerToken = req.headers.authorization;
const { jobIds } = req.body; const { jobIds } = req.body;
//Query Job Info //Query Job Info
@@ -64,7 +63,7 @@ exports.default = async (req, res) => {
//Replace this with a for-each loop to check every single Job that's included in the list. //Replace this with a for-each loop to check every single Job that's included in the list.
let insCoCustomerTier, ownerCustomerTier; let insCoCustomerTier, ownerCustomerTier, jobTier;
if (isThreeTier || twoTierPref === "source") { if (isThreeTier || twoTierPref === "source") {
//Insert the insurance company tier. //Insert the insurance company tier.
//Query for top level customer, the insurance company name. //Query for top level customer, the insurance company name.
@@ -94,19 +93,21 @@ exports.default = async (req, res) => {
); );
} }
} }
//Query for the Job or Create it. //Query for the Job or Create it.
const jobrecord = await InsertJob( jobTier = await QueryJob(oauthClient, req, job);
oauthClient,
req,
job,
isThreeTier,
ownerCustomerTier
);
//Is there a job associated to the owner? If so, get the ID and move on.
//Otherwise create it. // Need to validate that the job tier is associated to the right individual?
if (!jobTier) {
jobTier = await InsertJob(
oauthClient,
req,
job,
isThreeTier,
ownerCustomerTier
);
}
await InsertInvoice(oauthClient, req, job, bodyshop, jobTier);
res.sendStatus(200); res.sendStatus(200);
} catch (error) { } catch (error) {
console.log(error); console.log(error);
@@ -115,24 +116,32 @@ exports.default = async (req, res) => {
}; };
async function QueryInsuranceCo(oauthClient, req, job) { async function QueryInsuranceCo(oauthClient, req, job) {
const result = await oauthClient.makeApiCall({ try {
url: urlBuilder( const result = await oauthClient.makeApiCall({
req.cookies.qbo_realmId, url: urlBuilder(
"query", req.cookies.qbo_realmId,
`select * From Customer where DisplayName = '${job.ins_co_nm}'` "query",
), `select * From Customer where DisplayName = '${job.ins_co_nm}'`
method: "POST", ),
headers: { method: "POST",
"Content-Type": "application/json", headers: {
}, "Content-Type": "application/json",
}); },
setNewRefreshToken(req.user.email, result); });
return ( setNewRefreshToken(req.user.email, result);
result.json && return (
result.json.QueryResponse && result.json &&
result.json.QueryResponse.Customer && result.json.QueryResponse &&
result.json.QueryResponse.Customer[0] result.json.QueryResponse.Customer &&
); result.json.QueryResponse.Customer[0]
);
} catch (error) {
logger.log("qbo-receivables-error", "DEBUG", req.user.email, job.id, {
error,
method: "QueryInsuranceCo",
});
throw error;
}
} }
async function InsertInsuranceCo(oauthClient, req, job, bodyshop) { async function InsertInsuranceCo(oauthClient, req, job, bodyshop) {
const insCo = bodyshop.md_ins_cos.find((i) => i.name === job.ins_co_nm); const insCo = bodyshop.md_ins_cos.find((i) => i.name === job.ins_co_nm);
@@ -228,6 +237,28 @@ async function InsertOwner(oauthClient, req, job, isThreeTier, parentTierRef) {
throw error; throw error;
} }
} }
async function QueryJob(oauthClient, req, job) {
const result = await oauthClient.makeApiCall({
url: urlBuilder(
req.cookies.qbo_realmId,
"query",
`select * From Customer where DisplayName = '${job.ro_number}'`
),
method: "POST",
headers: {
"Content-Type": "application/json",
},
});
setNewRefreshToken(req.user.email, result);
return (
result.json &&
result.json.QueryResponse &&
result.json.QueryResponse.Customer &&
result.json.QueryResponse.Customer[0]
);
}
async function InsertJob(oauthClient, req, job, isThreeTier, parentTierRef) { async function InsertJob(oauthClient, req, job, isThreeTier, parentTierRef) {
const Customer = { const Customer = {
DisplayName: job.ro_number, DisplayName: job.ro_number,
@@ -266,47 +297,396 @@ async function InsertJob(oauthClient, req, job, isThreeTier, parentTierRef) {
throw error; throw error;
} }
} }
// const customerCreate = {
// FullyQualifiedName: "A Test Customer",
// DisplayName: "A test Customer",
// };
// const ret = await oauthClient.makeApiCall({
// url: urlBuilder(req.cookies.qbo_realmId, "customer"),
// method: "POST",
// headers: {
// "Content-Type": "application/json",
// },
// body: JSON.stringify(customerCreate),
// });
// const invoice = { async function QueryMetaData(oauthClient, req) {
// Line: [ const items = await oauthClient.makeApiCall({
// { url: urlBuilder(req.cookies.qbo_realmId, "query", `select * From Item`),
// DetailType: "SalesItemLineDetail", method: "POST",
// Amount: 100, headers: {
// SalesItemLineDetail: { "Content-Type": "application/json",
// ItemRef: { },
// name: "Services", });
// value: "1", setNewRefreshToken(req.user.email, items);
// }, const taxCodes = await oauthClient.makeApiCall({
// TaxCodeRef: { url: urlBuilder(req.cookies.qbo_realmId, "query", `select * From TaxCode`),
// value: "2", method: "POST",
// }, headers: {
// Qty: 1, "Content-Type": "application/json",
// UnitPrice: 100, },
// }, });
// },
// ],
// CustomerRef: {
// name: "A test Customer",
// },
// };
// const ret2 = await oauthClient.makeApiCall({ const taxCodeMapping = {};
// url: urlBuilder(req.cookies.qbo_realmId, "invoice"),
// method: "POST", const accounts = await oauthClient.makeApiCall({
// headers: { url: urlBuilder(req.cookies.qbo_realmId, "query", `select * From Account`),
// "Content-Type": "application/json", method: "POST",
// }, headers: {
// body: JSON.stringify(invoice), "Content-Type": "application/json",
// }); },
});
taxCodes.json &&
taxCodes.json.QueryResponse &&
taxCodes.json.QueryResponse.TaxCode.forEach((t) => {
taxCodeMapping[t.Name] = t.Id;
});
const itemMapping = {};
items.json &&
items.json.QueryResponse &&
items.json.QueryResponse.Item.forEach((t) => {
itemMapping[t.Name] = t.Id;
});
return {
items: itemMapping,
taxCodes: taxCodeMapping,
};
}
async function InsertInvoice(oauthClient, req, job, bodyshop, parentTierRef) {
const { items, taxCodes } = await QueryMetaData(oauthClient, req);
const InvoiceLineAdd = [];
const responsibilityCenters = bodyshop.md_responsibility_centers;
const invoiceLineHash = {}; //The hash of cost and profit centers based on the center name.
//Determine if there are MAPA and MASH lines already on the estimate.
//If there are, don't do anything extra (mitchell estimate)
//Otherwise, calculate them and add them to the default MAPA and MASH centers.
let hasMapaLine = false;
let hasMashLine = false;
//Create the invoice lines mapping.
job.joblines.map((jobline) => {
//Parts Lines
if (jobline.db_ref === "936008") {
//If either of these DB REFs change, they also need to change in job-totals/job-costing calculations.
hasMapaLine = true;
}
if (jobline.db_ref === "936007") {
hasMashLine = true;
}
if (jobline.profitcenter_part && jobline.act_price) {
let DineroAmount = Dinero({
amount: Math.round(jobline.act_price * 100),
}).multiply(jobline.part_qty || 1);
if (jobline.prt_dsmk_p && jobline.prt_dsmk_p !== 0) {
// console.log("Have a part discount", jobline);
DineroAmount = DineroAmount.add(
DineroAmount.percentage(jobline.prt_dsmk_p || 0)
);
}
const account = responsibilityCenters.profits.find(
(i) => jobline.profitcenter_part.toLowerCase() === i.name.toLowerCase()
);
if (!account) {
logger.log(
"qbxml-receivables-no-account",
"warn",
null,
jobline.id,
null
);
throw new Error(
`A matching account does not exist for the part allocation. Center: ${jobline.profitcenter_part}`
);
}
if (!invoiceLineHash[account.name]) {
invoiceLineHash[account.name] = {
ItemRef: { FullName: account.accountitem },
Desc: account.accountdesc,
Quantity: 1, //jobline.part_qty,
Amount: DineroAmount, //.toFormat(DineroQbFormat),
SalesTaxCodeRef: {
FullName: "E",
},
};
} else {
invoiceLineHash[account.name].Amount =
invoiceLineHash[account.name].Amount.add(DineroAmount);
}
}
// Labor Lines
if (
jobline.profitcenter_labor &&
jobline.mod_lb_hrs &&
jobline.mod_lb_hrs > 0
) {
const DineroAmount = Dinero({
amount: Math.round(
job[`rate_${jobline.mod_lbr_ty.toLowerCase()}`] * 100
),
}).multiply(jobline.mod_lb_hrs);
const account = responsibilityCenters.profits.find(
(i) => jobline.profitcenter_labor.toLowerCase() === i.name.toLowerCase()
);
if (!account) {
throw new Error(
`A matching account does not exist for the labor allocation. Center: ${jobline.profitcenter_labor}`
);
}
if (!invoiceLineHash[account.name]) {
invoiceLineHash[account.name] = {
ItemRef: { FullName: account.accountitem },
Desc: account.accountdesc,
Quantity: 1, // jobline.mod_lb_hrs,
Amount: DineroAmount,
//Amount: DineroAmount.toFormat(DineroQbFormat),
SalesTaxCodeRef: {
FullName: "E",
},
};
} else {
invoiceLineHash[account.name].Amount =
invoiceLineHash[account.name].Amount.add(DineroAmount);
}
}
});
// console.log("Done creating hash", JSON.stringify(invoiceLineHash));
if (!hasMapaLine && job.job_totals.rates.mapa.total.amount > 0) {
// console.log("Adding MAPA Line Manually.");
const mapaAccountName = responsibilityCenters.defaults.profits.MAPA;
const mapaAccount = responsibilityCenters.profits.find(
(c) => c.name === mapaAccountName
);
if (mapaAccount) {
InvoiceLineAdd.push({
ItemRef: { FullName: mapaAccount.accountitem },
Desc: mapaAccount.accountdesc,
Quantity: 1,
Amount: Dinero(job.job_totals.rates.mapa.total).toFormat(
DineroQbFormat
),
SalesTaxCodeRef: {
FullName: "E",
},
});
} else {
//console.log("NO MAPA ACCOUNT FOUND!!");
}
}
if (!hasMashLine && job.job_totals.rates.mash.total.amount > 0) {
// console.log("Adding MASH Line Manually.");
const mashAccountName = responsibilityCenters.defaults.profits.MASH;
const mashAccount = responsibilityCenters.profits.find(
(c) => c.name === mashAccountName
);
if (mashAccount) {
InvoiceLineAdd.push({
ItemRef: { FullName: mashAccount.accountitem },
Desc: mashAccount.accountdesc,
Quantity: 1,
Amount: Dinero(job.job_totals.rates.mash.total).toFormat(
DineroQbFormat
),
SalesTaxCodeRef: {
FullName: "E",
},
});
} else {
// console.log("NO MASH ACCOUNT FOUND!!");
}
}
//Convert the hash to an array.
Object.keys(invoiceLineHash).forEach((key) => {
InvoiceLineAdd.push({
...invoiceLineHash[key],
Amount: invoiceLineHash[key].Amount.toFormat(DineroQbFormat),
});
});
//Add Towing, storage and adjustment lines.
if (job.towing_payable && job.towing_payable !== 0) {
InvoiceLineAdd.push({
ItemRef: {
FullName: responsibilityCenters.profits.find(
(c) => c.name === responsibilityCenters.defaults.profits["TOW"]
).accountitem,
},
Desc: "Towing",
Quantity: 1,
Amount: Dinero({
amount: Math.round((job.towing_payable || 0) * 100),
}).toFormat(DineroQbFormat),
SalesTaxCodeRef: {
FullName: "E",
},
});
}
if (job.storage_payable && job.storage_payable !== 0) {
InvoiceLineAdd.push({
ItemRef: {
FullName: responsibilityCenters.profits.find(
(c) => c.name === responsibilityCenters.defaults.profits["TOW"]
).accountitem,
},
Desc: "Storage",
Quantity: 1,
Amount: Dinero({
amount: Math.round((job.storage_payable || 0) * 100),
}).toFormat(DineroQbFormat),
SalesTaxCodeRef: {
FullName: "E",
},
});
}
if (job.adjustment_bottom_line && job.adjustment_bottom_line !== 0) {
InvoiceLineAdd.push({
ItemRef: {
FullName: responsibilityCenters.profits.find(
(c) => c.name === responsibilityCenters.defaults.profits["PAO"]
).accountitem,
},
Desc: "Adjustment",
Quantity: 1,
Amount: Dinero({
amount: Math.round((job.adjustment_bottom_line || 0) * 100),
}).toFormat(DineroQbFormat),
SalesTaxCodeRef: {
FullName: "E",
},
});
}
//Add tax lines
const job_totals = job.job_totals;
const federal_tax = Dinero(job_totals.totals.federal_tax);
const state_tax = Dinero(job_totals.totals.state_tax);
const local_tax = Dinero(job_totals.totals.local_tax);
if (federal_tax.getAmount() > 0) {
InvoiceLineAdd.push({
ItemRef: {
FullName: bodyshop.md_responsibility_centers.taxes.federal.accountitem,
},
Desc: bodyshop.md_responsibility_centers.taxes.federal.accountdesc,
Amount: federal_tax.toFormat(DineroQbFormat),
});
}
if (state_tax.getAmount() > 0) {
InvoiceLineAdd.push({
ItemRef: {
FullName: bodyshop.md_responsibility_centers.taxes.state.accountitem,
},
Desc: bodyshop.md_responsibility_centers.taxes.state.accountdesc,
Amount: state_tax.toFormat(DineroQbFormat),
});
}
if (local_tax.getAmount() > 0) {
InvoiceLineAdd.push({
ItemRef: {
FullName: bodyshop.md_responsibility_centers.taxes.local.accountitem,
},
Desc: bodyshop.md_responsibility_centers.taxes.local.accountdesc,
Amount: local_tax.toFormat(DineroQbFormat),
});
}
//Region Specific
const { ca_bc_pvrt } = job;
if (ca_bc_pvrt) {
InvoiceLineAdd.push({
ItemRef: {
FullName: bodyshop.md_responsibility_centers.taxes.state.accountitem,
},
Desc: "PVRT",
Amount: Dinero({ amount: (ca_bc_pvrt || 0) * 100 }).toFormat(
DineroQbFormat
),
});
}
//map each invoice line to the correct style for QBO.
const invoiceObj = {
Line: [
{
DetailType: "SalesItemLineDetail",
Amount: 100,
SalesItemLineDetail: {
// ItemRef: {
// // name: "Services",
// value: "16",
// },
TaxCodeRef: {
value: "2",
},
Qty: 1,
UnitPrice: 100,
},
},
],
// Line: InvoiceLineAdd.map((i) => {
// return {
// DetailType: "SalesItemLineDetail",
// Amount: i.Amount,
// SalesItemLineDetail: {
// ItemRef: {
// //name: "Services",
// value: items[i.ItemRef.FullName],
// },
// // TaxCodeRef: {
// // value: "2",
// // },
// Qty: 1,
// },
// };
// }),
TxnTaxDetail: {
TaxLine: [
{
DetailType: "TaxLineDetail",
TaxLineDetail: {
NetAmountTaxable: 100,
TaxPercent: 7,
TaxRateRef: {
value: "16",
},
PercentBased: true,
},
},
],
},
CustomerRef: {
value: parentTierRef.Id,
},
};
try {
const result = await oauthClient.makeApiCall({
url: urlBuilder(req.cookies.qbo_realmId, "invoice"),
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(invoiceObj),
});
setNewRefreshToken(req.user.email, result);
return result && result.Invoice;
} catch (error) {
logger.log("qbo-receivables-error", "DEBUG", req.user.email, job.id, {
error,
method: "InsertOwner",
});
throw error;
}
}

View File

@@ -47,16 +47,40 @@ exports.default = async function (socket, jobid) {
}, },
}; };
//Determine if there are MAPA and MASH lines already on the estimate.
//If there are, don't do anything extra (mitchell estimate)
//Otherwise, calculate them and add them to the default MAPA and MASH centers.
let hasMapaLine = false;
let hasMashLine = false;
const profitCenterHash = job.joblines.reduce((acc, val) => { const profitCenterHash = job.joblines.reduce((acc, val) => {
//Check the Parts Assignment //Check the Parts Assignment
if (val.db_ref === "936008") {
//If either of these DB REFs change, they also need to change in job-totals/job-costing calculations.
hasMapaLine = true;
}
if (val.db_ref === "936007") {
hasMashLine = true;
}
if (val.profitcenter_part) { if (val.profitcenter_part) {
if (!acc[val.profitcenter_part]) acc[val.profitcenter_part] = Dinero(); if (!acc[val.profitcenter_part]) acc[val.profitcenter_part] = Dinero();
acc[val.profitcenter_part] = acc[val.profitcenter_part].add( let DineroAmount = Dinero({
Dinero({ amount: Math.round(val.act_price * 100),
amount: Math.round((val.act_price || 0) * 100), }).multiply(val.part_qty || 1);
}).multiply(val.part_qty || 0)
); if (val.prt_dsmk_p && val.prt_dsmk_p !== 0) {
// console.log("Have a part discount", val);
DineroAmount = DineroAmount.add(
DineroAmount.percentage(Math.abs(val.prt_dsmk_p || 0)).multiply(
val.prt_dsmk_p > 0 ? 1 : -1
)
);
}
acc[val.profitcenter_part] =
acc[val.profitcenter_part].add(DineroAmount);
} }
if (val.profitcenter_labor) { if (val.profitcenter_labor) {
//Check the Labor Assignment. //Check the Labor Assignment.
@@ -79,7 +103,8 @@ exports.default = async function (socket, jobid) {
bill_val.billlines.map((line_val) => { bill_val.billlines.map((line_val) => {
if (!bill_acc[line_val.cost_center]) if (!bill_acc[line_val.cost_center])
bill_acc[line_val.cost_center] = Dinero(); bill_acc[line_val.cost_center] = Dinero();
const lineDinero = Dinero({
let lineDinero = Dinero({
amount: Math.round((line_val.actual_cost || 0) * 100), amount: Math.round((line_val.actual_cost || 0) * 100),
}) })
.multiply(line_val.quantity) .multiply(line_val.quantity)
@@ -87,32 +112,73 @@ exports.default = async function (socket, jobid) {
bill_acc[line_val.cost_center] = bill_acc[line_val.cost_center] =
bill_acc[line_val.cost_center].add(lineDinero); bill_acc[line_val.cost_center].add(lineDinero);
//Add appropriate tax amounts.
const {
applicable_taxes: { local, state, federal },
} = line_val;
if (local) {
taxAllocations.local.cost = taxAllocations.local.cost.add(
lineDinero.percentage(bill_val.local_tax_rate || 0)
);
}
if (state) {
taxAllocations.state.cost = taxAllocations.state.cost.add(
lineDinero.percentage(bill_val.state_tax_rate || 0)
);
}
if (federal) {
taxAllocations.federal.cost = taxAllocations.federal.cost.add(
lineDinero.percentage(bill_val.federal_tax_rate || 0)
);
}
return null; return null;
}); });
return bill_acc; return bill_acc;
}, {}); }, {});
job.timetickets.forEach((ticket) => {
//Get the total amount of the ticket.
let TicketTotal = Dinero({
amount: Math.round(
ticket.rate *
(ticket.employee && ticket.employee.flat_rate
? ticket.productivehrs || 0
: ticket.actualhrs || 0) *
100
),
});
//Add it to the right cost center.
if (!costCenterHash[ticket.cost_center])
costCenterHash[ticket.cost_center] = Dinero();
costCenterHash[ticket.cost_center] =
costCenterHash[ticket.cost_center].add(TicketTotal);
});
if (!hasMapaLine && job.job_totals.rates.mapa.total.amount > 0) {
// console.log("Adding MAPA Line Manually.");
const mapaAccountName =
bodyshop.md_responsibility_centers.defaults.profits.MAPA;
const mapaAccount = bodyshop.md_responsibility_centers.profits.find(
(c) => c.name === mapaAccountName
);
if (mapaAccount) {
if (!profitCenterHash[mapaAccountName])
profitCenterHash[mapaAccountName] = Dinero();
profitCenterHash[mapaAccountName] = profitCenterHash[
mapaAccountName
].add(Dinero(job.job_totals.rates.mapa.total));
} else {
//console.log("NO MAPA ACCOUNT FOUND!!");
}
}
if (!hasMashLine && job.job_totals.rates.mash.total.amount > 0) {
// console.log("Adding MASH Line Manually.");
const mashAccountName =
bodyshop.md_responsibility_centers.defaults.profits.MASH;
const mashAccount = bodyshop.md_responsibility_centers.profits.find(
(c) => c.name === mashAccountName
);
if (mashAccount) {
if (!profitCenterHash[mashAccountName])
profitCenterHash[mashAccountName] = Dinero();
profitCenterHash[mashAccountName] = profitCenterHash[
mashAccountName
].add(Dinero(job.job_totals.rates.mash.total));
} else {
// console.log("NO MASH ACCOUNT FOUND!!");
}
}
const jobAllocations = _.union( const jobAllocations = _.union(
Object.keys(profitCenterHash), Object.keys(profitCenterHash),
Object.keys(costCenterHash) Object.keys(costCenterHash)
@@ -141,7 +207,9 @@ exports.default = async function (socket, jobid) {
taxAllocations[key].sale.getAmount() > 0 || taxAllocations[key].sale.getAmount() > 0 ||
taxAllocations[key].cost.getAmount() > 0 taxAllocations[key].cost.getAmount() > 0
) )
.map((key) => taxAllocations[key]), .map((key) => {
return { ...taxAllocations[key], tax: key };
}),
]; ];
} catch (error) { } catch (error) {
CdkBase.createLogEvent( CdkBase.createLogEvent(

View File

@@ -8,14 +8,11 @@ require("dotenv").config({
const GraphQLClient = require("graphql-request").GraphQLClient; const GraphQLClient = require("graphql-request").GraphQLClient;
const soap = require("soap"); const soap = require("soap");
const queries = require("../graphql-client/queries"); const queries = require("../graphql-client/queries");
const CdkBase = require("../web-sockets/web-socket");
const CdkWsdl = require("./cdk-wsdl").default; const CdkWsdl = require("./cdk-wsdl").default;
const logger = require("../utils/logger"); const logger = require("../utils/logger");
const Dinero = require("dinero.js");
const _ = require("lodash");
const { CDK_CREDENTIALS, CheckCdkResponseForError } = require("./cdk-wsdl"); const { CDK_CREDENTIALS, CheckCdkResponseForError } = require("./cdk-wsdl");
const { performance } = require("perf_hooks");
const apiGqlClient = require("../graphql-client/graphql-client").client;
// exports.default = async function (socket, cdk_dealerid) { // exports.default = async function (socket, cdk_dealerid) {
// try { // try {
@@ -87,6 +84,7 @@ exports.default = async function ReloadCdkMakes(req, res) {
count: newList.length, count: newList.length,
} }
); );
res.sendStatus(200);
} catch (error) { } catch (error) {
logger.log( logger.log(
"cdk-replace-makes-models-error", "cdk-replace-makes-models-error",
@@ -98,6 +96,7 @@ exports.default = async function ReloadCdkMakes(req, res) {
error, error,
} }
); );
res.status(500).json(error);
} }
}; };
@@ -108,7 +107,7 @@ async function GetCdkMakes(req, cdk_dealerid) {
try { try {
const soapClientVehicleInsert = await soap.createClientAsync( const soapClientVehicleInsert = await soap.createClientAsync(
CdkWsdl.VehicleInsert CdkWsdl.VehicleInsertUpdate
); );
const soapResponseVehicleSearch = const soapResponseVehicleSearch =

View File

@@ -11,6 +11,8 @@ const queries = require("../graphql-client/queries");
const CdkBase = require("../web-sockets/web-socket"); const CdkBase = require("../web-sockets/web-socket");
const CdkWsdl = require("./cdk-wsdl").default; const CdkWsdl = require("./cdk-wsdl").default;
const { CDK_CREDENTIALS, CheckCdkResponseForError } = require("./cdk-wsdl"); const { CDK_CREDENTIALS, CheckCdkResponseForError } = require("./cdk-wsdl");
const CalcualteAllocations = require("./cdk-calculate-allocations").default;
const moment = require("moment"); const moment = require("moment");
exports.default = async function (socket, { txEnvelope, jobid }) { exports.default = async function (socket, { txEnvelope, jobid }) {
@@ -44,7 +46,7 @@ exports.default = async function (socket, { txEnvelope, jobid }) {
CdkBase.createLogEvent( CdkBase.createLogEvent(
socket, socket,
"DEBUG", "DEBUG",
`{2.1} Querying the Vehicle using the DMSVid: ${socket.DMSVid}` `{2.1} Querying the Vehicle using the DMSVid: ${socket.DMSVid.vehiclesVehId}`
); );
socket.DMSVeh = await QueryDmsVehicleById(socket, JobData, socket.DMSVid); socket.DMSVeh = await QueryDmsVehicleById(socket, JobData, socket.DMSVid);
@@ -73,7 +75,9 @@ exports.default = async function (socket, { txEnvelope, jobid }) {
socket.DMSCustList = await QueryDmsCustomerByName(socket, JobData); socket.DMSCustList = await QueryDmsCustomerByName(socket, JobData);
socket.emit("cdk-select-customer", [ socket.emit("cdk-select-customer", [
...(socket.DMSVehCustomer ? [socket.DMSVehCustomer] : []), ...(socket.DMSVehCustomer
? [{ ...socket.DMSVehCustomer, vinOwner: true }]
: []),
...socket.DMSCustList, ...socket.DMSCustList,
]); ]);
} catch (error) { } catch (error) {
@@ -82,14 +86,6 @@ exports.default = async function (socket, { txEnvelope, jobid }) {
"ERROR", "ERROR",
`Error encountered in CdkJobExport. ${error}` `Error encountered in CdkJobExport. ${error}`
); );
} finally {
//Ensure we always insert logEvents
//GQL to insert logevents.
CdkBase.createLogEvent(
socket,
"DEBUG",
`Capturing log events to database.`
);
} }
}; };
@@ -146,18 +142,80 @@ async function CdkSelectedCustomer(socket, selectedCustomerId) {
); );
socket.DMSVeh = await UpdateDmsVehicle(socket); socket.DMSVeh = await UpdateDmsVehicle(socket);
} }
CdkBase.createLogEvent( CdkBase.createLogEvent(
socket, socket,
"DEBUG", "DEBUG",
`{5}Updating Service Vehicle History.` `{5} Creating Transaction header with Dms Start WIP`
); );
await InsertServiceVehicleHistory(socket); socket.DMSTransHeader = await InsertDmsStartWip(socket);
CdkBase.createLogEvent(
socket,
"DEBUG",
`{5.1} Creating Transaction with ID ${socket.DMSTransHeader.transID}`
);
socket.DMSBatchTxn = await InsertDmsBatchWip(socket);
CdkBase.createLogEvent(
socket,
"DEBUG",
`{6} Attempting to post Transaction with ID ${socket.DMSTransHeader.transID}`
);
socket.DmsBatchTxnPost = await PostDmsBatchWip(socket);
if (socket.DmsBatchTxnPost.code === "success") {
//something
CdkBase.createLogEvent(
socket,
"DEBUG",
`{6} Successfully posted sransaction to DMS.`
);
await MarkJobExported(socket, socket.JobData.id);
CdkBase.createLogEvent(
socket,
"DEBUG",
`{5} Updating Service Vehicle History. ***SKIPPING FOR NOW TO PRESERVE RO NUMBERS ***`
);
//socket.DMSVehHistory = await InsertServiceVehicleHistory(socket);
socket.emit("export-success", socket.JobData.id);
} else {
//Get the error code
CdkBase.createLogEvent(
socket,
"DEBUG",
`{6.1} Getting errors for Transaction ID ${socket.DMSTransHeader.transID}`
);
socket.DmsError = await QueryDmsErrWip(socket);
//Delete the transaction
CdkBase.createLogEvent(
socket,
"DEBUG",
`{6.2} Deleting Transaction ID ${socket.DMSTransHeader.transID}`
);
socket.DmsBatchTxnPost = await DeleteDmsWip(socket);
//Emit the error in a nice way .
socket.DmsError.errMsg
.split("|")
.map(
(e) =>
e !== null &&
e !== "" &&
CdkBase.createLogEvent(
socket,
"ERROR",
`Error(s) encountered in posting transaction. ${e}`
)
);
}
} catch (error) { } catch (error) {
CdkBase.createLogEvent( CdkBase.createLogEvent(
socket, socket,
"ERROR", "ERROR",
`Error encountered in CdkSelectedCustomer. ${error}` `Error encountered in CdkSelectedCustomer. ${error}`
); );
await InsertFailedExportLog(socket, error);
} finally { } finally {
//Ensure we always insert logEvents //Ensure we always insert logEvents
//GQL to insert logevents. //GQL to insert logevents.
@@ -509,7 +567,7 @@ async function InsertDmsCustomer(socket, newCustomerNumber) {
await soapClientCustomerInsertUpdate.insertAsync( await soapClientCustomerInsertUpdate.insertAsync(
{ {
arg0: CDK_CREDENTIALS, arg0: CDK_CREDENTIALS,
arg1: { dealerId: socket.JobData.bodyshop.cdk_dealerid }, //TODO: Verify why this does not follow the other standards. arg1: { dealerId: socket.JobData.bodyshop.cdk_dealerid },
arg2: { userId: null }, arg2: { userId: null },
arg3: { arg3: {
//Copied the required fields from the other integration. //Copied the required fields from the other integration.
@@ -519,7 +577,12 @@ async function InsertDmsCustomer(socket, newCustomerNumber) {
addressLine: socket.JobData.ownr_addr1, addressLine: socket.JobData.ownr_addr1,
city: socket.JobData.ownr_city, city: socket.JobData.ownr_city,
country: null, country: null,
postalCode: socket.JobData.ownr_zip, postalCode:
socket.JobData.ownr_zip &&
socket.JobData.ownr_zip //TODO Need to remove for US Based customers.
.toUpperCase()
.replace(/\W/g, "")
.replace(/(...)/, "$1 "),
stateOrProvince: socket.JobData.ownr_st, stateOrProvince: socket.JobData.ownr_st,
}, },
contactInfo: { contactInfo: {
@@ -527,6 +590,10 @@ async function InsertDmsCustomer(socket, newCustomerNumber) {
main: true, main: true,
value: socket.JobData.ownr_ph1, value: socket.JobData.ownr_ph1,
}, },
email: {
desc: socket.JobData.ownr_ea ? "Other" : "CustomerDeclined",
value: socket.JobData.ownr_ea ? "Other" : null,
},
}, },
demographics: null, demographics: null,
name1: { name1: {
@@ -539,6 +606,10 @@ async function InsertDmsCustomer(socket, newCustomerNumber) {
suffix: null, suffix: null,
title: null, title: null,
}, },
//TODO - REMOVE THIS AFTER TESTING.
...(process.env.NODE_ENV !== "production"
? { arStatus: { dealerField1: "Testing" } }
: {}),
}, },
}, },
@@ -751,7 +822,7 @@ async function InsertServiceVehicleHistory(socket) {
closeDate: moment(socket.JobData.invoice_date).format("YYYY-MM-DD"), closeDate: moment(socket.JobData.invoice_date).format("YYYY-MM-DD"),
closeTime: moment(socket.JobData.invoice_date).format("HH:MM:SS"), closeTime: moment(socket.JobData.invoice_date).format("HH:MM:SS"),
comments: socket.txEnvelope.story, comments: socket.txEnvelope.story,
cashierID: socket.JobData.bodyshop.cdk_configuration.cashierid, //NEEDS TO BE PROVIDED BY DEALER. cashierID: socket.JobData.bodyshop.cdk_configuration.cashierid,
}, },
}); });
@@ -779,8 +850,7 @@ async function InsertServiceVehicleHistory(socket) {
`soapClientServiceHistoryInsert.serviceHistoryHeaderInsert response.` `soapClientServiceHistoryInsert.serviceHistoryHeaderInsert response.`
); );
CheckCdkResponseForError(socket, soapResponseServiceHistoryInsert); CheckCdkResponseForError(socket, soapResponseServiceHistoryInsert);
const VehicleFromDMS = result && result.return && result.return.vehicle; return result && result.return;
return VehicleFromDMS;
} catch (error) { } catch (error) {
CdkBase.createLogEvent( CdkBase.createLogEvent(
socket, socket,
@@ -797,19 +867,20 @@ async function InsertDmsStartWip(socket) {
); );
const soapResponseAccountingGLInsertUpdate = const soapResponseAccountingGLInsertUpdate =
await soapClientAccountingGLInsertUpdate.startWIPAsync({ await soapClientAccountingGLInsertUpdate.doStartWIPAsync({
arg0: CDK_CREDENTIALS, arg0: CDK_CREDENTIALS,
arg1: { id: socket.JobData.bodyshop.cdk_dealerid }, arg1: { dealerId: socket.JobData.bodyshop.cdk_dealerid },
arg2: { arg2: {
acctgDate: moment().toISOString(), acctgDate: moment().format("YYYY-MM-DD"),
//socket.JobData.invoice_date
desc: socket.txEnvelope.story, desc: socket.txEnvelope.story,
docType: 7 || 10, //Need to check what this usually would be? docType: 10 || 7, //Need to check what this usually would be? Apparently it is almost always 10 or 7.
//1 Cash Receipt , 2 Check, 3 Journal Voucher, 4 Parts invoice, 5 Payable Invoice, 6 Recurring Entry, 7 Repair Order Invoice, 8 Vehicle Purchase Invoice, 9 Vehicle Sale Invoice, 10 Other, 11 Payroll, 12 Finance Charge, 13 FMLR Invoice, 14 Parts Credit Memo, 15 Manufacturer Document, 16 FMLR Credit Memo //1 Cash Receipt , 2 Check, 3 Journal Voucher, 4 Parts invoice, 5 Payable Invoice, 6 Recurring Entry, 7 Repair Order Invoice, 8 Vehicle Purchase Invoice, 9 Vehicle Sale Invoice, 10 Other, 11 Payroll, 12 Finance Charge, 13 FMLR Invoice, 14 Parts Credit Memo, 15 Manufacturer Document, 16 FMLR Credit Memo
m13Flag: 0, m13Flag: 0,
refer: socket.JobData.ro_number, refer: socket.JobData.ro_number,
srcCo: socket.txEnvelope.journal, srcCo: socket.JobData.bodyshop.cdk_configuration.srcco,
srcJrnl: socket.txEnvelope.journal, srcJrnl: socket.txEnvelope.journal,
userID: "?", //Where is this coming from? userID: socket.JobData.bodyshop.cdk_configuration.cashierid, //Where is this coming from?
//userName: "IMEX", //userName: "IMEX",
}, },
}); });
@@ -820,13 +891,13 @@ async function InsertDmsStartWip(socket) {
CdkBase.createXmlEvent( CdkBase.createXmlEvent(
socket, socket,
rawRequest, rawRequest,
`soapClientAccountingGLInsertUpdate.startWIPAsync request.` `soapClientAccountingGLInsertUpdate.doStartWIPAsync request.`
); );
CdkBase.createLogEvent( CdkBase.createLogEvent(
socket, socket,
"TRACE", "TRACE",
`soapClientAccountingGLInsertUpdate.startWIPAsync Result ${JSON.stringify( `soapClientAccountingGLInsertUpdate.doStartWIPAsync Result ${JSON.stringify(
result, result,
null, null,
2 2
@@ -835,17 +906,383 @@ async function InsertDmsStartWip(socket) {
CdkBase.createXmlEvent( CdkBase.createXmlEvent(
socket, socket,
rawResponse, rawResponse,
`soapClientAccountingGLInsertUpdate.startWIPAsync response.` `soapClientAccountingGLInsertUpdate.doStartWIPAsync response.`
); );
CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate); CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
const VehicleFromDMS = result && result.return && result.return.vehicle; const TransactionHeader = result && result.return;
return VehicleFromDMS; return TransactionHeader;
} catch (error) { } catch (error) {
CdkBase.createLogEvent( CdkBase.createLogEvent(
socket, socket,
"ERROR", "ERROR",
`Error in QueryDmsVehicleById - ${error}` `Error in InsertDmsStartWip - ${error}`
); );
throw new Error(error); throw new Error(error);
} }
} }
async function InsertDmsBatchWip(socket) {
try {
const soapClientAccountingGLInsertUpdate = await soap.createClientAsync(
CdkWsdl.AccountingGLInsertUpdate
);
const soapResponseAccountingGLInsertUpdate =
await soapClientAccountingGLInsertUpdate.doTransBatchWIPAsync({
arg0: CDK_CREDENTIALS,
arg1: { dealerId: socket.JobData.bodyshop.cdk_dealerid },
arg2: {
transWIPs: await GenerateTransWips(socket),
},
});
const [result, rawResponse, , rawRequest] =
soapResponseAccountingGLInsertUpdate;
CdkBase.createXmlEvent(
socket,
rawRequest,
`soapClientAccountingGLInsertUpdate.doTransBatchWIPAsync request.`
);
CdkBase.createLogEvent(
socket,
"TRACE",
`soapClientAccountingGLInsertUpdate.doTransBatchWIPAsync Result ${JSON.stringify(
result,
null,
2
)}`
);
CdkBase.createXmlEvent(
socket,
rawResponse,
`soapClientAccountingGLInsertUpdate.doTransBatchWIPAsync response.`
);
CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
const BatchWipResult = result && result.return;
return BatchWipResult;
} catch (error) {
CdkBase.createLogEvent(
socket,
"ERROR",
`Error in InsertDmsBatchWip - ${error}`
);
throw new Error(error);
}
}
async function GenerateTransWips(socket) {
const allocations = await CalcualteAllocations(socket, socket.JobData.id);
const wips = [];
allocations.forEach((alloc) => {
//Add the sale item from each allocation.
if (alloc.sale.getAmount() > 0 && !alloc.tax) {
const item = {
acct: alloc.profitCenter.dms_acctnumber,
cntl: socket.JobData.ro_number,
cntl2: null,
credtMemoNo: null,
postAmt: alloc.sale.multiply(-1).getAmount(),
postDesc: null,
prod: null,
statCnt: 1,
transID: socket.DMSTransHeader.transID,
trgtCoID: socket.JobData.bodyshop.cdk_configuration.srcco,
};
wips.push(item);
}
//Add the cost Item.
if (alloc.cost.getAmount() > 0 && !alloc.tax) {
const item = {
acct: alloc.costCenter.dms_acctnumber,
cntl: socket.JobData.ro_number,
cntl2: null,
credtMemoNo: null,
postAmt: alloc.cost.getAmount(),
postDesc: null,
prod: null,
statCnt: 1,
transID: socket.DMSTransHeader.transID,
trgtCoID: socket.JobData.bodyshop.cdk_configuration.srcco,
};
wips.push(item);
const itemWip = {
acct: alloc.costCenter.dms_wip_acctnumber,
cntl: socket.JobData.ro_number,
cntl2: null,
credtMemoNo: null,
postAmt: alloc.cost.multiply(-1).getAmount(),
postDesc: null,
prod: null,
statCnt: 1,
transID: socket.DMSTransHeader.transID,
trgtCoID: socket.JobData.bodyshop.cdk_configuration.srcco,
};
wips.push(itemWip);
//Add to the WIP account.
}
if (alloc.tax) {
// if (alloc.cost.getAmount() > 0) {
// const item = {
// acct: alloc.costCenter.dms_acctnumber,
// cntl: socket.JobData.ro_number,
// cntl2: null,
// credtMemoNo: null,
// postAmt: alloc.cost.getAmount(),
// postDesc: null,
// prod: null,
// statCnt: 1,
// transID: socket.DMSTransHeader.transID,
// trgtCoID: socket.JobData.bodyshop.cdk_configuration.srcco,
// };
// wips.push(item);
// }
if (alloc.sale.getAmount() > 0) {
const item2 = {
acct: alloc.profitCenter.dms_acctnumber,
cntl: socket.JobData.ro_number,
cntl2: null,
credtMemoNo: null,
postAmt: alloc.sale.multiply(-1).getAmount(),
postDesc: null,
prod: null,
statCnt: 1,
transID: socket.DMSTransHeader.transID,
trgtCoID: socket.JobData.bodyshop.cdk_configuration.srcco,
};
wips.push(item2);
}
}
});
socket.txEnvelope.payers.forEach((payer) => {
const item = {
acct: payer.dms_acctnumber,
cntl: payer.controlnumber,
cntl2: null,
credtMemoNo: null,
postAmt: Math.round(payer.amount * 100),
postDesc: null,
prod: null,
statCnt: 1,
transID: socket.DMSTransHeader.transID,
trgtCoID: socket.JobData.bodyshop.cdk_configuration.srcco,
};
wips.push(item);
});
//should validate that the wips = 0
console.log(
"WIPS TOTAL",
wips.reduce((acc, val) => {
console.log(val);
console.log(acc + val.postAmt);
return acc + val.postAmt;
}, 0)
);
return wips;
}
async function PostDmsBatchWip(socket) {
try {
const soapClientAccountingGLInsertUpdate = await soap.createClientAsync(
CdkWsdl.AccountingGLInsertUpdate
);
const soapResponseAccountingGLInsertUpdate =
await soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync({
arg0: CDK_CREDENTIALS,
arg1: { dealerId: socket.JobData.bodyshop.cdk_dealerid },
arg2: {
postWIP: { opCode: "P", transID: socket.DMSTransHeader.transID },
},
});
const [result, rawResponse, , rawRequest] =
soapResponseAccountingGLInsertUpdate;
CdkBase.createXmlEvent(
socket,
rawRequest,
`soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync request.`
);
CdkBase.createLogEvent(
socket,
"TRACE",
`soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync Result ${JSON.stringify(
result,
null,
2
)}`
);
CdkBase.createXmlEvent(
socket,
rawResponse,
`soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync response.`
);
// CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
const PostResult = result && result.return;
return PostResult;
} catch (error) {
CdkBase.createLogEvent(
socket,
"ERROR",
`Error in PostDmsBatchWip - ${error}`
);
throw new Error(error);
}
}
async function QueryDmsErrWip(socket) {
try {
const soapClientAccountingGLInsertUpdate = await soap.createClientAsync(
CdkWsdl.AccountingGLInsertUpdate
);
const soapResponseAccountingGLInsertUpdate =
await soapClientAccountingGLInsertUpdate.doErrWIPAsync({
arg0: CDK_CREDENTIALS,
arg1: { dealerId: socket.JobData.bodyshop.cdk_dealerid },
arg2: socket.DMSTransHeader.transID,
});
const [result, rawResponse, , rawRequest] =
soapResponseAccountingGLInsertUpdate;
CdkBase.createXmlEvent(
socket,
rawRequest,
`soapClientAccountingGLInsertUpdate.doErrWIPAsync request.`
);
CdkBase.createLogEvent(
socket,
"TRACE",
`soapClientAccountingGLInsertUpdate.doErrWIPAsync Result ${JSON.stringify(
result,
null,
2
)}`
);
CdkBase.createXmlEvent(
socket,
rawResponse,
`soapClientAccountingGLInsertUpdate.doErrWIPAsync response.`
);
CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
const PostResult = result && result.return;
return PostResult;
} catch (error) {
CdkBase.createLogEvent(
socket,
"ERROR",
`Error in QueryDmsErrWip - ${error}`
);
throw new Error(error);
}
}
async function DeleteDmsWip(socket) {
try {
const soapClientAccountingGLInsertUpdate = await soap.createClientAsync(
CdkWsdl.AccountingGLInsertUpdate
);
const soapResponseAccountingGLInsertUpdate =
await soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync({
arg0: CDK_CREDENTIALS,
arg1: { dealerId: socket.JobData.bodyshop.cdk_dealerid },
arg2: {
postWIP: { opCode: "D", transID: socket.DMSTransHeader.transID },
},
});
const [result, rawResponse, , rawRequest] =
soapResponseAccountingGLInsertUpdate;
CdkBase.createXmlEvent(
socket,
rawRequest,
`soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync request.`
);
CdkBase.createLogEvent(
socket,
"TRACE",
`soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync Result ${JSON.stringify(
result,
null,
2
)}`
);
CdkBase.createXmlEvent(
socket,
rawResponse,
`soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync response.`
);
CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
const PostResult = result && result.return;
return PostResult;
} catch (error) {
CdkBase.createLogEvent(
socket,
"ERROR",
`Error in PostDmsBatchWip - ${error}`
);
throw new Error(error);
}
}
async function MarkJobExported(socket, jobid) {
CdkBase.createLogEvent(
socket,
"DEBUG",
`Marking job as exported for id ${jobid}`
);
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
const result = await client
.setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
.request(queries.MARK_JOB_EXPORTED, {
jobId: jobid,
job: {
status:
socket.JobData.bodyshop.md_ro_statuses.default_exported ||
"Exported*",
date_exported: new Date(),
},
log: {
bodyshopid: socket.JobData.bodyshop.id,
jobid: jobid,
successful: true,
useremail: socket.user.email,
},
});
return result;
}
async function InsertFailedExportLog(socket, error) {
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
const result = await client
.setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
.request(queries.INSERT_EXPORT_LOG, {
log: {
bodyshopid: socket.JobData.bodyshop.id,
jobid: socket.JobData.id,
successful: false,
message: [error],
useremail: socket.user.email,
},
});
return result;
}

View File

@@ -78,6 +78,7 @@ exports.checkIndividualResult = checkIndividualResult;
const cdkDomain = "https://uat-3pa.dmotorworks.com"; const cdkDomain = "https://uat-3pa.dmotorworks.com";
exports.default = { exports.default = {
// VehicleSearch: `${cdkDomain}/pip-vehicle/services/VehicleSearch?wsdl`, // VehicleSearch: `${cdkDomain}/pip-vehicle/services/VehicleSearch?wsdl`,
HelpDataBase: `${cdkDomain}/pip-help-database-location/services/HelpDatabaseLocation?wsdl`,
AccountingGLInsertUpdate: `${cdkDomain}/pip-accounting-gl/services/AccountingGLInsertUpdate?wsdl`, AccountingGLInsertUpdate: `${cdkDomain}/pip-accounting-gl/services/AccountingGLInsertUpdate?wsdl`,
VehicleInsertUpdate: `${cdkDomain}/pip-vehicle/services/VehicleInsertUpdate?wsdl`, VehicleInsertUpdate: `${cdkDomain}/pip-vehicle/services/VehicleInsertUpdate?wsdl`,
CustomerInsertUpdate: `${cdkDomain}/pip-customer/services/CustomerInsertUpdate?wsdl`, CustomerInsertUpdate: `${cdkDomain}/pip-customer/services/CustomerInsertUpdate?wsdl`,

View File

@@ -12,14 +12,24 @@ query FIND_BODYSHOP_BY_MESSAGING_SERVICE_SID(
} }
`; `;
exports.INSERT_MESSAGE = ` exports.UNARCHIVE_CONVERSATION = `
mutation INSERT_MESSAGE($msg: [messages_insert_input!]!, $conversationid: uuid) { mutation UNARCHIVE_CONVERSATION($id: uuid!) {
update_conversations(where: {id: {_eq: $conversationid}}, _set: {archived: false}) { update_conversations_by_pk(pk_columns: {id: $id}, _set: {archived: false}) {
affected_rows id
} }
insert_messages(objects: $msg) { }
`;
exports.INSERT_MESSAGE = `
mutation INSERT_MESSAGE($msg: [messages_insert_input!]!, $conversationid: uuid!) {
update_conversations_by_pk(pk_columns: {id: $conversationid}, _set: {archived: false}) {
id
}
insert_messages(objects: $msg) {
returning { returning {
conversation { conversation {
id
archived
bodyshop { bodyshop {
associations(where: {active: {_eq: true}}) { associations(where: {active: {_eq: true}}) {
user { user {
@@ -140,6 +150,7 @@ query QUERY_JOBS_FOR_CDK_EXPORT($id: uuid!) {
ownr_zip ownr_zip
ownr_city ownr_city
ownr_st ownr_st
ownr_ea
ins_co_nm ins_co_nm
job_totals job_totals
rate_la1 rate_la1
@@ -177,9 +188,11 @@ query QUERY_JOBS_FOR_CDK_EXPORT($id: uuid!) {
ca_customer_gst ca_customer_gst
bodyshop { bodyshop {
id id
md_ro_statuses
md_responsibility_centers md_responsibility_centers
accountingconfig accountingconfig
cdk_dealerid cdk_dealerid
cdk_configuration
} }
owner { owner {
accountingid accountingid
@@ -951,106 +964,117 @@ affected_rows
`; `;
exports.GET_CDK_ALLOCATIONS = ` exports.GET_CDK_ALLOCATIONS = `query QUERY_JOB_CLOSE_DETAILS($id: uuid!) {
query QUERY_JOB_CLOSE_DETAILS($id: uuid!) { jobs_by_pk(id: $id) {
jobs_by_pk(id: $id) { bodyshop {
bodyshop{
id
md_responsibility_centers
}
ro_number
invoice_allocation
ins_co_id
id id
ded_amt md_responsibility_centers
ded_status cdk_configuration
depreciation_taxes }
other_amount_payable ro_number
towing_payable invoice_allocation
storage_payable ins_co_id
adjustment_bottom_line id
federal_tax_rate ded_amt
state_tax_rate ded_status
local_tax_rate depreciation_taxes
tax_tow_rt other_amount_payable
tax_str_rt towing_payable
tax_paint_mat_rt storage_payable
tax_sub_rt adjustment_bottom_line
tax_lbr_rt federal_tax_rate
tax_levies_rt state_tax_rate
parts_tax_rates local_tax_rate
job_totals tax_tow_rt
rate_la1 tax_str_rt
rate_la2 tax_paint_mat_rt
rate_la3 tax_sub_rt
rate_la4 tax_lbr_rt
rate_laa tax_levies_rt
rate_lab parts_tax_rates
rate_lad job_totals
rate_lae rate_la1
rate_laf rate_la2
rate_lag rate_la3
rate_lam rate_la4
rate_lar rate_laa
rate_las rate_lab
rate_lau rate_lad
rate_ma2s rate_lae
rate_ma2t rate_laf
rate_ma3s rate_lag
rate_mabl rate_lam
rate_macs rate_lar
rate_mahw rate_las
rate_mapa rate_lau
rate_mash rate_ma2s
rate_matd rate_ma2t
status rate_ma3s
date_exported rate_mabl
date_invoiced rate_macs
voided rate_mahw
scheduled_completion rate_mapa
actual_completion rate_mash
scheduled_delivery rate_matd
actual_delivery status
scheduled_in date_exported
actual_in date_invoiced
bills { voided
id scheduled_completion
federal_tax_rate actual_completion
local_tax_rate scheduled_delivery
state_tax_rate actual_delivery
is_credit_memo scheduled_in
billlines { actual_in
actual_cost timetickets {
cost_center id
id actualhrs
quantity cost_center
applicable_taxes productivehrs
} rate
} employee {
joblines(where: { removed: { _eq: false } }) { flat_rate
id
removed
tax_part
line_desc
prt_dsmk_p
prt_dsmk_m
part_type
oem_partno
db_price
act_price
part_qty
mod_lbr_ty
db_hrs
mod_lb_hrs
lbr_op
lbr_amt
op_code_desc
profitcenter_labor
profitcenter_part
prt_dsmk_p
} }
} }
bills(where: {isinhouse: {_eq: false}}) {
id
federal_tax_rate
local_tax_rate
state_tax_rate
is_credit_memo
billlines {
actual_cost
cost_center
id
quantity
applicable_taxes
}
}
joblines(where: {removed: {_eq: false}}) {
id
removed
tax_part
line_desc
prt_dsmk_p
prt_dsmk_m
part_type
oem_partno
db_price
db_ref
act_price
part_qty
mod_lbr_ty
db_hrs
mod_lb_hrs
lbr_op
lbr_amt
op_code_desc
profitcenter_labor
profitcenter_part
prt_dsmk_p
}
} }
}
`; `;
exports.GET_QBO_AUTH = `query GET_QBO_AUTH($email: String!) { exports.GET_QBO_AUTH = `query GET_QBO_AUTH($email: String!) {
@@ -1066,3 +1090,29 @@ exports.SET_QBO_AUTH = `mutation SET_QBO_AUTH($email: String!, $qbo_auth: jsonb!
} }
} }
`; `;
exports.MARK_JOB_EXPORTED = `
mutation MARK_JOB_EXPORTED($jobId: uuid!, $job: jobs_set_input!, $log: exportlog_insert_input!) {
update_jobs(where: {id: {_eq: $jobId}}, _set: $job) {
returning {
id
date_exported
status
alt_transport
ro_number
production_vars
lbr_adjustments
}
}
insert_exportlog_one(object: $log) {
id
}
}
`;
exports.INSERT_EXPORT_LOG = `
mutation INSERT_EXPORT_LOG($log: exportlog_insert_input!) {
insert_exportlog_one(object: $log) {
id
}
}
`;

View File

@@ -55,7 +55,7 @@ exports.send = (req, res) => {
: [], : [],
}; };
gqlClient gqlClient
.request(queries.INSERT_MESSAGE, { msg: newMessage }) .request(queries.INSERT_MESSAGE, { msg: newMessage, conversationid })
.then((r2) => { .then((r2) => {
//console.log("Responding GQL Message ID", JSON.stringify(r2)); //console.log("Responding GQL Message ID", JSON.stringify(r2));
logger.log("sms-outbound-success", "DEBUG", req.user.email, null, { logger.log("sms-outbound-success", "DEBUG", req.user.email, null, {

View File

@@ -50,7 +50,11 @@ io.on("connection", (socket) => {
socket.on("set-log-level", (level) => { socket.on("set-log-level", (level) => {
socket.log_level = level; socket.log_level = level;
createLogEvent(socket, "DEBUG", `Updated log level to ${level}`); socket.emit("log-event", {
timestamp: new Date(),
level: "INFO",
message: `Updated log level to ${level}`,
});
}); });
socket.on("cdk-export-job", (jobid) => { socket.on("cdk-export-job", (jobid) => {

View File

@@ -581,10 +581,10 @@ atob@2.1.2:
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
aws-sdk@^2.979.0: aws-sdk@^2.991.0:
version "2.983.0" version "2.991.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.983.0.tgz#4c6d98d802b2cf159acbc105979b892b427b5fb3" resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.991.0.tgz#ba858c65cb71e1eeea39523463cf5ef258a73e8f"
integrity sha512-i4QMJt5hEYzhoDzmbo0v+aAuHQPXM6ah15GBKObbxwYxmzK9wjMG+FH3DiWZZHdFsf3C+p1zDg4rIr63jmOeBw== integrity sha512-TybluMJhRBZ0h5HGupHPTfamwtsJlW56HddJpMbsIjvmh4LGupajrkEwLQYW7osFXQ1S/xuE+0QIy6vWgOpT0g==
dependencies: dependencies:
buffer "4.9.2" buffer "4.9.2"
events "1.1.1" events "1.1.1"
@@ -801,10 +801,10 @@ cloudinary-core@^2.10.2:
resolved "https://registry.yarnpkg.com/cloudinary-core/-/cloudinary-core-2.11.4.tgz#1d191935bcdcd412d499a91b928a94b266fee49d" resolved "https://registry.yarnpkg.com/cloudinary-core/-/cloudinary-core-2.11.4.tgz#1d191935bcdcd412d499a91b928a94b266fee49d"
integrity sha512-F1BZczD6f5mB73D0c8gl/iuacVQQO+UhckNZxeeS9ZIVeIHbsfqwWiAZMQmIvEb7Wti/9MLU0xVwaWOak2THHA== integrity sha512-F1BZczD6f5mB73D0c8gl/iuacVQQO+UhckNZxeeS9ZIVeIHbsfqwWiAZMQmIvEb7Wti/9MLU0xVwaWOak2THHA==
cloudinary@^1.26.2: cloudinary@^1.27.0:
version "1.26.3" version "1.27.0"
resolved "https://registry.yarnpkg.com/cloudinary/-/cloudinary-1.26.3.tgz#dd79a1e50395abcf7abec970f5973200c77430cb" resolved "https://registry.yarnpkg.com/cloudinary/-/cloudinary-1.27.0.tgz#1939f4767c32d596c8cd74ea3db66094bf25fa96"
integrity sha512-80ItEXYLbhOGPM42ksOsqG6320jbsU6kqszjVjl5QwDwzbjouktRlw/NdGva1beSu8sp/0lj1mtSGPymGsNiQA== integrity sha512-3Slh8gTmEfaut+ZBIMByOXaD60QP5uw46zn3lyYYEA0mhTQ82FIrwfj98s0eZ6PciQJIJ+Ea4QPBl7Ji21TQEA==
dependencies: dependencies:
cloudinary-core "^2.10.2" cloudinary-core "^2.10.2"
core-js "3.6.5" core-js "3.6.5"
@@ -2994,10 +2994,10 @@ performance-now@^2.1.0:
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
phone@^3.1.6: phone@^3.1.8:
version "3.1.6" version "3.1.8"
resolved "https://registry.yarnpkg.com/phone/-/phone-3.1.6.tgz#eefff0be1ce4ce9f2ee028c67be6b58dc5616ef1" resolved "https://registry.yarnpkg.com/phone/-/phone-3.1.8.tgz#6e348512539c9df81bf07fddb3ed3e2ec7e0c66e"
integrity sha512-46WCdbDG32OKoPsntTg2l0VBaWVWg0A3zvH5dUhApwOupyn7owXRtDBz6vAjsJiZQGTft++WvTxEZeqxlCUv9g== integrity sha512-eyneQKbBwhy6PLYgkioO4CcocMUrFHh4WEfYl1A3PpiQK9tiP0ABKU4yhs7F1URKDbp+oeI8rbJU0+8uMgWfBQ==
pick-util@^1.1.3: pick-util@^1.1.3:
version "1.1.3" version "1.1.3"
@@ -3684,19 +3684,19 @@ sprintf-js@~1.0.2:
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
ssh2-sftp-client@^7.0.3: ssh2-sftp-client@^7.0.4:
version "7.0.3" version "7.0.4"
resolved "https://registry.yarnpkg.com/ssh2-sftp-client/-/ssh2-sftp-client-7.0.3.tgz#6940c5fb7dad4c3a5199ee154775f66050ccfc0b" resolved "https://registry.yarnpkg.com/ssh2-sftp-client/-/ssh2-sftp-client-7.0.4.tgz#1e3182fa6a123f5d65429b2f62a76f1e9780907d"
integrity sha512-h2Zy0GNNOJ7ESyRwBXEdjWEnj7E5z1nVGxtZr7uE77UaIipHbGJ2aQwj7kDBXV/1Mq3YJNu38st8QC48f8ufoA== integrity sha512-4fFSTgoYlzcAtGfEjiXN6N41s1jSUmPlI00f7uD7pQOjt9yK9susminINKTRvPp35dkrATrlNZVhUxNCt3z5+w==
dependencies: dependencies:
concat-stream "^2.0.0" concat-stream "^2.0.0"
promise-retry "^2.0.1" promise-retry "^2.0.1"
ssh2 "^1.2.0" ssh2 "^1.4.0"
ssh2@^1.2.0: ssh2@^1.4.0:
version "1.3.0" version "1.4.0"
resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.3.0.tgz#bcd42ef7796250268b6ff6b0bbff2697029e91b9" resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.4.0.tgz#e32e8343394364c922bad915a5a7fecd67d0f5c5"
integrity sha512-OjBQ5FR+ClYav3fRnvkhycmd5co5qEfofBaZEqVO3I4tKJLZqu+Ku4LN4nJSckjhqQnomqBqlCdvD3iGV+6isA== integrity sha512-XvXwcXKvS452DyQvCa6Ct+chpucwc/UyxgliYz+rWXJ3jDHdtBb9xgmxJdMmnIn5bpgGAEV3KaEsH98ZGPHqwg==
dependencies: dependencies:
asn1 "^0.2.4" asn1 "^0.2.4"
bcrypt-pbkdf "^1.0.2" bcrypt-pbkdf "^1.0.2"
@@ -3801,10 +3801,10 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
stripe@^8.171.0: stripe@^8.176.0:
version "8.174.0" version "8.176.0"
resolved "https://registry.yarnpkg.com/stripe/-/stripe-8.174.0.tgz#91d2e61b0217b1ee9fde2842582e0f1cf1dddc94" resolved "https://registry.yarnpkg.com/stripe/-/stripe-8.176.0.tgz#2f4980ab49acbfe6d67ecaddd54c05e20de9532c"
integrity sha512-UFU5TuYH7XwUmSllUIcIKhhsvvhhjw9D6ZwVdfB74wU4VOOaWBiQqszkw6chaEFpdulUmbcAH5eZltV3HwOi7g== integrity sha512-0KCDo8TWFgeNWU7cPaqdjO2u2OSth0cmWYZmA7xsuxRCk7/lgWbJ/UbeSphx74cCIjFCmGuzDoNuNxqon9lEbg==
dependencies: dependencies:
"@types/node" ">=8.1.0" "@types/node" ">=8.1.0"
qs "^6.6.0" qs "^6.6.0"
@@ -3968,10 +3968,10 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
twilio@^3.67.1: twilio@^3.67.2:
version "3.67.1" version "3.67.2"
resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.67.1.tgz#7734c1c186b1309ca58555dd13ff7a2140f3d056" resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.67.2.tgz#208f297c1a2e36f21b2c9b45537ad4ef2515071b"
integrity sha512-JpdPLqPyYpMyrW39ByUbHimqeHpcWuMv7DD1R215C5wf8dS9EzYfAHqFvrZCEOZkdpB3QeR0UZfvh96jb8FB7Q== integrity sha512-JOpnY+leRJIERFljSzKIIu80Kfj2QVIoldEjTDH1xiCEEwbmsMbZIzZwO/zDEhCpKcvpMTSuK2jl/xPmTxAkvA==
dependencies: dependencies:
axios "^0.21.1" axios "^0.21.1"
dayjs "^1.8.29" dayjs "^1.8.29"