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

Merged release/2023-12-01 into feature/IO-2403-Paginated-Active-Jobs

Browse Source
This commit is contained in:
Dave Richer
2023-11-29 18:40:47 +00:00
parent ec2519eae4 b7c0fba48b
commit afbe328aa7
3 changed files with 91 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
client/src/components/jobs-available-table/jobs-available-supplement.headerfields.js
View File

@@ -114,7 +114,7 @@ const headerFields = [
"ins_ct_ph",
"ins_ct_phx",
"loss_cat",
//ad2
//AD2
"clmt_ln",
"clmt_fn",
"clmt_title",
@@ -219,7 +219,37 @@ const headerFields = [
"loc_title",
"loc_ph",
"loc_phx",
"loc_ea"
"loc_ea",
//VEH
"impact_1",
"impact_2",
"dmg_memo",
"db_v_code",
"plate_no",
"plate_st",
"v_vin",
"v_cond",
"v_prod_dt",
"v_model_yr",
"v_makecode",
"v_makedesc",
"v_model",
"v_type",
"v_bstyle",
"v_trimcode",
"trim_color",
"v_mldgcode",
"v_engine",
"v_mileage",
"v_options",
"v_color",
"v_tone",
"v_stage",
"paint_cd1",
"paint_cd2",
"paint_cd3",
"v_memo",
];
export default headerFields;

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

@@ -120,7 +120,7 @@ export const QUERY_PARTS_QUEUE = gql`
}
}
jobs(
where: { _and: [{ status: { _in: $statuses } }] }
where: { _and: [{ status: { _in: $statuses }, converted: { _eq: true } }] }
offset: $offset
limit: $limit
order_by: $order

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

@@ -56,13 +56,13 @@
"history": "History",
"inproduction": "Jobs In Production",
"manualevent": "Add Manual Appointment",
"noarrivingjobs": "No jobs are arriving.",
"nocompletingjobs": "No jobs scheduled for completion.",
"noarrivingjobs": "No Jobs are arriving.",
"nocompletingjobs": "No Jobs scheduled for completion.",
"nodateselected": "No date has been selected.",
"priorappointments": "Previous Appointments",
"reminder": "This is {{shopname}} reminding you about an appointment on {{date}} at {{time}}. Please let us know if you are not able to make the appointment. We look forward to seeing you soon. ",
"scheduledfor": "Scheduled appointment for: ",
"severalerrorsfound": "Several jobs have issues which may prevent accurate smart scheduling. Click to expand.",
"severalerrorsfound": "Several Jobs have issues which may prevent accurate smart scheduling. Click to expand.",
"smartscheduling": "Smart Scheduling",
"suggesteddates": "Suggested Dates"
},
@@ -117,11 +117,11 @@
"jobinproductionchange": "Job production status set to {{inproduction}}",
"jobioucreated": "IOU Created.",
"jobmodifylbradj": "Labor adjustments modified {{mod_lbr_ty}} / {{hours}}.",
"jobnoteadded": "Note added to job.",
"jobnotedeleted": "Note deleted from job.",
"jobnoteupdated": "Note updated on job.",
"jobspartsorder": "Parts order {{order_number}} added to job.",
"jobspartsreturn": "Parts return {{order_number}} added to job.",
"jobnoteadded": "Note added to Job.",
"jobnotedeleted": "Note deleted from Job.",
"jobnoteupdated": "Note updated on Job.",
"jobspartsorder": "Parts order {{order_number}} added to Job.",
"jobspartsreturn": "Parts return {{order_number}} added to Job.",
"jobstatuschange": "Job status changed to {{status}}.",
"jobsupplement": "Job supplement imported."
}
@@ -210,7 +210,7 @@
"markforreexport": "Mark for Re-export",
"new": "New Bill",
"noneselected": "No bill selected.",
"onlycmforinvoiced": "Only credit memos can be entered for any job that has been invoiced, exported, or voided.",
"onlycmforinvoiced": "Only credit memos can be entered for any Job that has been invoiced, exported, or voided.",
"retailtotal": "Bills Retail Total",
"savewithdiscrepancy": "You are about to save this bill with a discrepancy. The system will continue to use the calculated amount using the bill lines. Press cancel to return to the bill.",
"state_tax": "Provincial/State Tax",
@@ -658,7 +658,7 @@
"printall": "Print All Documents"
},
"errors": {
"complete": "Error during job checklist completion. {{error}}",
"complete": "Error during Job checklist completion. {{error}}",
"nochecklist": "No checklist has been configured for your shop. "
},
"labels": {
@@ -666,7 +666,7 @@
"allow_text_message": "Permission to Text?",
"checklist": "Checklist",
"printpack": "Job Intake Print Pack",
"removefromproduction": "Remove job from production?"
"removefromproduction": "Remove Job from Production?"
},
"successes": {
"completed": "Job checklist completed."
@@ -682,9 +682,9 @@
"senddltoform": "Insert Driver's License Information"
},
"errors": {
"fetchingjobinfo": "Error fetching job info. {{error}}.",
"returning": "Error returning courtesy car. {{error}}",
"saving": "Error saving contract. {{error}}",
"fetchingjobinfo": "Error fetching Job Info. {{error}}.",
"returning": "Error returning Courtesy Car. {{error}}",
"saving": "Error saving Contract. {{error}}",
"selectjobandcar": "Please ensure both a car and job are selected."
},
"fields": {
@@ -741,7 +741,7 @@
"driverinformation": "Driver's Information",
"findcontract": "Find Contract",
"findermodal": "Contract Finder",
"noteconvertedfrom": "R.O. created from converted Courtesy Car Contract {{agreementnumber}}.",
"noteconvertedfrom": "R.O. created from converted Courtesy Car Contract {{agreementnumber}}.",
"populatefromjob": "Populate from Job",
"rates": "Contract Rates",
"time": "Time",
@@ -763,7 +763,7 @@
"return": "Return Car"
},
"errors": {
"saving": "Error saving courtesy card. {{error}}"
"saving": "Error saving Courtesy Car. {{error}}"
},
"fields": {
"color": "Color",
@@ -914,7 +914,7 @@
"upload_limitexceeded": "Uploading all selected documents will exceed the job storage limit for your shop. ",
"upload_limitexceeded_title": "Unable to upload document(s)",
"uploading": "Uploading...",
"usage": "of job storage used. ({{used}} / {{total}})"
"usage": "of Job storage used. ({{used}} / {{total}})"
},
"successes": {
"delete": "Document(s) deleted successfully.",
@@ -1375,28 +1375,28 @@
},
"errors": {
"addingtoproduction": "Error adding to production. {{error}}",
"cannotintake": "Intake cannot be completed for this job. It has either already been completed or the job is already here.",
"closing": "Error closing job. {{error}}",
"creating": "Error encountered while creating job. {{error}}",
"deleted": "Error deleting job. {{error}}",
"exporting": "Error exporting job. {{error}}",
"cannotintake": "Intake cannot be completed for this Job. It has either already been completed or the Job is already here.",
"closing": "Error closing Job. {{error}}",
"creating": "Error encountered while creating Job. {{error}}",
"deleted": "Error deleting Job. {{error}}",
"exporting": "Error exporting Job. {{error}}",
"exporting-partner": "Unable to connect to ImEX Partner. Please ensure it is running and logged in.",
"invoicing": "Error invoicing job. {{error}}",
"noaccess": "This job does not exist or you do not have access to it.",
"invoicing": "Error invoicing Job. {{error}}",
"noaccess": "This Job does not exist or you do not have access to it.",
"nodamage": "No damage points on estimate.",
"nodates": "No dates specified for this job.",
"nodates": "No dates specified for this Job.",
"nofinancial": "No financial data has been calculated yet for this job. Please save it again.",
"nojobselected": "No job is selected.",
"nojobselected": "No Job is selected.",
"noowner": "No owner associated.",
"novehicle": "No vehicle associated.",
"partspricechange": "",
"saving": "Error encountered while saving record.",
"scanimport": "Error importing job. {{message}}",
"totalscalc": "Error while calculating new job totals.",
"updating": "Error while updating job(s). {{error}}",
"scanimport": "Error importing Job. {{message}}",
"totalscalc": "Error while calculating new Job totals.",
"updating": "Error while updating Job(s). {{error}}",
"validation": "Please ensure all fields are entered correctly.",
"validationtitle": "Validation Error",
"voiding": "Error voiding job. {{error}}"
"voiding": "Error voiding Job. {{error}}"
},
"fields": {
"actual_completion": "Actual Completion",
@@ -1673,9 +1673,9 @@
"adminwarning": "Use the functionality on this page at your own risk. You are responsible for any and all changes to your data.",
"allocations": "Allocations",
"alreadyaddedtoscoreboard": "Job has already been added to scoreboard. Saving will update the previous entry.",
"alreadyclosed": "This job has already been closed.",
"alreadyclosed": "This Job has already been closed.",
"appointmentconfirmation": "Send confirmation to customer?",
"associationwarning": "Any changes to associations will require updating the data from the new parent record to the job.",
"associationwarning": "Any changes to associations will require updating the data from the new parent record to the Job.",
"audit": "Audit Trail",
"available": "Available",
"availablejobs": "Available Jobs",
@@ -1683,7 +1683,7 @@
"days": "Days",
"rate": "PVRT Rate"
},
"ca_gst_all_if_null": "If the job is marked as a \"GST Registrant\" and this value is set to $0, the customer will be responsible for paying all of the GST by default. ",
"ca_gst_all_if_null": "If the Job is marked as a \"GST Registrant\" and this value is set to $0, the customer will be responsible for paying all of the GST by default. ",
"calc_repair_days": "Calculated Repair Days",
"calc_repair_days_tt": "This is the approximate number of days required to complete the repair according to the target touch time in your shop configuration (current set to {{target_touchtime}}).",
"cards": {
@@ -1699,7 +1699,7 @@
"totals": "Totals",
"vehicle": "Vehicle"
},
"changeclass": "Changing the job's class can have fundamental impacts to already exported accounting items. Are you sure you want to do this?",
"changeclass": "Changing the Job's class can have fundamental impacts to already exported accounting items. Are you sure you want to do this?",
"checklistcompletedby": "Checklist completed by {{by}} at {{at}}",
"checklistdocuments": "Checklist Documents",
"checklists": "Checklists",
@@ -1723,12 +1723,12 @@
"vehicleinfo": "Vehicle Info"
},
"createiouwarning": "Are you sure you want to create an IOU for these lines? A new RO will be created based on those lines for this customer.",
"creating_new_job": "Creating new job...",
"creating_new_job": "Creating new Job...",
"deductible": {
"stands": "Stands",
"waived": "Waived"
},
"deleteconfirm": "Are you sure you want to delete this job? This cannot be undone. ",
"deleteconfirm": "Are you sure you want to delete this Job? This cannot be undone. ",
"deletedelivery": "Delete Delivery Checklist",
"deleteintake": "Delete Intake Checklist",
"deliverchecklist": "Deliver Checklist",
@@ -1749,7 +1749,7 @@
"documents": "Documents",
"documents-images": "Images",
"documents-other": "Other Documents",
"duplicateconfirm": "Are you sure you want to duplicate this job? Some elements of this job will not be duplicated.",
"duplicateconfirm": "Are you sure you want to duplicate this Job? Some elements of this Job will not be duplicated.",
"emailaudit": "Email Audit Trail",
"employeeassignments": "Employee Assignments",
"estimatelines": "Estimate Lines",
@@ -1760,7 +1760,7 @@
"gppercent": "% G.P.",
"hrs_claimed": "Hours Claimed",
"hrs_total": "Hours Total",
"importnote": "The job was initially imported.",
"importnote": "The Job was initially imported.",
"inproduction": "In Production",
"intakechecklist": "Intake Checklist",
"iou": "IOU",
@@ -1793,9 +1793,9 @@
"calculatedcreditsnotreceived": "The calculated credits not received is derived by subtracting the amount of credit memos entered from the <b>retail</b> total of returns created. This does not take into account whether the credit was marked as received. You can find more information <a href=\"https://help.imex.online/en/article/credits-not-received-changes-1jy9snw\" target=\"_blank\">here</a>.",
"creditmemos": "The total <b>retail</b> amount of all returns created. This amount does not reflect credit memos that have been posted.",
"creditsnotreceived": "This total reflects the total <b>retail</b> of parts returns lines that have not been explicitly marked as returned when posting a credit memo. You can learn more about this here <a href=\"https://help.imex.online/en/article/credits-not-received-changes-1jy9snw\" target=\"_blank\">here</a>. ",
"discrep1": "If the discrepancy is not $0, you may have one of the following: <br/><br/>\n\n<ul>\n<li>Too many bills/bill lines that have been posted against this RO. Check to make sure every bill posted on this RO is correctly posted and assigned.</li>\n<li>You do not have the latest supplement imported, or, a supplement must be submitted and then imported.</li>\n<li>You have posted a bill line to labor.</li>\n</ul>\n<br/>\n<i>There may be additional issues not listed above that prevent this job from reconciling.</i>",
"discrep2": "If the discrepancy is not $0, you may have one of the following: <br/><br/>\n\n<ul>\n<li>Used an incorrect rate when deducting from labor.</li>\n<li>An outstanding imbalance higher in the reconciliation process.</li>\n</ul>\n<br/>\n<i>There may be additional issues not listed above that prevent this job from reconciling.</i>",
"discrep3": "If the discrepancy is not $0, you may have one of the following: <br/><br/>\n\n<ul>\n<li>A parts order return has not been created.</li>\n<li>An outstanding imbalance higher in the reconciliation process.</li>\n</ul>\n<br/>\n<i>There may be additional issues not listed above that prevent this job from reconciling.</i>",
"discrep1": "If the discrepancy is not $0, you may have one of the following: <br/><br/>\n\n<ul>\n<li>Too many bills/bill lines that have been posted against this RO. Check to make sure every bill posted on this RO is correctly posted and assigned.</li>\n<li>You do not have the latest supplement imported, or, a supplement must be submitted and then imported.</li>\n<li>You have posted a bill line to labor.</li>\n</ul>\n<br/>\n<i>There may be additional issues not listed above that prevent this Job from reconciling.</i>",
"discrep2": "If the discrepancy is not $0, you may have one of the following: <br/><br/>\n\n<ul>\n<li>Used an incorrect rate when deducting from labor.</li>\n<li>An outstanding imbalance higher in the reconciliation process.</li>\n</ul>\n<br/>\n<i>There may be additional issues not listed above that prevent this Job from reconciling.</i>",
"discrep3": "If the discrepancy is not $0, you may have one of the following: <br/><br/>\n\n<ul>\n<li>A parts order return has not been created.</li>\n<li>An outstanding imbalance higher in the reconciliation process.</li>\n</ul>\n<br/>\n<i>There may be additional issues not listed above that prevent this Job from reconciling.</i>",
"laboradj": "The sum of all bill lines that deducted from labor hours, rather than part prices.",
"partstotal": "This is the total of all parts and sublet amounts on the vehicle (some of these may require an in-house invoice).<br/>\nItems such as shop and paint materials, labor online lines, etc. are not included in this total.",
"totalreturns": "The total <b>retail</b> amount of returns created for this job."
@@ -1826,13 +1826,13 @@
"sale_parts": "Sales - Parts",
"sale_sublet": "Sales - Sublet",
"sales": "Sales",
"savebeforeconversion": "You have unsaved changes on the job. Please save them before converting it. ",
"scheduledinchange": "The scheduled in is based off the latest appointment. To change this date, please schedule or reschedule the job. ",
"savebeforeconversion": "You have unsaved changes on the Job. Please save them before converting it. ",
"scheduledinchange": "The scheduled in is based off the latest appointment. To change this date, please schedule or reschedule the Job. ",
"specialcoveragepolicy": "Special Coverage Policy Applies",
"state_tax_amt": "Provincial/State Taxes",
"subletstotal": "Sublets Total",
"subtotal": "Subtotal",
"supplementnote": "The job had a supplement imported.",
"supplementnote": "The Job had a supplement imported.",
"suspended": "SUSPENDED",
"suspense": "Suspense",
"threshhold": "Max Threshold: ${{amount}}",
@@ -1841,16 +1841,16 @@
"total_repairs": "Total Repairs",
"total_sales": "Total Sales",
"totals": "Totals",
"unvoidnote": "This job was unvoided.",
"unvoidnote": "This Job was unvoided.",
"vehicle_info": "Vehicle",
"vehicleassociation": "Vehicle Association",
"viewallocations": "View Allocations",
"voidjob": "Are you sure you want to void this job? This cannot be easily undone. ",
"voidnote": "This job was voided."
"voidjob": "Are you sure you want to void this Job? This cannot be easily undone. ",
"voidnote": "This Job was voided."
},
"successes": {
"addedtoproduction": "Job added to production board.",
"all_deleted": "{{count}} jobs deleted successfully.",
"all_deleted": "{{count}} Jobs deleted successfully.",
"closed": "Job closed successfully.",
"converted": "Job converted successfully.",
"created": "Job created successfully. Click to view.",
@@ -2026,7 +2026,7 @@
},
"errors": {
"invalidphone": "The phone number is invalid. Unable to open conversation. ",
"noattachedjobs": "No jobs have been associated to this conversation. ",
"noattachedjobs": "No Jobs have been associated to this conversation. ",
"updatinglabel": "Error updating label. {{error}}"
},
"labels": {
@@ -2035,7 +2035,7 @@
"maxtenimages": "You can only select up to a maximum of 10 images at a time.",
"messaging": "Messaging",
"noallowtxt": "This customer has not indicated their permission to be messaged.",
"nojobs": "Not associated to any job.",
"nojobs": "Not associated to any Job.",
"nopush": "Polling Mode Enabled",
"phonenumber": "Phone #",
"presets": "Presets",
@@ -2202,7 +2202,7 @@
"parts_orders": "Parts Orders",
"print": "Show Printed Form",
"receive": "Receive Parts Order",
"removefrompartsqueue": "Remove from Parts Queue?",
"removefrompartsqueue": "Unqueue from Parts Queue?",
"returnpartsorder": "Return Parts Order",
"sublet_order": "Sublet Order"
},
@@ -2455,15 +2455,15 @@
"unsuspend": "Unsuspend"
},
"errors": {
"boardupdate": "Error encountered updating job. {{message}}",
"boardupdate": "Error encountered updating Job. {{message}}",
"removing": "Error removing from production board. {{error}}",
"settings": "Error saving board settings: {{error}}"
},
"labels": {
"actual_in": "Actual In",
"alert": "Alert",
"alertoff": "Remove alert from job",
"alerton": "Add alert to job",
"alertoff": "Remove alert from Job",
"alerton": "Add alert to Job",
"ats": "Alternative Transportation",
"bodyhours": "B",
"bodypriority": "B/P",
@@ -2674,9 +2674,9 @@
"edit": "Edit"
},
"errors": {
"adding": "Error adding job to scoreboard. {{message}}",
"removing": "Error removing job from scoreboard. {{message}}",
"updating": "Error updating scoreboard. {{message}}"
"adding": "Error adding Job to Scoreboard. {{message}}",
"removing": "Error removing Job from Scoreboard. {{message}}",
"updating": "Error updating Scoreboard. {{message}}"
},
"fields": {
"bodyhrs": "Body Hours",
@@ -2774,7 +2774,7 @@
"ro_number": "Job to Post Against"
},
"labels": {
"alreadyclockedon": "You are already clocked in to the following job(s):",
"alreadyclockedon": "You are already clocked in to the following Job(s):",
"ambreak": "AM Break",
"amshift": "AM Shift",
"clockhours": "Shift Clock Hours Summary",