Commit graph

22572 commits

Author SHA1 Message Date
Łukasz Chruściel
355632b74b
Merge branch '1.7' into 1.8
* 1.7:
  Mention in documentation a new PayPal integration
  Visualy deprecate PayPal Express Checkout
  [Translations] Updated translations from Crowdin
  Update Github PR template
2020-11-10 17:52:36 +01:00
Łukasz Chruściel
eb113e85e9
refactor #12022 Suggest PayPalPlugin as the default PayPal integration (Zales0123)
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
| Related tickets | 
| License         | MIT

The next step is installing PayPalPlugin on Sylius-Standard by default 💃 

<img width="1102" alt="Zrzut ekranu 2020-11-9 o 11 55 47" src="https://user-images.githubusercontent.com/6212718/98536784-a68bab80-2288-11eb-992b-6be9328ff93c.png">


Commits
-------

e1da37e748 Visualy deprecate PayPal Express Checkout
710b39914f Mention in documentation a new PayPal integration
2020-11-10 17:51:19 +01:00
Łukasz Chruściel
ebaf18590e
minor #12019 [AUTO] Updated translations from Crowdin (1.7) ()
This PR was merged into the 1.7 branch.

Discussion
----------



Commits
-------

7e5d3ab56c [Translations] Updated translations from Crowdin
2020-11-10 17:44:03 +01:00
Łukasz Chruściel
2b28337881
minor #11899 Update Github PR template (Zales0123)
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
| Related tickets | 
| License         | MIT


Commits
-------

52fe833452 Update Github PR template
2020-11-10 17:42:57 +01:00
Łukasz Chruściel
63cba554ef
refactor #11908 Use proper parameters in access control patterns (loevgaard, lchrusciel)
This PR was merged into the 1.8 branch.

Discussion
----------

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


Commits
-------

d2b4a308b8 Use proper parameters in access control patterns
3f75a171f3 Fix order
f20cb2dacb Update upgrade guide
9b87f3f7b6 Update UPGRADE-1.8.md
e57f5cd531 Update UPGRADE-1.8.md
3c83d1752b [UPGRADE] Update versions
2020-11-10 17:37:27 +01:00
Łukasz Chruściel
3c83d1752b
[UPGRADE] Update versions 2020-11-10 17:36:38 +01:00
Łukasz Chruściel
e6ec2e4a55
Merge pull request #11949 from Philiphil/patch-2
[DOC] Update calculating_taxes.rst
2020-11-10 17:33:52 +01:00
Mateusz Zalewski
710b39914f
Mention in documentation a new PayPal integration 2020-11-09 12:29:58 +01:00
Mateusz Zalewski
e1da37e748
Visualy deprecate PayPal Express Checkout 2020-11-09 11:56:49 +01:00
Sylius Bot
7e5d3ab56c [Translations] Updated translations from Crowdin 2020-11-09 04:02:31 +00:00
Łukasz Chruściel
f57edd0b10
Merge branch '1.7' into 1.8
* 1.7:
  [UI] Fix broken checkboxes that dont change state
2020-11-07 12:17:41 +01:00
Łukasz Chruściel
be1480cd8a
bug #11974 [UI] Fix broken checkboxes that dont change state (misaon)
This PR was merged into the 1.7 branch.

Discussion
----------

Order (label <=> input) in Semantic UI

| Q               | A
| --------------- | -----
| Branch         | 1.7, 1.8 and master
| Bug fix        | yes
| New feature    | no
| BC breaks      | no
| Deprecations   | no
| License         | MIT



Commits
-------

769567f2c3 [UI] Fix broken checkboxes that dont change state
2020-11-06 17:24:46 +01:00
Łukasz Chruściel
158123add5
Merge branch '1.7' into 1.8
* 1.7:
  Update controller.rst
  Updated translation.rst
  Change application version to v1.7.11-DEV
  Generate changelog for v1.7.10
  Change application version to v1.7.10
2020-11-05 18:37:51 +01:00
Łukasz Chruściel
b9af6cb06c
bug #12011 Customize a controller fix typo in services config (Oipnet)
This PR was merged into the 1.7 branch.

Discussion
----------

in the services.yaml you need to override sylius.controller.shop.homepage not app.controller.shop.homepage

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

Commits
-------

fc20856c94 Update controller.rst
2020-11-05 18:08:13 +01:00
Łukasz Chruściel
e352b6be58
bug #12009 Updated translation.rst (Romain)
This PR was merged into the 1.7 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.6
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | Follow-up to [PR 17](https://github.com/Sylius/Customizations/pull/17)
| License         | MIT


I think that we should mention that clearing the cache is required in order to see the new translations appear.

Commits
-------

a5c570147c Updated translation.rst
2020-11-05 18:01:45 +01:00
Łukasz Chruściel
85b0a88ead
bug #12005 Use the correct variable (jacquesbh)
This PR was merged into the 1.8 branch.

Discussion
----------

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

Just a little documentation fix :).

Commits
-------

c0a377a349 Use the correct variable
2020-11-05 17:34:37 +01:00
Arnaud POINTET
fc20856c94
Update controller.rst
in the services.yaml you need to override sylius.controller.shop.homepage not app.controller.shop.homepage
2020-11-05 15:32:37 +01:00
Romain Biard
a5c570147c
Updated translation.rst
I think that we should mention that clearing the cache is required in order to see the new translations appear.
2020-11-05 15:02:36 +01:00
Jacques Bodin-Hullin
c0a377a349
Use the correct variable 2020-11-05 12:55:11 +01:00
Mateusz Zalewski
b79d9fab22
Change application version to v1.8.5-DEV 2020-11-05 09:26:01 +01:00
Mateusz Zalewski
13a1029062
Generate changelog for v1.8.4 2020-11-05 09:25:10 +01:00
Mateusz Zalewski
ecaf3447cd
Change application version to v1.8.4 2020-11-05 09:24:13 +01:00
Mateusz Zalewski
6118ecc7c9
Change application version to v1.7.11-DEV 2020-11-05 09:20:39 +01:00
Mateusz Zalewski
4b8746c220
Generate changelog for v1.7.10 2020-11-05 09:19:23 +01:00
Mateusz Zalewski
c70e693295
Change application version to v1.7.10 2020-11-05 09:18:11 +01:00
Łukasz Chruściel
f7fac17c1f
Merge branch '1.7' into 1.8
* 1.7:
  [Order] codestyles: check for null instead of LoggerInterface
  [Order] Check if logger is instance of LoggerInterface before logging an error & add it_wont_stop_cancelling_unpaid_orders_on_exception_for_a_single_order_and_skips_logging_if_logger_is_not_set
  [Order] Allow logger to be nullable in UnpaidOrdersStateUpdater to avoid BC break
  [Order] Do not stop cancelling unpaid orders on exception during cancelling a single order
2020-11-04 18:05:12 +01:00
Łukasz Chruściel
7f814ca3d8
bug #11894 [Order] Do not stop cancelling unpaid orders on exception during canc… (twojtylak)
This PR was merged into the 1.7 branch.

Discussion
----------

…elling a single order

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

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

 To be sure you are not breaking any Backward Compatibilities, check the documentation:
 https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->


Commits
-------

e6eac6c360 [Order] Do not stop cancelling unpaid orders on exception during cancelling a single order
a2624a8849 [Order] Allow logger to be nullable in UnpaidOrdersStateUpdater to avoid BC break
ec1e0cd30d [Order] Check if logger is instance of LoggerInterface before logging an error & add it_wont_stop_cancelling_unpaid_orders_on_exception_for_a_single_order_and_skips_logging_if_logger_is_not_set
aaa61cbb5e [Order] codestyles: check for null instead of LoggerInterface
2020-11-04 18:02:06 +01:00
Mateusz Zalewski
a1bca9a331
bug #11999 [Maintenance] Bump psalm, fix naming issues and build (lchrusciel)
This PR was merged into the 1.8 branch.

Discussion
----------

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

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

 To be sure you are not breaking any Backward Compatibilities, check the documentation:
 https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->


Commits
-------

1d6f4dc9a2 [Maintenance] Bump psalm, fix naming issues and build
2020-11-03 16:20:29 +01:00
Łukasz Chruściel
1d6f4dc9a2
[Maintenance] Bump psalm, fix naming issues and build 2020-11-03 14:35:01 +01:00
Mateusz Zalewski
996666c12f
Merge branch '1.7' into 1.8
* 1.7:
  Remove nikic/php-parser as a conflict
2020-11-03 08:13:11 +01:00
Mateusz Zalewski
368accf265
minor #11991 Remove nikic/php-parser as a conflict (loevgaard)
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
| Related tickets | Mentioned in https://github.com/Sylius/Sylius/pull/11694#issuecomment-720369247
| License         | MIT


Commits
-------

5e56a0a09d Remove nikic/php-parser as a conflict
2020-11-03 08:12:47 +01:00
Joachim Løvgaard
5e56a0a09d
Remove nikic/php-parser as a conflict 2020-11-02 21:08:06 +01:00
Łukasz Chruściel
0b67fa2fa2
bug #11981 Adjust services to symfony/serializer:^4.4 (Zales0123)
This PR was merged into the 1.8 branch.

Discussion
----------

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

It's required for our ApiPlatform denormalizer implementations. With `symfony/serializer` in version **4.4**, the following error occurs:

<img width="572" alt="Zrzut ekranu 2020-10-30 o 16 47 20" src="https://user-images.githubusercontent.com/6212718/97726834-f2439580-1acf-11eb-9275-f716bcb28ad4.png">


Commits
-------

d53f6fbb40 Adjust services to symfony/serializer:4.4
2020-11-02 20:33:00 +01:00
Mateusz Zalewski
d53f6fbb40
Adjust services to symfony/serializer:4.4 2020-11-02 17:11:58 +01:00
Mateusz Zalewski
5a527a2db2
bug #11988 [Behat] Fix argument name after upgrade Behat to v3.8.0 (GSadee)
This PR was merged into the 1.8 branch.

Discussion
----------

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


Commits
-------

c48e14bd06 [Behat] Fix argument name after upgrade Behat to v3.8.0
2020-11-02 14:50:38 +01:00
Grzegorz Sadowski
c48e14bd06
[Behat] Fix argument name after upgrade Behat to v3.8.0 2020-11-02 14:01:31 +01:00
Mateusz Zalewski
5d349991f1
minor #11982 [Minor] Update service definition to not using depracated service (lchrusciel)
This PR was merged into the 1.8 branch.

Discussion
----------

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

According to note: 
![image](https://user-images.githubusercontent.com/6213903/97786019-ebd51c80-1ba8-11eb-954f-1087fa1591cf.png)

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

 To be sure you are not breaking any Backward Compatibilities, check the documentation:
 https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->


Commits
-------

1d96476669 [Minor] Update service definition to not using depracated service
2020-11-02 12:49:22 +01:00
Łukasz Chruściel
1d96476669
[Minor] Update service definition to not using depracated service 2020-11-01 14:01:08 +01:00
twojtylak
aaa61cbb5e
[Order] codestyles: check for null instead of LoggerInterface
Co-authored-by: Joachim Løvgaard <joachim@loevgaard.dk>
2020-10-30 09:07:22 +01:00
Tobias Wojtylak
ec1e0cd30d [Order] Check if logger is instance of LoggerInterface before logging an error & add it_wont_stop_cancelling_unpaid_orders_on_exception_for_a_single_order_and_skips_logging_if_logger_is_not_set 2020-10-29 20:11:55 +01:00
Łukasz Chruściel
e54495a644
Merge branch '1.7' into 1.8
* 1.7:
  Use ShopBillingDataInterface instead of ShopBillingData
2020-10-29 16:04:33 +01:00
Łukasz Chruściel
72d91783ab
bug #11871 Patch for Unable to extends ShopBillingData [#11625] (jbcr)
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 | fixes #11625 
| License         | MIT

Fix the relation between Channel and ShopBillingData to allow override the ShopBillingData entity.

Commits
-------

7f68b621de Use ShopBillingDataInterface instead of ShopBillingData
2020-10-29 14:51:12 +01:00
Ondřej Misák
769567f2c3
[UI] Fix broken checkboxes that dont change state
Order (label <=> input) in Semantic UI
2020-10-29 14:16:40 +01:00
Grzegorz Sadowski
7edb6e80e4
Resolve upmerge conflict in composer.json 2020-10-29 10:37:05 +01:00
Grzegorz Sadowski
1d67b81d55
bug #11972 [Maintenance] Conflict symfony doctrine bridge (lchrusciel)
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 | partially fix #11970 
| License         | MIT

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

 To be sure you are not breaking any Backward Compatibilities, check the documentation:
 https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->


Commits
-------

c97e3c2a58 [Maintenance] Conflic symfony doctrine bridge
2020-10-29 10:35:24 +01:00
Łukasz Chruściel
c97e3c2a58
[Maintenance] Conflic symfony doctrine bridge 2020-10-29 08:53:22 +01:00
Tobias Wojtylak
a2624a8849 [Order] Allow logger to be nullable in UnpaidOrdersStateUpdater to avoid BC break 2020-10-25 14:12:28 +01:00
Grzegorz Sadowski
9e586eb404
bug #11958 [Core] Decouple cart collector from shop (lchrusciel)
This PR was merged into the 1.8 branch.

Discussion
----------

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

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

 To be sure you are not breaking any Backward Compatibilities, check the documentation:
 https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->


Commits
-------

ccfe7351a4 [Core] Decouple cart collector from shop
2020-10-23 15:27:28 +02:00
Łukasz Chruściel
ccfe7351a4
[Core] Decouple cart collector from shop 2020-10-23 11:37:55 +02:00
Grzegorz Sadowski
c34d4c93f2
Resolve upmerge conflict 2020-10-22 13:05:25 +02:00