From cfa4385c6ad2e8ce5875cb2fe2cd60d959e74800 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 26 Jul 2023 11:48:16 +0530 Subject: [PATCH 1/6] chore: remove undeclared field --- desk/src/components/global/Autocomplete.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/desk/src/components/global/Autocomplete.vue b/desk/src/components/global/Autocomplete.vue index f569e3724..49ddd872f 100644 --- a/desk/src/components/global/Autocomplete.vue +++ b/desk/src/components/global/Autocomplete.vue @@ -19,7 +19,6 @@ >
Date: Wed, 26 Jul 2023 11:55:51 +0530 Subject: [PATCH 2/6] fix: ticket type list routing --- desk/src/components/desk/global/AddNewTicketTypeDialog.vue | 2 +- desk/src/components/desk/settings/SettingsSideBarMenu.vue | 2 +- .../components/desk/settings/ticket_types/TicketTypeInfo.vue | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/desk/src/components/desk/global/AddNewTicketTypeDialog.vue b/desk/src/components/desk/global/AddNewTicketTypeDialog.vue index aa8c1d518..a118fbe5f 100644 --- a/desk/src/components/desk/global/AddNewTicketTypeDialog.vue +++ b/desk/src/components/desk/global/AddNewTicketTypeDialog.vue @@ -152,7 +152,7 @@ export default { return { url: "frappe.client.insert", onSuccess: (doc) => { - this.$router.push(`/ticket_types`) + this.$router.push(`/ticket-types`) }, } }, diff --git a/desk/src/components/desk/settings/SettingsSideBarMenu.vue b/desk/src/components/desk/settings/SettingsSideBarMenu.vue index 21a5775c1..162419cf4 100644 --- a/desk/src/components/desk/settings/SettingsSideBarMenu.vue +++ b/desk/src/components/desk/settings/SettingsSideBarMenu.vue @@ -35,7 +35,7 @@ export default { { label: "Ticket Types", pageName: "TicketTypes", - route: "/settings/ticket_types", + route: "/ticket-types", }, { label: "Support Policies", diff --git a/desk/src/components/desk/settings/ticket_types/TicketTypeInfo.vue b/desk/src/components/desk/settings/ticket_types/TicketTypeInfo.vue index 851c13187..300029d68 100644 --- a/desk/src/components/desk/settings/ticket_types/TicketTypeInfo.vue +++ b/desk/src/components/desk/settings/ticket_types/TicketTypeInfo.vue @@ -182,7 +182,7 @@ export default { url: "frappe.client.rename_doc", onSuccess: (res) => { this.$router.push({ - path: `/settings/ticket_types/${res}`, + path: `/ticket-types/${res}`, }); }, }; @@ -192,7 +192,7 @@ export default { url: "frappe.client.insert", onSuccess: (res) => { this.$router.push({ - path: `/settings/ticket_types/${res.name}`, + path: `/ticket-types/${res.name}`, }); }, }; From bc3545fd5135a91ba51c4b683ddf5894fb35d6a2 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 26 Jul 2023 14:25:51 +0530 Subject: [PATCH 3/6] fix: show add button in add agent dialog --- desk/src/components/desk/global/AddNewAgentsDialog.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/desk/src/components/desk/global/AddNewAgentsDialog.vue b/desk/src/components/desk/global/AddNewAgentsDialog.vue index 9bc234b30..81b205e58 100644 --- a/desk/src/components/desk/global/AddNewAgentsDialog.vue +++ b/desk/src/components/desk/global/AddNewAgentsDialog.vue @@ -22,8 +22,7 @@
@@ -204,6 +204,9 @@ export default { let error = this.validateEmailInput(this.emailId); error += this.validateFirstName(this.firstName); error += this.validatePhone(this.phone); + error += this.validateCustomer( + this.fdCustomer != null ? this.fdCustomer : this.selectedCustomer + ); return error; }, validateEmailInput(value) { From 641f2a98783071dc2294e23b1124f06f3061955d Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 26 Jul 2023 14:46:32 +0530 Subject: [PATCH 5/6] chore: add spaces between buttons --- desk/src/components/desk/global/AddNewAgentsDialog.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/desk/src/components/desk/global/AddNewAgentsDialog.vue b/desk/src/components/desk/global/AddNewAgentsDialog.vue index 81b205e58..ccf048adc 100644 --- a/desk/src/components/desk/global/AddNewAgentsDialog.vue +++ b/desk/src/components/desk/global/AddNewAgentsDialog.vue @@ -65,10 +65,11 @@ :disabled="inviteQueue.length == 0" appearance="primary" @click="sentInvites()" + class="mr-2" :loading="$resources.sentInvites.loading" >Send Invites - +