From affe264b30edddada3ec0ed70898d54110154d46 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 27 Feb 2025 10:29:00 +0100 Subject: [PATCH] Fixes --- .docker/.env.example | 3 +- .../docker-compose.local.ci.yml | 10 ++ .../docker-compose/docker-compose.local.yml | 1 + .gitea/workflows/run_tests.yaml | 4 +- src/new/.env.test | 4 +- .../articletemplates/scripts/2.phtml | 114 +++++++++--------- 6 files changed, 71 insertions(+), 65 deletions(-) diff --git a/.docker/.env.example b/.docker/.env.example index 72c71b2df..971b68711 100644 --- a/.docker/.env.example +++ b/.docker/.env.example @@ -10,8 +10,9 @@ APP_SSH_PASSWORD=123456 # mysql MYSQL_DATABASE=psc -MYSQL_PASSWORD=Wichtig1 +MYSQL_PASSWORD=psc MYSQL_ROOT_PASSWORD=Wichtig1 +MYSQL_USER=psc #APP_USER_NAME=application #APP_USER_ID=10000 diff --git a/.docker/docker-compose/docker-compose.local.ci.yml b/.docker/docker-compose/docker-compose.local.ci.yml index 1011c0152..76bf2b0b1 100644 --- a/.docker/docker-compose/docker-compose.local.ci.yml +++ b/.docker/docker-compose/docker-compose.local.ci.yml @@ -1,2 +1,12 @@ version: '3.7' +services: + application: + environment: + - APP_ENV=test + php-cron: + environment: + - APP_ENV=test + php-fpm: + environment: + - APP_ENV=test diff --git a/.docker/docker-compose/docker-compose.local.yml b/.docker/docker-compose/docker-compose.local.yml index 77f2dee67..1f1c6d76c 100644 --- a/.docker/docker-compose/docker-compose.local.yml +++ b/.docker/docker-compose/docker-compose.local.yml @@ -98,6 +98,7 @@ services: - BASE_IMAGE=${DOCKER_REGISTRY?}/${DOCKER_NAMESPACE?}/php-base-${ENV?}:${TAG?} - APP_SSH_PASSWORD=${APP_SSH_PASSWORD?} - ENV=${ENV?} + - APP_ENV=${APP_ENV} environment: - PHP_IDE_CONFIG=${PHP_IDE_CONFIG?} # cap_add and security_opt are required to enable strace diff --git a/.gitea/workflows/run_tests.yaml b/.gitea/workflows/run_tests.yaml index 6fad4d252..95b08c9d4 100644 --- a/.gitea/workflows/run_tests.yaml +++ b/.gitea/workflows/run_tests.yaml @@ -15,7 +15,7 @@ jobs: - run: echo "🖥️ The workflow is now ready to test your code on the runner." - name: Init run: | - make make-init + make make-init ENVS="ENV=test TAG=latest" make docker-compose-init - name: Build Images run: | @@ -49,7 +49,7 @@ jobs: - run: echo "🖥️ The workflow is now ready to test your code on the runner." - name: Init run: | - make make-init + make make-init ENVS="ENV=test TAG=latest" make docker-compose-init - name: Build Images run: | diff --git a/src/new/.env.test b/src/new/.env.test index 690698b1b..3f1653430 100755 --- a/src/new/.env.test +++ b/src/new/.env.test @@ -1,10 +1,8 @@ APP_ENV=test MAILER_DSN=smtp://smtp4dev:25 -PDFLIB_LIC=L900202-010091-135115-PPD3D2-EHE432 CORS_ALLOW_ORIGIN=* -DATABASE_URL=sqlite:///%kernel.project_dir%/var/test.sqlite MONGODB_DB=psc_test -DATABASE_URL=mysql://root:Wichtig1@mysql:3306/psc_test +DATABASE_URL=mysql://psc:psc@mysql:3306/psc_test PANTHER_NO_SANDBOX=0 PANTHER_WEB_SERVER_PORT=9001 PANTHER_CHROME_ARGUMENTS='--disable-dev-shm-usage' diff --git a/src/old/application/design/vorlagen/bootstrap4_api/articletemplates/scripts/2.phtml b/src/old/application/design/vorlagen/bootstrap4_api/articletemplates/scripts/2.phtml index be6115087..7bb23340a 100755 --- a/src/old/application/design/vorlagen/bootstrap4_api/articletemplates/scripts/2.phtml +++ b/src/old/application/design/vorlagen/bootstrap4_api/articletemplates/scripts/2.phtml @@ -30,7 +30,7 @@
- image()->thumbnailImage($this->article->title, 'layouter', $this->article->file); ?> + image()->thumbnailImage($this->article->title, 'layouter', $this->article->file); ?>
@@ -51,11 +51,11 @@ - +
@@ -63,11 +63,11 @@
+ /** + * Produktkonfiguration und Summe: + * Verschachtelte Anzeige: daher: neue Row + */ + ?>
@@ -88,7 +88,7 @@ article->stock): ?>
- article->display_no_price AND !$this->designsettings()->get('display_no_price')): ?> + article->display_no_price and !$this->designsettings()->get('display_no_price')): ?>

translate('Summe')?>


@@ -97,7 +97,7 @@

translate('Gewicht')?>: weight ?>g

- article->display_no_price AND !$this->designsettings()->get('display_no_price')): ?> + article->display_no_price and !$this->designsettings()->get('display_no_price')): ?> @@ -165,53 +165,41 @@ article->file1 != "" || $this->article->file2 != "" || $this->article->file3 != "" || $this->article->file4 != "" || $this->article->file5 != ""): ?>
- - article->file != ""): ?> - - - article->file1 != ""): ?> - - - article->file2 != ""): ?> - + + article->file2 != "") : ?> + - - - article->file3 != ""): ?> - + + article->file3 != "") : ?> + - - - article->file4 != ""): ?> - + + article->file4 != "") : ?> + - - - article->file5 != ""): ?> - + + article->file5 != "") : ?> + - - - article->file6 != ""): ?> - + + article->file6 != "") : ?> + - - - article->file7 != ""): ?> - + + article->file7 != "") : ?> + - - - article->getYoutubeId() != '') : ?> - - - + +
@@ -238,12 +226,20 @@
article->getAblaufDatum(),"d.m.Y"); if($this->article->getAblaufDatum()) { echo "Ablaufdatum: " . date_format($this->article->getAblaufDatum(),"d.m.Y") . "
"; }*/ - if($this->article->getZusatzDesigner() != "") { echo $this->article->getZusatzDesigner() . "
"; } - if($this->article->getZusatzAbmessung() != "") { echo $this->article->getZusatzAbmessung() . "
"; } - if($this->article->getZusatzShipping() != "") { echo $this->article->getZusatzShipping() . "
"; } - if($this->article->getAnsprechPartner() != "") { echo $this->article->getAnsprechPartner() . "
"; } - ?> + if($this->article->getZusatzDesigner() != "") { + echo $this->article->getZusatzDesigner() . "
"; + } + if($this->article->getZusatzAbmessung() != "") { + echo $this->article->getZusatzAbmessung() . "
"; + } + if($this->article->getZusatzShipping() != "") { + echo $this->article->getZusatzShipping() . "
"; + } + if($this->article->getAnsprechPartner() != "") { + echo $this->article->getAnsprechPartner() . "
"; + } + ?>
article->getText() ?>
- \ No newline at end of file +