Merge branch 'develop'

Definition/SectionSettingDefinition.php

@@ -13,8 +13,7 @@ class SectionSettingDefinition extends AbstractSettingDefinition
     const SETTING_ORDER_CLOSED_START = 'orderClosedStart';
     const SETTING_ORDER_CLOSED_END = 'orderClosedEnd';
     const SETTING_ORDER_MAXIMUM_PER_CYCLE = 'orderMaximumPerCycle';
-    /*const SETTING_COLOR_PRIMARY = 'colorPrimary';
-    const SETTING_COLOR_SECONDARY = 'colorSecondary';*/
+    const SETTING_OPENING_TEXT_CLOSED = 'openingTextClosed';
 
     const VALUE_ORDER_STATE_DEFAULT = 'default';
     const VALUE_ORDER_STATE_OPEN = 'open';
@@ -56,6 +55,13 @@ class SectionSettingDefinition extends AbstractSettingDefinition
                 ]
         );
 
+        $this->addSettingText(
+                [
+                        'category' => self::CATEGORY_GENERAL,
+                        'name' => self::SETTING_OPENING_TEXT_CLOSED
+                ]
+        );
+
         $this->addSettingText(
                 [
                         'name' => self::SETTING_ORDER_MAXIMUM_PER_CYCLE,

EventSubscriber/User/InitUserMerchantEventSubscriber.php

@@ -36,7 +36,7 @@ class InitUserMerchantEventSubscriber implements EventSubscriberInterface
 
     public function createUserMerchant(EntityManagerEvent $event)
     {
-        $user = $event->getEntity();
+       /* $user = $event->getEntity();
         $entityRepository = $this->em->getRepository(get_class($user));
         if ($user instanceof UserInterface) {
             $existingUser = $entityRepository->findOneByEmail($user->getEmail());
@@ -52,7 +52,7 @@ class InitUserMerchantEventSubscriber implements EventSubscriberInterface
                 );
                 $this->em->create($userMerchant);
             }
-        }
+        }*/
     }
 
 

Repository/Reduction/ReductionCreditRepositoryQuery.php

@@ -44,13 +44,13 @@ class ReductionCreditRepositoryQuery extends AbstractRepositoryQuery
     public function filterInactive()
     {
         $this->joinUsers();
-        return $this->having('COUNT(users.id) = 0');
+        return $this->andWhere('.users IS EMPTY');
     }
 
     public function filterActive()
     {
         $this->joinUsers();
-        return $this->having('COUNT(users.id) > 0');
+        return $this->andWhere('.users IS NOT EMPTY');
     }
 
     public function joinUsers()

Resolver/OpeningResolver.php

@@ -2,11 +2,9 @@
 
 namespace Lc\CaracoleBundle\Resolver;
 
-use App\Entity\Section\Section;
 use Lc\CaracoleBundle\Definition\SectionSettingDefinition;
 use Lc\CaracoleBundle\Model\Section\OpeningInterface;
 use Lc\CaracoleBundle\Model\Section\SectionInterface;
-use Lc\CaracoleBundle\Model\Section\SectionModel;
 use Lc\CaracoleBundle\Repository\Order\OrderShopStore;
 use Lc\CaracoleBundle\Repository\Section\OpeningStore;
 use Lc\CaracoleBundle\Solver\Section\OpeningSolver;
@@ -268,7 +266,7 @@ class OpeningResolver
         return '';
     }
 
-    public function isOpenSaleOnlyComplementaryOrders(Section $section = null, UserInterface $user = null)
+    public function isOpenSaleOnlyComplementaryOrders(SectionInterface $section = null, UserInterface $user = null)
     {
         if (is_null($section)) {
             $section = $this->sectionResolver->getCurrent();
@@ -286,6 +284,24 @@ class OpeningResolver
                 && count($orderShopsUser) > 0;
     }
 
+    public function getMessageOpeningNextSale(SectionInterface $section): ?string
+    {
+        $openingTextClosed = $this->settingSolver->getSettingValue(
+                $section,
+                SectionSettingDefinition::SETTING_OPENING_TEXT_CLOSED
+        );
+        if ($openingTextClosed && strlen($openingTextClosed) > 0) {
+            return $openingTextClosed ;
+        }
+
+        $dateOpeningNextSale = $this->getFormatedDateOpeningNextSale($section);
+        if ($dateOpeningNextSale && strlen($dateOpeningNextSale) > 0) {
+            return 'Réouverture aux commandes le <u>'.$dateOpeningNextSale.'</u>' ;
+        }
+
+        return null;
+    }
+
     public function getMessages(): array
     {
         return $this->messages;

Resources/views/admin/order/field/distribution.html.twig

@@ -10,4 +10,8 @@
     {% endif %}
 {% endif %}
 
-{{ labelCycleType ~ distribution.cycleNumber }}A{{ distribution.year|slice(2,2) }}
+{% if cycleType == "year" %}
+    A{{ distribution.cycleNumber }}
+{% else %}
+    {{ labelCycleType ~ distribution.cycleNumber }}A{{ distribution.year|slice(2,2) }}
+{% endif %}

Twig/StoreTwigExtension.php

@@ -194,7 +194,7 @@ class StoreTwigExtension extends AbstractExtension
         return $this->merchantResolver->getUserMerchant();
     }
 
-    public function getMerchantSetting(MerchantInterface $merchant, string $settingName): string
+    public function getMerchantSetting(MerchantInterface $merchant, string $settingName): ?string
     {
         return $this->settingSolver->getSettingValue($merchant, $settingName);
     }