Merge pull request #411 from AOEpeople/feature/change-benefits-in-kind

change prices
AOEpeople · Jan 29, 2024 · 7a1fdef · 7a1fdef
2 parents c054c50 + 7fd58a3
commit 7a1fdef
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/config/services.yaml b/config/services.yaml
@@ -46,10 +46,10 @@ parameters:
     app.secret: '%env(APP_SECRET)%'
 
     mealz.lock_toggle_participation_at: '-1 day 16:00'
-    mealz.meal.price: 3.60
+    mealz.meal.price: 4.13
     mealz.meal.search_timestamp: '2000-01-01'
     mealz.meal.new_flag_counter: 2
-    mealz.meal.combined.price: 5.60
+    mealz.meal.combined.price: 6.13
 
     # PDO Session Handler options
     # Define table and column names to store session data

diff --git a/src/Mealz/MealBundle/DataFixtures/ORM/LoadDishVariations.php b/src/Mealz/MealBundle/DataFixtures/ORM/LoadDishVariations.php
@@ -74,7 +74,7 @@ private function getDishVariation(Dish $dish): DishVariation
         $dishVariation->setTitleDe($dish->getTitleDe() . $dummyPrefix);
         $dishVariation->setTitleEn($dish->getTitleEn() . $dummyPrefix);
         $dishVariation->setParent($dish);
-        $dishVariation->setPrice(3.60);
+        $dishVariation->setPrice(4.13);
 
         $variations = $dish->getVariations();
         $variations->add($dishVariation);

diff --git a/src/Mealz/MealBundle/DataFixtures/ORM/LoadDishes.php b/src/Mealz/MealBundle/DataFixtures/ORM/LoadDishes.php
@@ -72,7 +72,7 @@ public function getOrder(): int
     protected function addDish(string $titleEN, string $titleDE, string $descEN = null, string $descDE = null, bool $oneSize = false): void
     {
         $dish = new Dish();
-        $dish->setPrice(3.60);
+        $dish->setPrice(4.13);
         $dish->setTitleEn($titleEN);
         $dish->setTitleDe($titleDE);
         $dish->setDescriptionEn('Description - ' . $titleEN);

diff --git a/src/Mealz/MealBundle/Tests/Repository/WeekRepositoryTest.php b/src/Mealz/MealBundle/Tests/Repository/WeekRepositoryTest.php
@@ -38,7 +38,8 @@ public function testGetNextWeek(): void
         $currCalWeek = (int) $now->format('W');
 
         $lastCalWeek = (int) $now->modify('last day of December')->format('W');
-        $this->assertContains($lastCalWeek, [52, 53]);
+        // last day of the year can we in the 52, 53 and in the calendar week 1 of the next year
+        $this->assertContains($lastCalWeek, [52, 53, 1]);
 
         $nextWeek = $this->weekRepository->getNextWeek(DateTime::createFromImmutable($now));
         $this->assertInstanceOf(Week::class, $nextWeek);