mirror of
https://github.com/crater-invoice/crater.git
synced 2025-10-28 12:11:08 -04:00
Merge branch 'master'
This commit is contained in:
@ -6,7 +6,6 @@
|
|||||||
value-prop="id"
|
value-prop="id"
|
||||||
label="name"
|
label="name"
|
||||||
:filter-results="false"
|
:filter-results="false"
|
||||||
:min-chars="1"
|
|
||||||
resolve-on-load
|
resolve-on-load
|
||||||
:delay="500"
|
:delay="500"
|
||||||
:searchable="true"
|
:searchable="true"
|
||||||
|
|||||||
@ -2,6 +2,21 @@
|
|||||||
import DashboardStats from '../dashboard/DashboardStats.vue'
|
import DashboardStats from '../dashboard/DashboardStats.vue'
|
||||||
import DashboardChart from '../dashboard/DashboardChart.vue'
|
import DashboardChart from '../dashboard/DashboardChart.vue'
|
||||||
import DashboardTable from '../dashboard/DashboardTable.vue'
|
import DashboardTable from '../dashboard/DashboardTable.vue'
|
||||||
|
import { useUserStore } from '@/scripts/stores/user'
|
||||||
|
import { onMounted } from 'vue'
|
||||||
|
import { useRoute, useRouter } from 'vue-router'
|
||||||
|
|
||||||
|
const route = useRoute()
|
||||||
|
const userStore = useUserStore()
|
||||||
|
const router = useRouter()
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
if (route.meta.ability && !userStore.hasAbilities(route.meta.ability)) {
|
||||||
|
router.push({ name: 'account.settings' })
|
||||||
|
} else if (route.meta.isOwner && !userStore.currentUser.is_owner) {
|
||||||
|
router.push({ name: 'account.settings' })
|
||||||
|
}
|
||||||
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
|||||||
@ -179,10 +179,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template #cell-name="{ row }">
|
<template #cell-name="{ row }">
|
||||||
<BaseText
|
<BaseText :text="row.data.customer.name" :length="30" />
|
||||||
:text="row.data.customer.name"
|
|
||||||
:length="30"
|
|
||||||
/>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<!-- Invoice Number -->
|
<!-- Invoice Number -->
|
||||||
|
|||||||
@ -50,12 +50,16 @@
|
|||||||
<BaseInputGroup :label="$tc('items.unit')" class="text-left">
|
<BaseInputGroup :label="$tc('items.unit')" class="text-left">
|
||||||
<BaseMultiselect
|
<BaseMultiselect
|
||||||
v-model="filters.unit_id"
|
v-model="filters.unit_id"
|
||||||
:options="itemStore.itemUnits"
|
|
||||||
label="name"
|
|
||||||
:placeholder="$t('items.select_a_unit')"
|
:placeholder="$t('items.select_a_unit')"
|
||||||
class="w-full"
|
|
||||||
value-prop="id"
|
value-prop="id"
|
||||||
|
track-by="name"
|
||||||
|
:filter-results="false"
|
||||||
|
label="name"
|
||||||
|
resolve-on-load
|
||||||
|
:delay="500"
|
||||||
searchable
|
searchable
|
||||||
|
class="w-full"
|
||||||
|
:options="searchUnits"
|
||||||
/>
|
/>
|
||||||
</BaseInputGroup>
|
</BaseInputGroup>
|
||||||
|
|
||||||
@ -298,6 +302,12 @@ function setFilters() {
|
|||||||
refreshTable()
|
refreshTable()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function searchUnits(search) {
|
||||||
|
let res = await itemStore.fetchItemUnits({ search })
|
||||||
|
|
||||||
|
return res.data.data
|
||||||
|
}
|
||||||
|
|
||||||
async function fetchData({ page, filter, sort }) {
|
async function fetchData({ page, filter, sort }) {
|
||||||
let data = {
|
let data = {
|
||||||
search: filters.name,
|
search: filters.name,
|
||||||
|
|||||||
@ -514,8 +514,9 @@ function selectNewCustomer(id) {
|
|||||||
|
|
||||||
if (route.params.id) params.model_id = route.params.id
|
if (route.params.id) params.model_id = route.params.id
|
||||||
|
|
||||||
paymentStore.currentPayment.invoice_id = null
|
paymentStore.currentPayment.invoice_id = selectedInvoice.value = null
|
||||||
|
paymentStore.currentPayment.amount = 100
|
||||||
|
invoiceList.value = []
|
||||||
paymentStore.getNextNumber(params, true)
|
paymentStore.getNextNumber(params, true)
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Reference in New Issue
Block a user