Fixes

.gitea/workflows/run_tests.yaml

@@ -0,0 +1,19 @@
+name: Gitea Actions Demo
+run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
+on: [push]
+
+jobs:
+  Explore-Gitea-Actions:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event."
+      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!"
+      - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner."
+      - run: echo "🖥️ The workflow is now ready to test your code on the runner."
+      - name: List files in the repository
+        run: |
+          ls ${{ gitea.workspace }}
+      - run: echo "🍏 This job's status is ${{ job.status }}."

.make/variables.env

@@ -1,4 +1,4 @@
-DOCKER_REGISTRY=registry.gitlab.com/printshopcreator
+DOCKER_REGISTRY=registry.thomas-peterson.de/printshopcreator
 DOCKER_NAMESPACE=docker
 
 APP_USER_NAME=application

src/new/src/PSC/Shop/ProductBundle/Form/Backend/ProductSearchType.php

@@ -58,6 +58,7 @@ class ProductSearchType extends AbstractType
                         ->andWhere("
                             (product.uid LIKE '%" . $values['value'] . "%' OR
                             product.title LIKE '%" . $values['value'] . "%' OR
+                            product.subTitle LIKE '%" . $values['value'] . "%' OR
                             product.calcXml LIKE '%" . $values['value'] . "%' OR
                             product.textFormat LIKE '%" . $values['value'] . "%' OR
                             product.description LIKE '%" . $values['value'] . "%' OR

src/new/src/PSC/Shop/ProductBundle/Resources/translations/core_product_list.de.yaml

@@ -9,6 +9,8 @@ changed: Geändert
 Yes: Ja
 No: Nein
 Name: Name
+Title: Titel
+Subtitle: Untertitel
 NoIntern: Nr. Intern
 Producttype: Produkttyp
 Productgroups: Produktgruppen

src/new/src/PSC/Shop/ProductBundle/Resources/views/backend/product/list/index.html.twig

@@ -70,7 +70,8 @@
                         <th>{{ knp_pagination_sortable(pagination, 'Sales'|trans, 'product.buyed') }}</th>
                         <th>{{ knp_pagination_sortable(pagination, 'generated'|trans, 'product.createdAt') }}</th>
                         <th>{{ knp_pagination_sortable(pagination, 'changed'|trans, 'product.updatedAt') }}</th>
-                        <th>{{ knp_pagination_sortable(pagination, 'Name'|trans, 'product.title') }}</th>
+                        <th>{{ knp_pagination_sortable(pagination, 'Title'|trans, 'product.title') }}</th>
+                        <th>{{ knp_pagination_sortable(pagination, 'Subtitle'|trans, 'product.subTitle') }}</th>
                         <th>{{ knp_pagination_sortable(pagination, 'NoIntern'|trans, 'product.nrIntern') }}</th>
                         <th>{{ knp_pagination_sortable(pagination, 'Producttype'|trans, 'product.type') }}</th>
                         <th>{{ "Productgroups"|trans }}</th>
@@ -90,6 +91,7 @@
                             <td>{{ product.createdAt|date('H:i d.m.Y') }}</td>
                             <td>{{ product.updatedAt|date('H:i d.m.Y') }}</td>
                             <td>{{ product.title }}</td>
+                            <td>{{ product.subTitle }}</td>
                             <td>{{ product.nrIntern }}</td>
                             <td>{{ product.type|productType }}</td>
                             <td>{% for productGroup in product.productGroups %}{{ productGroup.title }}{% if loop.last != true %}, {%  endif %}{% endfor %}</td>

src/old/application/modules/default/controllers/SearchController.php

@@ -2,7 +2,6 @@
 
 class SearchController extends TP_Controller_Action
 {
-
     /**
      * SearchAction
      *
@@ -46,7 +45,7 @@ class SearchController extends TP_Controller_Action
                 ->where(
                     "c.shop_id = ?
                     AND c.enable = 1 AND c.display_not_in_overview = 0
-                    AND (c.meta_keywords LIKE '%" . $searchQuery . "%' OR c.title LIKE '%" . $searchQuery . "%' OR c.kostenstelle LIKE '%" . $searchQuery . "%' OR c.article_nr_intern LIKE '%" . $searchQuery . "%' OR c.info LIKE '%" . $searchQuery . "%' OR c.einleitung LIKE '%" . $searchQuery . "%')",
+                    AND (c.meta_keywords LIKE '%" . $searchQuery . "%' OR c.sub_title LIKE '%" . $searchQuery . "%' OR c.title LIKE '%" . $searchQuery . "%' OR c.kostenstelle LIKE '%" . $searchQuery . "%' OR c.article_nr_intern LIKE '%" . $searchQuery . "%' OR c.info LIKE '%" . $searchQuery . "%' OR c.einleitung LIKE '%" . $searchQuery . "%')",
                     array($this->shop->id)
                 )
                 ->orderBy('c.pos ASC')
@@ -56,7 +55,7 @@ class SearchController extends TP_Controller_Action
             $temp = array();
             $temp[] = 0;
 
-            if(Zend_Auth::getInstance()->hasIdentity()) {
+            if (Zend_Auth::getInstance()->hasIdentity()) {
                 $identity = Zend_Auth::getInstance()->getIdentity();
 
                 $articles_contact = Doctrine_Query::create()->from('ContactArticle c')->where('c.contact_id = ?', array($identity ['id']))->execute()->toArray();
@@ -70,8 +69,8 @@ class SearchController extends TP_Controller_Action
 
             $article = array();
 
-            foreach($articles as $art) {
-                if(!$art->private || in_array($art->id, $temp)) {
+            foreach ($articles as $art) {
+                if (!$art->private || in_array($art->id, $temp)) {
                     $article[] = $art;
                 }
             }
@@ -95,7 +94,7 @@ class SearchController extends TP_Controller_Action
             $temp = array();
             $temp[] = 0;
 
-            if(Zend_Auth::getInstance()->hasIdentity()) {
+            if (Zend_Auth::getInstance()->hasIdentity()) {
                 $identity = Zend_Auth::getInstance()->getIdentity();
 
                 $articles_contact = Doctrine_Query::create()->from('ContactCms c')->where('c.contact_id = ?', array($identity ['id']))->execute()->toArray();
@@ -107,8 +106,8 @@ class SearchController extends TP_Controller_Action
 
             $tempCms = array();
 
-            foreach($cms as $art) {
-                if(!$art->private || in_array($art->id, $temp)) {
+            foreach ($cms as $art) {
+                if (!$art->private || in_array($art->id, $temp)) {
                     $tempCms[] = $art;
                 }
             }
@@ -120,7 +119,8 @@ class SearchController extends TP_Controller_Action
 
     protected function getAccountArticle($articles, $account_id, $deep = 1)
     {
-        if($deep == 4) { return $articles;
+        if ($deep == 4) {
+            return $articles;
         }
         $account_article = Doctrine_Query::create()->from('AccountArticle c')->where('c.account_id = ?', array($account_id))->execute()->toArray();
         $account = Doctrine_Query::create()->from('Account a')->where('a.id = ?', array($account_id))->fetchOne();
@@ -131,8 +131,8 @@ class SearchController extends TP_Controller_Action
             }
         }
 
-        if($account['filiale_id'] != "" && $account['filiale_id'] != 0) {
-            $articles = $this->getAccountArticle($articles, $account['filiale_id'], $deep+1);
+        if ($account['filiale_id'] != "" && $account['filiale_id'] != 0) {
+            $articles = $this->getAccountArticle($articles, $account['filiale_id'], $deep + 1);
         }
 
         return $articles;