Commit graph

143 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
Ferror
47ac3b0c32 [maintenance]Prepare postgresql pipeline by making behat scenarios de-case-sensitive 2022-06-03 10:37:44 +02:00
Adam Kasperczak
73588eeabc Merge branch '1.11'
* 1.11:
  [ShippingMethod] Change labels after changing shipping rule
  [ShippingMethod] Add note about changing shipping rule behaviour to the UPGRADE file
  Fix #13123, Only use products total in OrderTotalRuleChecker to select shipping methods
  [Behat][ShippingMethod] Adjust scenarios for shipping rules to be based on items total instead of order total
2022-04-14 15:40:36 +02:00
Adam Kasperczak
be6384ddd7 Merge branch '1.10' into 1.11
* 1.10:
  [ShippingMethod] Change labels after changing shipping rule
  [ShippingMethod] Add note about changing shipping rule behaviour to the UPGRADE file
  Fix #13123, Only use products total in OrderTotalRuleChecker to select shipping methods
  [Behat][ShippingMethod] Adjust scenarios for shipping rules to be based on items total instead of order total
2022-04-14 15:39:57 +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
Grzegorz Sadowski
085632aa9a
Merge branch '1.11'
* 1.11:
  [Core][Configuration] Rename flag that changes priorities in order processing
  [Core][Shipping] Update UPGRADE-1.10.md
  [Core][Configuration] Rename flag that changes priorities in order processing
  [Core][Configuration] Refactor test cases
  [Core][Configuration] Fix SyliusCoreConfigurationTest
  [Core][Configuration] Rename flag that changes priorities in order processing
  [Core][Configuration] Add possibilty to change priorities based on configuration
  [Core][Shipping][Behat] Update estimated shipping cost scenarios
  [Core][Shipping] Update UPGRADE-1.10.md
  [Core][Shipping] Change order processing priorities
  [Core][Shipping][Behat] Add estimated shipping cost scenarios
2022-03-18 14:05:04 +01:00
Grzegorz Sadowski
e6017a5997
Resolve conflict after upmerging changing processors priorities 2022-03-18 14:02:35 +01:00
Kevin Kaniaburka
9d9f8d9b18 [Core][Shipping][Behat] Update estimated shipping cost scenarios 2022-03-16 12:35:32 +01:00
Kevin Kaniaburka
caa04093d1 [Core][Shipping] Change order processing priorities 2022-03-16 11:07:02 +01:00
Kevin Kaniaburka
2863527a9d [Core][Shipping][Behat] Add estimated shipping cost scenarios 2022-03-16 11:07:02 +01:00
Łukasz Chruściel
54e76bd699
Merge branch '1.11'
* 1.11:
  [Behat] Use "When" for user actions where possible
2022-03-14 17:34:44 +01:00
Łukasz Chruściel
46ad6e19ef
Merge branch '1.10' into 1.11
* 1.10:
  [Behat] Use "When" for user actions where possible
2022-03-14 17:34:28 +01:00
Kevin Kaniaburka
984488d94b [Behat] Use "When" for user actions where possible 2022-03-11 09:20:29 +01:00
TheMilek
088051c56f
Correcting failing tests, comments and missing configuration 2022-02-17 12:31:17 +01:00
TheMilek
900f5c8e6c
[Behat][Unit] tests for new endpoint implementation 2022-02-15 11:44:51 +01:00
Łukasz Chruściel
ad4b1a8b32
[Behat][API][Shiipin] Turn on chunk of shipping scenarios with taxation 2021-07-15 17:13:50 +02:00
arti0090
9eba29d16a [API] Validating shipment that was shipped 2021-04-07 07:47:20 +02:00
arti0090
4e09dfd53c [API] show possible shipping methods for order 2020-12-10 10:59:22 +01:00
Grzegorz Sadowski
5518f8efea
[API][Shipment] Add filtering shipments by a shipping method 2020-10-06 13:24:23 +02:00
Grzegorz Sadowski
05b1ca774b
[Admin][Shipment] Add filtering shipments by a shipping method 2020-10-06 13:00:29 +02:00
Grzegorz Sadowski
4491a0e47a
[Behat][Shipment] Add scenario for filtering shipments by a shipping method 2020-10-06 12:59:51 +02: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
ee193f551c Fixed last failing scenario 2020-08-17 08:46:12 +02:00
Joachim Løvgaard
df3d448f8b Simplified feature and fixed typo 2020-08-17 08:46:12 +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
f6414bc4bc
bug #11381 [API][ShippingMethod][Product] Improve sort filter and tests (Tomanhez, pamil)
This PR was merged into the 1.8-dev branch.

Discussion
----------

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

Improve sort filter for ShippingMethod:
Before:
<img width="1293" alt="Screenshot 2020-04-16 at 08 51 57" src="https://user-images.githubusercontent.com/39232096/79756107-6976c080-831a-11ea-9703-e9a355f15dc1.png">
After:
<img width="1282" alt="Screenshot 2020-04-20 at 15 18 16" src="https://user-images.githubusercontent.com/39232096/79756051-52d06980-831a-11ea-99b5-289342ed3592.png">

localeCode field is a part of sortFileter and It was misleading
For greater readability:
Before:
<img width="1370" alt="Screenshot 2020-04-17 at 10 25 44" src="https://user-images.githubusercontent.com/39232096/79756084-611e8580-831a-11ea-8ef8-f00898178368.png">
After:
<img width="1313" alt="Screenshot 2020-04-20 at 15 14 20" src="https://user-images.githubusercontent.com/39232096/79756067-57951d80-831a-11ea-9da8-e62cc5540cc0.png">



Commits
-------

02e2abe2f3 Improve UI tests
5e84e48fd8 Improve Api tests
ccddefc837 Apply suggestions from code review
2020-05-12 22:35:11 +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
Mateusz Zalewski
c1b3243eec
Extract client for "by IRI" showing 2020-04-30 12:39:14 +02:00
Mateusz Zalewski
12e7f2d983
Check shipment units products by IRIs 2020-04-30 12:27:45 +02:00
Tomanhez
9e1cc286da
Add implementation for tests 2020-04-30 12:27:13 +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