Commit graph

21580 commits

Author SHA1 Message Date
Olivier ALLAIN
3ddbcbf90b
browsing zone 2020-05-11 12:41:46 +02:00
Olivier ALLAIN
6a8324bd0e
adding zone 2020-05-11 12:41:46 +02:00
Grzegorz Sadowski
4113a0bf26
Merge branch '1.7'
* 1.7:
  [Composer] Add conflict to doctrine/inflector ^1.4 to fix taxons
2020-05-11 08:52:21 +02:00
Łukasz Chruściel
cedaccff80
bug #11441 [Composer] Add conflict to doctrine/inflector ^1.4 to fix taxons (GSadee)
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 #11440
| License         | MIT


Commits
-------

7da61c9361 [Composer] Add conflict to doctrine/inflector ^1.4 to fix taxons
2020-05-11 08:47:54 +02:00
Grzegorz Sadowski
7da61c9361
[Composer] Add conflict to doctrine/inflector ^1.4 to fix taxons 2020-05-11 08:16:33 +02:00
Łukasz Chruściel
9c19440886
bug #11434 Revert "[Backend] Feeding sales statistics graph with date from chosen period" (lchrusciel)
This PR was merged into the 1.8-dev branch.

Discussion
----------

The previous implementation coupled us with MySQL, which is not an option. Next iteration over the feature should fix existing problems without generating new ones. 

Commits
-------

25e93dc1b3 Revert "[Backend] Feeding sales statistics graph with date from chosen period"
2020-05-08 13:26:22 +02:00
Łukasz Chruściel
25e93dc1b3
Revert "[Backend] Feeding sales statistics graph with date from chosen period" 2020-05-08 12:39:41 +02:00
Łukasz Chruściel
7c44c6182a
feature #10749 Promotion fixture coupons (JakobTolkemit, lchrusciel, Zales0123)
This PR was merged into the 1.7-dev branch.

Discussion
----------

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

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

This adds the possibility to define coupons in promotion fixtures.

```yaml
...
 promotion:
   options:
     custom:
       test:
         name: 'Test'
         coupon_based: true
         coupons:
           - code: 'abc'

           - code: 'abcde'
             expires_at: 'tomorrow'
             usage_limit: 10
             per_customer_usage_limit: 1
             reusable_from_cancelled_orders: true
```

Commits
-------

06d9ff40f8 Added coupons to promotion fixture
ae59d656ac Extracted coupon normalization to private method
ed18fc0605 Applied suggested changes
8885092d0c [Config] Generate coupons for promotion
d998c4fa8e [Config] Generate christmas coupons for promotion
687122a1f9 Fix deprecation message + cs
2020-05-07 22:53:39 +02:00
Mateusz Zalewski
687122a1f9
Fix deprecation message + cs 2020-05-07 20:15:07 +02:00
Łukasz Chruściel
d998c4fa8e
[Config] Generate christmas coupons for promotion 2020-05-07 16:53:10 +02:00
Łukasz Chruściel
8885092d0c
[Config] Generate coupons for promotion 2020-05-07 16:34:46 +02:00
Mateusz Zalewski
1c97d2d6a3
Merge branch '1.7'
* 1.7:
  Fix all Psalm errors
  fixed wrapping of tabs in product attribute section
2020-05-07 15:41:12 +02:00
Mateusz Zalewski
53dd173adb
bug #11430 Fix all Psalm errors (pamil)
This PR was merged into the 1.7 branch.

Discussion
----------



Commits
-------

fbf775d260 Fix all Psalm errors
2020-05-07 15:20:48 +02:00
Kamil Kokot
8c37fb6ec1
bug #11425 [UI] Add tabs wrapping on Product show page > Attributes section ()
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 | 
| License         | MIT

before:
![image](https://user-images.githubusercontent.com/22825722/81191067-dfd11f00-8fb8-11ea-9db4-e3655cb2d4b7.png)

fixed: 
![image](https://user-images.githubusercontent.com/22825722/81190425-1e1a0e80-8fb8-11ea-975b-0a8472debccd.png)



Commits
-------

540d2b6fe2 fixed wrapping of tabs in product attribute section
2020-05-07 14:50:37 +02:00
Kamil Kokot
fbf775d260
Fix all Psalm errors 2020-05-07 14:46:51 +02:00
Łukasz Chruściel
760a4b469d
refactor #11401 [Backend] Feeding sales statistics graph with date from chosen period (AdamKasp)
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?   | #11371 
| 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
-------

0c5c9988f3 First iteration over tests statistics
c67677306a upgrade statistics provider
b526ef85f1 Improve alice fixtures and fix tests
092c6f9594 replace sql with DQL in statistic provider
d2afea71bc Add Interval Converter
2020-05-07 12:58:22 +02:00
SirDomin
540d2b6fe2 fixed wrapping of tabs in product attribute section 2020-05-07 09:49:53 +02:00
Adam Kasperczak
d2afea71bc Add Interval Converter 2020-05-07 09:16:38 +02:00
Grzegorz Sadowski
87cb3b6682
Merge branch '1.7'
* 1.7:
  [Maintenance] Upgrade psalm version
2020-05-07 08:03:13 +02:00
Grzegorz Sadowski
95d56fcac0
bug #11427 [Maintenance] Upgrade psalm version (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 | 
| License         | MIT

Should resolve:
```bash
PHP Fatal error:  Uncaught Psalm\Exception\TypeParseTreeException: Unterminated bracket in /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Type/ParseTree.php:571
Stack trace:
#0 /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Type.php(171): Psalm\Internal\Type\ParseTree::createFromTokens(Array)
#1 /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Visitor/ReflectorVisitor.php(2668): Psalm\Type::parseTokens(Array)
#2 /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Visitor/ReflectorVisitor.php(2207): Psalm\Internal\Visitor\ReflectorVisitor->getAssertionParts('array<array-key...', Object(PhpParser\Node\Stmt\Function_))
#3 /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Visitor/ReflectorVisitor.php(323): Psalm\Internal\Visitor\ReflectorVisitor->registerFunctionLike(Object(PhpParser\Node\Stmt\Function_))
#4 /home/travis/build/Sylius/Sylius/vendor/nikic/php-parser/lib/PhpParser/NodeTraverser.php(200): Psalm\Internal\Visitor\Reflect in /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Type/ParseTree.php on line 571
Fatal error: Uncaught Psalm\Exception\TypeParseTreeException: Unterminated bracket in /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Type/ParseTree.php:571
Stack trace:
#0 /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Type.php(171): Psalm\Internal\Type\ParseTree::createFromTokens(Array)
#1 /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Visitor/ReflectorVisitor.php(2668): Psalm\Type::parseTokens(Array)
#2 /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Visitor/ReflectorVisitor.php(2207): Psalm\Internal\Visitor\ReflectorVisitor->getAssertionParts('array<array-key...', Object(PhpParser\Node\Stmt\Function_))
#3 /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Visitor/ReflectorVisitor.php(323): Psalm\Internal\Visitor\ReflectorVisitor->registerFunctionLike(Object(PhpParser\Node\Stmt\Function_))
#4 /home/travis/build/Sylius/Sylius/vendor/nikic/php-parser/lib/PhpParser/NodeTraverser.php(200): Psalm\Internal\Visitor\Reflect in /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Type/ParseTree.php on line 571
```

Ref. https://travis-ci.org/github/Sylius/Sylius/jobs/682877325
Ref. https://github.com/amphp/amp/issues/314

<!--
 - 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
-------

f6819a26e2 [Maintenance] Upgrade psalm version
2020-05-07 08:02:43 +02:00
Łukasz Chruściel
f6819a26e2
[Maintenance] Upgrade psalm version 2020-05-06 20:40:09 +02:00
Adam Kasperczak
092c6f9594 replace sql with DQL in statistic provider 2020-05-06 14:40:07 +02:00
Łukasz Chruściel
719f0321af
refactor #11394 [ChannelBundle] Fix channel context interface alias (vvasiloi)
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

Currently `Sylius\Component\Channel\Context\ChannelContextInterface` is aliased to `sylius.context.channel.composite`, instead of `sylius.contex.channel`, so the `sylius.context.channel.cached` is not used and it can result in a lot of extra database queries in applications that mainly use autowiring for service arguments.
It also doesn't make use of any custom application decorations of `sylius.context.channel`.

Commits
-------

8a05848185 alias Sylius\Component\Channel\Context\ChannelContextInterface to sylius.context.channel instead of sylius.context.channel.composite
761979d8c0 add note to UPGRADE.md
a859585949 Merge branch 'master' into fix-channel-context-alias
2020-05-05 15:48:05 +02:00
Victor Vasiloi
a859585949
Merge branch 'master' into fix-channel-context-alias 2020-05-05 14:27:43 +03:00
Łukasz Chruściel
0e9d41dd7b
style #11420 Fix UI in Product's inventory tab (jacquesbh)
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

From:
![image](https://user-images.githubusercontent.com/858611/81007979-6b7c6b80-8e52-11ea-9c84-dc0569fe59bd.png)

To: (like other tabs in the product's form)
![image](https://user-images.githubusercontent.com/858611/81008046-8cdd5780-8e52-11ea-8d8f-35bf667807e9.png)

Commits
-------

0f3563cb1d Fix UI in Product's inventory tab
2020-05-05 13:12:07 +02:00
Łukasz Chruściel
d78d21ea61
feature #11278 [API] add country (oallain)
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 | partially #11250 
| License         | MIT

Cover :

- [x] adding_country.feature
- [x] adding_country_with_provinces.feature
- [x] country_unique_code_validation.feature
- [x] editing_country.feature
- [x] managing_provinces_of_country.feature
- [x] province_unique_code_validation.feature
- [x] province_validation.feature

Commits
-------

45cf126d65 add country to Api Platform
92efb5eb35 adding country with provinces
97afba952c managing provinces of country
96b5d6a62c province unique code validation
7f8ee6bbd8 add routes prefix
df548bbc1e fix province name for UI behat
317232d116 province validation
e8577b44a0 merge some behat tests
afbe436554 refactor after code review
09c8665469 rebase and update after merge #11397
7a91353fcc use transformer of behat
2020-05-05 10:30:25 +02:00
Mateusz Zalewski
a9e355bad7
refactor #11347 [RFC][DX] Open consts holder classes (lchrusciel)
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

Final classes, which holds consts has been changed to interfaces. Therefore, still, no one is able to initialize them, while we are open to multi inheritance.  This should remove the problem of adding new values to them in plugins and end applications.  
<!--
 - 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
-------

69db13582b [DX] Open consts holder classes
2020-05-05 10:25:12 +02:00
Olivier ALLAIN
7a91353fcc use transformer of behat 2020-05-05 09:09:03 +02:00
Jacques Bodin-Hullin
0f3563cb1d
Fix UI in Product's inventory tab 2020-05-04 21:57:59 +02:00
Mateusz Zalewski
506d9b7d05
minor #11419 [Maintenance] Update release cycle (lchrusciel)
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

<!--
 - 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
-------

07232182a4 [Maintenance] Update release cycle
2020-05-04 14:59:55 +02:00
Łukasz Chruściel
07232182a4
[Maintenance] Update release cycle 2020-05-04 14:44:07 +02:00
Łukasz Chruściel
479393cb4f
feature #11407 [API][Shipment] Add implementation and test for shipment show (Tomanhez, Zales0123)
This PR was merged into the 1.7-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
-------

9e1cc286da Add implementation for tests
1d9ebeea67 Add fixes for tests
f2c16b2297 Expose OrderItemUnits as ShipmentUnits in API
12e7f2d983 Check shipment units products by IRIs
c1b3243eec Extract client for "by IRI" showing
2020-05-04 14:04:51 +02:00
Łukasz Chruściel
62da61246b
Merge branch '1.7'
* 1.7:
  Typo in code block in documentation
2020-05-04 13:42:14 +02:00
Łukasz Chruściel
32a7fda428
style #11413 Add a filter icon for filters in admin grids (jacquesbh)
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 |
| License         | MIT

Because it's nicer!

![image](https://user-images.githubusercontent.com/858611/80808993-12e26f80-8bc1-11ea-8285-927d140a1840.png)


Commits
-------

02a80766bc Add a filter icon for filters in admin grids
2020-05-04 13:41:58 +02:00
Łukasz Chruściel
26c776a927
minor #11409 Typo in code block in documentation (jacquesbh)
This PR was merged into the 1.7 branch.

Discussion
----------

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

SImple typo in documentation. The last `"` shouldn't be here.

Commits
-------

4c7c462e2a Typo in code block in documentation
2020-05-04 13:15:37 +02:00
Jacques Bodin-Hullin
4c7c462e2a
Typo in code block in documentation 2020-05-04 12:54:53 +02:00
Jacques Bodin-Hullin
02a80766bc
Add a filter icon for filters in admin grids
Because it's nicer!
2020-05-01 15:32:08 +02:00
Olivier ALLAIN
09c8665469 rebase and update after merge #11397 2020-04-30 21:29:26 +02:00
Olivier ALLAIN
afbe436554 refactor after code review 2020-04-30 13:38:26 +02:00
Olivier ALLAIN
e8577b44a0 merge some behat tests 2020-04-30 13:38:26 +02:00
Olivier ALLAIN
317232d116 province validation 2020-04-30 13:38:26 +02:00
Olivier ALLAIN
df548bbc1e fix province name for UI behat 2020-04-30 13:38:25 +02:00
Olivier ALLAIN
7f8ee6bbd8 add routes prefix 2020-04-30 13:38:25 +02:00
Olivier ALLAIN
96b5d6a62c province unique code validation 2020-04-30 13:38:25 +02:00
Olivier ALLAIN
97afba952c managing provinces of country 2020-04-30 13:38:25 +02:00
Olivier ALLAIN
92efb5eb35 adding country with provinces 2020-04-30 13:38:25 +02:00
Olivier ALLAIN
45cf126d65 add country to Api Platform 2020-04-30 13:38:25 +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
Mateusz Zalewski
f2c16b2297
Expose OrderItemUnits as ShipmentUnits in API 2020-04-30 12:27:43 +02:00