From 99df627633e343c6cd1c6e7ff470c0c44dd85898 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Sun, 26 Dec 2021 20:56:25 +0200 Subject: [PATCH] feat: empty status in credit & vednor. --- .../CreditNotes/CreditNoteForm/VendorCreditNoteForm.js | 6 ++---- .../CreditNoteForm/VendorCreditNoteFormProvider.js | 10 ++++++++-- .../CreditNotesLanding/VendorsCreditNoteEmptyStatus.js | 6 +++--- .../CreditNotesLanding/CreditNotesEmptyStatus.js | 4 ++-- src/lang/ar/index.json | 9 ++++++--- src/lang/en/index.json | 3 ++- 6 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteForm.js b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteForm.js index 357c874d8..010256b63 100644 --- a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteForm.js +++ b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteForm.js @@ -50,7 +50,7 @@ function VendorCreditNoteForm({ isNewMode, submitPayload, vendorCredit, - bill, + newVendorCredit, createVendorCreditMutate, editVendorCreditMutate, } = useVendorCreditNoteFormContext(); @@ -73,9 +73,7 @@ function VendorCreditNoteForm({ ...(vendorcreditAutoIncrement && { vendor_credit_number: vendorCreditNumber, }), - ...transformToEditForm({ - ...pick(bill, ['vendor_id', 'entries']), - }), + ...newVendorCredit, }), }), [vendorCredit, base_currency], diff --git a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormProvider.js b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormProvider.js index 4c914a532..7f4e0e8b5 100644 --- a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormProvider.js +++ b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormProvider.js @@ -20,7 +20,7 @@ const VendorCreditNoteFormContext = React.createContext(); */ function VendorCreditNoteFormProvider({ vendorCreditId, ...props }) { const { state } = useLocation(); - + const billId = state?.billId; // Handle fetching the items table based on the given query. @@ -61,6 +61,12 @@ function VendorCreditNoteFormProvider({ vendorCreditId, ...props }) { // Determines whether the form in new mode. const isNewMode = !vendorCreditId; + const newVendorCredit = !isEmpty(bill) + ? transformToEditForm({ + ...pick(bill, ['vendor_id', 'entries']), + }) + : []; + // Provider payload. const provider = { items, @@ -68,7 +74,7 @@ function VendorCreditNoteFormProvider({ vendorCreditId, ...props }) { vendorCredit, submitPayload, isNewMode, - bill, + newVendorCredit, isVendorCreditLoading, diff --git a/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNoteEmptyStatus.js b/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNoteEmptyStatus.js index a86fd6738..44abfe314 100644 --- a/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNoteEmptyStatus.js +++ b/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNoteEmptyStatus.js @@ -12,10 +12,10 @@ export default function VendorsCreditNoteEmptyStatus() { const history = useHistory(); return ( } + title={} description={

- +

} action={ @@ -26,7 +26,7 @@ export default function VendorsCreditNoteEmptyStatus() { large={true} onClick={() => history.push('/vendor-credits/new')} > - +