Merge pull request #17 from bigcapitalhq/BIG-270-publish-and-draft-cashflow-transaction-should-be-always-publish

BIG-270 Publish and draft cashflow transaction.

src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.js

@@ -57,7 +57,9 @@ function BillTransactionDeleteAlert({
       loading={isLoading}
     >
       <p>
-        <T id={`landed_cost.once_your_delete_this_located_landed_cost`} />
+        <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?`}
+        />
       </p>
     </Alert>
   );

src/containers/CashFlow/AccountTransactions/utils.js

@@ -79,10 +79,6 @@ 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', {

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'),

src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFloatingActions.js

@@ -37,7 +37,7 @@ function AllocateLandedCostFloatingActions({
       <DialogFooterActions alignment={'left'}>
         {costTransactionEntry && (
           <UnallocatedAmount>
-           <T id={'landed_cost.dialog.label_unallocated_cost_amount'}/>
+            Unallocated cost Amount:{' '}
             <strong>{formattedUnallocatedCostAmount}</strong>
           </UnallocatedAmount>
         )}

src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostForm.js

@@ -42,10 +42,7 @@ function AllocateLandedCostForm({
       .map((entry) => transformToForm(entry, defaultInitialValues.items[0]));
 
     if (entries.length <= 0) {
-      AppToaster.show({
+      AppToaster.show({ message: 'Something wrong!', intent: Intent.DANGER });
-        message: intl.get('something_wrong'),
-        intent: Intent.DANGER,
-      });
       return;
     }
     const form = {
@@ -72,14 +69,13 @@ function AllocateLandedCostForm({
         )
       ) {
         AppToaster.show({
-          message: intl.get(
+          message:
-            'landed_cost.error.the_total_located_cost_is_bigger_than_the_transaction_line',
+            'The total located cost is bigger than the transaction line.',
-          ),
           intent: Intent.DANGER,
         });
       } else {
         AppToaster.show({
-          message: intl.get('something_went_wrong'),
+          message: 'Something went wrong!',
           intent: Intent.DANGER,
         });
       }

src/containers/Dialogs/MoneyInDialog/MoneyInForm.js

@@ -73,7 +73,7 @@ function MoneyInForm({
   const handleFormSubmit = (values, { setSubmitting, setErrors }) => {
     const form = {
       ...omit(values, ['currency_code']),
-      published: submitPayload.publish,
+      published: true,
     };
     setSubmitting(true);
     createCashflowTransactionMutate(form)

src/containers/Dialogs/MoneyOutDialog/MoneyOutForm.js

@@ -73,7 +73,7 @@ function MoneyOutForm({
   const handleFormSubmit = (values, { setSubmitting, setErrors }) => {
     const form = {
       ...omit(values, ['currency_code']),
-      published: submitPayload.publish,
+      published: true,
     };
     setSubmitting(true);
     createCashflowTransactionMutate(form)

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}
               />
             )}

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'),

src/lang/ar/index.json

@@ -78,7 +78,7 @@
   "new": "جديد",
   "invite_user": "دعوة مستخدم",
   "your_access_to_your_team": "سيتلقى زميلك في الفريق رسالة بريد إلكتروني تتيح له الوصول إلى فريقك.",
-  "invite": "التصنيف",
+  "invite": "دعوة",
   "count": "العدد",
   "item_type": "نوع المنتج",
   "item_name": "اسم المنتج",
@@ -1173,6 +1173,7 @@
   "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": "تفاصيل الفاتورة",
@@ -1383,7 +1384,7 @@
   "filter.value": "قيمة",
   "payment_made.empty_status.title": "المنشأة لم تدفع اي اموال إلي الموردين ، إلي حد الأن!.",
   "estimate.delete.error.estimate_converted_to_invoice": "لا يمكن حذف عملية عرض اسعار الذي تم تحويلها إلي فاتورة بيع.",
-  "landed_cost.action.delete.success_message": "تم حذف تكلفة اضافية بنجاح. ",
+  "landed_cost.action.delete.success_message": "The landed cost has been deleted successfully.",
   "items.option.only_active": "Only active",
   "items.option_all_items.hint": "جميع الاصناف ، بما في ذلك تلك الاصناف لديها رصيد صفر.",
   "items.option_with_transactions": "الاصناف مع معاملات",
@@ -1582,9 +1583,6 @@
   "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": "تاريخ الاسترجاع",

src/lang/en/index.json

@@ -1145,6 +1145,7 @@
   "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",
@@ -1287,11 +1288,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_invoice": "New invoice",
-  "customer.drawer.action.new_estimate": "New Estimate",
+  "customer.drawer.action.new_estimate": "New estimate",
-  "customer.drawer.action.new_payment": "New Payment",
+  "customer.drawer.action.new_payment": "New payment",
-  "customer.drawer.action.new_receipt": "New Receipt",
+  "customer.drawer.action.new_receipt": "New receipt",
-  "customer.drawer.action.new_transaction": "New Transaction",
+  "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",
@@ -1317,9 +1318,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_transaction": "New transaction",
-  "vendor.drawer.action.new_payment": "New Payment",
+  "vendor.drawer.action.new_payment": "New payment",
-  "vendor.drawer.action.new_invoice": "New Purchase Invoice",
+  "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.",
@@ -1567,9 +1568,6 @@
   "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",