Commit graph

21998 commits

Author SHA1 Message Date
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
Łukasz Chruściel
e6bafd03be
bug #11542 [Maintenance] Add conflict to the 4.4.9 version of symfony/form (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 | associated with https://github.com/symfony/symfony/issues/37027
| License         | MIT


Commits
-------

a38c470ea1 [Maintenance] Add conflict to the 4.4.9 version of symfony/form
2020-06-02 11:23:07 +02:00
Grzegorz Sadowski
a38c470ea1
[Maintenance] Add conflict to the 4.4.9 version of symfony/form 2020-06-02 09:40:11 +02:00
Kamil Kokot
7901f9a3c6
feature #11535 Resolve awaiting_payment state in resolver (kayue)
This PR was merged into the 1.8-dev branch.

Discussion
----------

OrderPaymentStateResolver should resolve awaiting_payment state when there is payment under processing. This is needed to handle asynchronous payment confirmation.

> For asynchronous payment methods, it can take up to several days to confirm whether the payment has been successful. During this time, the payment cannot be guaranteed. The status of the payment’s Charge object is initially set to pending, until the payment has been confirmed as successful or failed. ACH debits are an example of an asynchronous method: with these debits, it takes a few days to confirm that the payment has succeeded.

https://stripe.com/docs/sources#synchronous-or-asynchronous-confirmation

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


Commits
-------

1bc64d93d8 Resolve awaiting_payment state in resolver
b524ec8275 Add spec test
2020-06-01 17:40:00 +02:00
Kamil Kokot
831cab3e2c
feature #11536 [UI] add form helper (oallain)
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 | fixes #10466
| License         | MIT

I suggest adding support for form helpers.

**By adding a helper in a back office form**

```php
->add('plainPassword', PasswordType::class, [
    'label' => 'sylius.form.user.password.label',
    'help' => 'sylius.form.user.password.help',
])
```
Look like (Without any other changes, css, ...)
![image](https://user-images.githubusercontent.com/6593252/83339372-74cfeb00-a2cd-11ea-9ba5-ea9fb7a2bda4.png)

**By adding a helper in a front office form**

```php
->add('newPassword', RepeatedType::class, [
    'type' => PasswordType::class,
    'first_options' => [
        'label' => 'sylius.form.user_change_password.new',
        'help' => 'sylius.form.user_change_password.help',
    ],
    'second_options' => ['label' => 'sylius.form.user_change_password.confirmation'],
    'invalid_message' => 'sylius.user.plainPassword.mismatch',
])
```

Look like (Without any other changes, css, ...)
![image](https://user-images.githubusercontent.com/6593252/83339413-d2643780-a2cd-11ea-8578-a9e29c257b86.png)

WDYT ?

Commits
-------

a357f86796 add form helper
2020-06-01 17:36:20 +02:00
Kamil Kokot
8263e7fb00
minor #11540 [Docs] Update order processor documentation (arti0090)
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 | fixes #9924
| License         | MIT

Commits
-------

85389791aa Update order processor documentation
2020-06-01 17:35:11 +02:00
arti0090
85389791aa Update order processor documentation 2020-06-01 08:41:17 +02:00
Olivier ALLAIN
a357f86796 add form helper 2020-05-30 23:20:49 +02:00
Ka Yue Yeung
b524ec8275 Add spec test 2020-05-30 10:56:01 +08:00