diff --git a/resources/js/Pages/Finance/Account.vue b/resources/js/Pages/Finance/Account.vue
index d7ca5de4..06457bf8 100644
--- a/resources/js/Pages/Finance/Account.vue
+++ b/resources/js/Pages/Finance/Account.vue
@@ -1,6 +1,6 @@
@@ -156,6 +181,13 @@ const reconciliation = () => {
>
Review Reconciliation
+
+ Pay credit card
+
diff --git a/resources/js/Pages/Finance/Budget.vue b/resources/js/Pages/Finance/Budget.vue
index 132d50bb..79b972b7 100644
--- a/resources/js/Pages/Finance/Budget.vue
+++ b/resources/js/Pages/Finance/Budget.vue
@@ -58,7 +58,7 @@ const { serverSearchOptions } = toRefs(props);
const { state: pageState, executeSearchWithDelay } = useServerSearch(
serverSearchOptions,
{
- manual: true,
+ manual: false,
defaultDates: true,
}
);
diff --git a/resources/js/Pages/WidgetHeaderRow.vue b/resources/js/Pages/WidgetHeaderRow.vue
index 1c187461..6080e995 100644
--- a/resources/js/Pages/WidgetHeaderRow.vue
+++ b/resources/js/Pages/WidgetHeaderRow.vue
@@ -22,7 +22,7 @@ defineProps<{
{{ valueBadge }}
- {{ {{ value }}}}
+ {{ value }}
diff --git a/resources/js/composables/useServerSearch.ts b/resources/js/composables/useServerSearch.ts
index f843e39c..d43729e7 100644
--- a/resources/js/composables/useServerSearch.ts
+++ b/resources/js/composables/useServerSearch.ts
@@ -1,7 +1,6 @@
+import { endOfMonth, startOfMonth, format, parseISO } from 'date-fns';
// import { format, parseISO } from "date-fns";
-import format from "date-fns/format";
-import parseISO from "date-fns/parseISO";
-import { reactive, Ref, watch, nextTick, computed, ref, inject, toRaw, onMounted } from "vue";
+import { reactive, Ref, watch, nextTick, computed, ref, inject } from "vue";
import debounce from "lodash/debounce";
export interface IServerSearchData {
@@ -102,10 +101,17 @@ export const parseParams = (state: SearchState) => {
.join("&");
};
-function parseDateFilters(options: Ref>) {
- const dates = options?.value?.filters?.date
+function parseDateFilters(options: Ref>, setDefaultDate: boolean) {
+
+ const defaultDates = setDefaultDate ? [
+ format(startOfMonth(new Date()), 'yyyy-MM-dd'),
+ format(endOfMonth(new Date()), 'yyyy-MM-dd')
+ ] : [null, null]
+
+ const dates = options?.value?.filters?.date
? options.value.filters.date.split("~")
- : [null, null];
+ : defaultDates;
+
return {
startDate: dates[0] && parseISO(dates[0]),
endDate:
diff --git a/resources/js/domains/transactions/components/CategoryTrendsPreview.vue b/resources/js/domains/transactions/components/CategoryTrendsPreview.vue
index fdb72dd7..f71daf72 100644
--- a/resources/js/domains/transactions/components/CategoryTrendsPreview.vue
+++ b/resources/js/domains/transactions/components/CategoryTrendsPreview.vue
@@ -36,21 +36,21 @@ const typeLabel = computed(() => {
+
+
+
-
- {{ typeLabel }}
-
-