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

Merge branch 'release/2024-04-05' into test-AIO

Browse Source 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

# Conflicts:
#	client/src/components/print-center-jobs-labels/print-center-jobs-labels.component.jsx
This commit is contained in:
Allan Carr
2024-04-05 12:21:35 -07:00
parent b61fd17879 33d5d9b462
commit 19a03ec080
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,13 @@
import { Button, Card, Form, InputNumber, notification, Popover, Radio } from "antd"; import {
Button,
Card,
Form,
InputNumber,
notification,
Popover,
Radio,
Space,
} from "antd";
import React, { useState } from "react"; import React, { useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
@@ -95,10 +104,16 @@ export function PrintCenterJobsLabels({ bodyshop, jobId }) {
> >
<InputNumber min={1} precision={0} max={99} /> <InputNumber min={1} precision={0} max={99} />
</Form.Item> </Form.Item>
<Button type="primary" loading={loading} onClick={handleOk}> <div style={{ display: "flex", justifyContent: "flex-end" }}>
{t("general.actions.print")} <Space>
</Button> <Button type="primary" loading={loading} onClick={handleOk}>
<Button onClick={handleCancel}>{t("general.actions.cancel")}</Button> {t("general.actions.print")}
</Button>
<Button onClick={handleCancel}>
{t("general.actions.cancel")}
</Button>
</Space>
</div>
</Form> </Form>
</Card> </Card>
); );