From a9c2a5c5f0b63b52e8d0072bd8eb601b32d28f0a Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Mon, 28 Mar 2022 21:38:56 +0200 Subject: [PATCH 1/8] BIG-354: warehouse transfer validate. --- .../WarehouseTransferForm.js | 20 +++++++++++++++---- src/lang/ar/index.json | 4 +++- src/lang/en/index.json | 16 +++------------ 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js index c61ce2b92..7a9f77a34 100644 --- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js +++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js @@ -1,7 +1,7 @@ import React from 'react'; import intl from 'react-intl-universal'; import { Formik, Form } from 'formik'; -import { isEmpty } from 'lodash'; +import { isEmpty, sumBy } from 'lodash'; import { Intent } from '@blueprintjs/core'; import { useHistory } from 'react-router-dom'; import { CLASSES } from 'common/classes'; @@ -20,7 +20,7 @@ import WarehouseTransferFormDialog from './WarehouseTransferFormDialog'; import withDashboardActions from 'containers/Dashboard/withDashboardActions'; import withSettings from 'containers/Settings/withSettings'; -import { AppToaster, } from 'components'; +import { AppToaster } from 'components'; import { useWarehouseTransferFormContext } from './WarehouseTransferFormProvider'; import { compose, orderingLinesIndexes, transactionNumber } from 'utils'; import { WarehouseTransferObserveItemsCost } from './components'; @@ -72,6 +72,18 @@ 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), @@ -119,7 +131,7 @@ function WarehouseTransferForm({ .catch(onError); } }; - + return (
- +
diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json index 48edb6793..cf6eb0632 100644 --- a/src/lang/ar/index.json +++ b/src/lang/ar/index.json @@ -2005,5 +2005,7 @@ "receipt.warehouse_button.label": "المخزن: {label}", "warehouse_transfer.empty_status.title": "إدارة عمليات النقل بين المستودعات", "warehouse_transfer.empty_status.description": "غالبًا ماتحتاج الاعمال ذات مستودعات متعددة لطلبات نقل البضائع من مستودع إلى آخر عندما تكون في حاجة ماسة إلى البائعين.", - "item.error.you_could_not_delete_item_has_associated": "لا يمكنك حذف العنصر لديه معاملات مرتبطة به " + "item.error.you_could_not_delete_item_has_associated": "لا يمكنك حذف العنصر لديه معاملات مرتبطة به ", + "warehouse_transfer.quantity_cannot_be_zero_or_empty": "لا يمكن أن تكون الكمية صفراً أو فارغة." + } \ No newline at end of file diff --git a/src/lang/en/index.json b/src/lang/en/index.json index a14106e11..5911e4753 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -1440,7 +1440,7 @@ "AP_aging_summary.filter_options.label": "Filter vendors", "item.error.type_cannot_change_with_item_has_transactions": "Cannot change item type to inventory with item has associated transactions.", "item.error.cannot_change_inventory_account": "Cannot change item inventory account while the item has transactions.", - "item.error.you_could_not_delete_item_has_associated":"You could not delete item that has associated transactions", + "item.error.you_could_not_delete_item_has_associated": "You could not delete item that has associated transactions", "customer.link.customer_details": "Customer details ({amount})", "bad_debt.dialog.written_off_amount": "Written-off amount", "bad_debt.dialog.bad_debt": "Bad debt", @@ -1776,13 +1776,10 @@ "profit_loss_sheet.percentage_of_row": "% of Row", "profit_loss_sheet.percentage_of_expense": "% of Expense", "profit_loss_sheet.percentage_of_income": "% of Income", - "report.balance_sheet_comparison.title": "Balance Sheet Comparison", "report.balance_sheet_comparison.desc": "Reports a company's assets, liabilities and shareholders' equity compared to previous year.", - "report.profit_loss_sheet_comparison.title": "Profit/Loss Comparison", "report.profit_loss_sheet_comparison.desc": "Reports the revenues, costs and expenses incurred at a specific point and compared to previous year.", - "the_vendor_has_been_inactivated_successfully": "The contact has been inactivated successfully.", "vendor.alert.activated_message": "The vendor has been activated successfully.", "vendor.alert.are_you_sure_want_to_inactivate_this_vendor": "Are you sure want to inactivate this vendor? You will to able to activate it later.", @@ -1794,7 +1791,6 @@ "customer.alert.are_you_sure_want_to_inactivate_this_customer": "Are you sure want to inactivate this customer? You will to able to activate it later.", "credit_note_preview.dialog.title": "Credit Note PDF Preview", "payment_receive_preview.dialog.title": "Payment Receive PDF Preview", - "warehouses.label": "Warehouses", "warehouses.label.new_warehouse": "New Warehouse", "warehouse.dialog.label.new_warehouse": "New Warehouse", @@ -1965,19 +1961,14 @@ "receipt_form.label.payment_amount": "Payment amount", "receipt_form.label.receipt_message": "Receipt Message", "receipt_form.receipt_message.placeholder": "This message will be displayed on the receipt.", - "receipt_form.label.terms_conditions": "Terms & Conditions", "receipt_form.terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed on the receipt.", - "payment_receive_form.label.note": "Note", "payment_receive_form.internal_note.placeholder": "Internal notes (Not visible to the customer).", - "payment_receive_form.message.label": "Payment Message", "payment_receive_form.message.placeholder": "This message will be displayed on the payment receipt.", - "payment_receive_form.label.subtotal": "Subtotal", "payment_receive_form.label.total": "TOTAL", - "bill_form.label.note": "Note", "bill_form.label.note.placeholder": "Internal note (Not visible to the vendor).", "bill_form.label.subtotal": "Subtotal", @@ -2012,10 +2003,9 @@ "estimate.warehouse_button.label": "Warehouse: {label}", "receipt.branch_button.label": "Branch: {label}", "receipt.warehouse_button.label": "Warehouse: {label}", - "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.form.reason.placeholder": "Enter the reason behind the transfer order.", + "warehouse_transfer.quantity_cannot_be_zero_or_empty": "Quantity cannot be zero or empty." } \ No newline at end of file From 3f4ffdc99569b372554e4d1207181e78a50328f2 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Wed, 30 Mar 2022 15:04:55 +0200 Subject: [PATCH 2/8] BIG-237: Validate invoice due date. --- .../Sales/Invoices/InvoiceForm/InvoiceForm.schema.js | 11 ++++++++++- src/lang/ar/index.json | 6 ++++-- src/lang/en/index.json | 4 +++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.schema.js b/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.schema.js index eaedac85f..9d68c079a 100644 --- a/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.schema.js +++ b/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.schema.js @@ -1,4 +1,5 @@ import * as Yup from 'yup'; +import moment from 'moment'; import intl from 'react-intl-universal'; import { DATATYPES_LENGTH } from 'common/dataTypes'; import { isBlank } from 'utils'; @@ -7,7 +8,15 @@ const getSchema = () => Yup.object().shape({ customer_id: Yup.string().label(intl.get('customer_name_')).required(), invoice_date: Yup.date().required().label(intl.get('invoice_date_')), - due_date: Yup.date().required().label(intl.get('due_date_')), + due_date: Yup.date() + .min(Yup.ref('invoice_date'), ({ path, min }) => + intl.get('invoice.validation.due_date', { + path, + min: moment(min).format('YYYY/MM/DD'), + }), + ) + .required() + .label(intl.get('due_date_')), invoice_no: Yup.string() .max(DATATYPES_LENGTH.STRING) .label(intl.get('invoice_no_')), diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json index cf6eb0632..b732b125b 100644 --- a/src/lang/ar/index.json +++ b/src/lang/ar/index.json @@ -1361,6 +1361,7 @@ "item.field.sell_account.hint": "أدخل السعر الذي ستبيعه لهذا العنصر.", "item_entries.products_services.hint": "أدخل المنتجات أو الخدمات التي تبيعها أو تشتريها لتتبع ما قمت ببيعه أو شرائه.", "item_entries.landed.hint": "يتيح لك هذه الخيار إمكانية إضافة تكلفة اضافية علي فاتورة الشراء متال علي ذلك تكاليف الشحن ، ثم تحديد هذه التكلفة لتحميلها علي فاتورة الشراء.", + "item_entries.remove_row": "حذف الصف", "invoice.auto_increment.auto": "يتم تعيين أرقام الفواتير على وضع الزيادة التلقائي. هل أنت متأكد من تغيير هذا الإعداد؟", "invoice.auto_increment.manually": "يتم تعيين أرقام فواتيرك يدوياً. هل أنت متأكد من تغيير هذه الإعدادات؟", "manual_journals.auto_increment.auto": "يتم تعيين أرقام القيود على وضع الزيادة التلقائي. هل أنت متأكد من تغيير هذا الإعداد؟", @@ -1847,6 +1848,7 @@ "warehouse_transfer.column.transfer_quantity": "الكمية ", "warehouse_transfer.column.source_warehouse": "المصدر", "warehouse_transfer.column.destination_warehouse": "الوجهة", + "warehouse_transfer.column.cost_price": "سعر التكلفة", "warehouse_transfer.auto_increment.auto": "يتم تعيين أرقام النقل على وضع الزيادة التلقائي. هل أنت متأكد من تغيير هذا الإعداد؟", "warehouse_transfer.auto_increment.manually": "يتم تعيين أرقام النقل يدوياً. هل أنت متأكد من تغيير هذه الإعدادات؟", "warehouse_transfer.setting_your_auto_generated_transfer_no": "تعيين رقم النقل الذي تم إنشاؤه تلقائيًا", @@ -2006,6 +2008,6 @@ "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": "لا يمكن أن تكون الكمية صفراً أو فارغة." - + "warehouse_transfer.quantity_cannot_be_zero_or_empty": "لا يمكن أن تكون الكمية صفراً أو فارغة.", + "invoice.validation.due_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}" } \ No newline at end of file diff --git a/src/lang/en/index.json b/src/lang/en/index.json index 5911e4753..9d46f4090 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -1338,6 +1338,7 @@ "item.field.sell_account.hint": "Enter price which you goint to sell this item.", "item_entries.products_services.hint": "Enter products or services you sell or buy to keep tracking what your sold or purchased.", "item_entries.landed.hint": "This options allows you to be able to add additional cost eg. freight then allocate cost to the items in your bills.", + "item_entries.remove_row": "Remove line", "invoice.auto_increment.auto": "Your invoice numbers are set on auto-increment mode. Are you sure changing this setting?", "invoice.auto_increment.manually": "Your invoice numbers are set on manual mode. Are you sure chaning this settings?", "manual_journals.auto_increment.auto": "Your Jouranl numbers are set on auto-increment mode. Are you sure changing this setting?", @@ -2007,5 +2008,6 @@ "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.quantity_cannot_be_zero_or_empty": "Quantity cannot be zero or empty.", + "invoice.validation.due_date": "{path} field must be later than {min}" } \ No newline at end of file From 373a695c4cf1af71bb4676a4adef525ac8cdcfc3 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Wed, 30 Mar 2022 15:06:58 +0200 Subject: [PATCH 3/8] BIG-236: Validate estimate expiration date. --- .../Estimates/EstimateForm/EstimateForm.schema.js | 15 +++++++++------ src/lang/ar/index.json | 3 ++- src/lang/en/index.json | 3 ++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/containers/Sales/Estimates/EstimateForm/EstimateForm.schema.js b/src/containers/Sales/Estimates/EstimateForm/EstimateForm.schema.js index 46bd23f5f..78cc4139d 100644 --- a/src/containers/Sales/Estimates/EstimateForm/EstimateForm.schema.js +++ b/src/containers/Sales/Estimates/EstimateForm/EstimateForm.schema.js @@ -2,16 +2,19 @@ import * as Yup from 'yup'; import intl from 'react-intl-universal'; import { DATATYPES_LENGTH } from 'common/dataTypes'; import { isBlank } from 'utils'; +import moment from 'moment'; const Schema = Yup.object().shape({ - customer_id: Yup.number() - .label(intl.get('customer_name_')) - .required(), - estimate_date: Yup.date() - .required() - .label(intl.get('estimate_date_')), + customer_id: Yup.number().label(intl.get('customer_name_')).required(), + estimate_date: Yup.date().required().label(intl.get('estimate_date_')), expiration_date: Yup.date() .required() + .min(Yup.ref('estimate_date'), ({ path, min }) => + intl.get('estimate.validation.expiration_date', { + path, + min: moment(min).format('YYYY/MM/DD'), + }), + ) .label(intl.get('expiration_date_')), estimate_number: Yup.string() .max(DATATYPES_LENGTH.STRING) diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json index b732b125b..944d6ea7a 100644 --- a/src/lang/ar/index.json +++ b/src/lang/ar/index.json @@ -2009,5 +2009,6 @@ "warehouse_transfer.empty_status.description": "غالبًا ماتحتاج الاعمال ذات مستودعات متعددة لطلبات نقل البضائع من مستودع إلى آخر عندما تكون في حاجة ماسة إلى البائعين.", "item.error.you_could_not_delete_item_has_associated": "لا يمكنك حذف العنصر لديه معاملات مرتبطة به ", "warehouse_transfer.quantity_cannot_be_zero_or_empty": "لا يمكن أن تكون الكمية صفراً أو فارغة.", - "invoice.validation.due_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}" + "invoice.validation.due_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}", + "estimate.validation.expiration_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}" } \ No newline at end of file diff --git a/src/lang/en/index.json b/src/lang/en/index.json index 9d46f4090..2a4d0b094 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -2009,5 +2009,6 @@ "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.", - "invoice.validation.due_date": "{path} field must be later than {min}" + "invoice.validation.due_date": "{path} field must be later than {min}", + "estimate.validation.expiration_date": "{path} field must be later than {min}" } \ No newline at end of file From ce674466fedf8f2f9fa46012ae282963b46cbf62 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Wed, 30 Mar 2022 15:09:11 +0200 Subject: [PATCH 4/8] BIG-238: Validate bill due date. --- .../Purchases/Bills/BillForm/BillForm.schema.js | 17 ++++++++++------- src/lang/ar/index.json | 3 ++- src/lang/en/index.json | 3 ++- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/containers/Purchases/Bills/BillForm/BillForm.schema.js b/src/containers/Purchases/Bills/BillForm/BillForm.schema.js index 6f77262b2..258ad5be4 100644 --- a/src/containers/Purchases/Bills/BillForm/BillForm.schema.js +++ b/src/containers/Purchases/Bills/BillForm/BillForm.schema.js @@ -1,16 +1,19 @@ import * as Yup from 'yup'; +import moment from 'moment'; import intl from 'react-intl-universal'; import { DATATYPES_LENGTH } from 'common/dataTypes'; import { isBlank } from 'utils'; const BillFormSchema = Yup.object().shape({ - vendor_id: Yup.number() - .required() - .label(intl.get('vendor_name_')), - bill_date: Yup.date() - .required() - .label(intl.get('bill_date_')), + vendor_id: Yup.number().required().label(intl.get('vendor_name_')), + bill_date: Yup.date().required().label(intl.get('bill_date_')), due_date: Yup.date() + .min(Yup.ref('bill_date'), ({ path, min }) => + intl.get('bill.validation.due_date', { + path, + min: moment(min).format('YYYY/MM/DD'), + }), + ) .required() .label(intl.get('due_date_')), bill_number: Yup.string() @@ -25,7 +28,7 @@ const BillFormSchema = Yup.object().shape({ open: Yup.boolean(), branch_id: Yup.string(), warehouse_id: Yup.string(), - exchange_rate:Yup.number(), + exchange_rate: Yup.number(), entries: Yup.array().of( Yup.object().shape({ quantity: Yup.number() diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json index 944d6ea7a..ca3cb74aa 100644 --- a/src/lang/ar/index.json +++ b/src/lang/ar/index.json @@ -2010,5 +2010,6 @@ "item.error.you_could_not_delete_item_has_associated": "لا يمكنك حذف العنصر لديه معاملات مرتبطة به ", "warehouse_transfer.quantity_cannot_be_zero_or_empty": "لا يمكن أن تكون الكمية صفراً أو فارغة.", "invoice.validation.due_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}", - "estimate.validation.expiration_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}" + "estimate.validation.expiration_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}", + "bill.validation.due_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}" } \ No newline at end of file diff --git a/src/lang/en/index.json b/src/lang/en/index.json index 2a4d0b094..7c10a8e5b 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -2010,5 +2010,6 @@ "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.", "invoice.validation.due_date": "{path} field must be later than {min}", - "estimate.validation.expiration_date": "{path} field must be later than {min}" + "estimate.validation.expiration_date": "{path} field must be later than {min}", + "bill.validation.due_date": "{path} field must be later than {min}" } \ No newline at end of file From 30b17d697f55fb236ef3f058162e17214a417e24 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Wed, 30 Mar 2022 16:28:42 +0200 Subject: [PATCH 5/8] BIG-355: remove expandable in item categories. --- src/containers/ItemsCategories/ItemCategoriesTable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/ItemsCategories/ItemCategoriesTable.js b/src/containers/ItemsCategories/ItemCategoriesTable.js index 5f2436e91..654500e24 100644 --- a/src/containers/ItemsCategories/ItemCategoriesTable.js +++ b/src/containers/ItemsCategories/ItemCategoriesTable.js @@ -50,7 +50,7 @@ function ItemsCategoryTable({ loading={isCategoriesLoading} headerLoading={isCategoriesLoading} progressBarLoading={isCategoriesFetching} - expandable={true} + // expandable={false} sticky={true} selectionColumn={true} TableLoadingRenderer={TableSkeletonRows} From 9bd13b0d4691e5967d64277cf3077c5c92ae1580 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Wed, 30 Mar 2022 16:31:34 +0200 Subject: [PATCH 6/8] BIG-355: remove expandable in item categories. --- src/containers/ItemsCategories/ItemCategoriesTable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/ItemsCategories/ItemCategoriesTable.js b/src/containers/ItemsCategories/ItemCategoriesTable.js index 654500e24..305865f45 100644 --- a/src/containers/ItemsCategories/ItemCategoriesTable.js +++ b/src/containers/ItemsCategories/ItemCategoriesTable.js @@ -50,7 +50,7 @@ function ItemsCategoryTable({ loading={isCategoriesLoading} headerLoading={isCategoriesLoading} progressBarLoading={isCategoriesFetching} - // expandable={false} + expandable={false} sticky={true} selectionColumn={true} TableLoadingRenderer={TableSkeletonRows} From 86c6de361bf3899edfea696fa010bbecb14746b3 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Wed, 30 Mar 2022 16:34:51 +0200 Subject: [PATCH 7/8] BIG-356: add localize remove line entries. --- src/containers/Accounting/MakeJournal/components.js | 12 ++++++++++-- src/containers/Entries/components.js | 2 +- src/containers/Expenses/ExpenseForm/components.js | 7 +++++-- src/containers/WarehouseTransfers/utils.js | 5 ++++- src/lang/ar/index.json | 5 ++++- src/lang/en/index.json | 5 ++++- 6 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/containers/Accounting/MakeJournal/components.js b/src/containers/Accounting/MakeJournal/components.js index cec39f28c..260adddd4 100644 --- a/src/containers/Accounting/MakeJournal/components.js +++ b/src/containers/Accounting/MakeJournal/components.js @@ -4,7 +4,12 @@ import { Popover2 } from '@blueprintjs/popover2'; import { useFormikContext } from 'formik'; import intl from 'react-intl-universal'; -import { ExchangeRateInputGroup, Icon, Hint, FormattedMessage as T } from 'components'; +import { + ExchangeRateInputGroup, + Icon, + Hint, + FormattedMessage as T, +} from 'components'; import { AccountsListFieldCell, MoneyFieldCell, @@ -63,7 +68,10 @@ export const ActionsCellRenderer = ({ }; const exampleMenu = ( - + ); return ( diff --git a/src/containers/Entries/components.js b/src/containers/Entries/components.js index bb0bc53a2..d7877cd1b 100644 --- a/src/containers/Entries/components.js +++ b/src/containers/Entries/components.js @@ -43,7 +43,7 @@ export function ActionsCellRenderer({ const exampleMenu = ( - + ); diff --git a/src/containers/Expenses/ExpenseForm/components.js b/src/containers/Expenses/ExpenseForm/components.js index 417d81506..c0426d9a3 100644 --- a/src/containers/Expenses/ExpenseForm/components.js +++ b/src/containers/Expenses/ExpenseForm/components.js @@ -48,7 +48,10 @@ const ActionsCellRenderer = ({ }; const exampleMenu = ( - + ); return ( @@ -163,4 +166,4 @@ export function ExpensesExchangeRateInputField({ ...props }) { /> ); } -ExpensesExchangeRateInputField.cellType = CellType.Field; \ No newline at end of file +ExpensesExchangeRateInputField.cellType = CellType.Field; diff --git a/src/containers/WarehouseTransfers/utils.js b/src/containers/WarehouseTransfers/utils.js index cc118fdd7..638a55a22 100644 --- a/src/containers/WarehouseTransfers/utils.js +++ b/src/containers/WarehouseTransfers/utils.js @@ -21,7 +21,10 @@ export function ActionsCellRenderer({ const exampleMenu = ( - + ); diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json index 944d6ea7a..9d09a3bff 100644 --- a/src/lang/ar/index.json +++ b/src/lang/ar/index.json @@ -2010,5 +2010,8 @@ "item.error.you_could_not_delete_item_has_associated": "لا يمكنك حذف العنصر لديه معاملات مرتبطة به ", "warehouse_transfer.quantity_cannot_be_zero_or_empty": "لا يمكن أن تكون الكمية صفراً أو فارغة.", "invoice.validation.due_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}", - "estimate.validation.expiration_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}" + "estimate.validation.expiration_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}", + "make_journal.entries.remove_row": "حذف الصف", + "expense.entries.remove_row": "حذف الصف", + "warehouse_transfer.entries.remove_row": "حذف الصف" } \ No newline at end of file diff --git a/src/lang/en/index.json b/src/lang/en/index.json index 2a4d0b094..dbd9b1e32 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -2010,5 +2010,8 @@ "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.", "invoice.validation.due_date": "{path} field must be later than {min}", - "estimate.validation.expiration_date": "{path} field must be later than {min}" + "estimate.validation.expiration_date": "{path} field must be later than {min}", + "make_journal.entries.remove_row": "Remove line", + "expense.entries.remove_row": "Remove line", + "warehouse_transfer.entries.remove_row": "Remove line" } \ No newline at end of file From 2db32b8ee85769da6d92a92fe58e8b39f307c646 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Wed, 30 Mar 2022 17:17:23 +0200 Subject: [PATCH 8/8] BIG-141: add inactive status to item details. --- .../ItemDetailDrawerProvider.js | 6 ++++- .../Drawers/ItemDetailDrawer/utlis.js | 27 +++++++++++++++++++ src/lang/ar/index.json | 3 ++- src/lang/en/index.json | 3 ++- 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 src/containers/Drawers/ItemDetailDrawer/utlis.js diff --git a/src/containers/Drawers/ItemDetailDrawer/ItemDetailDrawerProvider.js b/src/containers/Drawers/ItemDetailDrawer/ItemDetailDrawerProvider.js index c748e559b..fa811cf1d 100644 --- a/src/containers/Drawers/ItemDetailDrawer/ItemDetailDrawerProvider.js +++ b/src/containers/Drawers/ItemDetailDrawer/ItemDetailDrawerProvider.js @@ -1,6 +1,7 @@ import React from 'react'; import { DrawerHeaderContent, DrawerLoading } from 'components'; import { useItem } from 'hooks/query'; +import { inactiveStatus } from './utlis'; const ItemDetailDrawerContext = React.createContext(); @@ -27,7 +28,10 @@ function ItemDetailDrawerProvider({ itemId, ...props }) { return ( - + ); diff --git a/src/containers/Drawers/ItemDetailDrawer/utlis.js b/src/containers/Drawers/ItemDetailDrawer/utlis.js new file mode 100644 index 000000000..72b46fe3d --- /dev/null +++ b/src/containers/Drawers/ItemDetailDrawer/utlis.js @@ -0,0 +1,27 @@ +import React from 'react'; +import styled from 'styled-components'; +import { Intent, Tag } from '@blueprintjs/core'; +import { Choose, FormattedMessage as T } from '../../../components'; + +/** + * items inactive status. + * @returns {React.JSX} + */ +export function inactiveStatus(item) { + return ( + + + {item.name} + + + + + {item.name} + + ); +} + +const StatusTag = styled(Tag)` + font-size: 11px; + margin-left: 10px; +`; diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json index 9d09a3bff..2e870609f 100644 --- a/src/lang/ar/index.json +++ b/src/lang/ar/index.json @@ -2013,5 +2013,6 @@ "estimate.validation.expiration_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}", "make_journal.entries.remove_row": "حذف الصف", "expense.entries.remove_row": "حذف الصف", - "warehouse_transfer.entries.remove_row": "حذف الصف" + "warehouse_transfer.entries.remove_row": "حذف الصف", + "item.details.inactive": "غير نشط" } \ No newline at end of file diff --git a/src/lang/en/index.json b/src/lang/en/index.json index dbd9b1e32..664036468 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -2013,5 +2013,6 @@ "estimate.validation.expiration_date": "{path} field must be later than {min}", "make_journal.entries.remove_row": "Remove line", "expense.entries.remove_row": "Remove line", - "warehouse_transfer.entries.remove_row": "Remove line" + "warehouse_transfer.entries.remove_row": "Remove line", + "item.details.inactive": "Inactive" } \ No newline at end of file