From 2721f001dafaf83615ca178b9567bc6a407e2dd2 Mon Sep 17 00:00:00 2001 From: elforjani3 Date: Sun, 20 Dec 2020 16:38:44 +0200 Subject: [PATCH] fix: invoice deliver --- client/src/containers/Sales/Invoice/InvoiceForm.js | 2 +- client/src/containers/Sales/Invoice/InvoiceForm.schema.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/containers/Sales/Invoice/InvoiceForm.js b/client/src/containers/Sales/Invoice/InvoiceForm.js index aef1cf6f4..fa8bf7a0e 100644 --- a/client/src/containers/Sales/Invoice/InvoiceForm.js +++ b/client/src/containers/Sales/Invoice/InvoiceForm.js @@ -44,7 +44,7 @@ const defaultInvoice = { index: 0, item_id: '', rate: '', - discount: '', + discount: 0, quantity: 1, description: '', }; diff --git a/client/src/containers/Sales/Invoice/InvoiceForm.schema.js b/client/src/containers/Sales/Invoice/InvoiceForm.schema.js index e57da8896..9f16449ff 100644 --- a/client/src/containers/Sales/Invoice/InvoiceForm.schema.js +++ b/client/src/containers/Sales/Invoice/InvoiceForm.schema.js @@ -17,7 +17,7 @@ const Schema = Yup.object().shape({ .max(DATATYPES_LENGTH.STRING) .label(formatMessage({ id: 'invoice_no_' })), reference_no: Yup.string().min(1).max(DATATYPES_LENGTH.STRING), - delivered: Yup.boolean().required(), + delivered: Yup.boolean(), invoice_message: Yup.string() .trim() .min(1) @@ -43,7 +43,7 @@ const Schema = Yup.object().shape({ is: (quantity, rate) => !isBlank(quantity) && !isBlank(rate), then: Yup.number().required(), }), - discount: Yup.number().nullable().min(0).max(DATATYPES_LENGTH.INT_10), + discount: Yup.number().nullable().min(0).max(100), description: Yup.string().nullable().max(DATATYPES_LENGTH.TEXT), }), ),