diff --git a/.gitea/workflows/run_tests.yaml b/.gitea/workflows/run_tests.yaml new file mode 100644 index 000000000..c537cc636 --- /dev/null +++ b/.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 }}." diff --git a/.make/variables.env b/.make/variables.env index a86659597..21266d497 100644 --- a/.make/variables.env +++ b/.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 diff --git a/src/new/src/PSC/Shop/ProductBundle/Form/Backend/ProductSearchType.php b/src/new/src/PSC/Shop/ProductBundle/Form/Backend/ProductSearchType.php index 6bd2600d3..2a2c183ed 100755 --- a/src/new/src/PSC/Shop/ProductBundle/Form/Backend/ProductSearchType.php +++ b/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 diff --git a/src/new/src/PSC/Shop/ProductBundle/Resources/translations/core_product_list.de.yaml b/src/new/src/PSC/Shop/ProductBundle/Resources/translations/core_product_list.de.yaml index 32853c6b9..8fe423a8f 100755 --- a/src/new/src/PSC/Shop/ProductBundle/Resources/translations/core_product_list.de.yaml +++ b/src/new/src/PSC/Shop/ProductBundle/Resources/translations/core_product_list.de.yaml @@ -9,8 +9,10 @@ changed: GeΓ€ndert Yes: Ja No: Nein Name: Name +Title: Titel +Subtitle: Untertitel NoIntern: Nr. Intern Producttype: Produkttyp Productgroups: Produktgruppen Mainproduct: Hauptprodukt -Filter: Filtern \ No newline at end of file +Filter: Filtern diff --git a/src/new/src/PSC/Shop/ProductBundle/Resources/views/backend/product/list/index.html.twig b/src/new/src/PSC/Shop/ProductBundle/Resources/views/backend/product/list/index.html.twig index ed074203c..5a3e3ced4 100755 --- a/src/new/src/PSC/Shop/ProductBundle/Resources/views/backend/product/list/index.html.twig +++ b/src/new/src/PSC/Shop/ProductBundle/Resources/views/backend/product/list/index.html.twig @@ -70,7 +70,8 @@ {{ knp_pagination_sortable(pagination, 'Sales'|trans, 'product.buyed') }} {{ knp_pagination_sortable(pagination, 'generated'|trans, 'product.createdAt') }} {{ knp_pagination_sortable(pagination, 'changed'|trans, 'product.updatedAt') }} - {{ knp_pagination_sortable(pagination, 'Name'|trans, 'product.title') }} + {{ knp_pagination_sortable(pagination, 'Title'|trans, 'product.title') }} + {{ knp_pagination_sortable(pagination, 'Subtitle'|trans, 'product.subTitle') }} {{ knp_pagination_sortable(pagination, 'NoIntern'|trans, 'product.nrIntern') }} {{ knp_pagination_sortable(pagination, 'Producttype'|trans, 'product.type') }} {{ "Productgroups"|trans }} @@ -90,6 +91,7 @@ {{ product.createdAt|date('H:i d.m.Y') }} {{ product.updatedAt|date('H:i d.m.Y') }} {{ product.title }} + {{ product.subTitle }} {{ product.nrIntern }} {{ product.type|productType }} {% for productGroup in product.productGroups %}{{ productGroup.title }}{% if loop.last != true %}, {% endif %}{% endfor %} @@ -109,4 +111,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/src/old/application/modules/default/controllers/SearchController.php b/src/old/application/modules/default/controllers/SearchController.php index 524f8c089..d1f01a7f2 100755 --- a/src/old/application/modules/default/controllers/SearchController.php +++ b/src/old/application/modules/default/controllers/SearchController.php @@ -2,7 +2,6 @@ class SearchController extends TP_Controller_Action { - /** * SearchAction * @@ -28,7 +27,7 @@ class SearchController extends TP_Controller_Action $input = new Zend_Filter_Input($filters, $validators, $this->_getAllParams()); - if ($input->isValid('q') + if ($input->isValid('q') && $this->_getParam('q') != "" ) { @@ -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;