Merge branch 'develop' into migrate-pnpm

bigcapitalhq · Oct 4, 2023 · 38ad2d4 · 38ad2d4
2 parents f6a9f10 + 5df454d
commit 38ad2d4
Show file tree

Hide file tree

Showing 12 changed files with 13,736 additions and 22 deletions.
diff --git a/packages/server/package-lock.json b/packages/server/package-lock.json
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bigcapital/server",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "",
   "main": "src/server.ts",
   "scripts": {

diff --git a/packages/server/src/models/ItemEntry.ts b/packages/server/src/models/ItemEntry.ts
@@ -99,6 +99,13 @@ export default class ItemEntry extends TenantModel {
       : getExlusiveTaxAmount(this.amount, this.taxRate);
   }
 
+  static calcAmount(itemEntry) {
+    const { discount, quantity, rate } = itemEntry;
+    const total = quantity * rate;
+
+    return discount ? total - total * discount * 0.01 : total;
+  }
+
   /**
    * Item entry relations.
    */

diff --git a/packages/webapp/src/containers/Entries/ItemsEntriesTable.tsx b/packages/webapp/src/containers/Entries/ItemsEntriesTable.tsx
@@ -17,11 +17,21 @@ import {
   useItemEntriesTableContext,
 } from './ItemEntriesTableProvider';
 import { useUncontrolled } from '@/hooks/useUncontrolled';
+import { ItemEntry } from '@/interfaces/ItemEntries';
+
+interface ItemsEntriesTableProps {
+  initialValue?: ItemEntry;
+  value?: ItemEntry[];
+  onChange?: (entries: ItemEntry[]) => void;
+  taxRates?: any[];
+  minLinesNumber?: number;
+  enableTaxRates?: boolean;
+}
 
 /**
  * Items entries table.
  */
-function ItemsEntriesTable(props) {
+function ItemsEntriesTable(props: ItemsEntriesTableProps) {
   const { value, initialValue, onChange } = props;
 
   const [localValue, handleChange] = useUncontrolled({
@@ -119,8 +129,11 @@ ItemsEntriesTable.defaultProps = {
     discount: '',
   },
   initialEntries: [],
+  taxRates: [],
+  items: [],
   linesNumber: 1,
   minLinesNumber: 1,
+  enableTaxRates: true,
 };
 
 export default ItemsEntriesTable;
diff --git a/packages/webapp/src/containers/Entries/components.tsx b/packages/webapp/src/containers/Entries/components.tsx
@@ -92,7 +92,7 @@ const LandedCostHeaderCell = () => {
  */
 export function useEditableItemsEntriesColumns() {
   const { featureCan } = useFeatureCan();
-  const { landedCost } = useItemEntriesTableContext();
+  const { landedCost, enableTaxRates } = useItemEntriesTableContext();
 
   const isProjectsFeatureEnabled = featureCan(Features.Projects);
 
@@ -132,13 +132,17 @@ export function useEditableItemsEntriesColumns() {
         width: 70,
         align: Align.Right,
       },
-      {
-        Header: 'Tax rate',
-        accessor: 'tax_rate_id',
-        Cell: TaxRatesSuggestInputCell,
-        disableSortBy: true,
-        width: 110,
-      },
+      ...(enableTaxRates
+        ? [
+            {
+              Header: 'Tax rate',
+              accessor: 'tax_rate_id',
+              Cell: TaxRatesSuggestInputCell,
+              disableSortBy: true,
+              width: 110,
+            },
+          ]
+        : []),
       {
         Header: intl.get('discount'),
         accessor: 'discount',

diff --git a/packages/webapp/src/containers/Purchases/Bills/BillForm/BillItemsEntriesEditor.tsx b/packages/webapp/src/containers/Purchases/Bills/BillForm/BillItemsEntriesEditor.tsx
@@ -27,8 +27,8 @@ export default function BillFormBody({ defaultBill }) {
           meta: { error, touched },
         }) => (
           <ItemsEntriesTable
-            entries={value}
-            onUpdateData={(entries) => {
+            value={value}
+            onChange={(entries) => {
               setFieldValue('entries', entries);
             }}
             items={items}
@@ -37,6 +37,7 @@ export default function BillFormBody({ defaultBill }) {
             currencyCode={values.currency_code}
             itemType={ITEM_TYPE.PURCHASABLE}
             landedCost={true}
+            enableTaxRates={false}
           />
         )}
       </FastField>

diff --git a/...rc/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteItemsEntriesEditor.tsx b/...rc/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteItemsEntriesEditor.tsx
@@ -22,14 +22,15 @@ export default function VendorCreditNoteItemsEntriesEditor() {
           meta: { error, touched },
         }) => (
           <ItemsEntriesTable
-            entries={value}
-            onUpdateData={(entries) => {
+            value={value}
+            onChange={(entries) => {
               setFieldValue('entries', entries);
             }}
             items={items}
             errors={error}
             linesNumber={4}
             currencyCode={values.currency_code}
+            enableTaxRates={false}
           />
         )}
       </FastField>

diff --git a/...app/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteItemsEntriesEditorField.tsx b/...app/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteItemsEntriesEditorField.tsx
@@ -26,14 +26,15 @@ export default function CreditNoteItemsEntriesEditorField() {
           meta: { error, touched },
         }) => (
           <ItemsEntriesTable
-            entries={value}
-            onUpdateData={(entries) => {
+            value={value}
+            onChange={(entries) => {
               setFieldValue('entries', entries);
             }}
             items={items}
             errors={error}
             linesNumber={4}
             currencyCode={values.currency_code}
+            enableTaxRates={false}
           />
         )}
       </FastField>

diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateItemsEntriesField.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateItemsEntriesField.tsx
@@ -26,14 +26,15 @@ export default function EstimateFormItemsEntriesField() {
           meta: { error, touched },
         }) => (
           <ItemsEntriesTable
-            entries={value}
-            onUpdateData={(entries) => {
+            value={value}
+            onChange={(entries) => {
               setFieldValue('entries', entries);
             }}
             items={items}
             errors={error}
             linesNumber={4}
             currencyCode={values.currency_code}
+            enableTaxRates={false}
           />
         )}
       </FastField>

diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimateForm/utils.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimateForm/utils.tsx
@@ -31,6 +31,15 @@ export const defaultEstimateEntry = {
   amount: '',
 };
 
+const defaultEstimateEntryReq = {
+  index: 0,
+  item_id: '',
+  rate: '',
+  discount: '',
+  quantity: '',
+  description: '',
+};
+
 export const defaultEstimate = {
   customer_id: '',
   estimate_date: moment(new Date()).format('YYYY-MM-DD'),
@@ -148,7 +157,9 @@ export const transfromsFormValuesToRequest = (values) => {
     ...(values.estimate_number_manually && {
       estimate_number: values.estimate_number,
     }),
-    entries: entries.map((entry) => ({ ...omit(entry, ['amount']) })),
+    entries: entries.map((entry) => ({
+      ...transformToForm(entry, defaultEstimateEntryReq),
+    })),
   };
 };
 

diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptItemsEntriesEditor.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptItemsEntriesEditor.tsx
@@ -19,14 +19,15 @@ export default function ReceiptItemsEntriesEditor({ defaultReceipt }) {
           meta: { error, touched },
         }) => (
           <ItemsEntriesTable
-            entries={value}
-            onUpdateData={(entries) => {
+            value={value}
+            onChange={(entries) => {
               setFieldValue('entries', entries);
             }}
             items={items}
             errors={error}
             linesNumber={4}
             currencyCode={values.currency_code}
+            enableTaxRates={false}
           />
         )}
       </FastField>

diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/utils.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/utils.tsx
@@ -32,6 +32,15 @@ export const defaultReceiptEntry = {
   amount: '',
 };
 
+const defaultReceiptEntryReq = {
+  index: 0,
+  item_id: '',
+  rate: '',
+  discount: '',
+  quantity: '',
+  description: '',
+};
+
 export const defaultReceipt = {
   customer_id: '',
   deposit_account_id: '',
@@ -140,7 +149,9 @@ export const transformFormValuesToRequest = (values) => {
     ...(values.receipt_number_manually && {
       receipt_number: values.receipt_number,
     }),
-    entries: entries.map((entry) => ({ ...omit(entry, ['amount']) })),
+    entries: entries.map((entry) => ({
+      ...transformToForm(entry, defaultReceiptEntryReq),
+    })),
     closed: false,
   };
 };