Baks Development

baks-dev · Apr 16, 2024 · e5925c7 · e5925c7
1 parent b144ab5
commit e5925c7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 20 deletions.
diff --git a/Listeners/Entity/ProductSignModifyListener.php b/Listeners/Entity/ProductSignModifyListener.php
@@ -24,7 +24,7 @@
 namespace BaksDev\Products\Sign\Listeners\Entity;
 
 use BaksDev\Core\Type\Ip\IpAddress;
-use BaksDev\Products\Category\Entity\Modify\ProductCategoryModify;
+use BaksDev\Products\Category\Entity\Modify\CategoryProductModify;
 use BaksDev\Products\Sign\Entity\Modify\ProductSignModify;
 use BaksDev\Users\User\Entity\User;
 use Doctrine\Bundle\DoctrineBundle\Attribute\AsEntityListener;

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # BaksDev Product Sign
 
-[![Version](https://img.shields.io/badge/version-7.0.12-blue)](https://github.com/baks-dev/products-sign/releases)
+[![Version](https://img.shields.io/badge/version-7.0.13-blue)](https://github.com/baks-dev/products-sign/releases)
 ![php 8.2+](https://img.shields.io/badge/php-min%208.1-red.svg)
 
 Модуль Честный знак продукции

diff --git a/Repository/AllProductSign/AllProductSignRepository.php b/Repository/AllProductSign/AllProductSignRepository.php
@@ -29,12 +29,13 @@
 use BaksDev\Core\Form\Search\SearchDTO;
 use BaksDev\Core\Services\Paginator\PaginatorInterface;
 use BaksDev\Core\Doctrine\DBALQueryBuilder;
-use BaksDev\Products\Category\Entity\Info\ProductCategoryInfo;
-use BaksDev\Products\Category\Entity\Offers\ProductCategoryOffers;
-use BaksDev\Products\Category\Entity\Offers\Variation\Modification\ProductCategoryModification;
-use BaksDev\Products\Category\Entity\Offers\Variation\ProductCategoryVariation;
-use BaksDev\Products\Category\Entity\Trans\ProductCategoryTrans;
-use BaksDev\Products\Category\Type\Id\ProductCategoryUid;
+use BaksDev\Products\Category\Entity\CategoryProduct;
+use BaksDev\Products\Category\Entity\Info\CategoryProductInfo;
+use BaksDev\Products\Category\Entity\Offers\CategoryProductOffers;
+use BaksDev\Products\Category\Entity\Offers\Variation\Modification\CategoryProductModification;
+use BaksDev\Products\Category\Entity\Offers\Variation\CategoryProductVariation;
+use BaksDev\Products\Category\Entity\Trans\CategoryProductTrans;
+use BaksDev\Products\Category\Type\Id\CategoryProductUid;
 use BaksDev\Products\Product\Entity\Category\ProductCategory;
 use BaksDev\Products\Product\Entity\Event\ProductEvent;
 use BaksDev\Products\Product\Entity\Info\ProductInfo;
@@ -189,7 +190,7 @@ public function fetchAllProductSignAssociative(UserUid $user): PaginatorInterfac
             ->addSelect('category_offer.reference as product_offer_reference')
             ->leftJoin(
                 'product_offer',
-                ProductCategoryOffers::TABLE,
+                CategoryProductOffers::TABLE,
                 'category_offer',
                 'category_offer.id = product_offer.category_offer'
             );
@@ -217,7 +218,7 @@ public function fetchAllProductSignAssociative(UserUid $user): PaginatorInterfac
             ->addSelect('category_variation.reference as product_variation_reference')
             ->leftJoin(
                 'product_variation',
-                ProductCategoryVariation::class,
+                CategoryProductVariation::class,
                 'category_variation',
                 'category_variation.id = product_variation.category_variation'
             );
@@ -246,7 +247,7 @@ public function fetchAllProductSignAssociative(UserUid $user): PaginatorInterfac
             ->addSelect('category_offer_modification.reference as product_modification_reference')
             ->leftJoin(
                 'product_modification',
-                ProductCategoryModification::class,
+                CategoryProductModification::class,
                 'category_offer_modification',
                 'category_offer_modification.id = product_modification.category_modification'
             );
@@ -364,15 +365,10 @@ public function fetchAllProductSignAssociative(UserUid $user): PaginatorInterfac
             'product_event_category.event = product_event.id AND product_event_category.root = true'
         );
 
-        //        if($this->filter?->getCategory())
-        //        {
-        //            $dbal->andWhere('product_event_category.category = :category');
-        //            $dbal->setParameter('category', $this->filter->getCategory(), ProductCategoryUid::TYPE);
-        //        }
 
         $dbal->leftJoin(
             'product_event_category',
-            \BaksDev\Products\Category\Entity\ProductCategory::TABLE,
+            CategoryProduct::TABLE,
             'category',
             'category.id = product_event_category.category'
         );
@@ -381,7 +377,7 @@ public function fetchAllProductSignAssociative(UserUid $user): PaginatorInterfac
             ->addSelect('category_info.url AS category_url')
             ->leftJoin(
                 'category',
-                ProductCategoryInfo::TABLE,
+                CategoryProductInfo::TABLE,
                 'category_info',
                 'category_info.event = category.event'
             );
@@ -390,7 +386,7 @@ public function fetchAllProductSignAssociative(UserUid $user): PaginatorInterfac
             ->addSelect('category_trans.name AS category_name')
             ->leftJoin(
                 'category',
-                ProductCategoryTrans::TABLE,
+                CategoryProductTrans::TABLE,
                 'category_trans',
                 'category_trans.event = category.event AND category_trans.local = :local'
             );

diff --git a/Resources/view/admin/newedit/new/pc/content.html.twig b/Resources/view/admin/newedit/new/pc/content.html.twig
@@ -25,7 +25,7 @@
 
                     {# {% if form.cover.vars.data.ext is defined and form.cover.vars.data.ext is not null %}
                 {% set img_host =  form.cover.vars.data.cdn == true  ? CDN_HOST : '' %}
-                {% set img_table = '/upload/' ~ constant('BaksDev\\Products\\Category\\Entity\\Cover\\ProductCategoryCover::TABLE') ~ '/' %}
+                {% set img_table = '/upload/' ~ constant('BaksDev\\Products\\Category\\Entity\\Cover\\CategoryProductCover::TABLE') ~ '/' %}
                 {% set img_dir = form.cover.vars.data.name %}
                 {% set img_file = (img_host is empty ? '/image.' : '/small.') ~ form.cover.vars.data.ext %}
                 {% set image_path = img_host ~ img_table ~ img_dir ~ img_file %}