diff --git a/mellon/composer.json b/mellon/composer.json
index 19ec36d96..f76ac750c 100644
--- a/mellon/composer.json
+++ b/mellon/composer.json
@@ -11,7 +11,8 @@
"require-dev": {
"phpmd/phpmd": "^2.8.0",
"squizlabs/php_codesniffer": "*",
- "phpunit/phpunit": "^9.5.4"
+ "phpunit/phpunit": "^9.5.4",
+ "roave/security-advisories": "dev-latest"
},
"require": {
"php": ">=7.0.0",
@@ -36,4 +37,4 @@
}
}
]
-}
\ No newline at end of file
+}
diff --git a/zmsadmin/composer.json b/zmsadmin/composer.json
index 610e34314..64d015bd9 100644
--- a/zmsadmin/composer.json
+++ b/zmsadmin/composer.json
@@ -22,7 +22,7 @@
],
"config": {
"platform": {
- "php": "7.3"
+ "php": "8.0"
},
"allow-plugins": {
"php-http/discovery": true
diff --git a/zmsadmin/composer.lock b/zmsadmin/composer.lock
index e3e8eb2fe..ebfd77621 100644
--- a/zmsadmin/composer.lock
+++ b/zmsadmin/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "3de9c394dcf24f5a36246f602d593469",
+ "content-hash": "5139c86d6804ab69574d6dfb4c666a66",
"packages": [
{
"name": "aronduby/dump",
@@ -158,11 +158,11 @@
},
{
"name": "eappointment/mellon",
- "version": "dev-main",
+ "version": "dev-roave-test-2",
"dist": {
"type": "path",
"url": "../mellon",
- "reference": "51a4c08085945f4488ea92f925a2996a25173df3"
+ "reference": "132bd01dbec27ad473955fb9bb3d410515f9c98f"
},
"require": {
"ext-json": ">=0",
@@ -172,6 +172,7 @@
"require-dev": {
"phpmd/phpmd": "^2.8.0",
"phpunit/phpunit": "^9.5.4",
+ "roave/security-advisories": "dev-latest",
"squizlabs/php_codesniffer": "*"
},
"type": "library",
@@ -205,11 +206,11 @@
},
{
"name": "eappointment/zmsclient",
- "version": "dev-main",
+ "version": "dev-roave-test-2",
"dist": {
"type": "path",
"url": "../zmsclient",
- "reference": "a3041b800445f8aca076b2a79397eeca5fe7af85"
+ "reference": "249f1aa96e13e3c2379353bf33539f0174fced53"
},
"require": {
"aronduby/dump": "^0.9",
@@ -220,7 +221,6 @@
"ext-json": ">=1.0",
"ext-mbstring": ">=0",
"ext-pcre": ">=0",
- "juliangut/spiral": "0.4",
"php": ">=7.3.0",
"php-http/curl-client": "^2.2",
"psr/http-message": "^1.0",
@@ -264,11 +264,11 @@
},
{
"name": "eappointment/zmsentities",
- "version": "dev-main",
+ "version": "dev-roave-test-2",
"dist": {
"type": "path",
"url": "../zmsentities",
- "reference": "6d50c616376c01caa495318e4a4c3825703dd24b"
+ "reference": "132bd01dbec27ad473955fb9bb3d410515f9c98f"
},
"require": {
"eappointment/mellon": "@dev",
@@ -322,11 +322,11 @@
},
{
"name": "eappointment/zmsslim",
- "version": "dev-main",
+ "version": "dev-roave-test-2",
"dist": {
"type": "path",
"url": "../zmsslim",
- "reference": "dbbbdf39b2231536c550f7b58dd40dc6f873c977"
+ "reference": "132bd01dbec27ad473955fb9bb3d410515f9c98f"
},
"require": {
"eappointment/mellon": "@dev",
@@ -950,67 +950,6 @@
],
"time": "2023-08-27T10:13:57+00:00"
},
- {
- "name": "juliangut/spiral",
- "version": "0.4",
- "source": {
- "type": "git",
- "url": "https://github.com/juliangut/spiral.git",
- "reference": "967e130a5b36f069998baa2136a239fdc6bd95f2"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/juliangut/spiral/zipball/967e130a5b36f069998baa2136a239fdc6bd95f2",
- "reference": "967e130a5b36f069998baa2136a239fdc6bd95f2",
- "shasum": ""
- },
- "require": {
- "ext-curl": "*",
- "fig/http-message-util": "^1.0",
- "lib-curl": "*",
- "php": "^5.5|^7.0",
- "psr/http-message": "^1.0",
- "zendframework/zend-diactoros": "^1.3"
- },
- "require-dev": {
- "friendsofphp/php-cs-fixer": "^1.0",
- "phpmd/phpmd": "~2.2",
- "phpunit/phpunit": "~4.5|^5.0",
- "sebastian/phpcpd": "~2.0",
- "squizlabs/php_codesniffer": "~2.3"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Jgut\\Spiral\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Julián Gutiérrez",
- "email": "juliangut@gmail.com",
- "homepage": "http://juliangut.com",
- "role": "Developer"
- }
- ],
- "description": "A PSR7 aware cURL client",
- "homepage": "http://github.com/juliangut/spiral",
- "keywords": [
- "curl",
- "psr7",
- "request",
- "response"
- ],
- "support": {
- "issues": "https://github.com/juliangut/spiral/issues",
- "source": "https://github.com/juliangut/spiral"
- },
- "time": "2017-06-03T15:19:22+00:00"
- },
{
"name": "league/csv",
"version": "9.7.4",
@@ -3340,16 +3279,16 @@
},
{
"name": "symfony/twig-bridge",
- "version": "v5.4.29",
+ "version": "v5.4.26",
"source": {
"type": "git",
"url": "https://github.com/symfony/twig-bridge.git",
- "reference": "8e94856da373b63e7ba69e51a6c4f834d991cd58"
+ "reference": "832461a5f556df7933fd82e75b097d76182c640b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/8e94856da373b63e7ba69e51a6c4f834d991cd58",
- "reference": "8e94856da373b63e7ba69e51a6c4f834d991cd58",
+ "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/832461a5f556df7933fd82e75b097d76182c640b",
+ "reference": "832461a5f556df7933fd82e75b097d76182c640b",
"shasum": ""
},
"require": {
@@ -3441,7 +3380,7 @@
"description": "Provides integration for Twig with various Symfony components",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/twig-bridge/tree/v5.4.29"
+ "source": "https://github.com/symfony/twig-bridge/tree/v5.4.26"
},
"funding": [
{
@@ -3457,7 +3396,7 @@
"type": "tidelift"
}
],
- "time": "2023-09-06T21:54:06+00:00"
+ "time": "2023-07-20T16:28:53+00:00"
},
{
"name": "tracy/tracy",
@@ -3667,73 +3606,6 @@
}
],
"time": "2023-08-28T11:09:02+00:00"
- },
- {
- "name": "zendframework/zend-diactoros",
- "version": "1.8.7",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zend-diactoros.git",
- "reference": "a85e67b86e9b8520d07e6415fcbcb8391b44a75b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/a85e67b86e9b8520d07e6415fcbcb8391b44a75b",
- "reference": "a85e67b86e9b8520d07e6415fcbcb8391b44a75b",
- "shasum": ""
- },
- "require": {
- "php": "^5.6 || ^7.0",
- "psr/http-message": "^1.0"
- },
- "provide": {
- "psr/http-message-implementation": "1.0"
- },
- "require-dev": {
- "ext-dom": "*",
- "ext-libxml": "*",
- "php-http/psr7-integration-tests": "dev-master",
- "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7",
- "zendframework/zend-coding-standard": "~1.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-release-1.8": "1.8.x-dev"
- }
- },
- "autoload": {
- "files": [
- "src/functions/create_uploaded_file.php",
- "src/functions/marshal_headers_from_sapi.php",
- "src/functions/marshal_method_from_sapi.php",
- "src/functions/marshal_protocol_version_from_sapi.php",
- "src/functions/marshal_uri_from_sapi.php",
- "src/functions/normalize_server.php",
- "src/functions/normalize_uploaded_files.php",
- "src/functions/parse_cookie_header.php"
- ],
- "psr-4": {
- "Zend\\Diactoros\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-2-Clause"
- ],
- "description": "PSR HTTP Message implementations",
- "homepage": "https://github.com/zendframework/zend-diactoros",
- "keywords": [
- "http",
- "psr",
- "psr-7"
- ],
- "support": {
- "issues": "https://github.com/zendframework/zend-diactoros/issues",
- "source": "https://github.com/zendframework/zend-diactoros"
- },
- "abandoned": "laminas/laminas-diactoros",
- "time": "2019-08-06T17:53:53+00:00"
}
],
"packages-dev": [
@@ -3946,28 +3818,28 @@
},
{
"name": "helmich/phpunit-json-assert",
- "version": "v3.4.3",
+ "version": "v3.5.1",
"source": {
"type": "git",
"url": "https://github.com/martin-helmich/phpunit-json-assert.git",
- "reference": "73d72cc86f427ff247c8f356798b0568a185cf53"
+ "reference": "5a3a53e46f4d1f1b324c5cc2e33d87ad2d37260c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/martin-helmich/phpunit-json-assert/zipball/73d72cc86f427ff247c8f356798b0568a185cf53",
- "reference": "73d72cc86f427ff247c8f356798b0568a185cf53",
+ "url": "https://api.github.com/repos/martin-helmich/phpunit-json-assert/zipball/5a3a53e46f4d1f1b324c5cc2e33d87ad2d37260c",
+ "reference": "5a3a53e46f4d1f1b324c5cc2e33d87ad2d37260c",
"shasum": ""
},
"require": {
"justinrainbow/json-schema": "^5.0",
- "php": "^7.2 || ^8.0",
- "softcreatr/jsonpath": "^0.7.2 || ^0.8"
+ "php": "^8.0",
+ "softcreatr/jsonpath": "^0.8"
},
"conflict": {
- "phpunit/phpunit": "<8.0 || >= 10.0"
+ "phpunit/phpunit": "<8.0 || >= 11.0"
},
"require-dev": {
- "phpunit/phpunit": "^8.0 || ^9.0"
+ "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0"
},
"type": "library",
"autoload": {
@@ -3988,7 +3860,7 @@
"description": "PHPUnit assertions for JSON documents",
"support": {
"issues": "https://github.com/martin-helmich/phpunit-json-assert/issues",
- "source": "https://github.com/martin-helmich/phpunit-json-assert/tree/v3.4.3"
+ "source": "https://github.com/martin-helmich/phpunit-json-assert/tree/v3.5.1"
},
"funding": [
{
@@ -4000,7 +3872,7 @@
"type": "github"
}
],
- "time": "2023-02-01T09:41:56+00:00"
+ "time": "2023-03-03T14:09:38+00:00"
},
{
"name": "helmich/phpunit-psr7-assert",
@@ -6172,29 +6044,28 @@
},
{
"name": "softcreatr/jsonpath",
- "version": "0.7.6",
+ "version": "0.8.3",
"source": {
"type": "git",
"url": "https://github.com/SoftCreatR/JSONPath.git",
- "reference": "e04c02cb78bcc242c69d17dac5b29436bf3e1076"
+ "reference": "fc12dee0b46f3fa3a175c4051dbab60984acef4b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/SoftCreatR/JSONPath/zipball/e04c02cb78bcc242c69d17dac5b29436bf3e1076",
- "reference": "e04c02cb78bcc242c69d17dac5b29436bf3e1076",
+ "url": "https://api.github.com/repos/SoftCreatR/JSONPath/zipball/fc12dee0b46f3fa3a175c4051dbab60984acef4b",
+ "reference": "fc12dee0b46f3fa3a175c4051dbab60984acef4b",
"shasum": ""
},
"require": {
"ext-json": "*",
- "php": ">=7.1,<8.0"
+ "php": ">=8.0"
},
"replace": {
"flow/jsonpath": "*"
},
"require-dev": {
- "phpunit/phpunit": ">=7.0",
- "roave/security-advisories": "dev-latest",
- "squizlabs/php_codesniffer": "^3.5"
+ "phpunit/phpunit": "^9.6",
+ "roave/security-advisories": "dev-latest"
},
"type": "library",
"autoload": {
@@ -6237,7 +6108,7 @@
"type": "github"
}
],
- "time": "2022-09-27T09:27:12+00:00"
+ "time": "2023-08-17T20:14:00+00:00"
},
{
"name": "squizlabs/php_codesniffer",
@@ -6813,7 +6684,7 @@
"platform": [],
"platform-dev": [],
"platform-overrides": {
- "php": "7.3"
+ "php": "8.0"
},
"plugin-api-version": "2.6.0"
}
diff --git a/zmsadmin/js/block/calldisplay/config/index.js b/zmsadmin/js/block/calldisplay/config/index.js
index 3e607db08..e96e4c70d 100644
--- a/zmsadmin/js/block/calldisplay/config/index.js
+++ b/zmsadmin/js/block/calldisplay/config/index.js
@@ -48,6 +48,7 @@ class CallDisplayConfigView extends Component {
webtemplate: 'defaultplatz',
hmac: '',
enableQrCode: false,
+ twoDisplays: false,
showQrCode: false
}
@@ -73,9 +74,9 @@ class CallDisplayConfigView extends Component {
return document.location.origin;
}
- buildCalldisplayUrl() {
+ buildCalldisplayUrl(displayNumber = 1) {
const baseUrl = this.props.config.calldisplay.baseUrl
- let parameters = this.buildParameters(false);
+ let parameters = this.buildParameters(false, 'calldisplay', displayNumber);
return `${this.buildHost()}${baseUrl}?${parameters.join('&')}`
}
@@ -87,7 +88,7 @@ class CallDisplayConfigView extends Component {
return `${this.buildHost()}${baseUrl}?${parameters.join('&')}`
}
- buildParameters(hashParameters, target = 'calldisplay') {
+ buildParameters(hashParameters, target = 'calldisplay', displayNumber = 1) {
const collections = this.getSelectedItemsCollection(this.state)
let queryParts = []
@@ -115,6 +116,10 @@ class CallDisplayConfigView extends Component {
queryParts.push(`qrcode=1`)
}
+ if (! hashParameters && this.state.twoDisplays) {
+ queryParts.push(`display=` + displayNumber)
+ }
+
if (hashParameters) {
queryParts.push(`hmac=${this.state.hmac}`)
}
@@ -229,6 +234,22 @@ class CallDisplayConfigView extends Component {
)
}
+ renderTwoDisplays() {
+ const onChange = () => {
+ this.setState({
+ twoDisplays: !this.state.twoDisplays
+ });
+ }
+ return (
+
+ )
+ }
+
renderScopes(scopes) {
if (scopes.length > 0) {
return (
@@ -267,6 +288,7 @@ class CallDisplayConfigView extends Component {
render() {
const calldisplayUrl = this.buildCalldisplayUrl()
+ const calldisplayUrl2 = this.buildCalldisplayUrl(2)
const webcalldisplayUrl = this.buildWebcalldisplayUrl()
const onQueueStatusChange = (_, value) => {
@@ -291,6 +313,7 @@ class CallDisplayConfigView extends Component {