Commit graph

2677 commits

Author SHA1 Message Date
Jacob Tobiasz
26cec53ed0
Resolve conflicts between 1.12 and 1.13 2023-12-24 08:37:42 +01:00
Jacob Tobiasz
cb7b6898f6
docs #13777 [Locale] Change language negotiation to RFC 4647 based (gseric)
This PR was merged into the 1.12 branch.

Discussion
----------

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

Following this PR: #13708 

Commits
-------
  [Locale] Change language negotiation from simple string comparison to RFC 4647 based
  [Locale] Add some more tests for header languange negotiation
  [Unit] Fix JsonApiTestCase constructor arguments
  [Behat][API] Allow setting no accept-language in header
2023-12-22 15:04:58 +01:00
Jacob Tobiasz
66d6a047d8
Resolve conflicts between 1.12 and 1.13 2023-12-22 13:53:00 +01:00
Zairig Imad
02c9b7428b
Typo cart-flow.rst 2023-12-22 09:51:48 +01:00
gseric
3d5da057b8
[Locale] Change language negotiation from simple string comparison to RFC 4647 based 2023-12-21 18:11:44 +01:00
Jan Goralski
dc300fb0da [Documentation] Update mailer configuration 2023-12-21 15:14:16 +01:00
arti0090
dbbea4689f PR comment fix 2023-12-21 15:14:16 +01:00
arti0090
e4fdf671de [WIP][DOCS] Add info about mailer to 1.12 2023-12-21 15:14:16 +01:00
Alexis DUMAS
ec9f4f53a1 Update themes.rst 2023-12-21 11:33:07 +01:00
Jacob Tobiasz
bc145f5ced
Fix conflicts between 1.12 and 1.13 2023-12-04 11:59:05 +01:00
Jibé Barth
93f8069440
[DOC] Fix display link in authorize page 2023-11-27 10:03:30 +01:00
Grzegorz Sadowski
460f2895a5
Merge branch '1.12' into 1.13
* 1.12:
  Move note about PasswordHasherAwareInterface to the newest patch in the UPGRADE file
  doc: adds note on the PasswordHasherAwareInterface in User class
  fix(user): make compatible sf6 sylius user to use encoder_name on login
  [API] Improve normalizing value of select attribute
  Add if_array check in ProductAttributeValueNormalizer.php
  [Documentation] Minor improvement for note about tax calculators
  Update catalog_promotions.rst
  Update bootstrap-theme.rst
  Update bootstrap-theme.rst
  Update taxation.rst
2023-11-17 12:35:05 +01:00
Grzegorz Sadowski
5532b8cffe
bug #15487 Update taxation.rst (zairigimad, GSadee)
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12                   |
| 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.12 branch
 - Features and deprecations must be submitted against the 1.13 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
-------

c724593223 Update taxation.rst
568d8422bb [Documentation] Minor improvement for note about tax calculators
2023-11-17 11:14:10 +01:00
Grzegorz Sadowski
568d8422bb
[Documentation] Minor improvement for note about tax calculators 2023-11-17 10:48:45 +01:00
Grzegorz Sadowski
1d9293a0a7
bug #15513 Update BootstrapTheme install doc (Florian-Merle)
This PR was merged into the 1.12 branch.

Discussion
----------

I was trying to install the BootstrapTheme, but it wasn't working because the `legacy_mode` part was not documented. Hope it's helpful :)

Commits
-------

24148df10a Update bootstrap-theme.rst
6ba56f8bce Update bootstrap-theme.rst
2023-11-17 10:41:15 +01:00
Vladimir
e97c6bd7eb
Update catalog_promotions.rst
Fix links to classes: 

src/Sylius/Bundle/CoreBundle/CatalogPromotion/Command/ApplyCatalogPromotionsOnVariants.php
src/Sylius/Bundle/CoreBundle/CatalogPromotion/CommandDispatcher/BatchedApplyCatalogPromotionsOnVariantsCommandDispatcher.php
2023-11-10 11:25:13 +02:00
Florian Merle
6ba56f8bce
Update bootstrap-theme.rst 2023-11-09 17:58:43 +01:00
Florian Merle
24148df10a
Update bootstrap-theme.rst 2023-11-09 17:52:05 +01:00
Zairig Imad
c724593223
Update taxation.rst 2023-11-01 11:02:03 +01:00
Benjamin Belz
45a8f74620 adjust 2023-10-05 23:49:01 +02:00
Benjamin Belz
a00820b2e6 Updated links that were redirecting to 404 2023-10-05 21:30:02 +02:00
Jacob Tobiasz
f32c1fc0df
minor #15323 [Maintenance] Change trigger_error to trigger_deprecation (Rafikooo)
This PR was merged into the 1.13 branch.

Discussion
----------

Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13 <!-- see the comment below -->                  |
| Bug fix?        | no                                                      |
| New feature?    | no                                                      |
| BC breaks?      | no                                                      |
| Deprecations?   | no<!-- don't forget to update the UPGRADE-*.md file --> |
| License         | MIT                                                          |

<!--
 - Bug fixes must be submitted against the 1.12 branch
 - Features and deprecations must be submitted against the 1.13 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
-->

We need to sort out the deprecations as only one way is currently supported

Commits
-------
  [Maintenance] Change trigger_error to trigger_deprecation in component classes
  [Maintenance] Change trigger_error to trigger_deprecation in bundle classes
  [Maintenance] Change trigger_error to trigger_deprecation in rest of the classes
  [Docs] Update Deprecations section
  [Maintenance] Remove testing occurance of deprecations in spec classes
  [Maintenance] Remove redundant Sylius version information in deprecation messages
  [Maintenance] Unify deprecation descriptions
  Maintenance] Remove usage of sprinf in trigger_deprecation calls
2023-09-20 13:52:10 +02:00
Rafikooo
2bf34178d8
[Maintenance] Unify deprecation descriptions 2023-09-20 03:27:39 +02:00
Rafikooo
abfb0404e3
[Docs] Update Deprecations section 2023-09-18 22:47:38 +02:00
Rafikooo
0fac9e072f
[Maintenance] Change trigger_error to trigger_deprecation in rest of the classes 2023-09-18 22:47:38 +02:00
Grzegorz Sadowski
7f14e4b5f5
Merge branch '1.12' into 1.13
* 1.12:
  Change application's version to v1.12.12-dev
  Generate changelog for v1.12.11
  Change application's version to v1.12.11
  [CS][DX] Refactor
  Update cart-promotions.rst
  fix prefix url on order api path
  fix prefix url on locale api path
  Update docs/book/orders/cart-promotions.rst
  Update default Rules of cart promotion
2023-09-18 11:22:15 +02:00
Jacob Tobiasz
eea101751d
docs #15263 Update default Rules of cart promotion (zairigimad)
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12 or 1.13 <!-- see the comment below -->                  |
| 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.12 branch
 - Features and deprecations must be submitted against the 1.13 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
-------
  Update default Rules of cart promotion
  Update docs/book/orders/cart-promotions.rst
  Update cart-promotions.rst
2023-09-18 06:27:53 +02:00
Jacob Tobiasz
d5a95d9752
docs #15317 [doc] plugin naming - new plugin structure (oallain)
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12            |
| Bug fix?        | no                                                       |
| New feature?    | no                                                       |
| BC breaks?      | no                                                       |
| Deprecations?   | no <!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets |                       |
| License         | MIT                                                          |

<!--
 - Bug fixes must be submitted against the 1.12 branch
 - Features and deprecations must be submitted against the 1.13 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
-------
  doc plugin naming - new plugin structure
2023-09-18 06:27:01 +02:00
Olivier ALLAIN
a03bb39ced doc plugin naming - new plugin structure 2023-09-17 21:25:40 +02:00
Zairig Imad
847eb18f0c
Update cart-promotions.rst 2023-09-17 11:55:51 +01:00
Grzegorz Sadowski
c06f0e451d
Merge branch '1.12' into 1.13
* 1.12:
  Add a note about payment-related events
2023-09-14 14:51:49 +02:00
Grzegorz Sadowski
875171e8c0
bug #15290 Add a note about payment-related events (jakubtobiasz)
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | closes #12541
| License         | MIT

We agreed there is no good way to resolve that issue in `1.x` version, so we decided to make the docs as clear as it's possible in that matter.

![CleanShot 2023-09-13 at 04 49 57](https://github.com/Sylius/Sylius/assets/80641364/98e48e24-3ef7-47d6-a392-845d0b6dba24)

P.S. I've created a task for considering how to fix this in later Sylius versions :).

Commits
-------

cc6cde8e6a Add a note about payment-related events
2023-09-14 14:51:30 +02:00
Jacob Tobiasz
cc6cde8e6a Add a note about payment-related events 2023-09-14 14:47:51 +02:00
Grzegorz Sadowski
7aecb72d66
Merge branch '1.12' into 1.13
* 1.12:
  Cart promotion Action Update
  Enable Sylius API for app environments
  [Maintenance] Update dev symfony version to 5.4.*
  Provide post-CR fixes
  Remove redundant TaxonPositioner service
  Cover "jumping" taxons while moving with Behat scenarios
  Revert bc promise breaking changes
  Leave only bug-related code and extract the position-related logic
  Added: Move taxon to the top/end buttons at admin
  Fixed: Moving taxons up and down at admin
2023-09-14 09:24:15 +02:00
Zairig Imad
7972eb4e9e Cart promotion Action Update 2023-09-13 19:19:20 +02:00
Zairig Imad
61c1fc0b4f
Update docs/book/orders/cart-promotions.rst
Co-authored-by: Jan Góralski <jan.wojciech.goralski@gmail.com>
2023-08-30 10:27:34 +01:00
Zairig Imad
25e9b8e20f
Update default Rules of cart promotion 2023-08-30 10:22:42 +01:00
Jacob Tobiasz
0b743ec24a
[UPMERGE] 1.12 -> 1.13 (#15236) 2023-08-19 07:07:10 +02:00
Zairig Imad
29b344f17e
Update checkout.rst 2023-08-18 11:01:52 +02:00
Grzegorz Sadowski
61ffae5f9f
Merge branch '1.12' into 1.13
* 1.12:
  Fix BC Break in SelectAttributeChoicesCollectionType
  [Admin] Add note to channel form about disabling account verification
  [Documentation] Add note about accessing guest orders by shop user
  Update docs/book/orders/checkout.rst
  Update checkout.rst
  Update upgrade file
  [Behat] Add scenario for checking if attribute is correctly added with values
  Use localeCode in ProductAttribute form to prevent logic from breaking when not using default locale
  Remove usage of defaultLocaleCode from SelectAttributeChoicesCollectionType
2023-08-18 06:51:34 +02:00
Jacob Tobiasz
68c0dc5bd9
docs #15227 CartBlamerListener not found , replace with ShopCartBlamerListener (zairigimad)
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12 or 1.13 <!-- see the comment below -->                  |
| 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.12 branch
 - Features and deprecations must be submitted against the 1.13 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
-------
  Update checkout.rst
  Update docs/book/orders/checkout.rst
2023-08-18 06:01:38 +02:00
Grzegorz Sadowski
516d1f562b
[Documentation] Add note about accessing guest orders by shop user 2023-08-17 15:11:27 +02:00
Zairig Imad
c891a76649
Update docs/book/orders/checkout.rst
Co-authored-by: Jacob Tobiasz <80641364+jakubtobiasz@users.noreply.github.com>
2023-08-17 12:39:55 +01:00
Zairig Imad
ecbdfadfd9
Update checkout.rst 2023-08-15 10:28:14 +01:00
Grzegorz Sadowski
933586a966
Merge branch '1.12' into 1.13
* 1.12:
  Update catalog_promotions.rst
  [Maintenance] Remove depractions from OrderPaymentProcessor
2023-08-04 10:42:48 +02:00
Zairig Imad
1e42b7af06
Update catalog_promotions.rst 2023-08-03 18:05:12 +02:00
Grzegorz Sadowski
d316c693d2
Merge branch '1.12' into 1.13
* 1.12:
  [Docs] Update order processing info
  [Maintenance] Update upgrade file
  [Order] Make payments removing clearer and extract unavailable order states
  [Order] Add `fulfilled` as an unsupported state for OrderPaymentProcessor
  [Order] Extract payments removal from OrderPaymentProcessor
2023-08-03 15:00:23 +02:00
Jan Goralski
45fd398438
[Docs] Update order processing info 2023-08-03 10:33:53 +02:00
Grzegorz Sadowski
f297c75263
Merge branch '1.12' into 1.13
* 1.12:
  [Docs] Update Sylius Plus installation guide
2023-07-28 13:58:38 +02:00
Grzegorz Sadowski
2b77f7f0b5
refactor #15128 [Docs] Sylius Plus installation guide update (Rafikooo)
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12 and 1.13 <!-- see the comment below -->                  |
| Bug fix?        | no                                                      |
| New feature?    | no                                                      |
| BC breaks?      | no                                                      |
| Deprecations?   | no<!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets | https://github.com/Sylius/RefundPlugin/pull/396, https://github.com/Sylius/Plus/pull/1261
| License         | MIT                                                          |

To be merged by the new tag of Sylius Plus

Commits
-------

9f9e096a10 [Docs] Update Sylius Plus installation guide
2023-07-28 13:58:19 +02:00