Fixes

2025-02-27 10:29:00 +01:00 · 2025-02-27 10:29:00 +01:00 · affe264b30
commit affe264b30
parent 4ddb87bfa0
6 changed files with 71 additions and 65 deletions
--- 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
--- 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
--- 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
--- 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: |
--- 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'
--- 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 @@

                        <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/>
 			    
 			    
@ -88,7 +88,7 @@
                        <?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 />
                        <?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>
 						<br/>
 						<?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>
 						<?php endif; ?>
 						<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">
                                        <tbody>
                                        <tr>
@ -165,53 +165,41 @@
 <?php if($this->article->file1 != "" || $this->article->file2 != "" || $this->article->file3 != "" || $this->article->file4 != "" || $this->article->file5 != ""): ?>
 			    
 				<div class="vorschau-bilder-klein clearfix">
-
-				<?php if($this->article->file != ""): ?>
-                            <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 ?>')">
+<?php if ($this->article->file1 != "") : ?>
+                            <a href="<?php echo $this->image()->thumbnailImage($this->article->title, 'articlesinglegreater', $this->article->file1, true); ?>" data-lightbox="article_detail">
                                <img src="<?php echo $this->image()->thumbnailImage($this->article->title, 'little', $this->article->file1, true); ?>" class="img-fluid">
-                            </label>
+                            </a>
                        <?php endif; ?>
-                            <?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 ?>')">
+                        <?php if ($this->article->file2 != "") : ?>
+                            <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">
-                            </label>
+                            </a>
                        <?php endif; ?>
-                            <?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 ?>')">
+                        <?php if ($this->article->file3 != "") : ?>
+                            <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">
-                            </label>
+                            </a>
                        <?php endif; ?>
-                            <?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 ?>')">
+                        <?php if ($this->article->file4 != "") : ?>
+                            <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">
-                            </label>
+                            </a>
                        <?php endif; ?>
-                            <?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 ?>')">
+                        <?php if ($this->article->file5 != "") : ?>
+                            <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">
-                            </label>
+                            </a>
                        <?php endif; ?>
-                            <?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 ?>')">
+                        <?php if ($this->article->file6 != "") : ?>
+                            <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">
-                            </label>
+                            </a>
                        <?php endif; ?>
-                            <?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 ?>')">
+                        <?php if ($this->article->file7 != "") : ?>
+                            <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">
-                            </label>
+                            </a>
                        <?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>
@ -238,10 +226,18 @@
                </div>
                <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 />"; }*/
-                 if($this->article->getZusatzDesigner() != "") { echo $this->article->getZusatzDesigner() . "<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 />"; }
+	     if($this->article->getZusatzDesigner() != "") {
+	         echo $this->article->getZusatzDesigner() . "<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 class="clearfix"></div>