Grzegorz Sadowski
b2d88c15a9
Fix confict with upmerging
2020-02-06 10:04:28 +01:00
Grzegorz Sadowski
ef1dcb8af3
[Promotion] Return PHP_INT_MAX value as possible generation amount of coupons when the code length is too large
2020-02-06 07:49:50 +01:00
Olivier ALLAIN
eab239702e
fix code generation with too long code length
2020-02-06 07:49:28 +01:00
Adam Kasperczak
40161188a1
Ship shipment from index with tracking code
2020-02-03 08:38:11 +01:00
Adam Kasperczak
69bc77a7ea
Behats - shipping shipments with tracking code
2020-02-03 08:38:11 +01:00
Mateusz Zalewski
38d96c1a88
[Behat] Fix missing Behat step
2020-01-30 19:26:58 +01:00
Kamil Kokot
b03936e5a6
feature #10870 Allow guest checkout no matter what (loevgaard)
...
This PR was merged into the 1.7-dev branch.
Discussion
----------
| Q | A
| --------------- | -----
| Branch? | Master
| Bug fix? | Depends on the eyes ;)
| New feature? | Again, it depends
| BC breaks? | no
| Deprecations? | no
| Related tickets | fixes #10868
| License | MIT
- [x] Create Behat scenarios
- [x] Implement this change only on checkout (the same behaviour is present in the product review process where we want to keep it)
- [x] Update the docs describing this behaviour. Remember, also, to include a guide to add the 'registered user validation' again
Commits
-------
9defd0603f279366e42aaeabefdf1192db50d2ad3a082f43b58f56b1cb29d9e949cc40d0269dccdb
2020-01-30 15:03:41 +01:00
Łukasz Chruściel
e8145f02b9
feature #11055 Define countries for a channel (pamil)
...
This PR was merged into the 1.7-dev branch.
Discussion
----------
| Q | A
| --------------- | -----
| Branch? | master
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Related tickets | fixes #9122
| License | MIT
Currently used only in checkout addressing to limit the list of countries. If not defined, fallbacks to the previous behaviour - all enabled countries.
<img width="672" alt="Screenshot 2020-01-22 at 20 10 51" src="https://user-images.githubusercontent.com/1897953/72925676-65ef8f80-3d53-11ea-831c-25fad0973a83.png ">
Commits
-------
2e68737703
2020-01-23 13:22:17 +01:00
Kamil Kokot
2e68737703
Define countries for a channel
2020-01-23 10:03:42 +01:00
Łukasz Chruściel
e9ec260d2d
[Admin][Channel] Revert #10860
2020-01-22 16:14:14 +01:00
Mateusz Zalewski
6b60714e3f
Scenarios and implementation fixes
2020-01-16 18:53:48 +01:00
Mateusz Zalewski
727337e5c7
[Behat] Describe billing address as a base one in checkout Behat scenarios
2020-01-16 18:53:01 +01:00
Tomanhez
5fd7c801ff
Fixes for data-test-attributes
2020-01-16 13:52:01 +01:00
Mateusz Zalewski
6710941628
Behat semantical fixes
2020-01-14 01:01:23 +01:00
Mateusz Zalewski
b3a2f512bc
[Behat] Scenario for menu taxon after switching the channel
2020-01-12 23:30:28 +01:00
Mateusz Zalewski
d1563117c4
Show Taxons only from Channel menu taxon in Shop
2020-01-12 23:30:27 +01:00
Mateusz Zalewski
1970aea74a
[Behat] Displaying menu taxon in shop scenarios
2020-01-12 23:30:27 +01:00
Mateusz Zalewski
afcb228a8c
Protect from menu taxon deletion
2020-01-12 23:30:27 +01:00
Mateusz Zalewski
9b6ce70599
Choose menu taxon on channel form
2020-01-12 23:30:27 +01:00
Mateusz Zalewski
1d2361571e
[Behat] Managing menu taxon on channel scenarios
2020-01-12 23:30:26 +01:00
Joachim Løvgaard
d9e949cc40
Correct the stakeholder in the feature to comply with other features
2020-01-02 09:09:23 +01:00
Kamil Kokot
ac4962e7ae
Merge branch '1.6'
...
* 1.6:
[Behat] Negative shipping promotion bug fix scenario
Update ShippingPercentageDiscountPromotionActionCommand.php
2019-12-30 13:04:51 +01:00
Kamil Kokot
439cca2b51
Merge branch '1.5' into 1.6
...
* 1.5:
[Behat] Negative shipping promotion bug fix scenario
Update ShippingPercentageDiscountPromotionActionCommand.php
2019-12-30 12:28:40 +01:00
Mateusz Zalewski
2496f8173f
[Behat] Negative shipping promotion bug fix scenario
2019-12-27 15:16:23 +01:00
Kamil Kokot
05c9e8fc7d
bug #10981 [Behat] Spend less time waiting for slug generation (Zales0123)
...
This PR was merged into the 1.7-dev branch.
Discussion
----------
| Q | A
| --------------- | -----
| Branch? | master
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | related issues https://github.com/Sylius/Sylius/pull/10973 , https://github.com/Sylius/Sylius/pull/10562 , https://github.com/Sylius/Sylius/pull/10043
| License | MIT
Even though waiting for the slug generation should end when it's generated, I've noticed that it still takes a lot of time. So I made a quick experiment with lowering the waiting time and it seems to not harm and even improve execution time a little bit 💃
I also removed a `@javascript` tag from some scenarios that _de facto_ didn't need it.
Before:
<img width="552" alt="Zrzut ekranu 2019-12-20 o 11 57 30" src="https://user-images.githubusercontent.com/6212718/71250974-57135880-2321-11ea-8e86-ed3d1bb70061.png ">
After:
<img width="540" alt="Zrzut ekranu 2019-12-20 o 11 56 12" src="https://user-images.githubusercontent.com/6212718/71251008-698d9200-2321-11ea-9865-99a0bafa9c3c.png ">
Commits
-------
c0a4652a5baf99a572be
2019-12-23 10:25:25 +01:00
Grzegorz Sadowski
4951d192f0
Merge branch '1.6'
...
* 1.6:
Informs sylius users about cms plugin after sylius installed
2019-12-20 11:01:01 +01:00
Grzegorz Sadowski
5c9dcfc046
Merge branch '1.5' into 1.6
...
* 1.5:
Informs sylius users about cms plugin after sylius installed
2019-12-20 11:00:49 +01:00
Adam Kasperczak
d8ed6bf610
Informs sylius users about cms plugin after sylius installed
2019-12-20 10:12:55 +01:00
Mateusz Zalewski
c0a4652a5b
Remove unnecessary @javascript tag from some scenarios
2019-12-20 08:30:47 +01:00
Mateusz Zalewski
4013e51dfd
[Behat] Remove js requirement for bulk delete scenarios
2019-12-19 09:03:04 +01:00
Grzegorz Sadowski
cbe459bb26
[Admin][Order] Add resending a shipment confirmation email
2019-12-16 15:23:14 +01:00
Grzegorz Sadowski
d7baba1cdd
[Admin][Order] Add resending an order confirmation email
2019-12-16 08:02:25 +01:00
Grzegorz Sadowski
ccda8cd433
[Behat][Admin][Order] Add scenarios for resending an order confirmation email
2019-12-16 08:02:21 +01:00
Joachim Løvgaard
279366e42a
Add scenario
2019-12-12 08:34:46 +01:00
Grzegorz Sadowski
91f513a370
[Behat][Shop] Add scenarios for sending emails in different locale than the default one
2019-12-11 10:12:06 +01:00
Grzegorz Sadowski
16490cdd62
[Admin] Translate shipment confirmation email
2019-12-10 15:08:36 +01:00
Grzegorz Sadowski
3fef8769c6
[Behat][Shop] Add scenario for receiving order confirmation email in different locale than the default one
2019-12-10 10:50:33 +01:00
Adam Kasperczak
d9ed81fcdc
fix tests
2019-12-05 10:18:47 +01:00
Kamil Kokot
2f0c73c19b
feature #10860 [Channel] channel types (AdamKasp)
...
This PR was merged into the 1.7-dev branch.
Discussion
----------
| Q | A
| --------------- | -----
| Branch? | master
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| License | MIT
<!--
- Bug fixes must be submitted against the 1.4, 1.5 or 1.6 branch (the lowest possible)
- Features and deprecations must be submitted against the master branch
- Make sure that the correct base branch is set
-->
Commits
-------
a120f35347d8e9e29258e87e4575f035a22702e6
2019-11-21 19:57:56 +01:00
Grzegorz Sadowski
f5b137e926
Merge branch '1.6'
...
* 1.6:
Fixes after PR review
[Admin][Promotion] Fix the prevention of generating too many coupons
[Behat][Admin][Promotion] Implement scenarios for the prevention of generating too many coupons
[Behat][Admin][Promotion] Add scenarios for the prevention of generating too many coupons
2019-11-21 13:45:25 +01:00
Adam Kasperczak
35a22702e6
Fixes
2019-11-21 13:30:15 +01:00
Grzegorz Sadowski
db72ff85d1
Fixes after PR review
2019-11-21 12:17:26 +01:00
Grzegorz Sadowski
6653ca6b79
[Admin][Promotion] Fix the prevention of generating too many coupons
2019-11-21 10:10:10 +01:00
Grzegorz Sadowski
b55ded08f2
[Behat][Admin][Promotion] Implement scenarios for the prevention of generating too many coupons
2019-11-20 15:02:26 +01:00
Grzegorz Sadowski
beb98e9fcc
[Behat][Admin][Promotion] Add scenarios for the prevention of generating too many coupons
2019-11-20 14:58:54 +01:00
Adam Kasperczak
e87e4575f0
Add channel's form and fixes
2019-11-19 18:11:34 +01:00
Adam Kasperczak
a120f35347
Scenarios + Contexts
2019-11-19 17:52:11 +01:00
Grzegorz Sadowski
a14a599a67
[Behat][Admin][Order] Fix scenarios for displaying promotions on master after upmerge
2019-11-13 13:44:25 +01:00
Grzegorz Sadowski
38f0b723ad
Resolve upmerge conflict
2019-11-13 08:50:20 +01:00
Grzegorz Sadowski
40537771d6
Merge branch '1.5' into 1.6
...
* 1.5:
Fix behats
Move ShopApi reference to main menu
Modify order total adjustments
Modify order spec
2019-11-13 08:49:08 +01:00
