Merge branch 'fronkdev' into 'master'
Fronkdev See merge request fronk/thetool!1482
This commit is contained in:
@@ -18,7 +18,7 @@
|
||||
<!--<script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/vendor.min.js"></script>-->
|
||||
|
||||
<?php if(defined("ENABLE_VODIA_IDENTITY_SWITCHER") && ENABLE_VODIA_IDENTITY_SWITCHER && $me->is("employee")): ?>
|
||||
<script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/xinon-vodia-identity.js"></script>
|
||||
<script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/xinon-vodia-identity.js?<?=$git_merge_ts?>"></script>
|
||||
<?php endif; ?>
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
@@ -10,7 +10,7 @@ async function getVodiaIdentity() {
|
||||
$("#vodia-identity-switcher .phone-icon").addClass("fa-spin text-warning");
|
||||
}
|
||||
|
||||
var response = await fetch(baseurl + '/User/Api/do=getVodiaIdentity');
|
||||
var response = await fetch(baseurl + 'User/Api/do=getVodiaIdentity');
|
||||
if (!response.ok) {
|
||||
$("#vodia-identity-switcher a.phone-icon i").removeClass("fa-spin");
|
||||
return false;
|
||||
@@ -126,7 +126,7 @@ async function setVodiaOutboundIdentity(number) {
|
||||
$("#vodia-identities-list").empty();
|
||||
$("#vodia-identities-list").append("<img src='" + baseurl + "img/ajax-loader.gif' />");
|
||||
|
||||
var response = await fetch(baseurl + '/User/Api/do=setVodiaIdentity',{
|
||||
var response = await fetch(baseurl + 'User/Api/do=setVodiaIdentity',{
|
||||
method: 'POST',
|
||||
body: new URLSearchParams({
|
||||
'number': number
|
||||
|
||||
Reference in New Issue
Block a user