From a7a94ba201f2e5f6fa01ee4e499fc314470e4410 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Wed, 15 Dec 2021 20:19:04 +0200 Subject: [PATCH 1/2] fix: fix format. --- .../RefundCreditNoteTransactions/components.js | 4 ++-- .../RefundVendorCreditTransactions/components.js | 4 ++-- .../Purchases/CreditNotes/CreditNotesLanding/components.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/containers/Drawers/CreditNoteDetailDrawer/RefundCreditNoteTransactions/components.js b/src/containers/Drawers/CreditNoteDetailDrawer/RefundCreditNoteTransactions/components.js index 1d3c12a93..1b4730adc 100644 --- a/src/containers/Drawers/CreditNoteDetailDrawer/RefundCreditNoteTransactions/components.js +++ b/src/containers/Drawers/CreditNoteDetailDrawer/RefundCreditNoteTransactions/components.js @@ -25,14 +25,14 @@ export function useRefundCreditTransactionsTableColumns() { () => [ { Header: intl.get('date'), - accessor: 'date', + accessor: 'formatted_date', Cell: FormatDateCell, width: 100, className: 'date', }, { Header: intl.get('refund_credit_transactions.column.amount_refunded'), - accessor: 'amount', + accessor: 'formtted_amount', width: 100, className: 'amount', align: 'right', diff --git a/src/containers/Drawers/VendorCreditDetailDrawer/RefundVendorCreditTransactions/components.js b/src/containers/Drawers/VendorCreditDetailDrawer/RefundVendorCreditTransactions/components.js index 1a2bcd7f7..2c0d01d4b 100644 --- a/src/containers/Drawers/VendorCreditDetailDrawer/RefundVendorCreditTransactions/components.js +++ b/src/containers/Drawers/VendorCreditDetailDrawer/RefundVendorCreditTransactions/components.js @@ -25,14 +25,14 @@ export function useRefundCreditTransactionsTableColumns() { () => [ { Header: intl.get('date'), - accessor: 'date', + accessor: 'formatted_date', Cell: FormatDateCell, width: 100, className: 'date', }, { Header: intl.get('refund_vendor_credit.column.amount'), - accessor: 'amount', + accessor: 'formtted_amount', width: 100, className: 'amount', align: 'right', diff --git a/src/containers/Purchases/CreditNotes/CreditNotesLanding/components.js b/src/containers/Purchases/CreditNotes/CreditNotesLanding/components.js index b915823f8..a5e696e0e 100644 --- a/src/containers/Purchases/CreditNotes/CreditNotesLanding/components.js +++ b/src/containers/Purchases/CreditNotes/CreditNotesLanding/components.js @@ -47,7 +47,7 @@ export function ActionsMenu({ onClick={safeCallback(onOpen, original)} /> - + } text={intl.get('vendor_credits.action.reconcile_with_bills')} From 09e739a5a9949288fa9da79f8ba19420ad6f2d8a Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Wed, 15 Dec 2021 20:45:42 +0200 Subject: [PATCH 2/2] feat: edit locking transactions. --- .../CreditNotes/ReconcileCreditNoteDeleteAlert.js | 1 - .../LockingTransactionsDialogContent.js | 1 + .../LockingTransactionsForm.js | 6 +++--- .../LockingTransactionsFormProvider.js | 2 -- .../TransactionsLocking/TransactionsLockingBody.js | 14 ++++++++------ src/containers/TransactionsLocking/components.js | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/containers/Alerts/CreditNotes/ReconcileCreditNoteDeleteAlert.js b/src/containers/Alerts/CreditNotes/ReconcileCreditNoteDeleteAlert.js index 1d84cdbb6..7322fbf9d 100644 --- a/src/containers/Alerts/CreditNotes/ReconcileCreditNoteDeleteAlert.js +++ b/src/containers/Alerts/CreditNotes/ReconcileCreditNoteDeleteAlert.js @@ -43,7 +43,6 @@ function ReconcileCreditNoteDeleteAlert({ message: intl.get('reconcile_credit_note.alert.success_message'), intent: Intent.SUCCESS, }); - closeDrawer('credit-note-detail-drawer'); }) .catch( ({ diff --git a/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsDialogContent.js b/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsDialogContent.js index 97f02a41a..86c880e4c 100644 --- a/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsDialogContent.js +++ b/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsDialogContent.js @@ -11,6 +11,7 @@ export default function LockingTransactionsDialogContent({ moduleName, isEnabled, }) { + return ( ({ - ...(!isEnabled + ...(isEnabled ? { - ...defaultInitialValues, + ...transformToForm(transactionLocking, defaultInitialValues), module: moduleName, } : { - ...transformToForm(transactionLocking, defaultInitialValues), + ...defaultInitialValues, module: moduleName, }), }), diff --git a/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsFormProvider.js b/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsFormProvider.js index 49571ea62..4c70e4d50 100644 --- a/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsFormProvider.js +++ b/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsFormProvider.js @@ -25,8 +25,6 @@ function LockingTransactionsFormProvider({ enabled: !!isEnabled, }); - // const isEnabled = transactionLocking?.is_enabled; - // State provider. const provider = { dialogName, diff --git a/src/containers/TransactionsLocking/TransactionsLockingBody.js b/src/containers/TransactionsLocking/TransactionsLockingBody.js index ed78c8077..a47fbef99 100644 --- a/src/containers/TransactionsLocking/TransactionsLockingBody.js +++ b/src/containers/TransactionsLocking/TransactionsLockingBody.js @@ -23,14 +23,15 @@ function TransactionsLockingBodyJsx({ // #withAlertsActions openAlert, }) { - const { - isTransactionLockingLoading, - transactionLockingType, - } = useTransactionsLockingContext(); + const { isTransactionLockingLoading, transactionLockingType } = + useTransactionsLockingContext(); // Handle locking transactions. - const handleLockingTransactions = (module) => { - openDialog('locking-transactions', { module: module }); + const handleLockingTransactions = (module, {}, isEnabled) => { + openDialog('locking-transactions', { + isEnabled: isEnabled, + module: module, + }); }; // Handle unlocking transactions const handleUnlockTransactions = (module) => { @@ -49,6 +50,7 @@ function TransactionsLockingBodyJsx({ transactionLockingType === 'partial' ? ( { - safeInvoke(onLock, module, isEnabled, event); + safeInvoke(onLock, module, event); }; const handleEditBtn = (event) => { - safeInvoke(onEditLock, module, event); + safeInvoke(onEditLock, module, isEnabled, event); }; const handleUnlockPartial = (event) => { safeInvoke(onUnlockPartial, module, event); @@ -401,7 +401,7 @@ export const TransLockingReason = styled.div` `; const TransUnlockWrap = styled.div` - padding-top: 10px; + padding-top: 10px; border-top: 1px solid #ddd; margin-top: 10px;