Merge branch 'gitea-ci' into prod

.gitea/workflows/ci.yaml

@@ -26,15 +26,26 @@ jobs:
           - 5432:5432
         env:
           POSTGRES_PASSWORD: postgres
+      mysql8:
+        image: mysql:8.0
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_DATABASE: test_db
+        ports:
+          - 3306:3306
 
     steps:
       - uses: actions/checkout@v4
-
       - name: Setup Service
         if: matrix.db-type == 'mysql'
         run: |
-          sudo service mysql start
+          apt-get update && apt-get install -y lsb-release inetutils-tools
-          mysql -h 127.0.0.1 -u root -proot -e 'CREATE DATABASE cakephp;'
+          wget https://dev.mysql.com/get/mysql-apt-config_0.8.24-1_all.deb
+          DEBIAN_FRONTEND=noninteractive dpkg -i mysql-apt-config_0.8.24-1_all.deb
+          apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C
+          apt-get update
+          apt install -y default-mysql-client
+          mysql -h mysql8 -u root -e 'CREATE DATABASE cakephp;'
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

templates/ProductCatalogs/index.php

@@ -11,7 +11,6 @@
         <table>
             <thead>
                 <tr>
-                    <th><?= $this->Paginator->sort('id') ?></th>
                     <th><?= $this->Paginator->sort('name') ?></th>
                     <th><?= $this->Paginator->sort('catalog_description') ?></th>
                     <th><?= $this->Paginator->sort('enabled') ?></th>
@@ -21,7 +20,6 @@
             <tbody>
                 <?php foreach ($productCatalogs as $productCatalog): ?>
                 <tr>
-                    <td><?= $productCatalog->id; ?></td>
                     <td><?= h($productCatalog->name) ?></td>
                     <td><?= h($productCatalog->catalog_description) ?></td>
                     <td><?= h($productCatalog->enabled) ?></td>

templates/ProductCategories/index.php

@@ -11,7 +11,6 @@
         <table>
             <thead>
                 <tr>
-                    <th><?= $this->Paginator->sort('id') ?></th>
                     <th><?= $this->Paginator->sort('product_catalog_id') ?></th>
                     <th><?= $this->Paginator->sort('name') ?></th>
                     <th><?= $this->Paginator->sort('parent_id') ?></th>
@@ -22,7 +21,6 @@
             <tbody>
                 <?php foreach ($productCategories as $productCategory): ?>
                 <tr>
-                    <td><?= $productCategory->id; ?></td>
                     <td><?= $productCategory->hasValue('product_catalog') ? $this->Html->link($productCategory->product_catalog->name, ['controller' => 'ProductCatalogs', 'action' => 'view', $productCategory->product_catalog->id]) : '' ?></td>
                     <td><?= h($productCategory->name) ?></td>
                     <td><?= $productCategory->hasValue('parent_product_category') ? $this->Html->link($productCategory->parent_product_category->name, ['controller' => 'ProductCategories', 'action' => 'view', $productCategory->parent_product_category->id]) : '' ?></td>

templates/ProductCategoryAttributes/index.php

@@ -11,7 +11,6 @@
         <table>
             <thead>
                 <tr>
-                    <th><?= $this->Paginator->sort('id') ?></th>
                     <th><?= $this->Paginator->sort('name') ?></th>
                     <th><?= $this->Paginator->sort('product_category_id') ?></th>
                     <th><?= $this->Paginator->sort('attribute_type_id') ?></th>
@@ -22,7 +21,6 @@
             <tbody>
                 <?php foreach ($productCategoryAttributes as $productCategoryAttribute): ?>
                 <tr>
-                    <td><?= $productCategoryAttribute->id ?></td>
                     <td><?= h($productCategoryAttribute->name) ?></td>
                     <td><?= $productCategoryAttribute->hasValue('product_category') ? $this->Html->link($productCategoryAttribute->product_category->name, ['controller' => 'ProductCategories', 'action' => 'view', $productCategoryAttribute->product_category->id]) : '' ?></td>
                     <td><?= $productCategoryAttribute->attribute_type_id->name ?></td>

templates/ProductCategoryAttributes/view.php

@@ -42,7 +42,6 @@
                     <table>
                         <tr>
                             <th><?= __('Id') ?></th>
-                            <th><?= __('Product Category Attribute Id') ?></th>
                             <th><?= __('Attribute Value') ?></th>
                             <th><?= __('Attribute Label') ?></th>
                             <th><?= __('Enabled') ?></th>
@@ -51,7 +50,6 @@
                         <?php foreach ($productCategoryAttribute->product_category_attribute_options as $productCategoryAttributeOptions) : ?>
                         <tr>
                             <td><?= h($productCategoryAttributeOptions->id) ?></td>
-                            <td><?= h($productCategoryAttributeOptions->product_category_attribute_id) ?></td>
                             <td><?= h($productCategoryAttributeOptions->attribute_value) ?></td>
                             <td><?= h($productCategoryAttributeOptions->attribute_label) ?></td>
                             <td><?= h($productCategoryAttributeOptions->enabled) ?></td>

templates/Products/index.php

@@ -11,7 +11,6 @@
         <table>
             <thead>
                 <tr>
-                    <th><?= $this->Paginator->sort('id') ?></th>
                     <th><?= $this->Paginator->sort('name') ?></th>
                     <th><?= $this->Paginator->sort('product_category_id') ?></th>
                     <th><?= $this->Paginator->sort('product_type_id') ?></th>
@@ -21,7 +20,6 @@
             <tbody>
                 <?php foreach ($products as $product): ?>
                 <tr>
-                    <td><?= $this->Number->format($product->id) ?></td>
                     <td><?= h($product->name) ?></td>
                     <td><?= $product->hasValue('product_category') ? $this->Html->link($product->product_category->name, ['controller' => 'ProductCategories', 'action' => 'view', $product->product_category->id]) : '' ?></td>
                     <td><?= $product->product_type_id->name ?></td>