mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-07 05:31:24 +00:00
Add expense number at Expenses (#406)
* add expense number at expenses * Re-order expense fields * Rename expense_number migration * Add expense_number to tests --------- Co-authored-by: Darko Gjorgjijoski <dg@darkog.com>
This commit is contained in:
committed by
GitHub
parent
f3e49d3044
commit
3e96297699
1
resources/scripts/admin/stub/expense.js
vendored
1
resources/scripts/admin/stub/expense.js
vendored
@@ -3,6 +3,7 @@ import moment from 'moment'
|
||||
export default {
|
||||
expense_category_id: null,
|
||||
expense_date: moment().format('YYYY-MM-DD'),
|
||||
expense_number: '',
|
||||
amount: 100,
|
||||
notes: '',
|
||||
attachment_receipt: null,
|
||||
|
||||
@@ -116,6 +116,19 @@
|
||||
/>
|
||||
</BaseInputGroup>
|
||||
|
||||
<BaseInputGroup
|
||||
:label="$t('expenses.expense_number')"
|
||||
:content-loading="isFetchingInitialData"
|
||||
>
|
||||
<BaseInput
|
||||
v-model="expenseStore.currentExpense.expense_number"
|
||||
:content-loading="isFetchingInitialData"
|
||||
type="text"
|
||||
name="expense_number"
|
||||
:placeholder="$t('expenses.expense_number_placeholder')"
|
||||
/>
|
||||
</BaseInputGroup>
|
||||
|
||||
<BaseInputGroup
|
||||
:label="$t('expenses.amount')"
|
||||
:error="
|
||||
@@ -134,6 +147,7 @@
|
||||
@input="v$.currentExpense.amount.$touch()"
|
||||
/>
|
||||
</BaseInputGroup>
|
||||
|
||||
<BaseInputGroup
|
||||
:label="$t('expenses.currency')"
|
||||
:content-loading="isFetchingInitialData"
|
||||
@@ -216,6 +230,9 @@
|
||||
</BaseMultiselect>
|
||||
</BaseInputGroup>
|
||||
|
||||
</BaseInputGrid>
|
||||
|
||||
<BaseInputGrid class="mt-4">
|
||||
<BaseInputGroup
|
||||
:content-loading="isFetchingInitialData"
|
||||
:label="$t('expenses.note')"
|
||||
@@ -276,6 +293,7 @@
|
||||
</BaseButton>
|
||||
</div>
|
||||
</BaseInputGrid>
|
||||
|
||||
</BaseCard>
|
||||
</form>
|
||||
</BasePage>
|
||||
@@ -482,7 +500,10 @@ async function submitForm() {
|
||||
|
||||
isSaving.value = true
|
||||
|
||||
let formData = expenseStore.currentExpense
|
||||
let formData = {
|
||||
...expenseStore.currentExpense,
|
||||
expense_number: expenseStore.currentExpense.expense_number || ''
|
||||
}
|
||||
|
||||
try {
|
||||
if (isEdit.value) {
|
||||
|
||||
@@ -188,6 +188,10 @@
|
||||
{{ row.data.formatted_expense_date }}
|
||||
</template>
|
||||
|
||||
<template #cell-expense_number="{ row }">
|
||||
{{ row.data.expense_number || '-' }}
|
||||
</template>
|
||||
|
||||
<template #cell-user_name="{ row }">
|
||||
<BaseText
|
||||
:text="row.data.customer ? row.data.customer.name : '-'"
|
||||
@@ -281,6 +285,12 @@ const expenseColumns = computed(() => {
|
||||
thClass: 'extra',
|
||||
tdClass: 'font-medium text-gray-900',
|
||||
},
|
||||
{
|
||||
key: 'expense_number',
|
||||
label: t('expenses.expense_number'),
|
||||
thClass: 'extra',
|
||||
tdClass: 'font-medium text-gray-900',
|
||||
},
|
||||
{
|
||||
key: 'name',
|
||||
label: t('expenses.category'),
|
||||
|
||||
Reference in New Issue
Block a user