Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop

This commit is contained in:
a.bouhuolia
2021-12-22 19:17:46 +02:00
10 changed files with 202 additions and 33 deletions

View File

@@ -39,7 +39,7 @@ function CreditNoteDeleteAlert({
deleteCreditNoteMutate(creditNoteId)
.then(() => {
AppToaster.show({
message: intl.get('credit_note.alert.success_message'),
message: intl.get('credit_note.alert.delete_message'),
intent: Intent.SUCCESS,
});
closeDrawer('credit-note-detail-drawer');

View File

@@ -38,7 +38,7 @@ function VendorCreditDeleteAlert({
deleteVendorCreditMutate(vendorCreditId)
.then(() => {
AppToaster.show({
message: intl.get('vendor_credits.alert.success_message'),
message: intl.get('vendor_credits.alert.delete_message'),
intent: Intent.SUCCESS,
});
closeDrawer('vendor-credit-detail-drawer');

View File

@@ -116,7 +116,7 @@ function RefundCreditNoteFormFields() {
<FastField name={'from_account_id'}>
{({ form, field: { value }, meta: { error, touched } }) => (
<FormGroup
label={<T id={'refund_credit_note.dialog.form_account'} />}
label={<T id={'refund_credit_note.dialog.from_account'} />}
className={classNames(
'form-group--from_account_id',
'form-group--select-list',

View File

@@ -38,9 +38,8 @@ export function useRefundCreditTransactionsTableColumns() {
align: 'right',
},
{
Header: intl.get(
'refund_credit_transactions.column.withdrawal_account',
),
id: 'from_account',
Header: intl.get('refund_credit_transactions.column.withdrawal_account'),
accessor: ({ from_account }) => from_account.name,
width: 100,
className: 'from_account',

View File

@@ -56,7 +56,9 @@ function VendorCreditDetailDrawerProvider({ vendorCreditId, ...props }) {
>
<DrawerHeaderContent
name="vendor-credit-detail-drawer"
title={intl.get('vendor_credit.drawer_vendor_credit_detail')}
title={intl.get('vendor_credit.drawer_vendor_credit_detail', {
vendorNumber: vendorCredit.vendor_credit_number,
})}
/>
<VendorCreditDetailDrawerContext.Provider value={provider} {...props} />
</DrawerLoading>

View File

@@ -14,7 +14,7 @@ export default function VendorCreditNoteFormFooter() {
return (
<div class={classNames(CLASSES.PAGE_FORM_FOOTER)}>
<Postbox
title={<T id={'credit_note.label_credit_note_details'} />}
title={<T id={'vendor_credits_note.label_credit_note_details'} />}
defaultOpen={false}
>
<Row>

View File

@@ -80,7 +80,6 @@ function VendorsCreditNoteActionsBar({
allMenuItem={true}
resourceName={'vendor_credit'}
views={VendorCreditsViews}
allMenuItem={true}
allMenuItemText={<T id={'all'} />}
onChange={handleTabChange}
/>
@@ -88,7 +87,7 @@ function VendorsCreditNoteActionsBar({
<Button
className={Classes.MINIMAL}
icon={<Icon icon={'plus'} />}
text={<T id={'vendor_credits.action.new_vendor_credit'} />}
text={<T id={'vendor_credits.label.new_vendor_credit'} />}
onClick={handleClickNewVendorCredit}
/>
<AdvancedFilterPopover

View File

@@ -11,7 +11,7 @@ export default function VendorsCreditNoteEmptyStatus() {
title={<T id={'the_organization_doesn_t_receive_money_yet'} />}
description={
<p>
<T id={'credit_note.empty_status_description'} />
<T id={'vendor_credits.empty_status_description'} />
</p>
}
action={