feat: styling item form.

client/src/common/classes.js

@@ -11,6 +11,7 @@ const CLASSES = {
   PAGE_FORM_HEADER_FIELDS: 'page-form__header-fields',
   PAGE_FORM_HEADER_BIG_NUMBERS: 'page-form__big-numbers',
   PAGE_FORM_TABS: 'page-form__tabs',
+  PAGE_FORM_BODY: 'page-form__body',
   
   PAGE_FORM_FOOTER: 'page-form__footer',
   PAGE_FORM_FLOATING_ACTIONS: 'page-form__floating-actions',
@@ -22,6 +23,7 @@ const CLASSES = {
   PAGE_FORM_PAYMENT_MADE: 'page-form--payment-made',
   PAGE_FORM_PAYMENT_RECEIVE: 'page-form--payment-receive',
   PAGE_FORM_CUSTOMER: 'page-form--customer',
+  PAGE_FORM_ITEM: 'page-form--item',
 
   FORM_GROUP_LIST_SELECT: 'form-group--select-list',
 

client/src/containers/Items/ItemForm.js

@@ -1,69 +1,55 @@
-import React, { useState, useMemo, useCallback, useEffect } from 'react';
+import React, { useMemo, useCallback, useEffect } from 'react';
 import * as Yup from 'yup';
-import { useFormik, Formik } from 'formik';
+import { useFormik } from 'formik';
 import {
-  FormGroup,
+  Intent
-  MenuItem,
-  Intent,
-  InputGroup,
-  HTMLSelect,
-  Button,
-  Classes,
-  Checkbox,
 } from '@blueprintjs/core';
-import { Row, Col } from 'react-grid-system';
-import { FormattedMessage as T, useIntl } from 'react-intl';
 import { queryCache } from 'react-query';
 import { useHistory } from 'react-router-dom';
 import { pick } from 'lodash';
+import { useIntl } from 'react-intl';
 import classNames from 'classnames';
 
+import { CLASSES } from 'common/classes';
 import AppToaster from 'components/AppToaster';
-import ErrorMessage from 'components/ErrorMessage';
+import ItemFormPrimarySection from './ItemFormPrimarySection';
-import Icon from 'components/Icon';
+import ItemFormBody from './ItemFormBody';
-import MoneyInputGroup from 'components/MoneyInputGroup';
+import ItemFormFloatingActions from './ItemFormFloatingActions';
-import Dragzone from 'components/Dragzone';
+import ItemFormInventorySection from './ItemFormInventorySection';
-import {
-  ListSelect,
-  AccountsSelectList,
-  CategoriesSelectList,
-} from 'components';
 
 import withItemsActions from 'containers/Items/withItemsActions';
-import withItemCategories from 'containers/Items/withItemCategories';
-import withAccounts from 'containers/Accounts/withAccounts';
 import withMediaActions from 'containers/Media/withMediaActions';
 import useMedia from 'hooks/useMedia';
 import withItemDetail from 'containers/Items/withItemDetail';
 import withDashboardActions from 'containers/Dashboard/withDashboardActions';
-import withAccountDetail from 'containers/Accounts/withAccountDetail';
 
 import { compose } from 'utils';
 
-const ItemForm = ({
+/**
+ * Item form.
+ */
+function ItemForm({
   // #withItemActions
   requestSubmitItem,
   requestEditItem,
 
-  accountsList,
+  itemId,
   itemDetail,
   onFormSubmit,
-  onCancelForm,
 
   // #withDashboardActions
   changePageTitle,
-
+  changePageSubtitle,
-  // #withItemCategories
-  categoriesList,
 
   // #withMediaActions
   requestSubmitMedia,
   requestDeleteMedia,
-}) => {
+}) {
-  const [payload, setPayload] = useState({});
+  const isNewMode = !itemId;
 
   const history = useHistory();
   const { formatMessage } = useIntl();
+
   const {
     setFiles,
     saveMedia,
@@ -75,16 +61,6 @@ const ItemForm = ({
     deleteCallback: requestDeleteMedia,
   });
 
-  const ItemTypeDisplay = useMemo(
-    () => [
-      { value: null, label: formatMessage({ id: 'select_item_type' }) },
-      { value: 'service', label: formatMessage({ id: 'service' }) },
-      { value: 'inventory', label: formatMessage({ id: 'inventory' }) },
-      { value: 'non-inventory', label: formatMessage({ id: 'non_inventory' }) },
-    ],
-    [formatMessage],
-  );
-
   const validationSchema = Yup.object().shape({
     active: Yup.boolean(),
     name: Yup.string()
@@ -118,7 +94,7 @@ const ItemForm = ({
     () => ({
       active: true,
       name: '',
-      type: '',
+      type: 'service',
       sku: '',
       cost_price: 0,
       sell_price: 0,
@@ -127,8 +103,8 @@ const ItemForm = ({
       inventory_account_id: null,
       category_id: null,
       note: '',
-      sellable: null,
+      sellable: true,
-      purchasable: null,
+      purchasable: true,
     }),
     [],
   );
@@ -145,18 +121,44 @@ const ItemForm = ({
     [itemDetail, defaultInitialValues],
   );
 
-  const saveInvokeSubmit = useCallback(
-    (payload) => {
-      onFormSubmit && onFormSubmit(payload);
-    },
-    [onFormSubmit],
-  );
-
   useEffect(() => {
-    itemDetail && itemDetail.id
+    (!isNewMode)
       ? changePageTitle(formatMessage({ id: 'edit_item_details' }))
       : changePageTitle(formatMessage({ id: 'new_item' }));
-  }, [changePageTitle, itemDetail, formatMessage]);
+  }, [changePageTitle, isNewMode, formatMessage]);
+
+  // Handles the form submit.
+  const handleFormSubmit = (values, { setSubmitting, resetForm, setErrors }) => {
+    setSubmitting(true);
+    const form = { ...values };
+
+    const onSuccess = (response) => {
+      AppToaster.show({
+        message: formatMessage(
+          {
+            id: (isNewMode) ?
+              'service_has_been_successful_created' : 
+              'the_item_has_been_successfully_edited',
+          },
+          {
+            number: itemDetail.id,
+          },
+        ),
+        intent: Intent.SUCCESS,
+      });
+      setSubmitting(false);
+      history.push('/items');
+      queryCache.removeQueries(['items-table']);
+    };
+    const onError = (response) => {
+      setSubmitting(false);
+    };
+    if (isNewMode) {
+      requestSubmitItem(form).then(onSuccess).catch(onError);
+    } else {
+      requestEditItem(form).then(onSuccess).catch(onError);
+    }
+  };
 
   const {
     getFieldProps,
@@ -169,78 +171,17 @@ const ItemForm = ({
   } = useFormik({
     enableReinitialize: true,
     validationSchema: validationSchema,
-    initialValues: {
+    initialValues,
-      ...initialValues,
+    onSubmit: handleFormSubmit
-    },
-    onSubmit: (values, { setSubmitting, resetForm, setErrors }) => {
-      const saveItem = (mediaIds) => {
-        const formValues = { ...values };
-        if (itemDetail && itemDetail.id) {
-          requestEditItem(itemDetail.id, formValues)
-            .then((response) => {
-              AppToaster.show({
-                message: formatMessage(
-                  {
-                    id: 'the_item_has_been_successfully_edited',
-                  },
-                  {
-                    number: itemDetail.id,
-                  },
-                ),
-                intent: Intent.SUCCESS,
-              });
-              setSubmitting(false);
-              saveInvokeSubmit({ action: 'update', ...payload });
-              history.push('/items');
-              resetForm();
-            })
-            .catch((errors) => {
-              setSubmitting(false);
   });
+
+  useEffect(() => {
+    if (values.item_type) {
+      changePageSubtitle(formatMessage({ id: values.item_type }));
     } else {
-          requestSubmitItem(formValues).then((response) => {
+      changePageSubtitle('');
-            AppToaster.show({
-              message: formatMessage(
-                {
-                  id: 'service_has_been_successful_created',
-                },
-                {
-                  name: values.name,
-                  service: formatMessage({ id: 'item' }),
-                },
-              ),
-              intent: Intent.SUCCESS,
-            });
-            queryCache.removeQueries(['items-table']);
-            history.push('/items');
-          });
     }
-      };
+  }, [values.item_type]);
-
-      Promise.all([saveMedia(), deleteMedia()]).then(
-        ([savedMediaResponses]) => {
-          const mediaIds = savedMediaResponses.map((res) => res.data.media.id);
-          return saveItem(mediaIds);
-        },
-      );
-    },
-  });
-
-  const onItemAccountSelect = useCallback(
-    (filedName) => {
-      return (account) => {
-        setFieldValue(filedName, account.id);
-      };
-    },
-    [setFieldValue],
-  );
-
-  const requiredSpan = useMemo(() => <span class="required">*</span>, []);
-  const infoIcon = useMemo(() => <Icon icon="info-circle" iconSize={12} />, []);
-
-  const handleMoneyInputChange = (fieldKey) => (e, value) => {
-    setFieldValue(fieldKey, value);
-  };
 
   const initialAttachmentFiles = useMemo(() => {
     return itemDetail && itemDetail.media
@@ -251,9 +192,10 @@ const ItemForm = ({
         }))
       : [];
   }, [itemDetail]);
+ 
   const handleDropFiles = useCallback((_files) => {
     setFiles(_files.filter((file) => file.uploaded === false));
-  }, []);
+  }, [setFiles]);
 
   const handleDeleteFile = useCallback(
     (_deletedFiles) => {
@@ -266,349 +208,49 @@ const ItemForm = ({
     [setDeletedFiles, deletedFiles],
   );
 
-  const handleCancelClickBtn = () => {
+  const handleCancelBtnClick = useCallback(() => {
     history.goBack();
-  };
+  }, [history]);
 
   return (
-    <div class="item-form">
+    <div class={classNames(CLASSES.PAGE_FORM_ITEM)}>
       <form onSubmit={handleSubmit}>
-        <div class="item-form__primary-section">
+        <div class={classNames(CLASSES.PAGE_FORM_BODY)}>
-          <Row>
+          <ItemFormPrimarySection
-            <Col xs={7}>
+            getFieldProps={getFieldProps}
-              {/* Item type */}
+            setFieldValue={setFieldValue}
-              <FormGroup
+            errors={errors}
-                medium={true}
+            touched={touched}
-                label={<T id={'item_type'} />}
+            values={values}
-                labelInfo={requiredSpan}
-                className={'form-group--item-type'}
-                intent={errors.type && touched.type && Intent.DANGER}
-                helperText={
-                  <ErrorMessage {...{ errors, touched }} name="type" />
-                }
-                inline={true}
-              >
-                <HTMLSelect
-                  fill={true}
-                  options={ItemTypeDisplay}
-                  {...getFieldProps('type')}
           />
-              </FormGroup>
+          <ItemFormBody
-
+            getFieldProps={getFieldProps}
-              {/* Item name */}
+            touched={touched}
-              <FormGroup
+            errors={errors}
-                label={<T id={'item_name'} />}
+            values={values}
-                labelInfo={requiredSpan}
+            setFieldValue={setFieldValue}
-                className={'form-group--item-name'}
-                intent={errors.name && touched.name && Intent.DANGER}
-                helperText={
-                  <ErrorMessage {...{ errors, touched }} name="name" />
-                }
-                inline={true}
-              >
-                <InputGroup
-                  medium={true}
-                  intent={errors.name && touched.name && Intent.DANGER}
-                  {...getFieldProps('name')}
           />
-              </FormGroup>
+          <ItemFormInventorySection
-
+            errors={errors}
-              {/* SKU */}
+            touched={touched}
-              <FormGroup
+            setFieldValue={setFieldValue}
-                label={<T id={'sku'} />}
+            values={values}
-                labelInfo={infoIcon}
+            getFieldProps={getFieldProps}
-                className={'form-group--item-sku'}
-                intent={errors.sku && touched.sku && Intent.DANGER}
-                helperText={
-                  <ErrorMessage {...{ errors, touched }} name="sku" />
-                }
-                inline={true}
-              >
-                <InputGroup
-                  medium={true}
-                  intent={errors.sku && touched.sku && Intent.DANGER}
-                  {...getFieldProps('sku')}
           />
-              </FormGroup>
-
-              {/* Item category */}
-              <FormGroup
-                label={<T id={'category'} />}
-                labelInfo={infoIcon}
-                inline={true}
-                intent={
-                  errors.category_id && touched.category_id && Intent.DANGER
-                }
-                helperText={
-                  <ErrorMessage {...{ errors, touched }} name="category" />
-                }
-                className={classNames(
-                  'form-group--select-list',
-                  'form-group--category',
-                  Classes.FILL,
-                )}
-              >
-                <CategoriesSelectList
-                  categoriesList={categoriesList}
-                  selecetedCategoryId={values.category_id}
-                  onCategorySelected={onItemAccountSelect('category_id')}
-                  popoverProps={{ minimal: true }}
-                />
-              </FormGroup>
-
-              {/* Active checkbox */}
-              <FormGroup
-                label={' '}
-                inline={true}
-                className={'form-group--active'}
-              >
-                <Checkbox
-                  inline={true}
-                  label={<T id={'active'} />}
-                  defaultChecked={values.active}
-                  {...getFieldProps('active')}
-                />
-              </FormGroup>
-            </Col>
-
-            <Col xs={3}>
-              <Dragzone
-                initialFiles={initialAttachmentFiles}
-                onDrop={handleDropFiles}
-                onDeleteFile={handleDeleteFile}
-                hint={'Attachments: Maxiumum size: 20MB'}
-                className={'mt2'}
-              />
-            </Col>
-          </Row>
         </div>
-
+        <ItemFormFloatingActions
-        <Row gutterWidth={16} className={'item-form__accounts-section'}>
+          isSubmitting={isSubmitting}
-          <Col width={404}>
+          itemId={itemId}
-            <h4>
+          onCancelClick={handleCancelBtnClick}
-              <T id={'sales_information'} />
-            </h4>
-
-            <FormGroup
-              label={<T id={'selling_price'} />}
-              className={'form-group--item-selling-price'}
-              intent={
-                errors.selling_price && touched.selling_price && Intent.DANGER
-              }
-              helperText={
-                <ErrorMessage {...{ errors, touched }} name="selling_price" />
-              }
-              inline={true}
-            >
-              <MoneyInputGroup
-                value={values.selling_price}
-                prefix={'$'}
-                onChange={handleMoneyInputChange('selling_price')}
-                inputGroupProps={{
-                  medium: true,
-                  intent:
-                    errors.selling_price &&
-                    touched.selling_price &&
-                    Intent.DANGER,
-                }}
-                disabled={!values.sellable}
         />
-            </FormGroup>
-
-            {/* Selling account */}
-            <FormGroup
-              label={<T id={'account'} />}
-              labelInfo={infoIcon}
-              inline={true}
-              intent={
-                errors.sell_account_id &&
-                touched.sell_account_id &&
-                Intent.DANGER
-              }
-              helperText={
-                <ErrorMessage {...{ errors, touched }} name="sell_account_id" />
-              }
-              className={classNames(
-                'form-group--sell-account',
-                'form-group--select-list',
-                Classes.FILL,
-              )}
-            >
-              <AccountsSelectList
-                accounts={accountsList}
-                onAccountSelected={onItemAccountSelect('sell_account_id')}
-                defaultSelectText={<T id={'select_account'} />}
-                selectedAccountId={values.sell_account_id}
-                disabled={!values.sellable}
-              />
-            </FormGroup>
-
-            {/* sellable checkbox */}
-            <FormGroup
-              label={' '}
-              inline={true}
-              className={'form-group--sellable'}
-            >
-              <Checkbox
-                inline={true}
-                label={<T id={'sellable'} />}
-                checked={values.sellable}
-                {...getFieldProps('sellable')}
-              />
-            </FormGroup>
-          </Col>
-
-          <Col width={404}>
-            <h4>
-              <T id={'purchase_information'} />
-            </h4>
-
-            {/* Cost price */}
-            <FormGroup
-              label={<T id={'cost_price'} />}
-              className={'form-group--item-cost-price'}
-              intent={errors.cost_price && touched.cost_price && Intent.DANGER}
-              helperText={
-                <ErrorMessage {...{ errors, touched }} name="cost_price" />
-              }
-              inline={true}
-            >
-              <MoneyInputGroup
-                value={values.cost_price}
-                prefix={'$'}
-                onChange={handleMoneyInputChange('cost_price')}
-                inputGroupProps={{
-                  medium: true,
-                  intent:
-                    errors.cost_price && touched.cost_price && Intent.DANGER,
-                }}
-                disabled={!values.purchasable}
-              />
-            </FormGroup>
-
-            <FormGroup
-              label={<T id={'account'} />}
-              labelInfo={infoIcon}
-              inline={true}
-              intent={
-                errors.cost_account_id &&
-                touched.cost_account_id &&
-                Intent.DANGER
-              }
-              helperText={
-                <ErrorMessage {...{ errors, touched }} name="cost_account_id" />
-              }
-              className={classNames(
-                'form-group--cost-account',
-                'form-group--select-list',
-                Classes.FILL,
-              )}
-            >
-              <AccountsSelectList
-                accounts={accountsList}
-                onAccountSelected={onItemAccountSelect('cost_account_id')}
-                defaultSelectText={<T id={'select_account'} />}
-                selectedAccountId={values.cost_account_id}
-                disabled={!values.purchasable}
-              />
-            </FormGroup>
-
-            {/* purchasable checkbox */}
-            <FormGroup
-              label={' '}
-              inline={true}
-              className={'form-group--purchasable'}
-            >
-              <Checkbox
-                inline={true}
-                label={<T id={'purchasable'} />}
-                defaultChecked={values.purchasable}
-                {...getFieldProps('purchasable')}
-              />
-            </FormGroup>
-          </Col>
-        </Row>
-
-        <Row className={'item-form__accounts-section mt2'}>
-          <Col width={404}>
-            <h4>
-              <T id={'inventory_information'} />
-            </h4>
-
-            <FormGroup
-              label={<T id={'inventory_account'} />}
-              inline={true}
-              intent={
-                errors.inventory_account_id &&
-                touched.inventory_account_id &&
-                Intent.DANGER
-              }
-              helperText={
-                <ErrorMessage
-                  {...{ errors, touched }}
-                  name="inventory_account_id"
-                />
-              }
-              className={classNames(
-                'form-group--item-inventory_account',
-                'form-group--select-list',
-                Classes.FILL,
-              )}
-            >
-              <AccountsSelectList
-                accounts={accountsList}
-                onAccountSelected={onItemAccountSelect('inventory_account_id')}
-                defaultSelectText={<T id={'select_account'} />}
-                selectedAccountId={values.inventory_account_id}
-              />
-            </FormGroup>
-
-            <FormGroup
-              label={<T id={'opening_stock'} />}
-              className={'form-group--item-stock'}
-              inline={true}
-            >
-              <InputGroup
-                medium={true}
-                intent={errors.stock && Intent.DANGER}
-                {...getFieldProps('stock')}
-              />
-            </FormGroup>
-          </Col>
-        </Row>
-
-        <div class="form__floating-footer">
-          <Button intent={Intent.PRIMARY} disabled={isSubmitting} type="submit">
-            {itemDetail && itemDetail.id ? (
-              <T id={'edit'} />
-            ) : (
-              <T id={'save'} />
-            )}
-          </Button>
-
-          <Button className={'ml1'} disabled={isSubmitting}>
-            <T id={'save_as_draft'} />
-          </Button>
-
-          <Button className={'ml1'} onClick={handleCancelClickBtn}>
-            <T id={'close'} />
-          </Button>
-        </div>
       </form>
     </div>
   );
 };
 
 export default compose(
-  withAccounts(({ accountsList }) => ({
-    accountsList,
-  })),
-  withAccountDetail,
   withItemsActions,
   withItemDetail,
-  withItemCategories(({ categoriesList }) => ({
-    categoriesList,
-  })),
   withDashboardActions,
   withMediaActions,
 )(ItemForm);

client/src/containers/Items/ItemFormBody.js

@@ -0,0 +1,188 @@
+import React from 'react';
+import {
+  FormGroup,
+  Intent,
+  InputGroup,
+  Classes,
+  Checkbox,
+} from '@blueprintjs/core';
+import {
+  AccountsSelectList,
+  MoneyInputGroup,
+  ErrorMessage,
+  Col,
+  Row,
+  Hint,
+} from 'components';
+import { FormattedMessage as T } from 'react-intl';
+import classNames from 'classnames';
+import withAccounts from 'containers/Accounts/withAccounts';
+
+import { compose } from 'utils';
+
+/**
+ * Item form body.
+ */
+function ItemFormBody({
+  getFieldProps,
+  touched,
+  errors,
+  values,
+  setFieldValue,
+
+  accountsList,
+}) {
+  return (
+    <div class="page-form__section page-form__section--selling-cost">
+      <Row>
+        <Col xs={6}>
+          
+          {/*------------- Sellable checkbox ------------- */}
+          <FormGroup
+            inline={true}
+            className={'form-group--sellable'}
+          >
+            <Checkbox
+              inline={true}
+              label={<h3><T id={'i_purchase_this_item'} /></h3>}
+              checked={values.sellable}
+              {...getFieldProps('sellable')}
+            />
+          </FormGroup>
+
+          {/*------------- Selling price ------------- */}
+          <FormGroup
+            label={<T id={'selling_price'} />}
+            className={'form-group--item-selling-price'}
+            intent={
+              errors.selling_price && touched.selling_price && Intent.DANGER
+            }
+            helperText={
+              <ErrorMessage {...{ errors, touched }} name="selling_price" />
+            }
+            inline={true}
+          >
+            <MoneyInputGroup
+              value={values.selling_price}
+              prefix={'$'}
+              onChange={(e, value) => {
+                setFieldValue('selling_price', value);
+              }}
+              inputGroupProps={{
+                medium: true,
+                intent:
+                  errors.selling_price &&
+                  touched.selling_price &&
+                  Intent.DANGER,
+              }}
+              disabled={!values.sellable}
+            />
+          </FormGroup>
+
+          {/*------------- Selling account ------------- */}
+          <FormGroup
+            label={<T id={'account'} />}
+            labelInfo={<Hint />}
+            inline={true}
+            intent={
+              errors.sell_account_id && touched.sell_account_id && Intent.DANGER
+            }
+            helperText={
+              <ErrorMessage {...{ errors, touched }} name="sell_account_id" />
+            }
+            className={classNames(
+              'form-group--sell-account',
+              'form-group--select-list',
+              Classes.FILL,
+            )}
+          >
+            <AccountsSelectList
+              accounts={accountsList}
+              onAccountSelected={(account) => {
+                setFieldValue('sell_account_id', account.id);
+              }}
+              defaultSelectText={<T id={'select_account'} />}
+              selectedAccountId={values.sell_account_id}
+              disabled={!values.sellable}
+            />
+          </FormGroup>
+
+        </Col>
+
+        <Col xs={6}>
+          {/*------------- Purchasable checbox ------------- */}
+          <FormGroup
+            inline={true}
+            className={'form-group--purchasable'}
+          >
+            <Checkbox
+              inline={true}
+              label={<h3><T id={'i_sell_this_item'} /></h3>}
+              defaultChecked={values.purchasable}
+              {...getFieldProps('purchasable')}
+            />
+          </FormGroup>
+
+          {/*------------- Cost price ------------- */}
+          <FormGroup
+            label={<T id={'cost_price'} />}
+            className={'form-group--item-cost-price'}
+            intent={errors.cost_price && touched.cost_price && Intent.DANGER}
+            helperText={
+              <ErrorMessage {...{ errors, touched }} name="cost_price" />
+            }
+            inline={true}
+          >
+            <MoneyInputGroup
+              value={values.cost_price}
+              prefix={'$'}
+              onChange={(e, value) => {
+                setFieldValue('cost_price', value);
+              }}
+              inputGroupProps={{
+                medium: true,
+                intent:
+                  errors.cost_price && touched.cost_price && Intent.DANGER,
+              }}
+              disabled={!values.purchasable}
+            />
+          </FormGroup>
+
+          {/*------------- Cost account ------------- */}
+          <FormGroup
+            label={<T id={'account'} />}
+            labelInfo={<Hint />}
+            inline={true}
+            intent={
+              errors.cost_account_id && touched.cost_account_id && Intent.DANGER
+            }
+            helperText={
+              <ErrorMessage {...{ errors, touched }} name="cost_account_id" />
+            }
+            className={classNames(
+              'form-group--cost-account',
+              'form-group--select-list',
+              Classes.FILL,
+            )}
+          >
+            <AccountsSelectList
+              accounts={accountsList}
+              onAccountSelected={(account) => {
+                setFieldValue('cost_account_id', account.id)
+              }}
+              defaultSelectText={<T id={'select_account'} />}
+              selectedAccountId={values.cost_account_id}
+              disabled={!values.purchasable}
+            />
+          </FormGroup>
+        </Col>
+      </Row>
+    </div>
+  );
+}
+
+export default compose(
+  withAccounts(({ accountsList }) => ({
+    accountsList,
+  })),
+)(ItemFormBody);

client/src/containers/Items/ItemFormFloatingActions.js

@@ -0,0 +1,54 @@
+import React from 'react';
+import {
+  Button,
+  Intent,
+  FormGroup,
+  Checkbox
+} from '@blueprintjs/core';
+import { FormattedMessage as T } from 'react-intl';
+import { saveInvoke } from 'utils';
+import classNames from 'classnames';
+
+import { CLASSES } from 'common/classes';
+
+/**
+ * Item form floating actions.
+ */
+export default function ItemFormFloatingActions({
+  isSubmitting,
+  itemId,
+  onCancelClick
+}) {
+  const handleCancelBtnClick = (event) => {
+    saveInvoke(onCancelClick, event.currentTarget.value);
+  };
+  return (
+    <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
+      <Button intent={Intent.PRIMARY} disabled={isSubmitting} type="submit">
+        {itemId ? <T id={'edit'} /> : <T id={'save'} />}
+      </Button>
+
+      <Button className={'ml1'} disabled={isSubmitting}>
+        <T id={'save_as_draft'} />
+      </Button>
+
+      <Button className={'ml1'} onClick={handleCancelBtnClick}>
+        <T id={'close'} />
+      </Button>
+
+      {/*----------- Active ----------*/}
+      <FormGroup
+        label={' '}
+        inline={true}
+        className={'form-group--active'}
+      >
+        <Checkbox
+          inline={true}
+          label={<T id={'active'} />}
+          // defaultChecked={values.active}
+          // {...getFieldProps('active')}
+        />
+      </FormGroup>
+    </div>
+  );
+}

client/src/containers/Items/ItemFormInventorySection.js

@@ -0,0 +1,94 @@
+import React from 'react';
+import { FormGroup, Intent, InputGroup, Classes } from '@blueprintjs/core';
+import { AccountsSelectList, ErrorMessage, Col, Row } from 'components';
+import { FormattedMessage as T } from 'react-intl';
+import classNames from 'classnames';
+import withAccounts from 'containers/Accounts/withAccounts';
+
+import { compose } from 'utils';
+
+/**
+ * Item form inventory sections.
+ */
+function ItemFormInventorySection({
+  errors,
+  touched,
+  setFieldValue,
+  values,
+  getFieldProps,
+
+  accountsList,
+}) {
+  return (
+    <div class="page-form__section page-form__section--inventory">
+      <Row>
+        <Col xs={6}>
+          <h3>
+            <T id={'inventory_information'} />
+          </h3>
+
+          {/*------------- Inventory account ------------- */}
+          <FormGroup
+            label={<T id={'inventory_account'} />}
+            inline={true}
+            intent={
+              errors.inventory_account_id &&
+              touched.inventory_account_id &&
+              Intent.DANGER
+            }
+            helperText={
+              <ErrorMessage
+                {...{ errors, touched }}
+                name="inventory_account_id"
+              />
+            }
+            className={classNames(
+              'form-group--item-inventory_account',
+              'form-group--select-list',
+              Classes.FILL,
+            )}
+          >
+            <AccountsSelectList
+              accounts={accountsList}
+              onAccountSelected={(account) => {
+                setFieldValue('inventory_account_id', account.id);
+              }}
+              defaultSelectText={<T id={'select_account'} />}
+              selectedAccountId={values.inventory_account_id}
+            />
+          </FormGroup>
+
+          <FormGroup
+            label={<T id={'opening_stock'} />}
+            className={'form-group--item-stock'}
+            inline={true}
+          >
+            <InputGroup
+              medium={true}
+              intent={errors.stock && Intent.DANGER}
+              {...getFieldProps('stock')}
+            />
+          </FormGroup>
+
+          <FormGroup
+            label={'Opening average cost'}
+            className={'form-group--item-stock'}
+            inline={true}
+          >
+            <InputGroup
+              medium={true}
+              intent={errors.stock && Intent.DANGER}
+              {...getFieldProps('stock')}
+            />
+          </FormGroup>
+        </Col>
+      </Row>
+    </div>
+  );
+}
+
+export default compose(
+  withAccounts(({ accountsList }) => ({
+    accountsList,
+  })),
+)(ItemFormInventorySection);

client/src/containers/Items/ItemFormPrimarySection.js

@@ -0,0 +1,185 @@
+import React, { useMemo } from 'react';
+import {
+  FormGroup,
+  Intent,
+  InputGroup,
+  RadioGroup,
+  Classes,
+  Radio,
+  Position,
+  Tooltip,
+} from '@blueprintjs/core';
+import { FormattedMessage as T, useIntl } from 'react-intl';
+import {
+  CategoriesSelectList,
+  ErrorMessage,
+  Hint,
+  Col,
+  Row,
+  FieldRequiredHint,
+} from 'components';
+import classNames from 'classnames';
+import { CLASSES } from 'common/classes';
+
+import withItemCategories from 'containers/Items/withItemCategories';
+import withAccounts from 'containers/Accounts/withAccounts';
+
+import { compose, handleStringChange } from 'utils';
+
+/**
+ * Item form primary section.
+ */
+function ItemFormPrimarySection({
+  getFieldProps,
+  setFieldValue,
+  errors,
+  touched,
+  values,
+
+  // #withItemCategories
+  categoriesList,
+}) {
+  return (
+    <div className={classNames(CLASSES.PAGE_FORM_HEADER_PRIMARY)}>
+      <Row>
+        <Col xs={7}>
+          {/*----------- Item type ----------*/}
+          <FormGroup
+            medium={true}
+            label={<T id={'item_type'} />}
+            labelInfo={<FieldRequiredHint />}
+            className={'form-group--item-type'}
+            intent={errors.type && touched.type && Intent.DANGER}
+            helperText={<ErrorMessage {...{ errors, touched }} name="type" />}
+            inline={true}
+          >
+            <RadioGroup
+              inline={true}
+              onChange={handleStringChange((value) => {
+                setFieldValue('item_type', value);
+              })}
+              selectedValue={values.item_type}
+            >
+              <Radio
+                label={
+                  <Tooltip
+                    className={Classes.TOOLTIP_INDICATOR}
+                    content={'Services that you provide to customers.'}
+                    position={Position.BOTTOM_LEFT}
+                  >
+                    <T id={'service'} />
+                  </Tooltip>
+                }
+                value="service"
+              />
+              <Radio
+                label={
+                  <Tooltip
+                    className={Classes.TOOLTIP_INDICATOR}
+                    content={
+                      'Products you buy and/or sell and that you track quantities of.'
+                    }
+                    position={Position.BOTTOM_LEFT}
+                  >
+                    <T id={'inventory'} />
+                  </Tooltip>
+                }
+                value="inventory"
+              />
+              <Radio
+                label={
+                  <Tooltip
+                    className={Classes.TOOLTIP_INDICATOR}
+                    content={
+                      'Products you buy and/or sell but don’t need to (or can’t) track quantities of, for example, nuts and bolts used in an installation.'
+                    }
+                    position={Position.BOTTOM_LEFT}
+                  >
+                    <T id={'non_inventory'} />
+                  </Tooltip>
+                }
+                value="non_inventory"
+              />
+            </RadioGroup>
+          </FormGroup>
+
+          {/*----------- Item name ----------*/}
+          <FormGroup
+            label={<T id={'item_name'} />}
+            labelInfo={<FieldRequiredHint />}
+            className={'form-group--item-name'}
+            intent={errors.name && touched.name && Intent.DANGER}
+            helperText={<ErrorMessage {...{ errors, touched }} name="name" />}
+            inline={true}
+          >
+            <InputGroup
+              medium={true}
+              intent={errors.name && touched.name && Intent.DANGER}
+              {...getFieldProps('name')}
+            />
+          </FormGroup>
+
+          {/*----------- SKU ----------*/}
+          <FormGroup
+            label={<T id={'sku'} />}
+            labelInfo={<Hint />}
+            className={'form-group--item-sku'}
+            intent={errors.sku && touched.sku && Intent.DANGER}
+            helperText={<ErrorMessage {...{ errors, touched }} name="sku" />}
+            inline={true}
+          >
+            <InputGroup
+              medium={true}
+              intent={errors.sku && touched.sku && Intent.DANGER}
+              {...getFieldProps('sku')}
+            />
+          </FormGroup>
+
+          {/*----------- Item category ----------*/}
+          <FormGroup
+            label={<T id={'category'} />}
+            labelInfo={<Hint />}
+            inline={true}
+            intent={errors.category_id && touched.category_id && Intent.DANGER}
+            helperText={
+              <ErrorMessage {...{ errors, touched }} name="category" />
+            }
+            className={classNames(
+              'form-group--select-list',
+              'form-group--category',
+              Classes.FILL,
+            )}
+          >
+            <CategoriesSelectList
+              categoriesList={categoriesList}
+              selecetedCategoryId={values.category_id}
+              onCategorySelected={(category) => {
+                setFieldValue('item_category_id', category.id);
+              }}
+              popoverProps={{ minimal: true }}
+            />
+          </FormGroup>
+        </Col>
+
+        <Col xs={3}>
+          {/* <Dragzone
+            initialFiles={initialAttachmentFiles}
+            onDrop={handleDropFiles}
+            onDeleteFile={handleDeleteFile}
+            hint={'Attachments: Maxiumum size: 20MB'}
+            className={'mt2'}
+          /> */}
+        </Col>
+      </Row>
+    </div>
+  );
+}
+
+export default compose(
+  withAccounts(({ accountsList }) => ({
+    accountsList,
+  })),
+  withItemCategories(({ categoriesList }) => ({
+    categoriesList,
+  })),
+)(ItemFormPrimarySection);

client/src/lang/en/index.js

@@ -805,4 +805,6 @@ export default {
   address_line_2: 'Address line 2',
   website: 'Website',
   notes: 'Notes',
+  i_purchase_this_item: 'I purchase this item from a vendor.',
+  i_sell_this_item: 'I sell this item to a customer.',
 };

client/src/style/pages/items.scss

@@ -1,56 +1,136 @@
 
 
+.page-form--item{
+  $self: '.page-form';
+  padding: 20px;
 
-.item-form{
+  #{$self}__header{
-  padding: 22px;
+    padding: 0;
-  padding-bottom: 90px;
-
-  &__primary-section{
-    background-color: #FAFAFA;
-    padding: 40px 22px 22px;
-    margin: -22px -22px 22px;
-    background-color: #FAFAFA;
   }
-  &__accounts-section{
+  #{$self}__primary-section{
-    h4{
+    padding: 30px 22px 0;
-      margin: 0;
+    margin: -20px -20px 24px;
+    overflow: hidden;
+  }
+
+  #{$self}__body{
+    .bp3-form-group{
+      max-width: 500px;
+      margin-bottom: 14px;
+  
+      &.bp3-inline{
+  
+        .bp3-label{
+          min-width: 140px;
+        }
+      }
+      .bp3-form-content{
+        width: 100%;
+      }
+    }
+  
+    h3{
       font-weight: 500;
-      margin-bottom: 20px;
+      font-size: 14px;
-      color: #828282;
+      margin-bottom: 1.4rem;
-    }
-    > div:first-of-type{
-      padding-right: 15px !important;
     }
     
-    > div ~ div{
+    .bp3-control{
-      padding-left: 15px !important;
+      
-      border-left: 1px solid #e8e8e8;
+      h3{
+        display: inline;
+        margin-bottom: 0;
       }
     }
    
-  .#{$ns}-form-group{
+    .form-group--sellable,
-    .#{$ns}-label{
+    .form-group--purchasable{
-      width: 130px;
+      margin-bottom: 1rem;
-    }
-
-    .#{$ns}-form-content{
-      width: 250px;
     }
   }
 
-  .form-group--item-type,
+  #{$self}__section{
-  .form-group--item-name{
+    max-width: 850px;
+    margin-bottom: 1rem;
 
-    .#{$ns}-form-content{
+    .bp3-form-group{
-      width: 350px;
+      max-width: 400px;
+    }
+
+    &--selling-cost{
+      border-bottom: 1px solid #eaeaea;
+      margin-bottom: 1.25rem;
+      padding-bottom: 0.25rem;
     }
   }
 
+  #{$self}__floating-actions{
+    margin-left: -20px;
+    margin-right: -20px;
+
     .form-group--active{
-    margin-bottom: 5px;
+      display: inline-block;
-
-    .bp3-control.bp3-checkbox{
       margin: 0;
+      margin-left: 40px;
     }
   }
+
+  .bp3-tooltip-indicator{
+    border-bottom: 1px dashed #d0d0d0;
+  }
 }
+
+
+// .item-form{
+//   padding: 22px;
+//   padding-bottom: 90px;
+
+//   &__primary-section{
+//     background-color: #FAFAFA;
+//     padding: 40px 22px 22px;
+//     margin: -22px -22px 22px;
+//     background-color: #FAFAFA;
+//   }
+//   &__accounts-section{
+//     h4{
+//       margin: 0;
+//       font-weight: 500;
+//       margin-bottom: 20px;
+//       color: #828282;
+//     }
+//     > div:first-of-type{
+//       padding-right: 15px !important;
+//     }
+
+//     > div ~ div{
+//       padding-left: 15px !important;
+//       border-left: 1px solid #e8e8e8;
+//     }
+//   }
+
+//   .#{$ns}-form-group{
+//     .#{$ns}-label{
+//       width: 130px;
+//     }
+
+//     .#{$ns}-form-content{
+//       width: 250px;
+//     }    
+//   }
+
+//   .form-group--item-type,
+//   .form-group--item-name{
+    
+//     .#{$ns}-form-content{
+//       width: 350px;
+//     }  
+//   }
+
+//   .form-group--active{
+//     margin-bottom: 5px;
+
+//     .bp3-control.bp3-checkbox{
+//       margin: 0;
+//     }
+//   }
+// }