QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-18 13:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix :Forms Floating Actions.

Browse Source
This commit is contained in:
elforjani3
2020-11-25 23:05:37 +02:00
parent 7c16cb2b24
commit 33827f8ed2
8 changed files with 73 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/containers/Expenses/ExpenseDataTable.js
View File

@@ -124,7 +124,7 @@ function ExpensesDataTable({
text={formatMessage({ id: 'view_details' })}
/>
<MenuDivider />
<If condition={!expense.published}>
<If condition={!expense.is_published}>
<MenuItem
icon={<Icon icon={'arrow-to-top'} size={16} />}
text={formatMessage({ id: 'publish_expense' })}
@@ -209,7 +209,7 @@ function ExpensesDataTable({
id: 'publish',
Header: formatMessage({ id: 'publish' }),
accessor: (r) => {
return r.published ? (
return !!r.is_published ? (
<Tag minimal={true}>
<T id={'published'} />
</Tag>

2
client/src/containers/Expenses/ExpenseFloatingActions.js
View File

@@ -90,7 +90,7 @@ export default function ExpenseFloatingFooter({
return (
<div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
{/* ----------- Save And Publish ----------- */}
<If condition={!expense}>
<If condition={!expense || !expensePublished}>
<ButtonGroup>
<Button
disabled={isSubmitting}

5
client/src/containers/Expenses/ExpenseForm.js
View File

@@ -129,6 +129,7 @@ function ExpenseForm({
description: '',
reference_no: '',
currency_code: baseCurrency,
is_published: '',
categories: [...repeatValue(defaultCategory, MIN_LINES_NUMBER)],
}),
[defaultCategory],
@@ -230,7 +231,7 @@ function ExpenseForm({
const form = {
...values,
publish: submitPayload.publish,
is_published: submitPayload.publish,
categories,
};
const saveExpense = (mdeiaIds) =>
@@ -374,7 +375,7 @@ function ExpenseForm({
onSubmitForm={submitForm}
onResetForm={resetForm}
expense={expenseId}
expensePublished={true}
expensePublished={values.is_published}
/>
</form>
</div>

2
client/src/containers/Expenses/ExpenseForm.schema.js
View File

@@ -21,7 +21,7 @@ const Schema = Yup.object().shape({
.max(DATATYPES_LENGTH.TEXT)
.nullable()
.label(formatMessage({ id: 'description' })),
publish: Yup.boolean().label(formatMessage({ id: 'publish' })),
is_published: Yup.boolean(),
categories: Yup.array().of(
Yup.object().shape({
index: Yup.number().min(1).max(DATATYPES_LENGTH.INT_10).nullable(),

2
client/src/containers/Sales/Estimate/EstimateFloatingActions.js
View File

@@ -89,7 +89,7 @@ export default function EstimateFloatingActions({
return (
<div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
{/* ----------- Save And Publish ----------- */}
<If condition={!estimateId}>
<If condition={!estimateId || !estimatePublished}>
<ButtonGroup>
<Button
disabled={isSubmitting}

2
client/src/containers/Sales/Invoice/InvoiceFloatingActions.js
View File

@@ -89,7 +89,7 @@ export default function InvoiceFloatingActions({
return (
<div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
{/* ----------- Save And Publish ----------- */}
<If condition={!invoice}>
<If condition={!invoice || !invoicePublished}>
<ButtonGroup>
<Button
disabled={isSubmitting}

2
client/src/containers/Sales/Receipt/ReceiptFormFloatingActions.js
View File

@@ -89,7 +89,7 @@ export default function ReceiptFormFloatingActions({
return (
<div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
{/* ----------- Save And Publish ----------- */}
<If condition={!receiptId}>
<If condition={!receiptId || !receiptPublished}>
<ButtonGroup>
<Button
disabled={isSubmitting}