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

Merged in hotfix/2021-06-01 (pull request #91)

Browse Source 
Hotfix/2021 06 01
This commit is contained in:
Patrick Fic
2021-06-01 21:47:20 +00:00
parent bcec0cd902 11d3e3c7ad
commit 61c57e1866
15 changed files with 771 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin/src/components/admin-root/admin-root.component.jsx
View File

@@ -28,7 +28,7 @@ import JobsShow from "../jobs/jobs.show";
const httpLink = new HttpLink({ const httpLink = new HttpLink({
uri: process.env.REACT_APP_GRAPHQL_ENDPOINT, uri: process.env.REACT_APP_GRAPHQL_ENDPOINT,
headers: { headers: {
"x-hasura-admin-secret": `Dev-BodyShopAppBySnaptSoftware!`, "x-hasura-admin-secret": `Dev-BodyShopApp!`,
// 'Authorization': `Bearer xxxx`, // 'Authorization': `Bearer xxxx`,
}, },
}); });
@@ -67,7 +67,7 @@ const client = new ApolloClient({
// uri: process.env.REACT_APP_GRAPHQL_ENDPOINT, // uri: process.env.REACT_APP_GRAPHQL_ENDPOINT,
// cache: new InMemoryCache(), // cache: new InMemoryCache(),
// headers: { // headers: {
// "x-hasura-admin-secret": `Dev-BodyShopAppBySnaptSoftware!`, // "x-hasura-admin-secret": `Dev-BodyShopApp!`,
// // 'Authorization': `Bearer xxxx`, // // 'Authorization': `Bearer xxxx`,
// }, // },
// }); // });

617
bodyshop_translations.babel
View File

@@ -1,4 +1,4 @@
<babeledit_project be_version="2.7.1" version="1.2"> <babeledit_project version="1.2" be_version="2.7.1">
<!-- <!--
BabelEdit project file BabelEdit project file
@@ -11040,6 +11040,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>uploading</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>usage</name> <name>usage</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -11087,6 +11108,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>edituploaded</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>insert</name> <name>insert</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -11907,6 +11949,37 @@
</folder_node> </folder_node>
</children> </children>
</folder_node> </folder_node>
<folder_node>
<name>exportlogs</name>
<children>
<folder_node>
<name>fields</name>
<children>
<concept_node>
<name>createdat</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
</children>
</folder_node>
<folder_node> <folder_node>
<name>general</name> <name>general</name>
<children> <children>
@@ -12377,6 +12450,32 @@
</concept_node> </concept_node>
</children> </children>
</folder_node> </folder_node>
<folder_node>
<name>errors</name>
<children>
<concept_node>
<name>notfound</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
<folder_node> <folder_node>
<name>itemtypes</name> <name>itemtypes</name>
<children> <children>
@@ -15232,6 +15331,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>prt_dsmk_p</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>status</name> <name>status</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -18548,6 +18668,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>pac</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>pae</name> <name>pae</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -29164,6 +29305,48 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>purchases_by_ro_detail</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>purchases_by_ro_summary</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>qc_sheet</name> <name>qc_sheet</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -29185,6 +29368,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>ro_totals</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>ro_with_description</name> <name>ro_with_description</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -30675,6 +30879,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>exportlogs</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>jobs</name> <name>jobs</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -30766,6 +30991,27 @@
<folder_node> <folder_node>
<name>templates</name> <name>templates</name>
<children> <children>
<concept_node>
<name>attendance</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>attendance_employee</name> <name>attendance_employee</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -30787,6 +31033,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>attendance_summary</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>credits_not_received_date</name> <name>credits_not_received_date</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -30850,6 +31117,90 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>export_payables</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>export_payments</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>export_receivables</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>gsr_by_delivery_date</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>gsr_by_estimator</name> <name>gsr_by_estimator</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -30871,6 +31222,48 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>gsr_by_exported_date</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>gsr_by_ins_co</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>gsr_by_make</name> <name>gsr_by_make</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -30892,6 +31285,48 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>gsr_by_referral</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>gsr_by_ro</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>gsr_labor_only</name> <name>gsr_labor_only</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -30935,7 +31370,7 @@
</translations> </translations>
</concept_node> </concept_node>
<concept_node> <concept_node>
<name>hours_sold_detail_closed_source</name> <name>hours_sold_detail_closed_ins_co</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
<description></description> <description></description>
<comment></comment> <comment></comment>
@@ -30977,7 +31412,7 @@
</translations> </translations>
</concept_node> </concept_node>
<concept_node> <concept_node>
<name>hours_sold_detail_open_source</name> <name>hours_sold_detail_open_ins_co</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
<description></description> <description></description>
<comment></comment> <comment></comment>
@@ -31019,7 +31454,7 @@
</translations> </translations>
</concept_node> </concept_node>
<concept_node> <concept_node>
<name>hours_sold_summary_closed_source</name> <name>hours_sold_summary_closed_ins_co</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
<description></description> <description></description>
<comment></comment> <comment></comment>
@@ -31061,7 +31496,7 @@
</translations> </translations>
</concept_node> </concept_node>
<concept_node> <concept_node>
<name>hours_sold_summary_open_source</name> <name>hours_sold_summary_open_ins_co</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
<description></description> <description></description>
<comment></comment> <comment></comment>
@@ -31145,7 +31580,7 @@
</translations> </translations>
</concept_node> </concept_node>
<concept_node> <concept_node>
<name>job_costing_ro_source</name> <name>job_costing_ro_ins_co</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
<description></description> <description></description>
<comment></comment> <comment></comment>
@@ -31186,6 +31621,90 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>open_orders_estimator</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>open_orders_ins_co</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>parts_backorder</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>payments_by_date</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>payments_by_date_type</name> <name>payments_by_date_type</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -31397,7 +31916,28 @@
</translations> </translations>
</concept_node> </concept_node>
<concept_node> <concept_node>
<name>supplement_ratio_source</name> <name>supplement_ratio_ins_co</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>thank_you_date</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
<description></description> <description></description>
<comment></comment> <comment></comment>
@@ -31480,6 +32020,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>unclaimed_hrs</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>void_ros</name> <name>void_ros</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -31501,6 +32062,48 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>work_in_progress_labour</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>work_in_progress_payables</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children> </children>
</folder_node> </folder_node>
</children> </children>

4
client/src/components/job-detail-lines/job-lines.component.jsx
View File

@@ -157,10 +157,12 @@ export function JobLinesComponent({
render: (text, record) => ( render: (text, record) => (
<> <>
<CurrencyFormatter>{record.act_price}</CurrencyFormatter> <CurrencyFormatter>{record.act_price}</CurrencyFormatter>
{record.prt_dsmk_p !== 0 && ( {record.prt_dsmk_p && record.prt_dsmk_p !== 0 ? (
<span <span
style={{ marginLeft: ".2rem" }} style={{ marginLeft: ".2rem" }}
>{`(${record.prt_dsmk_p}%)`}</span> >{`(${record.prt_dsmk_p}%)`}</span>
) : (
<></>
)} )}
</> </>
), ),

7
client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
View File

@@ -210,6 +210,13 @@ export default function JobLinesUpsertModalComponent({
> >
<InputCurrency precision={2} min={0} /> <InputCurrency precision={2} min={0} />
</Form.Item> </Form.Item>
<Form.Item
label={t("joblines.fields.prt_dsmk_p")}
name="prt_dsmk_p"
initialValue={0}
>
<InputNumber precision={0} min={0} max={100} />
</Form.Item>
</LayoutFormRow> </LayoutFormRow>
</Form> </Form>
</Modal> </Modal>

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

@@ -6,7 +6,7 @@
}, },
"errors": { "errors": {
"deleting": "Error encountered while deleting allocation. {{message}}", "deleting": "Error encountered while deleting allocation. {{message}}",
"saving": "Error while allocating. {{message}}", "saving": "Error while allocating. {{message}}",
"validation": "Please ensure all fields are entered correctly. " "validation": "Please ensure all fields are entered correctly. "
}, },
"fields": { "fields": {
@@ -701,10 +701,12 @@
"upload": "Upload", "upload": "Upload",
"upload_limitexceeded": "Uploading all selected documents will exceed the job storage limit for your shop. ", "upload_limitexceeded": "Uploading all selected documents will exceed the job storage limit for your shop. ",
"upload_limitexceeded_title": "Unable to upload document(s)", "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": { "successes": {
"delete": "Document(s) deleted successfully.", "delete": "Document(s) deleted successfully.",
"edituploaded": "Edited document uploaded successfully. Please close this window and refresh the documents list.",
"insert": "Uploaded document successfully. ", "insert": "Uploaded document successfully. ",
"updated": "Document updated successfully. " "updated": "Document updated successfully. "
} }
@@ -767,6 +769,11 @@
"unique_employee_number": "You must enter a unique employee number." "unique_employee_number": "You must enter a unique employee number."
} }
}, },
"exportlogs": {
"fields": {
"createdat": "Created At"
}
},
"general": { "general": {
"actions": { "actions": {
"add": "Add", "add": "Add",
@@ -792,6 +799,9 @@
"submitticket": "Submit a Support Ticket", "submitticket": "Submit a Support Ticket",
"view": "View" "view": "View"
}, },
"errors": {
"notfound": "No record was found."
},
"itemtypes": { "itemtypes": {
"contract": "CC Contract", "contract": "CC Contract",
"courtesycar": "Courtesy Car", "courtesycar": "Courtesy Car",
@@ -957,6 +967,7 @@
}, },
"profitcenter_labor": "Profit Center: Labor", "profitcenter_labor": "Profit Center: Labor",
"profitcenter_part": "Profit Center: Part", "profitcenter_part": "Profit Center: Part",
"prt_dsmk_p": "Line Markup %",
"status": "Status", "status": "Status",
"total": "Total", "total": "Total",
"unq_seq": "Seq #" "unq_seq": "Seq #"
@@ -1129,6 +1140,7 @@
"ownr_ea": "Email", "ownr_ea": "Email",
"ownr_ph1": "Phone 1", "ownr_ph1": "Phone 1",
"paa": "Aftermarket", "paa": "Aftermarket",
"pac": "Rechromed",
"pae": "Existing", "pae": "Existing",
"pag": "Glass", "pag": "Glass",
"pal": "LKQ", "pal": "LKQ",
@@ -1742,7 +1754,10 @@
"payment_receipt": "Payment Receipt", "payment_receipt": "Payment Receipt",
"payment_request": "Payment Request", "payment_request": "Payment Request",
"payments_by_job": "Job Payments", "payments_by_job": "Job Payments",
"purchases_by_ro_detail": "Purchases - Detail",
"purchases_by_ro_summary": "Purchases - Summary",
"qc_sheet": "Quality Control Sheet", "qc_sheet": "Quality Control Sheet",
"ro_totals": "RO Totals",
"ro_with_description": "RO Summary with Descriptions", "ro_with_description": "RO Summary with Descriptions",
"supplement_request": "Supplement Request", "supplement_request": "Supplement Request",
"thank_you_ro": "Thank You Letter", "thank_you_ro": "Thank You Letter",
@@ -1843,6 +1858,7 @@
"objects": { "objects": {
"appointments": "Appointments", "appointments": "Appointments",
"bills": "Bills", "bills": "Bills",
"exportlogs": "Export Logs",
"jobs": "Jobs", "jobs": "Jobs",
"payments": "Payments", "payments": "Payments",
"timetickets": "Timetickets" "timetickets": "Timetickets"
@@ -1850,26 +1866,40 @@
"vendor": "Vendor" "vendor": "Vendor"
}, },
"templates": { "templates": {
"attendance": "Attendance (All Employees)",
"attendance_employee": "Employee Attendance", "attendance_employee": "Employee Attendance",
"attendance_summary": "Attendance Summary (All Employees)",
"credits_not_received_date": "Credits not Received by Date", "credits_not_received_date": "Credits not Received by Date",
"estimator_detail": "Jobs by Estimator (Detail)", "estimator_detail": "Jobs by Estimator (Detail)",
"estimator_summary": "Jobs by Estimator (Summary)", "estimator_summary": "Jobs by Estimator (Summary)",
"export_payables": "Export Log - Payables",
"export_payments": "Export Log - Payments",
"export_receivables": "Export Log - Receivables",
"gsr_by_delivery_date": "Gross Sales by Delivery Date",
"gsr_by_estimator": "Gross Sales by Estimator", "gsr_by_estimator": "Gross Sales by Estimator",
"gsr_by_exported_date": "Gross Sales by Export Date",
"gsr_by_ins_co": "Gross Sales by Insurance Company'",
"gsr_by_make": "Gross Sales by Vehicle Make", "gsr_by_make": "Gross Sales by Vehicle Make",
"gsr_by_referral": "Gross Sales by Referral Source",
"gsr_by_ro": "Gross Sales by RO",
"gsr_labor_only": "Gross Sales - Labor Only", "gsr_labor_only": "Gross Sales - Labor Only",
"hours_sold_detail_closed": "Hours Sold Detail - Closed", "hours_sold_detail_closed": "Hours Sold Detail - Closed",
"hours_sold_detail_closed_source": "Hours Sold Detail - Closed by Source", "hours_sold_detail_closed_ins_co": "Hours Sold Detail - Closed by Source",
"hours_sold_detail_open": "Hours Sold Detail - Open", "hours_sold_detail_open": "Hours Sold Detail - Open",
"hours_sold_detail_open_source": "Hours Sold Detail - Open by Source", "hours_sold_detail_open_ins_co": "Hours Sold Detail - Open by Source",
"hours_sold_summary_closed": "Hours Sold Summary - Closed", "hours_sold_summary_closed": "Hours Sold Summary - Closed",
"hours_sold_summary_closed_source": "Hours Sold Summary - Closed by Source", "hours_sold_summary_closed_ins_co": "Hours Sold Summary - Closed by Source",
"hours_sold_summary_open": "Hours Sold Summary - Open", "hours_sold_summary_open": "Hours Sold Summary - Open",
"hours_sold_summary_open_source": "Hours Sold Summary - Open by Source", "hours_sold_summary_open_ins_co": "Hours Sold Summary - Open by Source",
"job_costing_ro_date_detail": "Job Costing by RO - Detail", "job_costing_ro_date_detail": "Job Costing by RO - Detail",
"job_costing_ro_date_summary": "Job Costing by RO - Summary", "job_costing_ro_date_summary": "Job Costing by RO - Summary",
"job_costing_ro_estimator": "Job Costing by Estimator", "job_costing_ro_estimator": "Job Costing by Estimator",
"job_costing_ro_source": "Job Costing by RO Source", "job_costing_ro_ins_co": "Job Costing by RO Source",
"open_orders": "Open Orders by Date", "open_orders": "Open Orders by Date",
"open_orders_estimator": "Open Orders by Estimator",
"open_orders_ins_co": "Open Orders by Insurance Company",
"parts_backorder": "Backordered Parts",
"payments_by_date": "Payments by Date",
"payments_by_date_type": "Payments by Date Range", "payments_by_date_type": "Payments by Date Range",
"purchases_by_cost_center_detail": "Purchases by Cost Center (Detail)", "purchases_by_cost_center_detail": "Purchases by Cost Center (Detail)",
"purchases_by_cost_center_summary": "Purchases by Cost Center (Summary)", "purchases_by_cost_center_summary": "Purchases by Cost Center (Summary)",
@@ -1880,11 +1910,15 @@
"purchases_grouped_by_vendor_detailed": "Purchases Grouped by Vendor - Detailed", "purchases_grouped_by_vendor_detailed": "Purchases Grouped by Vendor - Detailed",
"purchases_grouped_by_vendor_summary": "Purchases Grouped by Vendor - Summary", "purchases_grouped_by_vendor_summary": "Purchases Grouped by Vendor - Summary",
"schedule": "Appointment Schedule", "schedule": "Appointment Schedule",
"supplement_ratio_source": "Supplement Ratio by Source", "supplement_ratio_ins_co": "Supplement Ratio by Source",
"thank_you_date": "Thank You Letters",
"timetickets": "Time Tickets", "timetickets": "Time Tickets",
"timetickets_employee": "Employee Time Tickets", "timetickets_employee": "Employee Time Tickets",
"timetickets_summary": "Time Tickets Summary", "timetickets_summary": "Time Tickets Summary",
"void_ros": "Void ROs" "unclaimed_hrs": "Unclaimed Hours",
"void_ros": "Void ROs",
"work_in_progress_labour": "Work in Progress - Labor",
"work_in_progress_payables": "Work in Progress - Payables"
} }
}, },
"scoreboard": { "scoreboard": {

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

@@ -701,10 +701,12 @@
"upload": "Subir", "upload": "Subir",
"upload_limitexceeded": "", "upload_limitexceeded": "",
"upload_limitexceeded_title": "", "upload_limitexceeded_title": "",
"uploading": "",
"usage": "" "usage": ""
}, },
"successes": { "successes": {
"delete": "Documento eliminado con éxito.", "delete": "Documento eliminado con éxito.",
"edituploaded": "",
"insert": "Documento cargado con éxito.", "insert": "Documento cargado con éxito.",
"updated": "" "updated": ""
} }
@@ -767,6 +769,11 @@
"unique_employee_number": "" "unique_employee_number": ""
} }
}, },
"exportlogs": {
"fields": {
"createdat": ""
}
},
"general": { "general": {
"actions": { "actions": {
"add": "", "add": "",
@@ -792,6 +799,9 @@
"submitticket": "", "submitticket": "",
"view": "" "view": ""
}, },
"errors": {
"notfound": ""
},
"itemtypes": { "itemtypes": {
"contract": "", "contract": "",
"courtesycar": "", "courtesycar": "",
@@ -957,6 +967,7 @@
}, },
"profitcenter_labor": "", "profitcenter_labor": "",
"profitcenter_part": "", "profitcenter_part": "",
"prt_dsmk_p": "",
"status": "Estado", "status": "Estado",
"total": "", "total": "",
"unq_seq": "Seq #" "unq_seq": "Seq #"
@@ -1129,6 +1140,7 @@
"ownr_ea": "Email", "ownr_ea": "Email",
"ownr_ph1": "Teléfono 1", "ownr_ph1": "Teléfono 1",
"paa": "", "paa": "",
"pac": "",
"pae": "", "pae": "",
"pag": "", "pag": "",
"pal": "", "pal": "",
@@ -1742,7 +1754,10 @@
"payment_receipt": "", "payment_receipt": "",
"payment_request": "", "payment_request": "",
"payments_by_job": "", "payments_by_job": "",
"purchases_by_ro_detail": "",
"purchases_by_ro_summary": "",
"qc_sheet": "", "qc_sheet": "",
"ro_totals": "",
"ro_with_description": "", "ro_with_description": "",
"supplement_request": "", "supplement_request": "",
"thank_you_ro": "", "thank_you_ro": "",
@@ -1843,6 +1858,7 @@
"objects": { "objects": {
"appointments": "", "appointments": "",
"bills": "", "bills": "",
"exportlogs": "",
"jobs": "", "jobs": "",
"payments": "", "payments": "",
"timetickets": "" "timetickets": ""
@@ -1850,26 +1866,40 @@
"vendor": "" "vendor": ""
}, },
"templates": { "templates": {
"attendance": "",
"attendance_employee": "", "attendance_employee": "",
"attendance_summary": "",
"credits_not_received_date": "", "credits_not_received_date": "",
"estimator_detail": "", "estimator_detail": "",
"estimator_summary": "", "estimator_summary": "",
"export_payables": "",
"export_payments": "",
"export_receivables": "",
"gsr_by_delivery_date": "",
"gsr_by_estimator": "", "gsr_by_estimator": "",
"gsr_by_exported_date": "",
"gsr_by_ins_co": "",
"gsr_by_make": "", "gsr_by_make": "",
"gsr_by_referral": "",
"gsr_by_ro": "",
"gsr_labor_only": "", "gsr_labor_only": "",
"hours_sold_detail_closed": "", "hours_sold_detail_closed": "",
"hours_sold_detail_closed_source": "", "hours_sold_detail_closed_ins_co": "",
"hours_sold_detail_open": "", "hours_sold_detail_open": "",
"hours_sold_detail_open_source": "", "hours_sold_detail_open_ins_co": "",
"hours_sold_summary_closed": "", "hours_sold_summary_closed": "",
"hours_sold_summary_closed_source": "", "hours_sold_summary_closed_ins_co": "",
"hours_sold_summary_open": "", "hours_sold_summary_open": "",
"hours_sold_summary_open_source": "", "hours_sold_summary_open_ins_co": "",
"job_costing_ro_date_detail": "", "job_costing_ro_date_detail": "",
"job_costing_ro_date_summary": "", "job_costing_ro_date_summary": "",
"job_costing_ro_estimator": "", "job_costing_ro_estimator": "",
"job_costing_ro_source": "", "job_costing_ro_ins_co": "",
"open_orders": "", "open_orders": "",
"open_orders_estimator": "",
"open_orders_ins_co": "",
"parts_backorder": "",
"payments_by_date": "",
"payments_by_date_type": "", "payments_by_date_type": "",
"purchases_by_cost_center_detail": "", "purchases_by_cost_center_detail": "",
"purchases_by_cost_center_summary": "", "purchases_by_cost_center_summary": "",
@@ -1880,11 +1910,15 @@
"purchases_grouped_by_vendor_detailed": "", "purchases_grouped_by_vendor_detailed": "",
"purchases_grouped_by_vendor_summary": "", "purchases_grouped_by_vendor_summary": "",
"schedule": "", "schedule": "",
"supplement_ratio_source": "", "supplement_ratio_ins_co": "",
"thank_you_date": "",
"timetickets": "", "timetickets": "",
"timetickets_employee": "", "timetickets_employee": "",
"timetickets_summary": "", "timetickets_summary": "",
"void_ros": "" "unclaimed_hrs": "",
"void_ros": "",
"work_in_progress_labour": "",
"work_in_progress_payables": ""
} }
}, },
"scoreboard": { "scoreboard": {

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

@@ -701,10 +701,12 @@
"upload": "Télécharger", "upload": "Télécharger",
"upload_limitexceeded": "", "upload_limitexceeded": "",
"upload_limitexceeded_title": "", "upload_limitexceeded_title": "",
"uploading": "",
"usage": "" "usage": ""
}, },
"successes": { "successes": {
"delete": "Le document a bien été supprimé.", "delete": "Le document a bien été supprimé.",
"edituploaded": "",
"insert": "Document téléchargé avec succès.", "insert": "Document téléchargé avec succès.",
"updated": "" "updated": ""
} }
@@ -767,6 +769,11 @@
"unique_employee_number": "" "unique_employee_number": ""
} }
}, },
"exportlogs": {
"fields": {
"createdat": ""
}
},
"general": { "general": {
"actions": { "actions": {
"add": "", "add": "",
@@ -792,6 +799,9 @@
"submitticket": "", "submitticket": "",
"view": "" "view": ""
}, },
"errors": {
"notfound": ""
},
"itemtypes": { "itemtypes": {
"contract": "", "contract": "",
"courtesycar": "", "courtesycar": "",
@@ -957,6 +967,7 @@
}, },
"profitcenter_labor": "", "profitcenter_labor": "",
"profitcenter_part": "", "profitcenter_part": "",
"prt_dsmk_p": "",
"status": "Statut", "status": "Statut",
"total": "", "total": "",
"unq_seq": "Seq #" "unq_seq": "Seq #"
@@ -1129,6 +1140,7 @@
"ownr_ea": "Email", "ownr_ea": "Email",
"ownr_ph1": "Téléphone 1", "ownr_ph1": "Téléphone 1",
"paa": "", "paa": "",
"pac": "",
"pae": "", "pae": "",
"pag": "", "pag": "",
"pal": "", "pal": "",
@@ -1742,7 +1754,10 @@
"payment_receipt": "", "payment_receipt": "",
"payment_request": "", "payment_request": "",
"payments_by_job": "", "payments_by_job": "",
"purchases_by_ro_detail": "",
"purchases_by_ro_summary": "",
"qc_sheet": "", "qc_sheet": "",
"ro_totals": "",
"ro_with_description": "", "ro_with_description": "",
"supplement_request": "", "supplement_request": "",
"thank_you_ro": "", "thank_you_ro": "",
@@ -1843,6 +1858,7 @@
"objects": { "objects": {
"appointments": "", "appointments": "",
"bills": "", "bills": "",
"exportlogs": "",
"jobs": "", "jobs": "",
"payments": "", "payments": "",
"timetickets": "" "timetickets": ""
@@ -1850,26 +1866,40 @@
"vendor": "" "vendor": ""
}, },
"templates": { "templates": {
"attendance": "",
"attendance_employee": "", "attendance_employee": "",
"attendance_summary": "",
"credits_not_received_date": "", "credits_not_received_date": "",
"estimator_detail": "", "estimator_detail": "",
"estimator_summary": "", "estimator_summary": "",
"export_payables": "",
"export_payments": "",
"export_receivables": "",
"gsr_by_delivery_date": "",
"gsr_by_estimator": "", "gsr_by_estimator": "",
"gsr_by_exported_date": "",
"gsr_by_ins_co": "",
"gsr_by_make": "", "gsr_by_make": "",
"gsr_by_referral": "",
"gsr_by_ro": "",
"gsr_labor_only": "", "gsr_labor_only": "",
"hours_sold_detail_closed": "", "hours_sold_detail_closed": "",
"hours_sold_detail_closed_source": "", "hours_sold_detail_closed_ins_co": "",
"hours_sold_detail_open": "", "hours_sold_detail_open": "",
"hours_sold_detail_open_source": "", "hours_sold_detail_open_ins_co": "",
"hours_sold_summary_closed": "", "hours_sold_summary_closed": "",
"hours_sold_summary_closed_source": "", "hours_sold_summary_closed_ins_co": "",
"hours_sold_summary_open": "", "hours_sold_summary_open": "",
"hours_sold_summary_open_source": "", "hours_sold_summary_open_ins_co": "",
"job_costing_ro_date_detail": "", "job_costing_ro_date_detail": "",
"job_costing_ro_date_summary": "", "job_costing_ro_date_summary": "",
"job_costing_ro_estimator": "", "job_costing_ro_estimator": "",
"job_costing_ro_source": "", "job_costing_ro_ins_co": "",
"open_orders": "", "open_orders": "",
"open_orders_estimator": "",
"open_orders_ins_co": "",
"parts_backorder": "",
"payments_by_date": "",
"payments_by_date_type": "", "payments_by_date_type": "",
"purchases_by_cost_center_detail": "", "purchases_by_cost_center_detail": "",
"purchases_by_cost_center_summary": "", "purchases_by_cost_center_summary": "",
@@ -1880,11 +1910,15 @@
"purchases_grouped_by_vendor_detailed": "", "purchases_grouped_by_vendor_detailed": "",
"purchases_grouped_by_vendor_summary": "", "purchases_grouped_by_vendor_summary": "",
"schedule": "", "schedule": "",
"supplement_ratio_source": "", "supplement_ratio_ins_co": "",
"thank_you_date": "",
"timetickets": "", "timetickets": "",
"timetickets_employee": "", "timetickets_employee": "",
"timetickets_summary": "", "timetickets_summary": "",
"void_ros": "" "unclaimed_hrs": "",
"void_ros": "",
"work_in_progress_labour": "",
"work_in_progress_payables": ""
} }
}, },
"scoreboard": { "scoreboard": {

3
firebase/readme.md
View File

@@ -1,4 +1,3 @@
Must set the environment variables using: Must set the environment variables using:
firebase functions:config:set auth.graphql_endpoint="https://bodyshop-dev-db.herokuapp.com/v1/graphql" auth.hasura_secret_admin_key="Dev-BodyShopAppBySnaptSoftware!" firebase functions:config:set auth.graphql_endpoint="https://bodyshop-dev-db.herokuapp.com/v1/graphql" auth.hasura_secret_admin_key="Dev-BodyShopApp!"

2
hasura/config.yaml
View File

@@ -1,2 +1,2 @@
endpoint: https://bodyshop-dev-db.herokuapp.com endpoint: https://bodyshop-dev-db.herokuapp.com
admin_secret: Dev-BodyShopAppBySnaptSoftware! admin_secret: Dev-BodyShopApp!

5
hasura/migrations/1622571272382_alter_table_public_joblines_alter_column_prt_dsmk_p/down.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE ONLY "public"."joblines" ALTER COLUMN "prt_dsmk_p" DROP DEFAULT;
type: run_sql

6
hasura/migrations/1622571272382_alter_table_public_joblines_alter_column_prt_dsmk_p/up.yaml Normal file
View File

@@ -0,0 +1,6 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE ONLY "public"."joblines" ALTER COLUMN "prt_dsmk_p" SET DEFAULT
0;
type: run_sql

1
hasura/migrations/1622571551101_run_sql_migration/down.yaml Normal file
View File

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

5
hasura/migrations/1622571551101_run_sql_migration/up.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: "update joblines \nset prt_dsmk_p = 0 where joblines.prt_dsmk_p is null;"
type: run_sql

4
server/job/job-costing.js
View File

@@ -281,7 +281,7 @@ function GenerateCostingData(job) {
amount: Math.round((val.act_price || 0) * 100), amount: Math.round((val.act_price || 0) * 100),
}) })
.multiply(val.part_qty || 0) .multiply(val.part_qty || 0)
.percentage(val.prt_dsmk_p) .percentage(val.prt_dsmk_p || 0)
); );
if (!acc.parts[partsProfitCenter]) if (!acc.parts[partsProfitCenter])
acc.parts[partsProfitCenter] = Dinero(); acc.parts[partsProfitCenter] = Dinero();
@@ -310,7 +310,7 @@ function GenerateCostingData(job) {
amount: Math.round((val.act_price || 0) * 100), amount: Math.round((val.act_price || 0) * 100),
}) })
.multiply(val.part_qty || 0) .multiply(val.part_qty || 0)
.percentage(val.prt_dsmk_p) .percentage(val.prt_dsmk_p || 0)
); );
if (!acc.parts[partsProfitCenter]) if (!acc.parts[partsProfitCenter])

6
server/job/job-totals.js
View File

@@ -217,7 +217,7 @@ function CalculatePartsTotals(jobLines) {
amount: Math.round((value.act_price || 0) * 100), amount: Math.round((value.act_price || 0) * 100),
}) })
.multiply(value.part_qty || 0) .multiply(value.part_qty || 0)
.percentage(value.prt_dsmk_p) .percentage(value.prt_dsmk_p || 0)
), ),
list: { list: {
...acc.parts.list, ...acc.parts.list,
@@ -248,7 +248,7 @@ function CalculatePartsTotals(jobLines) {
amount: Math.round((value.act_price || 0) * 100), amount: Math.round((value.act_price || 0) * 100),
}) })
.multiply(value.part_qty || 0) .multiply(value.part_qty || 0)
.percentage(value.prt_dsmk_p) .percentage(value.prt_dsmk_p || 0)
), ),
}, },
}; };
@@ -382,7 +382,7 @@ function CalculateTaxesTotals(job, otherTotals) {
amount: Math.round((val.act_price || 0) * 100), amount: Math.round((val.act_price || 0) * 100),
}) })
.multiply(val.part_qty || 0) .multiply(val.part_qty || 0)
.percentage(val.prt_dsmk_p) .percentage(val.prt_dsmk_p || 0)
) )
.percentage( .percentage(
((job.parts_tax_rates && ((job.parts_tax_rates &&