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(form footer):missing.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/containers/Accounting/MakeJournal/MakeJournalFormFooterLeft.js
View File

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

2
src/containers/Dialogs/WarehouseTransferNumberDialog/WarehouseTransferNumberDialogContent.js
View File

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

4
src/containers/Expenses/ExpenseForm/ExpenseFormFooterLeft.js
View File

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

4
src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.js
View File

@@ -13,7 +13,9 @@ export function PaymentMadeFormFooterLeft() {
>
<FEditableText
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>
</React.Fragment>

7
src/containers/Purchases/PaymentMades/PaymentForm/utils.js
View File

@@ -1,7 +1,7 @@
import React from 'react';
import moment from 'moment';
import intl from 'react-intl-universal';
import { pick, first } from 'lodash';
import { pick, first, sumBy } from 'lodash';
import { useFormikContext } from 'formik';
import { Intent } from '@blueprintjs/core';
import { AppToaster } from 'components';
@@ -143,7 +143,10 @@ export const usePaymentMadeTotals = () => {
} = useFormikContext();
// 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.
const formattedTotal = React.useMemo(

8
src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooterLeft.js
View File

@@ -13,7 +13,9 @@ export function CreditNoteFormFooterLeft() {
>
<FEditableText
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>
{/* --------- Terms and conditions --------- */}
@@ -23,9 +25,7 @@ export function CreditNoteFormFooterLeft() {
>
<FEditableText
name={'terms_conditions'}
placeholder={
'Enter the terms and conditions of your business to be displayed in your transaction'
}
placeholder={<T id={'terms_and_conditions.placeholder'} />}
/>
</TermsConditsFormGroup>
</React.Fragment>

8
src/containers/Sales/Estimates/EstimateForm/EstimateFormFooterLeft.js
View File

@@ -13,7 +13,9 @@ export function EstimateFormFooterLeft() {
>
<FEditableText
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>
@@ -24,9 +26,7 @@ export function EstimateFormFooterLeft() {
>
<FEditableText
name={'terms_conditions'}
placeholder={
'Enter the terms and conditions of your business to be displayed in your transaction'
}
placeholder={<T id={'terms_and_conditions.placeholder'} />}
/>
</TermsConditsFormGroup>
</React.Fragment>

9
src/containers/Sales/Invoices/InvoiceForm/InvoiceFormFooterLeft.js
View File

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

5
src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormFootetLeft.js
View File

@@ -13,7 +13,9 @@ export function PaymentReceiveFormFootetLeft() {
>
<FEditableText
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>
</React.Fragment>
@@ -31,4 +33,3 @@ const TermsConditsFormGroup = styled(FFormGroup)`
}
}
`;

7
src/containers/Sales/PaymentReceives/PaymentReceiveForm/utils.js
View File

@@ -1,7 +1,7 @@
import React from 'react';
import moment from 'moment';
import intl from 'react-intl-universal';
import { omit, pick, first } from 'lodash';
import { omit, pick, first, sumBy } from 'lodash';
import { useFormikContext } from 'formik';
import { Intent } from '@blueprintjs/core';
import { AppToaster } from 'components';
@@ -226,7 +226,10 @@ export const usePaymentReceiveTotals = () => {
} = useFormikContext();
// 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.
const formattedTotal = React.useMemo(

4
src/containers/Sales/Receipts/ReceiptForm/ReceiptFormFooterLeft.js
View File

@@ -13,7 +13,9 @@ export function ReceiptFormFooterLeft() {
>
<FEditableText
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>

2
src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersActionsBar.js
View File

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

5
src/hooks/query/warehouses.js
View File

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

9
src/lang/ar/index.json
View File

@@ -1918,5 +1918,12 @@
"branche.error.warehouse_code_not_unique": "رمز الفرع ليس فريدًا ",
"branche.error.branch_has_associated_transactions": "لا يمكنك حذف هذا الفرع لأنه لديه معاملات مرتبطة به.",
"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"
}

6
src/lang/en/index.json
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_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_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"
}