diff --git a/admin/survey/modules/Evalvacija/class.GC.php b/admin/survey/modules/Evalvacija/class.GC.php
index 1424d2017..2f3b189da 100644
--- a/admin/survey/modules/Evalvacija/class.GC.php
+++ b/admin/survey/modules/Evalvacija/class.GC.php
@@ -183,15 +183,15 @@ class GC{
'4_1' => 'predmeti'
);
- $reports_id = '30102020';
- $report_type = '3_1';
- $fak_id = '3000043';
+ $reports_id = '11112020';
+ $report_type = '2_2';
+ $fak_id = '3000027';
$zip_name = '';
// Nastavimo pot do pdf-jev
- //$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/';
+ $this->pdf_path = 'modules/Evalvacija/pdf/unzipped/';
//$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/';
- $this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/'.$report_type_array[$report_type].'/';
+ //$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/'.$report_type_array[$report_type].'/';
echo 'Parametri:';
echo '- ID: '.$reports_id.'
';
diff --git a/composer.lock b/composer.lock
index 54c328891..0f35bb0c7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -65,16 +65,16 @@
},
{
"name": "fgrosse/phpasn1",
- "version": "v2.1.1",
+ "version": "v2.2.0",
"source": {
"type": "git",
"url": "https://github.com/fgrosse/PHPASN1.git",
- "reference": "7ebf2a09084a7bbdb7b879c66fdf7ad80461bbe8"
+ "reference": "d1978f7abd580f3fc33561e7f71d4c12c7531fad"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/7ebf2a09084a7bbdb7b879c66fdf7ad80461bbe8",
- "reference": "7ebf2a09084a7bbdb7b879c66fdf7ad80461bbe8",
+ "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/d1978f7abd580f3fc33561e7f71d4c12c7531fad",
+ "reference": "d1978f7abd580f3fc33561e7f71d4c12c7531fad",
"shasum": ""
},
"require": {
@@ -85,8 +85,10 @@
"satooshi/php-coveralls": "~2.0"
},
"suggest": {
+ "ext-bcmath": "BCmath is the fallback extension for big integer calculations",
+ "ext-curl": "For loading OID information from the web if they have not bee defined statically",
"ext-gmp": "GMP is the preferred extension for big integer calculations",
- "php-curl": "For loading OID information from the web if they have not bee defined statically"
+ "phpseclib/bcmath_compat": "BCmath polyfill for servers where neither GMP nor BCmath is available"
},
"type": "library",
"extra": {
@@ -130,31 +132,31 @@
"x509",
"x690"
],
- "time": "2018-12-02 01:34:34"
+ "time": "2020-10-11 16:28:18"
},
{
"name": "geoip2/geoip2",
- "version": "v2.10.0",
+ "version": "v2.11.0",
"source": {
"type": "git",
"url": "https://github.com/maxmind/GeoIP2-php.git",
- "reference": "419557cd21d9fe039721a83490701a58c8ce784a"
+ "reference": "d01be5894a5c1a3381c58c9b1795cd07f96c30f7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/419557cd21d9fe039721a83490701a58c8ce784a",
- "reference": "419557cd21d9fe039721a83490701a58c8ce784a",
+ "url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/d01be5894a5c1a3381c58c9b1795cd07f96c30f7",
+ "reference": "d01be5894a5c1a3381c58c9b1795cd07f96c30f7",
"shasum": ""
},
"require": {
"ext-json": "*",
- "maxmind-db/reader": "~1.5",
- "maxmind/web-service-common": "~0.6",
- "php": ">=5.6"
+ "maxmind-db/reader": "~1.8",
+ "maxmind/web-service-common": "~0.8",
+ "php": ">=7.2"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "2.*",
- "phpunit/phpunit": "5.*",
+ "phpunit/phpunit": "^8.0 || ^9.0",
"squizlabs/php_codesniffer": "3.*"
},
"type": "library",
@@ -183,7 +185,7 @@
"geolocation",
"maxmind"
],
- "time": "2019-12-12 18:48:39"
+ "time": "2020-10-01 18:48:34"
},
{
"name": "guzzlehttp/guzzle",
@@ -254,23 +256,23 @@
},
{
"name": "guzzlehttp/promises",
- "version": "v1.3.1",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
- "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+ "reference": "60d379c243457e073cff02bc323a2a86cb355631"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
- "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/60d379c243457e073cff02bc323a2a86cb355631",
+ "reference": "60d379c243457e073cff02bc323a2a86cb355631",
"shasum": ""
},
"require": {
- "php": ">=5.5.0"
+ "php": ">=5.5"
},
"require-dev": {
- "phpunit/phpunit": "^4.0"
+ "symfony/phpunit-bridge": "^4.4 || ^5.1"
},
"type": "library",
"extra": {
@@ -301,20 +303,20 @@
"keywords": [
"promise"
],
- "time": "2016-12-20 10:07:11"
+ "time": "2020-09-30 07:37:28"
},
{
"name": "guzzlehttp/psr7",
- "version": "1.6.1",
+ "version": "1.7.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
+ "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
- "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3",
+ "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3",
"shasum": ""
},
"require": {
@@ -327,15 +329,15 @@
},
"require-dev": {
"ext-zlib": "*",
- "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+ "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10"
},
"suggest": {
- "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
+ "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.6-dev"
+ "dev-master": "1.7-dev"
}
},
"autoload": {
@@ -372,27 +374,27 @@
"uri",
"url"
],
- "time": "2019-07-01 23:21:34"
+ "time": "2020-09-30 07:37:11"
},
{
"name": "maxmind-db/reader",
- "version": "v1.7.0",
+ "version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/maxmind/MaxMind-DB-Reader-php.git",
- "reference": "942553da239f12051275f9c666538b5dd09e2908"
+ "reference": "b566d429ac9aec10594b0935be8ff38302f8d5c8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/942553da239f12051275f9c666538b5dd09e2908",
- "reference": "942553da239f12051275f9c666538b5dd09e2908",
+ "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/b566d429ac9aec10594b0935be8ff38302f8d5c8",
+ "reference": "b566d429ac9aec10594b0935be8ff38302f8d5c8",
"shasum": ""
},
"require": {
"php": ">=7.2"
},
"conflict": {
- "ext-maxminddb": "<1.7.0,>=2.0.0"
+ "ext-maxminddb": "<1.8.0,>=2.0.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "2.*",
@@ -432,31 +434,31 @@
"geolocation",
"maxmind"
],
- "time": "2020-08-07 22:10:05"
+ "time": "2020-10-01 17:30:21"
},
{
"name": "maxmind/web-service-common",
- "version": "v0.7.0",
+ "version": "v0.8.1",
"source": {
"type": "git",
"url": "https://github.com/maxmind/web-service-common-php.git",
- "reference": "74c996c218ada5c639c8c2f076756e059f5552fc"
+ "reference": "32f274051c543fc865e5a84d3a2c703913641ea8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/74c996c218ada5c639c8c2f076756e059f5552fc",
- "reference": "74c996c218ada5c639c8c2f076756e059f5552fc",
+ "url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/32f274051c543fc865e5a84d3a2c703913641ea8",
+ "reference": "32f274051c543fc865e5a84d3a2c703913641ea8",
"shasum": ""
},
"require": {
"composer/ca-bundle": "^1.0.3",
"ext-curl": "*",
"ext-json": "*",
- "php": ">=5.6"
+ "php": ">=7.2"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "2.*",
- "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0",
+ "phpunit/phpunit": "^8.0 || ^9.0",
"squizlabs/php_codesniffer": "3.*"
},
"type": "library",
@@ -478,7 +480,7 @@
],
"description": "Internal MaxMind Web Service API",
"homepage": "https://github.com/maxmind/web-service-common-php",
- "time": "2020-05-06 14:07:26"
+ "time": "2020-11-02 17:00:53"
},
{
"name": "minishlink/web-push",
@@ -538,20 +540,20 @@
},
{
"name": "paragonie/random_compat",
- "version": "v9.99.99",
+ "version": "v9.99.100",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
+ "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
- "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a",
+ "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a",
"shasum": ""
},
"require": {
- "php": "^7"
+ "php": ">= 7"
},
"require-dev": {
"phpunit/phpunit": "4.*|5.*",
@@ -579,7 +581,7 @@
"pseudorandom",
"random"
],
- "time": "2018-07-02 15:55:56"
+ "time": "2020-10-15 08:29:30"
},
{
"name": "paragonie/sodium_compat",
@@ -754,21 +756,22 @@
},
{
"name": "phpmailer/phpmailer",
- "version": "v6.1.7",
+ "version": "v6.1.8",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git",
- "reference": "2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0"
+ "reference": "917ab212fa00dc6eacbb26e8bc387ebe40993bc1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0",
- "reference": "2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0",
+ "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/917ab212fa00dc6eacbb26e8bc387ebe40993bc1",
+ "reference": "917ab212fa00dc6eacbb26e8bc387ebe40993bc1",
"shasum": ""
},
"require": {
"ext-ctype": "*",
"ext-filter": "*",
+ "ext-hash": "*",
"php": ">=5.5.0"
},
"require-dev": {
@@ -812,7 +815,7 @@
}
],
"description": "PHPMailer is a full-featured email creation and transfer class for PHP",
- "time": "2020-07-14 18:50:27"
+ "time": "2020-10-09 14:55:58"
},
{
"name": "psr/http-message",
@@ -963,29 +966,28 @@
},
{
"name": "spomky-labs/base64url",
- "version": "v2.0.3",
+ "version": "v2.0.4",
"source": {
"type": "git",
"url": "https://github.com/Spomky-Labs/base64url.git",
- "reference": "48ea8ff600cefe56b82d3d5b768b6f4f3bfe05a1"
+ "reference": "7752ce931ec285da4ed1f4c5aa27e45e097be61d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Spomky-Labs/base64url/zipball/48ea8ff600cefe56b82d3d5b768b6f4f3bfe05a1",
- "reference": "48ea8ff600cefe56b82d3d5b768b6f4f3bfe05a1",
+ "url": "https://api.github.com/repos/Spomky-Labs/base64url/zipball/7752ce931ec285da4ed1f4c5aa27e45e097be61d",
+ "reference": "7752ce931ec285da4ed1f4c5aa27e45e097be61d",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
"require-dev": {
- "php-coveralls/php-coveralls": "^2.0",
- "phpstan/phpstan": "^0.11",
- "phpstan/phpstan-beberlei-assert": "^0.11.0",
- "phpstan/phpstan-deprecation-rules": "^0.11",
- "phpstan/phpstan-phpunit": "^0.11",
- "phpstan/phpstan-strict-rules": "^0.11",
- "phpunit/phpunit": "^7.0|^8.0|^9.0"
+ "phpstan/extension-installer": "^1.0",
+ "phpstan/phpstan": "^0.11|^0.12",
+ "phpstan/phpstan-beberlei-assert": "^0.11|^0.12",
+ "phpstan/phpstan-deprecation-rules": "^0.11|^0.12",
+ "phpstan/phpstan-phpunit": "^0.11|^0.12",
+ "phpstan/phpstan-strict-rules": "^0.11|^0.12"
},
"type": "library",
"autoload": {
@@ -1011,20 +1013,20 @@
"safe",
"url"
],
- "time": "2020-08-30 13:35:33"
+ "time": "2020-11-03 09:10:25"
},
{
"name": "stripe/stripe-php",
- "version": "v7.52.0",
+ "version": "v7.61.0",
"source": {
"type": "git",
"url": "https://github.com/stripe/stripe-php.git",
- "reference": "51e95c514aff45616dff09791ca5b2f10cf5c4e8"
+ "reference": "51c6cd18cb51740101c940a3fefc876ef7cd8cae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/stripe/stripe-php/zipball/51e95c514aff45616dff09791ca5b2f10cf5c4e8",
- "reference": "51e95c514aff45616dff09791ca5b2f10cf5c4e8",
+ "url": "https://api.github.com/repos/stripe/stripe-php/zipball/51c6cd18cb51740101c940a3fefc876ef7cd8cae",
+ "reference": "51c6cd18cb51740101c940a3fefc876ef7cd8cae",
"shasum": ""
},
"require": {
@@ -1068,26 +1070,25 @@
"payment processing",
"stripe"
],
- "time": "2020-09-08 19:29:20"
+ "time": "2020-10-20 20:01:45"
},
{
"name": "symfony/polyfill-intl-idn",
- "version": "v1.18.1",
+ "version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
- "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251"
+ "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/5dcab1bc7146cf8c1beaa4502a3d9be344334251",
- "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3b75acd829741c768bc8b1f84eb33265e7cc5117",
+ "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
+ "php": ">=7.1",
"symfony/polyfill-intl-normalizer": "^1.10",
- "symfony/polyfill-php70": "^1.10",
"symfony/polyfill-php72": "^1.10"
},
"suggest": {
@@ -1096,7 +1097,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-main": "1.20-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -1139,24 +1140,24 @@
"portable",
"shim"
],
- "time": "2020-08-04 06:02:08"
+ "time": "2020-10-23 14:02:19"
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.18.1",
+ "version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
- "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e"
+ "reference": "727d1096295d807c309fb01a851577302394c897"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
- "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/727d1096295d807c309fb01a851577302394c897",
+ "reference": "727d1096295d807c309fb01a851577302394c897",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"suggest": {
"ext-intl": "For best performance"
@@ -1164,7 +1165,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-main": "1.20-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -1206,92 +1207,29 @@
"portable",
"shim"
],
- "time": "2020-07-14 12:35:20"
- },
- {
- "name": "symfony/polyfill-php70",
- "version": "v1.18.1",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php70.git",
- "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
- "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
- "shasum": ""
- },
- "require": {
- "paragonie/random_compat": "~1.0|~2.0|~9.99",
- "php": ">=5.3.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.18-dev"
- },
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Php70\\": ""
- },
- "files": [
- "bootstrap.php"
- ],
- "classmap": [
- "Resources/stubs"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "time": "2020-07-14 12:35:20"
+ "time": "2020-10-23 14:02:19"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.18.1",
+ "version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "639447d008615574653fb3bc60d1986d7172eaae"
+ "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae",
- "reference": "639447d008615574653fb3bc60d1986d7172eaae",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cede45fcdfabdd6043b3592e83678e42ec69e930",
+ "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-main": "1.20-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -1328,7 +1266,7 @@
"portable",
"shim"
],
- "time": "2020-07-14 12:35:20"
+ "time": "2020-10-23 14:02:19"
},
{
"name": "web-token/jwt-core",
@@ -1970,25 +1908,25 @@
"packages-dev": [
{
"name": "filp/whoops",
- "version": "2.7.3",
+ "version": "2.9.1",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
- "reference": "5d5fe9bb3d656b514d455645b3addc5f7ba7714d"
+ "reference": "307fb34a5ab697461ec4c9db865b20ff2fd40771"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/filp/whoops/zipball/5d5fe9bb3d656b514d455645b3addc5f7ba7714d",
- "reference": "5d5fe9bb3d656b514d455645b3addc5f7ba7714d",
+ "url": "https://api.github.com/repos/filp/whoops/zipball/307fb34a5ab697461ec4c9db865b20ff2fd40771",
+ "reference": "307fb34a5ab697461ec4c9db865b20ff2fd40771",
"shasum": ""
},
"require": {
- "php": "^5.5.9 || ^7.0",
+ "php": "^5.5.9 || ^7.0 || ^8.0",
"psr/log": "^1.0.1"
},
"require-dev": {
"mockery/mockery": "^0.9 || ^1.0",
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0",
+ "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.3",
"symfony/var-dumper": "^2.6 || ^3.0 || ^4.0 || ^5.0"
},
"suggest": {
@@ -1998,7 +1936,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
@@ -2027,7 +1965,7 @@
"throwable",
"whoops"
],
- "time": "2020-06-14 09:00:00"
+ "time": "2020-11-01 12:00:00"
},
{
"name": "kint-php/kint",
@@ -2190,20 +2128,20 @@
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.18.1",
+ "version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a"
+ "reference": "39d483bdf39be819deabf04ec872eb0b2410b531"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a",
- "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531",
+ "reference": "39d483bdf39be819deabf04ec872eb0b2410b531",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"suggest": {
"ext-mbstring": "For best performance"
@@ -2211,7 +2149,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-main": "1.20-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -2249,29 +2187,29 @@
"portable",
"shim"
],
- "time": "2020-07-14 12:35:20"
+ "time": "2020-10-23 14:02:19"
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.18.1",
+ "version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981"
+ "reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981",
- "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/e70aa8b064c5b72d3df2abd5ab1e90464ad009de",
+ "reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de",
"shasum": ""
},
"require": {
- "php": ">=7.0.8"
+ "php": ">=7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-main": "1.20-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -2315,20 +2253,20 @@
"portable",
"shim"
],
- "time": "2020-07-14 12:35:20"
+ "time": "2020-10-23 14:02:19"
},
{
"name": "symfony/var-dumper",
- "version": "v4.4.13",
+ "version": "v4.4.16",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "1bef32329f3166486ab7cb88599cae4875632b99"
+ "reference": "3718e18b68d955348ad860e505991802c09f5f73"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1bef32329f3166486ab7cb88599cae4875632b99",
- "reference": "1bef32329f3166486ab7cb88599cae4875632b99",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3718e18b68d955348ad860e505991802c09f5f73",
+ "reference": "3718e18b68d955348ad860e505991802c09f5f73",
"shasum": ""
},
"require": {
@@ -2356,11 +2294,6 @@
"Resources/bin/var-dump-server"
],
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "4.4-dev"
- }
- },
"autoload": {
"files": [
"Resources/functions/dump.php"
@@ -2392,7 +2325,7 @@
"debug",
"dump"
],
- "time": "2020-08-17 07:31:35"
+ "time": "2020-10-26 20:47:51"
}
],
"aliases": [],
diff --git a/frontend/payments/api_test.php b/frontend/payments/api_test.php
index 09edc41d0..2b2f1f349 100644
--- a/frontend/payments/api_test.php
+++ b/frontend/payments/api_test.php
@@ -15,6 +15,8 @@ $private_key = 'NLFYb67/[pUE%W-s';
// Nastavimo parametre
$action = 'create_narocilo';
+$action = 'stripe_checkout_success';
+$action = 'check_ddv';
//$action = 'get_predracun';
//$action = 'placaj_narocilo';
//$action = 'get_paketi';
@@ -89,11 +91,11 @@ function executePOST(){
$params = 'action='.$action; // Funkcija, ki jo želimo izvesti
// POST data
- $post_data = array(
+ /*$post_data = array(
"email" => 'peter.hrvatin@gmail.com',
"status" => '0',
"package_id" => '3',
- "payment_method" => '1',
+ "payment_method" => '3',
//"discount" => '5.90',
"trajanje" => '12',
"lang" => 'sl',
@@ -104,12 +106,15 @@ function executePOST(){
"podjetje_postna" => '1000',
"podjetje_posta" => 'Ljubljanačšžćčxxx',
"podjetje_davcna" => '11122233',
-
- "stripe_id" => 'tok_1H4KLxJ2wzLbozFIyzmcM2kC'
- );
- /*$post_data = array(
- "narocilo_id" => '1'
);*/
+ /*$post_data = array(
+ "narocilo_id" => '33'
+ );*/
+ $post_data = array(
+ "podjetje_drzava" => 'Germany',
+ "podjetje_davcna" => '115235681',
+ "cena" => '24.28'
+ );
/*$post_data = array(
"ime" => 'Peter Hrvatin',
"organizacija" => 'Ikea d.o.o.',
diff --git a/main/survey/skins/1045_1kaBlue.css b/main/survey/skins/1045_1kaBlue.css
deleted file mode 100644
index c144e30ef..000000000
--- a/main/survey/skins/1045_1kaBlue.css
+++ /dev/null
@@ -1,529 +0,0 @@
-/*
- Default tema ankete - 1ka - Modra barva
-*/
-/* Barve */
-/* Import osnovne postavitve */
-/*
- Osnovna tema ankete - 1ka - brez definiranih barv
-*/
-/* Fonti */
-body {
- margin: 0;
- padding: 0;
- color: #505050;
- font-size: 100%;
- font-family: Montserrat, Arial, Sans-Serif !important;
- background: #ffffff;
-}
-
-body.preview, body.testdata {
- margin-top: 26px;
-}
-
-#outercontainer {
- width: 100%;
- margin: 0 auto;
-}
-#outercontainer .outercontainer_header {
- position: absolute;
- width: 100%;
- height: 80px;
- border-bottom: 6px #1e88e5 solid;
-}
-#outercontainer #container {
- position: relative;
- width: 100%;
- max-width: 1200px;
- margin: 0px auto 10px;
-}
-
-/* Warning bar (preview, cookie) */
-#cookie_alert,
-#test_alert {
- height: 26px;
- font-size: 15px;
- line-height: 25px;
- color: #ffffff;
- background-color: #ffa608;
- border-bottom: 1px solid #ffa608;
-}
-#cookie_alert a,
-#test_alert a {
- text-decoration: none;
- font-weight: bold;
- color: #ffffff;
-}
-#cookie_alert a:hover,
-#test_alert a:hover {
- text-decoration: underline;
-}
-#cookie_alert span,
-#test_alert span {
- color: #ffffff;
-}
-#cookie_alert span a,
-#test_alert span a {
- color: #ffffff;
- font-weight: normal;
-}
-
-/* Header - logo, naslov, progressbar */
-h1 {
- margin: 0px auto 30px;
- padding: 120px 0 50px 0;
- font-size: 28px;
- color: #1e88e5;
- text-align: center;
- border-bottom: 1px solid #ddeffd;
-}
-
-h1.evalvacija {
- margin-bottom: 0;
-}
-
-#logo {
- right: auto;
- left: 25px;
- top: 13px;
- max-height: 56px !important;
- background: url("../../../public/img/logo/1ka_slo.svg");
- background-repeat: no-repeat !important;
- background-size: auto 100% !important;
-}
-#logo a {
- width: 250px;
- height: 56px;
-}
-
-#logo.english {
- background: url("../../../public/img/logo/1ka_eng.svg");
-}
-
-.header_settings_holder {
- top: 0px;
- right: 20px;
- left: auto;
-}
-.header_settings_holder .progress_bar span {
- float: left !important;
- /* ie6,7 doesnt support inline-block */
- display: block;
- width: 20px;
- font-size: 11px;
- color: #6D87AF;
-}
-.header_settings_holder .progress_bar div {
- height: 10px;
- width: 130px;
- padding: 2px;
- margin: 0 5px;
- border: 1px #cccccc solid;
- background-color: #ffffff;
-}
-.header_settings_holder .progress_bar div span {
- height: 10px;
- background-color: #1e88e5;
-}
-.header_settings_holder .progress_bar p a {
- color: #1e88e5;
- text-decoration: none;
-}
-.header_settings_holder .progress_bar p a:hover {
- color: #ffa608;
-}
-.header_settings_holder .continue_later_setting a {
- color: #1e88e5;
-}
-.header_settings_holder .continue_later_setting a:hover {
- color: #ffa608;
-}
-.header_settings_holder .tawk_chat a {
- color: #1e88e5;
-}
-.header_settings_holder .tawk_chat a:hover {
- color: #ffa608;
-}
-
-/* Spremenljivke */
-.spremenljivka {
- margin: 20px 10px 20px 10px;
- padding: 20px 2px 50px 12px !important;
- border-bottom: 1px #ddeffd solid;
-}
-.spremenljivka .naslov {
- padding: 5px 0 15px 5px;
- font-size: 18px;
- font-weight: 600;
-}
-.spremenljivka .naslov .spremenljivka_info {
- font-size: 14px;
- font-weight: 400;
- padding-top: 7px;
-}
-.spremenljivka .sequence_number {
- background-color: #ddeffd;
- color: #42A5F5;
-}
-.spremenljivka .sequence_number:hover {
- background-color: #add8fb;
-}
-.spremenljivka .sequence_number.active {
- background-color: #42A5F5;
- color: #ffffff;
-}
-.spremenljivka .counter {
- font-size: 18px;
-}
-.spremenljivka #dynamic_count {
- color: #1e88e5;
-}
-.spremenljivka .arrow {
- color: #1e88e5;
-}
-.spremenljivka .arrow:hover {
- color: #ffa608;
-}
-
-.spremenljivka.limited {
- outline: 1px #F15A24 solid;
-}
-
-.required, .required_require, .required_limit {
- outline: 1px #F15A24 solid;
-}
-
-div.variabla,
-td.variabla,
-td.question,
-td.differential,
-.variabla_sum label {
- font-size: 14px;
-}
-
-div.variable_holder {
- padding: 10px 0 0 0;
-}
-div.variable_holder thead,
-div.variable_holder tr.table-header {
- font-weight: normal;
- font-size: 14px;
-}
-div.variable_holder thead td,
-div.variable_holder tr.table-header td {
- padding: 10px 5px;
-}
-
-table.grid_table thead tr td {
- border-bottom: 2px #42A5F5 solid;
-}
-table.grid_table thead tr.middle_row td {
- border-top: 2px #42A5F5 solid;
-}
-table.grid_table tbody tr.table-header td {
- border-bottom: 2px #42A5F5 solid;
- border-top: 2px #42A5F5 solid;
- background-color: #ffffff;
-}
-table.grid_table tbody tr:nth-child(2n+1) {
- background-color: #ffffff;
-}
-table.grid_table tbody tr:nth-child(2n) {
- background-color: #ddeffd;
-}
-table.grid_table td {
- padding: 10px 10px;
-}
-
-span.reminder {
- left: 3px;
-}
-
-/* Textboxi, textarea, select */
-input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
-}
-
-input[type=text], textarea, select {
- padding: 10px 15px;
- border-radius: 3px;
- border: 1px solid #d1d1d1;
- border-radius: 3px;
- background-color: #fff;
-}
-
-/* ranking */
-.dropzone {
- border-top: 1px #ddeffd solid;
- margin-top: 12px;
- padding-top: 17px;
-}
-
-table.ranking_table ul {
- margin-top: 19px;
-}
-
-.ranking,
-.ranking_long,
-.handle,
-.handle_long,
-.ime,
-.izbran,
-.frame_ranking,
-.frame_ranking_hover,
-.frame_dropping,
-.frame_dropping_hover,
-.frame_moving {
- font-size: 13px;
- padding: 7px 10px 9px;
- border: 2px solid #1e88e5;
- background-color: #ffffff;
-}
-
-.ranking:hover {
- background-color: #f5fafe;
-}
-
-div.variable_holder .frame_ranking_hover {
- border: 2px #1e88e5 solid;
- background-color: #ddeffd;
-}
-
-div.variable_holder .frame_ranking,
-div.variable_holder .frame_moving,
-div.variable_holder .frame_dropping,
-div.variable_holder .frame_dropping_hover {
- text-indent: -35px;
- border: 2px #42A5F5 solid;
- background-color: #ddeffd;
-}
-
-table.ranking_table b {
- font-size: 13px;
- font-weight: 600;
-}
-
-/* Photo upload button */
-button.record_foto {
- border: 2px solid #1e88e5;
-}
-button.record_foto::before {
- color: #1e88e5;
-}
-button.record_foto:hover, button.record_foto:focus {
- border-color: #ffa608;
-}
-button.record_foto:hover::before, button.record_foto:focus::before {
- color: #ffa608;
-}
-
-/* Koledar */
-.ui-datepicker {
- font-size: 14px;
-}
-
-button.ui-datepicker-trigger {
- color: #1e88e5;
-}
-button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
- color: #ffa608;
-}
-
-/* Slider */
-.grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
- color: #505050;
-}
-.grupa .spremenljivka .slider.ui-widget-content {
- /*background-color: $color_light !important;*/
- background-image: none !important;
- border: 0;
-}
-.grupa .spremenljivka .ui-slider-horizontal {
- height: 8px;
-}
-.grupa .spremenljivka .ui-slider-handle {
- cursor: pointer;
- height: 10px !important;
- width: 18px !important;
- margin-top: 1px;
- border: 0;
- border-radius: 15px 15px !important;
- background-color: #1e88e5 !important;
- background-image: none !important;
-}
-.grupa .spremenljivka .ui-slider-handle:active {
- background-color: #1e88e5 !important;
-}
-.grupa .spremenljivka .sliderText {
- padding-top: 2px;
- color: #505050;
- background-color: #42A5F5;
- border: 0;
-}
-.grupa .spremenljivka .sliderText::after {
- border-color: #42A5F5 transparent;
-}
-
-/* Warning levo od vprasanja */
-.validation_alert {
- position: absolute;
- z-index: 51;
- top: 20px;
- left: -150px;
- width: 130px;
- min-height: 29px;
- margin: 0;
- text-align: center;
- font-size: 11px;
- line-height: 14px;
- background-color: #ddeffd;
- border: 2px solid red;
- padding: 4px 7px;
- border-radius: 4px;
- box-shadow: none;
-}
-
-/* Gumbi na dnu */
-div.buttons {
- padding: 20px 20px 35px;
- margin: 0 10px;
-}
-div.buttons input {
- cursor: pointer;
- margin: 8px 10px;
- /*padding: 7px 11px;*/
- padding: 10px 20px;
- text-align: center;
- font-size: 12px;
- letter-spacing: 1px;
- font-weight: 600;
- color: #FFFFFF;
- border-radius: 20px;
- border: 0;
-}
-div.buttons input.next {
- background-color: #1e88e5;
- border: 1px solid #1e88e5;
-}
-div.buttons input.next:hover, div.buttons input.next:focus {
- background-color: #ffa608;
- border: 1px solid #ffa608;
-}
-div.buttons input.prev {
- color: #1e88e5;
- background-color: #fff;
- border: 1px solid #1e88e5;
-}
-div.buttons input.prev:hover, div.buttons input.prev:focus {
- color: #fff;
- background-color: #1e88e5;
-}
-
-/* Footer */
-#footer_survey {
- padding: 40px;
- background-color: #ffffff;
- border-top: 1px #ddeffd solid;
-}
-#footer_survey p, #footer_survey a, #footer_survey a:visited {
- color: #505050;
- font-size: 14px;
- line-height: 25px;
- font-weight: 400;
- text-decoration: none;
-}
-#footer_survey a:hover, #footer_survey a:active {
- text-decoration: none;
-}
-
-/* awesome radio in checkboxi */
-input[type=checkbox] + span.enka-checkbox-radio,
-input[type=radio] + span.enka-checkbox-radio,
-.custom_radio_picture.obarvan > label > span.enka-custom-radio:before,
-.visual-radio-scale.checked .enka-vizualna-skala {
- color: #42A5F5;
- font-size: 20px;
- vertical-align: -1px;
-}
-
-input[type=checkbox]:focus + span.enka-checkbox-radio:before,
-input[type=radio]:focus + span.enka-checkbox-radio:before,
-input[type=radio]:focus + span.enka-custom-radio:before,
-input[type=radio]:focus + span.enka-vizualna-skala::before {
- color: #0965ae;
-}
-
-input[type=text]:focus,
-input[type=number]:focus,
-input[type=email]:focus,
-input[type=password]:focus,
-textarea:focus {
- border-color: #42A5F5;
-}
-
-/* Ranking drag drop */
-.drag_and_drop {
- top: -9px;
- left: -12px;
-}
-
-.drag_and_drop_right {
- top: -9px !important;
- left: -12px !important;
-}
-
-.frame_dropping_titles {
- width: 240px;
- padding: 5px;
- margin: 0px auto 0px auto;
- height: 15px;
- text-align: center;
- background-color: #FFFFFF;
- border-top: 2px solid #b9c5d9;
- border-left: 2px solid #b9c5d9;
- border-right: 2px solid #b9c5d9;
- font-size: 13px;
-}
-
-.drag_and_drop_box {
- top: -9px;
- left: -12px;
-}
-.drag_and_drop_box img {
- display: block;
- margin-left: auto;
- margin-right: auto;
-}
-
-.drag_and_drop_box_right {
- top: 19px !important;
- left: -12px !important;
-}
-
-.drag_and_drop_box_right_after_refresh {
- /*top: 44px!important;*/
- left: -12px !important;
-}
-
-.drag_and_drop_box_right_over {
- left: -12px !important;
-}
-
-.frame_dropping_titles_box {
- width: 240px;
- padding: 5px;
- margin: 0px auto 0px auto;
- height: 15px;
- text-align: center;
- background-color: #FFFFFF;
- font-size: 13px;
-}
-
-.frame_dropping {
- padding: 7px 10px 9px;
-}
-
-.frame_dropping_box {
- padding: 7px 10px 9px;
-}
-
-/*# sourceMappingURL=1kaBlue.css.map */