Skip to content

Commit

Permalink
Merge pull request #13 from answear/working-days-fix
Browse files Browse the repository at this point in the history
Add second saturday WorkingDay value
  • Loading branch information
mglowala authored Jun 15, 2023
2 parents 280c414 + 92e4803 commit b5c7dae
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
"guzzlehttp/guzzle": "^6.0 || ^7.0",
"marc-mabe/php-enum": "^3.0|^4.3",
"psr/log": "^1.0",
"symfony/http-kernel": "^5.4|^6.0",
"symfony/property-info": "^5.4|^6.0",
"symfony/serializer": "^5.4|^6.0",
"symfony/http-kernel": "5.4 - 6.2",
"symfony/property-access": "5.4 - 6.2",
"symfony/property-info": "5.4 - 6.2",
"symfony/serializer": "5.4 - 6.2",
"webmozart/assert": "^1.3"
},
"require-dev": {
Expand Down
6 changes: 6 additions & 0 deletions src/Enum/DayType.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class DayType extends Enum implements \Serializable
public const THURSDAY = 10;
public const FRIDAY = 11;
public const SATURDAY = 2;
public const SATURDAY_2 = 12;
public const SUNDAY = 3;

public static function friday(): self
Expand Down Expand Up @@ -59,4 +60,9 @@ public static function workingDay(): self
{
return static::get(static::WORKING_DAY);
}

public static function saturday2(): self
{
return static::get(static::SATURDAY_2);
}
}
4 changes: 2 additions & 2 deletions tests/Integration/Service/data/parcelShops.json
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@
"Until": "22:00:00"
},
{
"Type": 3,
"TypeName": "LS.Nedjeljom",
"Type": 12,
"TypeName": "LS.Subotom",
"From": "06:00:00",
"Until": "22:00:00"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,8 @@
"until": "22:00:00"
},
{
"type": 3,
"typeName": "LS.Nedjeljom",
"type": 12,
"typeName": "LS.Subotom",
"from": "06:00:00",
"until": "22:00:00"
}
Expand Down

0 comments on commit b5c7dae

Please sign in to comment.