Update CHANGELOG.md

Billingplans

CHANGELOG.md

@@ -2,6 +2,33 @@
 
 All notable changes to Bigcapital server-side will be in this file.
 
+## [1.7.2-rc.2] - 04-04-2022
+
+### Fixed
+  - Add the missing Arabic localization.
+  - Subscription plans modifications.
+
+## [1.7.1-rc.2] - 30-03-2022
+
+## Added
+  - `BIG-141` Add inactive status to item drawer details.
+  - `BIG-278` Add created at date on expense details.
+  - `BIG-350` Add empty status content of warehouse transfers service.
+  - `BIG-344` Add branch details to manual journal and expense details.
+## Fixed
+  - `BIG-221` Remove Non-inventory radio choice on item form.
+  - `BIG-236` Validate estimate expiration date should be equal or bigger than estimate date.
+  - `BIG-237` Validate invoice due date should be equal or bigger than invoice date.
+  - `BIG-238` Validate bill due date should be equal or bigger than bill date.
+  - `BIG-280` Optimize style of multi-select accounts menu.
+  - `BIG-284` Cashflow statement loading bar.
+  - `BIG-296` Creating a new child account from accounts list.
+  - `BIG-301` Navigation bar divider on actions bar hide with permissions control.
+  - `BIG-304` Adding cash or bank account from cash flow service.
+  - `BIG-351` Invalid date in the inventory adjustment detail.
+  - `BIG-352` Fix terms and notes fields on footer of all services.
+  - `BIG-354` Validate the warehouse transfer quantity should be above zero.
+
 ## [1.7.0-rc.1] - 24-03-2022
 
 ## Added 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bigcapital-client",
-  "version": "1.6.3",
+  "version": "1.7.1",
   "private": true,
   "dependencies": {
     "@babel/core": "7.8.4",

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 = (
     <Menu>
-      <MenuItem onClick={handleClickRemoveRole} text="Remove line" />
+      <MenuItem
+        onClick={handleClickRemoveRole}
+        text={intl.get('make_journal.entries.remove_row')}
+      />
     </Menu>
   );
   return (

src/containers/Drawers/ExpenseDrawer/ExpenseDrawerHeader.js

@@ -10,6 +10,7 @@ import {
   Col,
   DetailItem,
   DetailsMenu,
+  FormatDate,
   ExchangeRateDetailItem,
   FormattedMessage as T,
 } from 'components';
@@ -64,10 +65,12 @@ export default function ExpenseDrawerHeader() {
             minLabelSize={'180px'}
           >
             <DetailItem label={<T id={'published_at'} />}>
-              {moment(expense.published_at).format('YYYY MMM DD')}
+              <FormatDate value={expense.published_at} />
             </DetailItem>
 
-            <DetailItem label={<T id={'created_at'} />}>2021 Aug 24</DetailItem>
+            <DetailItem label={<T id={'created_at'} />}>
+              <FormatDate value={expense.created_at} />
+            </DetailItem>
           </DetailsMenu>
         </Col>
       </Row>

src/containers/Drawers/ExpenseDrawer/ExpenseDrawerProvider.js

@@ -1,6 +1,9 @@
 import React from 'react';
+import intl from 'react-intl-universal';
 import { useExpense } from 'hooks/query';
-import { DrawerLoading } from 'components';
+import { DrawerHeaderContent, DrawerLoading } from 'components';
+import { Features } from 'common';
+import { useFeatureCan } from 'hooks/state';
 
 const ExpenseDrawerDrawerContext = React.createContext();
 
@@ -8,6 +11,9 @@ const ExpenseDrawerDrawerContext = React.createContext();
  * Expense drawer provider.
  */
 function ExpenseDrawerProvider({ expenseId, ...props }) {
+  // Features guard.
+  const { featureCan } = useFeatureCan();
+
   // Fetch the expense details.
   const {
     data: expense,
@@ -28,6 +34,17 @@ function ExpenseDrawerProvider({ expenseId, ...props }) {
 
   return (
     <DrawerLoading loading={isExpenseLoading}>
+      <DrawerHeaderContent
+        name="expense-drawer"
+        title={intl.get('expense.drawer.title')}
+        subTitle={
+          featureCan(Features.Branches)
+            ? intl.get('expense.drawer.subtitle', {
+                value: expense.branch?.name,
+              })
+            : null
+        }
+      />
       <ExpenseDrawerDrawerContext.Provider value={provider} {...props} />
     </DrawerLoading>
   );

src/containers/Drawers/ExpenseDrawer/index.js

@@ -1,6 +1,4 @@
 import React, { lazy } from 'react';
-import intl from 'react-intl-universal';
-
 import { Drawer, DrawerSuspense } from 'components';
 import withDrawers from 'containers/Drawer/withDrawers';
 
@@ -22,7 +20,6 @@ function ExpenseDrawer({
     <Drawer
       isOpen={isOpen}
       name={name}
-      title={intl.get('expense.drawer.title')}
       size={'65%'}
       style={{ minWidth: '700px', maxWidth: '900px' }}
     >

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 (
     <DrawerLoading loading={isItemLoading}>
-      <DrawerHeaderContent name="item-detail-drawer" title={item?.name} />
+      <DrawerHeaderContent
+        name="item-detail-drawer"
+        title={inactiveStatus(item)}
+      />
       <ItemDetailDrawerContext.Provider value={provider} {...props} />
     </DrawerLoading>
   );

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 (
+    <Choose>
+      <Choose.When condition={!item.active}>
+        {item.name}
+        <StatusTag intent={Intent.NONE} minimal={true} round={true}>
+          <T id={'item.details.inactive'} />
+        </StatusTag>
+      </Choose.When>
+      <Choose.Otherwise>{item.name}</Choose.Otherwise>
+    </Choose>
+  );
+}
+
+const StatusTag = styled(Tag)`
+  font-size: 11px;
+  margin-left: 10px;
+`;

src/containers/Drawers/ManualJournalDrawer/utils.js

@@ -3,6 +3,8 @@ import React from 'react';
 import { Tag, Intent, Classes, Tooltip, Position } from '@blueprintjs/core';
 
 import { T, Choose, FormatNumberCell, If, Icon } from '../../../components';
+import { Features } from 'common';
+import { useFeatureCan } from 'hooks/state';
 
 /**
  * Note column accessor.
@@ -46,8 +48,9 @@ export function ManualJournalDetailsStatus({ manualJournal }) {
 /**
  * Retrieve read-only manual journal entries columns.
  */
-export const useManualJournalEntriesColumns = () =>
-  React.useMemo(
+export const useManualJournalEntriesColumns = () => {
+  const { featureCan } = useFeatureCan();
+  return React.useMemo(
     () => [
       {
         Header: intl.get('account_name'),
@@ -70,6 +73,17 @@ export const useManualJournalEntriesColumns = () =>
         disableSortBy: true,
         className: 'note',
       },
+      ...(featureCan(Features.Branches)
+        ? [
+            {
+              Header: intl.get('branch'),
+              width: 130,
+              accessor: 'branch.name',
+              disableSortBy: true,
+              className: 'branch',
+            },
+          ]
+        : []),
       {
         Header: intl.get('credit'),
         accessor: 'credit',
@@ -93,5 +107,6 @@ export const useManualJournalEntriesColumns = () =>
         align: 'right',
       },
     ],
-    [],
+    [featureCan],
   );
+};

src/containers/Entries/components.js

@@ -43,7 +43,10 @@ export function ActionsCellRenderer({
 
   const exampleMenu = (
     <Menu>
-      <MenuItem onClick={onRemoveRole} text="Remove line" />
+      <MenuItem
+        onClick={onRemoveRole}
+        text={<T id={'item_entries.remove_row'} />}
+      />
     </Menu>
   );
 

src/containers/Expenses/ExpenseForm/components.js

@@ -48,7 +48,10 @@ const ActionsCellRenderer = ({
   };
   const exampleMenu = (
     <Menu>
-      <MenuItem onClick={handleClickRemoveRole} text="Remove line" />
+      <MenuItem
+        onClick={handleClickRemoveRole}
+        text={intl.get('expense.entries.remove_row')}
+      />
     </Menu>
   );
   return (
@@ -163,4 +166,4 @@ export function ExpensesExchangeRateInputField({ ...props }) {
     />
   );
 }
-ExpensesExchangeRateInputField.cellType = CellType.Field;
+ExpensesExchangeRateInputField.cellType = CellType.Field;

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}

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()

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)

src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeaderFields.js

@@ -147,7 +147,7 @@ function InvoiceFormHeaderFields({
           </FastField>
         </Col>
 
-        <Col className={'col--due-date'}>
+        <Col xs={6}>
           {/* ----------- Due date ----------- */}
           <FastField name={'due_date'}>
             {({ form, field: { value }, meta: { error, touched } }) => (

src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js

@@ -72,18 +72,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),

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),
     }),
   ),
 });

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);
 

src/containers/WarehouseTransfers/utils.js

@@ -21,7 +21,10 @@ export function ActionsCellRenderer({
 
   const exampleMenu = (
     <Menu>
-      <MenuItem onClick={onRemoveRole} text="Remove line" />
+      <MenuItem
+        onClick={onRemoveRole}
+        text={intl.get('warehouse_transfer.entries.remove_row')}
+      />
     </Menu>
   );
 

src/lang/ar/index.json

@@ -1916,7 +1916,7 @@
   "branches_multi_select.placeholder": "تصفية حسب الفروع…",
   "warehouses_multi_select.label": "مخازن",
   "warehouses_multi_select.placeholder": "تصفية حسب المخازن…",
-  "dimensions": "Dimensions",
+  "dimensions": "الأبعاد",
   "warehouse_transfer.save_initiate_transfer": "حفظ وبدء النقل",
   "warehouse_transfer.save_mark_as_transferred": "حفظ وتم النقل",
   "warehouse_transfer.label.transfer_initiated": "بدء النقل",
@@ -1945,7 +1945,7 @@
   "view_customer_details": "عرض تفاصيل العميل ",
   "view_vendor_details": "عرض تفاصيل المورد ",
   "thanks_for_your_business_and_have_a_great_day": "Thanks for your business and have a great day!",
-  "terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
+  "terms_and_conditions.placeholder": "أدخل شروط وأحكام عملك ليتم عرضها في المعاملة.",
   "expenses.decscrption.placeholder": "Enter the description of your business to be displayed in your transaction",
   "make_jorunal.decscrption.placeholder": "Enter the description of your business to be displayed in your transaction",
   "estimate_form.label.total": "إجمالي",
@@ -1953,14 +1953,15 @@
   "estimate_form.label.customer_note": "ملاحظة الزبون",
   "estimate_form.label.terms_conditions": "الشروط والأحكام",
   "estimate_form.customer_note.placeholder": "Thanks for your business and have a great day!",
-  "estimate_form.terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
+  "estimate_form.terms_and_conditions.placeholder": "أدخل شروط وأحكام عملك ليتم عرضها في المعاملة.",
   "invoice_form.label.total": "إجمالي",
   "invoice_form.label.subtotal": "المجموع",
   "invoice_form.label.due_amount": "مبلغ المستحق",
   "invoice_form.label.payment_amount": "مبلغ المدفوع",
   "invoice_form.label.invoice_message": "رسالة الفاتورة",
   "invoice_form.invoice_message.placeholder": "Thanks for your business and have a great day!",
-  "invoice_form.terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
+  "invoice_form.label.terms_conditions": "الشروط والأحكام",
+  "invoice_form.terms_and_conditions.placeholder": "أدخل شروط وأحكام عملك ليتم عرضها في المعاملة.",
   "receipt_form.label.total": "إجمالي",
   "receipt_form.label.subtotal": "المجموع",
   "receipt_form.label.due_amount": "مبلغ المستحق",
@@ -1974,13 +1975,13 @@
   "payment_receive_form.label.subtotal": "المجموع",
   "payment_receive_form.label.total": "إجمالي",
   "bill_form.label.note": "ملاحظة",
-  "bill_form.label.note.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
+  "bill_form.label.note.placeholder": "أدخل شروط وأحكام عملك ليتم عرضها في المعاملة.",
   "bill_form.label.subtotal": "المجموع",
   "bill_form.label.total": "إجمالي",
   "bill_form.label.due_amount": "مبلغ المستحق",
   "bill_form.label.payment_amount": "مبلغ المدفوع",
   "vendor_credit_form.label.note": "ملاحظة",
-  "vendor_credit_form.note.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
+  "vendor_credit_form.note.placeholder": "أدخل شروط وأحكام عملك ليتم عرضها في المعاملة.",
   "vendor_credit_form.label.subtotal": "المجموع",
   "vendor_credit_form.label.total": "إجمالي",
   "payment_made_form.label.statement": "بيان",
@@ -2005,9 +2006,17 @@
   "estimate.warehouse_button.label": "المخزن: {label}",
   "receipt.branch_button.label": "الفرع: {label}",
   "receipt.warehouse_button.label": "المخزن: {label}",
-  "warehouse_transfer.empty_status.title": "إدارة عمليات النقل بين المستودعات",
-  "warehouse_transfer.empty_status.description": "غالبًا ماتحتاج الاعمال ذات مستودعات متعددة لطلبات نقل البضائع من مستودع إلى آخر عندما تكون في حاجة ماسة إلى البائعين.",
+  "warehouse_transfer.empty_status.title": "إدارة عمليات النقل بين المخازن",
+  "warehouse_transfer.empty_status.description": "غالبًا ماتحتاج الاعمال ذات مخازن متعددة لطلبات نقل البضائع من مخزن إلى آخر عندما تكون في حاجة ماسة إلى البائعين.",
+  "warehouse_transfer.form.reason.label": "أسباب النقل",
+  "warehouse_transfer.form.reason.placeholder": "أدخل السبب وراء طلب النقل.",
   "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}",
+  "make_journal.entries.remove_row": "حذف الصف",
+  "expense.entries.remove_row": "حذف الصف",
+  "warehouse_transfer.entries.remove_row": "حذف الصف",
+  "item.details.inactive": "غير نشط",
+  "bill.validation.due_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}"
 }

src/lang/en/index.json

@@ -1259,12 +1259,41 @@
   "setup.initializing.please_refresh_the_page": "Please refresh the page",
   "setup.organization.title": "Let’s Get Started",
   "setup.organization.description": "Tell the system a little bit about your organization.",
+  "plan.capital_basic.title": "Capital Basic",
+  "plan.feature.sales_invoices": "Sales Invoices.",
+  "plan.feature.sales_estimates": "Sales Estimates.",
+  "plan.feature.customers": "Customers.",
+  "plan.feature.credit_notes": "Credit notes.",
+  "plan.feature.manual_journals": "Manual Journals.",
+  "plan.feature.expenses_tracking": "Expenses Tracking",
+  "plan.feature.basic_financial_reports": "Basic Financial Reports.",
+  "plan.capital_plus.title": "Capital Plus",
+  "plan.feature.all_capital_basic": "All Capital Basic features.",
+  "plan.feature.predefined_user_roles": "Predefined User Roles.",
+  "plan.feature.custom_tables_views": "Custom Tables Views.",
+  "plan.feature.transactions_locking": "Transactions Locking.",
+  "plan.feature.plus_financial_reports": "Plus Financial Reports.",
+  "plan.feature.custom_fields_resources": "Custom Fields & Resources.",
+  "plan.essential.title": "Capital Essential",
+  "plan.feature.all_capital_plus": "All Capital Basic features.",
+  "plan.feature.sales_purchases_order": "Sales & Purchases Order.",
+  "plan.feature.purchase_invoices": "Purchase Invoices.",
+  "plan.feature.inventory_tracking": "Inventory Tracking.",
+  "plan.feature.custom_roles": "Custom Roles.",
+  "plan.feature.multiply_currency_transcations": "Multiply Currency Transcations.",
+  "plan.feature.inventory_reports": "Inventory Reports.",
+  "plan.feature.landed_cost": "Landed cost.",
+  "plan.capital_enterprise.title": "Capital Enterprise",
+  "plan.feature.all_capital_essential": "All Capital Essential features.",
+  "plan.feature.multiply_branches": "Multiply Branches.",
+  "plan.feature.multiply_warehouses": "Multiply Warehouses.",
+  "plan.feature.accounting_dimensions": "Accounting Dimensions.",
+  "plan.feature.warehouses_reports": "Warehouses Reports.",
+  "plan.feature.branches_reports": "Branches Reports.",
   "plan.professional.title": "Pro",
-  "plan.essential.title": "Essential",
   "plan.plus.title": "Plus+",
   "plan.feature.sale_purchase_invoice": "Sale and purchase invoices.",
   "plan.feature.receivable_payable_accounts": "Customers/vendors accounts.",
-  "plan.feature.expenses_tracking": "Expenses tracking",
   "plan.feature.manual_journal": "Manual journals.",
   "plan.feature.financial_reports": "Financial reports.",
   "plan.feature.one_user_with_accountant": "For one user and accountant",
@@ -1275,9 +1304,7 @@
   "plan.feature.three_users": "Three users with your accountant",
   "plan.feature.advanced_financial_reports": "Advanced financial reports",
   "plan.feature.tracking_multi_locations": "Track multi-branches and locations",
-  "plan.feature.all_capital_essential": "All Capital Essential features.",
   "plan.feature.projects_accounting": "Projects accounting and timesheets",
-  "plan.feature.accounting_dimensions": "Accounting dimensions.",
   "plan.monthly": "Monthly",
   "plan.yearly": "Yearly",
   "payment_via_voucher.success_message": "Payment has been done successfully.",
@@ -1756,6 +1783,7 @@
   "payment_made.drawer.subtitle": "Branch: {value}",
   "manual_journal.drawer.title": "Manual journal details ({number})",
   "expense.drawer.title": "Expense details",
+  "expense.drawer.subtitle": "Branch: {value}",
   "global_error.you_dont_have_permissions": "You do not have permissions to access this page.",
   "global_error.transactions_locked": "Transactions before {lockedToDate} has been locked. Hence action cannot be performed.",
   "global_error.authorized_user_inactive": "The authorized user is inactive.",
@@ -1938,7 +1966,6 @@
   "payment_made.error.withdrawal_account_currency_invalid": "The withdrawal account currency should be same vendor currency or organization base currency.",
   "view_customer_details": "View Customer Details",
   "view_vendor_details": "View Vendor Details",
-  "thanks_for_your_business_and_have_a_great_day": "Thanks for your business and have a great day!",
   "terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
   "expenses.decscrption.placeholder": "Enter the description of your business to be displayed in your transaction",
   "make_jorunal.decscrption.placeholder": "Enter the description of your business to be displayed in your transaction",
@@ -2009,5 +2036,11 @@
   "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}",
+  "make_journal.entries.remove_row": "Remove line",
+  "expense.entries.remove_row": "Remove line",
+  "warehouse_transfer.entries.remove_row": "Remove line",
+  "item.details.inactive": "Inactive",
+  "bill.validation.due_date": "{path} field must be later than {min}"
 }

src/store/plans/plans.reducer.js

@@ -2,7 +2,6 @@ import { createReducer } from '@reduxjs/toolkit';
 import intl from 'react-intl-universal';
 import t from 'store/types';
 
-
 const getSubscriptionPeriods = () => [
   {
     slug: 'month',
@@ -15,79 +14,110 @@ const getSubscriptionPeriods = () => [
 ];
 
 const getSubscriptionPlans = () => [
+  {
+    name: intl.get('plan.capital_basic.title'),
+    slug: 'capital_basic',
+    description: [
+      intl.get('plan.feature.sales_invoices'),
+      intl.get('plan.feature.sales_estimates'),
+      intl.get('plan.feature.customers'),
+      intl.get('plan.feature.credit_notes'),
+      intl.get('plan.feature.manual_journals'),
+      intl.get('plan.feature.expenses_tracking'),
+      intl.get('plan.feature.basic_financial_reports'),
+    ],
+    price: '55',
+    periods: [
+      {
+        slug: 'month',
+        label: intl.get('plan.monthly'),
+        price: '55',
+      },
+      {
+        slug: 'year',
+        label: intl.get('plan.yearly'),
+        price: '595',
+      },
+    ],
+    currencyCode: 'LYD',
+  },
+  {
+    name: intl.get('plan.capital_plus.title'),
+    slug: 'capital_plus',
+    description: [
+      intl.get('plan.feature.all_capital_basic'),
+      intl.get('plan.feature.predefined_user_roles'),
+      intl.get('plan.feature.custom_tables_views'),
+      intl.get('plan.feature.transactions_locking'),
+      intl.get('plan.feature.plus_financial_reports'),
+      intl.get('plan.feature.custom_fields_resources'),
+    ],
+    price: '75',
+    periods: [
+      {
+        slug: 'month',
+        label: intl.get('plan.monthly'),
+        price: '75',
+      },
+      {
+        slug: 'year',
+        label: intl.get('plan.yearly'),
+        price: '795',
+      },
+    ],
+    currencyCode: 'LYD',
+  },
   {
     name: intl.get('plan.essential.title'),
     slug: 'essentials',
     description: [
-      intl.get('plan.feature.sale_purchase_invoice'),
-      intl.get('plan.feature.receivable_payable_accounts'),
-      intl.get('plan.feature.expenses_tracking'),
-      intl.get('plan.feature.manual_journal'),
-      intl.get('plan.feature.financial_reports'),
-      intl.get('plan.feature.one_user_with_accountant'),
+      intl.get('plan.feature.all_capital_plus'),
+      intl.get('plan.feature.sales_purchases_order'),
+      intl.get('plan.feature.purchase_invoices'),
+      intl.get('plan.feature.inventory_tracking'),
+      intl.get('plan.feature.custom_roles'),
+      intl.get('plan.feature.multiply_currency_transcations'),
+      intl.get('plan.feature.inventory_reports'),
+      intl.get('plan.feature.landed_cost'),
     ],
-    price: '100',
+    price: '95',
     periods: [
       {
         slug: 'month',
         label: intl.get('plan.monthly'),
-        price: '100'
+        price: '95',
       },
       {
         slug: 'year',
         label: intl.get('plan.yearly'),
-        price: '1,200',
+        price: '995',
       },
     ],
     currencyCode: 'LYD',
   },
   {
-    name: intl.get('plan.professional.title'),
-    slug: 'plus',
-    description: [
-      intl.get('plan.feature.all_capital_essential'),
-      intl.get('plan.feature.multi_currency'),
-      intl.get('plan.feature.purchase_sell_orders'),
-      intl.get('plan.feature.multi_inventory_managment'),
-      intl.get('plan.feature.three_users'),
-      intl.get('plan.feature.advanced_financial_reports'),
-    ],
-    price: '200',
-    currencyCode: 'LYD',
-    periods: [
-      {
-        slug: 'month',
-        label: intl.get('plan.monthly'),
-        price: '200'
-      },
-      {
-        slug: 'year',
-        label: intl.get('plan.yearly'),
-        price: '1,200',
-      },
-    ],
-  },
-  {
-    name: intl.get('plan.plus.title'),
+    name: intl.get('plan.capital_enterprise.title'),
     slug: 'enterprise',
     description: [
-      intl.get('plan.feture.all_capital_professional_features'),
-      intl.get('plan.feature.tracking_multi_locations'),
-      intl.get('plan.feature.projects_accounting'),
+      intl.get('plan.feature.all_capital_essential'),
+      intl.get('plan.feature.multiply_branches'),
+      intl.get('plan.feature.multiply_warehouses'),
       intl.get('plan.feature.accounting_dimensions'),
+      intl.get('plan.feature.warehouses_reports'),
+      intl.get('plan.feature.branches_reports'),
     ],
-    price: '300',
+    price: '120',
     currencyCode: 'LYD',
     periods: [
       {
         slug: 'month',
         label: intl.get('plan.monthly'),
-        price: '300'
+        price: '120',
       },
       {
         slug: 'year',
         label: intl.get('plan.yearly'),
-        price: '1,200',
+        price: '1,195',
       },
     ],
   },

src/style/pages/Subscription/BillingPlans.scss

@@ -1,6 +1,6 @@
 
 .billing-plans{
-  
+  max-width: 753px;
   .paragraph{
     font-size: 15px;
   }