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

Template list additoins.

Browse Source
This commit is contained in:
Patrick Fic
2021-02-22 12:27:49 -08:00
parent 8a886f19bc
commit 6bdf5b8499
11 changed files with 1095 additions and 32855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

199
bodyshop_translations.babel
View File

@@ -24189,6 +24189,32 @@
<folder_node> <folder_node>
<name>printcenter</name> <name>printcenter</name>
<children> <children>
<folder_node>
<name>bills</name>
<children>
<concept_node>
<name>inhouse_invoice</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>courtesycarcontract</name> <name>courtesycarcontract</name>
<children> <children>
@@ -24816,6 +24842,48 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>parts_order_history</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_return_slip</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>payment_receipt</name> <name>payment_receipt</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -25180,6 +25248,53 @@
</concept_node> </concept_node>
</children> </children>
</folder_node> </folder_node>
<folder_node>
<name>vendors</name>
<children>
<concept_node>
<name>purchases_by_vendor_detailed</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_vendor_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>
</children>
</folder_node>
</children> </children>
</folder_node> </folder_node>
<folder_node> <folder_node>
@@ -25931,6 +26046,90 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>purchases_by_date_range_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_date_range_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>
<name>schedule</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>timetickets</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>

27333
client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

16
client/package.json
View File

@@ -9,19 +9,19 @@
"@lourenci/react-kanban": "^2.1.0", "@lourenci/react-kanban": "^2.1.0",
"@stripe/react-stripe-js": "^1.2.2", "@stripe/react-stripe-js": "^1.2.2",
"@stripe/stripe-js": "^1.12.1", "@stripe/stripe-js": "^1.12.1",
"@tanem/react-nprogress": "^3.0.55", "@tanem/react-nprogress": "^3.0.56",
"@tinymce/tinymce-react": "^3.10.1", "@tinymce/tinymce-react": "^3.10.2",
"antd": "^4.12.3", "antd": "^4.12.3",
"apollo-boost": "^0.4.9", "apollo-boost": "^0.4.9",
"apollo-link-logger": "^2.0.0", "apollo-link-logger": "^2.0.0",
"axios": "^0.21.1", "axios": "^0.21.1",
"codemirror": "^5.59.2", "codemirror": "^5.59.3",
"codemirror-graphql": "^0.15.2", "codemirror-graphql": "^0.15.2",
"dinero.js": "^1.8.1", "dinero.js": "^1.8.1",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"firebase": "^8.2.7", "firebase": "^8.2.9",
"graphql": "^15.5.0", "graphql": "^15.5.0",
"i18next": "^19.8.7", "i18next": "^19.8.9",
"i18next-browser-languagedetector": "^6.0.1", "i18next-browser-languagedetector": "^6.0.1",
"jsoneditor": "^9.1.10", "jsoneditor": "^9.1.10",
"jsoneditor-react": "^3.1.0", "jsoneditor-react": "^3.1.0",
@@ -41,7 +41,7 @@
"react-drag-listview": "^0.1.8", "react-drag-listview": "^0.1.8",
"react-email-editor": "^1.2.0", "react-email-editor": "^1.2.0",
"react-grid-gallery": "^0.5.5", "react-grid-gallery": "^0.5.5",
"react-i18next": "^11.8.6", "react-i18next": "^11.8.7",
"react-icons": "^4.2.0", "react-icons": "^4.2.0",
"react-moment": "^1.1.1", "react-moment": "^1.1.1",
"react-number-format": "^4.4.4", "react-number-format": "^4.4.4",
@@ -49,9 +49,9 @@
"react-redux": "^7.2.2", "react-redux": "^7.2.2",
"react-resizable": "^1.11.0", "react-resizable": "^1.11.0",
"react-router-dom": "^5.2.0", "react-router-dom": "^5.2.0",
"react-scripts": "^4.0.2", "react-scripts": "^4.0.3",
"react-virtualized": "^9.22.3", "react-virtualized": "^9.22.3",
"recharts": "^2.0.6", "recharts": "^2.0.7",
"redux": "^4.0.5", "redux": "^4.0.5",
"redux-persist": "^6.0.0", "redux-persist": "^6.0.0",
"redux-saga": "^1.1.3", "redux-saga": "^1.1.3",

2
client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
View File

@@ -165,7 +165,7 @@ export function PartsOrderListTableComponent({
<PrintWrapper <PrintWrapper
templateObject={{ templateObject={{
name: record.isReturn name: record.isReturn
? TemplateList("partsorder").parts_return_confirmation.key ? TemplateList("partsorder").parts_return_slip.key
: TemplateList("partsorder").parts_order.key, : TemplateList("partsorder").parts_order.key,
variables: { id: record.id }, variables: { id: record.id },
}} }}

4
client/src/components/parts-order-modal/parts-order-modal.container.jsx
View File

@@ -165,7 +165,7 @@ export function PartsOrderModalContainer({
GenerateDocument( GenerateDocument(
{ {
name: isReturn name: isReturn
? TemplateList("partsorder").parts_return_confirmation.key ? TemplateList("partsorder").parts_return_slip.key
: TemplateList("partsorder").parts_order.key, : TemplateList("partsorder").parts_order.key,
variables: { variables: {
id: insertResult.data.insert_parts_orders.returning[0].id, id: insertResult.data.insert_parts_orders.returning[0].id,
@@ -182,7 +182,7 @@ export function PartsOrderModalContainer({
GenerateDocument( GenerateDocument(
{ {
name: isReturn name: isReturn
? TemplateList("partsorder").parts_return_confirmation.key ? TemplateList("partsorder").parts_return_slip.key
: TemplateList("partsorder").parts_order.key, : TemplateList("partsorder").parts_order.key,
variables: { variables: {
id: insertResult.data.insert_parts_orders.returning[0].id, id: insertResult.data.insert_parts_orders.returning[0].id,

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

@@ -1469,6 +1469,9 @@
} }
}, },
"printcenter": { "printcenter": {
"bills": {
"inhouse_invoice": "In House Invoice"
},
"courtesycarcontract": { "courtesycarcontract": {
"courtesy_car_contract": "Courtesy Car Contract", "courtesy_car_contract": "Courtesy Car Contract",
"courtesy_car_terms": "Courtesy Car Terms" "courtesy_car_terms": "Courtesy Car Terms"
@@ -1505,6 +1508,8 @@
"job_notes": "Job Notes", "job_notes": "Job Notes",
"parts_order": "Parts Order Confirmation", "parts_order": "Parts Order Confirmation",
"parts_order_confirmation": "", "parts_order_confirmation": "",
"parts_order_history": "Parts Order History",
"parts_return_slip": "Parts Return Slip",
"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",
@@ -1524,6 +1529,10 @@
"reportcentermodal": "Report Center", "reportcentermodal": "Report Center",
"speedprint": "Speed Print", "speedprint": "Speed Print",
"title": "Print Center" "title": "Print Center"
},
"vendors": {
"purchases_by_vendor_detailed": "Purchases by Vendor - Detailed",
"purchases_by_vendor_summary": "Purchases by Vendor - Summary"
} }
}, },
"production": { "production": {
@@ -1580,7 +1589,11 @@
"key": "Report" "key": "Report"
}, },
"templates": { "templates": {
"payments_by_date_type": "Payments by Date Range" "payments_by_date_type": "Payments by Date Range",
"purchases_by_date_range_detail": "Purchases by Date - Detail",
"purchases_by_date_range_summary": "Purchases by Date - Summary",
"schedule": "Appointment Schedule",
"timetickets": "Time Tickets"
} }
}, },
"scoreboard": { "scoreboard": {

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

@@ -1469,6 +1469,9 @@
} }
}, },
"printcenter": { "printcenter": {
"bills": {
"inhouse_invoice": ""
},
"courtesycarcontract": { "courtesycarcontract": {
"courtesy_car_contract": "", "courtesy_car_contract": "",
"courtesy_car_terms": "" "courtesy_car_terms": ""
@@ -1505,6 +1508,8 @@
"job_notes": "", "job_notes": "",
"parts_order": "", "parts_order": "",
"parts_order_confirmation": "", "parts_order_confirmation": "",
"parts_order_history": "",
"parts_return_slip": "",
"payment_receipt": "", "payment_receipt": "",
"payment_request": "", "payment_request": "",
"payments_by_job": "", "payments_by_job": "",
@@ -1524,6 +1529,10 @@
"reportcentermodal": "", "reportcentermodal": "",
"speedprint": "", "speedprint": "",
"title": "" "title": ""
},
"vendors": {
"purchases_by_vendor_detailed": "",
"purchases_by_vendor_summary": ""
} }
}, },
"production": { "production": {
@@ -1580,7 +1589,11 @@
"key": "" "key": ""
}, },
"templates": { "templates": {
"payments_by_date_type": "" "payments_by_date_type": "",
"purchases_by_date_range_detail": "",
"purchases_by_date_range_summary": "",
"schedule": "",
"timetickets": ""
} }
}, },
"scoreboard": { "scoreboard": {

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

@@ -1469,6 +1469,9 @@
} }
}, },
"printcenter": { "printcenter": {
"bills": {
"inhouse_invoice": ""
},
"courtesycarcontract": { "courtesycarcontract": {
"courtesy_car_contract": "", "courtesy_car_contract": "",
"courtesy_car_terms": "" "courtesy_car_terms": ""
@@ -1505,6 +1508,8 @@
"job_notes": "", "job_notes": "",
"parts_order": "", "parts_order": "",
"parts_order_confirmation": "", "parts_order_confirmation": "",
"parts_order_history": "",
"parts_return_slip": "",
"payment_receipt": "", "payment_receipt": "",
"payment_request": "", "payment_request": "",
"payments_by_job": "", "payments_by_job": "",
@@ -1524,6 +1529,10 @@
"reportcentermodal": "", "reportcentermodal": "",
"speedprint": "", "speedprint": "",
"title": "" "title": ""
},
"vendors": {
"purchases_by_vendor_detailed": "",
"purchases_by_vendor_summary": ""
} }
}, },
"production": { "production": {
@@ -1580,7 +1589,11 @@
"key": "" "key": ""
}, },
"templates": { "templates": {
"payments_by_date_type": "" "payments_by_date_type": "",
"purchases_by_date_range_detail": "",
"purchases_by_date_range_summary": "",
"schedule": "",
"timetickets": ""
} }
}, },
"scoreboard": { "scoreboard": {

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

@@ -169,6 +169,15 @@ export const TemplateList = (type, context) => {
key: "invoice_customer_payable", key: "invoice_customer_payable",
disabled: false, disabled: false,
}, },
parts_order_history: {
title: i18n.t("printcenter.jobs.parts_order_history"),
description: "All Jobs Notes",
subject: `${i18n.t("printcenter.jobs.parts_order_history")} - ${
context && context.job && context.job.ro_number
}`,
key: "parts_order_history",
disabled: false,
},
} }
: {}), : {}),
...(!type || type === "job_special" ...(!type || type === "job_special"
@@ -212,10 +221,10 @@ export const TemplateList = (type, context) => {
}`, }`,
disabled: false, disabled: false,
}, },
parts_return_confirmation: { parts_return_slip: {
title: i18n.t("printcenter.jobs.parts_return_confirmation"), title: i18n.t("printcenter.jobs.parts_return_slip"),
description: "Parts Return", description: "Parts Return",
key: "parts_return_confirmation", key: "parts_return_slip",
disabled: false, disabled: false,
}, },
} }
@@ -251,6 +260,46 @@ export const TemplateList = (type, context) => {
key: "payments_by_date_type", key: "payments_by_date_type",
disabled: false, disabled: false,
}, },
purchases_by_date_range_detail: {
title: i18n.t(
"reportcenter.templates.purchases_by_date_range_detail"
),
description: "Est Detail",
subject: `${i18n.t(
"reportcenter.templates.purchases_by_date_range_detail"
)} - ${context && context.job && context.job.ro_number}`,
key: "purchases_by_date_range_detail",
disabled: false,
},
purchases_by_date_range_summary: {
title: i18n.t(
"reportcenter.templates.purchases_by_date_range_summary"
),
description: "Est Detail",
subject: `${i18n.t(
"reportcenter.templates.purchases_by_date_range_summary"
)} - ${context && context.job && context.job.ro_number}`,
key: "purchases_by_date_range_summary",
disabled: false,
},
schedule: {
title: i18n.t("reportcenter.templates.schedule"),
description: "Est Detail",
subject: `${i18n.t("reportcenter.templates.schedule")} - ${
context && context.job && context.job.ro_number
}`,
key: "schedule",
disabled: false,
},
timetickets: {
title: i18n.t("printcenter.timetickets.timetickets"),
description: "Est Detail",
subject: `${i18n.t("printcenter.timetickets.timetickets")} - ${
context && context.job && context.job.ro_number
}`,
key: "timetickets",
disabled: false,
},
} }
: {}), : {}),
...(!type || type === "courtesycarcontract" ...(!type || type === "courtesycarcontract"
@@ -277,5 +326,53 @@ export const TemplateList = (type, context) => {
}, },
} }
: {}), : {}),
...(!type || type === "bill"
? {
inhouse_invoice: {
title: i18n.t("printcenter.bills.inhouse_invoice"),
description: "Est Detail",
subject: `${i18n.t("printcenter.bills.inhouse_invoice")} - ${
context && context.job && context.job.ro_number
}`,
key: "inhouse_invoice",
disabled: false,
},
}
: {}),
...(!type || type === "timeticket"
? {
// timetickets: {
// title: i18n.t("printcenter.timetickets.timetickets"),
// description: "Est Detail",
// subject: `${i18n.t("printcenter.timetickets.timetickets")} - ${
// context && context.job && context.job.ro_number
// }`,
// key: "timetickets",
// disabled: false,
// },
}
: {}),
...(!type || type === "vendor"
? {
purchases_by_vendor_detailed: {
title: i18n.t("printcenter.vendors.purchases_by_vendor_detailed"),
description: "Est Detail",
subject: `${i18n.t(
"printcenter.vendors.purchases_by_vendor_detailed"
)} - ${context && context.job && context.job.ro_number}`,
key: "purchases_by_vendor_detailed",
disabled: false,
},
purchases_by_vendor_summary: {
title: i18n.t("printcenter.vendors.purchases_by_vendor_summary"),
description: "Est Detail",
subject: `${i18n.t(
"printcenter.vendors.purchases_by_vendor_summary"
)} - ${context && context.job && context.job.ro_number}`,
key: "purchases_by_vendor_summary",
disabled: false,
},
}
: {}),
}; };
}; };

6232
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

16
package.json
View File

@@ -18,32 +18,32 @@
}, },
"dependencies": { "dependencies": {
"body-parser": "^1.18.3", "body-parser": "^1.18.3",
"cloudinary": "^1.24.0", "cloudinary": "^1.25.0",
"compression": "^1.7.4", "compression": "^1.7.4",
"cors": "2.8.5", "cors": "2.8.5",
"csrf": "^3.1.0", "csrf": "^3.1.0",
"dinero.js": "^1.8.1", "dinero.js": "^1.8.1",
"dotenv": "8.2.0", "dotenv": "8.2.0",
"express": "^4.16.4", "express": "^4.16.4",
"firebase-admin": "^9.4.2", "firebase-admin": "^9.5.0",
"graphql": "^15.5.0", "graphql": "^15.5.0",
"graphql-request": "^3.4.0", "graphql-request": "^3.4.0",
"handlebars": "^4.7.6", "handlebars": "^4.7.7",
"inline-css": "^3.0.0", "inline-css": "^3.0.0",
"intuit-oauth": "^3.0.2", "intuit-oauth": "^3.0.2",
"lodash": "^4.17.20", "lodash": "^4.17.21",
"moment": "^2.29.1", "moment": "^2.29.1",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",
"node-mailjet": "^3.3.1", "node-mailjet": "^3.3.1",
"phone": "^2.4.20", "phone": "^2.4.20",
"stripe": "^8.132.0", "stripe": "^8.137.0",
"twilio": "^3.55.1", "twilio": "^3.56.0",
"xmlbuilder": "^15.1.1" "xmlbuilder": "^15.1.1"
}, },
"devDependencies": { "devDependencies": {
"concurrently": "^5.3.0", "concurrently": "^5.3.0",
"eslint": "^7.19.0", "eslint": "^7.20.0",
"eslint-plugin-promise": "^4.2.1", "eslint-plugin-promise": "^4.3.1",
"source-map-explorer": "^2.5.2" "source-map-explorer": "^2.5.2"
} }
} }