Commit graph

21998 commits

Author SHA1 Message Date
Ka Yue Yeung
1bc64d93d8 Resolve awaiting_payment state in resolver
OrderPaymentStateResolver should resolve awaiting_payment state when there is payment under processing. This is needed to handle asynchronous payment confirmation.
2020-05-30 10:53:15 +08:00
Octav
b7d3fd7f0d
Add Sylius template events 2020-05-29 21:49:52 +03:00
Grzegorz Sadowski
2875e9e254
feature #11532 [API] Add simple item to cart (lchrusciel)
This PR was merged into the 1.8-dev branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master
| Bug fix?        | no
| New feature?    | yes
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | Related to #11250, Replaces #11528
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.6 or 1.7 branches (the lowest possible)
 - Features and deprecations must be submitted against the master branch
 - Make sure that the correct base branch is set
-->


Commits
-------

0c4088959b [API] Put simple item to cart implementation
c804251927 [API] Add to cart when logged in
14d8129be9 [API] Add products with quantity to cart
2020-05-29 12:57:15 +02:00
Łukasz Chruściel
6abecf84f4
feature #11504 [UI] As an Administrator, I want to select period of graphs and counts on the dashboard (-Day/2 Weeks/Month/Year) (kulczy, , GSadee)
This PR was merged into the 1.8-dev branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master
| Bug fix?        | no
| New feature?    | yes
| BC breaks?      | not sure
| Deprecations?   | not sure
| Related tickets | 
| License         | MIT

day not supported yet as a period

![image](https://user-images.githubusercontent.com/22825722/82974284-ecee9600-9fd9-11ea-8538-58580d5debed.png)


Commits
-------

486be96116 Add time ranges to the dashboard statistics
f895824474 Selecting period of graphs admin panel
48352a6e2e Add time ranges to the dashboard statistics
2f2e737082 Selecting period of graphs admin panel
0b4a16b28e fixed failing behats, removed day button, proper communication with backend
48f11f283d php-spec-init, pr fixes
46d7653295 spec finished
8ba23d0b67 pr fixes, behats fix v2
5a9c8b21f6 changed months to intervals as array key, more specs
be6444e446 fixed psalm failing
c9ebcc63e0 [Maintenance] Temporarily extend conflict to the ^2.5.5 versions of api-platform/core
b0d509d6cd chart template is back with deperecation
2020-05-29 12:36:11 +02:00
Łukasz Chruściel
14d8129be9
[API] Add products with quantity to cart 2020-05-29 12:10:09 +02:00
Grzegorz Sadowski
b0d509d6cd chart template is back with deperecation 2020-05-29 11:45:12 +02:00
Łukasz Chruściel
c804251927
[API] Add to cart when logged in 2020-05-29 11:30:05 +02:00
Łukasz Chruściel
0c4088959b
[API] Put simple item to cart implementation 2020-05-29 11:30:04 +02:00
Mateusz Zalewski
581f1b79d0
bug #11531 [Maintenance] Temporarily extend conflict to the ^2.5.5 versions of api-platform/core (GSadee)
This PR was merged into the 1.8-dev branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | 
| License         | MIT


Commits
-------

de3ef03487 [Maintenance] Temporarily extend conflict to the ^2.5.5 versions of api-platform/core
2020-05-29 11:02:46 +02:00
Grzegorz Sadowski
c9ebcc63e0 [Maintenance] Temporarily extend conflict to the ^2.5.5 versions of api-platform/core 2020-05-29 10:52:32 +02:00
Grzegorz Sadowski
de3ef03487
[Maintenance] Temporarily extend conflict to the ^2.5.5 versions of api-platform/core 2020-05-29 10:26:17 +02:00
SirDomin
be6444e446 fixed psalm failing 2020-05-29 08:22:33 +02:00
Grzegorz Sadowski
18e812ed5f
Merge branch '1.7'
* 1.7:
  Plus docs, missing information
2020-05-29 07:43:10 +02:00
Grzegorz Sadowski
77fce610ba
minor #11527 [Docs][Plus] Missing information about authentication (AdamKasp)
This PR was merged into the 1.7 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.6 or 1.7 branches (the lowest possible)
 - Features and deprecations must be submitted against the master branch
 - Make sure that the correct base branch is set
-->


Commits
-------

2300014ebf Plus docs, missing information
2020-05-29 07:42:41 +02:00
SirDomin
5a9c8b21f6 changed months to intervals as array key, more specs 2020-05-28 15:22:43 +02:00
Adam Kasperczak
2300014ebf Plus docs, missing information 2020-05-28 15:16:20 +02:00
SirDomin
8ba23d0b67 pr fixes, behats fix v2 2020-05-28 14:49:46 +02:00
Grzegorz Sadowski
401c78f2e5
Merge branch '1.7'
* 1.7:
  Change function that sorts given parameters
2020-05-28 14:47:52 +02:00
Grzegorz Sadowski
d0af87ef4e
bug #11511 Change function that orders grid fields (arti0090)
This PR was merged into the 1.7 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         |  1.7
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | #10676
| License         | MIT


Commits
-------

53ab9a5ddf Change function that sorts given parameters
2020-05-28 14:47:23 +02:00
Grzegorz Sadowski
3ae254716e
feature #11524 [API] Pick up cart implementation (lchrusciel)
This PR was merged into the 1.8-dev branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master
| Bug fix?        | no
| New feature?    | yes
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | Related to #11250
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.6 or 1.7 branches (the lowest possible)
 - Features and deprecations must be submitted against the master branch
 - Make sure that the correct base branch is set
-->


Commits
-------

e29fa932cb [API] Pick up cart implementation
2020-05-28 14:36:22 +02:00
arti0090
e452f32c8b Changed descriptions and added italic font 2020-05-28 14:27:19 +02:00
Grzegorz Sadowski
a6d28682f6
Merge branch '1.7'
* 1.7:
  Add Docs with Sylius Plus deployment
2020-05-28 14:09:36 +02:00
Grzegorz Sadowski
d042ccf7b6
minor #11525 [Docs][Plus] Add Docs with Sylius Plus deployment (AdamKasp)
This PR was merged into the 1.7 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.6 or 1.7 branches (the lowest possible)
 - Features and deprecations must be submitted against the master branch
 - Make sure that the correct base branch is set
-->


Commits
-------

5f267348a1 Add Docs with Sylius Plus deployment
2020-05-28 14:06:17 +02:00
Adam Kasperczak
5f267348a1 Add Docs with Sylius Plus deployment 2020-05-28 14:03:37 +02:00
Łukasz Chruściel
e29fa932cb
[API] Pick up cart implementation 2020-05-28 13:33:32 +02:00
SirDomin
46d7653295 spec finished 2020-05-28 12:16:11 +02:00
SirDomin
48f11f283d php-spec-init, pr fixes 2020-05-28 12:16:11 +02:00
SirDomin
0b4a16b28e fixed failing behats, removed day button, proper communication with backend 2020-05-28 12:16:11 +02:00
SirDomin
2f2e737082 Selecting period of graphs admin panel 2020-05-28 12:16:11 +02:00
Kulczy
48352a6e2e Add time ranges to the dashboard statistics 2020-05-28 12:16:06 +02:00
SirDomin
f895824474 Selecting period of graphs admin panel 2020-05-28 12:13:22 +02:00
Kulczy
486be96116 Add time ranges to the dashboard statistics 2020-05-28 12:13:21 +02:00
Kamil Kokot
8b8e681743
Merge branch '1.7'
* 1.7:
  Fix Psalm errors
2020-05-28 11:48:22 +02:00
Kamil Kokot
ce3c4867f0
bug #11523 Fix Psalm errors (pamil)
This PR was merged into the 1.7 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | associated with #11520 
| License         | MIT


Commits
-------

ca777cf6de Fix Psalm errors
2020-05-28 11:46:34 +02:00
Kamil Kokot
ca777cf6de
Fix Psalm errors 2020-05-28 10:41:19 +02:00
arti0090
ec81472a11 change lorem ipsum description and fix carousel header 2020-05-28 08:36:57 +02:00
Grzegorz Sadowski
cf116f2603
bug #11520 Fix Psalm errors (pamil)
This PR was merged into the 1.8-dev branch.

Discussion
----------



Commits
-------

ab375ffb32 Fix Psalm errors
2020-05-28 08:28:12 +02:00
Kamil Kokot
ab375ffb32
Fix Psalm errors 2020-05-27 19:45:36 +02:00
Kamil Kokot
a590339257
Make packages installable with PHP 7.4 2020-05-27 09:18:43 +02:00
arti0090
53ab9a5ddf Change function that sorts given parameters 2020-05-27 07:43:21 +02:00
Kamil Kokot
40f04de4ba
Merge branch '1.7'
* 1.7:
  Make packages installable with PHP 7.4
2020-05-26 23:36:30 +02:00
Kamil Kokot
367e9e3e50
minor #11510 Make packages installable with PHP 7.4 (pamil)
This PR was merged into the 1.7 branch.

Discussion
----------



Commits
-------

aca62b58e5 Make packages installable with PHP 7.4
2020-05-26 23:18:11 +02:00
Kamil Kokot
aca62b58e5
Make packages installable with PHP 7.4 2020-05-26 22:53:32 +02:00
Kamil Kokot
7a91cf6783
minor #11508 [Minor][DX] Using parent definition for api clients (lchrusciel)
This PR was merged into the 1.8-dev branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | fixes #X, partially #Y, mentioned in #Z
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.6 or 1.7 branches (the lowest possible)
 - Features and deprecations must be submitted against the master branch
 - Make sure that the correct base branch is set
-->


Commits
-------

4e247487ee [Minor][DX] Using parent defintion for api clients
2020-05-26 20:53:35 +02:00
Kamil Kokot
fface1ca84
minor #11505 Travis Bionic + Chrome Headless + PHP 7.4 support (pamil)
This PR was merged into the 1.8-dev branch.

Discussion
----------

- Moved from Ubuntu 14.04 (Trusty) to 18.04 (Bionic).
- Replaced Selenium + Chromedriver + Chrome with Chrome Headless for running JS Behat scenarios.
- Added support for PHP 7.4.

Closes #10994.

JS suite sped up from ~13m to ~8,5m.

Commits
-------

22fbf51c27 Travis Bionic + Chrome Headless + PHP 7.4 support
2020-05-26 20:52:40 +02:00
Kamil Kokot
1df073cb29
Merge branch '1.7'
* 1.7:
  Travis Bionic + Chrome Headless + PHP 7.4 support
2020-05-26 20:50:36 +02:00
Kamil Kokot
753d99bfc5
minor #11509 [1.7] Travis Bionic + Chrome Headless + PHP 7.4 support (pamil)
This PR was merged into the 1.7 branch.

Discussion
----------

Related to #11505.

Commits
-------

58b043756b Travis Bionic + Chrome Headless + PHP 7.4 support
2020-05-26 20:46:57 +02:00
Kamil Kokot
58b043756b
Travis Bionic + Chrome Headless + PHP 7.4 support 2020-05-26 20:20:04 +02:00
Kamil Kokot
22fbf51c27
Travis Bionic + Chrome Headless + PHP 7.4 support 2020-05-26 18:34:35 +02:00
Łukasz Chruściel
4e247487ee
[Minor][DX] Using parent defintion for api clients 2020-05-26 15:03:23 +02:00