Commit graph

21956 commits

Author SHA1 Message Date
Kamil Kokot
2689e081c3
minor #11567 [Doc] change sylius.security.shop_regex in doc for new api (oallain)
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 | 
| License         | MIT

Little forget about the documentation related to the new API.
c27fe6df9b/config/packages/security.yaml (L4)

Commits
-------

4577202ad0 change sylius.security.shop_regex in doc for new api
2020-06-15 10:49:36 +02:00
Kamil Kokot
dc2d324c21
minor #11564 [Minor][Behat] Typo fix (lchrusciel)
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 | fixes https://github.com/Sylius/Sylius/pull/11517#discussion_r437880953
| 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
-------

425c8831ef [Minor][Behat] Typo fix
2020-06-15 10:10:39 +02:00
Kamil Kokot
a6ef5bfa62
bug #11534 Add Sylius template event (tavy315)
This PR was merged into the 1.7 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | no/yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | #11151
| License         | MIT

I've seen the changes done in (186c13c250), but I guess that this file was missed.


Commits
-------

b7d3fd7f0d Add Sylius template events
0d973b60ac Merge remote-tracking branch 'upstream/1.7' into patch-1
2020-06-15 10:10:04 +02:00
Kamil Kokot
3b1376aaa7
feature #11545 Add priority to payment gateways (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 | 
| License         | MIT

`sylius.gateway_factories` parameter stays the same, priority is only used to order gateways - and therefore to display them in proper order in the admin panel.

<img width="258" alt="Zrzut ekranu 2020-06-3 o 16 45 41" src="https://user-images.githubusercontent.com/6212718/83651388-b7d5db00-a5b9-11ea-9e2a-f964a1fb99c2.png">

If priority is not set, it's `0` by default.

Commits
-------

99da07c20e Add priority to payment gateway
1d09e38a25 Add test and simplify implementation
2020-06-15 10:05:49 +02:00
Grzegorz Sadowski
110508bb47
feature #11558 switch timeframe on admin dashboard (arti0090)
This PR was merged into the 1.8-dev branch.

Discussion
----------

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

![ezgif com-video-to-gif](https://user-images.githubusercontent.com/35863747/84124458-8cc90c80-aa3b-11ea-9559-a9eec37b1295.gif)


TODO: Block possibility to move timeframe in future after the time we have today


Commits
-------

8b51e308ef switch timeframe on admin dashboard
2020-06-12 09:20:32 +02:00
Łukasz Chruściel
425c8831ef
[Minor][Behat] Typo fix 2020-06-12 08:19:05 +02:00
Grzegorz Sadowski
3540123e09
feature #11548 [Api][Cart] Clear cart (Tomanhez)
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
| 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
-------

2659e0964c Add cart transformer
47486c3e72 Add tests
72f0b647de Add QueryItemExtension
d4df414cbc Add customer to pickup cart when shop user is logged
7e2a326dd8 Fix tests
2020-06-12 08:13:40 +02:00
mamazu
0df50ab725 Fixing the tests 2020-06-11 20:26:21 +02:00
mamazu
a5e37128b7 Update src/Sylius/Behat/Context/Ui/Admin/ManagingProductVariantsContext.php
Co-authored-by: Łukasz Chruściel <lchrusciel@gmail.com>
2020-06-11 20:26:21 +02:00
mamazu
fc34aca7ce Adding a transformer for channels 2020-06-11 20:26:21 +02:00
mamazu
4de3ba117d Adding label back in to fix behat tests 2020-06-11 20:26:21 +02:00
mamazu
80661a5771 Fixing tests 2020-06-11 20:26:21 +02:00
mamazu
d4511ea2de Extracting channel_pricings out to its own template 2020-06-11 20:26:21 +02:00
mamazu
79a5074dd5 Using tabs for channel pricing 2020-06-11 20:26:21 +02:00
Olivier ALLAIN
4577202ad0 change sylius.security.shop_regex in doc for new api 2020-06-11 09:24:02 +02:00
Kamil Kokot
86fdef2b89
Synchronise packages composer.json files with the main one + normalize them 2020-06-10 17:17:54 +02:00
Mateusz Zalewski
1d09e38a25
Add test and simplify implementation 2020-06-10 15:30:01 +02:00
arti0090
8b51e308ef switch timeframe on admin dashboard 2020-06-10 13:21:12 +02:00
Kamil Kokot
c27fe6df9b
minor #11561 [Travis] Update config on 1.7 with master (Tomanhez)
This PR was merged into the 1.8-dev branch.

Discussion
----------

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

Update from : https://github.com/Sylius/Sylius/pull/11560




Commits
-------

47e412c4b2 Disable gpu
2020-06-10 12:29:05 +02:00
Octav
0d973b60ac Merge remote-tracking branch 'upstream/1.7' into patch-1 2020-06-10 12:22:12 +03:00
Tomanhez
7e2a326dd8 Fix tests 2020-06-10 10:40:28 +02:00
Tomanhez
d4df414cbc Add customer to pickup cart when shop user is logged 2020-06-10 10:27:02 +02:00
Tomanhez
72f0b647de Add QueryItemExtension 2020-06-10 10:27:02 +02:00
Tomanhez
47486c3e72 Add tests 2020-06-10 10:27:00 +02:00
Tomanhez
2659e0964c Add cart transformer 2020-06-10 10:26:02 +02:00
Łukasz Chruściel
fd01be59eb
feature #11517 [Api] Add test for checking access (Tomanhez)
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
| License         | MIT

Api paths:

- [x] GET `/new-api/shipping-methods`
- [x] POST `/new-api/shipping-methods`
- [x] GET `/new-api/shipping-methods/{id}`
- [x] PUT `/new-api/shipping-methods/{id}`
- [x] DELETE `/new-api/shipping-methods/{id}`
- [x] PATCH `/new-api/shipping-methods/{id}/archive`
- [x] PATH `/new-api/shipping-methods/{id}/restore`

Commits
-------

9e04dc83c8 Modify ResponseChecker and ApiPlartformCilent
ab17f34d21 Add tests
d5372e087c Add new step for creating shipping method
2020-06-10 08:45:10 +02:00
Łukasz Chruściel
f252124173
feature #11563 [AdminApi] Add ShippingMethod authorization test (Tomanhez)
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
| License         | MIT

AdminApi paths:

- [x] GET `/api/v{version}/shipping-methods/{id}`


Commits
-------

2a2c022d91 Add authorization test
2020-06-10 08:42:55 +02:00
Tomanhez
2a2c022d91 Add authorization test 2020-06-10 07:34:31 +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
Tomanhez
9e04dc83c8 Modify ResponseChecker and ApiPlartformCilent 2020-06-09 15:03:16 +02:00
Tomanhez
47e412c4b2 Disable gpu 2020-06-09 14:36:45 +02:00
Łukasz Chruściel
e18f1b820e
bug #11560 [HOTFIX] Fix build (Tomanhez)
This PR was merged into the 1.7-dev branch.

Discussion
----------

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

Fix build and improve `getError()` more usable 


Commits
-------

392982c6fc Add fix for getError() metchod
c659707a30 modify chrome travis run command
2020-06-09 14:13:54 +02:00
Tomanhez
c659707a30 modify chrome travis run command 2020-06-09 13:33:19 +02:00
Tomanhez
392982c6fc Add fix for getError() metchod 2020-06-09 12:18:05 +02:00
Łukasz Chruściel
755cc962d9
Merge branch '1.7'
* 1.7:
  Behat for reordering taxon feature
2020-06-09 09:11:10 +02:00
Łukasz Chruściel
23f3828dfc
bug #11549 Behat for reordering taxon feature ()
This PR was merged into the 1.7 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | 
| 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
-------

eb54c52702 Behat for reordering taxon feature
2020-06-09 09:10:04 +02:00
titomtd
eb54c52702 Behat for reordering taxon feature 2020-06-08 13:42:19 +02:00
Grzegorz Sadowski
016e8d506e
Resolve conlict during upmerging 2020-06-08 11:46:26 +02:00
Grzegorz Sadowski
44f8e60503
bug #11553 Fix Psalm errors (Tomanhez)
This PR was merged into the 1.7 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| 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
-------

6302ef131a Add ignore files to psalm
2020-06-08 11:43:46 +02:00
Tomanhez
6302ef131a Add ignore files to psalm 2020-06-08 10:49:00 +02:00
Mateusz Zalewski
99da07c20e
Add priority to payment gateway 2020-06-03 16:36:57 +02:00
Łukasz Chruściel
43a6852e74
minor #11543 [Travis] Fix deprecations in the config (pamil)
This PR was merged into the 1.8-dev branch.

Discussion
----------

<img width="1014" alt="CleanShot 2020-06-02 at 16 47 33@2x" src="https://user-images.githubusercontent.com/1897953/83534498-3286f380-a4f1-11ea-962f-c973933069f2.png">


Commits
-------

1b5d68188c [Travis] Fix deprecations in the config
2020-06-03 11:35:21 +02:00
Kamil Kokot
a6bc34e102
Change application's version to v1.7.6-DEV 2020-06-02 17:02:39 +02:00
Kamil Kokot
a52f76e0da
Generate changelog for v1.7.5 2020-06-02 17:02:04 +02:00
Kamil Kokot
865aeed0b2
Change application's version to v1.7.5 2020-06-02 17:00:17 +02:00
Kamil Kokot
1b5d68188c
[Travis] Fix deprecations in the config 2020-06-02 16:47:30 +02:00
Łukasz Chruściel
356c3db238
bug #11541 fixed url to send valid key for channel ()
This PR was merged into the 1.7-dev branch.

Discussion
----------

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



Commits
-------

534762ca35 fixed name to channelCode since we are sending code
2020-06-02 16:19:05 +02:00
SirDomin
534762ca35 fixed name to channelCode since we are sending code 2020-06-02 14:49:49 +02:00
Łukasz Chruściel
f8b1f49800
Merge branch '1.7'
* 1.7:
  [Maintenance] Add conflict to the 4.4.9 version of symfony/form
  Update order processor documentation
2020-06-02 14:29:25 +02:00