diff --git a/src/plugins/balance/pages/Overview.vue b/src/plugins/balance/pages/Overview.vue index 660bab0..005fff0 100644 --- a/src/plugins/balance/pages/Overview.vue +++ b/src/plugins/balance/pages/Overview.vue @@ -16,7 +16,16 @@ :loading="loading" @request="onRequest" binary-state-sort - /> + > + + + @@ -41,6 +50,7 @@ export default defineComponent({ }); }); + const showCancelled = ref(false); const data = ref([]); const loading = ref(false); const pagination = ref({ @@ -61,7 +71,6 @@ export default defineComponent({ function onRequest(props: { pagination: PaginationInterface; filter?: string }) { const { page, rowsPerPage, sortBy, descending } = props.pagination; - const filter = props.filter; loading.value = true; // get all rows if "All" (0) is selected @@ -70,7 +79,12 @@ export default defineComponent({ const startRow = (page - 1) * rowsPerPage; store .dispatch('balance/getTransactions', { - filter: { offset: startRow, limit: fetchCount } + filter: { + offset: startRow, + limit: fetchCount, + showCancelled: showCancelled.value, + showReversals: false + } }) .then((result: TransactionsResponse) => { // clear out existing data and add new @@ -128,7 +142,7 @@ export default defineComponent({ } ]; - return { data, pagination, onRequest, loading, balance, columns }; + return { data, pagination, onRequest, loading, balance, columns, showCancelled }; } }); diff --git a/src/plugins/balance/store/balance.ts b/src/plugins/balance/store/balance.ts index 8817da2..1fb3f17 100644 --- a/src/plugins/balance/store/balance.ts +++ b/src/plugins/balance/store/balance.ts @@ -126,7 +126,14 @@ const actions: ActionTree = { { commit, rootState }, payload: { userid?: string; - filter?: { limit?: number; offset?: number; from?: Date; to?: Date }; + filter?: { + limit?: number; + offset?: number; + from?: Date; + to?: Date; + showReversals?: boolean; + showCancelled?: boolean; + }; } ) { commit('setLoading');