diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 087a8f19..703f72c4 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -40,7 +40,7 @@ "/chunks/files.js": "/chunks/files.js?id=ee5b19530d832c6f9f34", "/chunks/files~chunks/oasis/invoices/list~chunks/oasis/platba~chunks/settings-subscription~chunks/shar~d6675e1e.js": "/chunks/files~chunks/oasis/invoices/list~chunks/oasis/platba~chunks/settings-subscription~chunks/shar~d6675e1e.js?id=effef49b99446fdaee0b", "/chunks/files~chunks/oasis/invoices/list~chunks/platform~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/oasis/invoices/list~chunks/platform~chunks/shared-files~chunks/shared/file-browser.js?id=c777877000f1e219a748", - "/chunks/files~chunks/oasis/invoices/list~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/oasis/invoices/list~chunks/shared-files~chunks/shared/file-browser.js?id=c6fc1ec1f0bf1b367c92", + "/chunks/files~chunks/oasis/invoices/list~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/oasis/invoices/list~chunks/shared-files~chunks/shared/file-browser.js?id=a35f0d58f42da919a182", "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~87b39a8d.js?id=c226fe89b510c599615f", "/chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/f~9f6a6eef.js": "/chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/f~9f6a6eef.js?id=9bc0d89f45dff1feb308", "/chunks/files~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.js?id=14b259c05259260985ec", @@ -53,7 +53,7 @@ "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=7fc7f9b6f10bdfac770e", "/chunks/oasis/homepage.js": "/chunks/oasis/homepage.js?id=a1885dd8814f9eb63a1c", "/chunks/oasis/invoices.js": "/chunks/oasis/invoices.js?id=fd5e7aca8897f59cd625", - "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=b94927bd83dae0172ac2", + "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=7e67f5fdd3306971f5e4", "/chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=28a7253b6d421716fe94", "/chunks/oasis/platba.js": "/chunks/oasis/platba.js?id=53d9f2a31b1dd5dad85e", "/chunks/oasis/platba~chunks/oasis/upgrade-billing~chunks/oasis/upgrade-plan~chunks/upgrade-billing~ch~6880400b.js": "/chunks/oasis/platba~chunks/oasis/upgrade-billing~chunks/oasis/upgrade-plan~chunks/upgrade-billing~ch~6880400b.js?id=0c8d1c3cca084baa177f", @@ -229,5 +229,10 @@ "/js/main.4ea5f95a6ebe1bc881ca.hot-update.js": "/js/main.4ea5f95a6ebe1bc881ca.hot-update.js", "/chunks/oasis/invoices.4ea5f95a6ebe1bc881ca.hot-update.js": "/chunks/oasis/invoices.4ea5f95a6ebe1bc881ca.hot-update.js", "/chunks/oasis/invoices/list.4ea5f95a6ebe1bc881ca.hot-update.js": "/chunks/oasis/invoices/list.4ea5f95a6ebe1bc881ca.hot-update.js", - "/chunks/oasis/invoices~chunks/oasis/invoices/list.4ea5f95a6ebe1bc881ca.hot-update.js": "/chunks/oasis/invoices~chunks/oasis/invoices/list.4ea5f95a6ebe1bc881ca.hot-update.js" + "/chunks/oasis/invoices~chunks/oasis/invoices/list.4ea5f95a6ebe1bc881ca.hot-update.js": "/chunks/oasis/invoices~chunks/oasis/invoices/list.4ea5f95a6ebe1bc881ca.hot-update.js", + "/chunks/oasis/invoices/list.8e2d2be381674fb05b0c.hot-update.js": "/chunks/oasis/invoices/list.8e2d2be381674fb05b0c.hot-update.js", + "/chunks/oasis/invoices/list.df406d455e437b8b4db6.hot-update.js": "/chunks/oasis/invoices/list.df406d455e437b8b4db6.hot-update.js", + "/js/main.0ac3865b6b3762804fff.hot-update.js": "/js/main.0ac3865b6b3762804fff.hot-update.js", + "/chunks/files~chunks/oasis/invoices/list~chunks/shared-files~chunks/shared/file-browser.7ac3afc1072873d385f7.hot-update.js": "/chunks/files~chunks/oasis/invoices/list~chunks/shared-files~chunks/shared/file-browser.7ac3afc1072873d385f7.hot-update.js", + "/chunks/oasis/invoices/list.49eab18a6be6e969328a.hot-update.js": "/chunks/oasis/invoices/list.49eab18a6be6e969328a.hot-update.js" } diff --git a/resources/js/Oasis/Modules/Invoices/components/InvoiceBrowser.vue b/resources/js/Oasis/Modules/Invoices/components/InvoiceBrowser.vue index 95a6441c..b0b35be8 100644 --- a/resources/js/Oasis/Modules/Invoices/components/InvoiceBrowser.vue +++ b/resources/js/Oasis/Modules/Invoices/components/InvoiceBrowser.vue @@ -113,7 +113,7 @@ }, watch: { query(val) { - this.$searchFiles(val) + this.$searchInvoices(val) } }, data() { diff --git a/resources/js/Oasis/Modules/Invoices/components/InvoiceDesktopToolbar.vue b/resources/js/Oasis/Modules/Invoices/components/InvoiceDesktopToolbar.vue index 594fe385..4cc8ac33 100644 --- a/resources/js/Oasis/Modules/Invoices/components/InvoiceDesktopToolbar.vue +++ b/resources/js/Oasis/Modules/Invoices/components/InvoiceDesktopToolbar.vue @@ -65,13 +65,12 @@ import ToolbarWrapper from '@/components/Desktop/ToolbarWrapper' import ToolbarButton from '@/components/FilesView/ToolbarButton' import ToolbarGroup from '@/components/Desktop/ToolbarGroup' + import OptionGroup from '@/components/FilesView/OptionGroup' import PopoverItem from '@/components/Desktop/PopoverItem' import SearchBar from '@/components/FilesView/SearchBar' + import Option from '@/components/FilesView/Option' import {mapGetters} from 'vuex' import {events} from '@/bus' - import OptionGroup from '@/components/FilesView/OptionGroup' - import Option from '@/components/FilesView/Option' - import {debounce} from "lodash"; export default { name: 'InvoiceDesktopToolbar', @@ -111,29 +110,9 @@ } }, watch: { - query: debounce(function (value) { - - if (value !== '' && typeof value !== 'undefined') { - - if (['regular-invoice', 'advance-invoice'].includes(this.$store.getters.currentFolder.location)) { - this.$store.dispatch('getSearchResultForInvoices', value) - } else { - this.$store.dispatch('getSearchResultForClients', value) - } - - } else if (typeof value !== 'undefined') { - - let locations = { - 'regular-invoice': 'getRegularInvoices', - 'advance-invoice': 'getAdvanceInvoices', - 'clients': 'getClients', - } - - this.$store.dispatch(locations[this.$store.getters.currentFolder.location]) - - this.$store.commit('CHANGE_SEARCHING_STATE', false) - } - }, 300) + query(val) { + this.$searchInvoices(val) + } }, methods: { showSortingMenu() { diff --git a/resources/js/components/FilesView/SearchBar.vue b/resources/js/components/FilesView/SearchBar.vue index 72ff9e1c..d5c0eaf2 100644 --- a/resources/js/components/FilesView/SearchBar.vue +++ b/resources/js/components/FilesView/SearchBar.vue @@ -9,7 +9,7 @@ diff --git a/resources/js/helpers.js b/resources/js/helpers.js index 7f24e573..4a3b2189 100644 --- a/resources/js/helpers.js +++ b/resources/js/helpers.js @@ -7,6 +7,29 @@ import axios from 'axios' const Helpers = { install(Vue) { + Vue.prototype.$searchInvoices = debounce(function (value) { + + if (value !== '' && typeof value !== 'undefined') { + + if (['regular-invoice', 'advance-invoice'].includes(this.$store.getters.currentFolder.location)) { + this.$store.dispatch('getSearchResultForInvoices', value) + } else { + this.$store.dispatch('getSearchResultForClients', value) + } + } else if (typeof value !== 'undefined') { + + let locations = { + 'regular-invoice': 'getRegularInvoices', + 'advance-invoice': 'getAdvanceInvoices', + 'clients': 'getClients', + } + + this.$store.dispatch(locations[this.$store.getters.currentFolder.location]) + + this.$store.commit('CHANGE_SEARCHING_STATE', false) + } + }, 300) + Vue.prototype.$searchFiles = debounce(function (value) { if (value !== '' && typeof value !== 'undefined') {