TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 12:11:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-date-formate-issue' into 'master'

Browse Source 
date formatting issue fix

See merge request mohit.panjvani/crater-web!1339
This commit is contained in:
Mohit Panjwani
2021-12-13 10:00:42 +00:00
parent b770e6277f 99b1cc80c6
commit 7f04781604
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/scripts/views/expenses/Index.vue
View File

@ -185,6 +185,10 @@
/> />
</template> </template>
<template #cell-expense_date="{ row }">
{{ row.data.formatted_expense_date }}
</template>
<template #cell-user_name="{ row }"> <template #cell-user_name="{ row }">
<BaseText <BaseText
:text="row.data.customer ? row.data.customer.name : '-'" :text="row.data.customer ? row.data.customer.name : '-'"

10
resources/scripts/views/payments/Index.vue
View File

@ -151,6 +151,10 @@
</div> </div>
</template> </template>
<template #cell-payment_date="{ row }">
{{ row.data.formatted_payment_date }}
</template>
<template #cell-payment_number="{ row }"> <template #cell-payment_number="{ row }">
<router-link <router-link
:to="{ path: `payments/${row.data.id}/view` }" :to="{ path: `payments/${row.data.id}/view` }"
@ -161,11 +165,7 @@
</template> </template>
<template #cell-name="{ row }"> <template #cell-name="{ row }">
<BaseText <BaseText :text="row.data.customer.name" :length="30" tag="span" />
:text="row.data.customer.name"
:length="30"
tag="span"
/>
</template> </template>
<template #cell-payment_mode="{ row }"> <template #cell-payment_mode="{ row }">

6
resources/scripts/views/payments/View.vue
View File

@ -163,7 +163,7 @@
> >
<div class="flex-2"> <div class="flex-2">
<BaseText <BaseText
:text="payment?.customer?.name " :text="payment?.customer?.name"
:length="30" :length="30"
class=" class="
pr-2 pr-2
@ -219,11 +219,11 @@
text-right text-gray-900 text-right text-gray-900
" "
:amount="payment?.amount" :amount="payment?.amount"
:currency="payment?.currency" :currency="payment.customer.currency"
/> />
<div class="text-sm text-right text-gray-500 non-italic"> <div class="text-sm text-right text-gray-500 non-italic">
{{ paymentDate }} {{ payment.formatted_payment_date }}
</div> </div>
</div> </div>
</router-link> </router-link>