diff --git a/.docker/images/nginx/conf.d/default.conf b/.docker/images/nginx/conf.d/default.conf index 18217f15f..2d62736b1 100644 --- a/.docker/images/nginx/conf.d/default.conf +++ b/.docker/images/nginx/conf.d/default.conf @@ -64,10 +64,10 @@ server { try_files $uri @sfFront; } - #location /w2p/ { - # proxy_pass http://tp:8080/w2p/; - # proxy_temp_path /tmp/proxy; - #} + location /w2p/ { + proxy_pass http://tp:8080/w2p/; + proxy_temp_path /tmp/proxy; + } location @sfFront { # Symfony if ($request_method = 'OPTIONS') { diff --git a/src/new/src/PSC/System/SettingsBundle/Twig/Node/Barcode.php b/src/new/src/PSC/System/SettingsBundle/Twig/Node/Barcode.php index 435f55416..5957370e0 100755 --- a/src/new/src/PSC/System/SettingsBundle/Twig/Node/Barcode.php +++ b/src/new/src/PSC/System/SettingsBundle/Twig/Node/Barcode.php @@ -41,8 +41,9 @@ class Barcode extends Node $compiler->raw( ' $options = new \PSC\System\SettingsBundle\Barcode\QRGdWithLogoOptions(); -//$options->version = -1; -$options->eccLevel = \chillerlan\QRCode\Common\EccLevel::M; +$options->version = -1; +$options->versionMax = 40; +$options->eccLevel = \chillerlan\QRCode\Common\EccLevel::H; $options->outputType = \chillerlan\QRCode\Output\QROutputInterface::CUSTOM; if(isset($_options["cmyk"]) && $_options["cmyk"] == true) { $options->outputInterface = \PSC\System\SettingsBundle\Barcode\QRImagickCMYK::class; diff --git a/src/new/src/PSC/System/UpdateBundle/Migrations/Version20250613181223.php b/src/new/src/PSC/System/UpdateBundle/Migrations/Version20250613181223.php index 7b4f90ec8..290d949fd 100644 --- a/src/new/src/PSC/System/UpdateBundle/Migrations/Version20250613181223.php +++ b/src/new/src/PSC/System/UpdateBundle/Migrations/Version20250613181223.php @@ -2,7 +2,7 @@ namespace PSC\System\UpdateBundle\Migrations; -class Version20250613181212 extends Base +class Version20250613181223 extends Base { public function migrateDatabase(): void { @@ -11,7 +11,7 @@ class Version20250613181212 extends Base $this->entityManager->getConnection()->exec("alter table article modify column a6_xmlpageobjectsfile varchar(255) default null;"); $this->entityManager->getConnection()->exec("alter table article modify column layouterid varchar(255) default null;"); $this->entityManager->getConnection()->exec("alter table article modify column resale int(1) default null;"); - $this->entityManager->getConnection()->exec("alter table article modify column a6_resale_price float(20,2) default null;"); + $this->entityManager->getConnection()->exec("alter table article modify column a6_resale_price float(20,2) default 0;"); $this->entityManager->getConnection()->exec("alter table article modify column render_new_preview_image int(1) default null;"); $this->entityManager->getConnection()->exec("alter table article modify column render_new_preview_pdf int(1) default null;"); $this->entityManager->getConnection()->exec("alter table article modify column render_new_preview_gallery int(1) default null;"); diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/bun.lock b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/bun.lock index d6e947bbc..8bf4390e3 100644 --- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/bun.lock +++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/bun.lock @@ -5,7 +5,7 @@ "name": "my-vue-app", "dependencies": { "@tailwindcss/vite": "^4.1.10", - "@vueuse/core": "^13.3.0", + "@vueuse/core": "^13.4.0", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", "lucide-vue-next": "^0.514.0", @@ -304,11 +304,11 @@ "@vue/tsconfig": ["@vue/tsconfig@0.7.0", "", { "peerDependencies": { "typescript": "5.x", "vue": "^3.4.0" }, "optionalPeers": ["typescript", "vue"] }, "sha512-ku2uNz5MaZ9IerPPUyOHzyjhXoX2kVJaVf7hL315DC17vS6IiZRmmCPfggNbU16QTvM80+uYYy3eYJB59WCtvg=="], - "@vueuse/core": ["@vueuse/core@13.3.0", "", { "dependencies": { "@types/web-bluetooth": "^0.0.21", "@vueuse/metadata": "13.3.0", "@vueuse/shared": "13.3.0" }, "peerDependencies": { "vue": "^3.5.0" } }, "sha512-uYRz5oEfebHCoRhK4moXFM3NSCd5vu2XMLOq/Riz5FdqZMy2RvBtazdtL3gEcmDyqkztDe9ZP/zymObMIbiYSg=="], + "@vueuse/core": ["@vueuse/core@13.4.0", "", { "dependencies": { "@types/web-bluetooth": "^0.0.21", "@vueuse/metadata": "13.4.0", "@vueuse/shared": "13.4.0" }, "peerDependencies": { "vue": "^3.5.0" } }, "sha512-OnK7zW3bTq/QclEk17+vDFN3tuAm8ONb9zQUIHrYQkkFesu3WeGUx/3YzpEp+ly53IfDAT9rsYXgGW6piNZC5w=="], - "@vueuse/metadata": ["@vueuse/metadata@13.3.0", "", {}, "sha512-42IzJIOYCKIb0Yjv1JfaKpx8JlCiTmtCWrPxt7Ja6Wzoq0h79+YVXmBV03N966KEmDEESTbp5R/qO3AB5BDnGw=="], + "@vueuse/metadata": ["@vueuse/metadata@13.4.0", "", {}, "sha512-CPDQ/IgOeWbqItg1c/pS+Ulum63MNbpJ4eecjFJqgD/JUCJ822zLfpw6M9HzSvL6wbzMieOtIAW/H8deQASKHg=="], - "@vueuse/shared": ["@vueuse/shared@13.3.0", "", { "peerDependencies": { "vue": "^3.5.0" } }, "sha512-L1QKsF0Eg9tiZSFXTgodYnu0Rsa2P0En2LuLrIs/jgrkyiDuJSsPZK+tx+wU0mMsYHUYEjNsuE41uqqkuR8VhA=="], + "@vueuse/shared": ["@vueuse/shared@13.4.0", "", { "peerDependencies": { "vue": "^3.5.0" } }, "sha512-+AxuKbw8R1gYy5T21V5yhadeNM7rJqb4cPaRI9DdGnnNl3uqXh+unvQ3uCaA2DjYLbNr1+l7ht/B4qEsRegX6A=="], "alien-signals": ["alien-signals@1.0.13", "", {}, "sha512-OGj9yyTnJEttvzhTUWuscOvtqxq5vrhF7vL9oS0xJ2mK0ItPYP1/y+vCFebfxoEyAz0++1AIwJ5CMr+Fk3nDmg=="], diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/index.html b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/index.html index 42f416210..c701d93dc 100644 --- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/index.html +++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/index.html @@ -4,7 +4,7 @@ - Vite + Vue + TS + Calc
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/package.json b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/package.json index 9da22f987..550325e7e 100644 --- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/package.json +++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.1.10", - "@vueuse/core": "^13.3.0", + "@vueuse/core": "^13.4.0", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", "lucide-vue-next": "^0.514.0", diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/Gui.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/Gui.vue index 4d8fa81ff..3f0a795e7 100644 --- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/Gui.vue +++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/Gui.vue @@ -13,42 +13,28 @@ import { Main } from '@/components/app/main' - + -