Commit graph

14806 commits

Author SHA1 Message Date
Jacques Bodin-Hullin
c0457468b7
Filter the orders grid on shipping method 2020-06-25 22:27:26 +02:00
Tomanhez
2ec88b71d1 Fix minor word bug 2020-06-25 12:33:44 +02:00
Kamil Kokot
aa75c6b1c7
Remove inheritdoc directives 2020-06-24 14:18:57 +02:00
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
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
Ł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
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
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
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
450ddd15f0
Merge branch '1.7'
* 1.7:
  Add symfony/form conflict
  Add Sylius template events
2020-06-16 08:44:56 +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
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
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
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
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
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
Ł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
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
titomtd
eb54c52702 Behat for reordering taxon feature 2020-06-08 13:42:19 +02:00
Mateusz Zalewski
99da07c20e
Add priority to payment gateway 2020-06-03 16:36:57 +02:00
Kamil Kokot
a6bc34e102
Change application's version to v1.7.6-DEV 2020-06-02 17:02:39 +02:00
Kamil Kokot
865aeed0b2
Change application's version to v1.7.5 2020-06-02 17:00:17 +02:00
SirDomin
534762ca35 fixed name to channelCode since we are sending code 2020-06-02 14:49:49 +02:00