From 35a4b263ea5820f0746a6a9c9777e67264ce0d3c Mon Sep 17 00:00:00 2001
From: Debora Crescenzo <dcrescenzo@sipwise.com>
Date: Fri, 17 May 2024 09:13:09 +0100
Subject: [PATCH] =?UTF-8?q?MT#60068=20Add=20=C2=A8force=20CLI=C2=A8=20chec?=
 =?UTF-8?q?kbox=20to=20csc=20add=20pbx=20seat=20form?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a new "force CLI" checkbox to the add pbx seat form.
If the checkbox is ticked, "?create_primary_acli=false" is
added to the request URL params when creating a subscriber.
Removes customer_id params from createSubscriber() as it
seems to be a leftover from old code.

Change-Id: I58e287030bc740659415f888d8ed42f5ab6894d1
---
 src/api/pbx-groups.js                             |  2 +-
 src/api/pbx-seats.js                              |  2 +-
 src/api/subscriber.js                             | 15 +++++++++------
 .../pages/PbxConfiguration/CscPbxSeatAddForm.vue  | 14 +++++++++++---
 src/i18n/de.json                                  |  1 +
 src/i18n/es.json                                  |  1 +
 src/i18n/fr.json                                  |  1 +
 src/i18n/it.json                                  |  1 +
 src/pages/CscPagePbxSeatDetails.vue               |  2 +-
 9 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/api/pbx-groups.js b/src/api/pbx-groups.js
index 62485b83..0ec58c08 100644
--- a/src/api/pbx-groups.js
+++ b/src/api/pbx-groups.js
@@ -130,7 +130,7 @@ export function createGroup (group) {
                 pbx_hunt_timeout: group.huntTimeout,
                 pbx_hunt_cancel_mode: group.huntCancelMode,
                 pbx_groupmember_ids: group.seats
-            })
+            }, {})
         }).then(($subscriberId) => {
             subscriberId = $subscriberId
             if (group.soundSet !== null && group.soundSet !== undefined) {
diff --git a/src/api/pbx-seats.js b/src/api/pbx-seats.js
index 479cb861..fa9e7e56 100644
--- a/src/api/pbx-seats.js
+++ b/src/api/pbx-seats.js
@@ -155,7 +155,7 @@ export function createSeat (seat) {
                 is_pbx_group: false,
                 pbx_extension: seat.extension,
                 pbx_group_ids: seat.groups
-            })
+            }, { forceCli: seat.forceCli })
         }).then(($subscriberId) => {
             subscriberId = $subscriberId
             setSeatIntraPbx(subscriberId, seat.clirIntrapbx)
diff --git a/src/api/subscriber.js b/src/api/subscriber.js
index b152cb65..40a8fcb1 100644
--- a/src/api/subscriber.js
+++ b/src/api/subscriber.js
@@ -326,13 +326,16 @@ export function disablePrivacy (id) {
     return setPrivacy(id, false)
 }
 
-export function createSubscriber (subscriber) {
+export function createSubscriber (subscriber, config
+) {
+    const params = {}
+    if (config.forceCli) {
+        params.create_primary_acli = false
+    }
+
     return new Promise((resolve, reject) => {
-        httpApi.post('api/subscribers/', subscriber, {
-            params: {
-                customer_id: subscriber.customer_id
-            }
-        }).then((res) => {
+        httpApi.post('api/subscribers/', subscriber, { params }
+        ).then((res) => {
             resolve(_.last(res.headers.location.split('/')))
         }).catch((err) => {
             if (err.response.status >= 400) {
diff --git a/src/components/pages/PbxConfiguration/CscPbxSeatAddForm.vue b/src/components/pages/PbxConfiguration/CscPbxSeatAddForm.vue
index a020e213..6f86f638 100644
--- a/src/components/pages/PbxConfiguration/CscPbxSeatAddForm.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxSeatAddForm.vue
@@ -48,6 +48,14 @@
                         />
                     </template>
                 </csc-input>
+                <q-checkbox
+                    v-model="data.forceCli"
+                    emit-value
+                    :disable="loading"
+                    :readonly="loading"
+                    :label="$t('Force CLI')"
+                    :left-label="true"
+                />
                 <q-select
                     v-model="data.aliasNumbers"
                     clearable
@@ -194,9 +202,7 @@
 </template>
 
 <script>
-import {
-    mapGetters
-} from 'vuex'
+import { mapGetters } from 'vuex'
 import {
     required,
     maxLength,
@@ -386,6 +392,7 @@ export default {
                 sipUsername: '',
                 webUsername: '',
                 extension: '',
+                forceCli: false,
                 password: {
                     password: '',
                     passwordRetype: ''
@@ -409,6 +416,7 @@ export default {
                 sipUsername: this.data.sipUsername,
                 webUsername: this.data.webUsername,
                 extension: this.data.extension,
+                forceCli: this.data.forceCli,
                 webPassword: this.data.password.password,
                 sipPassword: this.data.sipPassword.password,
                 aliasNumbers: this.data.aliasNumbers,
diff --git a/src/i18n/de.json b/src/i18n/de.json
index eae21f08..3435b4f5 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -184,6 +184,7 @@
     "Filter groups": "Filtergruppen",
     "Fine": "Mittel",
     "Folder : ": "Ordner : ",
+    "Force CLI": "Force CLI",
     "Forgot password?": "Passwort vergessen?",
     "Format": "Format",
     "Forward": "Weiterleitung",
diff --git a/src/i18n/es.json b/src/i18n/es.json
index ac34df05..af465e34 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -184,6 +184,7 @@
     "Filter groups": "Filtrar grupos",
     "Fine": "Bien",
     "Folder : ": "Folder : ",
+    "Force CLI": "Force CLI",
     "Forgot password?": "¿Ha olvidado su contraseña?",
     "Format": "Formato",
     "Forward": "Forward",
diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index 0ae9806b..87ee0fd7 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -184,6 +184,7 @@
     "Filter groups": "Groupes de filtres",
     "Fine": "Fin",
     "Folder : ": "Folder : ",
+    "Force CLI": "Force CLI",
     "Forgot password?": "Mot de passe oublié ?",
     "Format": "Format",
     "Forward": "Forward",
diff --git a/src/i18n/it.json b/src/i18n/it.json
index 01edcb7d..223e9595 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -181,6 +181,7 @@
     "Filter groups": "Filter groups",
     "Fine": "Fine",
     "Folder : ": "Folder : ",
+    "Force CLI": "Force CLI",
     "Forgot password?": "Forgot password?",
     "Format": "Format",
     "Forward": "Forward",
diff --git a/src/pages/CscPagePbxSeatDetails.vue b/src/pages/CscPagePbxSeatDetails.vue
index 869e2c2a..045838fa 100644
--- a/src/pages/CscPagePbxSeatDetails.vue
+++ b/src/pages/CscPagePbxSeatDetails.vue
@@ -398,7 +398,7 @@ export default {
             changes: null,
             id: this.$route.params.id,
             soundSet: null,
-            currentCli: '',
+            currentCli: {},
             selectedTab: this.initialTab,
             ncosOptions: [],
             ncosSetOptions: [],