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

Merged in release/2022-03-18 (pull request #422)

Browse Source 
Release/2022 03 18
This commit is contained in:
Patrick Fic
2022-03-16 20:54:13 +00:00
parent 9a6be8a71e 9c39c8d59b
commit e72925e34e
7 changed files with 75 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
bodyshop_translations.babel
View File

@@ -1,4 +1,4 @@
<babeledit_project version="1.2" be_version="2.7.1"> <babeledit_project be_version="2.7.1" version="1.2">
<!-- <!--
BabelEdit project file BabelEdit project file
@@ -4388,6 +4388,48 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>logo_img_footer_margin</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>logo_img_header_margin</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>logo_img_path</name> <name>logo_img_path</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

8
client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js
View File

@@ -37,7 +37,6 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
}); });
//Wahtever is left in the existing lines, are lines that should be removed. //Wahtever is left in the existing lines, are lines that should be removed.
const insertQueries = linesToInsert.reduce((acc, value, idx) => { const insertQueries = linesToInsert.reduce((acc, value, idx) => {
return acc + generateInsertQuery(value, idx, jobId); return acc + generateInsertQuery(value, idx, jobId);
}, ""); }, "");
@@ -49,6 +48,13 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
const removeQueries = existingLines.reduce((acc, value, idx) => { const removeQueries = existingLines.reduce((acc, value, idx) => {
return acc + generateRemoveQuery(value, idx); return acc + generateRemoveQuery(value, idx);
}, ""); }, "");
console.log(insertQueries, updateQueries, removeQueries);
if ((insertQueries + updateQueries + removeQueries).trim() === "") {
return new Promise((resolve, reject) => {
resolve(null);
});
}
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
resolve(gql` resolve(gql`

13
client/src/components/jobs-available-table/jobs-available-table.container.jsx
View File

@@ -220,12 +220,13 @@ export function JobsAvailableContainer({
); );
delete supp.joblines; delete supp.joblines;
await client.mutate({ if (suppDelta !== null) {
mutation: gql` await client.mutate({
${suppDelta} mutation: gql`
`, ${suppDelta}
}); `,
});
}
const updateResult = await updateJob({ const updateResult = await updateJob({
variables: { variables: {
jobId: selectedJob, jobId: selectedJob,

12
client/src/components/shop-info/shop-info.general.component.jsx
View File

@@ -142,6 +142,18 @@ export default function ShopInfoGeneral({ form }) {
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item
label={t("bodyshop.fields.logo_img_header_margin")}
name={["logo_img_path", "headerMargin"]}
>
<InputNumber min={0} />
</Form.Item>
<Form.Item
label={t("bodyshop.fields.logo_img_footer_margin")}
name={["logo_img_path", "footerMargin"]}
>
<InputNumber min={0} />
</Form.Item>
</LayoutFormRow> </LayoutFormRow>
<LayoutFormRow header={t("bodyshop.labels.accountingsetup")}> <LayoutFormRow header={t("bodyshop.labels.accountingsetup")}>
<Form.Item <Form.Item

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

@@ -275,6 +275,8 @@
"mash": "Job Costing - Shop Materials Hourly Cost Rate" "mash": "Job Costing - Shop Materials Hourly Cost Rate"
}, },
"lastnumberworkingdays": "Scoreboard - Last Number of Working Days", "lastnumberworkingdays": "Scoreboard - Last Number of Working Days",
"logo_img_footer_margin": "Footer Margin (px)",
"logo_img_header_margin": "Header Margin (px)",
"logo_img_path": "Shop Logo", "logo_img_path": "Shop Logo",
"logo_img_path_height": "Logo Image Height", "logo_img_path_height": "Logo Image Height",
"logo_img_path_width": "Logo Image Width", "logo_img_path_width": "Logo Image Width",

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

@@ -275,6 +275,8 @@
"mash": "" "mash": ""
}, },
"lastnumberworkingdays": "", "lastnumberworkingdays": "",
"logo_img_footer_margin": "",
"logo_img_header_margin": "",
"logo_img_path": "", "logo_img_path": "",
"logo_img_path_height": "", "logo_img_path_height": "",
"logo_img_path_width": "", "logo_img_path_width": "",

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

@@ -275,6 +275,8 @@
"mash": "" "mash": ""
}, },
"lastnumberworkingdays": "", "lastnumberworkingdays": "",
"logo_img_footer_margin": "",
"logo_img_header_margin": "",
"logo_img_path": "", "logo_img_path": "",
"logo_img_path_height": "", "logo_img_path_height": "",
"logo_img_path_width": "", "logo_img_path_width": "",