Merge branch 'develop' into main

fix(MoneyOutForm): BIG-270 publish & draft cashflow.
fix(MoneyInForm): BIG-270 publish & draft cashflow.
2026-02-14 11:50:31 +00:00 · 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
14 changed files with 68 additions and 28 deletions
--- a/config/env.js
+++ b/config/env.js
@@ -85,6 +85,9 @@ function getClientEnvironment(publicUrl) {
        WDS_SOCKET_HOST: process.env.WDS_SOCKET_HOST,
        WDS_SOCKET_PATH: process.env.WDS_SOCKET_PATH,
        WDS_SOCKET_PORT: process.env.WDS_SOCKET_PORT,
+
+        // Application version.
+        VERSION: paths.appVersion
      }
    );
  // Stringify all values so we can feed into webpack DefinePlugin
--- a/config/paths.js
+++ b/config/paths.js
@@ -48,6 +48,8 @@ const resolveModule = (resolveFn, filePath) => {
  return resolveFn(`${filePath}.js`);
 };

+const appVersion = require(resolveApp('package.json')).version;
+
 // config after eject: we're in ./config/
 module.exports = {
  dotenv: resolveApp('.env'),
@@ -65,6 +67,7 @@ module.exports = {
  proxySetup: resolveApp('src/setupProxy.js'),
  appNodeModules: resolveApp('node_modules'),
  publicUrlOrPath,
+  appVersion
 };


--- 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/components/Sidebar/Sidebar.js
+++ b/src/components/Sidebar/Sidebar.js
@@ -28,7 +28,7 @@ export default function Sidebar({ dashboardContentRef }) {
 * @returns {React.JSX}
 */
 function SidebarFooterVersion() {
-  const { REACT_APP_VERSION: VERSION } = process.env;
+  const { VERSION } = process.env;

  if (!VERSION) {
    return null;
--- a/src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.js
+++ b/src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.js
@@ -57,9 +57,7 @@ function BillTransactionDeleteAlert({
      loading={isLoading}
    >
      <p>
-        <T
-          id={`Once your delete this located landed cost, you won't be able to restore it later, Are your sure you want to delete this transaction?`}
-        />
+        <T id={`landed_cost.once_your_delete_this_located_landed_cost`} />
      </p>
    </Alert>
  );
--- a/src/containers/CashFlow/AccountTransactions/utils.js
+++ b/src/containers/CashFlow/AccountTransactions/utils.js
@@ -79,6 +79,10 @@ export const handleCashFlowTransactionType = (reference, openDrawer) => {
      return openDrawer('refund-vendor-detail-drawer', {
        refundTransactionId: reference.reference_id,
      });
+    case 'InventoryAdjustment':
+      return openDrawer('inventory-adjustment-drawer', {
+        inventoryId: reference.reference_id,
+      });

    default:
      return openDrawer('cashflow-transaction-drawer', {
--- a/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFloatingActions.js
+++ b/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFloatingActions.js
@@ -37,7 +37,7 @@ function AllocateLandedCostFloatingActions({
      <DialogFooterActions alignment={'left'}>
        {costTransactionEntry && (
          <UnallocatedAmount>
-            Unallocated cost Amount:{' '}
+           <T id={'landed_cost.dialog.label_unallocated_cost_amount'}/>
            <strong>{formattedUnallocatedCostAmount}</strong>
          </UnallocatedAmount>
        )}
--- a/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostForm.js
+++ b/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostForm.js
@@ -42,7 +42,10 @@ function AllocateLandedCostForm({
      .map((entry) => transformToForm(entry, defaultInitialValues.items[0]));

    if (entries.length <= 0) {
-      AppToaster.show({ message: 'Something wrong!', intent: Intent.DANGER });
+      AppToaster.show({
+        message: intl.get('something_wrong'),
+        intent: Intent.DANGER,
+      });
      return;
    }
    const form = {
@@ -69,13 +72,14 @@ function AllocateLandedCostForm({
        )
      ) {
        AppToaster.show({
-          message:
-            'The total located cost is bigger than the transaction line.',
+          message: intl.get(
+            'landed_cost.error.the_total_located_cost_is_bigger_than_the_transaction_line',
+          ),
          intent: Intent.DANGER,
        });
      } else {
        AppToaster.show({
-          message: 'Something went wrong!',
+          message: intl.get('something_went_wrong'),
          intent: Intent.DANGER,
        });
      }
--- 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: true,
+      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: true,
+      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/lang/ar/index.json
+++ b/src/lang/ar/index.json
@@ -1173,7 +1173,6 @@
  "From transaction": "من معاملة",
  "Landed": "Landed",
  "This options allows you to be able to add additional cost eg. freight then allocate cost to the items in your bills.": "يتيح لك هذا الخيار إمكانية إضافة تكلفة إضافية على سبيل المثال اضافة تكلفة الشحن ومن ثم تخصيص التكلفة لفواتير الشراء.",
-  "Once your delete this located landed cost, you won't be able to restore it later, Are your sure you want to delete this transaction?": "بمجرد حذف معاملة تحميل التكلفة ، لن تتمكن من استعادتها لاحقًا ، هل أنت متأكد من أنك تريد حذف هذه المعاملة؟",
  "journal_entries": "القيود",
  "contact": "جهة الاتصال",
  "invoice_details": "تفاصيل الفاتورة",
@@ -1384,7 +1383,7 @@
  "filter.value": "قيمة",
  "payment_made.empty_status.title": "المنشأة لم تدفع اي اموال إلي الموردين ، إلي حد الأن!.",
  "estimate.delete.error.estimate_converted_to_invoice": "لا يمكن حذف عملية عرض اسعار الذي تم تحويلها إلي فاتورة بيع.",
-  "landed_cost.action.delete.success_message": "The landed cost has been deleted successfully.",
+  "landed_cost.action.delete.success_message": "تم حذف تكلفة اضافية بنجاح. ",
  "items.option.only_active": "Only active",
  "items.option_all_items.hint": "جميع الاصناف ، بما في ذلك تلك الاصناف لديها رصيد صفر.",
  "items.option_with_transactions": "الاصناف مع معاملات",
@@ -1583,6 +1582,9 @@
  "refund": "استرجاع",
  "landed_cost.dialog.label_select_transaction": "حدد المعاملة ",
  "landed_cost.dialog.label_select_transaction_entry": "حدد سطر المعاملة ",
+  "landed_cost.dialog.label_unallocated_cost_amount":"قيمة التكلفة غير المحملة:",
+  "landed_cost.error.the_total_located_cost_is_bigger_than_the_transaction_line":"إجمالي قيمة التكلفة المحملة أكبر من قيمة سطر المعاملة.",
+  "landed_cost.once_your_delete_this_located_landed_cost": "بمجرد حذف معاملة تحميل التكلفة ، لن تتمكن من استعادتها لاحقًا ، هل أنت متأكد من أنك تريد حذف هذه المعاملة؟",
  "refund_credit_note.dialog.label": "استرجاع اموال",
  "refund_credit_note.dialog.success_message": "تم انشاء معاملة استرجاع الاموال لإشعار الدائن بنجاح.",
  "refund_credit_note.dialog.refund_date": "تاريخ الاسترجاع",
--- a/src/lang/en/index.json
+++ b/src/lang/en/index.json
@@ -1145,7 +1145,6 @@
  "From transaction": "From transaction",
  "landed": "Landed",
  "This options allows you to be able to add additional cost eg. freight then allocate cost to the items in your bills.": "This options allows you to be able to add additional cost eg. freight then allocate cost to the items in your bills.",
-  "Once your delete this located landed cost, you won't be able to restore it later, Are your sure you want to delete this transaction?": "Once your delete this located landed cost, you won't be able to restore it later, Are your sure you want to delete this transaction?",
  "journal_entries": "Journal Entries",
  "contact": "Contact",
  "invoice_details": "Invoice details",
@@ -1288,11 +1287,11 @@
  "inventory_adjustment.details_drawer.title": "Inventory adjustment details",
  "setup.organization.location": "Location",
  "preferences.general.success_message": "The general preferences has been saved.",
-  "customer.drawer.action.new_invoice": "New invoice",
-  "customer.drawer.action.new_estimate": "New estimate",
-  "customer.drawer.action.new_payment": "New payment",
-  "customer.drawer.action.new_receipt": "New receipt",
-  "customer.drawer.action.new_transaction": "New transaction",
+  "customer.drawer.action.new_invoice": "New Invoice",
+  "customer.drawer.action.new_estimate": "New Estimate",
+  "customer.drawer.action.new_payment": "New Payment",
+  "customer.drawer.action.new_receipt": "New Receipt",
+  "customer.drawer.action.new_transaction": "New Transaction",
  "customer.drawer.action.edit": "Edit",
  "customer.drawer.label.outstanding_receivable": "Outstanding receivable",
  "customer.drawer.label.customer_name": "Customer name",
@@ -1318,9 +1317,9 @@
  "vendor.drawer.label.note": "Note",
  "vendor.drawer.action.edit_vendor": "Edit vendor",
  "vendor.drawer.action.delete": "Delete",
-  "vendor.drawer.action.new_transaction": "New transaction",
-  "vendor.drawer.action.new_payment": "New payment",
-  "vendor.drawer.action.new_invoice": "New purchase invoice",
+  "vendor.drawer.action.new_transaction": "New Transaction",
+  "vendor.drawer.action.new_payment": "New Payment",
+  "vendor.drawer.action.new_invoice": "New Purchase Invoice",
  "vendor.drawer.action.edit": "Edit",
  "manual_journals.empty_status.description": "Manual journals can be used to record financial transactions manually, used by accountants to work with the ledger.",
  "manual_journals.empty_status.title": "Create your first journal entries on accounts chart.",
@@ -1568,6 +1567,9 @@
  "refund": "Refund",
  "landed_cost.dialog.label_select_transaction": "Select transaction",
  "landed_cost.dialog.label_select_transaction_entry": "Select transaction entry",
+  "landed_cost.dialog.label_unallocated_cost_amount": "Unallocated cost Amount:",
+  "landed_cost.error.the_total_located_cost_is_bigger_than_the_transaction_line": "The total located cost is bigger than the transaction line.",
+  "landed_cost.once_your_delete_this_located_landed_cost": "Once your delete this located landed cost, you won't be able to restore it later, Are your sure you want to delete this transaction?",
  "refund_credit_note.dialog.label": "Refund Credit Note",
  "refund_credit_note.dialog.success_message": "The customer credit note refund has been created successfully.",
  "refund_credit_note.dialog.refund_date": "Refund date",
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	11851d114d	Merge pull request #16 from bigcapitalhq/develop Release 1.5.5	2022-01-04 22:35:49 +02:00
a.bouhuolia	21779007be	fix: application version.	2022-01-03 23:14:11 +02:00
a.bouhuolia	4fc1ecdc2d	Merge branch 'main' of https://github.com/bigcapitalhq/client into main	2022-01-03 19:42:48 +02:00
a.bouhuolia	c9b5cecf7a	Merge branch 'develop' into main	2022-01-03 19:42:23 +02:00
elforjani13	c31e9dcd29	fix: inventory adjustment & contacts drawer.	2022-01-03 14:35:50 +02:00
elforjani13	430ab95dc3	landed cost localiztion.	2022-01-03 13:38:22 +02:00
Ahmed Bouhuolia	8100a57195	Merge pull request #15 from bigcapitalhq/develop Merge `develop` to `main`	2022-01-03 12:31:14 +02:00