BIG-359:

CHANGELOG.md

@@ -2,12 +2,6 @@
 
 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

src/common/journalTypes.js

@@ -0,0 +1,8 @@
+import intl from 'react-intl-universal';
+
+export const journalTypes = [
+  {
+    name: intl.get('journal'),
+    value: 'Journal',
+  },
+];

src/containers/Accounting/MakeJournal/MakeJournalEntriesHeaderFields.js

@@ -4,6 +4,7 @@ import {
   FormGroup,
   Position,
   ControlGroup,
+  Classes,
 } from '@blueprintjs/core';
 import { FastField, ErrorMessage } from 'formik';
 import { DateInput } from '@blueprintjs/datetime';
@@ -11,6 +12,8 @@ import { FormattedMessage as T } from 'components';
 import classNames from 'classnames';
 
 import { CLASSES } from 'common/classes';
+import { journalTypes } from '../../../common/journalTypes';
+import { FFormGroup } from '../../../components';
 import {
   momentFormatter,
   compose,
@@ -28,12 +31,13 @@ import {
 } from 'components';
 import withSettings from 'containers/Settings/withSettings';
 import { useMakeJournalFormContext } from './MakeJournalProvider';
-import { JournalExchangeRateInputField } from './components';
+import { JournalExchangeRateInputField, JournalTypeSelect } from './components';
 import withDialogActions from 'containers/Dialog/withDialogActions';
 import {
   currenciesFieldShouldUpdate,
   useObserveJournalNoSettings,
 } from './utils';
+
 /**
  * Make journal entries header.
  */
@@ -169,21 +173,18 @@ function MakeJournalEntriesHeader({
       </FastField>
 
       {/*------------ Journal type  -----------*/}
-      <FastField name={'journal_type'}>
-        {({ form, field, meta: { error, touched } }) => (
-          <FormGroup
-            label={<T id={'journal_type'} />}
-            className={classNames('form-group--account-type', CLASSES.FILL)}
-            inline={true}
-          >
-            <InputGroup
-              intent={inputIntent({ error, touched })}
-              fill={true}
-              {...field}
-            />
-          </FormGroup>
-        )}
-      </FastField>
+      <FFormGroup
+        name={'journal_type'}
+        label={<T id={'journal_type'} />}
+        inline={true}
+        className={classNames('form-group--select-list', Classes.FILL)}
+      >
+        <JournalTypeSelect
+          items={journalTypes}
+          name={'journal_type'}
+          popoverProps={{ minimal: true }}
+        />
+      </FFormGroup>
 
       {/*------------ Currency  -----------*/}
       <FastField

src/containers/Accounting/MakeJournal/components.js

@@ -9,6 +9,7 @@ import {
   Icon,
   Hint,
   FormattedMessage as T,
+  FSelect,
 } from 'components';
 import {
   AccountsListFieldCell,
@@ -183,3 +184,71 @@ export function JournalExchangeRateInputField({ ...props }) {
     />
   );
 }
+
+/**
+ *
+ * @param {*} query
+ * @param {*} journal
+ * @param {*} _index
+ * @param {*} exactMatch
+ * @returns
+ */
+const itemPredicate = (query, journal, _index, exactMatch) => {
+  const normalizedTitle = journal.name.toLowerCase();
+  const normalizedQuery = query.toLowerCase();
+
+  if (exactMatch) {
+    return normalizedTitle === normalizedQuery;
+  } else {
+    return normalizedTitle.indexOf(normalizedQuery) >= 0;
+  }
+};
+
+/**
+ *
+ * @param {*} item
+ * @param {*} param1
+ * @returns
+ */
+const itemRenderer = (item, { handleClick, modifiers, query }) => {
+  return (
+    <MenuItem
+      active={modifiers.active}
+      disabled={modifiers.disabled}
+      text={item.name}
+      label={item.label}
+      key={item.id}
+      onClick={handleClick}
+    />
+  );
+};
+
+const itemSelectProps = {
+  itemPredicate: itemPredicate,
+  itemRenderer: itemRenderer,
+  valueAccessor: 'name',
+  labelAccessor: 'name',
+};
+
+export function JournalTypeSelect({ items, ...rest }) {
+  return (
+    <FSelect
+      {...itemSelectProps}
+      {...rest}
+      items={items}
+      input={itemSelectButton}
+    />
+  );
+}
+
+/**
+ * @param {*} label
+ * @returns
+ */
+function itemSelectButton({ label }) {
+  return (
+    <Button
+      text={label ? label : intl.get('make_journal.label.select_journal_type')}
+    />
+  );
+}

src/containers/Entries/components.js

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

src/containers/Items/ItemFormFormik.js

@@ -50,7 +50,7 @@ export default function ItemFormFormik({
   // Handles the form submit.
   const handleFormSubmit = (values, form) => {
     const { setSubmitting, resetForm, setErrors } = form;
-    const formValues = { ...values };
+    const formValues = { ...values, type: values.type.toString() };
 
     setSubmitting(true);
 
@@ -96,7 +96,7 @@ export default function ItemFormFormik({
         validationSchema={isNewMode ? CreateItemFormSchema : EditItemFormSchema}
         initialValues={initialValues}
         onSubmit={handleFormSubmit}
-      > 
+      >
         <Form>
           <div class={classNames(CLASSES.PAGE_FORM_BODY)}>
             <ItemFormPrimarySection />

src/containers/Items/ItemFormPrimarySection.js

@@ -7,7 +7,12 @@ import {
   Radio,
   Position,
 } from '@blueprintjs/core';
-import { FormattedMessage as T, FormattedHTMLMessage } from 'components';
+import {
+  FormattedMessage as T,
+  FormattedHTMLMessage,
+  FCheckbox,
+  FFormGroup,
+} from 'components';
 import { ErrorMessage, FastField } from 'formik';
 import {
   CategoriesSelectList,
@@ -29,7 +34,7 @@ import { categoriesFieldShouldUpdate } from './utils';
 export default function ItemFormPrimarySection() {
   // Item form context.
   const { isNewMode, item, itemsCategories } = useItemFormContext();
-
+  console.log(item.type, 'XXX');
   const nameFieldRef = useRef(null);
 
   useEffect(() => {
@@ -53,7 +58,34 @@ export default function ItemFormPrimarySection() {
   return (
     <div className={classNames(CLASSES.PAGE_FORM_HEADER_PRIMARY)}>
       {/*----------- Item type ----------*/}
-      <FastField name={'type'}>
+      <FFormGroup
+        name={'type'}
+        label={<T id={'item_type'} />}
+        labelInfo={
+          <span>
+            <FieldRequiredHint />
+            <Hint
+              content={itemTypeHintContent}
+              position={Position.BOTTOM_LEFT}
+            />
+          </span>
+        }
+        inline={true}
+      >
+        <FCheckbox
+          inline={true}
+          name="type"
+          label={<T id={'service'} />}
+          value="service"
+        />
+        <FCheckbox
+          inline={true}
+          name="type"
+          label={<T id={'inventory'} />}
+          value="inventory"
+        />
+      </FFormGroup>
+      {/* <FastField name={'type'}>
         {({ form, field: { value }, meta: { touched, error } }) => (
           <FormGroup
             medium={true}
@@ -85,7 +117,7 @@ export default function ItemFormPrimarySection() {
             </RadioGroup>
           </FormGroup>
         )}
-      </FastField>
+      </FastField> */}
 
       <Row>
         <Col xs={7}>

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

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

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": "أدخل شروط وأحكام عملك ليتم عرضها في المعاملة.",
+  "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",
   "estimate_form.label.total": "إجمالي",
@@ -1953,15 +1953,14 @@
   "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": "أدخل شروط وأحكام عملك ليتم عرضها في المعاملة.",
+  "estimate_form.terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
   "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.label.terms_conditions": "الشروط والأحكام",
-  "invoice_form.terms_and_conditions.placeholder": "أدخل شروط وأحكام عملك ليتم عرضها في المعاملة.",
+  "invoice_form.terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
   "receipt_form.label.total": "إجمالي",
   "receipt_form.label.subtotal": "المجموع",
   "receipt_form.label.due_amount": "مبلغ المستحق",
@@ -1975,13 +1974,13 @@
   "payment_receive_form.label.subtotal": "المجموع",
   "payment_receive_form.label.total": "إجمالي",
   "bill_form.label.note": "ملاحظة",
-  "bill_form.label.note.placeholder": "أدخل شروط وأحكام عملك ليتم عرضها في المعاملة.",
+  "bill_form.label.note.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
   "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": "أدخل شروط وأحكام عملك ليتم عرضها في المعاملة.",
+  "vendor_credit_form.note.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
   "vendor_credit_form.label.subtotal": "المجموع",
   "vendor_credit_form.label.total": "إجمالي",
   "payment_made_form.label.statement": "بيان",
@@ -1990,6 +1989,7 @@
   "payment_made_form.label.total": "إجمالي",
   "make_journal.label.subtotal": "المجموع",
   "make_journal.label.total": "إجمالي",
+  "make_journal.label.select_journal_type":"حدد نوع القيد",
   "expense.label.subtotal": "المجموع",
   "expense.label.total": "إجمالي",
   "expense.branch_button.label": "الفرع: {label}",
@@ -2009,7 +2009,7 @@
   "warehouse_transfer.empty_status.title": "إدارة عمليات النقل بين المخازن",
   "warehouse_transfer.empty_status.description": "غالبًا ماتحتاج الاعمال ذات مخازن متعددة لطلبات نقل البضائع من مخزن إلى آخر عندما تكون في حاجة ماسة إلى البائعين.",
   "warehouse_transfer.form.reason.label": "أسباب النقل",
-  "warehouse_transfer.form.reason.placeholder": "أدخل السبب وراء طلب النقل.",
+  "warehouse_transfer.form.reason.placeholder": "Enter the reason behind the transfer order.",
   "item.error.you_could_not_delete_item_has_associated": "لا يمكنك حذف العنصر لديه معاملات مرتبطة به ",
   "warehouse_transfer.quantity_cannot_be_zero_or_empty": "لا يمكن أن تكون الكمية صفراً أو فارغة.",
   "invoice.validation.due_date": "يجب أن يكون حقل {path} في وقت لاحق من {min}",

src/lang/en/index.json

@@ -1259,41 +1259,12 @@
   "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",
@@ -1304,7 +1275,9 @@
   "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.",
@@ -1966,6 +1939,7 @@
   "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",
@@ -2015,6 +1989,7 @@
   "payment_made.form.internal_note.placeholder": "Internal note (Not visible to the vendor).",
   "make_journal.label.subtotal": "Subtotal",
   "make_journal.label.total": "TOTAL",
+  "make_journal.label.select_journal_type":"Select Journal Type",
   "expense.label.subtotal": "Subtotal",
   "expense.label.total": "TOTAL",
   "expense.branch_button.label": "Branch: {label}",

src/store/plans/plans.reducer.js

@@ -2,6 +2,7 @@ import { createReducer } from '@reduxjs/toolkit';
 import intl from 'react-intl-universal';
 import t from 'store/types';
 
+
 const getSubscriptionPeriods = () => [
   {
     slug: 'month',
@@ -14,110 +15,79 @@ 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.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'),
+      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'),
     ],
-    price: '95',
+    price: '100',
     periods: [
       {
         slug: 'month',
         label: intl.get('plan.monthly'),
-        price: '95',
+        price: '100'
       },
       {
         slug: 'year',
         label: intl.get('plan.yearly'),
-        price: '995',
+        price: '1,200',
       },
     ],
     currencyCode: 'LYD',
   },
   {
-    name: intl.get('plan.capital_enterprise.title'),
-    slug: 'enterprise',
+    name: intl.get('plan.professional.title'),
+    slug: 'plus',
     description: [
       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'),
+      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: '120',
+    price: '200',
     currencyCode: 'LYD',
     periods: [
       {
         slug: 'month',
         label: intl.get('plan.monthly'),
-        price: '120',
+        price: '200'
       },
       {
         slug: 'year',
         label: intl.get('plan.yearly'),
-        price: '1,195',
+        price: '1,200',
+      },
+    ],
+  },
+  {
+    name: intl.get('plan.plus.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.accounting_dimensions'),
+    ],
+    price: '300',
+    currencyCode: 'LYD',
+    periods: [
+      {
+        slug: 'month',
+        label: intl.get('plan.monthly'),
+        price: '300'
+      },
+      {
+        slug: 'year',
+        label: intl.get('plan.yearly'),
+        price: '1,200',
       },
     ],
   },

src/style/pages/Subscription/BillingPlans.scss

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