Merge pull request #233 from Netimage/more-new-features

More new features
BitBagCommerce · Feb 20, 2019 · 265d88c · 265d88c
2 parents a09c029 + b66967a
commit 265d88c
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 2 deletions.
diff --git a/src/Repository/PageRepository.php b/src/Repository/PageRepository.php
@@ -87,6 +87,21 @@ public function createShopListQueryBuilder(string $sectionCode, string $channelC
         ;
     }
 
+    public function findBySectionCode(string $sectionCode, ?string $localeCode): array
+    {
+        return $this->createQueryBuilder('o')
+            ->leftJoin('o.translations', 'translation')
+            ->innerJoin('o.sections', 'section')
+            ->where('translation.locale = :localeCode')
+            ->andWhere('section.code = :sectionCode')
+            ->andWhere('o.enabled = true')
+            ->setParameter('sectionCode', $sectionCode)
+            ->setParameter('localeCode', $localeCode)
+            ->getQuery()
+            ->getResult()
+        ;
+    }
+
     public function findByProduct(ProductInterface $product, string $channelCode): array
     {
         return $this->createQueryBuilder('o')

diff --git a/src/Repository/PageRepositoryInterface.php b/src/Repository/PageRepositoryInterface.php
@@ -33,6 +33,8 @@ public function findOneEnabledBySlugAndChannelCode(
 
     public function createShopListQueryBuilder(string $sectionCode, string $channelCode): QueryBuilder;
 
+    public function findBySectionCode(string $sectionCode, ?string $localeCode): array;
+
     public function findByProduct(ProductInterface $product, string $channelCode): array;
 
     public function findByProductAndSectionCode(ProductInterface $product, string $sectionCode, string $channelCode): array;

diff --git a/src/Repository/SectionRepository.php b/src/Repository/SectionRepository.php
@@ -66,4 +66,17 @@ public function findOneByCode(string $code, ?string $localeCode): ?SectionInterf
             ->getOneOrNullResult()
         ;
     }
+
+    public function findByCodesAndLocale(string $codes, string $localeCode): array
+    {
+        return $this->createQueryBuilder('o')
+            ->leftJoin('o.translations', 'translation')
+            ->where('translation.locale = :localeCode')
+            ->andWhere('o.code IN(:codes)')
+            ->setParameter('codes', explode(',', $codes))
+            ->setParameter('localeCode', $localeCode)
+            ->getQuery()
+            ->getResult()
+            ;
+    }
 }
diff --git a/src/Repository/SectionRepositoryInterface.php b/src/Repository/SectionRepositoryInterface.php
@@ -23,4 +23,6 @@ public function createListQueryBuilder(string $localeCode): QueryBuilder;
     public function findByNamePart(string $phrase, ?string $locale = null): array;
 
     public function findOneByCode(string $code, ?string $localeCode): ?SectionInterface;
+
+    public function findByCodesAndLocale(string $codes, string $localeCode): array;
 }
diff --git a/src/Resources/config/doctrine/FrequentlyAskedQuestionTranslation.orm.yml b/src/Resources/config/doctrine/FrequentlyAskedQuestionTranslation.orm.yml
@@ -10,8 +10,7 @@ BitBag\SyliusCmsPlugin\Entity\FrequentlyAskedQuestionTranslation:
     fields:
         question:
             column: question
-            type: string
-            length: 1500
+            type: text
             nullable: false
         answer:
             column: answer

diff --git a/src/Resources/config/routing/shop/page.yml b/src/Resources/config/routing/shop/page.yml
@@ -33,3 +33,33 @@ bitbag_sylius_cms_plugin_shop_page_index_by_section_code:
         _sylius:
             template: "@BitBagSyliusCmsPlugin/Shop/Page/index.html.twig"
             grid: bitbag_sylius_cms_plugin_shop_page
+            repository:
+                method: findBySectionCode
+                arguments:
+                    - $sectionCode
+                    - "expr:service('sylius.context.locale').getLocaleCode()"
+                    -
+bitbag_sylius_cms_plugin_shop_page_index_by_section_code_no_grid:
+    path: /pages/{sectionCode}/no-grid
+    methods: [GET]
+    defaults:
+        _controller: bitbag_sylius_cms_plugin.controller.page:indexAction
+        _sylius:
+            template: "@BitBagSyliusCmsPlugin/Shop/Page/index.html.twig"
+            repository:
+                method: findBySectionCode
+                arguments:
+                    - $sectionCode
+                    - "expr:service('sylius.context.locale').getLocaleCode()"
+
+bitbag_sylius_cms_plugin_shop_page_index_by_section_code_template:
+    path: /pages-template/{sectionCode}
+    defaults:
+        _controller: bitbag_sylius_cms_plugin.controller.page:indexAction
+        _sylius:
+            template: $template
+            repository:
+                method: findBySectionCode
+                arguments:
+                    - $sectionCode
+                    - "expr:service('sylius.context.locale').getLocaleCode()"
diff --git a/src/Resources/config/routing/shop/section.yml b/src/Resources/config/routing/shop/section.yml
@@ -10,3 +10,17 @@ bitbag_sylius_cms_plugin_shop_section_show:
                 arguments:
                     - $code
                     - "expr:service('sylius.context.locale').getLocaleCode()"
+
+bitbag_sylius_cms_plugin_shop_section_show_codes:
+    path: /sections/{codes}
+    methods: [GET]
+    defaults:
+        _controller: bitbag_sylius_cms_plugin.controller.section:indexAction
+        _sylius:
+            template: $template
+            repository:
+                method: findByCodesAndLocale
+                arguments:
+                    - $codes
+                    - "expr:service('sylius.context.locale').getLocaleCode()"
+