Commit graph

21989 commits

Author SHA1 Message Date
Kamil Kokot
ab95047d3c
Apply coding standard fixes 2020-06-24 14:18:24 +02:00
Kamil Kokot
4d8dae96bc
Merge branch '1.7'
* 1.7:
  Remove inheritdoc directives
  Apply coding standard fixes
  Upgrade yarn.lock
  [Docs] fix sylius plus deployment
  Update github PR template
  Sylius 1.4 end of security support
  [Fix] Less strict symfony form conflict
  [Translations] Updated translations from Crowdin
  Changed descriptions and added italic font
  change lorem ipsum description and fix carousel header
2020-06-24 14:16:07 +02:00
Kamil Kokot
f3094fef54
Remove inheritdoc directives 2020-06-24 14:11:14 +02:00
Kamil Kokot
2b7dfdd534
Apply coding standard fixes 2020-06-24 14:07:48 +02:00
Kamil Kokot
f7ca135ff2
Upgrade yarn.lock 2020-06-24 14:00:43 +02:00
Łukasz Chruściel
130afb5cc8
minor #11593 Upgrade static analysis tools and improve their usage (pamil)
This PR was merged into the 1.7-dev branch.

Discussion
----------



Commits
-------

5973709e62 Upgrade static analysis tools and improve their usage
2020-06-18 19:23:53 +02:00
Kamil Kokot
11672f575e
minor #11507 Synchronise packages composer.json files with the main one + normalize them (pamil)
This PR was merged into the 1.8-dev branch.

Discussion
----------

Related to #11500. Used https://github.com/ergebnis/composer-normalize to normalize composer.json files.

Commits
-------

86fdef2b89 Synchronise packages composer.json files with the main one + normalize them
2020-06-18 17:56:19 +02:00
Kamil Kokot
5973709e62
Upgrade static analysis tools and improve their usage 2020-06-18 17:42:57 +02:00
Łukasz Chruściel
b6e94eb041
bug #11522 [Homepage] Change lorem ipsum description and fix carousel header (arti0090)
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
| Related tickets | fixes #11238
| License         | MIT


Commits
-------

ec81472a11 change lorem ipsum description and fix carousel header
e452f32c8b Changed descriptions and added italic font
2020-06-18 13:23:20 +02:00
Łukasz Chruściel
54e8b507c4
bug #11589 [Docs] fix sylius plus deployment (AdamKasp)
This PR was merged into the 1.7 branch.

Discussion
----------

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


Commits
-------

8a2f1fd258 [Docs] fix sylius plus deployment
2020-06-18 13:21:27 +02:00
Adam Kasperczak
8a2f1fd258 [Docs] fix sylius plus deployment 2020-06-17 14:55:59 +02:00
Łukasz Chruściel
e492894313
feature #11571 [Admin] Make sidebar menu searchable (Florian-Merle)
This PR was merged into the 1.8-dev branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master <!-- see the comment below -->
| Bug fix?        | no
| New feature?    |yes
| BC breaks?      | yes
| Deprecations?   | no<!-- don't forget to update the UPGRADE-*.md file -->
| 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
-->

Adds a dynamic search input for the admin sidebar menu

![Kapture 2020-06-13 at 15 47 03](https://user-images.githubusercontent.com/20768914/84570356-54a03180-ad8d-11ea-910d-24e8073d4629.gif)


Commits
-------

501e670866 [Admin] Make sidebar menu searchable
2020-06-17 12:24:40 +02:00
Kamil Kokot
a920b0f5fb
minor #11577 [AUTO] Updated translations from Crowdin (master) (Sylius Bot)
This PR was merged into the 1.7-dev branch.

Discussion
----------



Commits
-------

ce2188e601 [Translations] Updated translations from Crowdin
2020-06-17 11:07:51 +02:00
Kamil Kokot
5e154afc64
minor #11576 [AUTO] Updated translations from Crowdin (1.7) (Sylius Bot)
This PR was merged into the 1.7 branch.

Discussion
----------



Commits
-------

c57afae514 [Translations] Updated translations from Crowdin
2020-06-17 11:07:27 +02:00
Kamil Kokot
52f2246748
minor #11582 [Maintenance] Update github PR template (oallain)
This PR was merged into the 1.7 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master 
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no <!-- don't forget to update the UPGRADE-*.md file -->
| Related tickets | 
| License         | MIT

Sylius 1.6 is "End of maintenance" since Apr 29, 2020, so we can update this template.

WDYT ?

Commits
-------

b5d473f0bd Update github PR template
2020-06-17 11:03:38 +02:00
Olivier ALLAIN
b5d473f0bd
Update github PR template 2020-06-17 11:02:02 +02:00
Florian Merle
501e670866 [Admin] Make sidebar menu searchable 2020-06-16 18:52:48 +02:00
Grzegorz Sadowski
9d463dc94b
bug #11586 fix left navigation arrow double click on admin statistics (arti0090)
This PR was merged into the 1.8-dev branch.

Discussion
----------

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


Commits
-------

304256e462 fix left nav arrow double click
2020-06-16 12:41:22 +02:00
arti0090
304256e462 fix left nav arrow double click 2020-06-16 12:00:06 +02:00
Łukasz Chruściel
929a23588d
feature #11529 [RFC] Using tabs for channel pricing (mamazu)
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

## Proposal
Channel prices in a simple product get displayed on the product page under the list of channels. So I propose that they will be made into a tabbed view so that they are more easy to manage. If you have a lot of channels (where the product is not active for example) you have a lot of values to scroll through.

### Before
![screenshot_before](https://user-images.githubusercontent.com/14860264/83183765-afe4e980-a128-11ea-9f98-705d2650572c.png)

### After
![screenshot_after](https://user-images.githubusercontent.com/14860264/83183770-b1161680-a128-11ea-948b-0f9ee5475d9f.png)


Commits
-------

79a5074dd5 Using tabs for channel pricing
d4511ea2de Extracting channel_pricings out to its own template
80661a5771 Fixing tests
4de3ba117d Adding label back in to fix behat tests
fc34aca7ce Adding a transformer for channels
a5e37128b7 Update src/Sylius/Behat/Context/Ui/Admin/ManagingProductVariantsContext.php
0df50ab725 Fixing the tests
2020-06-16 10:34:32 +02:00
Łukasz Chruściel
742ba5fab5
feature #11566 Limit dashboard move on future dates (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 (1)](https://user-images.githubusercontent.com/35863747/84507054-8b5c4600-acc0-11ea-8ace-0a0609dd033d.gif)


Commits
-------

a44e74d1ac Block move of dashboard to dates greater then today
c99066077c Limit dashboard move out of today date.
d1cf5c4dd3 fix `if` statement for date-object-factory
2020-06-16 10:28:55 +02:00
Kamil Kokot
cc56808ffc
minor #11584 [Fix] Less strict symfony form conflict (lchrusciel)
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
| Related tickets | fixes https://github.com/Sylius/Sylius/pull/11578/files#r440238589
| 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
-------

ced5416777 [Fix] Less strict symfony form conflict
2020-06-16 09:59:40 +02:00
Kamil Kokot
da41929022
minor #11581 [Doc] Sylius 1.4 end of security support (oallain)
This PR was merged into the 1.7 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master <!-- see the comment below -->
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | 
| License         | MIT

The date of `End of life` is passed so, i think we need to update documentaion.

Commits
-------

0bcf00158d Sylius 1.4 end of security support
2020-06-16 09:57:07 +02:00
Olivier ALLAIN
0bcf00158d
Sylius 1.4 end of security support 2020-06-16 09:48:13 +02:00
arti0090
d1cf5c4dd3 fix if statement for date-object-factory 2020-06-16 09:08:23 +02:00
arti0090
c99066077c Limit dashboard move out of today date.
Refactor of previous changes
2020-06-16 09:06:42 +02:00
arti0090
a44e74d1ac Block move of dashboard to dates greater then today 2020-06-16 09:06:42 +02:00
Łukasz Chruściel
ced5416777
[Fix] Less strict symfony form conflict 2020-06-16 08:48:28 +02:00
Łukasz Chruściel
450ddd15f0
Merge branch '1.7'
* 1.7:
  Add symfony/form conflict
  Add Sylius template events
2020-06-16 08:44:56 +02:00
Łukasz Chruściel
24960354c4
bug #11578 [HotFix]Add symfony/form conflict (Tomanhez)
This PR was merged into the 1.7 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master
| 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
-------

4783b51b95 Add symfony/form conflict
2020-06-16 08:39:18 +02:00
Tomanhez
4783b51b95
Add symfony/form conflict 2020-06-16 07:19:27 +02:00
Sylius Bot
ce2188e601 [Translations] Updated translations from Crowdin 2020-06-15 12:26:07 +00:00
Sylius Bot
c57afae514 [Translations] Updated translations from Crowdin 2020-06-15 12:24:06 +00:00
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