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

Merged in release/2023-04-21 (pull request #715)

Browse Source 
Release/2023 04 21

Approved-by: Patrick Fic
This commit is contained in:
Allan Carr
2023-04-19 23:14:52 +00:00
committed by Patrick Fic
parent c0d9bacf1d 1932795f55
commit 701c532e48
7 changed files with 2081 additions and 2092 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/graphql/jobs.queries.js
View File

@@ -1278,7 +1278,7 @@ export const SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE = gql`
export const SEARCH_FOR_JOBS = gql` export const SEARCH_FOR_JOBS = gql`
query SEARCH_FOR_JOBS($search: String!) { query SEARCH_FOR_JOBS($search: String!) {
search_jobs(args: { search: $search }) { search_jobs(args: { search: $search }, limit: 25) {
id id
ro_number ro_number
ownr_fn ownr_fn

14
client/src/graphql/search.queries.js
View File

@@ -2,22 +2,20 @@ import { gql } from "@apollo/client";
export const GLOBAL_SEARCH_QUERY = gql` export const GLOBAL_SEARCH_QUERY = gql`
query GLOBAL_SEARCH_QUERY($search: String) { query GLOBAL_SEARCH_QUERY($search: String) {
search_jobs(args: { search: $search }) { search_jobs(args: { search: $search }, limit: 25) {
id id
ro_number ro_number
status status
clm_no clm_no
v_model_yr v_model_yr
v_model_desc v_model_desc
v_make_desc v_make_desc
v_color v_color
ownr_fn ownr_fn
ownr_ln ownr_ln
ownr_co_nm ownr_co_nm
} }
search_owners(args: { search: $search }) { search_owners(args: { search: $search }, limit: 25) {
id id
ownr_fn ownr_fn
ownr_ln ownr_ln
@@ -25,7 +23,7 @@ export const GLOBAL_SEARCH_QUERY = gql`
ownr_ph1 ownr_ph1
ownr_ph2 ownr_ph2
} }
search_vehicles(args: { search: $search }) { search_vehicles(args: { search: $search }, limit: 25) {
id id
v_model_yr v_model_yr
v_model_desc v_model_desc
@@ -34,7 +32,7 @@ export const GLOBAL_SEARCH_QUERY = gql`
v_vin v_vin
plate_no plate_no
} }
search_payments(args: { search: $search }) { search_payments(args: { search: $search }, limit: 25) {
id id
amount amount
paymentnum paymentnum
@@ -45,7 +43,7 @@ export const GLOBAL_SEARCH_QUERY = gql`
memo memo
transactionid transactionid
} }
search_bills(args: { search: $search }) { search_bills(args: { search: $search }, limit: 25) {
id id
date date
invoice_number invoice_number
@@ -54,7 +52,7 @@ export const GLOBAL_SEARCH_QUERY = gql`
name name
} }
} }
search_phonebook(args: { search: $search }) { search_phonebook(args: { search: $search }, limit: 25) {
id id
firstname firstname
lastname lastname

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

@@ -2226,6 +2226,7 @@
"csi_invitation": "CSI Invitation", "csi_invitation": "CSI Invitation",
"csi_invitation_action": "CSI Invite", "csi_invitation_action": "CSI Invite",
"diagnostic_authorization": "Diagnostic Authorization", "diagnostic_authorization": "Diagnostic Authorization",
"dms_posting_sheet": "DMS Posting Sheet",
"envelope_return_address": "#10 Envelope Return Address Label", "envelope_return_address": "#10 Envelope Return Address Label",
"estimate": "Estimate Only", "estimate": "Estimate Only",
"estimate_detail": "Estimate Details", "estimate_detail": "Estimate Details",

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

@@ -2226,6 +2226,7 @@
"csi_invitation": "", "csi_invitation": "",
"csi_invitation_action": "", "csi_invitation_action": "",
"diagnostic_authorization": "", "diagnostic_authorization": "",
"dms_posting_sheet": "",
"envelope_return_address": "", "envelope_return_address": "",
"estimate": "", "estimate": "",
"estimate_detail": "", "estimate_detail": "",

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

@@ -2226,6 +2226,7 @@
"csi_invitation": "", "csi_invitation": "",
"csi_invitation_action": "", "csi_invitation_action": "",
"diagnostic_authorization": "", "diagnostic_authorization": "",
"dms_posting_sheet": "",
"envelope_return_address": "", "envelope_return_address": "",
"estimate": "", "estimate": "",
"estimate_detail": "", "estimate_detail": "",

4149
client/src/utils/TemplateConstants.js
View File

File diff suppressed because it is too large Load Diff

5
server/job/job-status-transition.js
View File

@@ -20,7 +20,8 @@ async function StatusTransition(req, res) {
res.status(403).send("Unauthorized"); res.status(403).send("Unauthorized");
return; return;
} }
res.sendStatus(200);
return;
const { const {
id: jobid, id: jobid,
status: value, status: value,
@@ -78,7 +79,7 @@ async function StatusTransition(req, res) {
res.sendStatus(200); //.json(ret); res.sendStatus(200); //.json(ret);
} catch (error) { } catch (error) {
logger.log("job-costing-error", "ERROR", req.user.email, jobid, { logger.log("job-status-transition-error", "ERROR", req.user?.email, jobid, {
message: error.message, message: error.message,
stack: error.stack, stack: error.stack,
}); });