boonkerz/printshopcreator
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases 2 Wiki Activity

Fixes
Some checks failed
Gitea Actions Demo / Run-Tests-On-Arm64 (push) Failing after 19s
Details
Gitea Actions Demo / Run-Tests-On-Amd64 (push) Failing after 26s
Details

Browse Source
This commit is contained in:
Thomas 2025-02-27 10:29:00 +01:00
parent 4ddb87bfa0
commit affe264b30
6 changed files with 71 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.docker/.env.example
View File

@ -10,8 +10,9 @@ APP_SSH_PASSWORD=123456
# mysql # mysql
MYSQL_DATABASE=psc MYSQL_DATABASE=psc
MYSQL_PASSWORD=Wichtig1 MYSQL_PASSWORD=psc
MYSQL_ROOT_PASSWORD=Wichtig1 MYSQL_ROOT_PASSWORD=Wichtig1
MYSQL_USER=psc
#APP_USER_NAME=application #APP_USER_NAME=application
#APP_USER_ID=10000 #APP_USER_ID=10000

10
.docker/docker-compose/docker-compose.local.ci.yml
View File

@ -1,2 +1,12 @@
version: '3.7' version: '3.7'
services:
application:
environment:
- APP_ENV=test
php-cron:
environment:
- APP_ENV=test
php-fpm:
environment:
- APP_ENV=test

1
.docker/docker-compose/docker-compose.local.yml
View File

@ -98,6 +98,7 @@ services:
- BASE_IMAGE=${DOCKER_REGISTRY?}/${DOCKER_NAMESPACE?}/php-base-${ENV?}:${TAG?} - BASE_IMAGE=${DOCKER_REGISTRY?}/${DOCKER_NAMESPACE?}/php-base-${ENV?}:${TAG?}
- APP_SSH_PASSWORD=${APP_SSH_PASSWORD?} - APP_SSH_PASSWORD=${APP_SSH_PASSWORD?}
- ENV=${ENV?} - ENV=${ENV?}
- APP_ENV=${APP_ENV}
environment: environment:
- PHP_IDE_CONFIG=${PHP_IDE_CONFIG?} - PHP_IDE_CONFIG=${PHP_IDE_CONFIG?}
# cap_add and security_opt are required to enable strace # cap_add and security_opt are required to enable strace

4
.gitea/workflows/run_tests.yaml
View File

@ -15,7 +15,7 @@ jobs:
- run: echo "🖥️ The workflow is now ready to test your code on the runner." - run: echo "🖥️ The workflow is now ready to test your code on the runner."
- name: Init - name: Init
run: | run: |
make make-init make make-init ENVS="ENV=test TAG=latest"
make docker-compose-init make docker-compose-init
- name: Build Images - name: Build Images
run: | run: |
@ -49,7 +49,7 @@ jobs:
- run: echo "🖥️ The workflow is now ready to test your code on the runner." - run: echo "🖥️ The workflow is now ready to test your code on the runner."
- name: Init - name: Init
run: | run: |
make make-init make make-init ENVS="ENV=test TAG=latest"
make docker-compose-init make docker-compose-init
- name: Build Images - name: Build Images
run: | run: |

4
src/new/.env.test
View File

@ -1,10 +1,8 @@
APP_ENV=test APP_ENV=test
MAILER_DSN=smtp://smtp4dev:25 MAILER_DSN=smtp://smtp4dev:25
PDFLIB_LIC=L900202-010091-135115-PPD3D2-EHE432
CORS_ALLOW_ORIGIN=* CORS_ALLOW_ORIGIN=*
DATABASE_URL=sqlite:///%kernel.project_dir%/var/test.sqlite
MONGODB_DB=psc_test 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_NO_SANDBOX=0
PANTHER_WEB_SERVER_PORT=9001 PANTHER_WEB_SERVER_PORT=9001
PANTHER_CHROME_ARGUMENTS='--disable-dev-shm-usage' PANTHER_CHROME_ARGUMENTS='--disable-dev-shm-usage'

110
src/old/application/design/vorlagen/bootstrap4_api/articletemplates/scripts/2.phtml
View File

@ -30,7 +30,7 @@
<div class="thumbnail"> <div class="thumbnail">
<?php echo $this->image()->thumbnailImage($this->article->title, 'layouter', $this->article->file); ?> <a href="<?php echo $this->image()->thumbnailImage($this->article->title, 'articlesinglegreater', $this->article->file, true); ?>" data-lightbox="article_detail"><?php echo $this->image()->thumbnailImage($this->article->title, 'layouter', $this->article->file); ?></a>
<br/> <br/>
@ -52,10 +52,10 @@
<?php <?php
/****************************************************************************************************************************************************************************** /******************************************************************************************************************************************************************************
* Beginn SPalte 2 * Beginn SPalte 2
*/ */
?> ?>
<div class="col-md-9"> <div class="col-md-9">
<form method="post" action=""> <form method="post" action="">
@ -63,11 +63,11 @@
</form> </form>
<?php <?php
/** /**
* Produktkonfiguration und Summe: * Produktkonfiguration und Summe:
* Verschachtelte Anzeige: daher: neue Row * Verschachtelte Anzeige: daher: neue Row
*/ */
?> ?>
<div class="row"> <div class="row">
<div class="col-md-8" style="padding:0 2em"> <div class="col-md-8" style="padding:0 2em">
@ -88,7 +88,7 @@
<?php if($this->article->stock): ?> <?php if($this->article->stock): ?>
<label class="basketstocklabel"><?php echo $this->translate('Aktueller Bestand')?>: <?php echo $this->article->stock_count ?> <?php echo $this->translate('Stk.')?></label><br /> <label class="basketstocklabel"><?php echo $this->translate('Aktueller Bestand')?>: <?php echo $this->article->stock_count ?> <?php echo $this->translate('Stk.')?></label><br />
<?php endif; ?> <?php endif; ?>
<?php if(!$this->article->display_no_price AND !$this->designsettings()->get('display_no_price')): ?> <?php if(!$this->article->display_no_price and !$this->designsettings()->get('display_no_price')): ?>
<h3><?php echo $this->translate('Summe')?></h3> <h3><?php echo $this->translate('Summe')?></h3>
<br/> <br/>
<?php endif; ?> <?php endif; ?>
@ -97,7 +97,7 @@
<p id="weight_display" class="text-info"><?php echo $this->translate('Gewicht')?>: <span><?php echo $this->weight ?></span>g</p> <p id="weight_display" class="text-info"><?php echo $this->translate('Gewicht')?>: <span><?php echo $this->weight ?></span>g</p>
<?php endif; ?> <?php endif; ?>
<div class="wellforMobilePrice"> <div class="wellforMobilePrice">
<?php if(!$this->article->display_no_price AND !$this->designsettings()->get('display_no_price')): ?> <?php if(!$this->article->display_no_price and !$this->designsettings()->get('display_no_price')): ?>
<table class="table"> <table class="table">
<tbody> <tbody>
<tr> <tr>
@ -165,53 +165,41 @@
<?php if($this->article->file1 != "" || $this->article->file2 != "" || $this->article->file3 != "" || $this->article->file4 != "" || $this->article->file5 != ""): ?> <?php if($this->article->file1 != "" || $this->article->file2 != "" || $this->article->file3 != "" || $this->article->file4 != "" || $this->article->file5 != ""): ?>
<div class="vorschau-bilder-klein clearfix"> <div class="vorschau-bilder-klein clearfix">
<?php if ($this->article->file1 != "") : ?>
<?php if($this->article->file != ""): ?> <a href="<?php echo $this->image()->thumbnailImage($this->article->title, 'articlesinglegreater', $this->article->file1, true); ?>" data-lightbox="article_detail">
<label onclick="loadFile('<?php echo $this->image()->thumbnailImage($this->article->title, 'articlesinglegreater', $this->article->file, true); ?>', 'pic', '<?php echo $this->article->title ?>')">
<img src="<?php echo $this->image()->thumbnailImage($this->article->title, 'little', $this->article->file, true); ?>" class="img-fluid">
</label>
<?php endif; ?>
<?php if($this->article->file1 != ""): ?>
<label onclick="loadFile('<?php echo $this->image()->thumbnailImage($this->article->title, 'articlesinglegreater', $this->article->file1, true); ?>', 'pic', '<?php echo $this->article->title ?>')">
<img src="<?php echo $this->image()->thumbnailImage($this->article->title, 'little', $this->article->file1, true); ?>" class="img-fluid"> <img src="<?php echo $this->image()->thumbnailImage($this->article->title, 'little', $this->article->file1, true); ?>" class="img-fluid">
</label> </a>
<?php endif; ?> <?php endif; ?>
<?php if($this->article->file2 != ""): ?> <?php if ($this->article->file2 != "") : ?>
<label onclick="loadFile('<?php echo $this->image()->thumbnailImage($this->article->title, 'articlesinglegreater', $this->article->file2, true); ?>', 'pic', '<?php echo $this->article->title ?>')"> <a href="<?php echo $this->image()->thumbnailImage($this->article->title, 'articlesinglegreater', $this->article->file2, true); ?>" data-lightbox="article_detail">
<img src="<?php echo $this->image()->thumbnailImage($this->article->title, 'little', $this->article->file2, true); ?>" class="img-fluid"> <img src="<?php echo $this->image()->thumbnailImage($this->article->title, 'little', $this->article->file2, true); ?>" class="img-fluid">
</label> </a>
<?php endif; ?> <?php endif; ?>
<?php if($this->article->file3 != ""): ?> <?php if ($this->article->file3 != "") : ?>
<label onclick="loadFile('<?php echo $this->image()->thumbnailImage($this->article->title, 'articlesinglegreater', $this->article->file3, true); ?>', 'pic', '<?php echo $this->article->title ?>')"> <a href="<?php echo $this->image()->thumbnailImage($this->article->title, 'articlesinglegreater', $this->article->file3, true); ?>" data-lightbox="article_detail">
<img src="<?php echo $this->image()->thumbnailImage($this->article->title, 'little', $this->article->file3, true); ?>" class="img-fluid"> <img src="<?php echo $this->image()->thumbnailImage($this->article->title, 'little', $this->article->file3, true); ?>" class="img-fluid">
</label> </a>
<?php endif; ?> <?php endif; ?>
<?php if($this->article->file4 != ""): ?> <?php if ($this->article->file4 != "") : ?>
<label onclick="loadFile('<?php echo $this->image()->thumbnailImage($this->article->title, 'articlesinglegreater', $this->article->file4, true); ?>', 'pic', '<?php echo $this->article->title ?>')"> <a href="<?php echo $this->image()->thumbnailImage($this->article->title, 'articlesinglegreater', $this->article->file4, true); ?>" data-lightbox="article_detail">
<img src="<?php echo $this->image()->thumbnailImage($this->article->title, 'little', $this->article->file4, true); ?>" class="img-fluid"> <img src="<?php echo $this->image()->thumbnailImage($this->article->title, 'little', $this->article->file4, true); ?>" class="img-fluid">
</label> </a>
<?php endif; ?> <?php endif; ?>
<?php if($this->article->file5 != ""): ?> <?php if ($this->article->file5 != "") : ?>
<label onclick="loadFile('<?php echo $this->image()->thumbnailImage($this->article->title, 'articlesinglegreater', $this->article->file5, true); ?>', 'pic', '<?php echo $this->article->title ?>')"> <a href="<?php echo $this->image()->thumbnailImage($this->article->title, 'articlesinglegreater', $this->article->file5, true); ?>" data-lightbox="article_detail">
<img src="<?php echo $this->image()->thumbnailImage($this->article->title, 'little', $this->article->file5, true); ?>" class="img-fluid"> <img src="<?php echo $this->image()->thumbnailImage($this->article->title, 'little', $this->article->file5, true); ?>" class="img-fluid">
</label> </a>
<?php endif; ?> <?php endif; ?>
<?php if($this->article->file6 != ""): ?> <?php if ($this->article->file6 != "") : ?>
<label onclick="loadFile('<?php echo $this->image()->thumbnailImage($this->article->title, 'articlesinglegreater', $this->article->file6, true); ?>', 'pic', '<?php echo $this->article->title ?>')"> <a href="<?php echo $this->image()->thumbnailImage($this->article->title, 'articlesinglegreater', $this->article->file6, true); ?>" data-lightbox="article_detail">
<img src="<?php echo $this->image()->thumbnailImage($this->article->title, 'little', $this->article->file6, true); ?>" class="img-fluid"> <img src="<?php echo $this->image()->thumbnailImage($this->article->title, 'little', $this->article->file6, true); ?>" class="img-fluid">
</label> </a>
<?php endif; ?> <?php endif; ?>
<?php if($this->article->file7 != ""): ?> <?php if ($this->article->file7 != "") : ?>
<label onclick="loadFile('<?php echo $this->image()->thumbnailImage($this->article->title, 'articlesinglegreater', $this->article->file7, true); ?>', 'pic', '<?php echo $this->article->title ?>')"> <a href="<?php echo $this->image()->thumbnailImage($this->article->title, 'articlesinglegreater', $this->article->file7, true); ?>" data-lightbox="article_detail">
<img src="<?php echo $this->image()->thumbnailImage($this->article->title, 'little', $this->article->file7, true); ?>" class="img-fluid"> <img src="<?php echo $this->image()->thumbnailImage($this->article->title, 'little', $this->article->file7, true); ?>" class="img-fluid">
</label> </a>
<?php endif; ?> <?php endif; ?>
<?php if ( $this->article->getYoutubeId() != '') : ?>
<label onclick="loadFile('//www.youtube.com/embed/<?php echo $this->article->getYoutubeId(); ?>', 'youtube')">
<img style="background:url(<?php echo'https://img.youtube.com/vi/'.$this->article->getYoutubeId().'/1.jpg'; ?>)" src="/<?php echo $this->designPath ?>bootstrap/img/miniplay.png"alt="" />
</label>
<?php endif; ?>
</div> </div>
@ -238,11 +226,19 @@
</div> </div>
<div class="col-md-5" style="padding-left: 0px;padding-right: 0px;"> <div class="col-md-5" style="padding-left: 0px;padding-right: 0px;">
<?php /*var_dump($this->article->getAblaufDatum(),"d.m.Y"); if($this->article->getAblaufDatum()) { echo "Ablaufdatum: " . date_format($this->article->getAblaufDatum(),"d.m.Y") . "<br />"; }*/ <?php /*var_dump($this->article->getAblaufDatum(),"d.m.Y"); if($this->article->getAblaufDatum()) { echo "Ablaufdatum: " . date_format($this->article->getAblaufDatum(),"d.m.Y") . "<br />"; }*/
if($this->article->getZusatzDesigner() != "") { echo $this->article->getZusatzDesigner() . "<br />"; } if($this->article->getZusatzDesigner() != "") {
if($this->article->getZusatzAbmessung() != "") { echo $this->article->getZusatzAbmessung() . "<br />"; } echo $this->article->getZusatzDesigner() . "<br />";
if($this->article->getZusatzShipping() != "") { echo $this->article->getZusatzShipping() . "<br />"; } }
if($this->article->getAnsprechPartner() != "") { echo $this->article->getAnsprechPartner() . "<br />"; } if($this->article->getZusatzAbmessung() != "") {
?> echo $this->article->getZusatzAbmessung() . "<br />";
}
if($this->article->getZusatzShipping() != "") {
echo $this->article->getZusatzShipping() . "<br />";
}
if($this->article->getAnsprechPartner() != "") {
echo $this->article->getAnsprechPartner() . "<br />";
}
?>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<div style="margin-bottom:50px;"><?php echo $this->article->getText() ?></div> <div style="margin-bottom:50px;"><?php echo $this->article->getText() ?></div>