diff --git a/src/components/TransactionCreate.vue b/src/components/TransactionCreate.vue index 37d635e..4337fe5 100644 --- a/src/components/TransactionCreate.vue +++ b/src/components/TransactionCreate.vue @@ -239,13 +239,15 @@ import TransactionTag, { TransactionTagLabel } from '@/enums/TransactionTag' import accountService from '@/services/AccountService' import exchangeService from '@/services/ExchangeService' import transactionService from '@/services/TransactionService' -import formatDate from '@/utils/format-date' import queueNotifService from '@/services/QueueNotifService' import { money } from '@/utils/filters' import { findContrastColor } from '@/utils' import ILocation from '@/models/ILocation' import notif from '@/utils/notif' import MapService from '../services/MapService' +import { format } from 'date-fns' + +const formatToDate = (date: Date) => format(date, 'yyyy-MM-dd') const today: Date = new Date() @@ -271,8 +273,8 @@ export default class TransactionCreate extends Vue { public name: string = '' public amount: number | null = null public tag: TransactionTag = TransactionTag.None - public today: string = formatDate(today) - public date: string = formatDate(today) + public today: string = formatToDate(today) + public date: string = formatToDate(today) public currency: ICurrency | null = null public payBy: string = '' public payFor: ISplit[] = [] @@ -289,7 +291,8 @@ export default class TransactionCreate extends Vue { public setData(transaction: ITransaction): void { this.name = transaction.name - this.date = formatDate(transaction.date) + this.date = formatToDate(transaction.date) + this.tag = transaction.tag this.amount = transaction.amount || null this.payBy = transaction.payBy @@ -320,6 +323,7 @@ export default class TransactionCreate extends Vue { (c: ICurrency) => c.code ) const date: Date = new Date(this.date) + date.setHours(today.getHours(), today.getMinutes()) const hasId: boolean = !!this.transaction._id const amount: number = this.amount ? parseFloat(this.amount.toString().replace(',', '.'))