fix(form footer):missing.

This commit is contained in:
elforjani13
2022-03-21 17:58:20 +02:00
parent 90c77d80eb
commit 70e1e94a4a
15 changed files with 49 additions and 35 deletions

View File

@@ -12,9 +12,7 @@ export function MakeJournalFormFooterLeft() {
> >
<FEditableText <FEditableText
name={'description'} name={'description'}
placeholder={ placeholder={<T id={'make_jorunal.decscrption.placeholder'} />}
'Enter the description of your business to be displayed in your transaction'
}
/> />
</DescriptionFormGroup> </DescriptionFormGroup>
</React.Fragment> </React.Fragment>

View File

@@ -52,7 +52,7 @@ function WarehouseTransferNumberDialogContent({
return; return;
} }
// Transformes the form values to settings to save it. // Transformes the form values to settings to save it.
const options = transformFormToSettings(values, 'warehouse_transfer'); const options = transformFormToSettings(values, 'warehouse_transfers');
// Save the settings. // Save the settings.
saveSettings({ options }).then(handleSuccess).catch(handleErrors); saveSettings({ options }).then(handleSuccess).catch(handleErrors);

View File

@@ -12,9 +12,7 @@ export function ExpenseFormFooterLeft() {
> >
<FEditableText <FEditableText
name={'description'} name={'description'}
placeholder={ placeholder={<T id={'expenses.decscrption.placeholder'} />}
'Enter the description of your business to be displayed in your transaction'
}
/> />
</DescriptionFormGroup> </DescriptionFormGroup>
</React.Fragment> </React.Fragment>

View File

@@ -13,7 +13,9 @@ export function PaymentMadeFormFooterLeft() {
> >
<FEditableText <FEditableText
name={'statement'} name={'statement'}
placeholder={'Thanks for your business and have a great day!'} placeholder={
<T id={'thanks_for_your_business_and_have_a_great_day'} />
}
/> />
</StatementFormGroup> </StatementFormGroup>
</React.Fragment> </React.Fragment>

View File

@@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import moment from 'moment'; import moment from 'moment';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import { pick, first } from 'lodash'; import { pick, first, sumBy } from 'lodash';
import { useFormikContext } from 'formik'; import { useFormikContext } from 'formik';
import { Intent } from '@blueprintjs/core'; import { Intent } from '@blueprintjs/core';
import { AppToaster } from 'components'; import { AppToaster } from 'components';
@@ -143,7 +143,10 @@ export const usePaymentMadeTotals = () => {
} = useFormikContext(); } = useFormikContext();
// Retrieves the invoice entries total. // Retrieves the invoice entries total.
const total = React.useMemo(() => getEntriesTotal(entries), [entries]); const total = React.useMemo(
() => sumBy(entries, 'payment_amount'),
[entries],
);
// Retrieves the formatted total money. // Retrieves the formatted total money.
const formattedTotal = React.useMemo( const formattedTotal = React.useMemo(

View File

@@ -13,7 +13,9 @@ export function CreditNoteFormFooterLeft() {
> >
<FEditableText <FEditableText
name={'note'} name={'note'}
placeholder={'Thanks for your business and have a great day!'} placeholder={
<T id={'thanks_for_your_business_and_have_a_great_day'} />
}
/> />
</CreditNoteMsgFormGroup> </CreditNoteMsgFormGroup>
{/* --------- Terms and conditions --------- */} {/* --------- Terms and conditions --------- */}
@@ -23,9 +25,7 @@ export function CreditNoteFormFooterLeft() {
> >
<FEditableText <FEditableText
name={'terms_conditions'} name={'terms_conditions'}
placeholder={ placeholder={<T id={'terms_and_conditions.placeholder'} />}
'Enter the terms and conditions of your business to be displayed in your transaction'
}
/> />
</TermsConditsFormGroup> </TermsConditsFormGroup>
</React.Fragment> </React.Fragment>

View File

@@ -13,7 +13,9 @@ export function EstimateFormFooterLeft() {
> >
<FEditableText <FEditableText
name={'note'} name={'note'}
placeholder={'Thanks for your business and have a great day!'} placeholder={
<T id={'thanks_for_your_business_and_have_a_great_day'} />
}
/> />
</EstimateMsgFormGroup> </EstimateMsgFormGroup>
@@ -24,9 +26,7 @@ export function EstimateFormFooterLeft() {
> >
<FEditableText <FEditableText
name={'terms_conditions'} name={'terms_conditions'}
placeholder={ placeholder={<T id={'terms_and_conditions.placeholder'} />}
'Enter the terms and conditions of your business to be displayed in your transaction'
}
/> />
</TermsConditsFormGroup> </TermsConditsFormGroup>
</React.Fragment> </React.Fragment>

View File

@@ -13,7 +13,9 @@ export function InvoiceFormFooterLeft() {
> >
<FEditableText <FEditableText
name={'invoice_message'} name={'invoice_message'}
placeholder={'Thanks for your business and have a great day!'} placeholder={
<T id={'thanks_for_your_business_and_have_a_great_day'} />
}
/> />
</InvoiceMsgFormGroup> </InvoiceMsgFormGroup>
@@ -24,9 +26,7 @@ export function InvoiceFormFooterLeft() {
> >
<FEditableText <FEditableText
name={'terms_conditions'} name={'terms_conditions'}
placeholder={ placeholder={<T id={'terms_and_conditions.placeholder'} />}
'Enter the terms and conditions of your business to be displayed in your transaction'
}
/> />
</TermsConditsFormGroup> </TermsConditsFormGroup>
</React.Fragment> </React.Fragment>
@@ -49,7 +49,6 @@ const InvoiceMsgFormGroup = styled(FFormGroup)`
const TermsConditsFormGroup = styled(FFormGroup)` const TermsConditsFormGroup = styled(FFormGroup)`
&.bp3-form-group { &.bp3-form-group {
.bp3-label { .bp3-label {
font-size: 12px; font-size: 12px;
margin-bottom: 12px; margin-bottom: 12px;

View File

@@ -13,7 +13,9 @@ export function PaymentReceiveFormFootetLeft() {
> >
<FEditableText <FEditableText
name={'statement'} name={'statement'}
placeholder={'Thanks for your business and have a great day!'} placeholder={
<T id={'thanks_for_your_business_and_have_a_great_day'} />
}
/> />
</TermsConditsFormGroup> </TermsConditsFormGroup>
</React.Fragment> </React.Fragment>
@@ -31,4 +33,3 @@ const TermsConditsFormGroup = styled(FFormGroup)`
} }
} }
`; `;

View File

@@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import moment from 'moment'; import moment from 'moment';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import { omit, pick, first } from 'lodash'; import { omit, pick, first, sumBy } from 'lodash';
import { useFormikContext } from 'formik'; import { useFormikContext } from 'formik';
import { Intent } from '@blueprintjs/core'; import { Intent } from '@blueprintjs/core';
import { AppToaster } from 'components'; import { AppToaster } from 'components';
@@ -226,7 +226,10 @@ export const usePaymentReceiveTotals = () => {
} = useFormikContext(); } = useFormikContext();
// Retrieves the invoice entries total. // Retrieves the invoice entries total.
const total = React.useMemo(() => getEntriesTotal(entries), [entries]); const total = React.useMemo(
() => sumBy(entries, 'payment_amount'),
[entries],
);
// Retrieves the formatted total money. // Retrieves the formatted total money.
const formattedTotal = React.useMemo( const formattedTotal = React.useMemo(

View File

@@ -13,7 +13,9 @@ export function ReceiptFormFooterLeft() {
> >
<FEditableText <FEditableText
name={'receipt_message'} name={'receipt_message'}
placeholder={'Thanks for your business and have a great day!'} placeholder={
<T id={'thanks_for_your_business_and_have_a_great_day'} />
}
/> />
</ReceiptMsgFormGroup> </ReceiptMsgFormGroup>

View File

@@ -66,7 +66,7 @@ function WarehouseTransfersActionsBar({
// Handle table row size change. // Handle table row size change.
const handleTableRowSizeChange = (size) => { const handleTableRowSizeChange = (size) => {
addSetting('warehouseTransfer', 'tableSize', size); addSetting('warehouseTransfers', 'tableSize', size);
}; };
return ( return (

View File

@@ -12,7 +12,7 @@ const commonInvalidateQueries = (queryClient) => {
// Invalidate warehouses transfers. // Invalidate warehouses transfers.
queryClient.invalidateQueries(t.WAREHOUSE_TRANSFERS); queryClient.invalidateQueries(t.WAREHOUSE_TRANSFERS);
queryClient.invalidateQueries(t.WAREHOUSE_TRANSFER); // queryClient.invalidateQueries(t.WAREHOUSE_TRANSFER);
queryClient.invalidateQueries(t.DASHBOARD_META); queryClient.invalidateQueries(t.DASHBOARD_META);
}; };
@@ -155,9 +155,6 @@ export function useDeleteWarehouseTransfer(props) {
return useMutation((id) => apiRequest.delete(`warehouses/transfers/${id}`), { return useMutation((id) => apiRequest.delete(`warehouses/transfers/${id}`), {
onSuccess: (res, id) => { onSuccess: (res, id) => {
// Invalidate specific warehoue.
queryClient.invalidateQueries([t.WAREHOUSE_TRANSFER, id]);
// Common invalidate queries. // Common invalidate queries.
commonInvalidateQueries(queryClient); commonInvalidateQueries(queryClient);
}, },

View File

@@ -1918,5 +1918,12 @@
"branche.error.warehouse_code_not_unique": "رمز الفرع ليس فريدًا ", "branche.error.warehouse_code_not_unique": "رمز الفرع ليس فريدًا ",
"branche.error.branch_has_associated_transactions": "لا يمكنك حذف هذا الفرع لأنه لديه معاملات مرتبطة به.", "branche.error.branch_has_associated_transactions": "لا يمكنك حذف هذا الفرع لأنه لديه معاملات مرتبطة به.",
"payment_Receive.error.payment_account_currency_invalid":"يجب أن تكون عملة حساب الإيداع هي نفس عملة العميل أو العملة الأساسية للمنشأة.", "payment_Receive.error.payment_account_currency_invalid":"يجب أن تكون عملة حساب الإيداع هي نفس عملة العميل أو العملة الأساسية للمنشأة.",
"payment_made.error.withdrawal_account_currency_invalid":"يجب أن تكون عملة حساب السحب هي نفس عملة المورد أو العملة الأساسية للمنشأة." "payment_made.error.withdrawal_account_currency_invalid":"يجب أن تكون عملة حساب السحب هي نفس عملة المورد أو العملة الأساسية للمنشأة.",
"view_customer_details": "عرض تفاصيل العميل ",
"view_vendor_details": "عرض تفاصيل المورد ",
"thanks_for_your_business_and_have_a_great_day": "Thanks for your business and have a great day!",
"terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
"expenses.decscrption.placeholder": "Enter the description of your business to be displayed in your transaction",
"make_jorunal.decscrption.placeholder": "Enter the description of your business to be displayed in your transaction"
} }

View File

@@ -1916,5 +1916,9 @@
"payment_Receive.error.payment_account_currency_invalid": "The deposit account currency should be same customer currency or organization base currency.", "payment_Receive.error.payment_account_currency_invalid": "The deposit account currency should be same customer currency or organization base currency.",
"payment_made.error.withdrawal_account_currency_invalid": "The withdrawal account currency should be same vendor currency or organization base currency.", "payment_made.error.withdrawal_account_currency_invalid": "The withdrawal account currency should be same vendor currency or organization base currency.",
"view_customer_details": "View Customer Details", "view_customer_details": "View Customer Details",
"view_vendor_details":"View Vendor Details" "view_vendor_details": "View Vendor Details",
"thanks_for_your_business_and_have_a_great_day": "Thanks for your business and have a great day!",
"terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
"expenses.decscrption.placeholder": "Enter the description of your business to be displayed in your transaction",
"make_jorunal.decscrption.placeholder": "Enter the description of your business to be displayed in your transaction"
} }