Merge branch 'feature/react-query' of https://github.com/abouolia/Bigcapital into feature/react-query

client/src/containers/Items/ItemForm.js

@@ -94,8 +94,10 @@ function ItemForm({
   );
 
   // Transform API errors.
-  const transformApiErrors = (errors) => {
+  const transformApiErrors = (error) => {
+    const { response: { data: { errors } } } = error;
     const fields = {};
+
     if (errors.find((e) => e.type === 'ITEM.NAME.ALREADY.EXISTS')) {
       fields.name = formatMessage({ id: 'the_name_used_before' });
     }

client/src/containers/Items/ItemFormBody.js

@@ -1,6 +1,12 @@
 import React from 'react';
 import { FastField, Field, ErrorMessage } from 'formik';
-import { FormGroup, Classes, Checkbox, ControlGroup } from '@blueprintjs/core';
+import {
+  FormGroup,
+  Classes,
+  TextArea,
+  Checkbox,
+  ControlGroup,
+} from '@blueprintjs/core';
 import {
   AccountsSelectList,
   MoneyInputGroup,
@@ -100,6 +106,25 @@ function ItemFormBody({ baseCurrency }) {
               </FormGroup>
             )}
           </FastField>
+
+          <FastField name={'sell_description'}>
+            {({ form: { values }, field, meta: { error, touched } }) => (
+              <FormGroup
+                label={<T id={'description'} />}
+                className={'form-group--sell-description'}
+                intent={inputIntent({ error, touched })}
+                helperText={<ErrorMessage name={'description'} />}
+                inline={true}
+              >
+                <TextArea
+                  growVertically={true}
+                  height={280}
+                  {...field}
+                  disabled={!values.sellable}
+                />
+              </FormGroup>
+            )}
+          </FastField>
         </Col>
 
         <Col xs={6}>
@@ -174,6 +199,25 @@ function ItemFormBody({ baseCurrency }) {
               </FormGroup>
             )}
           </FastField>
+
+          <FastField name={'purchase_description'}>
+            {({ form: { values }, field, meta: { error, touched } }) => (
+              <FormGroup
+                label={<T id={'description'} />}
+                className={'form-group--purchase-description'}
+                intent={inputIntent({ error, touched })}
+                helperText={<ErrorMessage name={'description'} />}
+                inline={true}
+              >
+                <TextArea
+                  growVertically={true}
+                  height={280}
+                  {...field}
+                  disabled={!values.purchasable}
+                />
+              </FormGroup>
+            )}
+          </FastField>
         </Col>
       </Row>
     </div>