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

Begin work on speed print menu. BOD-229

Browse Source
This commit is contained in:
Patrick Fic
2020-07-30 19:21:48 -07:00
parent 40ffede622
commit 4130bd0bdb
15 changed files with 329 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
bodyshop_translations.babel
View File

@@ -17053,6 +17053,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>type</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>
<folder_node> <folder_node>
@@ -17142,27 +17163,6 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>type</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>
<folder_node> <folder_node>
@@ -22013,7 +22013,7 @@
</editor_configuration> </editor_configuration>
<primary_language>en-US</primary_language> <primary_language>en-US</primary_language>
<configuration> <configuration>
<definitions>client/src</definitions> <definitions>.</definitions>
<indent>tab</indent> <indent>tab</indent>
<format>namespaced-json</format> <format>namespaced-json</format>
<support_arrays>true</support_arrays> <support_arrays>true</support_arrays>

2
client/src/components/payment-form/payment-form.component.jsx
View File

@@ -66,7 +66,7 @@ export function PaymentFormComponent({
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("payments.labels.type")} label={t("payments.fields.type")}
name="type" name="type"
rules={[ rules={[
{ {

9
client/src/components/print-center-jobs/print-center-jobs.component.jsx
View File

@@ -7,9 +7,10 @@ import { toggleModalVisible } from "../../redux/modals/modals.actions";
import { selectPrintCenter } from "../../redux/modals/modals.selectors"; import { selectPrintCenter } from "../../redux/modals/modals.selectors";
import { import {
selectBodyshop, selectBodyshop,
selectCurrentUser, selectCurrentUser
} from "../../redux/user/user.selectors"; } from "../../redux/user/user.selectors";
import PrintCenterItem from "../print-center-item/print-center-item.component"; import PrintCenterItem from "../print-center-item/print-center-item.component";
import PrintCenterSpeedPrint from "../print-center-speed-print/print-center-speed-print.component";
import JobsReports from "./print-center-jobs.list"; import JobsReports from "./print-center-jobs.list";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
@@ -17,17 +18,19 @@ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
printCenterModal: selectPrintCenter, printCenterModal: selectPrintCenter,
}); });
const mapDispatchToProps = (dispatch) => ({ const mapDispatchToProps = (dispatch) => ({
setEmailOptions: (e) => dispatch(setEmailOptions(e)), setEmailOptions: (e) => dispatch(setEmailOptions(e)),
toggleModalVisible: () => dispatch(toggleModalVisible("printCenter")), toggleModalVisible: () => dispatch(toggleModalVisible("printCenter")),
}); });
export function PrintCenterJobsComponent({ printCenterModal }) {
const { id: jobId } = printCenterModal.context;
export function PrintCenterJobsComponent({ bodyshop, printCenterModal }) {
const { id: jobId } = printCenterModal.context;
const JobsReportsList = JobsReports(null); const JobsReportsList = JobsReports(null);
return ( return (
<div> <div>
<PrintCenterSpeedPrint job={jobId} />
<Collapse accordion> <Collapse accordion>
{JobsReportsList.map((section) => ( {JobsReportsList.map((section) => (
<Collapse.Panel key={section.key} header={section.title}> <Collapse.Panel key={section.key} header={section.title}>

58
client/src/components/print-center-speed-print/print-center-speed-print.component.jsx Normal file
View File

@@ -0,0 +1,58 @@
import React from "react";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { selectBodyshop } from "../../redux/user/user.selectors";
import { logImEXEvent } from "../../firebase/firebase.utils";
import RenderTemplate, {
displayTemplateInWindow,
} from "../../utils/RenderTemplate";
import { Button } from "antd";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop, //currentUser: selectCurrentUser
});
const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language))
});
export function PrintCenterSpeedPrint({ bodyshop, job }) {
const { speedprint } = bodyshop;
const renderTemplate = async (templateKey) => {
logImEXEvent("speed_print_template_render");
const html = await RenderTemplate(
{
name: templateKey,
variables: { id: job.id },
},
bodyshop
);
displayTemplateInWindow(html);
};
const renderAllTemplates = (templateKeys) => {
logImEXEvent("speed_print_render_all_templates");
templateKeys.forEach((templateKey) => renderTemplate(templateKey));
};
return (
<div>
{speedprint.map((sp) => (
<div>
{JSON.stringify(sp)}
<Button onClick={() => renderAllTemplates(sp.templates)}>
Print All
</Button>
</div>
))}
</div>
);
}
export default connect(
mapStateToProps,
mapDispatchToProps
)(PrintCenterSpeedPrint);

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

@@ -47,6 +47,7 @@ export const QUERY_BODYSHOP = gql`
md_referral_sources md_referral_sources
md_messaging_presets md_messaging_presets
intakechecklist intakechecklist
speedprint
employees { employees {
id id
first_name first_name
@@ -102,6 +103,7 @@ export const UPDATE_SHOP = gql`
md_referral_sources md_referral_sources
md_messaging_presets md_messaging_presets
intakechecklist intakechecklist
speedprint
employees { employees {
id id
first_name first_name

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

@@ -1048,14 +1048,14 @@
"memo": "Memo", "memo": "Memo",
"payer": "Payer", "payer": "Payer",
"stripeid": "Stripe ID", "stripeid": "Stripe ID",
"transactionid": "Transaction ID" "transactionid": "Transaction ID",
"type": "Type"
}, },
"labels": { "labels": {
"electronicpayment": "Use Electronic Payment Processing?", "electronicpayment": "Use Electronic Payment Processing?",
"new": "New Payment", "new": "New Payment",
"signup": "Please contact support to sign up for electronic payments.", "signup": "Please contact support to sign up for electronic payments.",
"title": "Payments", "title": "Payments"
"type": "Type"
}, },
"successes": { "successes": {
"payment": "Payment created successfully. ", "payment": "Payment created successfully. ",

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

@@ -1048,14 +1048,14 @@
"memo": "", "memo": "",
"payer": "", "payer": "",
"stripeid": "", "stripeid": "",
"transactionid": "" "transactionid": "",
"type": ""
}, },
"labels": { "labels": {
"electronicpayment": "", "electronicpayment": "",
"new": "", "new": "",
"signup": "", "signup": "",
"title": "", "title": ""
"type": ""
}, },
"successes": { "successes": {
"payment": "", "payment": "",

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

@@ -1048,14 +1048,14 @@
"memo": "", "memo": "",
"payer": "", "payer": "",
"stripeid": "", "stripeid": "",
"transactionid": "" "transactionid": "",
"type": ""
}, },
"labels": { "labels": {
"electronicpayment": "", "electronicpayment": "",
"new": "", "new": "",
"signup": "", "signup": "",
"title": "", "title": ""
"type": ""
}, },
"successes": { "successes": {
"payment": "", "payment": "",

5
hasura/migrations/1596147831219_alter_table_public_bodyshops_add_column_speedprint/down.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."bodyshops" DROP COLUMN "speedprint";
type: run_sql

6
hasura/migrations/1596147831219_alter_table_public_bodyshops_add_column_speedprint/up.yaml Normal file
View File

@@ -0,0 +1,6 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."bodyshops" ADD COLUMN "speedprint" jsonb NULL DEFAULT
jsonb_build_array();
type: run_sql

57
hasura/migrations/1596147842820_update_permission_user_public_table_bodyshops/down.yaml Normal file
View File

@@ -0,0 +1,57 @@
- args:
role: user
table:
name: bodyshops
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- accountingconfig
- address1
- address2
- appt_length
- city
- country
- created_at
- email
- federal_tax_id
- id
- inhousevendorid
- insurance_vendor_id
- intakechecklist
- invoice_tax_rates
- logo_img_path
- md_messaging_presets
- md_order_statuses
- md_referral_sources
- md_responsibility_centers
- md_ro_statuses
- messagingservicesid
- production_config
- region_config
- scoreboard_target
- shopname
- shoprates
- ssbuckets
- state
- state_tax_id
- stripe_acct_id
- template_header
- textid
- updated_at
- zip_post
computed_fields: []
filter:
associations:
bodyshop:
associations:
user:
authid:
_eq: X-Hasura-User-Id
role: user
table:
name: bodyshops
schema: public
type: create_select_permission

58
hasura/migrations/1596147842820_update_permission_user_public_table_bodyshops/up.yaml Normal file
View File

@@ -0,0 +1,58 @@
- args:
role: user
table:
name: bodyshops
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- accountingconfig
- address1
- address2
- appt_length
- city
- country
- created_at
- email
- federal_tax_id
- id
- inhousevendorid
- insurance_vendor_id
- intakechecklist
- invoice_tax_rates
- logo_img_path
- md_messaging_presets
- md_order_statuses
- md_referral_sources
- md_responsibility_centers
- md_ro_statuses
- messagingservicesid
- production_config
- region_config
- scoreboard_target
- shopname
- shoprates
- speedprint
- ssbuckets
- state
- state_tax_id
- stripe_acct_id
- template_header
- textid
- updated_at
- zip_post
computed_fields: []
filter:
associations:
bodyshop:
associations:
user:
authid:
_eq: X-Hasura-User-Id
role: user
table:
name: bodyshops
schema: public
type: create_select_permission

51
hasura/migrations/1596147854907_update_permission_user_public_table_bodyshops/down.yaml Normal file
View File

@@ -0,0 +1,51 @@
- args:
role: user
table:
name: bodyshops
schema: public
type: drop_update_permission
- args:
permission:
columns:
- accountingconfig
- address1
- address2
- appt_length
- city
- country
- created_at
- email
- federal_tax_id
- id
- inhousevendorid
- insurance_vendor_id
- intakechecklist
- invoice_tax_rates
- logo_img_path
- md_messaging_presets
- md_order_statuses
- md_referral_sources
- md_responsibility_centers
- md_ro_statuses
- production_config
- scoreboard_target
- shopname
- shoprates
- ssbuckets
- state
- state_tax_id
- updated_at
- zip_post
filter:
associations:
bodyshop:
associations:
user:
authid:
_eq: X-Hasura-User-Id
set: {}
role: user
table:
name: bodyshops
schema: public
type: create_update_permission

52
hasura/migrations/1596147854907_update_permission_user_public_table_bodyshops/up.yaml Normal file
View File

@@ -0,0 +1,52 @@
- args:
role: user
table:
name: bodyshops
schema: public
type: drop_update_permission
- args:
permission:
columns:
- accountingconfig
- address1
- address2
- appt_length
- city
- country
- created_at
- email
- federal_tax_id
- id
- inhousevendorid
- insurance_vendor_id
- intakechecklist
- invoice_tax_rates
- logo_img_path
- md_messaging_presets
- md_order_statuses
- md_referral_sources
- md_responsibility_centers
- md_ro_statuses
- production_config
- scoreboard_target
- shopname
- shoprates
- speedprint
- ssbuckets
- state
- state_tax_id
- updated_at
- zip_post
filter:
associations:
bodyshop:
associations:
user:
authid:
_eq: X-Hasura-User-Id
set: {}
role: user
table:
name: bodyshops
schema: public
type: create_update_permission

2
hasura/migrations/metadata.yaml
View File

@@ -484,6 +484,7 @@ tables:
- scoreboard_target - scoreboard_target
- shopname - shopname
- shoprates - shoprates
- speedprint
- ssbuckets - ssbuckets
- state - state
- state_tax_id - state_tax_id
@@ -527,6 +528,7 @@ tables:
- scoreboard_target - scoreboard_target
- shopname - shopname
- shoprates - shoprates
- speedprint
- ssbuckets - ssbuckets
- state - state
- state_tax_id - state_tax_id