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

Merged in release/2022-04-22 (pull request #453)

Browse Source 
Release/2022 04 22
This commit is contained in:
Patrick Fic
2022-04-22 22:14:52 +00:00
parent cd25f079b5 a1f6f2fe4c
commit e65101b4a9
6 changed files with 73 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
View File

@@ -97,7 +97,7 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
</Form.Item>
<Form.Item
nostyle
noStyle
shouldUpdate={(prev, cur) => prev.auto_add_ats !== cur.auto_add_ats}
>
{() => {

47
client/src/utils/RenderTemplate.js
View File

@@ -163,19 +163,44 @@ export async function RenderTemplates(
: "50px",
},
}),
pdfOperations: templateAndData.map((template) => {
return {
pdfOperations: [
{
template: {
name: template.useShopSpecificTemplate
? `/${bodyshop.imexshopid}/${template.templateObject.name}`
: `/${template.templateObject.name}`,
...(renderAsHtml ? {} : { recipe: "chrome-pdf" }),
name: "/components/Header-Footer",
recipe: "chrome-pdf",
engine: "handlebars",
},
type: "append",
mergeWholeDocument: true,
renderForEveryPage: true,
};
}),
type: "merge",
},
...templateAndData.map((template) => {
return {
template: {
chrome: {
marginTop:
bodyshop.logo_img_path &&
bodyshop.logo_img_path.headerMargin &&
bodyshop.logo_img_path.headerMargin > 36
? bodyshop.logo_img_path.headerMargin
: "36px",
marginBottom:
bodyshop.logo_img_path &&
bodyshop.logo_img_path.footerMargin &&
bodyshop.logo_img_path.footerMargin > 50
? bodyshop.logo_img_path.footerMargin
: "50px",
},
name: template.useShopSpecificTemplate
? `/${bodyshop.imexshopid}/${template.templateObject.name}`
: `/${template.templateObject.name}`,
...(renderAsHtml ? {} : { recipe: "chrome-pdf" }),
},
type: "append",
// mergeWholeDocument: true,
// renderForEveryPage: true,
};
}),
],
},
data: {
...extend(

10
hasura/migrations/1650656410107_run_sql_migration/down.sql Normal file
View File

@@ -0,0 +1,10 @@
-- Could not auto-generate a down migration.
-- Please write an appropriate down migration for the SQL below:
-- CREATE OR REPLACE VIEW "public"."joblines_status" AS
-- SELECT j.jobid,
-- j.status,
-- count(1) AS count,
-- j.part_type
-- FROM joblines j
-- WHERE ((j.part_type IS NOT NULL) AND (j.part_type <> 'PAE'::text) AND (j.removed IS false))
-- GROUP BY j.jobid, j.status, j.part_type;

8
hasura/migrations/1650656410107_run_sql_migration/up.sql Normal file
View File

@@ -0,0 +1,8 @@
CREATE OR REPLACE VIEW "public"."joblines_status" AS
SELECT j.jobid,
j.status,
count(1) AS count,
j.part_type
FROM joblines j
WHERE ((j.part_type IS NOT NULL) AND (j.part_type <> 'PAE'::text) AND (j.removed IS false))
GROUP BY j.jobid, j.status, j.part_type;

10
hasura/migrations/1650656455358_run_sql_migration/down.sql Normal file
View File

@@ -0,0 +1,10 @@
-- Could not auto-generate a down migration.
-- Please write an appropriate down migration for the SQL below:
-- CREATE OR REPLACE VIEW "public"."joblines_status" AS
-- SELECT j.jobid,
-- j.status,
-- count(1) AS count,
-- j.part_type
-- FROM joblines j
-- WHERE ((j.part_type IS NOT NULL) AND (j.part_type <> 'PAE'::text) AND (j.removed IS false))
-- GROUP BY j.jobid, j.status, j.part_type;

8
hasura/migrations/1650656455358_run_sql_migration/up.sql Normal file
View File

@@ -0,0 +1,8 @@
CREATE OR REPLACE VIEW "public"."joblines_status" AS
SELECT j.jobid,
j.status,
count(1) AS count,
j.part_type
FROM joblines j
WHERE ((j.part_type IS NOT NULL) AND (j.part_type <> 'PAE'::text) AND (j.removed IS false))
GROUP BY j.jobid, j.status, j.part_type;