Skip to content

Commit

Permalink
Merge branch '4.0' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
dpfaffenbauer committed Aug 19, 2024
2 parents 0dfeb46 + 0e4db7c commit 768b472
Show file tree
Hide file tree
Showing 39 changed files with 856 additions and 1,547 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG-2.0.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ After you have migrated to the latest version you also have to remove them:
- `CoreShop\Component\Customer\Model\UserInterface::ROLE_SUPER_ADMIN` renamed `CoreShop\Component\Customer\Model\UserInterface::CORESHOP_ROLE_SUPER_ADMIN`

- **BC break** Shipment / Invoice Creation via API changed
- Before adding a new Shipment / Invoice you need to dispatch a request state to your order. Read more about it [here](./docs/03_Development/06_Order/05_Invoice/01_Invoice_Creation.md) and [here](./docs/03_Development/06_Order/06_Shipment/01_Shipment_Creation.md).
- Before adding a new Shipment / Invoice you need to dispatch a request state to your order.
- **BC break** getName in `CoreShop\Component\Index\Model\IndexableInterface` has been changed to `getIndexableName` as `getName` could eventually conflict with a non localized Pimcore Field
- **BC break** getEnabled in `CoreShop\Component\Index\Model\IndexableInterface` has been changed to `getIndexableEnabled` as `getEnabled` could eventually conflict with a localized Pimcore Field

Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG-2.1.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
- [IndexBundle] allow to query relations also by relation type (https://github.com/coreshop/CoreShop/pull/1156)
- [SEOBundle] add priority to extractors (https://github.com/coreshop/CoreShop/pull/1155)
- [QuantityPriceRules] Allow Object Deletion without removing QPR first (https://github.com/coreshop/CoreShop/issues/1160)
- [CoreBundle] Improve Unit Definition <=> QPR Dependency (https://github.com/coreshop/CoreShop/pull/1161)
- [CoreBundle] Improve Unit Definition `<=>` QPR Dependency (https://github.com/coreshop/CoreShop/pull/1161)
- [StorageList] introduce service to resolve if cart-items are equal (https://github.com/coreshop/CoreShop/pull/1188)
- [OrderBundle] Allow Item Data per Row in Order Overview (https://github.com/coreshop/CoreShop/pull/1193)
- [OrderBundle] add sale-detail event (https://github.com/coreshop/CoreShop/pull/1192)
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG-3.0.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
- [ResourceBundle] fix Pimcore 10.6 compatibility to find Admin User (https://github.com/coreshop/CoreShop/pull/2293)
- [OrderBundle] improve unlinking files in pdf generation (https://github.com/coreshop/CoreShop/pull/2294)
- [SerializedData] show data as string in version preview (https://github.com/coreshop/CoreShop/pull/2295)
- [Docs] Maintenance mode <-> Maintenance job (https://github.com/coreshop/CoreShop/pull/2299)
- [Docs] Maintenance mode `<->` Maintenance job (https://github.com/coreshop/CoreShop/pull/2299)
- [MessengerBundle] fix for standalone installation (https://github.com/coreshop/CoreShop/pull/2298)

# 3.0.5
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG-3.2.x.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 3.2.12
* [MoneyBundle] money and moneyCurrency type should respect money_decimal_precision by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2671
* [VariantBundle] Add possibility to exclude Variants from AttributeCollector via AttributePreconditionEvent by @almshadi in https://github.com/coreshop/CoreShop/pull/2674
* [Product] don't allow Price and DiscountPrice Rule for unit prices by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2678

# 3.2.11
* [Order] fixes for backend order creation by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2652
* [Messenger] fix serialization of failed_at by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2658
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG-4.0.x.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# 4.0.9
* [OrderBundle] use context language for OrderState Operator by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2677
* [VariantBundle] Variant Creator by @breakone in https://github.com/coreshop/CoreShop/pull/2679

# 4.0.8
* [PaymentBundle] fix null title for payment provider by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2640
* [ProductBundle] fix missing cascade merge by @benwalch in https://github.com/coreshop/CoreShop/pull/2647
* [PaymentBundle/ShippingBundle] fix logo select form type by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2654
* [OrderBundle] use user locale for transition and state translations by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2653
* [Order] fixes for backend order creation by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2652
* [Messenger] fix serialization of failed_at by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2658
* [CoreBundle] fixes for Reports by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2659
* [Pimcore] add conflict for Pimcore 11.3.1 by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2664

# 4.0.7

* [ProductBundle] fix missing cascade merge by @nehlsen in https://github.com/coreshop/CoreShop/pull/2636
Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
"symfony/notifier": "^6.3",
"symfony/serializer": "^6.3",
"symfony/twig-bundle": "^6.3",
"symfony/form": "^6.3",
"webmozart/assert": "^1.10"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion docs/01_Getting_Started/00_Installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ CoreShop also uses Symfony Messenger for async tasks like sending E-Mails or Pro
Please run these 2 transports to process the data

```yaml
bin/console messenger:consume coreshop_notification coreshop_index --time-limit=300
bin/console messenger:consume coreshop_notification coreshop_index coreshop_variant --time-limit=300
```

## Payment
Expand Down
Loading

0 comments on commit 768b472

Please sign in to comment.