diff --git a/frontend/views/containers/payments/MonthOverview.vue b/frontend/views/containers/payments/MonthOverview.vue index 27cc17f064..58d6479f77 100644 --- a/frontend/views/containers/payments/MonthOverview.vue +++ b/frontend/views/containers/payments/MonthOverview.vue @@ -3,7 +3,7 @@ i18n.c-summary-title.is-title-4( tag='h4' data-test='thisMonth' - :args='{ month: moment(new Date()).format("MMMM") }' + :args='{ month: humanDate(Date.now(), { month: "long" }) }' ) {month} overview .c-summary-item( @@ -27,7 +27,7 @@ import currencies from '@view-utils/currencies.js' import { mapGetters } from 'vuex' import ProgressBar from '@components/graphs/Progress.vue' import L from '@view-utils/translations.js' -import moment from 'moment' +import { humanDate } from '@view-utils/humanDate.js' export default { name: 'MonthOverview', @@ -74,7 +74,7 @@ export default { } }, methods: { - moment, + humanDate, // TEMP statusIsSent (user) { return ['completed', 'pending'].includes(user.status) diff --git a/frontend/views/containers/payments/PaymentDetail.vue b/frontend/views/containers/payments/PaymentDetail.vue index 250084d8ae..214dea8227 100644 --- a/frontend/views/containers/payments/PaymentDetail.vue +++ b/frontend/views/containers/payments/PaymentDetail.vue @@ -10,10 +10,10 @@ modal-template(ref='modal' v-if='payment') ul.c-payment-list li.c-payment-list-item i18n.has-text-1(tag='label') Date & Time - strong {{ moment(payment.date).format('hh:mm - MMMM DD, YYYY') }} + strong {{ humanDate(this.payment.date, { year: 'numeric', month: 'long', day: 'numeric', hour: '2-digit', minute: '2-digit' }) }} li.c-payment-list-item i18n.has-text-1(tag='label') Relative to - strong {{ moment(payment.relativeTo).format('MMMM')}} + strong {{ humanDate(payment.relativeTo, { month: 'long' }) }} li.c-payment-list-item i18n.has-text-1(tag='label') Mincome at the time strong {{ currency(groupSettings.mincomeAmount) }} @@ -31,11 +31,11 @@ modal-template(ref='modal' v-if='payment')