Merge branch 'develop'

Resolver/OpeningResolver.php

@@ -121,18 +121,21 @@ class OpeningResolver
     }
 
     // isHolidays
-    public function isClosingPeriod(SectionInterface $section = null)
+    public function isClosingPeriod(SectionInterface $section = null, \DateTime $date = null)
     {
         if (is_null($section)) {
             $section = $this->sectionResolver->getCurrent();
         }
 
-        $date = new \DateTime();
+        if(is_null($date)) {
+            $date = new \DateTime();
+        }
 
         $orderClosedStart = $this->settingSolver->getSettingValue(
                 $section,
                 SectionSettingDefinition::SETTING_ORDER_CLOSED_START
         );
+
         $orderClosedEnd = $this->settingSolver->getSettingValue(
                 $section,
                 SectionSettingDefinition::SETTING_ORDER_CLOSED_END
@@ -246,6 +249,13 @@ class OpeningResolver
         }
 
         $date = new \DateTime();
+        if($this->isClosingPeriod($section)) {
+            $date = $this->settingSolver->getSettingValue(
+                    $section,
+                    SectionSettingDefinition::SETTING_ORDER_CLOSED_END
+            );
+        }
+
         $openingArray = $this->openingStore
                 ->setSection($section)
                 ->get();