diff --git a/src/api/subscriber.js b/src/api/subscriber.js index d8445296..4b605542 100644 --- a/src/api/subscriber.js +++ b/src/api/subscriber.js @@ -773,20 +773,8 @@ export async function getSubscriberRegistrations (options) { return list } export async function getSubscriberPhonebook (options) { - let all = false - if (options.rows === 0) { - delete options.rows - delete options.page - all = true - } - if (!options.order_by) { - delete options.order_by - delete options.order_by_direction - } - options.include = 'all' - const list = await getList({ - resource: 'subscriberphonebookentries', - all, + const list = await get({ + path: `api/v2/subscribers/${options.subscriber_id}/phonebook`, params: options }) return list @@ -813,9 +801,10 @@ export async function createPhonebook (data) { const payLoad = { name: data.name, number: data.number, - shared: data.shared + shared: data.shared, + subscriber_id: Number(data.subscriber_id) } - return await httpApi.post('api/subscriberphonebookentries/', payLoad) + return await httpApi.post(`api/v2/subscribers/${data.subscriber_id}/phonebook`, payLoad) } export async function createCustomerPhonebook (data) { const payLoad = { diff --git a/src/pages/CscPageSubscriberPhonebook.vue b/src/pages/CscPageSubscriberPhonebook.vue index 77b1ef59..0b934b43 100644 --- a/src/pages/CscPageSubscriberPhonebook.vue +++ b/src/pages/CscPageSubscriberPhonebook.vue @@ -241,6 +241,7 @@ export default { rows: rowsPerPage, order_by: sortBy, order_by_direction: descending ? 'desc' : 'asc', + include: 'customer', subscriber_id: this.getSubscriberId }) this.pagination = { ...props.pagination } @@ -272,7 +273,10 @@ export default { cancel: true, persistent: true }).onOk(async (data) => { - await this.removeSubscriberPhonebook(row) + await this.removeSubscriberPhonebook({ + row, + subscriberId: this.getSubscriberId + }) await this.refresh() }) }, @@ -320,6 +324,7 @@ export default { rows: this.pagination.rowsPerPage, order_by: this.pagination.sortBy, order_by_direction: this.pagination.descending ? 'desc' : 'asc', + include: 'customer', subscriber_id: this.getSubscriberId }) } diff --git a/src/pages/CscPageSubscriberPhonebookAdd.vue b/src/pages/CscPageSubscriberPhonebookAdd.vue index 39f54415..1aee153c 100644 --- a/src/pages/CscPageSubscriberPhonebookAdd.vue +++ b/src/pages/CscPageSubscriberPhonebookAdd.vue @@ -107,7 +107,8 @@ export default { }, computed: { ...mapGetters('user', [ - 'prefilledNumber' + 'prefilledNumber', + 'getSubscriberId' ]), nameErrorMessage () { const errorsTab = this.v$.formData.name.$errors @@ -158,6 +159,7 @@ export default { }, async confirm () { try { + this.formData.subscriber_id = this.getSubscriberId await this.createPhonebookSubscriber(this.formData) await this.$router.push('/user/subscriber-phonebook/') } catch (error) { diff --git a/src/pages/CscPageSubscriberPhonebookDetails.vue b/src/pages/CscPageSubscriberPhonebookDetails.vue index 892c896f..e737c7ae 100644 --- a/src/pages/CscPageSubscriberPhonebookDetails.vue +++ b/src/pages/CscPageSubscriberPhonebookDetails.vue @@ -75,6 +75,7 @@