Commit graph

3542 commits

Author SHA1 Message Date
Rafikooo
10b67523c3
[PriceHistory] Tag scenarios as @todo 2023-03-13 12:38:59 +01:00
Rafikooo
30ca912876
[PriceHistory][Scenarios][Shop] Add lowest price displaying 2023-03-13 12:38:58 +01:00
Rafikooo
1161ec2664
[PriceHistory][Scenarios] Add lowest price displaying in product's show page 2023-03-13 09:40:13 +01:00
Rafikooo
805b93adb9
[PriceHistory][Scenarios] Add log entry creation after product's price change 2023-03-13 09:40:13 +01:00
Rafikooo
615f704fa7
[PriceHistory][Scenarios] Add deleting old log entries 2023-03-13 09:40:13 +01:00
Rafikooo
33a7407986
[PriceHistory][Scenarios] Add catalog promotion cases 2023-03-13 09:40:13 +01:00
Rafikooo
668bd90d8b
[PriceHistory][Scenarios] Accessing price history 2023-03-13 09:40:12 +01:00
Rafikooo
88db81fe0e
[PriceHistory][Scenarios] Channel setup 2023-03-13 09:40:12 +01:00
Grzegorz Sadowski
aef3367b2c
feature #14811 Cover managing the tax rates in API (hatem20, jakubtobiasz)
This PR was merged into the 1.13 branch.

Discussion
----------

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


Commits
-------

03c34387a7 [Tax rate][Behat] Add include tax rate step in add tax feature
f84fce7dc9 [API][Tax rate] Implement adding_tax_rate feature
c8fe3b325f [API][Tax rate] Implement deleting_tax_rate feature
e147639d37 [API][Tax rate] Implement deleting_multiple_tax_rates feature
bacef86376 [API][Tax rate] Implement tax_rate_unique_code_validation feature
161d25d6dd [API][Tax rate] Implement tax_rate_validation feature
7cdf3e7983 [API][Tax rate] Implement editing_tax_rate feature
cff62a6337 Adjust Tax Rates API related Behat scenarios to the new standard
2023-02-23 12:50:59 +01:00
Jakub Tobiasz
cff62a6337
Adjust Tax Rates API related Behat scenarios to the new standard 2023-02-22 11:41:09 +01:00
Grzegorz Sadowski
b66370546a
Merge branch '1.12' into 1.13
* 1.12:
  [Shop] Fix displaying discount on list view when original price is lower than current
  [Behat][Shop] Not seeing discount when original price is lower than current
2023-02-17 08:58:53 +01:00
Jan Goralski
acecbb210e
[Behat][Shop] Not seeing discount when original price is lower than current 2023-02-16 14:18:54 +01:00
Grzegorz Sadowski
a017697664
Merge branch '1.12' into 1.13
* 1.12:
  Rename composite to hybrid within Behats & post review improvements
  Rename custom Order factory
  Fix being unable to pick up latest non-empty cart started in shop and continued in API
  Add Behat scenarios for continuing cart from web in api
2023-02-16 07:44:49 +01:00
Grzegorz Sadowski
906e722e72
bug #14800 Fix being unable to pick up latest non-empty cart started in shop and continued in API (jakubtobiasz)
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12                  |
| Bug fix?        | yes                                                       |
| New feature?    | no                                                       |
| BC breaks?      | no                                                       |
| Deprecations?   | no  |
| Related tickets | fixes #14539, successor of #14597                      |
| License         | MIT                                                          |

PR created by @Nek- was great, but was involving some sort of changes we've called feature and bc policy breaking. We (believe that) we've found a way to fix the bug part without changing the previous behavior on the web shop. 

Commits
-------

854e3e7ceb Add Behat scenarios for continuing cart from web in api
fb70c5e34a Fix being unable to pick up latest non-empty cart started in shop and continued in API
1e3410a72b Rename custom Order factory
efdbb44594 Rename composite to hybrid within Behats & post review improvements
2023-02-16 07:44:21 +01:00
Jakub Tobiasz
efdbb44594
Rename composite to hybrid within Behats & post review improvements 2023-02-15 18:06:59 +01:00
hatem20
7cdf3e7983
[API][Tax rate] Implement editing_tax_rate feature 2023-02-15 11:55:24 +01:00
hatem20
161d25d6dd
[API][Tax rate] Implement tax_rate_validation feature 2023-02-15 11:55:24 +01:00
hatem20
bacef86376
[API][Tax rate] Implement tax_rate_unique_code_validation feature 2023-02-15 11:55:24 +01:00
hatem20
e147639d37
[API][Tax rate] Implement deleting_multiple_tax_rates feature 2023-02-15 11:55:23 +01:00
hatem20
c8fe3b325f
[API][Tax rate] Implement deleting_tax_rate feature 2023-02-15 11:55:23 +01:00
hatem20
f84fce7dc9
[API][Tax rate] Implement adding_tax_rate feature 2023-02-15 11:55:21 +01:00
hatem20
03c34387a7
[Tax rate][Behat] Add include tax rate step in add tax feature 2023-02-15 11:53:09 +01:00
Grzegorz Sadowski
95fa57af77
Merge branch '1.12' into 1.13
* 1.12:
  Logout Admin User after being disabled
  [ApiBundle] Remove no longer needed mapping configuration
  [API] Prepend configuration with API Platform mapping
2023-02-13 12:03:17 +01:00
Jakub Tobiasz
ab84ad6bdb
Logout Admin User after being disabled 2023-02-10 16:33:20 +01:00
Grzegorz Sadowski
9a2b6523ac
Merge branch '1.12' into 1.13
* 1.12:
  Fix CI
  Update Plus' dependencies' versions requirements
  Update sylius_plus_installation.rst
  Update versions in the "Submitting a Patch" doc
  Add adjusting shop regex section to disabling-localised-urls.rst
  [Architecture] Ensure HTTP errors are not dispatched in command handlers
  [Behat] add scenario for disabled admin
  Added promotion form theme override in UPGRADE-1.9.md
2023-02-10 08:50:06 +01:00
Jakub Tobiasz
854e3e7ceb
Add Behat scenarios for continuing cart from web in api 2023-02-07 08:22:56 +01:00
SirDomin
619464c028
[Behat] add scenario for disabled admin 2023-02-03 14:01:56 +01:00
TheMilek
25350d1ab8
Merge branch '1.12' into 1.13
* 1.12:
  [Promotion] Revert removing min and max validation messages for code length
  [Behat] Add minor improvements to range validations fixes
  Set correct notInRangeMessage for unit percentage discount promotion action
  Set correct notInRangeMessage for coupon generation validation
2023-01-31 16:38:14 +01:00
TheMilek
1b0ce98c52
Merge branch '1.11' into 1.12
* 1.11:
  [Promotion] Revert removing min and max validation messages for code length
  [Behat] Add minor improvements to range validations fixes
  Set correct notInRangeMessage for unit percentage discount promotion action
  Set correct notInRangeMessage for coupon generation validation
2023-01-31 16:35:58 +01:00
Kamil Grygierzec
c477884ae8
minor #14576 Fix notInRangeMessage usage for a few Range validations (diimpp, GSadee)
This PR was merged into the 1.11 branch.

Discussion
----------

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

**Issue**
Symfony validation constraint [`Range`](https://symfony.com/doc/4.4/reference/constraints/Range.html#notinrangemessage) instroduced new behavior since 4.4 release -- if both `min` and `max` options are defined, then `notInRangeMessage` will be shown and `minMessage`/`maxMessage` will be disregarded.

<details><summary>Example</summary>

If you will try to generate coupons for promotion with code length larger than 40, then you will see symfony standard message `notInRangeMessage: This value should be between {{ min }} and {{ max }}.` instead of sylius `maxMessage: Coupon code must not be longer than {{ limit }} characters.`
![image](https://user-images.githubusercontent.com/870747/203878039-2d6ac8c3-130c-4758-a7ae-bd638817faf7.png)


</details>

#### Case 1

9506c80f20/src/Sylius/Bundle/PromotionBundle/Resources/config/validation/PromotionCouponGeneratorInstruction.xml (L33-L37)

- [x] Remove minMessage, maxMessage and their translations
- [x] Introduce notInRangeMessage and new translation
- [x] Cover case with behat scenario 

#### Case 2
9506c80f20/src/Sylius/Bundle/PromotionBundle/Form/Type/Action/UnitPercentageDiscountConfigurationType.php (L35-L41)

- [x] Remove minMessage, maxMessage usage; Their translations were already removed.
- [x] Introduce notInRangeMessage; Translation already exists as it's shared between order/item percentage discount
- [x] Cover case with behat scenario

#### Case 3
9506c80f20/src/Sylius/Bundle/ApiBundle/Resources/config/validation/AddProductReview.xml (L23-L28)

- [x] Remove minMessage, maxMessage
- [x] Rename translation key `range` to `not_in_range`
- [x] Move to separate https://github.com/Sylius/Sylius/pull/14584 due deprecation.

**Questions**
1. Does removal of `sylius.promotion_coupon_generator_instruction.code_length.min` and `...max` messages constitute a deprecation entry? Because those translation strings were inactive (effectively deprecated by symfony upgrade) since project was upgraded to symfony 4.4 and even if somebody has custom translation over there, it has no effect whatsoever. 
2. Please advise on adding/removal of translation strings, do I need to do anything else? I do recall some translation service was in use.


Commits
-------

f1ae3df84d Set correct notInRangeMessage for coupon generation validation
f55babdb58 Set correct notInRangeMessage for unit percentage discount promotion action
7d88a38986 [Behat] Add minor improvements to range validations fixes
63e8b69f6c [Promotion] Revert removing min and max validation messages for code length
2023-01-31 16:34:55 +01:00
Rafikooo
f936f15b3b
Merge branch '1.12' into 1.13
* 1.12:
  [Behat] Fix return type of cart transformer
  [Product] Add missing LocaleContextInterface in ProductAttributeController after upmerge from 1.11
  [Behat] Fix problem with duplicated step in cart contexts
  [Behat][Admin] Cover trying to show cart in the admin panel
  Changing the naming of the order function
  Throwing a not found when order is still a cart
2023-01-31 16:11:06 +01:00
Rafikooo
63ed46f0d0
Merge branch '1.11' into 1.12
* 1.11:
  [Behat] Fix return type of cart transformer
  [Behat] Fix problem with duplicated step in cart contexts
  [Behat][Admin] Cover trying to show cart in the admin panel
  Changing the naming of the order function
  Throwing a not found when order is still a cart
2023-01-31 16:10:45 +01:00
Rafał Jaskulski
b88d58d5c8
minor #14174 [Admin] Fix 500 error when showing cart in admin panel (lchrusciel)
This PR was merged into the 1.11 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.11           |
| Bug fix?        | yes                                                       |
| New feature?    | no                                                       |
| BC breaks?      | no                                                       |
| Deprecations?   | no |
| Related tickets | down ported version of https://github.com/Sylius/Sylius/pull/13831, fixes https://github.com/Sylius/Sylius/issues/13826 |
| License         | MIT                                                          |

<!--
 - Bug fixes must be submitted against the 1.10 or 1.11 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
-------

8b66199933 Throwing a not found when order is still a cart

If the order is in state cart the order show should not throw a 500.
095d5c90a2 Changing the naming of the order function
ea87cabc26 [Behat][Admin] Cover trying to show cart in the admin panel
deddc31da6 [Behat] Fix problem with duplicated step in cart contexts
ba8f290948 [Behat] Fix return type of cart transformer
2023-01-31 16:09:36 +01:00
Grzegorz Sadowski
71f5ca885b
Merge branch '1.12' into 1.13
* 1.12:
  [Behat][Product] Tests of adding select attributes
  [Product] Always translate attribute label
  [Product] Fixed product attribute translations #11570
2023-01-31 14:09:29 +01:00
Grzegorz Sadowski
a02de0206b
Merge branch '1.11' into 1.12
* 1.11:
  [Behat][Product] Tests of adding select attributes
  [Product] Always translate attribute label
  [Product] Fixed product attribute translations #11570
2023-01-31 14:09:15 +01:00
Grzegorz Sadowski
f9236df12e
bug #14416 [Product] Fixed product attribute translations #11570 (NoResponseMate)
This PR was merged into the 1.11 branch.

Discussion
----------

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

Bug :
Select attributes on product edit page in BO are not translated.

Fix : 
Get locale from context and translate with this locale.

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

73dc8a9af9 [Product] Fixed product attribute translations #11570
9670a1c6a7 [Product] Always translate attribute label
0ccdbf69c5 [Behat][Product] Tests of adding select attributes
2023-01-31 13:55:16 +01:00
Grzegorz Sadowski
7d88a38986
[Behat] Add minor improvements to range validations fixes 2023-01-31 10:19:30 +01:00
Dmitri Perunov
f55babdb58
Set correct notInRangeMessage for unit percentage discount promotion action 2023-01-31 10:19:30 +01:00
Dmitri Perunov
f1ae3df84d
Set correct notInRangeMessage for coupon generation validation 2023-01-31 10:19:29 +01:00
Jan Goralski
0ccdbf69c5
[Behat][Product] Tests of adding select attributes 2023-01-31 09:48:36 +01:00
Grzegorz Sadowski
deddc31da6
[Behat] Fix problem with duplicated step in cart contexts 2023-01-31 07:41:13 +01:00
Grzegorz Sadowski
ea87cabc26
[Behat][Admin] Cover trying to show cart in the admin panel 2023-01-30 15:17:21 +01:00
Grzegorz Sadowski
7bdd9325f3
Merge branch '1.12' into 1.13
* 1.12:
  [ECS] Fix
  Fix applying catalog promotions when there is no applied promotions and price differ from original price
2023-01-27 14:19:15 +01:00
Grzegorz Sadowski
5801d07694
Merge branch '1.11' into 1.12
* 1.11:
  [ECS] Fix
  Fix applying catalog promotions when there is no applied promotions and price differ from original price
2023-01-27 14:18:49 +01:00
TheMilek
f67b6d0da9
Fix applying catalog promotions when there is no applied promotions and price differ from original price 2023-01-25 12:51:42 +01:00
Grzegorz Sadowski
2c48d1147e
Merge branch '1.12' into 1.13
* 1.12:
  creating data provider
2023-01-23 08:15:06 +01:00
Grzegorz Sadowski
b24a525d33
Merge branch '1.11' into 1.12
* 1.11:
  creating data provider
2023-01-23 08:14:03 +01:00
everwhatever
869dcaea29 creating data provider 2023-01-23 06:18:56 +01:00
everwhatever
a1b8d59888 As an Admin, I want to modify taxons of a product 2023-01-17 12:17:03 +01:00
Jakub Tobiasz
90fa4111b1
Drop unneeded @javascript tag 2023-01-12 13:27:44 +01:00