From 9045cffb7fb0ace7a60f110b15afa3b134f729a3 Mon Sep 17 00:00:00 2001
From: "a.bouhuolia" <a.bouhuolia@live.com>
Date: Sun, 12 Sep 2021 10:20:59 +0200
Subject: [PATCH] BIG-23|BIG-24: fix add missing hint on selling/cost account
 on item form.

---
 client/src/components/FieldHint.js          |  5 +++--
 client/src/containers/Entries/components.js | 16 +++++++---------
 client/src/containers/Items/ItemFormBody.js |  8 ++++++--
 client/src/lang/ar/index.json               |  6 +++++-
 client/src/lang/en/index.json               |  6 +++++-
 5 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/client/src/components/FieldHint.js b/client/src/components/FieldHint.js
index 324f27a2c..f01dc918d 100644
--- a/client/src/components/FieldHint.js
+++ b/client/src/components/FieldHint.js
@@ -10,11 +10,12 @@ import 'style/components/Hint.scss';
 export default function FieldHint({
   content,
   position,
-  iconSize = 12
+  iconSize = 12,
+  tooltipProps
 }) {
   return (
     <span class="hint">
-      <Tooltip content={content} position={position}>
+      <Tooltip content={content} position={position} { ...tooltipProps }>
         <Icon icon="info-circle" iconSize={iconSize} />
       </Tooltip>
     </span>
diff --git a/client/src/containers/Entries/components.js b/client/src/containers/Entries/components.js
index 05380a388..68992f8e0 100644
--- a/client/src/containers/Entries/components.js
+++ b/client/src/containers/Entries/components.js
@@ -1,8 +1,7 @@
 import React from 'react';
-import { FormattedMessage as T } from 'components';
 import intl from 'react-intl-universal';
-import { Tooltip, Button, Checkbox, Intent, Position } from '@blueprintjs/core';
-import { Hint, Icon } from 'components';
+import { Tooltip, Button, Intent, Position } from '@blueprintjs/core';
+import { Hint, Icon, FormattedMessage as T } from 'components';
 import { formattedAmount, safeSumBy } from 'utils';
 import {
   InputGroupCell,
@@ -20,7 +19,10 @@ export function ItemHeaderCell() {
   return (
     <>
       <T id={'product_and_service'} />
-      <Hint />
+      <Hint
+        content={<T id={'item_entries.products_services.hint'} />}
+        tooltipProps={{ boundary: 'window', position: Position.RIGHT }}
+      />
     </>
   );
 }
@@ -98,11 +100,7 @@ const LandedCostHeaderCell = () => {
   return (
     <>
       <T id={'Landed'} />
-      <Hint
-        content={
-          'This options allows you to be able to add additional cost eg. freight then allocate cost to the items in your bills.'
-        }
-      />
+      <Hint content={<T id={'item_entries.landed.hint'} />} />
     </>
   );
 };
diff --git a/client/src/containers/Items/ItemFormBody.js b/client/src/containers/Items/ItemFormBody.js
index fa9ea4ecf..5305e8ba2 100644
--- a/client/src/containers/Items/ItemFormBody.js
+++ b/client/src/containers/Items/ItemFormBody.js
@@ -100,7 +100,9 @@ function ItemFormBody({ organization: { base_currency } }) {
             {({ form, field: { value }, meta: { error, touched } }) => (
               <FormGroup
                 label={<T id={'account'} />}
-                labelInfo={<Hint />}
+                labelInfo={
+                  <Hint content={<T id={'item.field.sell_account.hint'} />} />
+                }
                 inline={true}
                 intent={inputIntent({ error, touched })}
                 helperText={<ErrorMessage name="sell_account_id" />}
@@ -206,7 +208,9 @@ function ItemFormBody({ organization: { base_currency } }) {
             {({ form, field: { value }, meta: { error, touched } }) => (
               <FormGroup
                 label={<T id={'account'} />}
-                labelInfo={<Hint />}
+                labelInfo={
+                  <Hint content={<T id={'item.field.cost_account.hint'} />} />
+                }
                 inline={true}
                 intent={inputIntent({ error, touched })}
                 helperText={<ErrorMessage name="cost_account_id" />}
diff --git a/client/src/lang/ar/index.json b/client/src/lang/ar/index.json
index c6d95a71a..f1127ec28 100644
--- a/client/src/lang/ar/index.json
+++ b/client/src/lang/ar/index.json
@@ -1312,6 +1312,10 @@
   "expenses.empty_status.description": "قم بإنشاء وإدارة المصروفات التي تُعد جزء من التكاليف التشغيلية لمؤسستك.",
   "manual_journals.empty_status.title": "قم بإدخال اول القيود اليدوية علي شجرة الحسابات.",
   "manual_journals.empty_status.description": "يمكن القيود اليدوية لتسجيل المعاملات المالية ، ويستخدمها المحاسبون للعمل مع دفتر الأستاذ.",
-  "expense.column.multi_categories": "- متعدد التصنيفات -"
+  "expense.column.multi_categories": "- متعدد التصنيفات -",
+  "item.field.cost_account.hint": "أدخل السعر الذي اشتريت به هذا العنصر.",
+  "item.field.sell_account.hint": "أدخل السعر الذي ستبيعه لهذا العنصر.",
+  "item_entries.products_services.hint": "أدخل المنتجات أو الخدمات التي تبيعها أو تشتريها لتتبع ما قمت ببيعه أو شرائه.",
+  "item_entries.landed.hint": "يتيح لك هذه الخيار إمكانية  إضافة تكلفة اضافية علي فاتورة الشراء متال علي ذلك تكاليف الشحن ، ثم تحديد هذه التكلفة لتحميلها علي فاتورة الشراء."
 }
 
diff --git a/client/src/lang/en/index.json b/client/src/lang/en/index.json
index 647981950..a751f6032 100644
--- a/client/src/lang/en/index.json
+++ b/client/src/lang/en/index.json
@@ -1283,5 +1283,9 @@
   "manual_journals.empty_status.title": "Create your first journal entries on accounts chart.",
   "expenses.empty_status.description": "Create and manage expeses that are part of your organization's operating costs.",
   "expenses.empty_status.title": "Create and manage your organization's expenses",
-  "expense.column.multi_categories": "- Multi Categories -"
+  "expense.column.multi_categories": "- Multi Categories -",
+  "item.field.cost_account.hint": "Enter price at which you purchased this item.",
+  "item.field.sell_account.hint": "Enter price which you goint to sell this item.",
+  "item_entries.products_services.hint": "Enter products or services you sell or buy to keep tracking what your sold or purchased.",
+  "item_entries.landed.hint": "This options allows you to be able to add additional cost eg. freight then allocate cost to the items in your bills."
 }
\ No newline at end of file