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

apply scroll to load data changes in customer and fixed search with scroll to load data issue in estimate, invoice, recurring invoice and payments

Browse Source
This commit is contained in:
asift798
2022-02-15 18:41:05 +05:30
parent 13cbb5439f
commit 30dc428b1a
5 changed files with 221 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
resources/scripts/admin/views/recurring-invoices/partials/RecurringInvoiceViewSidebar.vue
View File

@ -12,7 +12,6 @@ const recurringInvoiceStore = useRecurringInvoiceStore()
const { t } = useI18n()
const route = useRoute()
const isSearching = ref(false)
const isLoading = ref(false)
const invoiceList = ref(null)
@ -37,29 +36,52 @@ function hasActiveUrl(id) {
return route.params.id == id
}
async function loadRecurringInvoices(params, fromScrollListener = false) {
async function loadRecurringInvoices(pageNumber, fromScrollListener = false) {
if (isLoading.value) {
return
}
let params = {}
if (
searchData.searchText !== '' &&
searchData.searchText !== null &&
searchData.searchText !== undefined
) {
params.search = searchData.searchText
}
if (searchData.orderBy !== null && searchData.orderBy !== undefined) {
params.orderBy = searchData.orderBy
}
if (
searchData.orderByField !== null &&
searchData.orderByField !== undefined
) {
params.orderByField = searchData.orderByField
}
isLoading.value = true
let response = await recurringInvoiceStore.fetchRecurringInvoices(params)
let response = await recurringInvoiceStore.fetchRecurringInvoices({
page: pageNumber,
...params,
})
isLoading.value = false
invoiceList.value = invoiceList.value ? invoiceList.value : []
invoiceList.value = [...invoiceList.value, ...response.data.data]
currentPageNumber.value = params ? params.page : 1
currentPageNumber.value = pageNumber ? pageNumber : 1
lastPageNumber.value = response.data.meta.last_page
let invoiceFound = invoiceList.value.find((inv) => inv.id == route.params.id)
if (
fromScrollListener == false &&
!invoiceFound &&
currentPageNumber.value < lastPageNumber.value
currentPageNumber.value < lastPageNumber.value &&
Object.keys(params).length === 0
) {
loadRecurringInvoices({ page: ++currentPageNumber.value })
loadRecurringInvoices(++currentPageNumber.value)
}
if (invoiceFound) {
@ -88,37 +110,15 @@ function addScrollListener() {
ev.target.scrollHeight - 200
) {
if (currentPageNumber.value < lastPageNumber.value) {
loadRecurringInvoices({ page: ++currentPageNumber.value }, true)
loadRecurringInvoices(++currentPageNumber.value, true)
}
}
})
}
async function onSearched() {
let data = ''
if (
searchData.searchText !== '' &&
searchData.searchText !== null &&
searchData.searchText !== undefined
) {
data += `search=${searchData.searchText}&`
}
if (searchData.orderBy !== null && searchData.orderBy !== undefined) {
data += `orderBy=${searchData.orderBy}&`
}
if (
searchData.orderByField !== null &&
searchData.orderByField !== undefined
) {
data += `orderByField=${searchData.orderByField}`
}
isSearching.value = true
let response = await recurringInvoiceStore.searchRecurringInvoice(data)
isSearching.value = false
if (response.data) {
invoiceList.value = response.data.data
}
invoiceList.value = []
loadRecurringInvoices()
}
function sortData() {
@ -327,14 +327,11 @@ onSearched = debounce(onSearched, 500)
</div>
</router-link>
</div>
<div
v-if="isLoading || isSearching"
class="flex justify-center p-4 items-center"
>
<div v-if="isLoading" class="flex justify-center p-4 items-center">
<LoadingIcon class="h-6 m-1 animate-spin text-primary-400" />
</div>
<p
v-if="!invoiceList?.length && !isLoading && !isSearching"
v-if="!invoiceList?.length && !isLoading"
class="flex justify-center px-4 mt-5 text-sm text-gray-600"
>
{{ $t('invoices.no_matching_invoices') }}