Merge pull request #155 from bigcapitalhq/abouhuolia/big-19-delete-expense-transaction-does-not-work

fix(server): the expense transaction journal entries

packages/server/src/services/Expenses/CRUD/DeleteExpense.ts

@@ -9,7 +9,6 @@ import events from '@/subscribers/events';
 import UnitOfWork from '@/services/UnitOfWork';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 import { CommandExpenseValidator } from './CommandExpenseValidator';
-import { ExpenseCategory } from 'models';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 
 @Service()
@@ -37,7 +36,7 @@ export class DeleteExpense {
     expenseId: number,
     authorizedUser: ISystemUser
   ): Promise<void> => {
-    const { Expense } = this.tenancy.models(tenantId);
+    const { Expense, ExpenseCategory } = this.tenancy.models(tenantId);
 
     // Retrieves the expense transaction with associated entries or
     // throw not found error.
@@ -60,7 +59,7 @@ export class DeleteExpense {
       } as IExpenseDeletingPayload);
 
       // Deletes expense associated entries.
-      await ExpenseCategory.query(trx).findById(expenseId).delete();
+      await ExpenseCategory.query(trx).where('expenseId', expenseId).delete();
 
       // Deletes expense transactions.
       await Expense.query(trx).findById(expenseId).delete();

packages/server/src/services/Expenses/ExpenseGLEntries.ts

@@ -46,7 +46,7 @@ export class ExpenseGLEntries {
       ...commonEntry,
       credit: expense.localAmount,
       accountId: expense.paymentAccountId,
-      accountNormal: AccountNormal.CREDIT,
+      accountNormal: AccountNormal.DEBIT,
       index: 1,
     };
   };

packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesTable.tsx

@@ -13,6 +13,7 @@ import {
 
 import PaymentMadesEmptyStatus from './PaymentMadesEmptyStatus';
 
+import withPaymentMade from './withPaymentMade';
 import withPaymentMadeActions from './withPaymentMadeActions';
 import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization';
 
@@ -23,7 +24,6 @@ import withSettings from '@/containers/Settings/withSettings';
 import { usePaymentMadesTableColumns, ActionsMenu } from './components';
 import { usePaymentMadesListContext } from './PaymentMadesListProvider';
 import { useMemorizedColumnsWidths } from '@/hooks';
-import { DRAWERS } from '@/constants/drawers';
 
 /**
  * Payment made datatable transactions.
@@ -32,6 +32,9 @@ function PaymentMadesTable({
   // #withPaymentMadeActions
   setPaymentMadesTableState,
 
+  // #withPaymentMade
+  paymentMadesTableState,
+
   // #withAlerts
   openAlert,
 
@@ -68,12 +71,12 @@ function PaymentMadesTable({
 
   // Handle view detail  payment made.
   const handleViewDetailPaymentMade = ({ id }) => {
-    openDrawer(DRAWERS.PAYMENT_MADE, { paymentMadeId: id });
+    openDrawer('payment-made-detail-drawer', { paymentMadeId: id });
   };
 
   // Handle cell click.
   const handleCellClick = (cell, event) => {
-    openDrawer(DRAWERS.PAYMENT_MADE, {
+    openDrawer('payment-made-detail-drawer', {
       paymentMadeId: cell.row.original.id,
     });
   };
@@ -131,6 +134,7 @@ function PaymentMadesTable({
 
 export default compose(
   withPaymentMadeActions,
+  withPaymentMade(({ paymentMadesTableState }) => ({ paymentMadesTableState })),
   withAlertsActions,
   withDrawerActions,
   withCurrentOrganization(),