Merge branch 'develop' into main

fix(MoneyOutForm): BIG-270 publish & draft cashflow.
fix(MoneyInForm): BIG-270 publish & draft cashflow.
2022-01-08 18:20:08 +02:00 · 2022-01-08 18:14:39 +02:00 · 2022-01-08 18:14:17 +02:00 · 2022-01-08 18:06:54 +02:00 · 2022-01-08 17:59:30 +02:00 · 2022-01-08 17:02:54 +02:00
9 changed files with 100 additions and 14 deletions
--- a/public/index.html
+++ b/public/index.html
@@ -2,7 +2,11 @@
 <html dir="ltr" lang="en">
  <head>
    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicons/favicon-32.ico" sizes="32x32">
+    <link
+      rel="icon"
+      href="%PUBLIC_URL%/favicons/favicon-32.ico"
+      sizes="32x32"
+    />
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <meta name="theme-color" content="#000000" />
    <meta
@@ -15,6 +19,22 @@
      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
    -->
    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <!-- Hotjar Tracking Code for https://app.bigcapital.ly/ -->
+    <script>
+      (function (h, o, t, j, a, r) {
+        h.hj =
+          h.hj ||
+          function () {
+            (h.hj.q = h.hj.q || []).push(arguments);
+          };
+        h._hjSettings = { hjid: 2774528, hjsv: 6 };
+        a = o.getElementsByTagName('head')[0];
+        r = o.createElement('script');
+        r.async = 1;
+        r.src = t + h._hjSettings.hjid + j + h._hjSettings.hjsv;
+        a.appendChild(r);
+      })(window, document, 'https://static.hotjar.com/c/hotjar-', '.js?sv=');
+    </script>
    <!--
      Notice the use of %PUBLIC_URL% in the tags above.
      It will be replaced with the URL of the `public` folder during the build.
@@ -41,7 +61,11 @@
      To create a production bundle, use `npm run build` or `yarn build`.
    -->

-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/flexboxgrid/6.3.1/flexboxgrid.min.css" type="text/css" >
+    <link
+      rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/flexboxgrid/6.3.1/flexboxgrid.min.css"
+      type="text/css"
+    />
    <!-- <link href="https://cdn.syncfusion.com/ej2/material.css" rel="stylesheet"> -->
    <!-- <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" /> -->
  </body>
--- a/src/containers/Customers/CustomersLanding/components.js
+++ b/src/containers/Customers/CustomersLanding/components.js
@@ -1,5 +1,13 @@
 import React, { useMemo } from 'react';
-import { Menu, MenuItem, MenuDivider, Intent } from '@blueprintjs/core';
+import {
+  Menu,
+  MenuItem,
+  MenuDivider,
+  Intent,
+  Tooltip,
+  Position,
+  Classes,
+} from '@blueprintjs/core';
 import clsx from 'classnames';

 import intl from 'react-intl-universal';
@@ -79,7 +87,7 @@ export function ActionsMenu({
 * Phone number accessor.
 */
 export function PhoneNumberAccessor(row) {
-  return <div className={'work_phone'}>{row.work_phone}</div>;
+  return <div className={'work_phone'}>{row.personal_phone}</div>;
 }

 /**
@@ -89,6 +97,24 @@ export function BalanceAccessor(row) {
  return <Money amount={row.closing_balance} currency={row.currency_code} />;
 }

+/**
+ * Note column accessor.
+ */
+export function NoteAccessor(row) {
+  return (
+    <If condition={row.note}>
+      <Tooltip
+        className={Classes.TOOLTIP_INDICATOR}
+        content={row.note}
+        position={Position.LEFT_TOP}
+        hoverOpenDelay={50}
+      >
+        <Icon icon={'file-alt'} iconSize={16} />
+      </Tooltip>
+    </If>
+  );
+}
+
 /**
 * Retrieve customers table columns.
 */
@@ -123,12 +149,20 @@ export function useCustomersTableColumns() {
      },
      {
        id: 'work_phone',
-        Header: intl.get('work_phone'),
+        Header: intl.get('phone_number'),
        accessor: PhoneNumberAccessor,
        className: 'phone_number',
        width: 100,
        clickable: true,
      },
+      {
+        id: 'note',
+        Header: intl.get('note'),
+        accessor: NoteAccessor,
+        disableSortBy: true,
+        width: 85,
+        clickable: true,
+      },
      {
        id: 'balance',
        Header: intl.get('receivable_balance'),
--- a/src/containers/Dialogs/MoneyInDialog/MoneyInForm.js
+++ b/src/containers/Dialogs/MoneyInDialog/MoneyInForm.js
@@ -29,7 +29,7 @@ const defaultInitialValues = {
  cashflow_account_id: '',
  credit_account_id: '',
  description: '',
-  published: '',
+  publish: '',
 };

 function MoneyInForm({
@@ -73,7 +73,7 @@ function MoneyInForm({
  const handleFormSubmit = (values, { setSubmitting, setErrors }) => {
    const form = {
      ...omit(values, ['currency_code']),
-      published: submitPayload.publish,
+      publish: true,
    };
    setSubmitting(true);
    createCashflowTransactionMutate(form)
--- a/src/containers/Dialogs/MoneyInDialog/MoneyInForm.schema.js
+++ b/src/containers/Dialogs/MoneyInDialog/MoneyInForm.schema.js
@@ -14,7 +14,7 @@ const Schema = Yup.object().shape({
    .min(3)
    .max(DATATYPES_LENGTH.TEXT)
    .label(intl.get('description')),
-  published: Yup.boolean(),
+    publish: Yup.boolean(),
 });

 export const CreateMoneyInFormSchema = Schema;
--- a/src/containers/Dialogs/MoneyOutDialog/MoneyOutForm.js
+++ b/src/containers/Dialogs/MoneyOutDialog/MoneyOutForm.js
@@ -29,7 +29,7 @@ const defaultInitialValues = {
  cashflow_account_id: '',
  credit_account_id: '',
  description: '',
-  published: '',
+  publish: '',
 };

 function MoneyOutForm({
@@ -73,7 +73,7 @@ function MoneyOutForm({
  const handleFormSubmit = (values, { setSubmitting, setErrors }) => {
    const form = {
      ...omit(values, ['currency_code']),
-      published: submitPayload.publish,
+      publish: true,
    };
    setSubmitting(true);
    createCashflowTransactionMutate(form)
--- a/src/containers/Dialogs/MoneyOutDialog/MoneyOutForm.schema.js
+++ b/src/containers/Dialogs/MoneyOutDialog/MoneyOutForm.schema.js
@@ -14,7 +14,7 @@ const Schema = Yup.object().shape({
    .min(3)
    .max(DATATYPES_LENGTH.TEXT)
    .label(intl.get('description')),
-  published: Yup.boolean(),
+    publish: Yup.boolean(),
 });

 export const CreateMoneyOutSchema = Schema;
--- a/src/containers/Vendors/VendorForm/VendorFormAfterPrimarySection.js
+++ b/src/containers/Vendors/VendorForm/VendorFormAfterPrimarySection.js
@@ -48,7 +48,7 @@ function VendorFormAfterPrimarySection() {
            {({ field, meta: { error, touched } }) => (
              <InputGroup
                intent={inputIntent({ error, touched })}
-                placeholder={intl.get('Mobile')}
+                placeholder={intl.get('mobile')}
                {...field}
              />
            )}
--- a/src/containers/Vendors/VendorsLanding/components.js
+++ b/src/containers/Vendors/VendorsLanding/components.js
@@ -6,7 +6,9 @@ import {
  MenuItem,
  MenuDivider,
  Position,
+  Tooltip,
  Intent,
+  Classes,
 } from '@blueprintjs/core';
 import intl from 'react-intl-universal';

@@ -114,6 +116,24 @@ export function BalanceAccessor({ closing_balance, currency_code }) {
  return <Money amount={closing_balance} currency={currency_code} />;
 }

+/**
+ * Note column accessor.
+ */
+export function NoteAccessor(row) {
+  return (
+    <If condition={row.note}>
+      <Tooltip
+        className={Classes.TOOLTIP_INDICATOR}
+        content={row.note}
+        position={Position.LEFT_TOP}
+        hoverOpenDelay={50}
+      >
+        <Icon icon={'file-alt'} iconSize={16} />
+      </Tooltip>
+    </If>
+  );
+}
+
 /**
 * Retrieve the vendors table columns.
 */
@@ -148,12 +168,20 @@ export function useVendorsTableColumns() {
      },
      {
        id: 'work_phone',
-        Header: intl.get('work_phone'),
+        Header: intl.get('phone_number'),
        accessor: PhoneNumberAccessor,
        className: 'work_phone',
        width: 100,
        clickable: true,
      },
+      {
+        id: 'note',
+        Header: intl.get('note'),
+        accessor: NoteAccessor,
+        disableSortBy: true,
+        width: 85,
+        clickable: true,
+      },
      {
        id: 'balance',
        Header: intl.get('receivable_balance'),
--- a/src/lang/ar/index.json
+++ b/src/lang/ar/index.json
@@ -78,7 +78,7 @@
  "new": "جديد",
  "invite_user": "دعوة مستخدم",
  "your_access_to_your_team": "سيتلقى زميلك في الفريق رسالة بريد إلكتروني تتيح له الوصول إلى فريقك.",
-  "invite": "التصنيف",
+  "invite": "دعوة",
  "count": "العدد",
  "item_type": "نوع المنتج",
  "item_name": "اسم المنتج",
Author	SHA1	Message	Date
a.bouhuolia	f1899e1ce1	Merge branch 'develop' into main	2022-01-08 18:20:08 +02:00
elforjani13	76d6cd0eaa	fix(MoneyOutForm): BIG-270 publish & draft cashflow.	2022-01-08 18:14:39 +02:00
elforjani13	90b4f86a0d	fix(MoneyInForm): BIG-270 publish & draft cashflow.	2022-01-08 18:14:17 +02:00
Ahmed Bouhuolia	5766d25bd1	Merge pull request #18 from bigcapitalhq/BIG-271-hotjar-client-application-integration `BIG-271` Hotjar client application integration.	2022-01-08 18:06:54 +02:00
elforjani13	6a5d96e869	BIG-271 Hotjar client application integration.	2022-01-08 17:59:30 +02:00
Ahmed Bouhuolia	69f16d1977	Merge pull request #17 from bigcapitalhq/BIG-270-publish-and-draft-cashflow-transaction-should-be-always-publish BIG-270 Publish and draft cashflow transaction.	2022-01-08 17:02:54 +02:00
elforjani13	9973693a86	BIG-270 Publish and draft cashflow transaction.	2022-01-08 16:59:31 +02:00
Ahmed Bouhuolia	11851d114d	Merge pull request #16 from bigcapitalhq/develop Release 1.5.5	2022-01-04 22:35:49 +02:00
elforjani13	3a3dd7a565	fix(VendorForm): placeholder phone number.	2022-01-04 22:31:01 +02:00
elforjani13	687dda1e7c	fix(inviteUserFrom): fix localiztion.	2022-01-04 21:31:58 +02:00
elforjani13	bfa809c831	feat(VendorList): add note accessor & personal phone.	2022-01-04 20:47:43 +02:00
elforjani13	07145e92ab	feat(CustomerList): add note accessor & personal phone.	2022-01-04 20:47:28 +02:00