Compare commits
3 Commits
feature/IO
...
feature/cy
| Author | SHA1 | Date | |
|---|---|---|---|
|
345fc48c17 | ||
|
|
b8fe566030 | ||
|
|
bee078fe18 |
4
.gitignore
vendored
4
.gitignore
vendored
@@ -117,6 +117,4 @@ logs/oAuthClient-log.log
|
||||
|
||||
.node-persist/**
|
||||
|
||||
/*.env.*
|
||||
|
||||
client/cypress/e2e/[1,2]-*
|
||||
/*.env.*
|
||||
13
README.MD
13
README.MD
@@ -1,3 +1,14 @@
|
||||
Yarn Dependency Management:
|
||||
To force upgrades for some packages:
|
||||
yarn upgrade-interactive --latest
|
||||
|
||||
To Start Hasura CLI:
|
||||
npx hasura console
|
||||
|
||||
Migrating to Staging:
|
||||
npx hasura migrate apply --endpoint https://db.imex.online/ --admin-secret 'Production-ImEXOnline!@#'
|
||||
npx hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret 'Test-ImEXOnlineBySnaptSoftware!'
|
||||
|
||||
NGROK TEsting:
|
||||
./ngrok.exe http http://localhost:4000 -host-header="localhost:4000"
|
||||
|
||||
@@ -10,4 +21,4 @@ hasura migrate apply --version "1620771761757" --skip-execution --endpoint https
|
||||
hasura migrate status --endpoint https://db.imex.online/ --admin-secret 'Production-ImEXOnline!@#'
|
||||
|
||||
Generate the license file:
|
||||
$ generate-license-file --input package.json --output third-party-licenses.txt --overwrite
|
||||
$ generate-license-file --input package.json --output third-party-licenses.txt --overwrite
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -8,6 +8,6 @@ REACT_APP_CLOUDINARY_API_KEY=957865933348715
|
||||
REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
|
||||
REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
|
||||
REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
|
||||
REACT_APP_AXIOS_BASE_API_URL=http://localhost:4000
|
||||
REACT_APP_AXIOS_BASE_API_URL=https://api.imex.online/
|
||||
REACT_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
|
||||
REACT_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
|
||||
@@ -1,4 +1,3 @@
|
||||
GENERATE_SOURCEMAP=false
|
||||
REACT_APP_GRAPHQL_ENDPOINT=https://db.imex.online/v1/graphql
|
||||
REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.imex.online/v1/graphql
|
||||
REACT_APP_GA_CODE=231103507
|
||||
|
||||
@@ -1,17 +1,9 @@
|
||||
const { defineConfig } = require("cypress");
|
||||
|
||||
module.exports = defineConfig({
|
||||
experimentalStudio: true,
|
||||
|
||||
env: {
|
||||
FIREBASE_USERNAME: "cypress@imex.test",
|
||||
FIREBASE_PASSWORD: "cypress",
|
||||
},
|
||||
|
||||
e2e: {
|
||||
setupNodeEvents(on, config) {
|
||||
// implement node event listeners here
|
||||
},
|
||||
baseUrl: "http://localhost:3000",
|
||||
},
|
||||
});
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"graphql_dev_endpoint": "https://db.dev.bodyshop.app/v1/graphql",
|
||||
"uploaded_by_email": "john@imex.dev"
|
||||
}
|
||||
18
client/cypress/e2e/1-auth/login.cy.js
Normal file
18
client/cypress/e2e/1-auth/login.cy.js
Normal file
@@ -0,0 +1,18 @@
|
||||
/// <reference types="cypress" />
|
||||
|
||||
context("Actions", () => {
|
||||
beforeEach(() => {});
|
||||
|
||||
// https://on.cypress.io/interacting-with-elements
|
||||
|
||||
it("Attempt a failed login.", () => {
|
||||
cy.visit("http://localhost:3000");
|
||||
cy.get(".ant-btn").contains("Sign In").click();
|
||||
cy.get("#email").type("fake@email.com");
|
||||
cy.get("#password").type("fakepassword");
|
||||
cy.get(".ant-btn").contains("Login").click();
|
||||
cy.should("have.text", "user");
|
||||
});
|
||||
|
||||
it("Attempt a failed login.", () => {});
|
||||
});
|
||||
@@ -1,232 +0,0 @@
|
||||
import moment from "moment";
|
||||
import job from "../../fixtures/jobs/job-3.json";
|
||||
|
||||
describe(
|
||||
"Adding job to checklist",
|
||||
{
|
||||
defaultCommandTimeout: 10000,
|
||||
},
|
||||
() => {
|
||||
beforeEach(() => {
|
||||
cy.visit("/manage/jobs");
|
||||
|
||||
cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
|
||||
if (req.body.operationName === "QUERY_BODYSHOP") {
|
||||
req.alias = "bodyshop";
|
||||
}
|
||||
});
|
||||
|
||||
cy.get('[data-cy="active-jobs-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("active-jobs-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@active-jobs-table")
|
||||
.contains(job.clm_no)
|
||||
.first()
|
||||
.parent()
|
||||
.find('[data-cy="active-job-link"]')
|
||||
.click();
|
||||
});
|
||||
|
||||
it("adds checklists to the job and set the job to production", () => {
|
||||
const tomorrow = moment(new Date()).format("YYYY-MM-DD");
|
||||
|
||||
cy.get('[data-cy="job-actions-button"]').click();
|
||||
// Go to intake
|
||||
cy.get('[data-cy="job-intake-button"]').should("not.be.disabled").click();
|
||||
cy.url().should("include", "/intake");
|
||||
// Fill out the form
|
||||
cy.get('[data-cy="checklist-form"]').should("be.visible");
|
||||
|
||||
cy.wait("@bodyshop").then(({ response }) => {
|
||||
const bodyshop = response.body.data.bodyshops[0];
|
||||
|
||||
// intakechecklist
|
||||
const checklists = bodyshop.intakechecklist.form;
|
||||
|
||||
checklists.forEach((item, index) => {
|
||||
if (item.type === "text") {
|
||||
cy.get('[data-cy="config-form-components"] > div')
|
||||
.eq(index)
|
||||
.find("input:text")
|
||||
.type("Random Word");
|
||||
} else if (item.type === "textarea") {
|
||||
cy.get('[data-cy="config-form-components"] > div')
|
||||
.eq(index)
|
||||
.find("textarea")
|
||||
.type("Random Word");
|
||||
} else if (item.type === "checkbox") {
|
||||
cy.get('[data-cy="config-form-components"] > div')
|
||||
.eq(index)
|
||||
.find("input:checkbox")
|
||||
.check();
|
||||
} else if (item.type === "slider") {
|
||||
cy.get('[data-cy="config-form-components"] > div')
|
||||
.eq(index)
|
||||
.find(".ant-slider-dot:eq(1)")
|
||||
.click({ force: true });
|
||||
} else if (item.type === "rate") {
|
||||
cy.get('[data-cy="config-form-components"] > div')
|
||||
.eq(index)
|
||||
.find(".ant-rate > li")
|
||||
.eq(3)
|
||||
.find("div[role='radio']")
|
||||
.click({ force: true });
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// Check if `Add Job to Production` is switched to on
|
||||
cy.get('[data-cy="add-to-production-switch"]').should(
|
||||
"have.attr",
|
||||
"aria-checked",
|
||||
"true"
|
||||
);
|
||||
// Select dates for completion and delivery
|
||||
cy.get("#scheduled_completion").find(".ant-picker-input").first().click();
|
||||
cy.get(`[title="${tomorrow}"]`).should("be.visible").click();
|
||||
// Add time selection
|
||||
cy.get("#scheduled_delivery").find(".ant-picker-input").first().click();
|
||||
cy.get(`[title="${tomorrow}"]`)
|
||||
.should("be.visible")
|
||||
.click({ multiple: true, force: true });
|
||||
// Add time selection
|
||||
// Add note
|
||||
cy.get('[data-cy="checklist-production-note"]').type("automated testing");
|
||||
// Submit the form
|
||||
cy.get('[data-cy="checklist-submit-button"]').click();
|
||||
|
||||
cy.url().should("include", "/manage/jobs");
|
||||
cy.contains("In Production");
|
||||
});
|
||||
|
||||
it("adds checklists to the job and remove the job to production", () => {
|
||||
const tomorrow = moment(new Date()).format("YYYY-MM-DD");
|
||||
|
||||
cy.get('[data-cy="job-actions-button"]').click();
|
||||
// Go to deliver
|
||||
cy.get('[data-cy="job-deliver"]').should("not.be.disabled").click();
|
||||
cy.url().should("include", "/deliver");
|
||||
// Fill out the form
|
||||
cy.get('[data-cy="checklist-form"]').should("be.visible");
|
||||
|
||||
cy.wait("@bodyshop").then(({ response }) => {
|
||||
const bodyshop = response.body.data.bodyshops[0];
|
||||
|
||||
// deliverchecklist
|
||||
const checklists = bodyshop.deliverchecklist.form;
|
||||
|
||||
checklists.forEach((item, index) => {
|
||||
if (item.type === "text") {
|
||||
cy.get('[data-cy="config-form-components"] > div')
|
||||
.eq(index)
|
||||
.find("input:text")
|
||||
.type("Random Word");
|
||||
} else if (item.type === "textarea") {
|
||||
cy.get('[data-cy="config-form-components"] > div')
|
||||
.eq(index)
|
||||
.find("textarea")
|
||||
.type("Random Word");
|
||||
} else if (item.type === "checkbox") {
|
||||
cy.get('[data-cy="config-form-components"] > div')
|
||||
.eq(index)
|
||||
.find("input:checkbox")
|
||||
.check();
|
||||
} else if (item.type === "slider") {
|
||||
cy.get('[data-cy="config-form-components"] > div')
|
||||
.eq(index)
|
||||
.find(".ant-slider-dot:eq(1)")
|
||||
.click({ force: true });
|
||||
} else if (item.type === "rate") {
|
||||
cy.get('[data-cy="config-form-components"] > div')
|
||||
.eq(index)
|
||||
.find(".ant-rate > li")
|
||||
.eq(3)
|
||||
.find("div[role='radio']")
|
||||
.click({ force: true });
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// Select dates for completion and delivery
|
||||
cy.get("#actual_completion").find(".ant-picker-input").first().click();
|
||||
cy.get(`[title="${tomorrow}"]`).should("be.visible").click();
|
||||
cy.get("#actual_delivery").find(".ant-picker-input").first().click();
|
||||
cy.get(`[title="${tomorrow}"]`)
|
||||
.should("be.visible")
|
||||
.click({ multiple: true, force: true });
|
||||
|
||||
cy.get('[data-cy="remove-from-production"]').should(
|
||||
"have.attr",
|
||||
"aria-checked",
|
||||
"true"
|
||||
);
|
||||
|
||||
// Submit the form
|
||||
cy.get('[data-cy="checklist-submit-button"]').click();
|
||||
|
||||
// Job checklist completed.
|
||||
cy.url().should("include", "/manage/jobs");
|
||||
cy.contains("Delivered");
|
||||
});
|
||||
|
||||
it("renders and check the checklists correctly", () => {
|
||||
// Click the actions button
|
||||
cy.get('[data-cy="job-actions-button"]').click();
|
||||
// Go to checklists
|
||||
cy.get('[data-cy="job-checklist"]').should("not.be.disabled").click();
|
||||
|
||||
cy.wait("@bodyshop").then(({ response }) => {
|
||||
const bodyshop = response.body.data.bodyshops[0];
|
||||
|
||||
// intakechecklist
|
||||
const intakechecklist = bodyshop.intakechecklist.form;
|
||||
// deliverchecklist
|
||||
const deliverchecklist = bodyshop.deliverchecklist.form;
|
||||
|
||||
const checklists = [...intakechecklist, ...deliverchecklist];
|
||||
|
||||
cy.get('[data-cy="intake-checklist"]')
|
||||
.should("be.visible")
|
||||
.find("input")
|
||||
.should("be.disabled");
|
||||
|
||||
cy.get('[data-cy="deliver-checklist"]')
|
||||
.should("be.visible")
|
||||
.find("input")
|
||||
.should("be.disabled");
|
||||
|
||||
checklists.forEach((item, index) => {
|
||||
if (item.type === "text") {
|
||||
cy.get('[data-cy="config-form-components"] > div')
|
||||
.eq(index)
|
||||
.find("input:text")
|
||||
.should("have.value", "Random Word");
|
||||
} else if (item.type === "textarea") {
|
||||
cy.get('[data-cy="config-form-components"] > div')
|
||||
.eq(index)
|
||||
.find("textarea")
|
||||
.should("have.value", "Random Word");
|
||||
} else if (item.type === "checkbox") {
|
||||
cy.get('[data-cy="config-form-components"] > div')
|
||||
.eq(index)
|
||||
.find("input:checkbox")
|
||||
.should("be.checked");
|
||||
} else if (item.type === "slider") {
|
||||
cy.get('[data-cy="config-form-components"] > div')
|
||||
.eq(index)
|
||||
.find(".ant-slider-handle")
|
||||
.should("have.attr", "aria-valuenow", item.max / 2);
|
||||
} else if (item.type === "rate") {
|
||||
cy.get('[data-cy="config-form-components"] > div')
|
||||
.eq(index)
|
||||
.find(".ant-rate > .ant-rate-star-full")
|
||||
.should("have.length", 3);
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
);
|
||||
@@ -1,149 +0,0 @@
|
||||
import job from "../../fixtures/jobs/job-3.json";
|
||||
|
||||
const errorMessages = {
|
||||
class: "Class is required. ",
|
||||
referral_source: "Referral Source is required. ",
|
||||
employee_csr: "Customer Service Rep. is required. ",
|
||||
category: "Category is required. ",
|
||||
};
|
||||
|
||||
describe(
|
||||
"Converting a job with ",
|
||||
{
|
||||
defaultCommandTimeout: 10000,
|
||||
},
|
||||
() => {
|
||||
beforeEach(() => {
|
||||
cy.visit("/manage/jobs");
|
||||
|
||||
cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
|
||||
if (req.body.operationName === "QUERY_BODYSHOP") {
|
||||
req.alias = "bodyshop";
|
||||
}
|
||||
});
|
||||
|
||||
cy.get('[data-cy="active-jobs-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("active-jobs-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@active-jobs-table")
|
||||
.contains(job.clm_no)
|
||||
.first()
|
||||
.parent()
|
||||
.find('[data-cy="active-job-link"]')
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="job-convert-button"]').click();
|
||||
});
|
||||
|
||||
it("shows the error messages of required fields", () => {
|
||||
cy.wait("@bodyshop").then(({ response }) => {
|
||||
const bodyshop = response.body.data.bodyshops[0];
|
||||
|
||||
const data = {
|
||||
ins_cos: bodyshop.md_ins_cos,
|
||||
config: {
|
||||
class: bodyshop.enforce_class,
|
||||
referral_source: bodyshop.enforce_referral,
|
||||
employee_csr: bodyshop.enforce_conversion_csr,
|
||||
category: bodyshop.enforce_conversion_category,
|
||||
},
|
||||
};
|
||||
|
||||
cy.get('[data-cy="convert-button"]').click();
|
||||
|
||||
cy.get("#ins_co_nm_help")
|
||||
.find(".ant-form-item-explain-error")
|
||||
.should("have.text", "Insurance Company Name is required. ");
|
||||
|
||||
for (const id in data.config) {
|
||||
if (data.config[id]) {
|
||||
cy.get(`#${id}_help`)
|
||||
.find(".ant-form-item-explain-error")
|
||||
.should("have.text", errorMessages[id]);
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
it("shows error of required fields when insurance company is selected", () => {
|
||||
cy.wait("@bodyshop").then(({ response }) => {
|
||||
const bodyshop = response.body.data.bodyshops[0];
|
||||
|
||||
const data = {
|
||||
ins_cos: bodyshop.md_ins_cos,
|
||||
config: {
|
||||
class: bodyshop.enforce_class,
|
||||
referral_source: bodyshop.enforce_referral,
|
||||
employee_csr: bodyshop.enforce_conversion_csr,
|
||||
category: bodyshop.enforce_conversion_category,
|
||||
},
|
||||
};
|
||||
|
||||
cy.get(".ant-select-selection-search").find("#ins_co_nm").click();
|
||||
cy.get("#ins_co_nm_list")
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.first()
|
||||
.click();
|
||||
|
||||
cy.get("#ca_gst_registrant").should("have.class", "ant-switch").click();
|
||||
cy.get("#driveable").should("have.class", "ant-switch").click();
|
||||
cy.get("#towin").should("have.class", "ant-switch").click();
|
||||
|
||||
cy.get('[data-cy="convert-button"]').click();
|
||||
|
||||
for (const id in data.config) {
|
||||
if (data.config[id]) {
|
||||
cy.get(`#${id}_help`)
|
||||
.find(".ant-form-item-explain-error")
|
||||
.should("have.text", errorMessages[id]);
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
it("checks for the job to convert", () => {
|
||||
cy.wait("@bodyshop").then(({ response }) => {
|
||||
const bodyshop = response.body.data.bodyshops[0];
|
||||
|
||||
const data = {
|
||||
ins_cos: bodyshop.md_ins_cos,
|
||||
config: {
|
||||
class: bodyshop.enforce_class,
|
||||
referral_source: bodyshop.enforce_referral,
|
||||
employee_csr: bodyshop.enforce_conversion_csr,
|
||||
category: bodyshop.enforce_conversion_category,
|
||||
},
|
||||
};
|
||||
|
||||
cy.get(".ant-select-selection-search").find("#ins_co_nm").click();
|
||||
cy.get("#ins_co_nm_list")
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.first()
|
||||
.click();
|
||||
|
||||
for (const id in data.config) {
|
||||
if (data.config[id]) {
|
||||
cy.get(".ant-select-selection-search").find(`#${id}`).click();
|
||||
cy.get(`#${id}_list`)
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.first()
|
||||
.click();
|
||||
}
|
||||
}
|
||||
|
||||
cy.get("#ca_gst_registrant").should("have.class", "ant-switch").click();
|
||||
cy.get("#driveable").should("have.class", "ant-switch").click();
|
||||
cy.get("#towin").should("have.class", "ant-switch").click();
|
||||
|
||||
// cy.get('[data-cy="convert-button"]').click();
|
||||
// cy.get(".ant-notification-notice-message").contains("successfully");
|
||||
});
|
||||
});
|
||||
}
|
||||
);
|
||||
@@ -1,500 +0,0 @@
|
||||
import job from "../../fixtures/jobs/job-3.json";
|
||||
import job2 from "../../fixtures/jobs/job-4.json";
|
||||
import jobSupplement from "../../fixtures/jobs/job-3-supplement.json";
|
||||
import jobMetadata from "../../fixtures/jobs/job-3-jobmetadata.json";
|
||||
import jobSupplementMetadata from "../../fixtures/jobs/job-3-supplment-jobmetadata.json";
|
||||
import Dinero from "dinero.js";
|
||||
|
||||
const createJobEstimate = (job, bodyshopid) => {
|
||||
return {
|
||||
owner: {
|
||||
data: {
|
||||
shopid: bodyshopid,
|
||||
...job.owner.data,
|
||||
},
|
||||
},
|
||||
vehicle: {
|
||||
data: {
|
||||
shopid: bodyshopid,
|
||||
...job.vehicle.data,
|
||||
},
|
||||
},
|
||||
shopid: bodyshopid,
|
||||
...job,
|
||||
};
|
||||
};
|
||||
|
||||
describe(
|
||||
"Importing an available job",
|
||||
{
|
||||
defaultCommandTimeout: 10000,
|
||||
requestTimeout: 10000,
|
||||
},
|
||||
() => {
|
||||
// assuming that user is logged in
|
||||
beforeEach(() => {
|
||||
cy.visit("/manage/available");
|
||||
// intercept bodyshop query for id
|
||||
|
||||
cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
|
||||
if (req.body.operationName === "QUERY_BODYSHOP") {
|
||||
req.alias = "bodyshop";
|
||||
}
|
||||
});
|
||||
|
||||
cy.wait("@bodyshop").then(({ response }) => {
|
||||
const id = response.body.data.bodyshops[0].id;
|
||||
|
||||
cy.wrap(id).as("bodyshopid");
|
||||
});
|
||||
});
|
||||
|
||||
it("Enters a job programatically", () => {
|
||||
cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
|
||||
if (req.body.operationName === "QUERY_AVAILABLE_JOBS") {
|
||||
req.alias = "availableJobs";
|
||||
}
|
||||
});
|
||||
|
||||
cy.wait("@availableJobs").then(({ request }) => {
|
||||
const token = request.headers.authorization;
|
||||
|
||||
cy.get("@bodyshopid").then((bodyshopid) => {
|
||||
const job_est_data = createJobEstimate(job, bodyshopid);
|
||||
|
||||
cy.insertAvailableJob({
|
||||
bodyshopid,
|
||||
job,
|
||||
token,
|
||||
job_est_data,
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
it("creates a new owner record for the job", () => {
|
||||
cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
|
||||
if (req.body.operationName === "QUERY_AVAILABLE_JOBS") {
|
||||
req.alias = "availableJobs";
|
||||
}
|
||||
});
|
||||
|
||||
cy.wait("@availableJobs");
|
||||
|
||||
cy.get('[data-cy="available-jobs-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.contains(job.clm_no)
|
||||
.parent()
|
||||
.as("row");
|
||||
|
||||
cy.get("@row")
|
||||
.find('[data-cy="add-job-as-new-button"]')
|
||||
.should("be.enabled")
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="new_owner_checkbox"]').should("be.checked");
|
||||
cy.get('[data-cy="existing-owners-ok-button"]')
|
||||
.should("be.enabled")
|
||||
.click();
|
||||
|
||||
cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
|
||||
if (req.body.operationName === "INSERT_JOB") {
|
||||
req.alias = "insertJob";
|
||||
}
|
||||
});
|
||||
|
||||
cy.wait("@insertJob").then(({ response }) => {
|
||||
const id = response.body.data.insert_jobs.returning[0].id;
|
||||
|
||||
cy.get(".ant-notification-notice-message")
|
||||
.contains("Job created successfully. Click to view.")
|
||||
.click();
|
||||
|
||||
cy.url().should("include", `/manage/jobs/${id}`);
|
||||
});
|
||||
|
||||
cy.get('[data-cy="tab-totals"]').should("be.visible").click();
|
||||
|
||||
cy.get('[data-cy="job-totals-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("totals-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@totals-table")
|
||||
.eq(0)
|
||||
.find("td:not(.ant-table-selection-column)")
|
||||
.eq(1)
|
||||
.invoke("text")
|
||||
.should(
|
||||
"be.equal",
|
||||
Dinero({
|
||||
amount: jobMetadata.totals.subtotal.amount,
|
||||
}).toFormat()
|
||||
);
|
||||
});
|
||||
|
||||
it("imports a supplement for an existing job", () => {
|
||||
cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
|
||||
if (req.body.operationName === "QUERY_AVAILABLE_JOBS") {
|
||||
req.alias = "availableJobs";
|
||||
}
|
||||
});
|
||||
|
||||
cy.wait("@availableJobs").then(({ request }) => {
|
||||
const token = request.headers.authorization;
|
||||
|
||||
cy.get("@bodyshopid").then((bodyshopid) => {
|
||||
const job_est_data = createJobEstimate(jobSupplement, bodyshopid);
|
||||
|
||||
cy.insertAvailableJob({
|
||||
bodyshopid,
|
||||
job: jobSupplement,
|
||||
token,
|
||||
job_est_data,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
cy.get('[data-cy="refetch-available-jobs-button"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="available-jobs-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.contains(jobSupplement.clm_no)
|
||||
.parent()
|
||||
.as("row");
|
||||
|
||||
cy.get('[data-cy="add-job-as-supplement"]').should("be.enabled").click();
|
||||
|
||||
cy.get('[data-cy="existing-jobs-table"]')
|
||||
.find(".ant-table-tbody tr")
|
||||
.should("not.have.class", "ant-table-placeholder")
|
||||
.first()
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="existing-jobs-ok-button"]')
|
||||
.should("not.be", "disabled")
|
||||
.click();
|
||||
|
||||
cy.get(".ant-notification-notice-message")
|
||||
.contains("Job supplemented successfully.")
|
||||
.click();
|
||||
|
||||
cy.url().should("include", "/manage/jobs");
|
||||
|
||||
cy.get('[data-cy="tab-totals"]').should("be.visible").click();
|
||||
|
||||
cy.get('[data-cy="job-totals-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("totals-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@totals-table")
|
||||
.eq(0)
|
||||
.find("td:not(.ant-table-selection-column)")
|
||||
.eq(1)
|
||||
.invoke("text")
|
||||
.should(
|
||||
"be.equal",
|
||||
Dinero({
|
||||
amount: jobSupplementMetadata.totals.subtotal.amount,
|
||||
}).toFormat()
|
||||
);
|
||||
});
|
||||
|
||||
it("imports a supplement and override estimate header", () => {
|
||||
cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
|
||||
if (req.body.operationName === "QUERY_AVAILABLE_JOBS") {
|
||||
req.alias = "availableJobs";
|
||||
}
|
||||
});
|
||||
|
||||
cy.wait("@availableJobs").then(({ request }) => {
|
||||
const token = request.headers.authorization;
|
||||
|
||||
cy.get("@bodyshopid").then((bodyshopid) => {
|
||||
const job_est_data = createJobEstimate(jobSupplement, bodyshopid);
|
||||
|
||||
cy.insertAvailableJob({
|
||||
bodyshopid,
|
||||
job: jobSupplement,
|
||||
token,
|
||||
job_est_data,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
cy.get('[data-cy="refetch-available-jobs-button"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="available-jobs-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.contains(jobSupplement.clm_no)
|
||||
.parent()
|
||||
.as("row");
|
||||
|
||||
cy.get('[data-cy="add-job-as-supplement"]').should("be.enabled").click();
|
||||
|
||||
cy.get('[data-cy="existing-jobs-table"]')
|
||||
.find(".ant-table-tbody tr")
|
||||
.should("not.have.class", "ant-table-placeholder")
|
||||
.first()
|
||||
.click();
|
||||
|
||||
// click override
|
||||
cy.get('[data-cy="override-header-checkbox"]').check();
|
||||
|
||||
cy.get('[data-cy="existing-jobs-ok-button"]')
|
||||
.should("not.be", "disabled")
|
||||
.click();
|
||||
|
||||
cy.get(".ant-notification-notice-message")
|
||||
.contains("Job supplemented successfully.")
|
||||
.click();
|
||||
|
||||
cy.url().should("include", "/manage/jobs");
|
||||
|
||||
cy.get('[data-cy="tab-totals"]').should("be.visible").click();
|
||||
|
||||
cy.get('[data-cy="job-totals-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("totals-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@totals-table")
|
||||
.eq(0)
|
||||
.find("td:not(.ant-table-selection-column)")
|
||||
.eq(1)
|
||||
.invoke("text")
|
||||
.should(
|
||||
"be.equal",
|
||||
Dinero({
|
||||
amount: jobSupplementMetadata.totals.subtotal.amount,
|
||||
}).toFormat()
|
||||
);
|
||||
});
|
||||
|
||||
it("imports a job with an existing owner", () => {
|
||||
cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
|
||||
if (req.body.operationName === "QUERY_AVAILABLE_JOBS") {
|
||||
req.alias = "availableJobs";
|
||||
}
|
||||
});
|
||||
|
||||
cy.wait("@availableJobs").then(({ request }) => {
|
||||
const token = request.headers.authorization;
|
||||
|
||||
cy.get("@bodyshopid").then((bodyshopid) => {
|
||||
const job_est_data = createJobEstimate(job2, bodyshopid);
|
||||
|
||||
cy.insertAvailableJob({
|
||||
bodyshopid,
|
||||
job: job2,
|
||||
token,
|
||||
job_est_data,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
cy.get('[data-cy="refetch-available-jobs-button"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="add-job-as-new-button"]').should("be.enabled").click();
|
||||
|
||||
cy.get('[data-cy="existing-owner-table"]', { timeout: 20000 })
|
||||
.find(".ant-table-tbody tr")
|
||||
.should("not.have.class", "ant-table-placeholder")
|
||||
.then(($table) => {
|
||||
cy.wrap($table).first().click();
|
||||
|
||||
cy.get('[data-cy="new_owner_checkbox"]').should("not.be", "checked");
|
||||
});
|
||||
|
||||
cy.get('[data-cy="existing-owners-ok-button"]').click();
|
||||
|
||||
cy.get(".ant-notification-notice-message").contains(
|
||||
"Job created successfully. Click to view."
|
||||
);
|
||||
|
||||
cy.visit("/manage/owners");
|
||||
// Navigate to owner records
|
||||
cy.get('[data-cy="owners-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("owners-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
// Get owner name
|
||||
cy.get("@owners-table")
|
||||
.contains(`${job2.owner.data.ownr_fn} ${job2.owner.data.ownr_ln}`)
|
||||
.click();
|
||||
|
||||
// check list if claim number is there
|
||||
cy.get('[data-cy="owner-jobs-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("owner-jobs-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
// Get owner name
|
||||
cy.get("@owner-jobs-table").contains(job2.clm_no).should("exist");
|
||||
});
|
||||
}
|
||||
);
|
||||
|
||||
const errorMessages = {
|
||||
class: "Class is required. ",
|
||||
referral_source: "Referral Source is required. ",
|
||||
employee_csr: "Customer Service Rep. is required. ",
|
||||
category: "Category is required. ",
|
||||
};
|
||||
|
||||
describe(
|
||||
"Converting an active job",
|
||||
{
|
||||
defaultCommandTimeout: 10000,
|
||||
},
|
||||
() => {
|
||||
beforeEach(() => {
|
||||
cy.visit("/manage/jobs");
|
||||
|
||||
cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
|
||||
if (req.body.operationName === "QUERY_BODYSHOP") {
|
||||
req.alias = "bodyshop";
|
||||
}
|
||||
});
|
||||
|
||||
cy.get('[data-cy="active-jobs-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("active-jobs-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@active-jobs-table")
|
||||
.contains(job.clm_no)
|
||||
.first()
|
||||
.parent()
|
||||
.find('[data-cy="active-job-link"]')
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="job-convert-button"]').click();
|
||||
});
|
||||
|
||||
it("shows the error messages of required fields", () => {
|
||||
cy.wait("@bodyshop").then(({ response }) => {
|
||||
const bodyshop = response.body.data.bodyshops[0];
|
||||
|
||||
const data = {
|
||||
ins_cos: bodyshop.md_ins_cos,
|
||||
config: {
|
||||
class: bodyshop.enforce_class,
|
||||
referral_source: bodyshop.enforce_referral,
|
||||
employee_csr: bodyshop.enforce_conversion_csr,
|
||||
category: bodyshop.enforce_conversion_category,
|
||||
},
|
||||
};
|
||||
|
||||
cy.get('[data-cy="convert-button"]').click();
|
||||
|
||||
cy.get("#ins_co_nm_help")
|
||||
.find(".ant-form-item-explain-error")
|
||||
.should("have.text", "Insurance Company Name is required. ");
|
||||
|
||||
for (const id in data.config) {
|
||||
if (data.config[id]) {
|
||||
cy.get(`#${id}_help`)
|
||||
.find(".ant-form-item-explain-error")
|
||||
.should("have.text", errorMessages[id]);
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
it("shows error of required fields when insurance company is selected", () => {
|
||||
cy.wait("@bodyshop").then(({ response }) => {
|
||||
const bodyshop = response.body.data.bodyshops[0];
|
||||
|
||||
const data = {
|
||||
ins_cos: bodyshop.md_ins_cos,
|
||||
config: {
|
||||
class: bodyshop.enforce_class,
|
||||
referral_source: bodyshop.enforce_referral,
|
||||
employee_csr: bodyshop.enforce_conversion_csr,
|
||||
category: bodyshop.enforce_conversion_category,
|
||||
},
|
||||
};
|
||||
|
||||
cy.get(".ant-select-selection-search").find("#ins_co_nm").click();
|
||||
cy.get("#ins_co_nm_list")
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.first()
|
||||
.click();
|
||||
|
||||
cy.get("#ca_gst_registrant").should("have.class", "ant-switch").click();
|
||||
cy.get("#driveable").should("have.class", "ant-switch").click();
|
||||
cy.get("#towin").should("have.class", "ant-switch").click();
|
||||
|
||||
cy.get('[data-cy="convert-button"]').click();
|
||||
|
||||
for (const id in data.config) {
|
||||
if (data.config[id]) {
|
||||
cy.get(`#${id}_help`)
|
||||
.find(".ant-form-item-explain-error")
|
||||
.should("have.text", errorMessages[id]);
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
it("checks for the job to convert", () => {
|
||||
cy.wait("@bodyshop").then(({ response }) => {
|
||||
const bodyshop = response.body.data.bodyshops[0];
|
||||
|
||||
const data = {
|
||||
ins_cos: bodyshop.md_ins_cos,
|
||||
config: {
|
||||
class: bodyshop.enforce_class,
|
||||
referral_source: bodyshop.enforce_referral,
|
||||
employee_csr: bodyshop.enforce_conversion_csr,
|
||||
category: bodyshop.enforce_conversion_category,
|
||||
},
|
||||
};
|
||||
|
||||
cy.get(".ant-select-selection-search").find("#ins_co_nm").click();
|
||||
cy.get("#ins_co_nm_list")
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.first()
|
||||
.click();
|
||||
|
||||
for (const id in data.config) {
|
||||
if (data.config[id]) {
|
||||
cy.get(".ant-select-selection-search").find(`#${id}`).click();
|
||||
cy.get(`#${id}_list`)
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.first()
|
||||
.click();
|
||||
}
|
||||
}
|
||||
|
||||
cy.get("#ca_gst_registrant").should("have.class", "ant-switch").click();
|
||||
cy.get("#driveable").should("have.class", "ant-switch").click();
|
||||
cy.get("#towin").should("have.class", "ant-switch").click();
|
||||
|
||||
cy.get('[data-cy="convert-button"]').click();
|
||||
cy.get(".ant-notification-notice-message").contains(
|
||||
"Job converted successfully."
|
||||
);
|
||||
});
|
||||
});
|
||||
}
|
||||
);
|
||||
@@ -1,32 +0,0 @@
|
||||
describe("logging in to the application", () => {
|
||||
// FIXME error message
|
||||
it("logs in the using wrong credentials", () => {
|
||||
cy.login("fakeusername", "veryverylongpassword_123@#");
|
||||
cy.contains("invalid-email");
|
||||
});
|
||||
|
||||
it("logs in the using wrong password", () => {
|
||||
cy.login("john@imex.dev", "veryverylongpassword_123@#");
|
||||
cy.contains(
|
||||
"The email and password combination you provided is incorrect."
|
||||
);
|
||||
});
|
||||
|
||||
it("logs in a non-existent credentials", () => {
|
||||
cy.login("franz@imex.dev", "veryverylongpassword_123@#");
|
||||
cy.contains("A user with this email does not exist.");
|
||||
});
|
||||
|
||||
// TODO create disabled account
|
||||
// it("logs in with a disabled account", () => {
|
||||
// cy.login("disabled_account@imex.dev", "john123");
|
||||
// cy.contains("User account disabled.");
|
||||
// });
|
||||
|
||||
// TODO log in to the application
|
||||
// it("logs in the using the right credentials", () => {
|
||||
// cy.login("john@imex.dev", "john123");
|
||||
|
||||
// cy.url().should('include', '/manage')
|
||||
// });
|
||||
});
|
||||
@@ -1,17 +0,0 @@
|
||||
describe("resetting user password", () => {
|
||||
it("resets forgotten password with an invalid email", () => {
|
||||
cy.passwordReset("franz");
|
||||
cy.contains("Email is not a valid email");
|
||||
});
|
||||
|
||||
// FIXME error message
|
||||
it("resets forgotten password with a user that does not exist", () => {
|
||||
cy.passwordReset("franz@imex.dev");
|
||||
cy.contains("user-not-found");
|
||||
});
|
||||
|
||||
it("resets forgotten password using the right credentials", () => {
|
||||
cy.passwordReset("john@imex.dev");
|
||||
cy.contains("A password reset link has been sent to you.");
|
||||
});
|
||||
});
|
||||
@@ -1,131 +0,0 @@
|
||||
import job from "../../fixtures/jobs/job-3.json";
|
||||
import job2 from "../../fixtures/jobs/job-4.json";
|
||||
import moment from "moment";
|
||||
|
||||
describe(
|
||||
"Ordering parts for the job",
|
||||
{
|
||||
defaultCommandTimeout: 10000,
|
||||
},
|
||||
() => {
|
||||
beforeEach(() => {
|
||||
cy.visit("/manage/jobs");
|
||||
|
||||
cy.get('[data-cy="active-jobs-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("active-jobs-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
});
|
||||
|
||||
it("order parts for the job", () => {
|
||||
const today = moment(new Date()).format("YYYY-MM-DD");
|
||||
|
||||
cy.get("@active-jobs-table")
|
||||
.contains(job.clm_no)
|
||||
.first()
|
||||
.parent()
|
||||
.find('[data-cy="active-job-link"]')
|
||||
.click();
|
||||
|
||||
// Go to repair data tab
|
||||
cy.get('[data-cy="tab-repairdata"]').should("be.visible").click();
|
||||
// Click on filter parts only
|
||||
cy.get('[data-cy="filter-parts-button"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
// Select multiple rows
|
||||
cy.get('[data-cy="repair-data-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.first()
|
||||
.find(".ant-checkbox-input")
|
||||
.click();
|
||||
// Click Order Parts
|
||||
cy.get('[data-cy="order-parts-button"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
// Modal should be visible
|
||||
cy.get('[data-cy="parts-order-modal"]').should("be.visible");
|
||||
// Fill required fields
|
||||
cy.get(".ant-select-selection-search").find(`#vendorid`).click();
|
||||
cy.get(`#vendorid_list`)
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.first()
|
||||
.click({ force: true });
|
||||
cy.get("#deliver_by").click();
|
||||
cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
|
||||
|
||||
cy.get('[data-cy="part-order-select-none"]').check();
|
||||
cy.get('[data-cy="order-part-submit"]').should("not.be.disabled").click();
|
||||
|
||||
cy.get(".ant-notification-notice-message").contains(
|
||||
"Parts order created successfully."
|
||||
);
|
||||
|
||||
cy.get('[data-cy="repair-data-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.first()
|
||||
.find(".ant-table-cell")
|
||||
.eq(15)
|
||||
.contains("Ordered");
|
||||
});
|
||||
|
||||
it.only("order multiple parts for the job", () => {
|
||||
const today = moment(new Date()).format("YYYY-MM-DD");
|
||||
|
||||
cy.get("@active-jobs-table")
|
||||
.contains(job2.clm_no)
|
||||
.first()
|
||||
.parent()
|
||||
.find('[data-cy="active-job-link"]')
|
||||
.click();
|
||||
|
||||
// Go to repair data tab
|
||||
cy.get('[data-cy="tab-repairdata"]').should("be.visible").click();
|
||||
// Click on filter parts only
|
||||
cy.get('[data-cy="filter-parts-button"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
// Select multiple rows
|
||||
cy.get('[data-cy="repair-data-table"]')
|
||||
.find("input:checkbox")
|
||||
.first()
|
||||
.click();
|
||||
// Click Order Parts
|
||||
cy.get('[data-cy="order-parts-button"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
// Modal should be visible
|
||||
cy.get('[data-cy="parts-order-modal"]').should("be.visible");
|
||||
// Fill required fields
|
||||
cy.get(".ant-select-selection-search").find(`#vendorid`).click();
|
||||
cy.get(`#vendorid_list`)
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.first()
|
||||
.click({ force: true });
|
||||
cy.get("#deliver_by").click();
|
||||
cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
|
||||
|
||||
cy.get('[data-cy="part-order-comments"]').type("testing from cypress");
|
||||
|
||||
cy.get('[data-cy="part-order-select-none"]').check();
|
||||
cy.get('[data-cy="order-part-submit"]').should("not.be.disabled").click();
|
||||
|
||||
cy.get(".ant-notification-notice-message").contains(
|
||||
"Parts order created successfully."
|
||||
);
|
||||
|
||||
cy.get('[data-cy="repair-data-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.first()
|
||||
.find(".ant-table-cell")
|
||||
.eq(15)
|
||||
.contains("Ordered");
|
||||
});
|
||||
}
|
||||
);
|
||||
@@ -1,89 +0,0 @@
|
||||
describe(
|
||||
"Entering payment for the job",
|
||||
{
|
||||
defaultCommandTimeout: 5000,
|
||||
},
|
||||
() => {
|
||||
beforeEach(() => {
|
||||
cy.visit("/manage");
|
||||
|
||||
cy.get("body").then(($body) => {
|
||||
if ($body.text().includes("Login")) {
|
||||
// Log in
|
||||
cy.get('[data-cy="username"]').type("john@imex.dev");
|
||||
cy.get('[data-cy="password"]').type("john123");
|
||||
cy.get('[data-cy="sign-in-button"]').click();
|
||||
}
|
||||
|
||||
cy.get(".ant-table-tbody")
|
||||
.should("be.visible")
|
||||
.find("tr")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get(".ant-table-row")
|
||||
.not(':contains("Open")')
|
||||
.first()
|
||||
.find("a")
|
||||
.first()
|
||||
.click();
|
||||
|
||||
cy.url().should("include", "/manage/jobs");
|
||||
|
||||
// Go to totals data tab
|
||||
cy.get('[data-cy="tab-totals"]').should("be.visible").click();
|
||||
});
|
||||
});
|
||||
|
||||
it("enters a payment manually", () => {
|
||||
cy.get('[data-cy="job-payment-button"]').should("be.visible").click();
|
||||
|
||||
// fill out form
|
||||
cy.get('[data-cy="payment-amount"]').type(100);
|
||||
cy.get('[data-cy="payment-transactionid"]').type("QBD-P-03");
|
||||
cy.get('[data-cy="payment-memo"]').type("e2e testing");
|
||||
cy.get('[data-cy="payment-date"]').click();
|
||||
cy.get('[title="2023-07-03"]').should("be.visible").click();
|
||||
|
||||
cy.antdSelect("payer");
|
||||
cy.antdSelect("type");
|
||||
|
||||
cy.get('[data-cy="payment-form-save"]').click();
|
||||
});
|
||||
|
||||
// TODO Add payment using intellipay
|
||||
|
||||
it("marks payment as exported", () => {
|
||||
cy.get('[data-cy="payments-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("payments-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@payments-table")
|
||||
.first()
|
||||
.find('[data-cy="edit-payment-button"]')
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="payment-markexported"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
});
|
||||
|
||||
it("marks payment for re-export", () => {
|
||||
cy.get('[data-cy="payments-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("payments-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@payments-table")
|
||||
.last()
|
||||
.find('[data-cy="edit-payment-button"]')
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="payment-markforreexport"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
});
|
||||
}
|
||||
);
|
||||
@@ -1,431 +0,0 @@
|
||||
import job from "../../fixtures/jobs/job-3.json";
|
||||
import moment from "moment";
|
||||
|
||||
const uuid = () => Cypress._.random(0, 1e6);
|
||||
|
||||
describe(
|
||||
"Billing job parts orders",
|
||||
{
|
||||
defaultCommandTimeout: 10000,
|
||||
},
|
||||
() => {
|
||||
const today = moment(new Date()).format("YYYY-MM-DD");
|
||||
|
||||
beforeEach(() => {
|
||||
cy.viewport(1280, 720);
|
||||
cy.visit("/manage/jobs");
|
||||
|
||||
cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
|
||||
if (req.body.operationName === "SEARCH_VENDOR_AUTOCOMPLETE") {
|
||||
req.alias = "vendors";
|
||||
}
|
||||
});
|
||||
|
||||
cy.get('[data-cy="active-jobs-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("active-jobs-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@active-jobs-table")
|
||||
.contains(job.clm_no)
|
||||
.first()
|
||||
.parent()
|
||||
.find('[data-cy="active-job-link"]')
|
||||
.click();
|
||||
});
|
||||
|
||||
it("receives a part bill", () => {
|
||||
// Order a part
|
||||
// Go to repair data tab
|
||||
cy.get('[data-cy="tab-repairdata"]').should("be.visible").click();
|
||||
// Click on filter parts only
|
||||
cy.get('[data-cy="filter-parts-button"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
// Select multiple rows
|
||||
cy.get('[data-cy="repair-data-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.first()
|
||||
.find(".ant-checkbox-input")
|
||||
.click();
|
||||
// Click Order Parts
|
||||
cy.get('[data-cy="order-parts-button"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
// Modal should be visible
|
||||
cy.get('[data-cy="parts-order-modal"]').should("be.visible");
|
||||
// Fill required fields
|
||||
cy.get(".ant-select-selection-search").find(`#vendorid`).click();
|
||||
cy.get(`#vendorid_list`)
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.first()
|
||||
.click({ force: true });
|
||||
cy.get("#deliver_by").click();
|
||||
cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
|
||||
|
||||
cy.get('[data-cy="part-order-comments"]').type("testing from cypress");
|
||||
|
||||
cy.get('[data-cy="part-order-select-none"]').check();
|
||||
cy.get('[data-cy="order-part-submit"]').should("not.be.disabled").click();
|
||||
|
||||
cy.get(".ant-notification-notice-message").contains(
|
||||
"Parts order created successfully."
|
||||
);
|
||||
|
||||
cy.get('[data-cy="repair-data-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.first()
|
||||
.find(".ant-table-cell")
|
||||
.eq(15)
|
||||
.contains("Ordered");
|
||||
|
||||
cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
|
||||
// Find the first row in the parts order
|
||||
cy.get('[data-cy="part-orders-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("orders-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@orders-table")
|
||||
.first()
|
||||
.should("be.visible")
|
||||
.find('[data-cy="receive-bill-button"]')
|
||||
.click();
|
||||
|
||||
// fill out form
|
||||
cy.get('[data-cy="bill-form-invoice"]').type(uuid());
|
||||
|
||||
cy.get("#bill-form-date").click();
|
||||
cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
|
||||
|
||||
cy.get('[data-cy="bill-form-parts-bin"]').find("input").click();
|
||||
cy.get("#location_list")
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.first()
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="bill-line-table"]').each(($row) => {
|
||||
// get retail amount
|
||||
cy.wrap($row)
|
||||
.find('[data-cy="bill-line-actual-price"]')
|
||||
.click({ force: true, multiple: true });
|
||||
cy.wrap($row)
|
||||
.find('[data-cy="bill-line-actual-cost"]')
|
||||
.click({ multiple: true });
|
||||
});
|
||||
|
||||
cy.get('[data-cy="bill-line-actual-cost"]').then((cells) => {
|
||||
const totals = cells.toArray().map((el) => Number(el.value));
|
||||
const sum = Cypress._.sum(totals);
|
||||
|
||||
cy.get('[data-cy="bill-form-bill-total"]').type(sum);
|
||||
});
|
||||
// Click save
|
||||
cy.get('[data-cy="bill-form-save-button"]').click();
|
||||
|
||||
cy.get(".ant-notification-notice-message").contains(
|
||||
"Invoice added successfully."
|
||||
);
|
||||
|
||||
cy.get('[data-cy="tab-repairdata"]').should("be.visible").click();
|
||||
|
||||
cy.get('[data-cy="filter-parts-button"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="repair-data-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.first()
|
||||
.find(".ant-table-cell")
|
||||
.eq(15)
|
||||
.contains("Received");
|
||||
});
|
||||
|
||||
it("backorders part from order", () => {
|
||||
cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
|
||||
|
||||
cy.get('[data-cy="part-orders-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("orders-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@orders-table")
|
||||
.first()
|
||||
.should("be.visible")
|
||||
.find('[data-cy="view-part-order-button"]')
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="mark-backorder-button"]').click();
|
||||
cy.get(".backorder-date").click();
|
||||
cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
|
||||
|
||||
cy.get('[data-cy="mark-for-backorder-button"]').click();
|
||||
|
||||
cy.get(".ant-drawer-close").click();
|
||||
|
||||
cy.get('[data-cy="tab-repairdata"]').should("be.visible").click();
|
||||
|
||||
cy.get('[data-cy="filter-parts-button"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="repair-data-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.first()
|
||||
.find(".ant-table-cell")
|
||||
.eq(15)
|
||||
.contains("Backordered");
|
||||
});
|
||||
|
||||
it("order parts inhouse", () => {
|
||||
cy.get('[data-cy="tab-repairdata"]').should("be.visible").click();
|
||||
// Click on filter parts only
|
||||
cy.get('[data-cy="filter-parts-button"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
// Select multiple rows
|
||||
cy.get('[data-cy="repair-data-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.first()
|
||||
.find(".ant-checkbox-input")
|
||||
.click();
|
||||
// Click Order Parts
|
||||
cy.get('[data-cy="order-parts-inhouse-button"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
|
||||
cy.antdSelect("bill-vendor");
|
||||
|
||||
cy.antdSelect("bill-cost-center");
|
||||
|
||||
cy.get('[data-cy="bill-form-save-button"]').click({ force: true });
|
||||
|
||||
cy.get(".ant-notification-notice-message").contains(
|
||||
"Invoice added successfully."
|
||||
);
|
||||
|
||||
cy.get('[data-cy="repair-data-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.first()
|
||||
.find(".ant-table-cell")
|
||||
.eq(15)
|
||||
.contains("Received");
|
||||
});
|
||||
|
||||
it("check inhouse bill to have extra actions", () => {
|
||||
cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
|
||||
|
||||
cy.get('[data-cy="bills-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("bills-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@bills-table")
|
||||
.contains("$0.00")
|
||||
.parent()
|
||||
.parent()
|
||||
.first()
|
||||
.find('[data-cy="print-wrapper"]')
|
||||
.should("exist");
|
||||
});
|
||||
|
||||
it("posts bill directly", () => {
|
||||
cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
|
||||
|
||||
cy.get('[data-cy="bills-post-button"]').should("be.visible").click();
|
||||
|
||||
// Add New Line
|
||||
cy.get('[data-cy="bill-line-add-button"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
// Select Vendor
|
||||
cy.antdSelect("bill-vendor");
|
||||
// Select Line
|
||||
cy.antdSelect("bill-line");
|
||||
|
||||
cy.get('[data-cy="bill-line-line-desc"]').type("Line Description");
|
||||
// Fill the Form
|
||||
cy.get('[data-cy="bill-form-invoice"]').type(uuid());
|
||||
|
||||
cy.get("#bill-form-date").click();
|
||||
cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
|
||||
|
||||
cy.get('[data-cy="bill-form-parts-bin"]').find("input").click();
|
||||
cy.get("#location_list")
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.first()
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="bill-line-table"]').each(($row) => {
|
||||
// get retail amount
|
||||
cy.wrap($row)
|
||||
.find('[data-cy="bill-line-actual-price"]')
|
||||
.click({ force: true, multiple: true });
|
||||
cy.wrap($row)
|
||||
.find('[data-cy="bill-line-actual-cost"]')
|
||||
.click({ multiple: true });
|
||||
});
|
||||
|
||||
cy.get('[data-cy="bill-line-actual-cost"]').then((cells) => {
|
||||
const totals = cells.toArray().map((el) => Number(el.value));
|
||||
const sum = Cypress._.sum(totals);
|
||||
|
||||
cy.get('[data-cy="bill-form-bill-total"]').type(sum);
|
||||
});
|
||||
|
||||
cy.antdSelect("bill-cost-center");
|
||||
|
||||
// Click save
|
||||
cy.get('[data-cy="bill-form-save-button"]').click();
|
||||
|
||||
cy.get(".ant-notification-notice-message").contains(
|
||||
"Invoice added successfully."
|
||||
);
|
||||
});
|
||||
|
||||
it("posts a bill with save and new", () => {
|
||||
cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
|
||||
|
||||
cy.get('[data-cy="bills-post-button"]').should("be.visible").click();
|
||||
|
||||
// Add New Line
|
||||
cy.get('[data-cy="bill-line-add-button"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
// Select Vendor
|
||||
cy.antdSelect("bill-vendor");
|
||||
// Select Line
|
||||
cy.antdSelect("bill-line", "-- Not On Estimate --");
|
||||
// Fill the Form
|
||||
cy.get('[data-cy="bill-form-invoice"]').type(uuid());
|
||||
|
||||
cy.get("#bill-form-date").click();
|
||||
cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
|
||||
|
||||
cy.get('[data-cy="bill-form-parts-bin"]').find("input").click();
|
||||
cy.get("#location_list")
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.first()
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="bill-line-table"]').each(($row) => {
|
||||
// get retail amount
|
||||
cy.wrap($row)
|
||||
.find('[data-cy="bill-line-actual-price"]')
|
||||
.click({ force: true, multiple: true });
|
||||
cy.wrap($row)
|
||||
.find('[data-cy="bill-line-actual-cost"]')
|
||||
.click({ multiple: true });
|
||||
});
|
||||
|
||||
cy.get('[data-cy="bill-line-actual-cost"]').then((cells) => {
|
||||
const totals = cells.toArray().map((el) => Number(el.value));
|
||||
const sum = Cypress._.sum(totals);
|
||||
|
||||
cy.get('[data-cy="bill-form-bill-total"]').type(sum);
|
||||
});
|
||||
|
||||
cy.antdSelect("bill-cost-center");
|
||||
|
||||
// Click save
|
||||
cy.get('[data-cy="bill-form-savenew-button"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
|
||||
cy.get(".ant-notification-notice-message").contains(
|
||||
"Invoice added successfully."
|
||||
);
|
||||
});
|
||||
|
||||
it("uploads a document to a bill", () => {
|
||||
cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
|
||||
|
||||
cy.get('[data-cy="bills-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("bills-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@bills-table")
|
||||
.first()
|
||||
.should("be.visible")
|
||||
.find('[data-cy="edit-bill-button"]')
|
||||
.click();
|
||||
|
||||
cy.location("search").should("include", "billid");
|
||||
cy.get('[data-cy="bill-edit-form"]')
|
||||
.find(".ant-upload #bill-document-upload")
|
||||
.selectFile("job.json", { force: true });
|
||||
});
|
||||
|
||||
it("marks bill as exported", () => {
|
||||
cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
|
||||
|
||||
cy.get('[data-cy="bills-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("bills-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@bills-table")
|
||||
.find('[data-cy="bill-exported-checkbox"]')
|
||||
.not(":checked")
|
||||
.first()
|
||||
.as("export-status")
|
||||
.parent()
|
||||
.parent()
|
||||
.parent()
|
||||
.parent()
|
||||
.find('[data-cy="edit-bill-button"]')
|
||||
.click();
|
||||
|
||||
cy.location("search").should("include", "billid");
|
||||
cy.get('[data-cy="bill-mark-export-button"]')
|
||||
.as("mark-for-export")
|
||||
.click();
|
||||
cy.get("@mark-for-export").should("be.disabled");
|
||||
});
|
||||
|
||||
it("marks bill for re-export", () => {
|
||||
cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
|
||||
|
||||
cy.get('[data-cy="bills-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("bills-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@bills-table")
|
||||
.find('[data-cy="bill-exported-checkbox"]')
|
||||
.filter(":checked")
|
||||
.first()
|
||||
.as("export-status")
|
||||
.parent()
|
||||
.parent()
|
||||
.parent()
|
||||
.parent()
|
||||
.find('[data-cy="edit-bill-button"]')
|
||||
.click();
|
||||
|
||||
cy.location("search").should("include", "billid");
|
||||
cy.get('[data-cy="bill-mark-reexport-button"]')
|
||||
.as("mark-for-reexport")
|
||||
.click();
|
||||
cy.get("@mark-for-reexport").should("be.disabled");
|
||||
});
|
||||
}
|
||||
);
|
||||
@@ -1,487 +0,0 @@
|
||||
import job2 from "../../fixtures/jobs/job-4.json";
|
||||
import moment from "moment";
|
||||
import Dinero from "dinero.js";
|
||||
|
||||
const uuid = () => Cypress._.random(0, 1e6);
|
||||
|
||||
describe(
|
||||
"Validating and calculating bills",
|
||||
{
|
||||
defaultCommandTimeout: 10000,
|
||||
},
|
||||
() => {
|
||||
const today = moment(new Date()).format("YYYY-MM-DD");
|
||||
const jobLines = job2.joblines.data.filter(
|
||||
(line) => line.part_type === "PAS" || line.part_type === "PAE"
|
||||
);
|
||||
const linesTotal = jobLines.reduce(
|
||||
(prev, line) => prev + line.act_price,
|
||||
0
|
||||
);
|
||||
|
||||
beforeEach(() => {
|
||||
cy.viewport(1280, 720);
|
||||
cy.visit("/manage/jobs");
|
||||
|
||||
cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
|
||||
if (req.body.operationName === "SEARCH_VENDOR_AUTOCOMPLETE") {
|
||||
req.alias = "vendors";
|
||||
}
|
||||
});
|
||||
|
||||
cy.get('[data-cy="active-jobs-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("active-jobs-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@active-jobs-table")
|
||||
.contains(job2.clm_no)
|
||||
.first()
|
||||
.parent()
|
||||
.find('[data-cy="active-job-link"]')
|
||||
.click();
|
||||
|
||||
// Go to repair data tab
|
||||
cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
|
||||
});
|
||||
|
||||
it("validates auto reconciliation through posting bill", () => {
|
||||
cy.get('[data-cy="tab-repairdata"]').should("be.visible").click();
|
||||
// Click on filter parts only
|
||||
cy.get('[data-cy="filter-parts-button"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
// Select multiple rows
|
||||
cy.get('[data-cy="repair-data-table"]')
|
||||
.find(".ant-checkbox-input")
|
||||
.first()
|
||||
.click();
|
||||
// Click Order Parts
|
||||
cy.get('[data-cy="order-parts-button"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
// Modal should be visible
|
||||
cy.get('[data-cy="parts-order-modal"]').should("be.visible");
|
||||
// Fill required fields
|
||||
cy.get(".ant-select-selection-search").find(`#vendorid`).click();
|
||||
cy.get(`#vendorid_list`)
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.first()
|
||||
.click({ force: true });
|
||||
cy.get("#deliver_by").click();
|
||||
cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
|
||||
|
||||
cy.get('[data-cy="part-order-comments"]').type("testing from cypress");
|
||||
|
||||
cy.get('[data-cy="part-order-select-none"]').check();
|
||||
cy.get('[data-cy="order-part-submit"]').should("not.be.disabled").click();
|
||||
|
||||
cy.get(".ant-notification-notice-message").contains(
|
||||
"Parts order created successfully."
|
||||
);
|
||||
|
||||
cy.get('[data-cy="tab-partssublet"]').should("be.visible").click();
|
||||
|
||||
// Find the first row in the parts order
|
||||
cy.get('[data-cy="part-orders-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("orders-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@orders-table")
|
||||
.first()
|
||||
.should("be.visible")
|
||||
.find('[data-cy="receive-bill-button"]')
|
||||
.click();
|
||||
|
||||
// fill out form
|
||||
cy.get('[data-cy="bill-form-invoice"]').type(uuid());
|
||||
|
||||
cy.get("#bill-form-date").click();
|
||||
cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
|
||||
|
||||
cy.get('[data-cy="bill-form-parts-bin"]').find("input").click();
|
||||
cy.get("#location_list")
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.first()
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="bill-line-table"]').each(($row) => {
|
||||
// get retail amount
|
||||
cy.wrap($row)
|
||||
.find('[data-cy="bill-line-actual-price"]')
|
||||
.as("retailPrice")
|
||||
.click({ force: true, multiple: true });
|
||||
cy.wrap($row)
|
||||
.find('[data-cy="bill-line-actual-cost"]')
|
||||
.click({ multiple: true });
|
||||
});
|
||||
|
||||
cy.get('[data-cy="bill-line-actual-cost"]').then((cells) => {
|
||||
const totals = cells.toArray().map((el) => Number(el.value));
|
||||
const sum = Cypress._.sum(totals);
|
||||
|
||||
cy.get('[data-cy="bill-form-bill-total"]').type(sum);
|
||||
|
||||
// Get taxes add it to the sum
|
||||
cy.get('[data-cy="bill-form-tax"]').then((taxes) => {
|
||||
const subtotals = taxes
|
||||
.toArray()
|
||||
.map((el) => Number(el.innerText.substring(1)));
|
||||
const totalTax = Cypress._.sum(subtotals);
|
||||
|
||||
const billAmount = sum + totalTax;
|
||||
|
||||
cy.get('[data-cy="bill-form-bill-total"]')
|
||||
.find("input")
|
||||
.clear()
|
||||
.type(billAmount);
|
||||
});
|
||||
});
|
||||
|
||||
cy.get("#bill-form-discrepancy").should("have.text", "$0.00");
|
||||
|
||||
// Click save
|
||||
cy.get('[data-cy="bill-form-save-button"]').click();
|
||||
|
||||
cy.get("@retailPrice")
|
||||
.invoke("val")
|
||||
.then((val) => {
|
||||
const discrepancy = linesTotal - Number(val);
|
||||
|
||||
cy.get("#retailtotal").should("have.text", `$${val}`);
|
||||
|
||||
cy.get(".discrepancy").each(($statistic) => {
|
||||
cy.wrap($statistic).should(
|
||||
"have.text",
|
||||
Dinero({
|
||||
amount: discrepancy,
|
||||
precision: 0,
|
||||
}).toFormat()
|
||||
);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
it("returning item and validating statistics", () => {
|
||||
cy.get('[data-cy="bills-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("bills-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@bills-table")
|
||||
.find('[data-cy="credit-memo-checkbox"]')
|
||||
.filter(":not(:checked)")
|
||||
.first()
|
||||
.should("not.be.disabled")
|
||||
.parent()
|
||||
.parent()
|
||||
.parent()
|
||||
.parent()
|
||||
.find('[data-cy="return-items-button"]')
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="billline-checkbox"]').check();
|
||||
cy.get('[data-cy="billline-return-items-ok-button"]').click();
|
||||
cy.get('[data-cy="billline-actual-price"]')
|
||||
.find(".ant-form-item-control-input-content")
|
||||
.then((prices) => {
|
||||
const totals = prices
|
||||
.toArray()
|
||||
.map((el) => Number(el.innerText.substring(1)));
|
||||
const sum = Cypress._.sum(totals);
|
||||
|
||||
const price = Dinero({
|
||||
amount: sum * 100,
|
||||
}).toFormat();
|
||||
|
||||
cy.get('[data-cy="order-quantity"]').each((input) => {
|
||||
cy.wrap(input).type("1");
|
||||
});
|
||||
cy.get('[data-cy="part-order-select-none"]').click();
|
||||
|
||||
cy.get('[data-cy="order-part-submit"]').click();
|
||||
|
||||
cy.get("#totalReturns").should("have.text", price);
|
||||
cy.get("#calculatedcreditsnotreceived").should("have.text", price);
|
||||
cy.get("#creditsnotreceived").should("have.text", price);
|
||||
});
|
||||
});
|
||||
|
||||
it("receives credit memo without return part", () => {
|
||||
// Find the first row in the parts order
|
||||
cy.get('[data-cy="part-orders-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("orders-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@orders-table")
|
||||
.find('[data-cy="part-order-return-checkbox"]')
|
||||
.filter(":checked")
|
||||
.first()
|
||||
.parent()
|
||||
.parent()
|
||||
.parent()
|
||||
.parent()
|
||||
.find('[data-cy="receive-bill-button"]')
|
||||
.click();
|
||||
|
||||
// fill out form
|
||||
cy.get('[data-cy="bill-form-invoice"]').type(uuid());
|
||||
|
||||
cy.get("#bill-form-date").click();
|
||||
cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
|
||||
|
||||
cy.get('[data-cy="bill-line-table"]').each(($row) => {
|
||||
// get retail amount
|
||||
cy.wrap($row)
|
||||
.find('[data-cy="bill-line-actual-price"]')
|
||||
.click({ force: true, multiple: true });
|
||||
cy.wrap($row)
|
||||
.find('[data-cy="bill-line-actual-cost"]')
|
||||
.click({ multiple: true });
|
||||
});
|
||||
|
||||
cy.get('[data-cy="is-credit-memo-switch"]').click();
|
||||
|
||||
cy.get('[data-cy="is-credit-memo-switch"]').should(
|
||||
"have.attr",
|
||||
"aria-checked",
|
||||
"false"
|
||||
);
|
||||
|
||||
cy.get('[data-cy="bill-line-actual-cost"]').then((cells) => {
|
||||
cy.get('[data-cy="bill-line-actual-price"]').then((priceCells) => {
|
||||
const totals = cells.toArray().map((el) => Number(el.value));
|
||||
const priceTotals = priceCells
|
||||
.toArray()
|
||||
.map((el) => Number(el.value));
|
||||
const sum = Cypress._.sum(totals);
|
||||
const priceSum = Cypress._.sum(priceTotals);
|
||||
|
||||
cy.get('[data-cy="bill-form-bill-total"]').type(sum);
|
||||
|
||||
// Get taxes add it to the sum
|
||||
cy.get('[data-cy="bill-form-tax"]').then((taxes) => {
|
||||
const subtotals = taxes
|
||||
.toArray()
|
||||
.map((el) => Number(el.innerText.substring(1)));
|
||||
const totalTax = Cypress._.sum(subtotals);
|
||||
|
||||
const billAmount = sum + totalTax;
|
||||
|
||||
cy.get('[data-cy="bill-form-bill-total"]')
|
||||
.find("input")
|
||||
.clear()
|
||||
.type(billAmount);
|
||||
});
|
||||
|
||||
cy.get("#bill-form-discrepancy").should("have.text", "$0.00");
|
||||
|
||||
cy.get(`.ant-select-bill-cost-center > .ant-select-selector`).each(
|
||||
(select) => {
|
||||
cy.wrap(select).click();
|
||||
|
||||
cy.wrap(select)
|
||||
.find("input")
|
||||
.invoke("attr", "id")
|
||||
.then((id) => {
|
||||
cy.get(`#${id}_list`)
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.first()
|
||||
.click({ force: true });
|
||||
});
|
||||
}
|
||||
);
|
||||
|
||||
cy.get('[data-cy="bill-form-save-button"]').click();
|
||||
|
||||
cy.get("#totalReturns")
|
||||
.invoke("text")
|
||||
.then((value) => {
|
||||
const totalReturns =
|
||||
Number(value.substring(1)) - priceSum < 0
|
||||
? 0
|
||||
: Number(value.substring(1)) - priceSum;
|
||||
|
||||
cy.get("#calculatedcreditsnotreceived").should(
|
||||
"have.text",
|
||||
Dinero({
|
||||
amount: totalReturns,
|
||||
precision: 0,
|
||||
}).toFormat()
|
||||
);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
it("receives credit memo with return part", () => {
|
||||
// Find the first row in the parts order
|
||||
cy.get('[data-cy="part-orders-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("orders-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@orders-table")
|
||||
.find('[data-cy="part-order-return-checkbox"]')
|
||||
.filter(":checked")
|
||||
.first()
|
||||
.parent()
|
||||
.parent()
|
||||
.parent()
|
||||
.parent()
|
||||
.find('[data-cy="receive-bill-button"]')
|
||||
.click();
|
||||
|
||||
// fill out form
|
||||
cy.get('[data-cy="bill-form-invoice"]').type(uuid());
|
||||
|
||||
cy.get("#bill-form-date").click();
|
||||
cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
|
||||
|
||||
cy.get('[data-cy="bill-line-table"]').each(($row) => {
|
||||
// get retail amount
|
||||
cy.wrap($row)
|
||||
.find('[data-cy="bill-line-actual-price"]')
|
||||
.click({ force: true, multiple: true });
|
||||
cy.wrap($row)
|
||||
.find('[data-cy="bill-line-actual-cost"]')
|
||||
.click({ multiple: true });
|
||||
});
|
||||
|
||||
cy.get('[data-cy="is-credit-memo-switch"]').should(
|
||||
"have.attr",
|
||||
"aria-checked",
|
||||
"true"
|
||||
);
|
||||
|
||||
cy.get('[data-cy="bill-line-actual-cost"]').then((cells) => {
|
||||
cy.get('[data-cy="bill-line-actual-price"]').then((priceCells) => {
|
||||
const totals = cells.toArray().map((el) => Number(el.value));
|
||||
const priceTotals = priceCells
|
||||
.toArray()
|
||||
.map((el) => Number(el.value));
|
||||
const sum = Cypress._.sum(totals);
|
||||
const priceSum = Cypress._.sum(priceTotals);
|
||||
|
||||
cy.get('[data-cy="bill-form-bill-total"]').type(sum);
|
||||
|
||||
// Get taxes add it to the sum
|
||||
cy.get('[data-cy="bill-form-tax"]').then((taxes) => {
|
||||
const subtotals = taxes
|
||||
.toArray()
|
||||
.map((el) => Number(el.innerText.substring(1)));
|
||||
const totalTax = Cypress._.sum(subtotals);
|
||||
|
||||
const billAmount = sum + totalTax;
|
||||
|
||||
cy.get('[data-cy="bill-form-bill-total"]')
|
||||
.find("input")
|
||||
.clear()
|
||||
.type(billAmount);
|
||||
});
|
||||
|
||||
cy.get("#bill-form-discrepancy").should("have.text", "$0.00");
|
||||
|
||||
cy.get(`.ant-select-bill-cost-center > .ant-select-selector`).each(
|
||||
(select) => {
|
||||
cy.wrap(select).click();
|
||||
|
||||
cy.wrap(select)
|
||||
.find("input")
|
||||
.invoke("attr", "id")
|
||||
.then((id) => {
|
||||
cy.get(`#${id}_list`)
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.first()
|
||||
.click({ force: true });
|
||||
});
|
||||
}
|
||||
);
|
||||
|
||||
cy.get('[data-cy="mark-as-received-checkbox"]').check({
|
||||
multiple: true,
|
||||
});
|
||||
|
||||
cy.get('[data-cy="bill-form-save-button"]').click();
|
||||
|
||||
cy.get("#totalReturns")
|
||||
.invoke("text")
|
||||
.then((value) => {
|
||||
const totalReturns =
|
||||
Number(value.substring(1)) - priceSum < 0
|
||||
? 0
|
||||
: Number(value.substring(1)) - priceSum;
|
||||
|
||||
cy.get("#creditsnotreceived").should(
|
||||
"have.text",
|
||||
Dinero({
|
||||
amount: totalReturns,
|
||||
precision: 0,
|
||||
}).toFormat()
|
||||
);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
it("views the row expander if it has the order and bill", () => {
|
||||
cy.get('[data-cy="tab-repairdata"]').should("be.visible").click();
|
||||
|
||||
cy.get('[data-cy="filter-parts-button"]')
|
||||
.should("not.be.disabled")
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="repair-data-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.first()
|
||||
.find("td")
|
||||
.first()
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="repair-data-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.first()
|
||||
.find("td")
|
||||
.eq(13)
|
||||
.find("div")
|
||||
.should("exist");
|
||||
|
||||
cy.get('[data-cy="repair-data-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.first()
|
||||
.find("td")
|
||||
.eq(14)
|
||||
.find("div")
|
||||
.should("exist");
|
||||
|
||||
cy.get('[data-cy="repair-data-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.first()
|
||||
.find("td")
|
||||
.eq(15)
|
||||
.find("div")
|
||||
.should("have.text", "Returned");
|
||||
|
||||
cy.get('[data-cy="parts-bills-order"]')
|
||||
.should("be.visible")
|
||||
.find("li")
|
||||
.first()
|
||||
.should("not.have.text", "This part has not yet been ordered.");
|
||||
});
|
||||
}
|
||||
);
|
||||
@@ -1,318 +0,0 @@
|
||||
import moment from "moment";
|
||||
import job2 from "../../fixtures/jobs/job-4.json";
|
||||
import Dinero from "dinero.js";
|
||||
|
||||
const uuid = () => Cypress._.random(0, 1e6);
|
||||
|
||||
describe(
|
||||
"Entering payment for the job",
|
||||
{
|
||||
defaultCommandTimeout: 5000,
|
||||
},
|
||||
() => {
|
||||
const today = moment().format("YYYY-MM-DD");
|
||||
const LABOR_HOURS = 1;
|
||||
const COST_CENTER = "Body";
|
||||
|
||||
beforeEach(() => {
|
||||
cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
|
||||
if (req.body.operationName === "QUERY_ACTIVE_EMPLOYEES") {
|
||||
req.alias = "employees";
|
||||
}
|
||||
});
|
||||
|
||||
cy.intercept("POST", Cypress.env("graphql_dev_endpoint"), (req) => {
|
||||
if (req.body.operationName === "QUERY_BODYSHOP") {
|
||||
req.alias = "bodyshop";
|
||||
}
|
||||
});
|
||||
|
||||
cy.visit("/manage");
|
||||
|
||||
cy.get('[data-cy="active-jobs-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("active-jobs-table")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@active-jobs-table")
|
||||
.contains(job2.clm_no)
|
||||
.first()
|
||||
.parent()
|
||||
.find('[data-cy="active-job-link"]')
|
||||
.click();
|
||||
|
||||
cy.url().should("include", "/manage/jobs");
|
||||
});
|
||||
|
||||
it("checks input validations", () => {
|
||||
cy.get('[data-cy="job-actions-button"]').click();
|
||||
|
||||
cy.get('[data-cy="actions-timetickets"]')
|
||||
.should("be.visible")
|
||||
.and("not.be.disabled")
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="timeticket-save-button"]').first().click();
|
||||
|
||||
cy.get('[data-cy="form-timeticket"]')
|
||||
.find(".ant-form-item-explain-error")
|
||||
.should("have.length", 4);
|
||||
|
||||
cy.get('[data-cy="form-timeticket-date"]').click();
|
||||
cy.get(`[title="${today}"]`).should("be.visible").click({ force: true });
|
||||
|
||||
cy.antdSelect("timeticket-employee");
|
||||
|
||||
cy.antdSelect("cost-center");
|
||||
|
||||
cy.get('[data-cy="labor-allocations-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("labor-allocations")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get("@labor-allocations")
|
||||
.eq(0)
|
||||
.find("td:not(.ant-table-selection-column)")
|
||||
.eq(4)
|
||||
.find("strong")
|
||||
.invoke("text")
|
||||
.as("bodyDiff")
|
||||
.then((diff) => {
|
||||
// TODO dynamically select the employee prior to what is the labor and cost
|
||||
cy.get('[data-cy="form-timeticket-productivehrs"]').type(
|
||||
Number(diff) + 1
|
||||
);
|
||||
|
||||
cy.get(".ant-form-item-explain-error").should(
|
||||
"have.text",
|
||||
"The number of hours entered is more than what is available for this cost center."
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
it("adds new time ticket to a job with flat rate", () => {
|
||||
cy.get('[data-cy="job-actions-button"]').click();
|
||||
|
||||
cy.get('[data-cy="actions-timetickets"]')
|
||||
.should("be.visible")
|
||||
.and("not.be.disabled")
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="labor-allocations-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("labor-allocations")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
// Get Difference for Body
|
||||
cy.get('[data-cy="form-timeticket-date"]').click();
|
||||
cy.get(`[title="${today}"]`).should("be.visible").click();
|
||||
|
||||
cy.get("@labor-allocations")
|
||||
.eq(0)
|
||||
.find("td:not(.ant-table-selection-column)")
|
||||
.eq(4)
|
||||
.find("strong")
|
||||
.invoke("text")
|
||||
.as("bodyDiff")
|
||||
.then((diff) => {
|
||||
cy.get('[data-cy="form-timeticket-productivehrs"]').type(LABOR_HOURS);
|
||||
|
||||
cy.get('[data-cy="form-timeticket-actualhrs"]').type(LABOR_HOURS);
|
||||
});
|
||||
|
||||
cy.wait("@employees").then(({ response }) => {
|
||||
const employees = response.body.data.employees;
|
||||
const employee = employees.find((e) => e.flat_rate);
|
||||
const employee_name = `${employee.first_name} ${employee.last_name}`;
|
||||
|
||||
cy.antdSelectValue("timeticket-employee", employee_name);
|
||||
|
||||
cy.antdSelectValue("cost-center", COST_CENTER);
|
||||
});
|
||||
|
||||
cy.get('[data-cy="form-timeticket-memo"]').type(uuid());
|
||||
|
||||
cy.get('[data-cy="timeticket-save-button"]').first().click();
|
||||
|
||||
cy.get(".ant-notification-notice-message").contains(
|
||||
"Time ticket entered successfully."
|
||||
);
|
||||
});
|
||||
|
||||
it("adds new time ticket to a job with straight rate", () => {
|
||||
cy.get('[data-cy="job-actions-button"]').click();
|
||||
|
||||
cy.get('[data-cy="actions-timetickets"]')
|
||||
.should("be.visible")
|
||||
.and("not.be.disabled")
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="labor-allocations-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("labor-allocations")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
// Get Difference for Body
|
||||
cy.get('[data-cy="form-timeticket-date"]').click();
|
||||
cy.get(`[title="${today}"]`).should("be.visible").click();
|
||||
|
||||
cy.get("@labor-allocations")
|
||||
.eq(0)
|
||||
.find("td:not(.ant-table-selection-column)")
|
||||
.eq(4)
|
||||
.find("strong")
|
||||
.invoke("text")
|
||||
.as("bodyDiff")
|
||||
.then((diff) => {
|
||||
cy.get('[data-cy="form-timeticket-productivehrs"]').type(LABOR_HOURS);
|
||||
|
||||
cy.get('[data-cy="form-timeticket-actualhrs"]').type(LABOR_HOURS);
|
||||
});
|
||||
|
||||
cy.wait("@employees").then(({ response }) => {
|
||||
const employees = response.body.data.employees;
|
||||
const employee = employees.find((e) => !e.flat_rate);
|
||||
const employee_name = `${employee.first_name} ${employee.last_name}`;
|
||||
|
||||
cy.antdSelectValue("timeticket-employee", employee_name);
|
||||
|
||||
cy.antdSelectValue("cost-center", COST_CENTER);
|
||||
});
|
||||
|
||||
cy.get('[data-cy="form-timeticket-memo"]').type(uuid());
|
||||
|
||||
cy.get('[data-cy="timeticket-save-button"]').first().click();
|
||||
|
||||
cy.get(".ant-notification-notice-message").contains(
|
||||
"Time ticket entered successfully."
|
||||
);
|
||||
});
|
||||
|
||||
it("checks hours calculated to the allocations table", () => {
|
||||
cy.get('[data-cy="tab-labor"]').should("be.visible").click();
|
||||
|
||||
cy.get('[data-cy="labor-allocations-table"]')
|
||||
.find(".ant-table-tbody")
|
||||
.find("> tr:not(.ant-table-measure-row)")
|
||||
.as("labor-allocations")
|
||||
.should("not.have.class", "ant-table-placeholder");
|
||||
|
||||
cy.get('[data-cy="labor-total-hrs-claimed"]')
|
||||
.invoke("text")
|
||||
.then((hours) => {
|
||||
cy.wrap(hours).should("not.equal", "0");
|
||||
});
|
||||
});
|
||||
|
||||
it("checks the job costing calculations", () => {
|
||||
cy.get('[data-cy="job-actions-button"]').click();
|
||||
|
||||
cy.get('[data-cy="actions-jobcosting"]')
|
||||
.should("be.visible")
|
||||
.and("not.be.disabled")
|
||||
.click();
|
||||
|
||||
cy.wait("@bodyshop").then(({ request }) => {
|
||||
const token = request.headers.authorization;
|
||||
|
||||
const query = `query QUERY_ACTIVE_EMPLOYEES {
|
||||
employees(where: { active: { _eq: true } }) {
|
||||
last_name
|
||||
id
|
||||
first_name
|
||||
employee_number
|
||||
active
|
||||
termination_date
|
||||
hire_date
|
||||
flat_rate
|
||||
rates
|
||||
pin
|
||||
user_email
|
||||
}
|
||||
}`;
|
||||
|
||||
cy.request({
|
||||
url: "http://localhost:4000/test/query",
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
Authorization: token,
|
||||
},
|
||||
body: {
|
||||
query,
|
||||
},
|
||||
}).then((response) => {
|
||||
const cost_center = COST_CENTER;
|
||||
const employees = response.body.employees;
|
||||
const total_cost = employees.reduce((prev, employee) => {
|
||||
const rate =
|
||||
employee.rates.find((rate) => rate.cost_center === cost_center)
|
||||
.rate ?? 0;
|
||||
|
||||
return prev + rate * LABOR_HOURS;
|
||||
}, 0);
|
||||
|
||||
cy.get('[data-cy="responsibilitycenter"]')
|
||||
.contains(cost_center)
|
||||
.parent()
|
||||
.parent()
|
||||
.find('[data-cy="cost"]')
|
||||
.should(
|
||||
"have.text",
|
||||
Dinero({
|
||||
amount: total_cost,
|
||||
precision: 0,
|
||||
}).toFormat()
|
||||
);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
it.only("clocks in and out of the tech page for the timeticket", () => {
|
||||
// TODO go to tech page for the clock in and out
|
||||
cy.visit("/tech");
|
||||
|
||||
cy.get('[data-cy="tech-employee-id"]').type("a");
|
||||
cy.get('[data-cy="tech-employee-password"]').type("a{enter}");
|
||||
|
||||
cy.contains("Logged in as");
|
||||
// go to clock in
|
||||
cy.get('[data-cy="sider-joblock"]').click({ force: true });
|
||||
// find the job ro
|
||||
cy.get('[data-cy="clock-ro-select"]').type("273");
|
||||
cy.get('[data-cy="clock-ro-select"] .ant-select-selection-search input')
|
||||
.invoke("attr", "id")
|
||||
.then((selElm) => {
|
||||
const dropDownSelector = `#${selElm}_list`;
|
||||
|
||||
cy.get(dropDownSelector)
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.first()
|
||||
.click({ force: true });
|
||||
});
|
||||
// select cost center
|
||||
cy.get('[data-cy="clock-cost-center-select"]').click();
|
||||
cy.get(
|
||||
'[data-cy="clock-cost-center-select"] .ant-select-selection-search input'
|
||||
)
|
||||
.invoke("attr", "id")
|
||||
.then((selElm) => {
|
||||
const dropDownSelector = `#${selElm}_list`;
|
||||
|
||||
cy.get(dropDownSelector)
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.contains("Body")
|
||||
.first()
|
||||
.click({ force: true });
|
||||
});
|
||||
|
||||
// clock in and out of the job
|
||||
});
|
||||
}
|
||||
);
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,316 +0,0 @@
|
||||
{
|
||||
"parts": {
|
||||
"parts": {
|
||||
"list": {
|
||||
"PAE": {
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"PAN": {
|
||||
"total": {
|
||||
"amount": 26661,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
}
|
||||
},
|
||||
"total": {
|
||||
"amount": 26661,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"subtotal": {
|
||||
"amount": 26661,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"prt_dsmk_total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"sublets": {
|
||||
"total": {
|
||||
"amount": 5000,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"subtotal": {
|
||||
"amount": 5000,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
}
|
||||
},
|
||||
"rates": {
|
||||
"la1": {
|
||||
"rate": 92.49,
|
||||
"hours": 3.5,
|
||||
"total": {
|
||||
"amount": 32372,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"la2": {
|
||||
"rate": 0,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"la3": {
|
||||
"rate": 0,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"la4": {
|
||||
"rate": 0,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"laa": {
|
||||
"rate": 0,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"lab": {
|
||||
"rate": 85.16,
|
||||
"hours": 29.7,
|
||||
"total": {
|
||||
"amount": 252925,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"lad": {
|
||||
"rate": 0,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"lae": {
|
||||
"rate": 0,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"laf": {
|
||||
"rate": 97.34,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"lag": {
|
||||
"rate": 85.16,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"lam": {
|
||||
"rate": 109.5,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"lar": {
|
||||
"rate": 85.16,
|
||||
"hours": 8.500000000000002,
|
||||
"total": {
|
||||
"amount": 72386,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"las": {
|
||||
"rate": 85.16,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"lau": {
|
||||
"rate": 0,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"mapa": {
|
||||
"rate": 55.38,
|
||||
"hours": 8.500000000000002,
|
||||
"total": {
|
||||
"amount": 47073,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"mash": {
|
||||
"rate": 6.85,
|
||||
"hours": 33.199999999999996,
|
||||
"total": {
|
||||
"amount": 22742,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"subtotal": {
|
||||
"amount": 427498,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"rates_subtotal": {
|
||||
"amount": 357683,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"totals": {
|
||||
"subtotal": {
|
||||
"amount": 495355,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"local_tax": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"state_tax": {
|
||||
"amount": 34675,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"custPayable": {
|
||||
"total": {
|
||||
"amount": 30000,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"dep_taxes": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"deductible": {
|
||||
"amount": 30000,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"federal_tax": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"other_customer_amount": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"federal_tax": {
|
||||
"amount": 24768,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"net_repairs": {
|
||||
"amount": 524798,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"statePartsTax": {
|
||||
"amount": 2216,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"total_repairs": {
|
||||
"amount": 554798,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"additional": {
|
||||
"pvrt": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"total": {
|
||||
"amount": 36196,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"towing": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"storage": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"shipping": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"adjustments": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"additionalCosts": {
|
||||
"amount": 36196,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"additionalCostItems": [
|
||||
{
|
||||
"key": "ATS Amount",
|
||||
"total": {
|
||||
"amount": 36196,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,316 +0,0 @@
|
||||
{
|
||||
"parts": {
|
||||
"parts": {
|
||||
"list": {
|
||||
"PAE": {
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"PAN": {
|
||||
"total": {
|
||||
"amount": 36661,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
}
|
||||
},
|
||||
"total": {
|
||||
"amount": 36661,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"subtotal": {
|
||||
"amount": 36661,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"prt_dsmk_total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"sublets": {
|
||||
"total": {
|
||||
"amount": 5000,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"subtotal": {
|
||||
"amount": 5000,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
}
|
||||
},
|
||||
"rates": {
|
||||
"la1": {
|
||||
"rate": 92.49,
|
||||
"hours": 3.5,
|
||||
"total": {
|
||||
"amount": 32372,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"la2": {
|
||||
"rate": 0,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"la3": {
|
||||
"rate": 0,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"la4": {
|
||||
"rate": 0,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"laa": {
|
||||
"rate": 0,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"lab": {
|
||||
"rate": 85.16,
|
||||
"hours": 29.7,
|
||||
"total": {
|
||||
"amount": 252925,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"lad": {
|
||||
"rate": 0,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"lae": {
|
||||
"rate": 0,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"laf": {
|
||||
"rate": 97.34,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"lag": {
|
||||
"rate": 85.16,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"lam": {
|
||||
"rate": 109.5,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"lar": {
|
||||
"rate": 85.16,
|
||||
"hours": 8.500000000000002,
|
||||
"total": {
|
||||
"amount": 72386,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"las": {
|
||||
"rate": 85.16,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"lau": {
|
||||
"rate": 0,
|
||||
"hours": 0,
|
||||
"total": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"mapa": {
|
||||
"rate": 55.38,
|
||||
"hours": 8.500000000000002,
|
||||
"total": {
|
||||
"amount": 47073,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"mash": {
|
||||
"rate": 6.85,
|
||||
"hours": 33.199999999999996,
|
||||
"total": {
|
||||
"amount": 22742,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"subtotal": {
|
||||
"amount": 427498,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"rates_subtotal": {
|
||||
"amount": 357683,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"totals": {
|
||||
"subtotal": {
|
||||
"amount": 505355,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"local_tax": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"state_tax": {
|
||||
"amount": 35375,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"custPayable": {
|
||||
"total": {
|
||||
"amount": 30000,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"dep_taxes": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"deductible": {
|
||||
"amount": 30000,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"federal_tax": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"other_customer_amount": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"federal_tax": {
|
||||
"amount": 25268,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"net_repairs": {
|
||||
"amount": 535998,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"statePartsTax": {
|
||||
"amount": 2916,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"total_repairs": {
|
||||
"amount": 565998,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
},
|
||||
"additional": {
|
||||
"pvrt": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"total": {
|
||||
"amount": 36196,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"towing": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"storage": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"shipping": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"adjustments": {
|
||||
"amount": 0,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"additionalCosts": {
|
||||
"amount": 36196,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
},
|
||||
"additionalCostItems": [
|
||||
{
|
||||
"key": "ATS Amount",
|
||||
"total": {
|
||||
"amount": 36196,
|
||||
"currency": "USD",
|
||||
"precision": 2
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -22,106 +22,4 @@
|
||||
//
|
||||
//
|
||||
// -- This will overwrite an existing command --
|
||||
// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
|
||||
|
||||
Cypress.Commands.add("goToSignInPage", () => {
|
||||
cy.visit("/");
|
||||
cy.contains("Sign In").click();
|
||||
});
|
||||
|
||||
Cypress.Commands.add("login", (username, password) => {
|
||||
cy.goToSignInPage();
|
||||
|
||||
cy.get('[data-cy="username"]').type(username);
|
||||
cy.get('[data-cy="password"]').type(password);
|
||||
cy.get('[data-cy="sign-in-button"]', { timeout: 2000 }).click();
|
||||
});
|
||||
|
||||
Cypress.Commands.add("passwordReset", (email) => {
|
||||
cy.goToSignInPage();
|
||||
cy.get('[data-cy="reset-password"]').click();
|
||||
cy.get('[data-cy="reset-password-email-input"]').type(email);
|
||||
cy.get('[data-cy="reset-password-button"]').click();
|
||||
});
|
||||
|
||||
Cypress.on("uncaught:exception", (err, runnable) => {
|
||||
// returning false here prevents Cypress from
|
||||
// failing the test
|
||||
return false;
|
||||
});
|
||||
|
||||
Cypress.Commands.add("antdSelect", (selector, filter) => {
|
||||
cy.get(`.ant-select-${selector} > .ant-select-selector`).click();
|
||||
cy.get(`.ant-select-${selector} .ant-select-selection-search input`)
|
||||
.invoke("attr", "id")
|
||||
.then((selElm) => {
|
||||
const dropDownSelector = `#${selElm}_list`;
|
||||
|
||||
if (filter) {
|
||||
cy.get(dropDownSelector)
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.not(`:contains("${filter}")`)
|
||||
.first()
|
||||
.click({ force: true });
|
||||
} else {
|
||||
cy.get(dropDownSelector)
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.first()
|
||||
.click({ force: true });
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
Cypress.Commands.add("antdSelectValue", (selector, filter) => {
|
||||
cy.get(`.ant-select-${selector} > .ant-select-selector`).click();
|
||||
cy.get(`.ant-select-${selector} .ant-select-selection-search input`)
|
||||
.invoke("attr", "id")
|
||||
.then((selElm) => {
|
||||
const dropDownSelector = `#${selElm}_list`;
|
||||
|
||||
cy.get(dropDownSelector)
|
||||
.next()
|
||||
.find(".ant-select-item-option-content")
|
||||
.contains(filter)
|
||||
.first()
|
||||
.click({ force: true });
|
||||
});
|
||||
});
|
||||
|
||||
Cypress.Commands.add(
|
||||
"insertAvailableJob",
|
||||
({ bodyshopid, job, job_est_data, token }) => {
|
||||
const query = `mutation INSERT_AVAILABLE_JOB($job: available_jobs_insert_input!) {
|
||||
insert_available_jobs_one(object: $job) {
|
||||
id
|
||||
}
|
||||
}`;
|
||||
|
||||
cy.request({
|
||||
url: "http://localhost:4000/test/query",
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
Authorization: token,
|
||||
},
|
||||
body: {
|
||||
query,
|
||||
job: {
|
||||
est_data: job_est_data,
|
||||
uploaded_by: Cypress.env("uploaded_by_email"),
|
||||
cieca_id: job.ciecaid,
|
||||
bodyshopid,
|
||||
clm_amt: job.clm_total,
|
||||
clm_no: job.clm_no,
|
||||
ins_co_nm: job.ins_co_nm,
|
||||
ownr_name: `${job.owner.data.ownr_fn} ${job.owner.data.ownr_ln}`,
|
||||
vehicle_info: `${job.v_model_yr} ${job.v_make_desc} ${job.v_model_desc}`,
|
||||
},
|
||||
},
|
||||
})
|
||||
.its("body.insert_available_jobs_one")
|
||||
.should("have.property", "id");
|
||||
}
|
||||
);
|
||||
// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
|
||||
@@ -14,7 +14,7 @@
|
||||
// ***********************************************************
|
||||
|
||||
// Import commands.js using ES2015 syntax:
|
||||
import "./commands";
|
||||
import './commands'
|
||||
|
||||
// Alternatively you can use CommonJS syntax:
|
||||
// require('./commands')
|
||||
// require('./commands')
|
||||
5912
client/job.json
5912
client/job.json
File diff suppressed because it is too large
Load Diff
@@ -4,73 +4,71 @@
|
||||
"private": true,
|
||||
"proxy": "http://localhost:4000",
|
||||
"dependencies": {
|
||||
"@apollo/client": "^3.7.9",
|
||||
"@apollo/client": "^3.6.9",
|
||||
"@asseinfo/react-kanban": "^2.2.0",
|
||||
"@craco/craco": "^7.0.0",
|
||||
"@craco/craco": "^6.4.5",
|
||||
"@fingerprintjs/fingerprintjs": "^3.3.3",
|
||||
"@jsreport/browser-client": "^3.1.0",
|
||||
"@sentry/react": "^7.40.0",
|
||||
"@sentry/tracing": "^7.40.0",
|
||||
"@splitsoftware/splitio-react": "^1.8.1",
|
||||
"@sentry/react": "^7.7.0",
|
||||
"@sentry/tracing": "^7.7.0",
|
||||
"@splitsoftware/splitio-react": "^1.6.0",
|
||||
"@stripe/react-stripe-js": "^1.9.0",
|
||||
"@stripe/stripe-js": "^1.32.0",
|
||||
"@tanem/react-nprogress": "^5.0.8",
|
||||
"antd": "^4.24.8",
|
||||
"apollo-link-logger": "^2.0.1",
|
||||
"axios": "^1.3.4",
|
||||
"craco-less": "^2.0.0",
|
||||
"antd": "^4.22.3",
|
||||
"apollo-link-logger": "^2.0.0",
|
||||
"axios": "^0.27.2",
|
||||
"craco-less": "^1.20.0",
|
||||
"dinero.js": "^1.9.1",
|
||||
"dotenv": "^16.0.1",
|
||||
"enquire-js": "^0.2.1",
|
||||
"env-cmd": "^10.1.0",
|
||||
"exifr": "^7.1.3",
|
||||
"firebase": "^9.17.1",
|
||||
"graphql": "^16.6.0",
|
||||
"i18next": "^22.4.10",
|
||||
"i18next-browser-languagedetector": "^7.0.1",
|
||||
"firebase": "^9.9.1",
|
||||
"graphql": "^16.5.0",
|
||||
"i18next": "^21.8.14",
|
||||
"i18next-browser-languagedetector": "^6.1.4",
|
||||
"jsoneditor": "^9.9.0",
|
||||
"jsreport-browser-client-dist": "^1.3.0",
|
||||
"libphonenumber-js": "^1.10.21",
|
||||
"libphonenumber-js": "^1.10.9",
|
||||
"logrocket": "^3.0.1",
|
||||
"markerjs2": "^2.28.1",
|
||||
"markerjs2": "^2.22.0",
|
||||
"moment-business-days": "^1.2.0",
|
||||
"moment-timezone": "^0.5.41",
|
||||
"normalize-url": "^8.0.0",
|
||||
"phone": "^3.1.35",
|
||||
"moment-timezone": "^0.5.34",
|
||||
"normalize-url": "^7.0.3",
|
||||
"phone": "^3.1.23",
|
||||
"preval.macro": "^5.0.0",
|
||||
"prop-types": "^15.8.1",
|
||||
"query-string": "^7.1.3",
|
||||
"query-string": "^7.1.1",
|
||||
"rc-queue-anim": "^2.0.0",
|
||||
"rc-scroll-anim": "^2.7.6",
|
||||
"react": "^17.0.2",
|
||||
"react-big-calendar": "^1.6.8",
|
||||
"react-big-calendar": "^1.5.0",
|
||||
"react-color": "^2.19.3",
|
||||
"react-cookie": "^4.1.1",
|
||||
"react-dom": "^17.0.2",
|
||||
"react-drag-listview": "^0.2.1",
|
||||
"react-grid-gallery": "^1.0.0",
|
||||
"react-grid-gallery": "^0.5.5",
|
||||
"react-grid-layout": "^1.3.4",
|
||||
"react-i18next": "^12.2.0",
|
||||
"react-icons": "^4.7.1",
|
||||
"react-image-lightbox": "^5.1.4",
|
||||
"react-intersection-observer": "^9.4.3",
|
||||
"react-number-format": "^5.1.3",
|
||||
"react-redux": "^8.0.5",
|
||||
"react-i18next": "^11.18.1",
|
||||
"react-icons": "^4.4.0",
|
||||
"react-number-format": "^4.9.3",
|
||||
"react-redux": "^7.2.8",
|
||||
"react-resizable": "^3.0.4",
|
||||
"react-router-dom": "^5.3.0",
|
||||
"react-scripts": "^5.0.1",
|
||||
"react-scripts": "^4.0.3",
|
||||
"react-sticky": "^6.0.3",
|
||||
"react-sublime-video": "^0.2.5",
|
||||
"react-virtualized": "^9.22.3",
|
||||
"recharts": "^2.4.3",
|
||||
"redux": "^4.2.1",
|
||||
"recharts": "^2.1.12",
|
||||
"redux": "^4.2.0",
|
||||
"redux-persist": "^6.0.0",
|
||||
"redux-saga": "^1.2.2",
|
||||
"redux-saga": "^1.1.3",
|
||||
"redux-state-sync": "^3.1.4",
|
||||
"reselect": "^4.1.7",
|
||||
"sass": "^1.58.3",
|
||||
"socket.io-client": "^4.6.1",
|
||||
"styled-components": "^5.3.6",
|
||||
"reselect": "^4.1.6",
|
||||
"sass": "^1.54.0",
|
||||
"socket.io-client": "^4.5.1",
|
||||
"styled-components": "^5.3.5",
|
||||
"subscriptions-transport-ws": "^0.11.0",
|
||||
"uniqid": "^5.4.0",
|
||||
"web-vitals": "^2.1.4",
|
||||
"workbox-background-sync": "^6.5.3",
|
||||
"workbox-broadcast-update": "^6.5.3",
|
||||
@@ -83,8 +81,7 @@
|
||||
"workbox-range-requests": "^6.5.3",
|
||||
"workbox-routing": "^6.5.3",
|
||||
"workbox-strategies": "^6.5.3",
|
||||
"workbox-streams": "^6.5.3",
|
||||
"yauzl": "^2.10.0"
|
||||
"workbox-streams": "^6.5.3"
|
||||
},
|
||||
"scripts": {
|
||||
"analyze": "source-map-explorer 'build/static/js/*.js'",
|
||||
@@ -94,8 +91,7 @@
|
||||
"build-deploy:test": "yarn run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'",
|
||||
"buildcra": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
|
||||
"test": "cypress open",
|
||||
"eject": "react-scripts eject",
|
||||
"madge": "madge --image ./madge-graph.svg --extensions js,jsx,ts,tsx --circular ."
|
||||
"eject": "react-scripts eject"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"extends": [
|
||||
@@ -120,9 +116,8 @@
|
||||
"react-error-overlay": "6.0.9"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@sentry/webpack-plugin": "^1.20.0",
|
||||
"@testing-library/cypress": "^8.0.3",
|
||||
"cypress": "^12.13.0",
|
||||
"@sentry/webpack-plugin": "^1.19.0",
|
||||
"cypress": "^12.2.0",
|
||||
"eslint-plugin-cypress": "^2.12.1",
|
||||
"react-error-overlay": "6.0.11",
|
||||
"redux-logger": "^3.0.6",
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -143,24 +143,8 @@
|
||||
}
|
||||
}
|
||||
|
||||
//Update row highlighting on production board.
|
||||
|
||||
//Update row highlighting on production board.
|
||||
.ant-table-tbody > tr.ant-table-row:hover > td {
|
||||
background: #eaeaea !important;
|
||||
}
|
||||
|
||||
.job-line-manual {
|
||||
color: tomato;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
td.ant-table-column-sort {
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
.ant-table-tbody > tr.ant-table-row:nth-child(2n) > td {
|
||||
background-color: #f4f4f4;
|
||||
}
|
||||
|
||||
.rowWithColor > td {
|
||||
background-color: var(--bgColor) !important;
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,8 @@
|
||||
import React from "react";
|
||||
import {
|
||||
PaymentRequestButtonElement,
|
||||
useStripe,
|
||||
} from "@stripe/react-stripe-js";
|
||||
import React, { useEffect, useState } from "react";
|
||||
import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import { logImEXEvent } from "../../firebase/firebase.utils";
|
||||
@@ -15,6 +19,49 @@ const mapDispatchToProps = (dispatch) => ({
|
||||
});
|
||||
|
||||
function Test({ bodyshop, setEmailOptions }) {
|
||||
const stripe = useStripe();
|
||||
|
||||
const [paymentRequest, setPaymentRequest] = useState(null);
|
||||
useEffect(() => {
|
||||
if (stripe) {
|
||||
const pr = stripe.paymentRequest({
|
||||
country: "CA",
|
||||
displayItems: [{ label: "Deductible", amount: 1099 }],
|
||||
currency: "cad",
|
||||
total: {
|
||||
label: "Demo total",
|
||||
amount: 1099,
|
||||
},
|
||||
requestPayerName: true,
|
||||
requestPayerEmail: true,
|
||||
});
|
||||
|
||||
// Check the availability of the Payment Request API.
|
||||
pr.canMakePayment().then((result) => {
|
||||
if (result) {
|
||||
setPaymentRequest(pr);
|
||||
} else {
|
||||
// var details = {
|
||||
// total: { label: "", amount: { currency: "CAD", value: "0.00" } },
|
||||
// };
|
||||
new PaymentRequest(
|
||||
[{ supportedMethods: ["basic-card"] }],
|
||||
{}
|
||||
// details
|
||||
).show();
|
||||
}
|
||||
});
|
||||
}
|
||||
}, [stripe]);
|
||||
|
||||
if (paymentRequest) {
|
||||
return (
|
||||
<div style={{ height: "300px" }}>
|
||||
<PaymentRequestButtonElement options={{ paymentRequest }} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div>
|
||||
<button
|
||||
|
||||
@@ -107,6 +107,11 @@ export function AccountingPayablesTableComponent({
|
||||
dataIndex: "transactionid",
|
||||
key: "transactionid",
|
||||
},
|
||||
{
|
||||
title: t("payments.fields.stripeid"),
|
||||
dataIndex: "stripeid",
|
||||
key: "stripeid",
|
||||
},
|
||||
{
|
||||
title: t("payments.fields.created_at"),
|
||||
dataIndex: "created_at",
|
||||
|
||||
@@ -117,7 +117,7 @@ export default function BillCmdReturnsTableComponent({
|
||||
name={[field.name, "cm_received"]}
|
||||
valuePropName="checked"
|
||||
>
|
||||
<Checkbox data-cy="mark-as-received-checkbox" />
|
||||
<Checkbox />
|
||||
</Form.Item>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -6,7 +6,7 @@ import { useTranslation } from "react-i18next";
|
||||
import { DELETE_BILL } from "../../graphql/bills.queries";
|
||||
import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
|
||||
|
||||
export default function BillDeleteButton({ bill, callback }) {
|
||||
export default function BillDeleteButton({ bill }) {
|
||||
const [loading, setLoading] = useState(false);
|
||||
const { t } = useTranslation();
|
||||
const [deleteBill] = useMutation(DELETE_BILL);
|
||||
@@ -36,8 +36,6 @@ export default function BillDeleteButton({ bill, callback }) {
|
||||
|
||||
if (!!!result.errors) {
|
||||
notification["success"]({ message: t("bills.successes.deleted") });
|
||||
|
||||
if (callback && typeof callback === "function") callback(bill.id);
|
||||
} else {
|
||||
//Check if it's an fkey violation.
|
||||
const error = JSON.stringify(result.errors);
|
||||
|
||||
@@ -10,7 +10,7 @@ import { createStructuredSelector } from "reselect";
|
||||
import {
|
||||
DELETE_BILL_LINE,
|
||||
INSERT_NEW_BILL_LINES,
|
||||
UPDATE_BILL_LINE,
|
||||
UPDATE_BILL_LINE
|
||||
} from "../../graphql/bill-lines.queries";
|
||||
import { QUERY_BILL_BY_PK, UPDATE_BILL } from "../../graphql/bills.queries";
|
||||
import { insertAuditTrail } from "../../redux/application/application.actions";
|
||||
@@ -194,19 +194,12 @@ export function BillDetailEditcontainer({
|
||||
{t("general.actions.save")}
|
||||
</Button>
|
||||
</Popconfirm>
|
||||
<BillReeportButtonComponent
|
||||
data-cy="bill-mark-reexport-button"
|
||||
bill={data && data.bills_by_pk}
|
||||
/>
|
||||
<BillMarkExportedButton
|
||||
data-cy="bill-mark-export-button"
|
||||
bill={data && data.bills_by_pk}
|
||||
/>
|
||||
<BillReeportButtonComponent bill={data && data.bills_by_pk} />
|
||||
<BillMarkExportedButton bill={data && data.bills_by_pk} />
|
||||
</Space>
|
||||
}
|
||||
/>
|
||||
<Form
|
||||
data-cy="bill-edit-form"
|
||||
form={form}
|
||||
onFinish={handleFinish}
|
||||
initialValues={transformData(data)}
|
||||
|
||||
@@ -77,14 +77,11 @@ export function BillDetailEditReturn({
|
||||
return (
|
||||
<>
|
||||
<Modal
|
||||
open={visible}
|
||||
visible={visible}
|
||||
onCancel={() => setVisible(false)}
|
||||
destroyOnClose
|
||||
title={t("bills.actions.return")}
|
||||
onOk={() => form.submit()}
|
||||
okButtonProps={{
|
||||
"data-cy": "billline-return-items-ok-button",
|
||||
}}
|
||||
>
|
||||
<Form
|
||||
initialValues={data && data.bills_by_pk}
|
||||
@@ -99,7 +96,6 @@ export function BillDetailEditReturn({
|
||||
<tr>
|
||||
<td>
|
||||
<Checkbox
|
||||
data-cy="billline-checkbox"
|
||||
onChange={(e) => {
|
||||
form.setFieldsValue({
|
||||
billlines: form
|
||||
@@ -154,7 +150,6 @@ export function BillDetailEditReturn({
|
||||
// label={t("joblines.fields.actual_price")}
|
||||
key={`${index}actual_price`}
|
||||
name={[field.name, "actual_price"]}
|
||||
data-cy="billline-actual-price"
|
||||
>
|
||||
<ReadOnlyFormItemComponent type="currency" />
|
||||
</Form.Item>
|
||||
@@ -178,7 +173,6 @@ export function BillDetailEditReturn({
|
||||
</Form>
|
||||
</Modal>
|
||||
<Button
|
||||
data-cy="return-items-button"
|
||||
disabled={data.bills_by_pk.is_credit_memo || disabled}
|
||||
onClick={() => {
|
||||
setVisible(true);
|
||||
|
||||
@@ -362,16 +362,11 @@ function BillEnterModalContainer({
|
||||
{t("bills.labels.generatepartslabel")}
|
||||
</Checkbox>
|
||||
<Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>
|
||||
<Button
|
||||
data-cy="bill-form-save-button"
|
||||
loading={loading}
|
||||
onClick={() => form.submit()}
|
||||
>
|
||||
<Button loading={loading} onClick={() => form.submit()}>
|
||||
{t("general.actions.save")}
|
||||
</Button>
|
||||
{billEnterModal.context && billEnterModal.context.id ? null : (
|
||||
<Button
|
||||
data-cy="bill-form-savenew-button"
|
||||
type="primary"
|
||||
loading={loading}
|
||||
onClick={() => {
|
||||
|
||||
@@ -177,7 +177,6 @@ export function BillFormComponent({
|
||||
]}
|
||||
>
|
||||
<VendorSearchSelect
|
||||
className="ant-select-bill-vendor"
|
||||
disabled={disabled}
|
||||
options={vendorAutoCompleteOptions}
|
||||
onSelect={handleVendorSelect}
|
||||
@@ -250,10 +249,7 @@ export function BillFormComponent({
|
||||
}),
|
||||
]}
|
||||
>
|
||||
<Input
|
||||
data-cy="bill-form-invoice"
|
||||
disabled={disabled || disableInvNumber}
|
||||
/>
|
||||
<Input disabled={disabled || disableInvNumber} />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
label={t("bills.fields.date")}
|
||||
@@ -265,7 +261,7 @@ export function BillFormComponent({
|
||||
},
|
||||
]}
|
||||
>
|
||||
<FormDatePicker id="bill-form-date" disabled={disabled} />
|
||||
<FormDatePicker disabled={disabled} />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
label={t("bills.fields.is_credit_memo")}
|
||||
@@ -304,10 +300,9 @@ export function BillFormComponent({
|
||||
}),
|
||||
]}
|
||||
>
|
||||
<Switch data-cy="is-credit-memo-switch" />
|
||||
<Switch />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
data-cy="bill-form-bill-total"
|
||||
label={t("bills.fields.total")}
|
||||
name="total"
|
||||
rules={[
|
||||
@@ -321,12 +316,7 @@ export function BillFormComponent({
|
||||
</Form.Item>
|
||||
{!billEdit && (
|
||||
<Form.Item label={t("bills.fields.allpartslocation")} name="location">
|
||||
<Select
|
||||
data-cy="bill-form-parts-bin"
|
||||
style={{ width: "10rem" }}
|
||||
disabled={disabled}
|
||||
allowClear
|
||||
>
|
||||
<Select style={{ width: "10rem" }} disabled={disabled} allowClear>
|
||||
{bodyshop.md_parts_locations.map((loc, idx) => (
|
||||
<Select.Option key={idx} value={loc}>
|
||||
{loc}
|
||||
@@ -385,29 +375,17 @@ export function BillFormComponent({
|
||||
/>
|
||||
<Statistic
|
||||
title={t("bills.labels.federal_tax")}
|
||||
valueRender={() => (
|
||||
<span data-cy="bill-form-tax">
|
||||
{totals.federalTax.toFormat()}
|
||||
</span>
|
||||
)}
|
||||
value={totals.federalTax.toFormat()}
|
||||
precision={2}
|
||||
/>
|
||||
<Statistic
|
||||
title={t("bills.labels.state_tax")}
|
||||
valueRender={() => (
|
||||
<span data-cy="bill-form-tax">
|
||||
{totals.stateTax.toFormat()}
|
||||
</span>
|
||||
)}
|
||||
value={totals.stateTax.toFormat()}
|
||||
precision={2}
|
||||
/>
|
||||
<Statistic
|
||||
title={t("bills.labels.local_tax")}
|
||||
valueRender={() => (
|
||||
<span data-cy="bill-form-tax">
|
||||
{totals.localTax.toFormat()}
|
||||
</span>
|
||||
)}
|
||||
value={totals.localTax.toFormat()}
|
||||
precision={2}
|
||||
/>
|
||||
<Statistic
|
||||
@@ -428,12 +406,7 @@ export function BillFormComponent({
|
||||
? "green"
|
||||
: "red",
|
||||
}}
|
||||
// value={totals.discrepancy.toFormat()}
|
||||
valueRender={() => (
|
||||
<span id="bill-form-discrepancy">
|
||||
{totals.discrepancy.toFormat()}
|
||||
</span>
|
||||
)}
|
||||
value={totals.discrepancy.toFormat()}
|
||||
precision={2}
|
||||
/>
|
||||
</Space>
|
||||
@@ -483,20 +456,19 @@ export function BillFormComponent({
|
||||
}}
|
||||
>
|
||||
<Upload.Dragger
|
||||
id="bill-image-upload"
|
||||
multiple={true}
|
||||
name="logo"
|
||||
beforeUpload={() => false}
|
||||
listType="picture"
|
||||
>
|
||||
<div>
|
||||
<>
|
||||
<p className="ant-upload-drag-icon">
|
||||
<UploadOutlined />
|
||||
</p>
|
||||
<p className="ant-upload-text">
|
||||
Click or drag files to this area to upload.
|
||||
</p>
|
||||
</div>
|
||||
</>
|
||||
</Upload.Dragger>
|
||||
</Form.Item>
|
||||
</div>
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
import { DeleteFilled, DollarCircleFilled } from "@ant-design/icons";
|
||||
import { useTreatments } from "@splitsoftware/splitio-react";
|
||||
import {
|
||||
Button,
|
||||
Form,
|
||||
Button, Form,
|
||||
Input,
|
||||
InputNumber,
|
||||
Select,
|
||||
Space,
|
||||
Switch,
|
||||
Table,
|
||||
Tooltip,
|
||||
Tooltip
|
||||
} from "antd";
|
||||
import React from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
@@ -80,7 +79,6 @@ export function BillEnterModalLinesComponent({
|
||||
),
|
||||
formInput: (record, index) => (
|
||||
<BillLineSearchSelect
|
||||
className="ant-select-bill-line"
|
||||
disabled={disabled}
|
||||
options={lineData}
|
||||
style={{ width: "100%", minWidth: "10rem" }}
|
||||
@@ -134,9 +132,7 @@ export function BillEnterModalLinesComponent({
|
||||
],
|
||||
};
|
||||
},
|
||||
formInput: (record, index) => (
|
||||
<Input data-cy="bill-line-line-desc" disabled={disabled} />
|
||||
),
|
||||
formInput: (record, index) => <Input disabled={disabled} />,
|
||||
},
|
||||
{
|
||||
title: t("billlines.fields.quantity"),
|
||||
@@ -198,7 +194,6 @@ export function BillEnterModalLinesComponent({
|
||||
},
|
||||
formInput: (record, index) => (
|
||||
<CurrencyInput
|
||||
data-cy="bill-line-actual-price"
|
||||
min={0}
|
||||
disabled={disabled}
|
||||
onBlur={(e) => {
|
||||
@@ -246,7 +241,6 @@ export function BillEnterModalLinesComponent({
|
||||
},
|
||||
formInput: (record, index) => (
|
||||
<CurrencyInput
|
||||
data-cy="bill-line-actual-cost"
|
||||
min={0}
|
||||
disabled={disabled}
|
||||
controls={false}
|
||||
@@ -319,12 +313,7 @@ export function BillEnterModalLinesComponent({
|
||||
};
|
||||
},
|
||||
formInput: (record, index) => (
|
||||
<Select
|
||||
showSearch
|
||||
style={{ minWidth: "3rem" }}
|
||||
disabled={disabled}
|
||||
className="ant-select-bill-cost-center"
|
||||
>
|
||||
<Select showSearch style={{ minWidth: "3rem" }} disabled={disabled}>
|
||||
{bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
|
||||
? CiecaSelect(true, false)
|
||||
: responsibilityCenters.costs.map((item) => (
|
||||
@@ -583,7 +572,6 @@ export function BillEnterModalLinesComponent({
|
||||
return (
|
||||
<>
|
||||
<Table
|
||||
data-cy="bill-line-table"
|
||||
components={{
|
||||
body: {
|
||||
cell: EditableCell,
|
||||
@@ -599,7 +587,6 @@ export function BillEnterModalLinesComponent({
|
||||
/>
|
||||
<Form.Item>
|
||||
<Button
|
||||
data-cy="bill-line-add-button"
|
||||
disabled={disabled}
|
||||
onClick={() => {
|
||||
add();
|
||||
|
||||
@@ -32,7 +32,6 @@ export function BillMarkExportedButton({
|
||||
bodyshop,
|
||||
authLevel,
|
||||
bill,
|
||||
...props
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
const [loading, setLoading] = useState(false);
|
||||
@@ -93,12 +92,7 @@ export function BillMarkExportedButton({
|
||||
|
||||
if (hasAccess)
|
||||
return (
|
||||
<Button
|
||||
loading={loading}
|
||||
disabled={bill.exported}
|
||||
onClick={handleUpdate}
|
||||
{...props}
|
||||
>
|
||||
<Button loading={loading} disabled={bill.exported} onClick={handleUpdate}>
|
||||
{t("bills.labels.markexported")}
|
||||
</Button>
|
||||
);
|
||||
|
||||
@@ -24,12 +24,7 @@ export default connect(
|
||||
mapDispatchToProps
|
||||
)(BillMarkForReexportButton);
|
||||
|
||||
export function BillMarkForReexportButton({
|
||||
bodyshop,
|
||||
authLevel,
|
||||
bill,
|
||||
...props
|
||||
}) {
|
||||
export function BillMarkForReexportButton({ bodyshop, authLevel, bill }) {
|
||||
const { t } = useTranslation();
|
||||
const [loading, setLoading] = useState(false);
|
||||
|
||||
@@ -78,7 +73,6 @@ export function BillMarkForReexportButton({
|
||||
loading={loading}
|
||||
disabled={!bill.exported}
|
||||
onClick={handleUpdate}
|
||||
{...props}
|
||||
>
|
||||
{t("bills.labels.markforreexport")}
|
||||
</Button>
|
||||
|
||||
@@ -54,10 +54,7 @@ export function BillsListTableComponent({
|
||||
const recordActions = (record, showView = false) => (
|
||||
<Space wrap>
|
||||
{showView && (
|
||||
<Button
|
||||
onClick={() => handleOnRowClick(record)}
|
||||
data-cy="edit-bill-button"
|
||||
>
|
||||
<Button onClick={() => handleOnRowClick(record)}>
|
||||
<EditFilled />
|
||||
</Button>
|
||||
)}
|
||||
@@ -129,12 +126,7 @@ export function BillsListTableComponent({
|
||||
sortOrder:
|
||||
state.sortedInfo.columnKey === "is_credit_memo" &&
|
||||
state.sortedInfo.order,
|
||||
render: (text, record) => (
|
||||
<Checkbox
|
||||
data-cy="credit-memo-checkbox"
|
||||
checked={record.is_credit_memo}
|
||||
/>
|
||||
),
|
||||
render: (text, record) => <Checkbox checked={record.is_credit_memo} />,
|
||||
},
|
||||
{
|
||||
title: t("bills.fields.exported"),
|
||||
@@ -143,9 +135,7 @@ export function BillsListTableComponent({
|
||||
sorter: (a, b) => a.exported - b.exported,
|
||||
sortOrder:
|
||||
state.sortedInfo.columnKey === "exported" && state.sortedInfo.order,
|
||||
render: (text, record) => (
|
||||
<Checkbox data-cy="bill-exported-checkbox" checked={record.exported} />
|
||||
),
|
||||
render: (text, record) => <Checkbox checked={record.exported} />,
|
||||
},
|
||||
{
|
||||
title: t("general.labels.actions"),
|
||||
@@ -188,7 +178,6 @@ export function BillsListTableComponent({
|
||||
{job && job.converted ? (
|
||||
<>
|
||||
<Button
|
||||
data-cy="bills-post-button"
|
||||
onClick={() => {
|
||||
setBillEnterContext({
|
||||
actions: { refetch: billsQuery.refetch },
|
||||
@@ -228,7 +217,6 @@ export function BillsListTableComponent({
|
||||
}
|
||||
>
|
||||
<Table
|
||||
data-cy="bills-table"
|
||||
loading={billsQuery.loading}
|
||||
scroll={{
|
||||
x: true, // y: "50rem"
|
||||
|
||||
@@ -7,9 +7,7 @@ import { createStructuredSelector } from "reselect";
|
||||
import { selectBreadcrumbs } from "../../redux/application/application.selectors";
|
||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||
import GlobalSearch from "../global-search/global-search.component";
|
||||
import GlobalSearchOs from "../global-search/global-search-os.component";
|
||||
import "./breadcrumbs.styles.scss";
|
||||
import { useTreatments } from "@splitsoftware/splitio-react";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
breadcrumbs: selectBreadcrumbs,
|
||||
@@ -17,12 +15,6 @@ const mapStateToProps = createStructuredSelector({
|
||||
});
|
||||
|
||||
export function BreadCrumbs({ breadcrumbs, bodyshop }) {
|
||||
const { OpenSearch } = useTreatments(
|
||||
["OpenSearch"],
|
||||
{},
|
||||
bodyshop && bodyshop.imexshopid
|
||||
);
|
||||
|
||||
return (
|
||||
<Row className="breadcrumb-container">
|
||||
<Col xs={24} sm={24} md={16}>
|
||||
@@ -46,7 +38,7 @@ export function BreadCrumbs({ breadcrumbs, bodyshop }) {
|
||||
</Breadcrumb>
|
||||
</Col>
|
||||
<Col xs={24} sm={24} md={8}>
|
||||
{OpenSearch.treatment === "on" ? <GlobalSearchOs /> : <GlobalSearch />}
|
||||
<GlobalSearch />
|
||||
</Col>
|
||||
</Row>
|
||||
);
|
||||
|
||||
@@ -10,10 +10,7 @@ export default function CABCpvrtCalculator({ disabled, form }) {
|
||||
|
||||
const handleFinish = async (values) => {
|
||||
logImEXEvent("job_ca_bc_pvrt_calculate");
|
||||
form.setFieldsValue({
|
||||
ca_bc_pvrt: ((values.rate || 0) * (values.days || 0)).toFixed(2),
|
||||
});
|
||||
form.setFields([{ name: "ca_bc_pvrt", touched: true }]);
|
||||
form.setFieldsValue({ ca_bc_pvrt: ((values.rate||0) * (values.days||0)).toFixed(2) });
|
||||
setVisibility(false);
|
||||
};
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Badge, List, Tag } from "antd";
|
||||
import React, { useEffect } from "react";
|
||||
import React from "react";
|
||||
import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import { setSelectedConversation } from "../../redux/messaging/messaging.actions";
|
||||
@@ -7,8 +7,6 @@ import { selectSelectedConversation } from "../../redux/messaging/messaging.sele
|
||||
import { TimeAgoFormatter } from "../../utils/DateFormatter";
|
||||
import PhoneFormatter from "../../utils/PhoneFormatter";
|
||||
import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
|
||||
import { List as VirtualizedList, AutoSizer } from "react-virtualized";
|
||||
|
||||
import "./chat-conversation-list.styles.scss";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
@@ -20,86 +18,59 @@ const mapDispatchToProps = (dispatch) => ({
|
||||
dispatch(setSelectedConversation(conversationId)),
|
||||
});
|
||||
|
||||
function ChatConversationListComponent({
|
||||
export function ChatConversationListComponent({
|
||||
conversationList,
|
||||
selectedConversation,
|
||||
setSelectedConversation,
|
||||
subscribeToMoreConversations,
|
||||
loadMoreConversations,
|
||||
}) {
|
||||
useEffect(
|
||||
() => subscribeToMoreConversations(),
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
[]
|
||||
);
|
||||
|
||||
const rowRenderer = ({ index, key, style }) => {
|
||||
const item = conversationList[index];
|
||||
|
||||
return (
|
||||
<List.Item
|
||||
key={key}
|
||||
onClick={() => setSelectedConversation(item.id)}
|
||||
className={`chat-list-item ${
|
||||
item.id === selectedConversation
|
||||
? "chat-list-selected-conversation"
|
||||
: null
|
||||
}`}
|
||||
style={style}
|
||||
>
|
||||
<div sryle={{ display: "inline-block" }}>
|
||||
{item.label && <div className="chat-name">{item.label}</div>}
|
||||
{item.job_conversations.length > 0 ? (
|
||||
<div className="chat-name">
|
||||
{item.job_conversations.map((j, idx) => (
|
||||
<div key={idx}>
|
||||
<OwnerNameDisplay ownerObject={j.job} />
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
) : (
|
||||
<PhoneFormatter>{item.phone_num}</PhoneFormatter>
|
||||
)}
|
||||
</div>
|
||||
<div sryle={{ display: "inline-block" }}>
|
||||
<div>
|
||||
{item.job_conversations.length > 0
|
||||
? item.job_conversations.map((j, idx) => (
|
||||
<Tag key={idx} className="ro-number-tag">
|
||||
{j.job.ro_number}
|
||||
</Tag>
|
||||
))
|
||||
: null}
|
||||
</div>
|
||||
<TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>
|
||||
</div>
|
||||
<Badge count={item.messages_aggregate.aggregate.count || 0} />
|
||||
</List.Item>
|
||||
);
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="chat-list-container">
|
||||
<AutoSizer>
|
||||
{({ height, width }) => (
|
||||
<VirtualizedList
|
||||
height={height}
|
||||
width={width}
|
||||
rowCount={conversationList.length}
|
||||
rowHeight={60}
|
||||
rowRenderer={rowRenderer}
|
||||
onScroll={({ scrollTop, scrollHeight, clientHeight }) => {
|
||||
if (scrollTop + clientHeight === scrollHeight) {
|
||||
loadMoreConversations();
|
||||
}
|
||||
}}
|
||||
/>
|
||||
<List
|
||||
bordered
|
||||
dataSource={conversationList}
|
||||
renderItem={(item) => (
|
||||
<List.Item
|
||||
key={item.id}
|
||||
onClick={() => setSelectedConversation(item.id)}
|
||||
className={`chat-list-item ${
|
||||
item.id === selectedConversation
|
||||
? "chat-list-selected-conversation"
|
||||
: null
|
||||
}`}
|
||||
>
|
||||
<div sryle={{ display: "inline-block" }}>
|
||||
{item.label && <div className="chat-name">{item.label}</div>}
|
||||
{item.job_conversations.length > 0 ? (
|
||||
<div className="chat-name">
|
||||
{item.job_conversations.map((j, idx) => (
|
||||
<div key={idx}>
|
||||
<OwnerNameDisplay ownerObject={j.job} />
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
) : (
|
||||
<PhoneFormatter>{item.phone_num}</PhoneFormatter>
|
||||
)}
|
||||
</div>
|
||||
<div sryle={{ display: "inline-block" }}>
|
||||
<div>
|
||||
{item.job_conversations.length > 0
|
||||
? item.job_conversations.map((j, idx) => (
|
||||
<Tag key={idx} className="ro-number-tag">
|
||||
{j.job.ro_number}
|
||||
</Tag>
|
||||
))
|
||||
: null}
|
||||
</div>
|
||||
<TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>
|
||||
</div>
|
||||
<Badge count={item.messages_aggregate.aggregate.count || 0} />
|
||||
</List.Item>
|
||||
)}
|
||||
</AutoSizer>
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default connect(
|
||||
mapStateToProps,
|
||||
mapDispatchToProps
|
||||
|
||||
@@ -3,9 +3,8 @@
|
||||
}
|
||||
.chat-list-container {
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
overflow: auto;
|
||||
height: 100%;
|
||||
border: 1px solid gainsboro;
|
||||
}
|
||||
|
||||
.chat-list-item {
|
||||
@@ -22,6 +21,4 @@
|
||||
.ro-number-tag {
|
||||
align-self: baseline;
|
||||
}
|
||||
padding: 12px 24px;
|
||||
border-bottom: 1px solid gainsboro;
|
||||
}
|
||||
|
||||
@@ -42,7 +42,6 @@ export function ChatConversationContainer({ bodyshop, selectedConversation }) {
|
||||
MARK_MESSAGES_AS_READ_BY_CONVERSATION,
|
||||
{
|
||||
variables: { conversationId: selectedConversation },
|
||||
refetchQueries: ["UNREAD_CONVERSATION_COUNT"],
|
||||
update(cache) {
|
||||
cache.modify({
|
||||
id: cache.identify({
|
||||
|
||||
@@ -4,17 +4,13 @@ import {
|
||||
ShrinkOutlined,
|
||||
SyncOutlined,
|
||||
} from "@ant-design/icons";
|
||||
import { useLazyQuery, useSubscription } from "@apollo/client";
|
||||
import { useQuery } from "@apollo/client";
|
||||
import { Badge, Card, Col, Row, Space, Tag, Tooltip, Typography } from "antd";
|
||||
import React, { useCallback, useEffect, useState } from "react";
|
||||
import React, { useEffect, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import {
|
||||
CONVERSATION_LIST_QUERY,
|
||||
CONVERSATION_LIST_SUBSCRIPTION,
|
||||
UNREAD_CONVERSATION_COUNT_SUBSCRIPTION,
|
||||
} from "../../graphql/conversations.queries";
|
||||
import { CONVERSATION_LIST_QUERY } from "../../graphql/conversations.queries";
|
||||
import { toggleChatVisible } from "../../redux/messaging/messaging.actions";
|
||||
import {
|
||||
selectChatVisible,
|
||||
@@ -41,18 +37,10 @@ export function ChatPopupComponent({
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
const [pollInterval, setpollInterval] = useState(0);
|
||||
|
||||
const { data: unreadData } = useSubscription(
|
||||
UNREAD_CONVERSATION_COUNT_SUBSCRIPTION
|
||||
);
|
||||
|
||||
const [
|
||||
getConversations,
|
||||
{ loading, data, called, refetch, fetchMore, subscribeToMore },
|
||||
] = useLazyQuery(CONVERSATION_LIST_QUERY, {
|
||||
const { loading, data, refetch, called } = useQuery(CONVERSATION_LIST_QUERY, {
|
||||
fetchPolicy: "network-only",
|
||||
nextFetchPolicy: "network-only",
|
||||
skip: !chatVisible,
|
||||
...(pollInterval > 0 ? { pollInterval } : {}),
|
||||
});
|
||||
|
||||
const fcmToken = sessionStorage.getItem("fcmtoken");
|
||||
@@ -66,24 +54,15 @@ export function ChatPopupComponent({
|
||||
}, [fcmToken]);
|
||||
|
||||
useEffect(() => {
|
||||
if (called && chatVisible)
|
||||
getConversations({
|
||||
variables: {
|
||||
offset: 0,
|
||||
},
|
||||
});
|
||||
}, [chatVisible, called, getConversations]);
|
||||
if (called && chatVisible) refetch();
|
||||
}, [chatVisible, called, refetch]);
|
||||
|
||||
const loadMoreConversations = useCallback(() => {
|
||||
if (data)
|
||||
fetchMore({
|
||||
variables: {
|
||||
offset: data.conversations.length,
|
||||
},
|
||||
});
|
||||
}, [data, fetchMore]);
|
||||
|
||||
const unreadCount = unreadData?.messages_aggregate.aggregate.count || 0;
|
||||
const unreadCount = data
|
||||
? data.conversations.reduce(
|
||||
(acc, val) => val.messages_aggregate.aggregate.count + acc,
|
||||
0
|
||||
)
|
||||
: 0;
|
||||
|
||||
return (
|
||||
<Badge count={unreadCount}>
|
||||
@@ -118,44 +97,6 @@ export function ChatPopupComponent({
|
||||
) : (
|
||||
<ChatConversationListComponent
|
||||
conversationList={data ? data.conversations : []}
|
||||
loadMoreConversations={loadMoreConversations}
|
||||
subscribeToMoreConversations={() =>
|
||||
subscribeToMore({
|
||||
document: CONVERSATION_LIST_SUBSCRIPTION,
|
||||
variables: { offset: 0 },
|
||||
updateQuery: (prev, { subscriptionData }) => {
|
||||
if (
|
||||
!subscriptionData.data ||
|
||||
subscriptionData.data.conversations.length === 0
|
||||
)
|
||||
return prev;
|
||||
|
||||
let conversations = [...prev.conversations];
|
||||
const newConversations =
|
||||
subscriptionData.data.conversations;
|
||||
|
||||
for (const conversation of newConversations) {
|
||||
const index = conversations.findIndex(
|
||||
(prevConversation) =>
|
||||
prevConversation.id === conversation.id
|
||||
);
|
||||
|
||||
if (index !== -1) {
|
||||
conversations.splice(index, 1);
|
||||
conversations.unshift(conversation);
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
conversations.unshift(conversation);
|
||||
}
|
||||
|
||||
return Object.assign({}, prev, {
|
||||
conversations: conversations,
|
||||
});
|
||||
},
|
||||
})
|
||||
}
|
||||
/>
|
||||
)}
|
||||
</Col>
|
||||
|
||||
@@ -16,7 +16,7 @@ export default function JobIntakeFormCheckboxComponent({ formItem, readOnly }) {
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Checkbox data-cy="checklist-item-checkbox" disabled={readOnly} />
|
||||
<Checkbox disabled={readOnly} />
|
||||
</Form.Item>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ import FormTypes from "./config-form-types";
|
||||
|
||||
export default function ConfirmFormComponents({ componentList, readOnly }) {
|
||||
return (
|
||||
<div data-cy="config-form-components">
|
||||
<div>
|
||||
{componentList.map((f, idx) => {
|
||||
const Comp = FormTypes[f.type];
|
||||
|
||||
|
||||
@@ -4,18 +4,6 @@ import React from "react";
|
||||
export default function JobIntakeFormCheckboxComponent({ formItem, readOnly }) {
|
||||
const { name, label, required, min, max } = formItem;
|
||||
|
||||
const marks = {
|
||||
[min]: {
|
||||
label: <span style={{ height: 0 }}> </span>,
|
||||
},
|
||||
[max / 2]: {
|
||||
label: <span style={{ height: 0 }}> </span>,
|
||||
},
|
||||
[max]: {
|
||||
label: <span style={{ height: 0 }}> </span>,
|
||||
},
|
||||
};
|
||||
|
||||
return (
|
||||
<Form.Item
|
||||
name={name}
|
||||
@@ -27,13 +15,7 @@ export default function JobIntakeFormCheckboxComponent({ formItem, readOnly }) {
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Slider
|
||||
disabled={readOnly}
|
||||
min={min || 0}
|
||||
max={max || 10}
|
||||
marks={marks}
|
||||
style={{ marginBottom: 0, marginTop: 0 }}
|
||||
/>
|
||||
<Slider disabled={readOnly} min={min || 0} max={max || 10} />
|
||||
</Form.Item>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ import moment from "moment";
|
||||
import React from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { DateFormatter } from "../../utils/DateFormatter";
|
||||
//import ContractLicenseDecodeButton from "../contract-license-decode-button/contract-license-decode-button.component";
|
||||
import ContractLicenseDecodeButton from "../contract-license-decode-button/contract-license-decode-button.component";
|
||||
import ContractStatusSelector from "../contract-status-select/contract-status-select.component";
|
||||
import ContractsRatesChangeButton from "../contracts-rates-change-button/contracts-rates-change-button.component";
|
||||
import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel-select.component";
|
||||
@@ -165,9 +165,7 @@ export default function ContractFormComponent({
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
{
|
||||
//<ContractLicenseDecodeButton form={form} />
|
||||
}
|
||||
<ContractLicenseDecodeButton form={form} />
|
||||
</Space>
|
||||
</div>
|
||||
<LayoutFormRow header={t("contracts.labels.driverinformation")}>
|
||||
|
||||
@@ -8,8 +8,6 @@ export default function DataLabel({
|
||||
vertical,
|
||||
visible = true,
|
||||
valueStyle = {},
|
||||
valueClassName,
|
||||
onValueClick,
|
||||
...props
|
||||
}) {
|
||||
if (!visible || (hideIfNull && !!!children)) return null;
|
||||
@@ -30,10 +28,7 @@ export default function DataLabel({
|
||||
marginLeft: ".3rem",
|
||||
fontWeight: "bolder",
|
||||
wordWrap: "break-word",
|
||||
cursor: onValueClick !== undefined ? "pointer" : "",
|
||||
}}
|
||||
className={valueClassName}
|
||||
onClick={onValueClick}
|
||||
>
|
||||
{typeof children === "string" ? (
|
||||
<Typography.Text style={valueStyle}>{children}</Typography.Text>
|
||||
|
||||
@@ -35,7 +35,6 @@ export function DocumentsLocalUploadComponent({
|
||||
|
||||
return (
|
||||
<Upload.Dragger
|
||||
id="bill-document-upload"
|
||||
multiple={true}
|
||||
fileList={fileList}
|
||||
onChange={(f) => {
|
||||
|
||||
@@ -1,28 +1,28 @@
|
||||
import { UploadOutlined, UserAddOutlined } from "@ant-design/icons";
|
||||
import {
|
||||
Button,
|
||||
Divider,
|
||||
Dropdown,
|
||||
Form,
|
||||
Input,
|
||||
Menu,
|
||||
Select,
|
||||
Space,
|
||||
Tabs,
|
||||
Upload,
|
||||
Space,
|
||||
Menu,
|
||||
Dropdown,
|
||||
Button,
|
||||
} from "antd";
|
||||
import _ from "lodash";
|
||||
import React from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import EmailDocumentsComponent from "../email-documents/email-documents.component";
|
||||
import _ from "lodash";
|
||||
import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import { selectEmailConfig } from "../../redux/email/email.selectors";
|
||||
import {
|
||||
selectBodyshop,
|
||||
selectCurrentUser,
|
||||
} from "../../redux/user/user.selectors";
|
||||
import { CreateExplorerLinkForJob } from "../../utils/localmedia";
|
||||
import EmailDocumentsComponent from "../email-documents/email-documents.component";
|
||||
import { selectEmailConfig } from "../../redux/email/email.selectors";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
bodyshop: selectBodyshop,
|
||||
@@ -54,15 +54,6 @@ export function EmailOverlayComponent({
|
||||
]),
|
||||
});
|
||||
};
|
||||
const handle_CC_Click = ({ item, key, keyPath }) => {
|
||||
const email = item.props.value;
|
||||
form.setFieldsValue({
|
||||
cc: _.uniq([
|
||||
...(form.getFieldValue("cc") || ""),
|
||||
...(typeof email === "string" ? [email] : email),
|
||||
]),
|
||||
});
|
||||
};
|
||||
|
||||
const menu = (
|
||||
<div>
|
||||
@@ -83,25 +74,6 @@ export function EmailOverlayComponent({
|
||||
</div>
|
||||
);
|
||||
|
||||
const menuCC = (
|
||||
<div>
|
||||
<Menu onClick={handle_CC_Click}>
|
||||
{bodyshop.employees
|
||||
.filter((e) => e.user_email)
|
||||
.map((e, idx) => (
|
||||
<Menu.Item value={e.user_email} key={idx}>
|
||||
{`${e.first_name} ${e.last_name}`}
|
||||
</Menu.Item>
|
||||
))}
|
||||
{bodyshop.md_to_emails.map((e, idx) => (
|
||||
<Menu.Item value={e.emails} key={idx + "group"}>
|
||||
{e.label}
|
||||
</Menu.Item>
|
||||
))}
|
||||
</Menu>
|
||||
</div>
|
||||
);
|
||||
|
||||
return (
|
||||
<div>
|
||||
<Form.Item
|
||||
@@ -150,23 +122,7 @@ export function EmailOverlayComponent({
|
||||
>
|
||||
<Select mode="tags" tokenSeparators={[",", ";"]} />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
label={
|
||||
<Space>
|
||||
{t("emails.fields.cc")}
|
||||
<Dropdown overlay={menuCC}>
|
||||
<a
|
||||
className="ant-dropdown-link"
|
||||
href=" #"
|
||||
onClick={(e) => e.preventDefault()}
|
||||
>
|
||||
<UserAddOutlined />
|
||||
</a>
|
||||
</Dropdown>
|
||||
</Space>
|
||||
}
|
||||
name="cc"
|
||||
>
|
||||
<Form.Item label={t("emails.fields.cc")} name="cc">
|
||||
<Select mode="tags" tokenSeparators={[",", ";"]} />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
|
||||
@@ -5,11 +5,13 @@ const ReadOnlyFormItem = ({ value, type = "text", onChange }, ref) => {
|
||||
if (!value) return null;
|
||||
switch (type) {
|
||||
case "text":
|
||||
return <>{value}</>;
|
||||
return <div>{value}</div>;
|
||||
case "currency":
|
||||
return <>{Dinero({ amount: Math.round(value * 100) }).toFormat()}</>;
|
||||
return (
|
||||
<div>{Dinero({ amount: Math.round(value * 100) }).toFormat()}</div>
|
||||
);
|
||||
default:
|
||||
return <>{value}</>;
|
||||
return <div>{value}</div>;
|
||||
}
|
||||
};
|
||||
export default forwardRef(ReadOnlyFormItem);
|
||||
|
||||
@@ -1,216 +0,0 @@
|
||||
import { AutoComplete, Divider, Input, Space } from "antd";
|
||||
import axios from "axios";
|
||||
import _ from "lodash";
|
||||
import React, { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Link, useHistory } from "react-router-dom";
|
||||
import PhoneNumberFormatter from "../../utils/PhoneFormatter";
|
||||
import OwnerNameDisplay, {
|
||||
OwnerNameDisplayFunction,
|
||||
} from "../owner-name-display/owner-name-display.component";
|
||||
import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
|
||||
|
||||
export default function GlobalSearchOs() {
|
||||
const { t } = useTranslation();
|
||||
const history = useHistory();
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [data, setData] = useState(false);
|
||||
|
||||
const executeSearch = async (v) => {
|
||||
if (v && v && v !== "" && v.length >= 3) {
|
||||
try {
|
||||
setLoading(true);
|
||||
const searchData = await axios.post("/search", {
|
||||
search: v,
|
||||
});
|
||||
|
||||
const resultsByType = {
|
||||
payments: [],
|
||||
jobs: [],
|
||||
bills: [],
|
||||
owners: [],
|
||||
vehicles: [],
|
||||
};
|
||||
|
||||
searchData.data.hits.hits.forEach((hit) => {
|
||||
resultsByType[hit._index].push(hit._source);
|
||||
});
|
||||
setData([
|
||||
{
|
||||
label: renderTitle(t("menus.header.search.jobs")),
|
||||
options: resultsByType.jobs.map((job) => {
|
||||
return {
|
||||
key: job.id,
|
||||
value: job.ro_number || "N/A",
|
||||
label: (
|
||||
<Link to={`/manage/jobs/${job.id}`}>
|
||||
<Space size="small" split={<Divider type="vertical" />}>
|
||||
<strong>{job.ro_number || t("general.labels.na")}</strong>
|
||||
<span>{`${job.status || ""}`}</span>
|
||||
<span>
|
||||
<OwnerNameDisplay ownerObject={job} />
|
||||
</span>
|
||||
<span>{`${job.v_model_yr || ""} ${
|
||||
job.v_make_desc || ""
|
||||
} ${job.v_model_desc || ""}`}</span>
|
||||
<span>{`${job.clm_no || ""}`}</span>
|
||||
</Space>
|
||||
</Link>
|
||||
),
|
||||
};
|
||||
}),
|
||||
},
|
||||
{
|
||||
label: renderTitle(t("menus.header.search.owners")),
|
||||
options: resultsByType.owners.map((owner) => {
|
||||
return {
|
||||
key: owner.id,
|
||||
value: OwnerNameDisplayFunction(owner),
|
||||
label: (
|
||||
<Link to={`/manage/owners/${owner.id}`}>
|
||||
<Space
|
||||
size="small"
|
||||
split={<Divider type="vertical" />}
|
||||
wrap
|
||||
>
|
||||
<span>
|
||||
<OwnerNameDisplay ownerObject={owner} />
|
||||
</span>
|
||||
<PhoneNumberFormatter>
|
||||
{owner.ownr_ph1}
|
||||
</PhoneNumberFormatter>
|
||||
<PhoneNumberFormatter>
|
||||
{owner.ownr_ph2}
|
||||
</PhoneNumberFormatter>
|
||||
</Space>
|
||||
</Link>
|
||||
),
|
||||
};
|
||||
}),
|
||||
},
|
||||
{
|
||||
label: renderTitle(t("menus.header.search.vehicles")),
|
||||
options: resultsByType.vehicles.map((vehicle) => {
|
||||
return {
|
||||
key: vehicle.id,
|
||||
value: `${vehicle.v_model_yr || ""} ${
|
||||
vehicle.v_make_desc || ""
|
||||
} ${vehicle.v_model_desc || ""}`,
|
||||
label: (
|
||||
<Link to={`/manage/vehicles/${vehicle.id}`}>
|
||||
<Space size="small" split={<Divider type="vertical" />}>
|
||||
<span>
|
||||
{`${vehicle.v_model_yr || ""} ${
|
||||
vehicle.v_make_desc || ""
|
||||
} ${vehicle.v_model_desc || ""}`}
|
||||
</span>
|
||||
<span>{vehicle.plate_no || ""}</span>
|
||||
<span>
|
||||
<VehicleVinDisplay>
|
||||
{vehicle.v_vin || ""}
|
||||
</VehicleVinDisplay>
|
||||
</span>
|
||||
</Space>
|
||||
</Link>
|
||||
),
|
||||
};
|
||||
}),
|
||||
},
|
||||
{
|
||||
label: renderTitle(t("menus.header.search.payments")),
|
||||
options: resultsByType.payments.map((payment) => {
|
||||
return {
|
||||
key: payment.id,
|
||||
value: `${payment.job?.ro_number} ${payment.amount}`,
|
||||
label: (
|
||||
<Link to={`/manage/jobs/${payment.job?.id}`}>
|
||||
<Space size="small" split={<Divider type="vertical" />}>
|
||||
<span>{payment.paymentnum}</span>
|
||||
<span>{payment.job?.ro_number}</span>
|
||||
<span>{payment.memo || ""}</span>
|
||||
<span>{payment.amount || ""}</span>
|
||||
<span>{payment.transactionid || ""}</span>
|
||||
</Space>
|
||||
</Link>
|
||||
),
|
||||
};
|
||||
}),
|
||||
},
|
||||
{
|
||||
label: renderTitle(t("menus.header.search.bills")),
|
||||
options: resultsByType.bills.map((bill) => {
|
||||
return {
|
||||
key: bill.id,
|
||||
value: `${bill.invoice_number} - ${bill.vendor.name}`,
|
||||
label: (
|
||||
<Link to={`/manage/bills?billid=${bill.id}`}>
|
||||
<Space size="small" split={<Divider type="vertical" />}>
|
||||
<span>{bill.invoice_number}</span>
|
||||
<span>{bill.vendor.name}</span>
|
||||
<span>{bill.date}</span>
|
||||
</Space>
|
||||
</Link>
|
||||
),
|
||||
};
|
||||
}),
|
||||
},
|
||||
// {
|
||||
// label: renderTitle(t("menus.header.search.phonebook")),
|
||||
// options: resultsByType.search_phonebook.map((pb) => {
|
||||
// return {
|
||||
// key: pb.id,
|
||||
// value: `${pb.firstname || ""} ${pb.lastname || ""} ${
|
||||
// pb.company || ""
|
||||
// }`,
|
||||
// label: (
|
||||
// <Link to={`/manage/phonebook?phonebookentry=${pb.id}`}>
|
||||
// <Space size="small" split={<Divider type="vertical" />}>
|
||||
// <span>{`${pb.firstname || ""} ${pb.lastname || ""} ${
|
||||
// pb.company || ""
|
||||
// }`}</span>
|
||||
// <PhoneNumberFormatter>{pb.phone1}</PhoneNumberFormatter>
|
||||
// <span>{pb.email}</span>
|
||||
// </Space>
|
||||
// </Link>
|
||||
// ),
|
||||
// };
|
||||
// }),
|
||||
// },
|
||||
]);
|
||||
} catch (error) {
|
||||
console.log("Error while fetching search results", error);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}
|
||||
};
|
||||
const debouncedExecuteSearch = _.debounce(executeSearch, 750);
|
||||
|
||||
const handleSearch = (value) => {
|
||||
debouncedExecuteSearch(value);
|
||||
};
|
||||
|
||||
const renderTitle = (title) => {
|
||||
return <span>{title}</span>;
|
||||
};
|
||||
|
||||
return (
|
||||
<AutoComplete
|
||||
options={data}
|
||||
onSearch={handleSearch}
|
||||
defaultActiveFirstOption
|
||||
onSelect={(val, opt) => {
|
||||
history.push(opt.label.props.to);
|
||||
}}
|
||||
onClear={() => setData([])}
|
||||
>
|
||||
<Input.Search
|
||||
size="large"
|
||||
placeholder={t("general.labels.globalsearch")}
|
||||
enterButton
|
||||
allowClear
|
||||
loading={loading}
|
||||
/>
|
||||
</AutoComplete>
|
||||
);
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
import { useLazyQuery } from "@apollo/client";
|
||||
import { AutoComplete, Divider, Input, Space } from "antd";
|
||||
import { LoadingOutlined } from "@ant-design/icons";
|
||||
import { AutoComplete, Divider, Space } from "antd";
|
||||
import _ from "lodash";
|
||||
import React from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
@@ -18,18 +19,11 @@ export default function GlobalSearch() {
|
||||
useLazyQuery(GLOBAL_SEARCH_QUERY);
|
||||
|
||||
const executeSearch = (v) => {
|
||||
if (
|
||||
v &&
|
||||
v.variables.search &&
|
||||
v.variables.search !== "" &&
|
||||
v.variables.search.length >= 3
|
||||
)
|
||||
callSearch(v);
|
||||
if (v && v.variables.search && v.variables.search !== "") callSearch(v);
|
||||
};
|
||||
const debouncedExecuteSearch = _.debounce(executeSearch, 750);
|
||||
|
||||
const handleSearch = (value) => {
|
||||
console.log("Handle Search");
|
||||
debouncedExecuteSearch({ variables: { search: value } });
|
||||
};
|
||||
|
||||
@@ -44,7 +38,7 @@ export default function GlobalSearch() {
|
||||
options: data.search_jobs.map((job) => {
|
||||
return {
|
||||
key: job.id,
|
||||
value: job.ro_number || "N/A",
|
||||
value: job.ro_number,
|
||||
label: (
|
||||
<Link to={`/manage/jobs/${job.id}`}>
|
||||
<Space size="small" split={<Divider type="vertical" />}>
|
||||
@@ -184,18 +178,13 @@ export default function GlobalSearch() {
|
||||
<AutoComplete
|
||||
options={options}
|
||||
onSearch={handleSearch}
|
||||
suffixIcon={loading && <LoadingOutlined spin />}
|
||||
defaultActiveFirstOption
|
||||
placeholder={t("general.labels.globalsearch")}
|
||||
allowClear
|
||||
onSelect={(val, opt) => {
|
||||
history.push(opt.label.props.to);
|
||||
}}
|
||||
>
|
||||
<Input.Search
|
||||
size="large"
|
||||
placeholder={t("general.labels.globalsearch")}
|
||||
enterButton
|
||||
allowClear
|
||||
loading={loading}
|
||||
/>
|
||||
</AutoComplete>
|
||||
></AutoComplete>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -106,7 +106,6 @@ function Header({
|
||||
selectedKeys={[selectedHeader]}
|
||||
onClick={handleMenuClick}
|
||||
subMenuCloseDelay={0.3}
|
||||
data-cy="header-menu"
|
||||
>
|
||||
<Menu.Item key="home" icon={<HomeFilled />}>
|
||||
<Link to="/manage">{t("menus.header.home")}</Link>
|
||||
@@ -348,14 +347,8 @@ function Header({
|
||||
currentUser.email ||
|
||||
t("general.labels.unknown")
|
||||
}
|
||||
data-cy="user-sub-menu"
|
||||
>
|
||||
<Menu.Item
|
||||
key="signout"
|
||||
danger
|
||||
data-cy="sign-out-button"
|
||||
onClick={() => signOutStart()}
|
||||
>
|
||||
<Menu.Item key="signout" danger onClick={() => signOutStart()}>
|
||||
{t("user.actions.signout")}
|
||||
</Menu.Item>
|
||||
<Menu.Item
|
||||
|
||||
@@ -3,11 +3,9 @@ import {
|
||||
Button,
|
||||
Divider,
|
||||
Dropdown,
|
||||
Form,
|
||||
Menu,
|
||||
notification,
|
||||
Popover,
|
||||
Select,
|
||||
Space,
|
||||
} from "antd";
|
||||
import parsePhoneNumber from "libphonenumber-js";
|
||||
@@ -61,10 +59,7 @@ export function ScheduleEventComponent({
|
||||
|
||||
const blockContent = (
|
||||
<div>
|
||||
<Button
|
||||
onClick={() => handleCancel({ id: event.id })}
|
||||
disabled={event.arrived}
|
||||
>
|
||||
<Button onClick={() => handleCancel(event.id)} disabled={event.arrived}>
|
||||
{t("appointments.actions.cancel")}
|
||||
</Button>
|
||||
</div>
|
||||
@@ -208,46 +203,10 @@ export function ScheduleEventComponent({
|
||||
<Button>{t("appointments.actions.sendreminder")}</Button>
|
||||
</Dropdown>
|
||||
) : null}
|
||||
<Popover
|
||||
trigger="click"
|
||||
disabled={event.arrived}
|
||||
content={
|
||||
<Form
|
||||
layout="vertical"
|
||||
onFinish={({ lost_sale_reason }) => {
|
||||
handleCancel({ id: event.id, lost_sale_reason });
|
||||
}}
|
||||
>
|
||||
<Form.Item
|
||||
name="lost_sale_reason"
|
||||
label={t("jobs.fields.lost_sale_reason")}
|
||||
rules={[
|
||||
{
|
||||
required: true,
|
||||
//message: t("general.validation.required"),
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Select
|
||||
options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
|
||||
label: lsr,
|
||||
value: lsr,
|
||||
}))}
|
||||
/>
|
||||
</Form.Item>
|
||||
<Button htmlType="submit">
|
||||
{t("appointments.actions.cancel")}
|
||||
</Button>
|
||||
</Form>
|
||||
}
|
||||
>
|
||||
<Button
|
||||
// onClick={() => handleCancel(event.id)}
|
||||
disabled={event.arrived}
|
||||
>
|
||||
{t("appointments.actions.cancel")}
|
||||
</Button>
|
||||
</Popover>
|
||||
|
||||
<Button onClick={() => handleCancel(event.id)} disabled={event.arrived}>
|
||||
{t("appointments.actions.cancel")}
|
||||
</Button>
|
||||
{event.isintake ? (
|
||||
<Button
|
||||
disabled={event.arrived}
|
||||
@@ -290,7 +249,7 @@ export function ScheduleEventComponent({
|
||||
const RegularEvent = event.isintake ? (
|
||||
<Space
|
||||
wrap
|
||||
size="small"
|
||||
size='small'
|
||||
style={{
|
||||
backgroundColor:
|
||||
event.color && event.color.hex ? event.color.hex : event.color,
|
||||
|
||||
@@ -11,7 +11,7 @@ export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
|
||||
const { t } = useTranslation();
|
||||
const [cancelAppointment] = useMutation(CANCEL_APPOINTMENT_BY_ID);
|
||||
const [updateJob] = useMutation(UPDATE_JOB);
|
||||
const handleCancel = async ({ id, lost_sale_reason }) => {
|
||||
const handleCancel = async (id) => {
|
||||
logImEXEvent("schedule_cancel_appt");
|
||||
|
||||
const cancelAppt = await cancelAppointment({
|
||||
@@ -38,8 +38,7 @@ export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
|
||||
job: {
|
||||
date_scheduled: null,
|
||||
scheduled_in: null,
|
||||
scheduled_completion: null,
|
||||
lost_sale_reason,
|
||||
scheduled_completion:null,
|
||||
status: bodyshop.md_ro_statuses.default_imported,
|
||||
},
|
||||
},
|
||||
|
||||
@@ -84,8 +84,6 @@ export default function JobBillsTotalComponent({
|
||||
})
|
||||
);
|
||||
|
||||
console.log(totals.parts.parts.total);
|
||||
|
||||
const totalPartsSublet = Dinero(totals.parts.parts.total)
|
||||
.add(Dinero(totals.parts.sublets.total))
|
||||
.add(Dinero(totals.additional.shipping))
|
||||
@@ -129,10 +127,7 @@ export default function JobBillsTotalComponent({
|
||||
>
|
||||
<Statistic
|
||||
title={t("bills.labels.retailtotal")}
|
||||
// value={billTotals.toFormat()}
|
||||
valueRender={() => (
|
||||
<span id="retailtotal">{billTotals.toFormat()}</span>
|
||||
)}
|
||||
value={billTotals.toFormat()}
|
||||
/>
|
||||
</Tooltip>
|
||||
<Typography.Title>=</Typography.Title>
|
||||
@@ -150,12 +145,7 @@ export default function JobBillsTotalComponent({
|
||||
valueStyle={{
|
||||
color: discrepancy.getAmount() === 0 ? "green" : "red",
|
||||
}}
|
||||
// value={discrepancy.toFormat()}
|
||||
valueRender={() => (
|
||||
<span id="discrepancy" className="discrepancy">
|
||||
{discrepancy.toFormat()}
|
||||
</span>
|
||||
)}
|
||||
value={discrepancy.toFormat()}
|
||||
/>
|
||||
</Tooltip>
|
||||
<Typography.Title>+</Typography.Title>
|
||||
@@ -188,12 +178,7 @@ export default function JobBillsTotalComponent({
|
||||
valueStyle={{
|
||||
color: discrepWithLbrAdj.getAmount() === 0 ? "green" : "red",
|
||||
}}
|
||||
// value={discrepWithLbrAdj.toFormat()}
|
||||
valueRender={() => (
|
||||
<span id="discrepWithLbrAdj" className="discrepancy">
|
||||
{discrepWithLbrAdj.toFormat()}
|
||||
</span>
|
||||
)}
|
||||
value={discrepWithLbrAdj.toFormat()}
|
||||
/>
|
||||
</Tooltip>
|
||||
<Typography.Title>+</Typography.Title>
|
||||
@@ -208,10 +193,7 @@ export default function JobBillsTotalComponent({
|
||||
>
|
||||
<Statistic
|
||||
title={t("bills.labels.totalreturns")}
|
||||
// value={totalReturns.toFormat()}
|
||||
valueRender={() => (
|
||||
<span id="totalReturns">{totalReturns.toFormat()}</span>
|
||||
)}
|
||||
value={totalReturns.toFormat()}
|
||||
/>
|
||||
</Tooltip>
|
||||
<Typography.Title>=</Typography.Title>
|
||||
@@ -229,12 +211,7 @@ export default function JobBillsTotalComponent({
|
||||
valueStyle={{
|
||||
color: discrepWithCms.getAmount() === 0 ? "green" : "red",
|
||||
}}
|
||||
// value={discrepWithCms.toFormat()}
|
||||
valueRender={() => (
|
||||
<span id="discrepWithCms" className="discrepancy">
|
||||
{discrepWithCms.toFormat()}
|
||||
</span>
|
||||
)}
|
||||
value={discrepWithCms.toFormat()}
|
||||
/>
|
||||
</Tooltip>
|
||||
</Space>
|
||||
@@ -254,10 +231,7 @@ export default function JobBillsTotalComponent({
|
||||
>
|
||||
<Statistic
|
||||
title={t("bills.labels.totalreturns")}
|
||||
// value={totalReturns.toFormat()}
|
||||
valueRender={() => (
|
||||
<span id="totalReturns">{totalReturns.toFormat()}</span>
|
||||
)}
|
||||
value={totalReturns.toFormat()}
|
||||
/>
|
||||
</Tooltip>
|
||||
<Tooltip
|
||||
@@ -279,18 +253,11 @@ export default function JobBillsTotalComponent({
|
||||
? "green"
|
||||
: "red",
|
||||
}}
|
||||
// value={
|
||||
// calculatedCreditsNotReceived.getAmount() >= 0
|
||||
// ? calculatedCreditsNotReceived.toFormat()
|
||||
// : Dinero().toFormat()
|
||||
// }
|
||||
valueRender={() => (
|
||||
<span id="calculatedcreditsnotreceived">
|
||||
{calculatedCreditsNotReceived.getAmount() >= 0
|
||||
? calculatedCreditsNotReceived.toFormat()
|
||||
: Dinero().toFormat()}
|
||||
</span>
|
||||
)}
|
||||
value={
|
||||
calculatedCreditsNotReceived.getAmount() >= 0
|
||||
? calculatedCreditsNotReceived.toFormat()
|
||||
: Dinero().toFormat()
|
||||
}
|
||||
/>
|
||||
</Tooltip>
|
||||
<Tooltip
|
||||
@@ -310,18 +277,11 @@ export default function JobBillsTotalComponent({
|
||||
? "green"
|
||||
: "red",
|
||||
}}
|
||||
// value={
|
||||
// totalReturnsMarkedNotReceived.getAmount() >= 0
|
||||
// ? totalReturnsMarkedNotReceived.toFormat()
|
||||
// : Dinero().toFormat()
|
||||
// }
|
||||
valueRender={() => (
|
||||
<span id="creditsnotreceived">
|
||||
{totalReturnsMarkedNotReceived.getAmount() >= 0
|
||||
? totalReturnsMarkedNotReceived.toFormat()
|
||||
: Dinero().toFormat()}
|
||||
</span>
|
||||
)}
|
||||
value={
|
||||
totalReturnsMarkedNotReceived.getAmount() >= 0
|
||||
? totalReturnsMarkedNotReceived.toFormat()
|
||||
: Dinero().toFormat()
|
||||
}
|
||||
/>
|
||||
</Tooltip>
|
||||
</Space>
|
||||
|
||||
@@ -199,7 +199,6 @@ export function JobChecklistForm({
|
||||
extra={
|
||||
!readOnly && (
|
||||
<Button
|
||||
data-cy="checklist-submit-button"
|
||||
loading={loading}
|
||||
type="primary"
|
||||
onClick={() => form.submit()}
|
||||
@@ -210,7 +209,6 @@ export function JobChecklistForm({
|
||||
}
|
||||
>
|
||||
<Form
|
||||
data-cy="checklist-form"
|
||||
form={form}
|
||||
onFinish={handleFinish}
|
||||
initialValues={{
|
||||
@@ -258,7 +256,7 @@ export function JobChecklistForm({
|
||||
label={t("checklist.labels.addtoproduction")}
|
||||
disabled={readOnly}
|
||||
>
|
||||
<Switch data-cy="add-to-production-switch" disabled={readOnly} />
|
||||
<Switch disabled={readOnly} />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
name="allow_text_message"
|
||||
@@ -294,11 +292,7 @@ export function JobChecklistForm({
|
||||
disabled={readOnly}
|
||||
trigger="onChange"
|
||||
>
|
||||
<Input.TextArea
|
||||
data-cy="checklist-production-note"
|
||||
rows={3}
|
||||
disabled={readOnly}
|
||||
/>
|
||||
<Input.TextArea rows={3} disabled={readOnly} />
|
||||
</Form.Item>
|
||||
</div>
|
||||
)}
|
||||
@@ -330,11 +324,7 @@ export function JobChecklistForm({
|
||||
label={t("checklist.labels.removefromproduction")}
|
||||
disabled={readOnly}
|
||||
>
|
||||
<Switch
|
||||
data-cy="remove-from-production"
|
||||
disabled={readOnly}
|
||||
defaultChecked={true}
|
||||
/>
|
||||
<Switch disabled={readOnly} defaultChecked={true} />
|
||||
</Form.Item>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -23,7 +23,6 @@ export default function JobCostingPartsTable({ data, summaryData }) {
|
||||
sorter: (a, b) => alphaSort(a.cost_center, b.cost_center),
|
||||
sortOrder:
|
||||
state.sortedInfo.columnKey === "cost_center" && state.sortedInfo.order,
|
||||
render: (record) => <span data-cy="responsibilitycenter">{record}</span>,
|
||||
},
|
||||
{
|
||||
title: t("jobs.labels.sales"),
|
||||
@@ -43,7 +42,6 @@ export default function JobCostingPartsTable({ data, summaryData }) {
|
||||
parseFloat(a.costs.substring(1)) - parseFloat(b.costs.substring(1)),
|
||||
sortOrder:
|
||||
state.sortedInfo.columnKey === "costs" && state.sortedInfo.order,
|
||||
render: (record) => <span data-cy="cost">{record}</span>,
|
||||
},
|
||||
|
||||
{
|
||||
|
||||
@@ -22,12 +22,12 @@ export default function JobLinesExpander({ jobline, jobid }) {
|
||||
if (error) return <AlertComponent message={error.message} type="error" />;
|
||||
|
||||
return (
|
||||
<Row data-cy="parts-expanded-row">
|
||||
<Row>
|
||||
<Col md={24} lg={12}>
|
||||
<Typography.Title level={4}>
|
||||
{t("parts_orders.labels.parts_orders")}
|
||||
</Typography.Title>
|
||||
<Timeline data-cy="parts-bills-order">
|
||||
<Timeline>
|
||||
{data.parts_order_lines.length > 0 ? (
|
||||
data.parts_order_lines.map((line) => (
|
||||
<Timeline.Item key={line.id}>
|
||||
@@ -43,7 +43,7 @@ export default function JobLinesExpander({ jobline, jobid }) {
|
||||
</Timeline.Item>
|
||||
))
|
||||
) : (
|
||||
<Timeline.Item data-cy="parts-empty-order">
|
||||
<Timeline.Item>
|
||||
{t("parts_orders.labels.notyetordered")}
|
||||
</Timeline.Item>
|
||||
)}
|
||||
@@ -51,7 +51,7 @@ export default function JobLinesExpander({ jobline, jobid }) {
|
||||
</Col>
|
||||
<Col md={24} lg={12}>
|
||||
<Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title>
|
||||
<Timeline data-cy="parts-bills-order">
|
||||
<Timeline>
|
||||
{data.billlines.length > 0 ? (
|
||||
data.billlines.map((line) => (
|
||||
<Timeline.Item key={line.id}>
|
||||
@@ -71,7 +71,7 @@ export default function JobLinesExpander({ jobline, jobid }) {
|
||||
</Col>
|
||||
<Col span={4}>
|
||||
<span>
|
||||
{`${t("billlines.fields.actual_cost")}: `}
|
||||
{`${t("billlines.fields.actual_cost")}: `}
|
||||
<CurrencyFormatter>{line.actual_cost}</CurrencyFormatter>
|
||||
</span>
|
||||
</Col>
|
||||
@@ -83,7 +83,7 @@ export default function JobLinesExpander({ jobline, jobid }) {
|
||||
</Timeline.Item>
|
||||
))
|
||||
) : (
|
||||
<Timeline.Item data-cy="parts-empty-order">
|
||||
<Timeline.Item>
|
||||
{t("parts_orders.labels.notyetordered")}
|
||||
</Timeline.Item>
|
||||
)}
|
||||
|
||||
@@ -103,12 +103,6 @@ export function JobLinesComponent({
|
||||
fixed: "left",
|
||||
key: "line_desc",
|
||||
sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
|
||||
onCell: (record) => ({
|
||||
className: record.manual_line && "job-line-manual",
|
||||
style: {
|
||||
...(record.critical ? { boxShadow: " -.5em 0 0 #FFC107" } : {}),
|
||||
},
|
||||
}),
|
||||
sortOrder:
|
||||
state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
|
||||
ellipsis: true,
|
||||
@@ -348,7 +342,7 @@ export function JobLinesComponent({
|
||||
onClick={() => {
|
||||
setJobLineEditContext({
|
||||
actions: { refetch: refetch, submit: form && form.submit },
|
||||
context: { ...record, jobid: job.id },
|
||||
context: record,
|
||||
});
|
||||
}}
|
||||
>
|
||||
@@ -441,7 +435,6 @@ export function JobLinesComponent({
|
||||
</Tag>
|
||||
)}
|
||||
<Button
|
||||
data-cy="order-parts-inhouse-button"
|
||||
disabled={
|
||||
(job && !job.converted) ||
|
||||
(selectedLines.length > 0 ? false : true) ||
|
||||
@@ -498,7 +491,6 @@ export function JobLinesComponent({
|
||||
{selectedLines.length > 0 && ` (${selectedLines.length})`}
|
||||
</Button>
|
||||
<Button
|
||||
data-cy="order-parts-button"
|
||||
disabled={
|
||||
(job && !job.converted) ||
|
||||
(selectedLines.length > 0 ? false : true) ||
|
||||
@@ -528,7 +520,6 @@ export function JobLinesComponent({
|
||||
{selectedLines.length > 0 && ` (${selectedLines.length})`}
|
||||
</Button>
|
||||
<Button
|
||||
data-cy="filter-parts-button"
|
||||
onClick={() => {
|
||||
setState((state) => ({
|
||||
...state,
|
||||
@@ -578,7 +569,6 @@ export function JobLinesComponent({
|
||||
}
|
||||
/>
|
||||
<Table
|
||||
data-cy="repair-data-table"
|
||||
columns={columns}
|
||||
rowKey="id"
|
||||
loading={loading}
|
||||
|
||||
@@ -22,20 +22,9 @@ export function JoblinePresetButton({ bodyshop, form }) {
|
||||
};
|
||||
|
||||
const menu = (
|
||||
<Menu
|
||||
style={{
|
||||
columnCount: Math.max(
|
||||
Math.floor(bodyshop.md_jobline_presets.length / 15),
|
||||
1
|
||||
),
|
||||
}}
|
||||
>
|
||||
<Menu>
|
||||
{bodyshop.md_jobline_presets.map((i, idx) => (
|
||||
<Menu.Item
|
||||
onClick={() => handleSelect(i)}
|
||||
key={idx}
|
||||
style={{ breakInside: "avoid" }}
|
||||
>
|
||||
<Menu.Item onClick={() => handleSelect(i)} key={idx}>
|
||||
{i.label}
|
||||
</Menu.Item>
|
||||
))}
|
||||
|
||||
@@ -40,11 +40,6 @@ export function JobLinesUpsertModalComponent({
|
||||
{},
|
||||
bodyshop.imexshopid
|
||||
);
|
||||
const { Autohouse_Detail_line } = useTreatments(
|
||||
["Autohouse_Detail_line"],
|
||||
{},
|
||||
bodyshop.imexshopid
|
||||
);
|
||||
|
||||
return (
|
||||
<Modal
|
||||
@@ -160,40 +155,6 @@ export function JobLinesUpsertModalComponent({
|
||||
>
|
||||
<InputNumber precision={1} />
|
||||
</Form.Item>
|
||||
{Autohouse_Detail_line.treatment === "on" && (
|
||||
<Form.Item
|
||||
label={t("joblines.fields.ah_detail_line")}
|
||||
name="ah_detail_line"
|
||||
valuePropName="checked"
|
||||
dependencies={["mod_lbr_ty"]}
|
||||
initialValue={false}
|
||||
rules={[
|
||||
({ getFieldValue }) => ({
|
||||
validator(rule, value) {
|
||||
if (
|
||||
value === false ||
|
||||
value === undefined ||
|
||||
value === null
|
||||
)
|
||||
return Promise.resolve();
|
||||
if (
|
||||
value === true &&
|
||||
["LA1", "LA2", "LA3", "LA4", "LAU"].includes(
|
||||
getFieldValue("mod_lbr_ty")
|
||||
)
|
||||
) {
|
||||
return Promise.resolve();
|
||||
}
|
||||
return Promise.reject(
|
||||
t("joblines.validations.ahdetailonlyonuserdefinedtypes")
|
||||
);
|
||||
},
|
||||
}),
|
||||
]}
|
||||
>
|
||||
<Switch />
|
||||
</Form.Item>
|
||||
)}
|
||||
</LayoutFormRow>
|
||||
<LayoutFormRow>
|
||||
<Form.Item label={t("joblines.fields.part_type")} name="part_type">
|
||||
@@ -257,6 +218,7 @@ export function JobLinesUpsertModalComponent({
|
||||
rules={[
|
||||
({ getFieldValue }) => ({
|
||||
validator(rule, value) {
|
||||
console.log(value);
|
||||
if (!value || getFieldValue("part_type") !== "PAE") {
|
||||
return Promise.resolve();
|
||||
}
|
||||
@@ -267,6 +229,7 @@ export function JobLinesUpsertModalComponent({
|
||||
}),
|
||||
({ getFieldValue }) => ({
|
||||
validator(rule, value) {
|
||||
console.log(value, !!value);
|
||||
if (
|
||||
!!getFieldValue("part_type") === (!!value || value === 0)
|
||||
) {
|
||||
@@ -289,7 +252,7 @@ export function JobLinesUpsertModalComponent({
|
||||
name="prt_dsmk_p"
|
||||
initialValue={0}
|
||||
>
|
||||
<InputNumber precision={0} min={-100} max={100} />
|
||||
<InputNumber precision={0} min={0} max={100} />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
label={t("joblines.fields.tax_part")}
|
||||
|
||||
@@ -13,13 +13,8 @@ import { selectJobLineEditModal } from "../../redux/modals/modals.selectors";
|
||||
import UndefinedToNull from "../../utils/undefinedtonull";
|
||||
import JobLinesUpdsertModal from "./job-lines-upsert-modal.component";
|
||||
import Axios from "axios";
|
||||
import Dinero from "dinero.js";
|
||||
import CriticalPartsScan from "../../utils/criticalPartsScan";
|
||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||
import { useTreatments } from "@splitsoftware/splitio-react";
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
jobLineEditModal: selectJobLineEditModal,
|
||||
bodyshop: selectBodyshop,
|
||||
});
|
||||
const mapDispatchToProps = (dispatch) => ({
|
||||
toggleModalVisible: () => dispatch(toggleModalVisible("jobLineEdit")),
|
||||
@@ -28,13 +23,7 @@ const mapDispatchToProps = (dispatch) => ({
|
||||
function JobLinesUpsertModalContainer({
|
||||
jobLineEditModal,
|
||||
toggleModalVisible,
|
||||
bodyshop,
|
||||
}) {
|
||||
const { CriticalPartsScanning } = useTreatments(
|
||||
["CriticalPartsScanning"],
|
||||
{},
|
||||
bodyshop.imexshopid
|
||||
);
|
||||
const { t } = useTranslation();
|
||||
const [insertJobLine] = useMutation(INSERT_NEW_JOB_LINE);
|
||||
const [updateJobLine] = useMutation(UPDATE_JOB_LINE);
|
||||
@@ -51,15 +40,7 @@ function JobLinesUpsertModalContainer({
|
||||
manual_line: !(
|
||||
jobLineEditModal.context && jobLineEditModal.context.id
|
||||
),
|
||||
...UndefinedToNull({
|
||||
...values,
|
||||
prt_dsmk_m: Dinero({
|
||||
amount: Math.round((values.act_price || 0) * 100),
|
||||
})
|
||||
.percentage(Math.abs(values.prt_dsmk_p || 0))
|
||||
.multiply(values.prt_dsmk_p >= 0 ? 1 : -1)
|
||||
.toFormat(0.0),
|
||||
}),
|
||||
...UndefinedToNull(values),
|
||||
},
|
||||
],
|
||||
},
|
||||
@@ -87,15 +68,7 @@ function JobLinesUpsertModalContainer({
|
||||
const r = await updateJobLine({
|
||||
variables: {
|
||||
lineId: jobLineEditModal.context.id,
|
||||
line: {
|
||||
...values,
|
||||
prt_dsmk_m: Dinero({
|
||||
amount: Math.round(values.act_price * 100),
|
||||
})
|
||||
.percentage(Math.abs(values.prt_dsmk_p || 0))
|
||||
.multiply(values.prt_dsmk_p >= 0 ? 1 : -1)
|
||||
.toFormat(0.0),
|
||||
},
|
||||
line: values,
|
||||
},
|
||||
refetchQueries: ["GET_LINE_TICKET_BY_PK"],
|
||||
});
|
||||
@@ -119,9 +92,6 @@ function JobLinesUpsertModalContainer({
|
||||
}
|
||||
toggleModalVisible();
|
||||
}
|
||||
if (CriticalPartsScanning.treatment === "on") {
|
||||
CriticalPartsScan(jobLineEditModal.context.jobid);
|
||||
}
|
||||
setLoading(false);
|
||||
};
|
||||
|
||||
|
||||
@@ -25,6 +25,8 @@ const mapDispatchToProps = (dispatch) => ({
|
||||
dispatch(setModalContext({ context: context, modal: "payment" })),
|
||||
});
|
||||
|
||||
const stripeTestEnv = process.env.REACT_APP_STRIPE_PUBLIC_KEY; //.includes("test");
|
||||
|
||||
export function JobPayments({
|
||||
job,
|
||||
jobRO,
|
||||
@@ -92,6 +94,23 @@ export function JobPayments({
|
||||
state.sortedInfo.columnKey === "transactionid" &&
|
||||
state.sortedInfo.order,
|
||||
},
|
||||
{
|
||||
title: t("payments.fields.stripeid"),
|
||||
dataIndex: "stripeid",
|
||||
key: "stripeid",
|
||||
render: (text, record) =>
|
||||
record.stripeid ? (
|
||||
<a
|
||||
href={
|
||||
stripeTestEnv
|
||||
? `https://dashboard.stripe.com/${bodyshop.stripe_acct_id}/test/payments/${record.stripeid}`
|
||||
: `https://dashboard.stripe.com/${bodyshop.stripe_acct_id}/payments/${record.stripeid}`
|
||||
}
|
||||
>
|
||||
{record.stripeid}
|
||||
</a>
|
||||
) : null,
|
||||
},
|
||||
{
|
||||
title: t("general.labels.actions"),
|
||||
dataIndex: "actions",
|
||||
@@ -99,8 +118,7 @@ export function JobPayments({
|
||||
render: (text, record) => (
|
||||
<Space wrap>
|
||||
<Button
|
||||
// disabled={record.exportedat}
|
||||
data-cy="edit-payment-button"
|
||||
disabled={record.exportedat}
|
||||
onClick={() => {
|
||||
setPaymentContext({
|
||||
actions: { refetch: refetch },
|
||||
@@ -151,7 +169,6 @@ export function JobPayments({
|
||||
extra={
|
||||
<Space wrap>
|
||||
<Button
|
||||
data-cy="job-payment-button"
|
||||
disabled={!job.converted}
|
||||
onClick={() =>
|
||||
setPaymentContext({
|
||||
@@ -172,7 +189,6 @@ export function JobPayments({
|
||||
}
|
||||
>
|
||||
<Table
|
||||
data-cy="payments-table"
|
||||
columns={columns}
|
||||
rowKey="id"
|
||||
pagination={false}
|
||||
|
||||
@@ -166,16 +166,6 @@ export default function ScoreboardAddButton({
|
||||
painthrs: 0,
|
||||
}
|
||||
);
|
||||
|
||||
//Add Labor Adjustments
|
||||
v.painthrs = v.painthrs + (job.lbr_adjustments.LAR || 0);
|
||||
v.bodyhrs =
|
||||
v.bodyhrs +
|
||||
Object.keys(job.lbr_adjustments)
|
||||
.filter((key) => key !== "LAR")
|
||||
.reduce((acc, val) => {
|
||||
return acc + job.lbr_adjustments[val];
|
||||
}, 0);
|
||||
form.setFieldsValue({
|
||||
date: new moment(),
|
||||
bodyhrs: Math.round(v.bodyhrs * 10) / 10,
|
||||
|
||||
@@ -108,7 +108,6 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
|
||||
|
||||
return (
|
||||
<Table
|
||||
data-cy="job-totals-table"
|
||||
columns={columns}
|
||||
rowKey="key"
|
||||
showHeader={false}
|
||||
|
||||
@@ -171,16 +171,12 @@ export function JobsAvailableComponent({
|
||||
{!isClosed && (
|
||||
<>
|
||||
<Button
|
||||
data-cy="add-job-as-new-button"
|
||||
onClick={() => addJobAsNew(record)}
|
||||
disabled={record.issupplement}
|
||||
>
|
||||
<PlusCircleFilled />
|
||||
</Button>
|
||||
<Button
|
||||
data-cy="add-job-as-supplement"
|
||||
onClick={() => addJobAsSupp(record)}
|
||||
>
|
||||
<Button onClick={() => addJobAsSupp(record)}>
|
||||
<DownloadOutlined />
|
||||
</Button>
|
||||
</>
|
||||
@@ -218,7 +214,6 @@ export function JobsAvailableComponent({
|
||||
extra={
|
||||
<Space wrap>
|
||||
<Button
|
||||
data-cy="refetch-available-jobs-button"
|
||||
onClick={() => {
|
||||
refetch();
|
||||
}}
|
||||
@@ -260,7 +255,6 @@ export function JobsAvailableComponent({
|
||||
columns={columns}
|
||||
rowKey="id"
|
||||
dataSource={availableJobs}
|
||||
data-cy="available-jobs-table"
|
||||
onChange={handleTableChange}
|
||||
/>
|
||||
</Card>
|
||||
|
||||
@@ -5,7 +5,6 @@ import {
|
||||
useMutation,
|
||||
useQuery,
|
||||
} from "@apollo/client";
|
||||
import { useTreatments } from "@splitsoftware/splitio-react";
|
||||
import { Col, notification, Row } from "antd";
|
||||
import Axios from "axios";
|
||||
import Dinero from "dinero.js";
|
||||
@@ -32,7 +31,6 @@ import {
|
||||
} from "../../redux/user/user.selectors";
|
||||
import confirmDialog from "../../utils/asyncConfirm";
|
||||
import AuditTrailMapping from "../../utils/AuditTrailMappings";
|
||||
import CriticalPartsScan from "../../utils/criticalPartsScan";
|
||||
import AlertComponent from "../alert/alert.component";
|
||||
import JobsAvailableScan from "../jobs-available-scan/jobs-available-scan.component";
|
||||
import JobsFindModalContainer from "../jobs-find-modal/jobs-find-modal.container";
|
||||
@@ -55,11 +53,6 @@ export function JobsAvailableContainer({
|
||||
currentUser,
|
||||
insertAuditTrail,
|
||||
}) {
|
||||
const { CriticalPartsScanning } = useTreatments(
|
||||
["CriticalPartsScanning"],
|
||||
{},
|
||||
bodyshop.imexshopid
|
||||
);
|
||||
const { loading, error, data, refetch } = useQuery(QUERY_AVAILABLE_JOBS, {
|
||||
fetchPolicy: "network-only",
|
||||
nextFetchPolicy: "network-only",
|
||||
@@ -162,9 +155,6 @@ export function JobsAvailableContainer({
|
||||
},
|
||||
})
|
||||
.then((r) => {
|
||||
if (CriticalPartsScanning.treatment === "on") {
|
||||
CriticalPartsScan(r.data.insert_jobs.returning[0].id);
|
||||
}
|
||||
notification["success"]({
|
||||
message: t("jobs.successes.created"),
|
||||
onClick: () => {
|
||||
@@ -251,9 +241,7 @@ export function JobsAvailableContainer({
|
||||
},
|
||||
},
|
||||
});
|
||||
if (CriticalPartsScanning.treatment === "on") {
|
||||
CriticalPartsScan(updateResult.data.update_jobs.returning[0].id);
|
||||
}
|
||||
|
||||
if (updateResult.errors) {
|
||||
//error while inserting
|
||||
notification["error"]({
|
||||
|
||||
@@ -9,7 +9,6 @@ import {
|
||||
Space,
|
||||
Switch,
|
||||
} from "antd";
|
||||
import axios from "axios";
|
||||
import React, { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { connect } from "react-redux";
|
||||
@@ -19,6 +18,7 @@ import { insertAuditTrail } from "../../redux/application/application.actions";
|
||||
import { selectJobReadOnly } from "../../redux/application/application.selectors";
|
||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||
import AuditTrailMapping from "../../utils/AuditTrailMappings";
|
||||
import axios from "axios";
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
//currentUser: selectCurrentUser
|
||||
bodyshop: selectBodyshop,
|
||||
@@ -43,22 +43,14 @@ export function JobsConvertButton({
|
||||
const { t } = useTranslation();
|
||||
const [form] = Form.useForm();
|
||||
|
||||
const handleConvert = async ({ employee_csr, category, ...values }) => {
|
||||
const handleConvert = async (values) => {
|
||||
if (parentFormIsFieldsTouched()) {
|
||||
alert(t("jobs.labels.savebeforeconversion"));
|
||||
return;
|
||||
}
|
||||
setLoading(true);
|
||||
const res = await mutationConvertJob({
|
||||
variables: {
|
||||
jobId: job.id,
|
||||
job: {
|
||||
converted: true,
|
||||
...(bodyshop.enforce_conversion_csr ? { employee_csr } : {}),
|
||||
...(bodyshop.enforce_conversion_category ? { category } : {}),
|
||||
...values,
|
||||
},
|
||||
},
|
||||
variables: { jobId: job.id, ...values },
|
||||
});
|
||||
|
||||
if (values.ca_gst_registrant) {
|
||||
@@ -91,12 +83,7 @@ export function JobsConvertButton({
|
||||
layout="vertical"
|
||||
form={form}
|
||||
onFinish={handleConvert}
|
||||
initialValues={{
|
||||
driveable: true,
|
||||
towin: false,
|
||||
employee_csr: job.employee_csr,
|
||||
category: job.category,
|
||||
}}
|
||||
initialValues={{ driveable: true, towin: false }}
|
||||
>
|
||||
<Form.Item
|
||||
name={["ins_co_nm"]}
|
||||
@@ -108,9 +95,9 @@ export function JobsConvertButton({
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Select className="ant-select-ins_co_nm">
|
||||
{bodyshop.md_ins_cos.map((s, i) => (
|
||||
<Select.Option key={i} value={s.name}>
|
||||
<Select>
|
||||
{bodyshop.md_ins_cos.map((s) => (
|
||||
<Select.Option key={s.name} value={s.name}>
|
||||
{s.name}
|
||||
</Select.Option>
|
||||
))}
|
||||
@@ -127,7 +114,7 @@ export function JobsConvertButton({
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Select className="ant-select-class">
|
||||
<Select>
|
||||
{bodyshop.md_classes.map((s) => (
|
||||
<Select.Option key={s} value={s}>
|
||||
{s}
|
||||
@@ -148,7 +135,7 @@ export function JobsConvertButton({
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Select className="ant-select-referral_source">
|
||||
<Select>
|
||||
{bodyshop.md_referral_sources.map((s) => (
|
||||
<Select.Option key={s} value={s}>
|
||||
{s}
|
||||
@@ -157,7 +144,6 @@ export function JobsConvertButton({
|
||||
</Select>
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
data-cy="referral_source_extra"
|
||||
label={t("jobs.fields.referral_source_extra")}
|
||||
name="referral_source_extra"
|
||||
>
|
||||
@@ -165,71 +151,13 @@ export function JobsConvertButton({
|
||||
</Form.Item>
|
||||
</>
|
||||
)}
|
||||
{bodyshop.enforce_conversion_csr && (
|
||||
<Form.Item
|
||||
name={"employee_csr"}
|
||||
label={t("jobs.fields.employee_csr")}
|
||||
rules={[
|
||||
{
|
||||
required: bodyshop.enforce_conversion_csr,
|
||||
//message: t("general.validation.required"),
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Select
|
||||
className="ant-select-employee_csr"
|
||||
showSearch
|
||||
style={{ width: 200 }}
|
||||
optionFilterProp="children"
|
||||
filterOption={(input, option) =>
|
||||
option.props.children
|
||||
.toLowerCase()
|
||||
.indexOf(input.toLowerCase()) >= 0
|
||||
}
|
||||
>
|
||||
{bodyshop.employees
|
||||
.filter((emp) => emp.active)
|
||||
.map((emp) => (
|
||||
<Select.Option
|
||||
value={emp.id}
|
||||
key={emp.id}
|
||||
name={`${emp.first_name} ${emp.last_name}`}
|
||||
>
|
||||
{`${emp.first_name} ${emp.last_name}`}
|
||||
</Select.Option>
|
||||
))}
|
||||
</Select>
|
||||
</Form.Item>
|
||||
)}
|
||||
{bodyshop.enforce_conversion_category && (
|
||||
<Form.Item
|
||||
name={"category"}
|
||||
label={t("jobs.fields.category")}
|
||||
rules={[
|
||||
{
|
||||
required: bodyshop.enforce_conversion_category,
|
||||
//message: t("general.validation.required"),
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Select allowClear className="ant-select-category">
|
||||
{bodyshop.md_categories.map((s) => (
|
||||
<Select.Option key={s} value={s}>
|
||||
{s}
|
||||
</Select.Option>
|
||||
))}
|
||||
</Select>
|
||||
</Form.Item>
|
||||
)}
|
||||
{bodyshop.region_config.toLowerCase().startsWith("ca") && (
|
||||
<Form.Item
|
||||
label={t("jobs.fields.ca_gst_registrant")}
|
||||
name="ca_gst_registrant"
|
||||
valuePropName="checked"
|
||||
>
|
||||
<Switch />
|
||||
</Form.Item>
|
||||
)}
|
||||
<Form.Item
|
||||
label={t("jobs.fields.ca_gst_registrant")}
|
||||
name="ca_gst_registrant"
|
||||
valuePropName="checked"
|
||||
>
|
||||
<Switch />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
label={t("jobs.fields.driveable")}
|
||||
name="driveable"
|
||||
@@ -245,12 +173,7 @@ export function JobsConvertButton({
|
||||
<Switch />
|
||||
</Form.Item>
|
||||
<Space wrap>
|
||||
<Button
|
||||
type="danger"
|
||||
data-cy="convert-button"
|
||||
onClick={() => form.submit()}
|
||||
loading={loading}
|
||||
>
|
||||
<Button type="danger" onClick={() => form.submit()} loading={loading}>
|
||||
{t("jobs.actions.convert")}
|
||||
</Button>
|
||||
<Button onClick={() => setVisible(false)}>
|
||||
@@ -271,15 +194,7 @@ export function JobsConvertButton({
|
||||
// style={{ display: job.converted ? "none" : "" }}
|
||||
disabled={job.converted || jobRO}
|
||||
loading={loading}
|
||||
data-cy="job-convert-button"
|
||||
onClick={() => {
|
||||
setVisible(true);
|
||||
form.setFieldsValue({
|
||||
driveable: true,
|
||||
towin: false,
|
||||
employee_csr: job.employee_csr,
|
||||
});
|
||||
}}
|
||||
onClick={() => setVisible(true)}
|
||||
>
|
||||
{t("jobs.actions.convert")}
|
||||
</Button>
|
||||
|
||||
@@ -224,15 +224,13 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
|
||||
>
|
||||
<CurrencyInput />
|
||||
</Form.Item>
|
||||
{bodyshop.region_config.toLowerCase().startsWith("ca") && (
|
||||
<Form.Item
|
||||
label={t("jobs.fields.ca_gst_registrant")}
|
||||
name="ca_gst_registrant"
|
||||
valuePropName="checked"
|
||||
>
|
||||
<Switch />
|
||||
</Form.Item>
|
||||
)}
|
||||
<Form.Item
|
||||
label={t("jobs.fields.ca_gst_registrant")}
|
||||
name="ca_gst_registrant"
|
||||
valuePropName="checked"
|
||||
>
|
||||
<Switch />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
label={t("jobs.fields.other_amount_payable")}
|
||||
name="other_amount_payable"
|
||||
|
||||
@@ -9,11 +9,7 @@ const colSpan = {
|
||||
lg: { span: 12 },
|
||||
};
|
||||
|
||||
export default function JobsCreateVehicleInfoComponent({
|
||||
loading,
|
||||
vehicles,
|
||||
form,
|
||||
}) {
|
||||
export default function JobsCreateVehicleInfoComponent({ loading, vehicles }) {
|
||||
const [state, setState] = useContext(JobCreateContext);
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
@@ -62,7 +58,7 @@ export default function JobsCreateVehicleInfoComponent({
|
||||
/>
|
||||
</Col>
|
||||
<Col {...colSpan}>
|
||||
<JobsCreateVehicleInfoNewComponent form={form}/>
|
||||
<JobsCreateVehicleInfoNewComponent />
|
||||
</Col>
|
||||
</Row>
|
||||
</div>
|
||||
|
||||
@@ -20,7 +20,6 @@ export default function JobsCreateVehicleInfoContainer({ form }) {
|
||||
<JobsCreateVehicleInfoComponent
|
||||
loading={loading}
|
||||
vehicles={data ? data.search_vehicles : null}
|
||||
form={form}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -4,9 +4,8 @@ import { useTranslation } from "react-i18next";
|
||||
import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
|
||||
import FormDatePicker from "../form-date-picker/form-date-picker.component";
|
||||
import LayoutFormRow from "../layout-form-row/layout-form-row.component";
|
||||
import JobsCreateVehicleInfoPredefined from "./jobs-create-vehicle-info.predefined.component";
|
||||
|
||||
export default function JobsCreateVehicleInfoNewComponent({ form }) {
|
||||
export default function JobsCreateVehicleInfoNewComponent() {
|
||||
const [state] = useContext(JobCreateContext);
|
||||
|
||||
const { t } = useTranslation();
|
||||
@@ -26,7 +25,7 @@ export default function JobsCreateVehicleInfoNewComponent({ form }) {
|
||||
<Input disabled={!state.vehicle.new} />
|
||||
</Form.Item>
|
||||
</LayoutFormRow>
|
||||
<LayoutFormRow grow noDivider>
|
||||
<LayoutFormRow grow>
|
||||
<Form.Item
|
||||
label={t("vehicles.fields.v_color")}
|
||||
name={["vehicle", "data", "v_color"]}
|
||||
@@ -53,9 +52,8 @@ export default function JobsCreateVehicleInfoNewComponent({ form }) {
|
||||
</Form.Item>
|
||||
</LayoutFormRow>
|
||||
|
||||
<LayoutFormRow grow noDivider>
|
||||
<LayoutFormRow grow>
|
||||
<Form.Item
|
||||
span={10}
|
||||
label={t("vehicles.fields.v_make_desc")}
|
||||
name={["vehicle", "data", "v_make_desc"]}
|
||||
rules={[
|
||||
@@ -68,7 +66,6 @@ export default function JobsCreateVehicleInfoNewComponent({ form }) {
|
||||
<Input disabled={!state.vehicle.new} />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
span={11}
|
||||
label={t("vehicles.fields.v_model_desc")}
|
||||
name={["vehicle", "data", "v_model_desc"]}
|
||||
rules={[
|
||||
@@ -80,11 +77,6 @@ export default function JobsCreateVehicleInfoNewComponent({ form }) {
|
||||
>
|
||||
<Input disabled={!state.vehicle.new} />
|
||||
</Form.Item>
|
||||
<JobsCreateVehicleInfoPredefined
|
||||
disabled={!state.vehicle.new}
|
||||
form={form}
|
||||
span={1}
|
||||
/>
|
||||
</LayoutFormRow>
|
||||
|
||||
<LayoutFormRow header={t("vehicles.forms.registration")} grow>
|
||||
|
||||
@@ -1,81 +0,0 @@
|
||||
import { PlusOutlined, SearchOutlined } from "@ant-design/icons";
|
||||
import { Button, Input, Popover, Table } from "antd";
|
||||
import React, { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import PredefinedVehicles from "./predefined-vehicles.js";
|
||||
|
||||
export default function JobsCreateVehicleInfoPredefined({ disabled, form }) {
|
||||
const [open, setOpen] = useState(false);
|
||||
const [search, setSearch] = useState("");
|
||||
const { t } = useTranslation();
|
||||
const handleOpenChange = (newOpen) => {
|
||||
setOpen(newOpen);
|
||||
setSearch("");
|
||||
};
|
||||
const filteredPredefinedVehicles =
|
||||
search === ""
|
||||
? PredefinedVehicles
|
||||
: PredefinedVehicles.filter(
|
||||
(v) =>
|
||||
v.make.toLowerCase().includes(search.toLowerCase()) ||
|
||||
v.model.toLowerCase().includes(search.toLowerCase())
|
||||
);
|
||||
|
||||
const popContent = () => (
|
||||
<div>
|
||||
<Table
|
||||
size="small"
|
||||
title={() => <Input.Search onSearch={(value) => setSearch(value)} />}
|
||||
dataSource={filteredPredefinedVehicles}
|
||||
columns={[
|
||||
{
|
||||
dataIndex: "make",
|
||||
key: "make",
|
||||
title: t("vehicles.fields.v_make_desc"),
|
||||
},
|
||||
{
|
||||
dataIndex: "model",
|
||||
key: "model",
|
||||
title: t("vehicles.fields.v_model_desc"),
|
||||
},
|
||||
{
|
||||
dataIndex: "select",
|
||||
key: "select",
|
||||
title: t("general.labels.actions"),
|
||||
render: (value, record) => (
|
||||
<Button
|
||||
disabled={disabled}
|
||||
onClick={() => {
|
||||
form.setFieldsValue({
|
||||
vehicle: {
|
||||
data: {
|
||||
v_make_desc: record.make,
|
||||
v_model_desc: record.model,
|
||||
},
|
||||
},
|
||||
});
|
||||
setOpen(false);
|
||||
setSearch("");
|
||||
}}
|
||||
>
|
||||
<PlusOutlined />
|
||||
</Button>
|
||||
),
|
||||
},
|
||||
]}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
return (
|
||||
<Popover
|
||||
content={popContent}
|
||||
trigger="click"
|
||||
open={open}
|
||||
placement="left"
|
||||
onOpenChange={handleOpenChange}
|
||||
destroyTooltipOnHide
|
||||
>
|
||||
<SearchOutlined style={{ cursor: "pointer" }} />
|
||||
</Popover>
|
||||
);
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -256,7 +256,7 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
|
||||
</FormRow>
|
||||
<FormRow header={t("jobs.forms.other")}>
|
||||
<Form.Item label={t("jobs.fields.category")} name="category">
|
||||
<Select disabled={jobRO} allowClear>
|
||||
<Select disabled={jobRO}>
|
||||
{bodyshop.md_categories.map((s) => (
|
||||
<Select.Option key={s} value={s}>
|
||||
{s}
|
||||
@@ -289,12 +289,6 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
|
||||
>
|
||||
<Input disabled={jobRO} />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
label={t("jobs.fields.lost_sale_reason")}
|
||||
name="lost_sale_reason"
|
||||
>
|
||||
<Input disabled={jobRO} allowClear />
|
||||
</Form.Item>
|
||||
</FormRow>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -1,15 +1,6 @@
|
||||
import { DownCircleFilled } from "@ant-design/icons";
|
||||
import { useApolloClient, useMutation } from "@apollo/client";
|
||||
import {
|
||||
Button,
|
||||
Dropdown,
|
||||
Form,
|
||||
Menu,
|
||||
notification,
|
||||
Popconfirm,
|
||||
Popover,
|
||||
Select,
|
||||
} from "antd";
|
||||
import { Button, Dropdown, Menu, notification, Popconfirm } from "antd";
|
||||
import React, { useMemo } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { connect } from "react-redux";
|
||||
@@ -29,7 +20,6 @@ import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
|
||||
import JobsDetaiLheaderCsi from "./jobs-detail-header-actions.csi.component";
|
||||
import DuplicateJob from "./jobs-detail-header-actions.duplicate.util";
|
||||
import JobsDetailHeaderActionsExportcustdataComponent from "./jobs-detail-header-actions.exportcustdata.component";
|
||||
import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
bodyshop: selectBodyshop,
|
||||
@@ -137,66 +127,37 @@ export function JobsDetailHeaderActions({
|
||||
<Menu.Item
|
||||
disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
|
||||
>
|
||||
<Popover
|
||||
trigger="click"
|
||||
<Popconfirm
|
||||
title={t("general.labels.areyousure")}
|
||||
okText="Yes"
|
||||
cancelText="No"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
|
||||
content={
|
||||
<Form
|
||||
layout="vertical"
|
||||
onFinish={async ({ lost_sale_reason }) => {
|
||||
const jobUpdate = await cancelAllAppointments({
|
||||
variables: {
|
||||
jobid: job.id,
|
||||
job: {
|
||||
date_scheduled: null,
|
||||
scheduled_in: null,
|
||||
scheduled_completion: null,
|
||||
lost_sale_reason,
|
||||
status: bodyshop.md_ro_statuses.default_imported,
|
||||
},
|
||||
},
|
||||
});
|
||||
if (!jobUpdate.errors) {
|
||||
notification["success"]({
|
||||
message: t("appointments.successes.canceled"),
|
||||
});
|
||||
return;
|
||||
}
|
||||
}}
|
||||
>
|
||||
<Form.Item
|
||||
name="lost_sale_reason"
|
||||
label={t("jobs.fields.lost_sale_reason")}
|
||||
rules={[
|
||||
{
|
||||
required: true,
|
||||
//message: t("general.validation.required"),
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Select
|
||||
options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
|
||||
label: lsr,
|
||||
value: lsr,
|
||||
}))}
|
||||
/>
|
||||
</Form.Item>
|
||||
<Button
|
||||
htmlType="submit"
|
||||
disabled={
|
||||
job.status !== bodyshop.md_ro_statuses.default_scheduled
|
||||
}
|
||||
>
|
||||
{t("appointments.actions.cancel")}
|
||||
</Button>
|
||||
</Form>
|
||||
}
|
||||
onConfirm={async () => {
|
||||
const jobUpdate = await cancelAllAppointments({
|
||||
variables: {
|
||||
jobid: job.id,
|
||||
job: {
|
||||
date_scheduled: null,
|
||||
scheduled_in: null,
|
||||
scheduled_completion: null,
|
||||
status: bodyshop.md_ro_statuses.default_imported,
|
||||
},
|
||||
},
|
||||
});
|
||||
if (!jobUpdate.errors) {
|
||||
notification["success"]({
|
||||
message: t("appointments.successes.canceled"),
|
||||
});
|
||||
return;
|
||||
}
|
||||
}}
|
||||
getPopupContainer={(trigger) => trigger.parentNode}
|
||||
>
|
||||
{t("menus.jobsactions.cancelallappointments")}
|
||||
</Popover>
|
||||
</Popconfirm>
|
||||
</Menu.Item>
|
||||
<Menu.Item
|
||||
data-cy="job-intake-button"
|
||||
disabled={
|
||||
!!job.intakechecklist ||
|
||||
!jobInPreProduction ||
|
||||
@@ -215,7 +176,7 @@ export function JobsDetailHeaderActions({
|
||||
</Link>
|
||||
)}
|
||||
</Menu.Item>
|
||||
<Menu.Item data-cy="job-deliver" disabled={!jobInProduction || jobRO}>
|
||||
<Menu.Item disabled={!jobInProduction || jobRO}>
|
||||
{!jobInProduction ? (
|
||||
t("jobs.actions.deliver")
|
||||
) : (
|
||||
@@ -224,7 +185,7 @@ export function JobsDetailHeaderActions({
|
||||
</Link>
|
||||
)}
|
||||
</Menu.Item>
|
||||
<Menu.Item data-cy="job-checklist" disabled={!job.converted}>
|
||||
<Menu.Item disabled={!job.converted}>
|
||||
<Link to={`/manage/jobs/${job.id}/checklist`}>
|
||||
{t("jobs.actions.viewchecklist")}
|
||||
</Link>
|
||||
@@ -244,9 +205,7 @@ export function JobsDetailHeaderActions({
|
||||
});
|
||||
}}
|
||||
>
|
||||
<span data-cy="actions-timetickets">
|
||||
{t("timetickets.actions.enter")}
|
||||
</span>
|
||||
{t("timetickets.actions.enter")}
|
||||
</Menu.Item>
|
||||
<Menu.Item
|
||||
key="enterpayments"
|
||||
@@ -430,7 +389,7 @@ export function JobsDetailHeaderActions({
|
||||
});
|
||||
}}
|
||||
>
|
||||
<span data-cy="actions-jobcosting">{t("jobs.labels.jobcosting")}</span>
|
||||
{t("jobs.labels.jobcosting")}
|
||||
</Menu.Item>
|
||||
{job && !job.converted && (
|
||||
<Menu.Item>
|
||||
@@ -465,62 +424,60 @@ export function JobsDetailHeaderActions({
|
||||
)}
|
||||
<JobsDetailHeaderActionsAddevent jobid={job.id} />
|
||||
{!jobRO && job.converted && (
|
||||
<RbacWrapper action="jobs:void" noauth>
|
||||
<Menu.Item>
|
||||
<Popconfirm
|
||||
title={t("jobs.labels.voidjob")}
|
||||
okText="Yes"
|
||||
cancelText="No"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
onConfirm={async () => {
|
||||
//delete the job.
|
||||
const result = await voidJob({
|
||||
variables: {
|
||||
jobId: job.id,
|
||||
job: {
|
||||
status: bodyshop.md_ro_statuses.default_void,
|
||||
voided: true,
|
||||
scheduled_in: null,
|
||||
scheduled_completion: null,
|
||||
inproduction: false,
|
||||
},
|
||||
note: [
|
||||
{
|
||||
jobid: job.id,
|
||||
created_by: currentUser.email,
|
||||
audit: true,
|
||||
text: t("jobs.labels.voidnote"),
|
||||
},
|
||||
],
|
||||
<Menu.Item>
|
||||
<Popconfirm
|
||||
title={t("jobs.labels.voidjob")}
|
||||
okText="Yes"
|
||||
cancelText="No"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
onConfirm={async () => {
|
||||
//delete the job.
|
||||
const result = await voidJob({
|
||||
variables: {
|
||||
jobId: job.id,
|
||||
job: {
|
||||
status: bodyshop.md_ro_statuses.default_void,
|
||||
voided: true,
|
||||
scheduled_in: null,
|
||||
scheduled_completion: null,
|
||||
inproduction: false,
|
||||
},
|
||||
});
|
||||
note: [
|
||||
{
|
||||
jobid: job.id,
|
||||
created_by: currentUser.email,
|
||||
audit: true,
|
||||
text: t("jobs.labels.voidnote"),
|
||||
},
|
||||
],
|
||||
},
|
||||
});
|
||||
|
||||
if (!!!result.errors) {
|
||||
notification["success"]({
|
||||
message: t("jobs.successes.voided"),
|
||||
});
|
||||
//go back to jobs list.
|
||||
history.push(`/manage/`);
|
||||
} else {
|
||||
notification["error"]({
|
||||
message: t("jobs.errors.voiding", {
|
||||
error: JSON.stringify(result.errors),
|
||||
}),
|
||||
});
|
||||
}
|
||||
}}
|
||||
getPopupContainer={(trigger) => trigger.parentNode}
|
||||
>
|
||||
{t("menus.jobsactions.void")}
|
||||
</Popconfirm>
|
||||
</Menu.Item>
|
||||
</RbacWrapper>
|
||||
if (!!!result.errors) {
|
||||
notification["success"]({
|
||||
message: t("jobs.successes.voided"),
|
||||
});
|
||||
//go back to jobs list.
|
||||
history.push(`/manage/`);
|
||||
} else {
|
||||
notification["error"]({
|
||||
message: t("jobs.errors.voiding", {
|
||||
error: JSON.stringify(result.errors),
|
||||
}),
|
||||
});
|
||||
}
|
||||
}}
|
||||
getPopupContainer={(trigger) => trigger.parentNode}
|
||||
>
|
||||
{t("menus.jobsactions.void")}
|
||||
</Popconfirm>
|
||||
</Menu.Item>
|
||||
)}
|
||||
</Menu>
|
||||
);
|
||||
return (
|
||||
<Dropdown overlay={statusmenu} trigger={["click"]} key="changestatus">
|
||||
<Button data-cy="job-actions-button">
|
||||
<Button>
|
||||
<span>{t("general.labels.actions")}</span>
|
||||
|
||||
<DownCircleFilled />
|
||||
|
||||
@@ -5,7 +5,7 @@ import {
|
||||
BranchesOutlined,
|
||||
} from "@ant-design/icons";
|
||||
import { Card, Col, Row, Space, Tag, Tooltip } from "antd";
|
||||
import React, { useState } from "react";
|
||||
import React from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { connect } from "react-redux";
|
||||
import { Link } from "react-router-dom";
|
||||
@@ -56,7 +56,7 @@ const colSpan = {
|
||||
|
||||
export function JobsDetailHeader({ job, bodyshop, disabled }) {
|
||||
const { t } = useTranslation();
|
||||
const [notesClamped, setNotesClamped] = useState(true);
|
||||
|
||||
const vehicleTitle = `${job.v_model_yr || ""} ${job.v_color || ""}
|
||||
${job.v_make_desc || ""}
|
||||
${job.v_model_desc || ""}`.trim();
|
||||
@@ -229,8 +229,6 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
|
||||
<DataLabel
|
||||
label={t("vehicles.fields.notes")}
|
||||
valueStyle={{ whiteSpace: "pre-wrap" }}
|
||||
valueClassName={notesClamped ? "clamp" : ""}
|
||||
onValueClick={() => setNotesClamped(!notesClamped)}
|
||||
>
|
||||
{job.vehicle.notes}
|
||||
</DataLabel>
|
||||
|
||||
@@ -6,12 +6,3 @@
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.clamp {
|
||||
-webkit-line-clamp: 3;
|
||||
-webkit-box-orient: vertical;
|
||||
display: -webkit-box;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
overflow-wrap: break-word;
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import BillDetailEditcontainer from "../bill-detail-edit/bill-detail-edit.contai
|
||||
import BillsListTable from "../bills-list-table/bills-list-table.component";
|
||||
import JobBillsTotal from "../job-bills-total/job-bills-total.component";
|
||||
import PartsOrderListTableComponent from "../parts-order-list-table/parts-order-list-table.component";
|
||||
import PartsOrderModal from "../parts-order-modal/parts-order-modal.container";
|
||||
|
||||
export default function JobsDetailPliComponent({
|
||||
job,
|
||||
@@ -14,6 +15,7 @@ export default function JobsDetailPliComponent({
|
||||
}) {
|
||||
return (
|
||||
<div>
|
||||
<PartsOrderModal />
|
||||
{billsQuery.error ? (
|
||||
<AlertComponent message={billsQuery.error.message} type="error" />
|
||||
) : null}
|
||||
|
||||
@@ -40,26 +40,24 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
|
||||
>
|
||||
<CurrencyInput disabled={jobRO} min={0} />
|
||||
</Form.Item>
|
||||
{bodyshop.region_config.toLowerCase().startsWith("ca") && (
|
||||
<Tooltip title={t("jobs.labels.ca_gst_all_if_null")}>
|
||||
<Form.Item
|
||||
label={t("jobs.fields.ca_customer_gst")}
|
||||
name="ca_customer_gst"
|
||||
>
|
||||
<CurrencyInput
|
||||
disabled={jobRO}
|
||||
min={0}
|
||||
max={
|
||||
Math.round(
|
||||
(job.job_totals &&
|
||||
job.job_totals.totals.federal_tax.amount) ||
|
||||
0
|
||||
) / 100
|
||||
}
|
||||
/>
|
||||
</Form.Item>
|
||||
</Tooltip>
|
||||
)}
|
||||
<Tooltip title={t("jobs.labels.ca_gst_all_if_null")}>
|
||||
<Form.Item
|
||||
label={t("jobs.fields.ca_customer_gst")}
|
||||
name="ca_customer_gst"
|
||||
>
|
||||
<CurrencyInput
|
||||
disabled={jobRO}
|
||||
min={0}
|
||||
max={
|
||||
Math.round(
|
||||
(job.job_totals &&
|
||||
job.job_totals.totals.federal_tax.amount) ||
|
||||
0
|
||||
) / 100
|
||||
}
|
||||
/>
|
||||
</Form.Item>
|
||||
</Tooltip>
|
||||
<Form.Item
|
||||
label={t("jobs.fields.other_amount_payable")}
|
||||
name="other_amount_payable"
|
||||
@@ -84,14 +82,12 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
|
||||
>
|
||||
<CurrencyInput disabled={jobRO || bodyshop.cdk_dealerid} />
|
||||
</Form.Item>
|
||||
{bodyshop.region_config === "CA_BC" && (
|
||||
<Space align="center">
|
||||
<Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
|
||||
<CurrencyInput disabled={jobRO} min={0} />
|
||||
</Form.Item>
|
||||
<CABCpvrtCalculator form={form} disabled={jobRO} />
|
||||
</Space>
|
||||
)}
|
||||
<Space align="end">
|
||||
<Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
|
||||
<CurrencyInput disabled={jobRO} min={0} />
|
||||
</Form.Item>
|
||||
<CABCpvrtCalculator form={form} disabled={jobRO} />
|
||||
</Space>
|
||||
<Form.Item
|
||||
label={t("jobs.fields.auto_add_ats")}
|
||||
name="auto_add_ats"
|
||||
@@ -145,15 +141,13 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
|
||||
>
|
||||
<InputNumber min={0} max={1} precision={2} disabled={jobRO} />
|
||||
</Form.Item>
|
||||
{bodyshop.region_config.toLowerCase().startsWith("ca") && (
|
||||
<Form.Item
|
||||
label={t("jobs.fields.ca_gst_registrant")}
|
||||
name="ca_gst_registrant"
|
||||
valuePropName="checked"
|
||||
>
|
||||
<Switch disabled={jobRO} />
|
||||
</Form.Item>
|
||||
)}
|
||||
<Form.Item
|
||||
label={t("jobs.fields.ca_gst_registrant")}
|
||||
name="ca_gst_registrant"
|
||||
valuePropName="checked"
|
||||
>
|
||||
<Switch disabled={jobRO} />
|
||||
</Form.Item>
|
||||
</FormRow>
|
||||
<Divider
|
||||
orientation="left"
|
||||
|
||||
@@ -5,7 +5,7 @@ import { useTranslation } from "react-i18next";
|
||||
import { logImEXEvent } from "../../firebase/firebase.utils";
|
||||
import cleanAxios from "../../utils/CleanAxios";
|
||||
import formatBytes from "../../utils/formatbytes";
|
||||
//import yauzl from "yauzl";
|
||||
import yauzl from "yauzl";
|
||||
import { useTreatments } from "@splitsoftware/splitio-react";
|
||||
|
||||
import { connect } from "react-redux";
|
||||
@@ -69,44 +69,44 @@ export function JobsDocumentsDownloadButton({
|
||||
setDownload(null);
|
||||
if (Direct_Media_Download.treatment === "on") {
|
||||
try {
|
||||
// const parentDir = await window.showDirectoryPicker({
|
||||
// id: "media",
|
||||
// startIn: "downloads",
|
||||
// });
|
||||
const parentDir = await window.showDirectoryPicker({
|
||||
id: "media",
|
||||
startIn: "downloads",
|
||||
});
|
||||
|
||||
// const directory = await parentDir.getDirectoryHandle(identifier, {
|
||||
// create: true,
|
||||
// });
|
||||
const directory = await parentDir.getDirectoryHandle(identifier, {
|
||||
create: true,
|
||||
});
|
||||
|
||||
// yauzl.fromBuffer(
|
||||
// Buffer.from(theDownloadedZip.data),
|
||||
// {},
|
||||
// (err, zipFile) => {
|
||||
// if (err) throw err;
|
||||
// zipFile.on("entry", (entry) => {
|
||||
// zipFile.openReadStream(entry, async (readErr, readStream) => {
|
||||
// if (readErr) {
|
||||
// zipFile.close();
|
||||
// throw readErr;
|
||||
// }
|
||||
// if (err) throw err;
|
||||
// let fileSystemHandle = await directory.getFileHandle(
|
||||
// entry.fileName,
|
||||
// {
|
||||
// create: true,
|
||||
// }
|
||||
// );
|
||||
// const writable = await fileSystemHandle.createWritable();
|
||||
// readStream.on("data", async function (chunk) {
|
||||
// await writable.write(chunk);
|
||||
// });
|
||||
// readStream.on("end", async function () {
|
||||
// await writable.close();
|
||||
// });
|
||||
// });
|
||||
// });
|
||||
// }
|
||||
// );
|
||||
yauzl.fromBuffer(
|
||||
Buffer.from(theDownloadedZip.data),
|
||||
{},
|
||||
(err, zipFile) => {
|
||||
if (err) throw err;
|
||||
zipFile.on("entry", (entry) => {
|
||||
zipFile.openReadStream(entry, async (readErr, readStream) => {
|
||||
if (readErr) {
|
||||
zipFile.close();
|
||||
throw readErr;
|
||||
}
|
||||
if (err) throw err;
|
||||
let fileSystemHandle = await directory.getFileHandle(
|
||||
entry.fileName,
|
||||
{
|
||||
create: true,
|
||||
}
|
||||
);
|
||||
const writable = await fileSystemHandle.createWritable();
|
||||
readStream.on("data", async function (chunk) {
|
||||
await writable.write(chunk);
|
||||
});
|
||||
readStream.on("end", async function () {
|
||||
await writable.close();
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
);
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
standardMediaDownload(theDownloadedZip.data);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { EditFilled, FileExcelFilled, SyncOutlined } from "@ant-design/icons";
|
||||
import { Button, Card, Col, Row, Space } from "antd";
|
||||
import React, { useEffect, useState } from "react";
|
||||
import { Gallery } from "react-grid-gallery";
|
||||
import Gallery from "react-grid-gallery";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import DocumentsUploadComponent from "../documents-upload/documents-upload.component";
|
||||
import { DetermineFileType } from "../documents-upload/documents-upload.utility";
|
||||
@@ -11,9 +11,6 @@ import JobsDocumentsGalleryReassign from "./jobs-document-gallery.reassign.compo
|
||||
import JobsDocumentsDeleteButton from "./jobs-documents-gallery.delete.component";
|
||||
import JobsDocumentsGallerySelectAllComponent from "./jobs-documents-gallery.selectall.component";
|
||||
|
||||
import Lightbox from "react-image-lightbox";
|
||||
import "react-image-lightbox/style.css";
|
||||
|
||||
function JobsDocumentsComponent({
|
||||
data,
|
||||
jobId,
|
||||
@@ -26,7 +23,11 @@ function JobsDocumentsComponent({
|
||||
}) {
|
||||
const [galleryImages, setgalleryImages] = useState({ images: [], other: [] });
|
||||
const { t } = useTranslation();
|
||||
const [modalState, setModalState] = useState({ open: false, index: 0 });
|
||||
const [index, setIndex] = useState(0);
|
||||
|
||||
const onCurrentImageChange = (index) => {
|
||||
setIndex(index);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
let documents = data.reduce(
|
||||
@@ -34,16 +35,14 @@ function JobsDocumentsComponent({
|
||||
const fileType = DetermineFileType(value.type);
|
||||
if (value.type.startsWith("image")) {
|
||||
acc.images.push({
|
||||
// src: GenerateSrcUrl(value),
|
||||
src: GenerateThumbUrl(value),
|
||||
// src: GenerateSrcUrl(value),
|
||||
// thumbnail: GenerateThumbUrl(value),
|
||||
fullsize: GenerateSrcUrl(value),
|
||||
height: 225,
|
||||
width: 225,
|
||||
src: GenerateSrcUrl(value),
|
||||
thumbnail: GenerateThumbUrl(value),
|
||||
thumbnailHeight: 225,
|
||||
thumbnailWidth: 225,
|
||||
isSelected: false,
|
||||
key: value.key,
|
||||
extension: value.extension,
|
||||
|
||||
id: value.id,
|
||||
type: value.type,
|
||||
size: value.size,
|
||||
@@ -63,7 +62,7 @@ function JobsDocumentsComponent({
|
||||
const fileName = value.key.split("/").pop();
|
||||
acc.other.push({
|
||||
source: GenerateSrcUrl(value),
|
||||
src: thumb,
|
||||
src: "",
|
||||
thumbnail: thumb,
|
||||
tags: [
|
||||
{
|
||||
@@ -86,9 +85,10 @@ function JobsDocumentsComponent({
|
||||
]
|
||||
: []),
|
||||
],
|
||||
height: 225,
|
||||
width: 225,
|
||||
thumbnailHeight: 225,
|
||||
thumbnailWidth: 225,
|
||||
isSelected: false,
|
||||
|
||||
extension: value.extension,
|
||||
key: value.key,
|
||||
id: value.id,
|
||||
@@ -148,15 +148,35 @@ function JobsDocumentsComponent({
|
||||
<Card title={t("jobs.labels.documents-images")}>
|
||||
<Gallery
|
||||
images={galleryImages.images}
|
||||
onClick={(index, item) => {
|
||||
setModalState({ open: true, index: index });
|
||||
// window.open(
|
||||
// item.fullsize,
|
||||
// "_blank",
|
||||
// "toolbar=0,location=0,menubar=0"
|
||||
// );
|
||||
backdropClosesModal={true}
|
||||
currentImageWillChange={onCurrentImageChange}
|
||||
customControls={[
|
||||
<Button
|
||||
key="edit-button"
|
||||
style={{
|
||||
float: "right",
|
||||
zIndex: "5",
|
||||
}}
|
||||
onClick={() => {
|
||||
const newWindow = window.open(
|
||||
`${window.location.protocol}//${window.location.host}/edit?documentId=${galleryImages.images[index].id}`,
|
||||
"_blank",
|
||||
"noopener,noreferrer"
|
||||
);
|
||||
if (newWindow) newWindow.opener = null;
|
||||
}}
|
||||
>
|
||||
<EditFilled />
|
||||
</Button>,
|
||||
]}
|
||||
onClickImage={(props) => {
|
||||
window.open(
|
||||
props.target.src,
|
||||
"_blank",
|
||||
"toolbar=0,location=0,menubar=0"
|
||||
);
|
||||
}}
|
||||
onSelect={(index, image) => {
|
||||
onSelectImage={(index, image) => {
|
||||
setgalleryImages({
|
||||
...galleryImages,
|
||||
images: galleryImages.images.map((g, idx) =>
|
||||
@@ -171,6 +191,8 @@ function JobsDocumentsComponent({
|
||||
<Card title={t("jobs.labels.documents-other")}>
|
||||
<Gallery
|
||||
images={galleryImages.other}
|
||||
backdropClosesModal={true}
|
||||
enableLightbox={false}
|
||||
thumbnailStyle={() => {
|
||||
return {
|
||||
backgroundImage: <FileExcelFilled />,
|
||||
@@ -179,14 +201,14 @@ function JobsDocumentsComponent({
|
||||
cursor: "pointer",
|
||||
};
|
||||
}}
|
||||
onClick={(index) => {
|
||||
onClickThumbnail={(index) => {
|
||||
window.open(
|
||||
galleryImages.other[index].source,
|
||||
"_blank",
|
||||
"toolbar=0,location=0,menubar=0"
|
||||
);
|
||||
}}
|
||||
onSelect={(index) => {
|
||||
onSelectImage={(index) => {
|
||||
setgalleryImages({
|
||||
...galleryImages,
|
||||
other: galleryImages.other.map((g, idx) =>
|
||||
@@ -197,53 +219,6 @@ function JobsDocumentsComponent({
|
||||
/>
|
||||
</Card>
|
||||
</Col>
|
||||
{modalState.open && (
|
||||
<Lightbox
|
||||
toolbarButtons={[
|
||||
<EditFilled
|
||||
onClick={() => {
|
||||
const newWindow = window.open(
|
||||
`${window.location.protocol}//${
|
||||
window.location.host
|
||||
}/edit?documentId=${
|
||||
galleryImages.images[modalState.index].id
|
||||
}`,
|
||||
"_blank",
|
||||
"noopener,noreferrer"
|
||||
);
|
||||
if (newWindow) newWindow.opener = null;
|
||||
}}
|
||||
/>,
|
||||
]}
|
||||
mainSrc={galleryImages.images[modalState.index].fullsize}
|
||||
nextSrc={
|
||||
galleryImages.images[
|
||||
(modalState.index + 1) % galleryImages.images.length
|
||||
].fullsize
|
||||
}
|
||||
prevSrc={
|
||||
galleryImages.images[
|
||||
(modalState.index + galleryImages.images.length - 1) %
|
||||
galleryImages.images.length
|
||||
].fullsize
|
||||
}
|
||||
onCloseRequest={() => setModalState({ open: false, index: 0 })}
|
||||
onMovePrevRequest={() =>
|
||||
setModalState({
|
||||
...modalState,
|
||||
index:
|
||||
(modalState.index + galleryImages.images.length - 1) %
|
||||
galleryImages.images.length,
|
||||
})
|
||||
}
|
||||
onMoveNextRequest={() =>
|
||||
setModalState({
|
||||
...modalState,
|
||||
index: (modalState.index + 1) % galleryImages.images.length,
|
||||
})
|
||||
}
|
||||
/>
|
||||
)}
|
||||
</Row>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import React, { useEffect } from "react";
|
||||
import { Gallery } from "react-grid-gallery";
|
||||
import Gallery from "react-grid-gallery";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { GenerateThumbUrl } from "./job-documents.utility";
|
||||
import { GenerateSrcUrl, GenerateThumbUrl } from "./job-documents.utility";
|
||||
|
||||
function JobsDocumentGalleryExternal({
|
||||
data,
|
||||
@@ -15,8 +15,8 @@ function JobsDocumentGalleryExternal({
|
||||
let documents = data.reduce((acc, value) => {
|
||||
if (value.type.startsWith("image")) {
|
||||
acc.push({
|
||||
//src: GenerateSrcUrl(value),
|
||||
src: GenerateThumbUrl(value),
|
||||
src: GenerateSrcUrl(value),
|
||||
thumbnail: GenerateThumbUrl(value),
|
||||
thumbnailHeight: 225,
|
||||
thumbnailWidth: 225,
|
||||
isSelected: false,
|
||||
@@ -39,7 +39,7 @@ function JobsDocumentGalleryExternal({
|
||||
<Gallery
|
||||
images={galleryImages}
|
||||
backdropClosesModal={true}
|
||||
onSelect={(index, image) => {
|
||||
onSelectImage={(index, image) => {
|
||||
setgalleryImages(
|
||||
galleryImages.map((g, idx) =>
|
||||
index === idx ? { ...g, isSelected: !g.isSelected } : g
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { SyncOutlined, FileExcelFilled } from "@ant-design/icons";
|
||||
import { Alert, Button, Card, Space } from "antd";
|
||||
import React, { useEffect, useState } from "react";
|
||||
import { Gallery } from "react-grid-gallery";
|
||||
import React, { useEffect } from "react";
|
||||
import Gallery from "react-grid-gallery";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
@@ -19,9 +19,6 @@ import JobsLocalGalleryDownloadButton from "./jobs-documents-local-gallery.downl
|
||||
import JobsDocumentsLocalGalleryReassign from "./jobs-documents-local-gallery.reassign.component";
|
||||
import JobsDocumentsLocalGallerySelectAllComponent from "./jobs-documents-local-gallery.selectall.component";
|
||||
|
||||
import Lightbox from "react-image-lightbox";
|
||||
import "react-image-lightbox/style.css";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
bodyshop: selectBodyshop,
|
||||
allMedia: selectAllMedia,
|
||||
@@ -52,7 +49,6 @@ export function JobsDocumentsLocalGallery({
|
||||
vendorid,
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
const [modalState, setModalState] = useState({ open: false, index: 0 });
|
||||
useEffect(() => {
|
||||
if (job) {
|
||||
if (invoice_number) {
|
||||
@@ -74,20 +70,12 @@ export function JobsDocumentsLocalGallery({
|
||||
) {
|
||||
acc.images.push({
|
||||
...val,
|
||||
fullsize: val.src,
|
||||
src: val.thumbnail,
|
||||
height: val.thumbnailHeight,
|
||||
width: val.thumbnailWidth,
|
||||
...(val.optimized && { src: val.optimized, fullsize: val.src }),
|
||||
});
|
||||
if (val.optimized) optimized = true;
|
||||
} else {
|
||||
acc.other.push({
|
||||
...val,
|
||||
fullsize: val.src,
|
||||
src: val.thumbnail,
|
||||
height: val.thumbnailHeight,
|
||||
width: val.thumbnailWidth,
|
||||
tags: [{ value: val.filename, title: val.filename }],
|
||||
});
|
||||
}
|
||||
@@ -132,7 +120,8 @@ export function JobsDocumentsLocalGallery({
|
||||
<Card title={t("jobs.labels.documents-images")}>
|
||||
<Gallery
|
||||
images={jobMedia.images}
|
||||
onSelect={(index, image) => {
|
||||
backdropClosesModal={true}
|
||||
onSelectImage={(index, image) => {
|
||||
toggleMediaSelected({ jobid: job.id, filename: image.filename });
|
||||
}}
|
||||
{...(optimized && {
|
||||
@@ -144,23 +133,24 @@ export function JobsDocumentsLocalGallery({
|
||||
/>,
|
||||
],
|
||||
})}
|
||||
onClick={(index) => {
|
||||
setModalState({ open: true, index: index });
|
||||
// const media = allMedia[job.id].find(
|
||||
// (m) => m.optimized === item.src
|
||||
// );
|
||||
onClickImage={(props) => {
|
||||
const media = allMedia[job.id].find(
|
||||
(m) => m.optimized === props.target.src
|
||||
);
|
||||
|
||||
// window.open(
|
||||
// media ? media.fullsize : item.fullsize,
|
||||
// "_blank",
|
||||
// "toolbar=0,location=0,menubar=0"
|
||||
// );
|
||||
window.open(
|
||||
media ? media.src : props.target.src,
|
||||
"_blank",
|
||||
"toolbar=0,location=0,menubar=0"
|
||||
);
|
||||
}}
|
||||
/>
|
||||
</Card>
|
||||
<Card title={t("jobs.labels.documents-other")}>
|
||||
<Gallery
|
||||
images={jobMedia.other}
|
||||
backdropClosesModal={true}
|
||||
enableLightbox={false}
|
||||
thumbnailStyle={() => {
|
||||
return {
|
||||
backgroundImage: <FileExcelFilled />,
|
||||
@@ -169,48 +159,18 @@ export function JobsDocumentsLocalGallery({
|
||||
cursor: "pointer",
|
||||
};
|
||||
}}
|
||||
onClick={(index) => {
|
||||
onClickThumbnail={(index) => {
|
||||
window.open(
|
||||
jobMedia.other[index].fullsize,
|
||||
jobMedia.other[index].src,
|
||||
"_blank",
|
||||
"toolbar=0,location=0,menubar=0"
|
||||
);
|
||||
}}
|
||||
onSelect={(index, image) => {
|
||||
onSelectImage={(index, image) => {
|
||||
toggleMediaSelected({ jobid: job.id, filename: image.filename });
|
||||
}}
|
||||
/>
|
||||
</Card>
|
||||
{modalState.open && (
|
||||
<Lightbox
|
||||
mainSrc={jobMedia.images[modalState.index].fullsize}
|
||||
nextSrc={
|
||||
jobMedia.images[(modalState.index + 1) % jobMedia.images.length]
|
||||
.fullsize
|
||||
}
|
||||
prevSrc={
|
||||
jobMedia.images[
|
||||
(modalState.index + jobMedia.images.length - 1) %
|
||||
jobMedia.images.length
|
||||
].fullsize
|
||||
}
|
||||
onCloseRequest={() => setModalState({ open: false, index: 0 })}
|
||||
onMovePrevRequest={() =>
|
||||
setModalState({
|
||||
...modalState,
|
||||
index:
|
||||
(modalState.index + jobMedia.images.length - 1) %
|
||||
jobMedia.images.length,
|
||||
})
|
||||
}
|
||||
onMoveNextRequest={() =>
|
||||
setModalState({
|
||||
...modalState,
|
||||
index: (modalState.index + 1) % jobMedia.images.length,
|
||||
})
|
||||
}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import React, { useEffect } from "react";
|
||||
import { Gallery } from "react-grid-gallery";
|
||||
import Gallery from "react-grid-gallery";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
@@ -38,7 +38,7 @@ function JobDocumentsLocalGalleryExternal({
|
||||
const { t } = useTranslation();
|
||||
|
||||
useEffect(() => {
|
||||
if (jobId) {
|
||||
if ( jobId) {
|
||||
getJobMedia(jobId);
|
||||
}
|
||||
}, [jobId, getJobMedia]);
|
||||
@@ -52,15 +52,11 @@ function JobDocumentsLocalGalleryExternal({
|
||||
val.type.mime &&
|
||||
val.type.mime.startsWith("image")
|
||||
) {
|
||||
acc.push({ ...val, src: val.thumbnail });
|
||||
acc.push(val);
|
||||
}
|
||||
return acc;
|
||||
}, [])
|
||||
: [];
|
||||
console.log(
|
||||
"🚀 ~ file: jobs-documents-local-gallery.external.component.jsx:48 ~ useEffect ~ documents:",
|
||||
documents
|
||||
);
|
||||
|
||||
setgalleryImages(documents);
|
||||
}, [allMedia, jobId, setgalleryImages, t]);
|
||||
@@ -69,7 +65,8 @@ function JobDocumentsLocalGalleryExternal({
|
||||
<div className="clearfix">
|
||||
<Gallery
|
||||
images={galleryImages}
|
||||
onSelect={(index, image) => {
|
||||
backdropClosesModal={true}
|
||||
onSelectImage={(index, image) => {
|
||||
setgalleryImages(
|
||||
galleryImages.map((g, idx) =>
|
||||
index === idx ? { ...g, isSelected: !g.isSelected } : g
|
||||
|
||||
@@ -182,7 +182,7 @@ export function JobsExportAllButton({
|
||||
|
||||
return (
|
||||
<Button onClick={handleQbxml} loading={loading} disabled={disabled}>
|
||||
{t("jobs.actions.exportselected")}
|
||||
{t("jobs.actions.export")}
|
||||
</Button>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -167,7 +167,6 @@ export default function JobsFindModalComponent({
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
data-cy="existing-jobs-table"
|
||||
pagination={{ position: "bottom" }}
|
||||
columns={columns}
|
||||
rowKey="id"
|
||||
@@ -190,7 +189,6 @@ export default function JobsFindModalComponent({
|
||||
/>
|
||||
<Divider />
|
||||
<Checkbox
|
||||
data-cy="override-header-checkbox"
|
||||
defaultChecked={importOptions.overrideHeader}
|
||||
onChange={(e) =>
|
||||
setImportOptions({
|
||||
|
||||
@@ -77,10 +77,7 @@ export default connect(
|
||||
title={t("jobs.labels.existing_jobs")}
|
||||
width={"80%"}
|
||||
destroyOnClose
|
||||
okButtonProps={{
|
||||
disabled: selectedJob ? false : true,
|
||||
"data-cy": "existing-jobs-ok-button",
|
||||
}}
|
||||
okButtonProps={{ disabled: selectedJob ? false : true }}
|
||||
{...modalProps}
|
||||
>
|
||||
{loading ? <LoadingSpinner /> : null}
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
import { SyncOutlined } from "@ant-design/icons";
|
||||
import { Button, Card, Input, Space, Table, Typography } from "antd";
|
||||
import axios from "axios";
|
||||
import _ from "lodash";
|
||||
import queryString from "query-string";
|
||||
import React, { useEffect, useState } from "react";
|
||||
import React from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { connect } from "react-redux";
|
||||
import { Link, useHistory, useLocation } from "react-router-dom";
|
||||
@@ -22,8 +21,6 @@ const mapDispatchToProps = (dispatch) => ({
|
||||
|
||||
export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
|
||||
const search = queryString.parse(useLocation().search);
|
||||
const [openSearchResults, setOpenSearchResults] = useState([]);
|
||||
const [searchLoading, setSearchLoading] = useState(false);
|
||||
const { page, sortcolumn, sortorder } = search;
|
||||
const history = useHistory();
|
||||
|
||||
@@ -196,28 +193,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
|
||||
history.push({ search: queryString.stringify(search) });
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (search.search && search.search.trim() !== "") {
|
||||
searchJobs();
|
||||
}
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, []);
|
||||
|
||||
async function searchJobs(value) {
|
||||
try {
|
||||
setSearchLoading(true);
|
||||
const searchData = await axios.post("/search", {
|
||||
search: value || search.search,
|
||||
index: "jobs",
|
||||
});
|
||||
setOpenSearchResults(searchData.data.hits.hits.map((s) => s._source));
|
||||
} catch (error) {
|
||||
console.log("Error while fetching search results", error);
|
||||
} finally {
|
||||
setSearchLoading(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<Card
|
||||
extra={
|
||||
@@ -230,7 +205,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
|
||||
<Button
|
||||
onClick={() => {
|
||||
delete search.search;
|
||||
delete search.page;
|
||||
history.push({ search: queryString.stringify(search) });
|
||||
}}
|
||||
>
|
||||
@@ -246,32 +220,24 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
|
||||
onSearch={(value) => {
|
||||
search.search = value;
|
||||
history.push({ search: queryString.stringify(search) });
|
||||
searchJobs(value);
|
||||
}}
|
||||
loading={loading || searchLoading}
|
||||
enterButton
|
||||
/>
|
||||
</Space>
|
||||
}
|
||||
>
|
||||
<Table
|
||||
loading={loading || searchLoading}
|
||||
pagination={
|
||||
search?.search
|
||||
? {
|
||||
pageSize: 25,
|
||||
showSizeChanger: false,
|
||||
}
|
||||
: {
|
||||
pageSize: 25,
|
||||
current: parseInt(page || 1),
|
||||
total: total,
|
||||
showSizeChanger: false,
|
||||
}
|
||||
}
|
||||
loading={loading}
|
||||
pagination={{
|
||||
position: "top",
|
||||
pageSize: 25,
|
||||
current: parseInt(page || 1),
|
||||
total: total,
|
||||
showSizeChanger: false,
|
||||
}}
|
||||
columns={columns}
|
||||
rowKey="id"
|
||||
dataSource={search?.search ? openSearchResults : jobs}
|
||||
dataSource={jobs}
|
||||
onChange={handleTableChange}
|
||||
/>
|
||||
</Card>
|
||||
|
||||
@@ -112,9 +112,7 @@ export function JobsList({ bodyshop }) {
|
||||
title: t("jobs.fields.ro_number"),
|
||||
dataIndex: "ro_number",
|
||||
key: "ro_number",
|
||||
sorter: (a, b) =>
|
||||
parseInt((a.ro_number || "0").replace(/\D/g, "")) -
|
||||
parseInt((b.ro_number || "0").replace(/\D/g, "")),
|
||||
sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
|
||||
sortOrder:
|
||||
state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
|
||||
|
||||
@@ -122,7 +120,6 @@ export function JobsList({ bodyshop }) {
|
||||
<Link
|
||||
to={"/manage/jobs/" + record.id}
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
data-cy="active-job-link"
|
||||
>
|
||||
<Space>
|
||||
{record.ro_number || t("general.labels.na")}
|
||||
@@ -263,19 +260,6 @@ export function JobsList({ bodyshop }) {
|
||||
dataIndex: "ins_co_nm",
|
||||
key: "ins_co_nm",
|
||||
ellipsis: true,
|
||||
filters:
|
||||
(jobs &&
|
||||
jobs
|
||||
.map((j) => j.ins_co_nm)
|
||||
.filter(onlyUnique)
|
||||
.map((s) => {
|
||||
return {
|
||||
text: s,
|
||||
value: [s],
|
||||
};
|
||||
})) ||
|
||||
[],
|
||||
onFilter: (value, record) => value.includes(record.ins_co_nm),
|
||||
responsive: ["md"],
|
||||
},
|
||||
{
|
||||
@@ -365,7 +349,6 @@ export function JobsList({ bodyshop }) {
|
||||
}
|
||||
>
|
||||
<Table
|
||||
data-cy="active-jobs-table"
|
||||
loading={loading}
|
||||
pagination={{ defaultPageSize: 50 }}
|
||||
columns={columns}
|
||||
|
||||
@@ -75,27 +75,6 @@ export function JobNotesComponent({
|
||||
</span>
|
||||
),
|
||||
},
|
||||
{
|
||||
title: t("notes.fields.type"),
|
||||
dataIndex: "type",
|
||||
key: "type",
|
||||
width: 120,
|
||||
filteredValue: filter?.type || null,
|
||||
filters: [
|
||||
{ value: "general", text: t("notes.fields.types.general") },
|
||||
{ value: "customer", text: t("notes.fields.types.customer") },
|
||||
{ value: "shop", text: t("notes.fields.types.shop") },
|
||||
{ value: "office", text: t("notes.fields.types.office") },
|
||||
{ value: "parts", text: t("notes.fields.types.parts") },
|
||||
{ value: "paint", text: t("notes.fields.types.paint") },
|
||||
{
|
||||
value: "supplement",
|
||||
text: t("notes.fields.types.supplement"),
|
||||
},
|
||||
],
|
||||
onFilter: (value, record) => value.includes(record.type),
|
||||
render: (text, record) => t(`notes.fields.types.${record.type}`),
|
||||
},
|
||||
{
|
||||
title: t("notes.fields.text"),
|
||||
dataIndex: "text",
|
||||
@@ -127,7 +106,7 @@ export function JobNotesComponent({
|
||||
title: t("notes.actions.actions"),
|
||||
dataIndex: "actions",
|
||||
key: "actions",
|
||||
width: 200,
|
||||
width: 150,
|
||||
render: (text, record) => (
|
||||
<Space wrap>
|
||||
<Button
|
||||
|
||||
@@ -272,19 +272,6 @@ export function JobsReadyList({ bodyshop }) {
|
||||
dataIndex: "ins_co_nm",
|
||||
key: "ins_co_nm",
|
||||
ellipsis: true,
|
||||
filters:
|
||||
(jobs &&
|
||||
jobs
|
||||
.map((j) => j.ins_co_nm)
|
||||
.filter(onlyUnique)
|
||||
.map((s) => {
|
||||
return {
|
||||
text: s,
|
||||
value: [s],
|
||||
};
|
||||
})) ||
|
||||
[],
|
||||
onFilter: (value, record) => value.includes(record.ins_co_nm),
|
||||
responsive: ["md"],
|
||||
},
|
||||
{
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user