diff --git a/src/_services/bill.service.js b/src/_services/bill.service.js index f4558d7..02e7657 100644 --- a/src/_services/bill.service.js +++ b/src/_services/bill.service.js @@ -11,5 +11,5 @@ function getAllBillsByAccount(userId, messages, errors) { } function getBillByAccountAndId(userId, billId, messages, errors) { - return fetch(`${config.apiUrl}/users/${userId}/bills/${billId}`, util.getWithAuth()).then(util.handleCrudResponse(messages, errors)); + return fetch(`${config.apiUrl}/users/${userId}/bills/${billId}?payments=true`, util.getWithAuth()).then(util.handleCrudResponse(messages, errors)); } diff --git a/src/account/payment/BillsPage.vue b/src/account/payment/BillsPage.vue index d77e8ff..fc428e2 100644 --- a/src/account/payment/BillsPage.vue +++ b/src/account/payment/BillsPage.vue @@ -1,6 +1,42 @@ @@ -36,28 +73,27 @@ userId: null, linkPrefix: null, currentUser: util.currentUser(), - billObjects: null + billFocus: null }; }, computed: { ...mapState('system', ['messages']), - ...mapState('bills', ['bills']) + ...mapState('bills', ['bills', 'bill']) }, methods: { - ...mapActions('bills', ['getAllBillsByAccount']), - ...mapGetters('bills', ['loading']) + ...mapActions('bills', ['getAllBillsByAccount', 'getBillByAccountAndId']), + ...mapGetters('bills', ['loading']), + showBillDetail (bill) { + this.billFocus = bill; + if (bill !== null) { + this.getBillByAccountAndId({userId: this.userId, billId: bill.uuid, messages: this.messages, errors: this.errors}); + } + } }, watch: { - bills (b) { - if (b && b.length && b.length > 0) { - const billObjects = []; - for (let i=0; i