diff --git a/packages/server/src/modules/BillPayments/commands/BillPaymentGL.ts b/packages/server/src/modules/BillPayments/commands/BillPaymentGL.ts index ea44edea7..fa96dd23e 100644 --- a/packages/server/src/modules/BillPayments/commands/BillPaymentGL.ts +++ b/packages/server/src/modules/BillPayments/commands/BillPaymentGL.ts @@ -1,3 +1,4 @@ +import * as moment from 'moment'; import { sumBy } from 'lodash'; import { BillPayment } from '../models/BillPayment'; import { AccountNormal } from '@/interfaces/Account'; diff --git a/packages/server/src/modules/Bills/commands/BillsGL.ts b/packages/server/src/modules/Bills/commands/BillsGL.ts index f7fa52d9a..1d8df8455 100644 --- a/packages/server/src/modules/Bills/commands/BillsGL.ts +++ b/packages/server/src/modules/Bills/commands/BillsGL.ts @@ -1,4 +1,5 @@ import { sumBy } from 'lodash'; +import * as moment from 'moment'; import { ILedgerEntry } from '@/modules/Ledger/types/Ledger.types'; import { ItemEntry } from '@/modules/TransactionItemEntry/models/ItemEntry'; import { Bill } from '../models/Bill'; diff --git a/packages/server/src/modules/Expenses/dtos/Expense.dto.ts b/packages/server/src/modules/Expenses/dtos/Expense.dto.ts index 6bdd9949d..a9e8a6270 100644 --- a/packages/server/src/modules/Expenses/dtos/Expense.dto.ts +++ b/packages/server/src/modules/Expenses/dtos/Expense.dto.ts @@ -1,6 +1,7 @@ import { ToNumber } from '@/common/decorators/Validators'; +import { parseBoolean } from '@/utils/parse-boolean'; import { ApiProperty } from '@nestjs/swagger'; -import { Type } from 'class-transformer'; +import { Transform, Type } from 'class-transformer'; import { IsArray, IsBoolean, @@ -41,6 +42,7 @@ export class ExpenseCategoryDto { description?: string; @IsBoolean() + @Transform(({ value }) => parseBoolean(value, false)) @IsOptional() landedCost?: boolean; @@ -103,6 +105,7 @@ export class CommandExpenseDto { currencyCode?: string; @IsBoolean() + @Transform(({ value }) => parseBoolean(value, false)) @IsOptional() @ApiProperty({ description: 'The publish status of the expense', diff --git a/packages/server/src/modules/ManualJournals/ManualJournals.controller.ts b/packages/server/src/modules/ManualJournals/ManualJournals.controller.ts index a898ca6ce..3519166bb 100644 --- a/packages/server/src/modules/ManualJournals/ManualJournals.controller.ts +++ b/packages/server/src/modules/ManualJournals/ManualJournals.controller.ts @@ -4,6 +4,7 @@ import { Delete, Get, Param, + Patch, Post, Put, Query, @@ -67,7 +68,7 @@ export class ManualJournalsController { return this.manualJournalsApplication.deleteManualJournal(manualJournalId); } - @Put(':id/publish') + @Patch(':id/publish') @ApiOperation({ summary: 'Publish the given manual journal.' }) @ApiResponse({ status: 200, diff --git a/packages/server/src/modules/VendorCreditsApplyBills/VendorCreditApplyBillsApplication.service.ts b/packages/server/src/modules/VendorCreditsApplyBills/VendorCreditApplyBillsApplication.service.ts index de3a65f96..5ac9daeda 100644 --- a/packages/server/src/modules/VendorCreditsApplyBills/VendorCreditApplyBillsApplication.service.ts +++ b/packages/server/src/modules/VendorCreditsApplyBills/VendorCreditApplyBillsApplication.service.ts @@ -1,9 +1,11 @@ +import { Injectable } from '@nestjs/common'; import { ApplyVendorCreditToBillsService } from './command/ApplyVendorCreditToBills.service'; import { DeleteApplyVendorCreditToBillService } from './command/DeleteApplyVendorCreditToBill.service'; import { GetAppliedBillsToVendorCreditService } from './queries/GetAppliedBillsToVendorCredit.service'; import { GetVendorCreditToApplyBills } from './queries/GetVendorCreditToApplyBills.service'; import { IVendorCreditApplyToInvoicesDTO } from './types/VendorCreditApplyBills.types'; +@Injectable() export class VendorCreditApplyBillsApplicationService { /** * @param {ApplyVendorCreditToBillsService} applyVendorCreditToBillsService diff --git a/packages/webapp/src/hooks/query/expenses.tsx b/packages/webapp/src/hooks/query/expenses.tsx index 2798ad71b..a10300771 100644 --- a/packages/webapp/src/hooks/query/expenses.tsx +++ b/packages/webapp/src/hooks/query/expenses.tsx @@ -110,7 +110,7 @@ export function useEditExpense(props) { const apiRequest = useApiRequest(); return useMutation( - ([id, values]) => apiRequest.post(`expenses/${id}`, values), + ([id, values]) => apiRequest.put(`expenses/${id}`, values), { onSuccess: (res, [id, values]) => { // Invalidate specific expense. diff --git a/packages/webapp/src/hooks/query/manualJournals.tsx b/packages/webapp/src/hooks/query/manualJournals.tsx index 92f6f3e60..b3363355a 100644 --- a/packages/webapp/src/hooks/query/manualJournals.tsx +++ b/packages/webapp/src/hooks/query/manualJournals.tsx @@ -56,7 +56,7 @@ export function useEditJournal(props) { const apiRequest = useApiRequest(); return useMutation( - ([id, values]) => apiRequest.post(`manual-journals/${id}`, values), + ([id, values]) => apiRequest.put(`manual-journals/${id}`, values), { onSuccess: (res, [id]) => { // Invalidate specific manual journal. @@ -95,7 +95,7 @@ export function usePublishJournal(props) { const queryClient = useQueryClient(); const apiRequest = useApiRequest(); - return useMutation((id) => apiRequest.post(`manual-journals/${id}/publish`), { + return useMutation((id) => apiRequest.patch(`manual-journals/${id}/publish`), { onSuccess: (res, id) => { // Invalidate specific manual journal. queryClient.invalidateQueries(t.MANUAL_JOURNAL, id);