kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 09:02:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

[UPMERGE] 1.13 -> 2.0 (#15694)

Browse source 
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout 
git merge upstream/2.0 --no-commit
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.

Once the conflicts are resolved, please run `git merge --continue` and
change the commit title to
```
Resolve conflicts between 1.13 and 2.0
```
This commit is contained in:
Jacob Tobiasz 2024-01-04 09:04:13 +01:00 • committed by GitHub
commit 1a7f4faf07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/customization/fixtures.rst
View file

@ -179,7 +179,7 @@ just like in the example mentioned above.
}
}
**2.** Extend the ``Sylius\Bundle\CoreBundle\Fixture\ShippingMethodFixture`` in ``App\Entity\Fixture\ShippingMethodFixture``:
**2.** Extend the ``Sylius\Bundle\CoreBundle\Fixture\ShippingMethodFixture`` in ``App\Fixture\ShippingMethodFixture``:
.. code-block:: php

14
features/admin/statistics.feature
View file

@ -14,11 +14,11 @@ Feature: Statistics
@ui @no-api
Scenario: Seeing statistics for the current year and default channel when expectations are not specified
Given it is "2022-12-31" now
Given it is "last day of December last year" now
And 2 new customers have fulfilled 2 orders placed for total of "$1,000.00"
And it is "2023-01-01" now
And it is "first day of January this year" now
And 3 new customers have fulfilled 4 orders placed for total of "$2,000.21"
And it is "2023-02-01" now
And it is "first day of February this year" now
And 2 more new customers have paid 2 orders placed for total of "$5,000.37"
When I view statistics
Then I should see 5 new customers
@ -28,9 +28,9 @@ Feature: Statistics
@ui @javascript
Scenario: Seeing statistics for the previous year
Given it is "2022-01-01" now
Given it is "first day of January last year" now
And 3 new customers have fulfilled 2 orders placed for total of "$2,000.00"
And it is "2023-02-01" now
And it is "first day of February this year" now
And 4 more new customers have paid 5 orders placed for total of "$5,000.37"
And 2 more new customers have paid 2 orders placed for total of "$5,000.37"
When I view statistics for "United States" channel and previous year split by month
@ -41,9 +41,9 @@ Feature: Statistics
@ui @javascript
Scenario: Seeing statistics for the next year
Given it is "2022-01-01" now
Given it is "first day of January last year" now
And 3 new customers have fulfilled 2 orders placed for total of "$2,000.00"
And it is "2023-02-01" now
And it is "first day of February this year" now
And 4 more new customers have paid 5 orders placed for total of "$5,000.37"
And 2 more new customers have paid 2 orders placed for total of "$5,000.37"
When I view statistics for "United States" channel and previous year split by month