Skip to content

Commit

Permalink
Merge branch '5.3' into feature/pt-2315-add-coupon-code-order-conditi…
Browse files Browse the repository at this point in the history
…on-rule
  • Loading branch information
nfourtythree authored Dec 11, 2024
2 parents 609551c + 71b377a commit 7aa9cab
Show file tree
Hide file tree
Showing 31 changed files with 665 additions and 271 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: ci
uses: craftcms/.github/.github/workflows/ci.yml@v3
with:
php_version: '8.2'
php_version: '["8.2", "8.3"]'
craft_version: '5'
node_version: '20'
jobs: '["ecs", "phpstan", "prettier", "tests"]'
Expand Down
8 changes: 6 additions & 2 deletions CHANGELOG-WIP.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
# Release Notes for Craft Commerce (WIP)

### Store Management
- Order conditions can now have a “Coupon Code” rule. ([#3776](https://github.com/craftcms/commerce/discussions/3776))
- Order conditions can now have a “Payment Gateway” rule. ([#3722](https://github.com/craftcms/commerce/discussions/3722))

### Administration
- Added a new "Coupon Code" order condition rule. ([#3776](https://github.com/craftcms/commerce/discussions/3776))
- Added a new "Payment Gateway" order condition rule. ([#3722](https://github.com/craftcms/commerce/discussions/3722))
- Added support for `to`, `bcc`, and `cc` email fields to support environment variables. ([#3738](https://github.com/craftcms/commerce/issues/3738))

### Development
- Added the `couponCode` order query param.
- Added an `originalCart` value to the `commerce/update-cart` failed ajax response. ([#430](https://github.com/craftcms/commerce/issues/430))

### Extensibility
- Added `craft\commerce\elements\conditions\orders\CouponCodeConditionRule`.
Expand Down
31 changes: 31 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,36 @@
# Release Notes for Craft Commerce

## Unreleased

- Fixed a bug where a product’s default price was showing incorrectly on the Products index page. ([#3807](https://github.com/craftcms/commerce/issues/3807))
- Fixed a bug where inline-editable Matrix fields weren’t saving content on product variants. ([#3805](https://github.com/craftcms/commerce/issues/3805))
- Fixed a bug where order errors weren't showing on the Edit Order page.

## 5.2.8 - 2024-12-04

- Fixed a bug where line items weren’t getting hyperlinked within Edit Order pages. ([#3792](https://github.com/craftcms/commerce/issues/3792))
- Fixed a bug where Inventory pages were showing draft purchasables.
- Fixed a PHP error that could occur when creating inventory transfers. ([#3696](https://github.com/craftcms/commerce/issues/3696))
- Fixed a bug where prices weren’t getting formatted per the user’s formatting locale, in payment models on Edit Order pages. ([#3789](https://github.com/craftcms/commerce/issues/3789))
- Fixed a bug where store settings weren’t respecting environment variables. ([#3786](https://github.com/craftcms/commerce/issues/3786))

## 5.2.7 - 2024-12-02

- Fixed an error that occurred on the Orders index page when running Craft CMS 5.5.4 or later. ([#3793](https://github.com/craftcms/commerce/issues/3793))
- Fixed a bug where a structured product type’s “Max Levels” setting wasn’t being respected. ([#3785](https://github.com/craftcms/commerce/issues/3785))
- Fixed an information disclosure vulnerability.

## 5.2.6 - 2024-11-26

- Fixed a bug where variant prices could be displayed incorrectly when inline editing. ([#3768](https://github.com/craftcms/commerce/issues/3768))
- Fixed a performance degradation bug with variant queries. ([#3758](https://github.com/craftcms/commerce/issues/3758))
- Fixed a PHP error that could occur when managing store settings. ([#3780](https://github.com/craftcms/commerce/issues/3780))

## 5.2.5 - 2024-11-20

- The `resave/products`, `resave/orders`, and `resave/carts` commands now support the `--with-fields` option.
- Fixed a SQL error that could occur when updating. ([#3778](https://github.com/craftcms/commerce/issues/3778))

## 5.2.4 - 2024-11-14

- Improved the performance of `craft\commerce\elements\Product::getVariants()`. ([#3578](https://github.com/craftcms/commerce/issues/3758))
Expand Down
Loading

0 comments on commit 7aa9cab

Please sign in to comment.