Commit graph

66 commits

Author SHA1 Message Date
Jan Goralski
f3f7c96de4
[Behat][Admin] Describe how the channel validation indicators work 2022-07-19 12:38:18 +02:00
Grzegorz Sadowski
fda1f4b8d3
[Behat][ShippingMethod] Adjust scenarios for shipping rules to be based on items total instead of order total 2022-04-14 12:42:17 +02:00
Kevin Kaniaburka
984488d94b [Behat] Use "When" for user actions where possible 2022-03-11 09:20:29 +01:00
Mateusz Zalewski
a266dbe64b
feature #10434 [Shipping] Shipping method rules (loevgaard)
This PR was merged into the 1.8-dev branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master
| Bug fix?        | No
| New feature?    | Yes
| BC breaks?      | No
| Deprecations?   | Yes
| Related tickets | Fixes #10302
| License         | MIT

This pull request adds rules to shipping methods. If any rule returns false the shipping method will not be shown. It is very much based on the same logic as the promotion engine.

- [x] Functionality
- [x] Specs
- [x] Behat tests
- [x] Docs

Here is a screenshot of the functionality:

![image](https://user-images.githubusercontent.com/2412177/74140012-9ad56080-4bf4-11ea-9dde-3ac1643577f3.png)


Commits
-------

27fb698c56 added main files for shipping method rules
3c04cc60e5 Removed inheritdoc
58639a3bac Removed not empty assertion
767b9bf9f1 Removed public modifier
168e3d89c8 Add type to $threshold
df3d448f8b Simplified feature and fixed typo
94a95c4aac Added types
f1686ce9ba Add lexical transformer
ee193f551c Fixed last failing scenario
f3905e9655 Removed test that shouldn't be there after removing assertion of empty constructor
556a744c2c Instead of fixing the inheritdoc with code style I just removed it
77ccf295fb Fix correct extension of deprecated interface
6181dab492 Fix psalm deprecation error
6a5f922192 Supress psalm error
0944bc6247 Moved amount type and associated classes to core bundle
14b07f8918 Making behat build
743b6b6eb0 Update deprecations
f5dd3ba044 Output help directly in template
3420d2d06d Add another deprecation and remove double defined services
c8d3db3d73 Improved spec
5722494c54 Improved spec
1fed2d3989 Removed AddWeightFormSubscriber
e569bff6b2 Remove deprecation since it is not needed
2020-08-17 14:58:02 +02:00
Joachim Løvgaard
14b07f8918 Making behat build 2020-08-17 10:02:55 +02:00
Łukasz Chruściel
f5d806745d
Merge branch '1.7'
* 1.7:
  [Behat] Add javascript tags
  Revert "[Behat] Remove js requirement for bulk delete scenarios"
  [Docs] Udpdate obsolete branches
  [Documentation] removed 1.6 as a maintenance branch
  [Admin] removed duplicated id attribute
  [Account] Add spec to sync username with customer email
  Injecting locale parameter instead of having it harcdoded
  [Behat] Unfinalize some Behat pages
  [Shop] Add form in add to cart template event args
  [Admin] Convert newlines in product description to breaklines in product details view
2020-08-17 09:18:01 +02:00
Joachim Løvgaard
27fb698c56 added main files for shipping method rules
Added two more rules

Adding back removed inheritdoc from other bundle

Fixed xml error and other optimizations

Readd inheritdoc

Fixed correct iteration of tagged services

renamed total form subscriber

Fixed another xml error

Fixed BC compat with SF3.4

Moved two rules to core since they depend on a core interface

Fixing build

Added docs

Moved services to correct service file

Changed constraint from numeric to integer

Renamed TotalType to AmountType

Added Behat scenarios

Updated Behat tests

fixed a few review comments

rebased

Fixed wrong xml formatting

Fixed more review comments

Added step to check for rule appendance

Fixing some build errors

Fixed psalm errors

Move shipping methods below inventory
2020-08-17 08:46:11 +02:00
Destiny
cb044e3115
Revert "[Behat] Remove js requirement for bulk delete scenarios"
This reverts commit 4013e51dfd.
2020-08-15 13:45:05 +02:00
Łukasz Chruściel
425c8831ef
[Minor][Behat] Typo fix 2020-06-12 08:19:05 +02:00
Tomanhez
d5372e087c Add new step for creating shipping method 2020-06-09 15:03:16 +02:00
Tomanhez
ab17f34d21 Add tests 2020-06-09 15:03:16 +02:00
Kamil Kokot
ccddefc837
Apply suggestions from code review
Co-authored-by: Grzegorz Sadowski <sadowskigp@gmail.com>
2020-05-12 22:32:10 +02:00
Tomanhez
5e84e48fd8 Improve Api tests 2020-05-04 14:12:26 +02:00
Tomanhez
02e2abe2f3 Improve UI tests 2020-05-04 10:26:14 +02:00
Łukasz Chruściel
7450d01592
[API] Archivization toggling and filtration 2020-03-20 12:44:11 +01:00
Łukasz Chruściel
3013bbbafa
feature #11268 [API] Sorting shipping methods by name (Zales0123)
This PR was merged into the 1.8-dev branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master
| Bug fix?        | no
| New feature?    | yes
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | part of #11250, the continuation of #11267
| License         | MIT


Commits
-------

19daa1736b [API] Sorting shipping methods by name
2020-03-20 12:39:00 +01:00
Mateusz Zalewski
a7139ca0be
feature #11266 [API] Hide archived shipping methods (lchrusciel)
This PR was merged into the 1.8-dev branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master
| Bug fix?        | no
| New feature?    | yes
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | Part of #11250
| License         | MIT

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


Commits
-------

132ac6a617 [API] Hide archived shipping methods
2020-03-20 12:28:29 +01:00
Mateusz Zalewski
19daa1736b
[API] Sorting shipping methods by name 2020-03-20 12:06:52 +01:00
Łukasz Chruściel
6b2735acd7
feature #11267 [API] Sorting shipping method by code and position (Zales0123)
This PR was merged into the 1.8-dev branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | part of https://github.com/Sylius/Sylius/issues/11250
| License         | MIT


Commits
-------

bbde767af4 [API] Sorting shipping methods by code
3699851041 [API] Sorting shipping methods by position
2020-03-20 11:48:15 +01:00
Mateusz Zalewski
3699851041
[API] Sorting shipping methods by position 2020-03-20 11:14:08 +01:00
Mateusz Zalewski
bbde767af4
[API] Sorting shipping methods by code 2020-03-20 11:05:20 +01:00
Łukasz Chruściel
132ac6a617
[API] Hide archived shipping methods 2020-03-20 10:47:44 +01:00
Łukasz Chruściel
8e46a6062c
[API] Protect shipping method from removal when in use 2020-03-20 09:09:37 +01:00
Łukasz Chruściel
75bfde0c61
[API] Editing and validation of shipping methods 2020-03-19 17:24:45 +01:00
Łukasz Chruściel
6cb6e43896
[API] Adding shipping methods 2020-03-19 14:28:42 +01:00
Łukasz Chruściel
42d5d0e085
[API] Adding shipping methods 2020-03-19 11:49:10 +01:00
Łukasz Chruściel
4524502d81
[API] Deleting shipping methods 2020-03-17 15:43:47 +01:00
Łukasz Chruściel
21a0bdb535
[API] Browsing shipping methods 2020-03-17 15:43:37 +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
-------

c0a4652a5b Remove unnecessary @javascript tag from some scenarios
af99a572be Lower jquery waiting time
2019-12-23 10:25:25 +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
Mateusz Zalewski
b9c1ca52ab
PR review fixes 2019-10-24 08:17:01 +02:00
Mateusz Zalewski
031c398e77
[ShippingMethod] Do not allow to specify shipping fee below 0 2019-10-23 13:30:43 +02:00
Grzegorz Sadowski
18011fd179 [Behat] Implement scenarios for deleting multiple resources 2017-10-30 10:44:38 +01:00
Grzegorz Sadowski
b206d148ba [Behat] Add scenarios for deleting multiple resources 2017-10-30 10:44:38 +01:00
Mateusz Zalewski
91dfbb8e9f
[Behat] Enable shipping method name validation scenario 2017-09-12 09:41:20 +02:00
Loïc Frémont
ef42c04cd2 [Behat] Fix error when searching a row with more than one columns (#8414)
* fix hasRowFields method of TableAccessor

* add a string conversion on searchedValue

* fix some failed tests

* remove useless blankline

* fix hasRowFields method of TableAccessor

* add a string conversion on searchedValue

* fix some failed tests

* remove useless blankline

* fix a codestyle error
2017-09-04 08:56:15 +02:00
Jan Goralski
62875a04bf [Behat] Scenarios for archiving shipping methods 2017-01-20 15:21:56 +01:00
Mateusz Zalewski
7e4a9b8947
[Admin][Zone] Removing zone from existing shipping method validation 2016-12-13 11:28:56 +01:00
Jan Goralski
f1c614947c [Behat] Tests for code regex on shipping methods 2016-11-29 13:24:51 +01:00
Grzegorz Sadowski
35e5b57993 [Behat][Admin][Shipping] Fixes in shipping method after add currency per channel 2016-11-28 18:57:24 +01:00
Grzegorz Sadowski
467df0e9d4 [Behat][Admin][Shipping] Update scenarios 2016-11-28 18:57:24 +01:00
Łukasz Chruściel
d7f0a4fa03
[Shipment] Fix master build and consistency 2016-11-16 22:28:42 +01:00
Mateusz Zalewski
eecf6b6824
[Core][Admin] Choose channels on shipping method form 2016-11-16 11:56:05 +01:00
Mateusz Zalewski
80cfe527f8
[Behat] Be consistent with shipping method naming 2016-11-15 14:57:02 +01:00
Kamil Kokot
010e191575
[Shipping] Fix sorting after recent changes 2016-10-19 09:55:19 +02:00
Kamil Kokot
e757903912
[Admin] Allow for changing position in the UI 2016-10-19 09:55:18 +02:00
Kamil Kokot
ab9d42f4d2
[Admin] Make shipping methods position update when adding new ones 2016-10-19 09:55:18 +02:00
Kamil Kokot
520abc59fe
[Admin] Sort shipping methods by their positions 2016-10-19 09:55:17 +02:00
Jan Goralski
eb2c758d10 [Behat] Fixed flailing scenarios 2016-10-18 10:55:20 +02:00