From 46d895bef9d608f0299292a2f311b218332f9a2e Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Thu, 31 Mar 2022 14:50:40 +0200 Subject: [PATCH 1/2] BIG-354: Validate the warehouse transfer. --- .../WarehouseTransferForm/WarehouseTransferForm.js | 13 ------------- .../WarehouseTransferForm.schema.js | 2 +- .../WarehouseTransferFormEntriesTable.js | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js index 7a9f77a34..07bcb913e 100644 --- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js +++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js @@ -71,19 +71,6 @@ function WarehouseTransferForm({ // Handles form submit. const handleSubmit = (values, { setSubmitting, setErrors, resetForm }) => { - setSubmitting(true); - const totalQuantity = sumBy(values.entries, 'quantity'); - - if (totalQuantity <= 0) { - AppToaster.show({ - message: intl.get( - 'warehouse_transfer.quantity_cannot_be_zero_or_empty', - ), - intent: Intent.DANGER, - }); - return; - } - // Transformes the values of the form to request. const form = { ...transformValueToRequest(values), diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.schema.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.schema.js index 026bc5e20..3fab6b29a 100644 --- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.schema.js +++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.schema.js @@ -20,7 +20,7 @@ const Schema = Yup.object().shape({ Yup.object().shape({ item_id: Yup.number().nullable(), description: Yup.string().nullable().max(DATATYPES_LENGTH.TEXT), - quantity: Yup.number().nullable().max(DATATYPES_LENGTH.INT_10), + quantity: Yup.number().min(1).max(DATATYPES_LENGTH.INT_10), }), ), }); diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormEntriesTable.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormEntriesTable.js index b4336cb13..09e8f5990 100644 --- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormEntriesTable.js +++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormEntriesTable.js @@ -45,7 +45,7 @@ export default function WarehouseTransferFormEntriesTable({ item_id: newRowMeta.itemId, warehouses: newRowMeta.warehouses, description: '', - quantity: 0, + quantity: '', }; const newRows = mutateTableRow(newRowMeta.rowIndex, newRow, entries); From 6daa9f09a5ee88815bbaa4a6325cd38caa9fcf46 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Thu, 31 Mar 2022 14:58:36 +0200 Subject: [PATCH 2/2] BIG-354: fix validate the warehouse transfer. --- .../WarehouseTransferForm/WarehouseTransferForm.js | 1 + src/lang/ar/index.json | 4 +--- src/lang/en/index.json | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js index 07bcb913e..1359c6132 100644 --- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js +++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js @@ -71,6 +71,7 @@ function WarehouseTransferForm({ // Handles form submit. const handleSubmit = (values, { setSubmitting, setErrors, resetForm }) => { + setSubmitting(true); // Transformes the values of the form to request. const form = { ...transformValueToRequest(values), diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json index cf6eb0632..48edb6793 100644 --- a/src/lang/ar/index.json +++ b/src/lang/ar/index.json @@ -2005,7 +2005,5 @@ "receipt.warehouse_button.label": "المخزن: {label}", "warehouse_transfer.empty_status.title": "إدارة عمليات النقل بين المستودعات", "warehouse_transfer.empty_status.description": "غالبًا ماتحتاج الاعمال ذات مستودعات متعددة لطلبات نقل البضائع من مستودع إلى آخر عندما تكون في حاجة ماسة إلى البائعين.", - "item.error.you_could_not_delete_item_has_associated": "لا يمكنك حذف العنصر لديه معاملات مرتبطة به ", - "warehouse_transfer.quantity_cannot_be_zero_or_empty": "لا يمكن أن تكون الكمية صفراً أو فارغة." - + "item.error.you_could_not_delete_item_has_associated": "لا يمكنك حذف العنصر لديه معاملات مرتبطة به " } \ No newline at end of file diff --git a/src/lang/en/index.json b/src/lang/en/index.json index 5911e4753..2224f1074 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -2006,6 +2006,5 @@ "warehouse_transfer.empty_status.title": "Manage transfer orders between warehouses.", "warehouse_transfer.empty_status.description": "Business with multiply warehouses often transfers items from on warehouse to another when they are in immediate need of vendors.", "warehouse_transfer.form.reason.label": "Reason", - "warehouse_transfer.form.reason.placeholder": "Enter the reason behind the transfer order.", - "warehouse_transfer.quantity_cannot_be_zero_or_empty": "Quantity cannot be zero or empty." + "warehouse_transfer.form.reason.placeholder": "Enter the reason behind the transfer order." } \ No newline at end of file