mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-19 06:10:31 +00:00
Merge branch 'develop' into big-105-convert-invoice-status-after-sending-mail-notification
This commit is contained in:
@@ -82,7 +82,7 @@ export function CreditNoteUniversalSearchItem(
|
||||
}
|
||||
label={
|
||||
<>
|
||||
<div class="amount">${item.reference.amount}</div>
|
||||
<div class="amount">{item.reference.formatted_amount}</div>
|
||||
<CreditNoteUniversalSearchStatus receipt={item.reference} />
|
||||
</>
|
||||
}
|
||||
|
||||
@@ -112,6 +112,16 @@ export const transformErrors = (errors, { setErrors }) => {
|
||||
intent: Intent.DANGER,
|
||||
});
|
||||
}
|
||||
if (
|
||||
errors.some(
|
||||
({ type }) => type === ERROR.INVOICE_AMOUNT_SMALLER_THAN_PAYMENT_AMOUNT,
|
||||
)
|
||||
) {
|
||||
AppToaster.show({
|
||||
message: intl.get('sale_invoice.total_smaller_than_paid_amount'),
|
||||
intent: Intent.DANGER,
|
||||
});
|
||||
}
|
||||
if (
|
||||
errors.some((error) => error.type === ERROR.SALE_INVOICE_NO_IS_REQUIRED)
|
||||
) {
|
||||
|
||||
@@ -83,13 +83,13 @@ export function InvoiceUniversalSearchItem(
|
||||
<span class="bp4-text-muted">
|
||||
{highlightText(item.reference.invoice_no, query)}{' '}
|
||||
<Icon icon={'caret-right-16'} iconSize={16} />
|
||||
{item.reference.formatted_invoice_date}
|
||||
{item.reference.invoice_date_formatted}
|
||||
</span>
|
||||
</div>
|
||||
}
|
||||
label={
|
||||
<>
|
||||
<div class="amount">${item.reference.balance}</div>
|
||||
<div class="amount">{item.reference.total_formatted}</div>
|
||||
<InvoiceStatus customer={item.reference} />
|
||||
</>
|
||||
}
|
||||
|
||||
@@ -28,6 +28,7 @@ export default function PaymentReceiveItemsTable({
|
||||
// Formik context.
|
||||
const {
|
||||
values: { customer_id },
|
||||
errors,
|
||||
} = useFormikContext();
|
||||
|
||||
// No results message.
|
||||
@@ -58,7 +59,7 @@ export default function PaymentReceiveItemsTable({
|
||||
data={entries}
|
||||
spinnerProps={false}
|
||||
payload={{
|
||||
errors: [],
|
||||
errors: errors?.entries || [],
|
||||
updateData: handleUpdateData,
|
||||
currencyCode,
|
||||
}}
|
||||
|
||||
@@ -75,7 +75,7 @@ export function ReceiptUniversalSearchItem(
|
||||
}
|
||||
label={
|
||||
<>
|
||||
<div class="amount">${item.reference.amount}</div>
|
||||
<div class="amount">{item.reference.formatted_amount}</div>
|
||||
<ReceiptStatus receipt={item.reference} />
|
||||
</>
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user