QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-16 04:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix : correct rename variable in sale & purchase floating Actions.

Browse Source
This commit is contained in:
elforjani3
2021-01-03 19:43:25 +02:00
parent a2284945f1
commit 31e4b7f0e0
8 changed files with 32 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/src/containers/Purchases/Bill/BillFloatingActions.js
View File

@@ -23,9 +23,7 @@ export default function BillFloatingActions({
isSubmitting,
onSubmitClick,
onCancelClick,
onClearClick,
billId,
isOpen,
bill,
}) {
const { resetForm, submitForm } = useFormikContext();
const handleSubmitOpenBtnClick = (event) => {
@@ -81,14 +79,13 @@ export default function BillFloatingActions({
};
const handleClearBtnClick = (event) => {
// saveInvoke(onClearClick, event);
resetForm();
};
return (
<div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
{/* ----------- Save And Open ----------- */}
<If condition={!billId || !isOpen}>
<If condition={!bill || !bill?.is_open}>
<ButtonGroup>
<Button
disabled={isSubmitting}
@@ -155,7 +152,7 @@ export default function BillFloatingActions({
</ButtonGroup>
</If>
{/* ----------- Save and New ----------- */}
<If condition={billId && isOpen}>
<If condition={bill && bill?.is_open}>
<ButtonGroup>
<Button
disabled={isSubmitting}
@@ -191,7 +188,7 @@ export default function BillFloatingActions({
className={'ml1'}
disabled={isSubmitting}
onClick={handleClearBtnClick}
text={billId ? <T id={'reset'} /> : <T id={'clear'} />}
text={bill ? <T id={'reset'} /> : <T id={'clear'} />}
/>
{/* ----------- Cancel ----------- */}
<Button

5
client/src/containers/Purchases/Bill/BillForm.js
View File

@@ -219,7 +219,7 @@ function BillForm({
initialValues={initialValues}
onSubmit={handleFormSubmit}
>
{({ isSubmitting ,values }) => (
{({ isSubmitting}) => (
<Form>
<BillFormHeader onBillNumberChanged={handleBillNumberChanged} />
<BillFormBody defaultBill={defaultBill} />
@@ -229,8 +229,7 @@ function BillForm({
/>
<BillFloatingActions
isSubmitting={isSubmitting}
billId={billId}
isOpen={values.open}
bill={bill}
onSubmitClick={handleSubmitClick}
onCancelClick={handleCancelClick}
/>

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

@@ -23,9 +23,7 @@ export default function EstimateFloatingActions({
isSubmitting,
onSubmitClick,
onCancelClick,
onClearClick,
estimateId,
isDelivered,
estimate,
}) {
const { resetForm, submitForm } = useFormikContext();
@@ -82,14 +80,13 @@ export default function EstimateFloatingActions({
};
const handleClearBtnClick = (event) => {
// saveInvoke(onClearClick, event);
resetForm();
};
return (
<div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
{/* ----------- Save And Deliver ----------- */}
<If condition={!estimateId || !isDelivered}>
<If condition={!estimate || !estimate?.is_delivered}>
<ButtonGroup>
<Button
disabled={isSubmitting}
@@ -156,7 +153,7 @@ export default function EstimateFloatingActions({
</ButtonGroup>
</If>
{/* ----------- Save and New ----------- */}
<If condition={estimateId && isDelivered}>
<If condition={estimate && estimate?.is_delivered}>
<ButtonGroup>
<Button
disabled={isSubmitting}
@@ -192,7 +189,7 @@ export default function EstimateFloatingActions({
className={'ml1'}
disabled={isSubmitting}
onClick={handleClearBtnClick}
text={estimateId ? <T id={'reset'} /> : <T id={'clear'} />}
text={estimate ? <T id={'reset'} /> : <T id={'clear'} />}
/>
{/* ----------- Cancel ----------- */}
<Button

5
client/src/containers/Sales/Estimate/EstimateForm.js
View File

@@ -264,7 +264,7 @@ const EstimateForm = ({
initialValues={initialValues}
onSubmit={handleFormSubmit}
>
{({ isSubmitting, values }) => (
{({ isSubmitting}) => (
<Form>
<EstimateFormHeader
onEstimateNumberChanged={handleEstimateNumberChange}
@@ -274,10 +274,9 @@ const EstimateForm = ({
<EstimateFormFooter />
<EstimateFloatingActions
isSubmitting={isSubmitting}
estimateId={estimateId}
estimate={estimate}
onSubmitClick={handleSubmitClick}
onCancelClick={handleCancelClick}
isDelivered={values.delivered}
/>
</Form>
)}

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

@@ -23,9 +23,7 @@ export default function InvoiceFloatingActions({
isSubmitting,
onSubmitClick,
onCancelClick,
onClearClick,
invoice,
isDelivered,
}) {
const { resetForm, submitForm } = useFormikContext();
@@ -82,14 +80,13 @@ export default function InvoiceFloatingActions({
};
const handleClearBtnClick = (event) => {
// saveInvoke(onClearClick, event);
resetForm();
};
return (
<div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
{/* ----------- Save And Deliver ----------- */}
<If condition={!invoice || !isDelivered}>
<If condition={!invoice || !invoice?.is_delivered}>
<ButtonGroup>
<Button
disabled={isSubmitting}
@@ -156,7 +153,7 @@ export default function InvoiceFloatingActions({
</ButtonGroup>
</If>
{/* ----------- Save and New ----------- */}
<If condition={invoice && isDelivered}>
<If condition={invoice && invoice?.is_delivered}>
<ButtonGroup>
<Button
disabled={isSubmitting}

5
client/src/containers/Sales/Invoice/InvoiceForm.js
View File

@@ -246,7 +246,7 @@ function InvoiceForm({
initialValues={initialValues}
onSubmit={handleSubmit}
>
{({ isSubmitting, values }) => (
{({ isSubmitting}) => (
<Form>
<InvoiceFormHeader
onInvoiceNumberChanged={handleInvoiceNumberChanged}
@@ -262,10 +262,9 @@ function InvoiceForm({
<InvoiceFormFooter />
<InvoiceFloatingActions
isSubmitting={isSubmitting}
invoice={invoiceId}
invoice={invoice}
onCancelClick={handleCancelClick}
onSubmitClick={handleSubmitClick}
isDelivered={values.delivered}
/>
</Form>
)}

23
client/src/containers/Sales/Receipt/ReceiptForm.js
View File

@@ -58,7 +58,7 @@ const defaultInitialValues = {
reference_no: '',
receipt_message: '',
statement: '',
closed:'',
closed: '',
entries: [...repeatValue(defaultReceipt, MIN_LINES_NUMBER)],
};
@@ -247,13 +247,15 @@ function ReceiptForm({
},
[history],
);
return (
<div className={classNames(
CLASSES.PAGE_FORM,
CLASSES.PAGE_FORM_STRIP_STYLE,
CLASSES.PAGE_FORM_RECEIPT,
)}>
<div
className={classNames(
CLASSES.PAGE_FORM,
CLASSES.PAGE_FORM_STRIP_STYLE,
CLASSES.PAGE_FORM_RECEIPT,
)}
>
<Formik
validationSchema={
isNewMode ? CreateReceiptFormSchema : EditReceiptFormSchema
@@ -261,18 +263,17 @@ function ReceiptForm({
initialValues={initialValues}
onSubmit={handleFormSubmit}
>
{({ isSubmitting ,values }) => (
{({ isSubmitting}) => (
<Form>
<ReceiptFromHeader
onReceiptNumberChanged={handleReceiptNumberChanged}
/>
<ReceiptNumberWatcher receiptNumber={receiptNumber} />
<ReceiptFormBody defaultReceipt ={defaultReceipt} />
<ReceiptFormBody defaultReceipt={defaultReceipt} />
<ReceiptFormFooter />
<ReceiptFormFloatingActions
isSubmitting={isSubmitting}
receiptId={receiptId}
isClosed={values.closed}
receipt={receipt}
onSubmitClick={handleSubmitClick}
onCancelClick={handleCancelClick}
/>

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

@@ -21,11 +21,9 @@ import { If, Icon } from 'components';
*/
export default function ReceiptFormFloatingActions({
isSubmitting,
receiptId,
isClosed,
receipt,
onSubmitClick,
onCancelClick,
onClearClick,
}) {
const { resetForm, submitForm } = useFormikContext();
@@ -82,14 +80,13 @@ export default function ReceiptFormFloatingActions({
};
const handleClearBtnClick = (event) => {
// saveInvoke(onClearClick, event);
resetForm();
};
return (
<div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
{/* ----------- Save And Close ----------- */}
<If condition={!receiptId || !isClosed}>
<If condition={!receipt || !receipt?.is_closed}>
<ButtonGroup>
<Button
disabled={isSubmitting}
@@ -156,7 +153,7 @@ export default function ReceiptFormFloatingActions({
</ButtonGroup>
</If>
{/* ----------- Save and New ----------- */}
<If condition={receiptId && isClosed}>
<If condition={receipt && receipt?.is_closed}>
<ButtonGroup>
<Button
disabled={isSubmitting}
@@ -191,7 +188,7 @@ export default function ReceiptFormFloatingActions({
className={'ml1'}
disabled={isSubmitting}
onClick={handleClearBtnClick}
text={receiptId ? <T id={'reset'} /> : <T id={'clear'} />}
text={receipt ? <T id={'reset'} /> : <T id={'clear'} />}
/>
{/* ----------- Cancel ----------- */}
<Button