Commit graph

34171 commits

Author SHA1 Message Date
Grzegorz Sadowski
1109c4100e
Merge branch '2.0' into api-platform-3
* 2.0: (22 commits)
  [CS][DX] Refactor
  Fix error template finders specs and the way logged in admin user is checked
  [Behat] Fix """unexistent"""
  [Shop][Admin] Fix error pages location
  Slight cleanup
  Fix the build and improve a bit the failed step erros messages
  Move Error renderer to UiBundle
  Redirect to login page if the reset password token is wrong
  Decouple TwigErrorRenderer from AdminBundle
  Add tests
  Exclude ErrorRenderer and FlattenException from composer require checker
  Separate exact templates for Admin and Shop
  Separate the rendering of the error templates for Shop and Admin
  Create and add a 404 page for the Admin Panel using twig hooks
  Customer create edit page fixes
  Remove deprecated statistics
  Use interface for a response checker dependency
  [Admin][Taxon] Minor improvements
  [Admin][Taxon] Add info about component inside template
  [Admin][Taxon] Remove unnecessary lines
  ...
2024-07-04 06:56:56 +02:00
Grzegorz Sadowski
9df39f7579
Merge branch '1.14' into 2.0
* 1.14:
  Use interface for a response checker dependency
2024-07-04 06:54:30 +02:00
Grzegorz Sadowski
b58414cd8f
Merge branch '1.13' into 1.14
* 1.13:
  Use interface for a response checker dependency
2024-07-04 06:54:22 +02:00
Sylius Bot
7aa3856cdd [CS][DX] Refactor 2024-07-04 06:51:37 +02:00
Grzegorz Sadowski
e9421bdb19
minor #16469 Use interface for a response checker dependency (jaroslavtyc)
This PR was merged into the 1.13 branch.

Discussion
----------

To allow decorate response checker for custom error messages and so.

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

Commits
-------

fe8300c661 Use interface for a response checker dependency
2024-07-04 06:51:06 +02:00
Jan Goralski
4ba4822146 Fix error template finders specs and the way logged in admin user is checked 2024-07-04 06:49:08 +02:00
Jan Goralski
e216f4129f [Behat] Fix """unexistent""" 2024-07-04 06:49:08 +02:00
Jan Goralski
859f5e2d5a [Shop][Admin] Fix error pages location 2024-07-04 06:49:08 +02:00
Jan Goralski
0d33c16cba Slight cleanup 2024-07-04 06:49:08 +02:00
Kamil Grygierzec
5e32f2e3f6 Fix the build and improve a bit the failed step erros messages 2024-07-04 06:49:08 +02:00
Kamil Grygierzec
2b61e4a3a7 Move Error renderer to UiBundle 2024-07-04 06:49:08 +02:00
Kamil Grygierzec
337a4eb83f Redirect to login page if the reset password token is wrong 2024-07-04 06:49:08 +02:00
Kamil Grygierzec
4d320c4f03 Decouple TwigErrorRenderer from AdminBundle 2024-07-04 06:49:08 +02:00
Kamil Grygierzec
355a5d3b87 Add tests 2024-07-04 06:49:08 +02:00
Kamil Grygierzec
5e24692a38 Exclude ErrorRenderer and FlattenException from composer require checker 2024-07-04 06:49:08 +02:00
Kamil Grygierzec
7693b62b22 Separate exact templates for Admin and Shop 2024-07-04 06:49:08 +02:00
Kamil Grygierzec
54ce8d15fd Separate the rendering of the error templates for Shop and Admin 2024-07-04 06:49:08 +02:00
Kamil Grygierzec
30aae665bf Create and add a 404 page for the Admin Panel using twig hooks 2024-07-04 06:49:08 +02:00
Jan Góralski
6f6d622092
minor #16514 Customer create edit page fixes (TheMilek)
This PR was merged into the 2.0 branch.

Discussion
----------

| Q               | A
|-----------------|-----
| Branch?         | 2.0 <!-- see the comment below -->
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - Features and deprecations must be submitted against the 1.14 branch
 - Features, removing deprecations and BC breaks must be submitted against the 2.0 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
-->
[REF](https://github.com/Sylius/Sylius/pull/16458)

Commits
-------
  Customer create edit page fixes
2024-07-03 17:10:33 +02:00
Kamil Grygierzec
9fa5d74db1
Customer create edit page fixes 2024-07-03 15:56:16 +02:00
Michał Pysiak
87350f21fa Remove deprecated statistics 2024-07-03 14:54:44 +02:00
Jan Góralski
621dcb28dd
minor #16509 [Admin][Taxon] Delete (Wojdylak)
This PR was merged into the 2.0 branch.

Discussion
----------

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

![image](https://github.com/Sylius/Sylius/assets/33687392/d54b534c-0b66-49e2-a87e-5404adc88096)
![image](https://github.com/Sylius/Sylius/assets/33687392/9779baa7-df3a-432f-9272-5989bf8021c5)


Commits
-------
  [Admin][Taxon] Delete
  [Admin][Taxon] Enable behat tests for taxons deleting
  [Admin][Taxon] Remove unnecessary lines
  [Admin][Taxon] Add info about component inside template
  [Admin][Taxon] Minor improvements
2024-07-03 14:44:47 +02:00
Jaroslav Týc
fe8300c661 Use interface for a response checker dependency
To allow decorate response checker for custom error messages and so.
2024-07-03 14:33:14 +02:00
Grzegorz Sadowski
9894c69e3c
Merge branch '2.0' into api-platform-3
* 2.0:
  [Admin] Fix slug generation button's icon
  Add info message to the account credentials section
  move logic from CustomerType to subscriber
  Enable tests
  Remove CustomerTypeExtension, as the whole logic is only used in the Admin
  Fix customer create/update
  Fixes after CR
  Minor fixes
  Fix styles
  Fix behats tags
  Make NewOrders component live
  Fix behats
  Change channel select button
  Refactor and fixes
  [Admin] Add a preliminary dashboard statistics implementation
  [Admin] Add dashboard component improvements
  [Behat] Configure dashboard defined elements
  [Behat] Enable dashboard statistics scenarios
  Change ship button styling
2024-07-03 13:02:05 +02:00
Jan Goralski
d1ef3907bf [Admin] Fix slug generation button's icon 2024-07-03 12:55:13 +02:00
Wojdylak
3a16335d0c
[Admin][Taxon] Minor improvements 2024-07-03 12:42:43 +02:00
Kamil Grygierzec
e818fb3aaf Add info message to the account credentials section 2024-07-03 11:53:08 +02:00
Kamil Grygierzec
83eb016293 move logic from CustomerType to subscriber 2024-07-03 11:53:08 +02:00
Kamil Grygierzec
e3c70fc232 Enable tests 2024-07-03 11:53:08 +02:00
Kamil Grygierzec
a1570fb981 Remove CustomerTypeExtension, as the whole logic is only used in the Admin 2024-07-03 11:53:08 +02:00
Kamil Grygierzec
ee1c5d2350 Fix customer create/update 2024-07-03 11:53:08 +02:00
Michał Pysiak
9318c14f42 Fixes after CR 2024-07-03 11:33:25 +02:00
Michał Pysiak
d92a55130e Minor fixes 2024-07-03 11:33:25 +02:00
Michał Pysiak
99d2aa682a Fix styles 2024-07-03 11:33:25 +02:00
Michał Pysiak
4716a2f5f8 Fix behats tags 2024-07-03 11:33:25 +02:00
Michał Pysiak
a5a5e1a907 Make NewOrders component live 2024-07-03 11:33:25 +02:00
Michał Pysiak
dd988e3802 Fix behats 2024-07-03 11:33:25 +02:00
Michał Pysiak
eab7b8d0b5 Change channel select button 2024-07-03 11:33:25 +02:00
Michał Pysiak
490b292b3d Refactor and fixes 2024-07-03 11:33:25 +02:00
Rafikooo
b88dd5ec30 [Admin] Add a preliminary dashboard statistics implementation 2024-07-03 11:33:25 +02:00
Rafikooo
9dfac78847 [Admin] Add dashboard component improvements 2024-07-03 11:33:25 +02:00
Rafikooo
485e293b37 [Behat] Configure dashboard defined elements 2024-07-03 11:33:25 +02:00
Rafikooo
2df2e86256 [Behat] Enable dashboard statistics scenarios 2024-07-03 11:33:25 +02:00
Wojdylak
f3307f1b0c
[Admin][Taxon] Add info about component inside template 2024-07-03 10:47:56 +02:00
Wojdylak
6ac313bf6b
[Admin][Taxon] Remove unnecessary lines 2024-07-03 10:37:56 +02:00
Wojdylak
109e9a3125
[Admin][Taxon] Enable behat tests for taxons deleting 2024-07-03 10:33:48 +02:00
Wojdylak
0df190ad06
[Admin][Taxon] Delete 2024-07-03 10:32:37 +02:00
kulczy
d7809bff1d
Change ship button styling (#16507)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | 
| License         | MIT


![image](https://github.com/Sylius/Sylius/assets/129760562/168bb16d-a686-4516-b24d-3fbed22410f3)
2024-07-03 10:30:50 +02:00
Michał Pysiak
82fd33b6af
[API] Upgrade OrderItem and OrderItemUnit resources to API Platform 3 (#16505)
| Q               | A
|-----------------|-----
| Branch?         | api-platform-3
| 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 or 1.13 branches
 - Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 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
-->
2024-07-03 06:37:24 +02:00
Grzegorz Sadowski
07dd028052
Merge branch '2.0' into api-platform-3
* 2.0:
  Change application's version to v1.13.4-dev
  Generate changelog for v1.13.3
  Change application's version to v1.13.3
  Change application's version to v1.12.19-dev
  Generate changelog for v1.12.18
  Change application's version to v1.12.18
  [CS][DX] Refactor
  Update repository.rst
  Update model.rst
2024-07-02 11:32:13 +02:00