Commit graph

835 commits

Author SHA1 Message Date
Grzegorz Sadowski
d6357ed4ab
Resolve upmerge conflict 2020-09-17 20:47:30 +02:00
Adam Kasperczak
8eedea1193 [Product] Adding product/variant without price 2020-09-17 14:36:52 +02:00
Adam Kasperczak
13ffd07da3 [Product] deleteing only price from obsolete channel 2020-09-16 12:59:29 +02:00
Joachim Løvgaard
27fb698c56 added main files for shipping method rules
Added two more rules

Adding back removed inheritdoc from other bundle

Fixed xml error and other optimizations

Readd inheritdoc

Fixed correct iteration of tagged services

renamed total form subscriber

Fixed another xml error

Fixed BC compat with SF3.4

Moved two rules to core since they depend on a core interface

Fixing build

Added docs

Moved services to correct service file

Changed constraint from numeric to integer

Renamed TotalType to AmountType

Added Behat scenarios

Updated Behat tests

fixed a few review comments

rebased

Fixed wrong xml formatting

Fixed more review comments

Added step to check for rule appendance

Fixing some build errors

Fixed psalm errors

Move shipping methods below inventory
2020-08-17 08:46:11 +02:00
Łukasz Chruściel
ca417351a6
Merge branch '1.7'
* 1.7:
  [Maintenance] Conflict failed spec version
  Use query builder in migration
  Add missing images in entry.js
2020-07-10 12:01:10 +02:00
Jacques Bodin-Hullin
81dd021190
Use query builder in migration
fixes #11592
2020-07-10 10:49:45 +02:00
Luca Gallinari
acb183aa2d Enable all taxons upon migration 2020-07-06 11:25:20 +02:00
Manuele Menozzi
19e7e26ee2 Add toggleable to taxon and first behat scenario 2020-07-06 11:25:20 +02:00
Manuele Menozzi
7f3c21007e Add statement to toggleable variant migration to enable existing 2020-05-13 14:25:54 +02:00
Manuele Menozzi
3d91820353 Revert "Add default value to variant enabled column migration"
This reverts commit 540031efb23dae1207254b9beb5989e5c0810dcb.
2020-05-13 14:25:54 +02:00
Manuele Menozzi
35bfe8c934 Add default value to variant enabled column migration 2020-05-13 14:25:53 +02:00
Manuele Menozzi
ee4231efb0 Add enabled flag on product variant migration 2020-05-13 14:24:10 +02:00
Adam Kasperczak
d36d4a4b60
Add shippedAt date on shipment 2020-02-11 09:21:28 +01:00
Łukasz Chruściel
e8145f02b9
feature #11055 Define countries for a channel (pamil)
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
| Related tickets | fixes #9122 
| License         | MIT

Currently used only in checkout addressing to limit the list of countries. If not defined, fallbacks to the previous behaviour - all enabled countries.

<img width="672" alt="Screenshot 2020-01-22 at 20 10 51" src="https://user-images.githubusercontent.com/1897953/72925676-65ef8f80-3d53-11ea-831c-25fad0973a83.png">



Commits
-------

2e68737703 Define countries for a channel
2020-01-23 13:22:17 +01:00
Kamil Kokot
2e68737703
Define countries for a channel 2020-01-23 10:03:42 +01:00
Łukasz Chruściel
e9ec260d2d
[Admin][Channel] Revert #10860 2020-01-22 16:14:14 +01:00
Mateusz Zalewski
cdfcb85e5c
[API] Expose menu taxon in Channel Admin API 2020-01-12 23:35:37 +01:00
Mateusz Zalewski
9b86215312
[Core] Add menu taxon to Channel entity 2020-01-12 23:30:27 +01:00
Adam Kasperczak
e87e4575f0
Add channel's form and fixes 2019-11-19 18:11:34 +01:00
Adam Kasperczak
d8e9e29258
Add type in channel entity and improve contexts 2019-11-19 17:52:35 +01:00
Kamil Kokot
02809f6627
minor #10666 Test doctrine migrations up & down (loic425)
This PR was merged into the 1.6-dev branch.

Discussion
----------

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

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

In CI, we test migration up during installation, but we never test down migrations.
This new Travis test checks doctrine migration up & down.

Commits
-------

d72c1c4cd8 Test doctrine migrations up & down
2019-09-26 13:45:06 +02:00
Loïc Frémont
d72c1c4cd8 Test doctrine migrations up & down 2019-09-10 11:36:04 +02:00
Tomanhez
5c65893bea
Add migration 2019-06-14 13:40:07 +02:00
Grzegorz Sadowski
b7409c2b03
[PromotionCoupon] Add reusable from cancelled orders flag to coupon entity 2019-04-19 12:12:01 +02:00
Mateusz Zalewski
d669c0613b
Fix AbstractMigration use statement 2019-02-08 15:26:16 +01:00
Kamil Kokot
53f150fc21
feature #10149 Add index on order.cart + order.updated_at for faster expired cart removal selection (stefandoorn)
This PR was merged into the 1.5-dev branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.2
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | partially #10148 
| License         | MIT

Makes selection of expired carts way more efficient. Especially helpful in growing projects.

Before:

![image](https://user-images.githubusercontent.com/4903082/52199892-a4045280-2867-11e9-9a09-0fc89bf48c84.png)

After:

![image](https://user-images.githubusercontent.com/4903082/52199904-a8c90680-2867-11e9-8e5e-25f17b36ea80.png)

Commits
-------

5ade19a8e3 Add index on order.cart + order.updated_at for faster expired cart removal selection
2019-02-06 11:42:13 +01:00
Stefan Doorn
5ade19a8e3 Add index on order.cart + order.updated_at for faster expired cart removal selection 2019-02-04 10:27:19 +01:00
Kamil Kokot
163545ed56
Merge branch '1.3'
* 1.3: (34 commits)
  Fix ThemeBundle + plugins tests
  [Docs] Outdate User component
  [Docs] Outdate Taxonomy component
  [Docs] Outdate Taxation component
  [Docs] Outdate Shipping component
  [Docs] Outdate Registry component
  [Docs] Outdate Promotion component
  [Docs] Outdate Product component
  [Docs] Outdate Payment component
  [Docs] Outdate Order component
  [Docs] Outdate Mailer component
  [Docs] Outdate Locale component
  [Docs] Outdate Inventory component
  [Docs] Outdate Grid component
  [Docs] Outdate Currency component
  [Docs] Outdate Channel component
  [Docs] Outdate Attribute component
  [Docs] Outdate Addressing component
  [Docs] Outdate Components section index
  [Docs] Outdate UserBundle
  ...
2019-01-15 16:21:40 +01:00
Mateusz Zalewski
b004cc5bfe
Fix ThemeBundle + plugins tests 2019-01-15 14:28:03 +01:00
Kamil Kokot
b22fc98104
Merge branch '1.3'
* 1.3:
  less noise
  fix link
  PR review fixes
  Test plugin with overriden by theme template
  Plugin templates in theme tests
2019-01-15 11:44:01 +01:00
Kamil Kokot
399be02a94
Merge branch '1.2' into 1.3
* 1.2:
  PR review fixes
  Test plugin with overriden by theme template
  Plugin templates in theme tests
2019-01-15 11:04:04 +01:00
Mateusz Zalewski
27dbb0db68
Test plugin with overriden by theme template 2019-01-14 16:01:50 +01:00
Kamil Kokot
f08c3bf8f7
Apply coding standard fixes 2019-01-13 15:31:33 +01:00
Kamil Kokot
72960390bf
Apply coding standard fixes 2019-01-13 15:21:57 +01:00
Kamil Kokot
82fab5ad97
Merge branch '1.2' into 1.3
* 1.2:
  Apply coding standard fixes
  #9699 🍌 -> 🥥
  Revert int strictness to just pass strings
  Make tests passing
  Fix build
  Behat test for assigning main taxon on new product
  #9699 Fix for viewing products when they belong to a taxon and to one of children taxon
2019-01-13 15:20:17 +01:00
Kamil Kokot
5da58b99bc
Apply coding standard fixes 2019-01-13 15:18:45 +01:00
Kamil Kokot
10d6b88037
feature #10089 Switch to Symfony's dotenv file handling (pamil)
This PR was merged into the 1.2-dev branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.4
| Bug fix?        | no
| New feature?    | yes
| BC breaks?      | maybe, but not in the code (Behat configuration, needs some testing)
| Deprecations?   | no
| Related tickets | -
| License         | MIT

See https://symfony.com/doc/current/configuration/dot-env-changes.html for reference.

TODO (after merge):
 - Port this change to Sylius/Sylius-Standard (Sylius/Sylius-Standard#316)
 - Port this change to Sylius/PluginSkeleton (Sylius/PluginSkeleton#155)

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


Commits
-------

7ed723981f Switch to Symfony's dotenv file handling
2019-01-13 15:11:13 +01:00
Kamil Kokot
7ed723981f
Switch to Symfony's dotenv file handling 2019-01-11 15:29:24 +01:00
Mateusz Zalewski
d282793764
Switch to DoctrineMigrationsBundle 2.0 2019-01-11 13:15:25 +01:00
Mateusz Zalewski
4f0f488b9d
Remove container cleanup in test environment 2019-01-11 08:56:19 +01:00
Kamil Kokot
400cba3918
feature #10079 [Channel] Shop billing data (Zales0123)
This PR was merged into the 1.4-dev branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master
| Bug fix?        | no
| New feature?    | yes
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | associated with https://github.com/Sylius/RefundPlugin/issues/106, https://github.com/Sylius/InvoicingPlugin/issues/52
| License         | MIT

During the development of `InvoicingPlugin`, we introduced a concept of shop billing data (set per channel) that is required to be displayed on an invoice. On the other hand, we also should have it in a `RefundPlugin` to generate a credit memo properly.

We considered a few options, but in the end, it's quite a common use case to have such a bunch of data manageable in Admin panel.

<img width="563" alt="zrzut ekranu 2019-01-9 o 11 04 31" src="https://user-images.githubusercontent.com/6212718/50892815-a35ed480-13ff-11e9-81e7-d5a96c6f8e28.png">


Commits
-------

f7cdb5522f Shop billing data on channel tests
ea37635e60 ShopBillingData entity and Channel relation
1185ef8657 Shop billing data in channel form
0848c16074 Tests fixes and nullable fields
801247abb8 PR review changes
cfdca1e836 Change column names to fulfill conventions
2019-01-10 14:59:19 +01:00
Mateusz Zalewski
cfdca1e836
Change column names to fulfill conventions 2019-01-10 13:39:48 +01:00
Kamil Kokot
43aa742b2e
Add encoder name to the User model 2019-01-09 17:04:51 +01:00
Mateusz Zalewski
0848c16074
Tests fixes and nullable fields 2019-01-09 11:34:29 +01:00
Mateusz Zalewski
ea37635e60
ShopBillingData entity and Channel relation 2019-01-09 11:27:42 +01:00
Łukasz Chruściel
46f2f811f2
Merge branch '1.2' into 1.3
* 1.2:
  fix dashboard context
  extends friends of behat page
  remove double 'When'
  some changes after code review
  Accessing a product which does not exist
  redirecting on login after being logout from administration dashboard
  improve behat sentences and fix 403 title to be more explicit
  add error page interface
  [Behat] viewing errors
2018-11-23 11:12:14 +01:00
Loïc Frémont
8d73c9ea26
Accessing a product which does not exist 2018-11-20 15:32:22 +01:00
Loïc Frémont
4c09714660
improve behat sentences and fix 403 title to be more explicit 2018-11-20 15:30:51 +01:00
Loïc Frémont
f83561a345
[Behat] viewing errors 2018-11-20 15:30:50 +01:00
Kamil Kokot
6bd7a3a372
Remove unused parameters.yml.dist file 2018-08-29 11:58:10 +02:00