Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.3 #3740

Draft
wants to merge 79 commits into
base: 5.x
Choose a base branch
from
Draft

5.3 #3740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
1ad4c42
Add payment gateway order condition rule
lukeholder Oct 25, 2024
01d6a44
Cleanup
lukeholder Oct 25, 2024
0b60e60
Add Cart purge event
lukeholder Nov 6, 2024
c95eb01
Use UID
lukeholder Nov 6, 2024
fe7a7dc
Merge branch '5.x' into 5.3
nfourtythree Nov 6, 2024
1047f16
Fix cs
nfourtythree Nov 6, 2024
643d287
Don’t show “view customer” link on order edit if they don’t have perm…
nfourtythree Nov 6, 2024
2ef66f8
Add env support for email email fields
lukeholder Nov 13, 2024
842b6d4
Merge branch '5.x' into 5.3
lukeholder Nov 13, 2024
ae351db
Merge branch '5.x' into 5.3
nfourtythree Nov 14, 2024
e98efbb
Merge branch '5.x' into 5.3
nfourtythree Nov 18, 2024
9f0e2be
Add coupon code condition rule and element query param
nfourtythree Nov 18, 2024
ebf639b
Fix order query coupon code, should be case-insensitive
nfourtythree Nov 19, 2024
664fc0f
`CouponCodeConditionRule` re-implements `matchValue()` method to be c…
nfourtythree Nov 19, 2024
f372059
Make sure the discount order condition doesn’t have the coupon code rule
nfourtythree Nov 19, 2024
597f93a
Add `CouponCodeConditionRule` to `OrderConditionTest`
nfourtythree Nov 19, 2024
609551c
Add `CouponCodeConditionRuleTest`
nfourtythree Nov 19, 2024
df8d99e
Merge branch '5.x' into 5.3
nfourtythree Nov 19, 2024
de72552
include the original cart if cart has errors
lukeholder Nov 20, 2024
c881d80
FIx php docs
lukeholder Nov 20, 2024
5d5b1b8
Merge branch '5.3' into feature/5.3-email-env-support
lukeholder Nov 20, 2024
2b5e493
Merge pull request #3761 from craftcms/feature/5.3-email-env-support
lukeholder Nov 20, 2024
3c3b05f
cleanup
lukeholder Nov 20, 2024
e7a1580
Merge branch '5.3' into feature/5.x-purgeevent
lukeholder Nov 20, 2024
a1fa1bf
release notes
lukeholder Nov 20, 2024
714f74f
Bump Craft requirement
nfourtythree Nov 21, 2024
2420860
WIP Card layout designer
nfourtythree Nov 21, 2024
7ca145f
Changelog
nfourtythree Nov 21, 2024
2d14040
Merge branch '5.x' into 5.3
nfourtythree Nov 28, 2024
c4079f8
Merge branch '5.3' into feature/pt-2318-products-variants-card-view-d…
nfourtythree Nov 28, 2024
92fc28f
WIP variant card attributes
nfourtythree Nov 28, 2024
c69ca44
Merge branch '5.x' into 5.3
lukeholder Dec 3, 2024
50161cb
Enabled option for taxrates
lukeholder Dec 4, 2024
7a7fb15
updates
lukeholder Dec 4, 2024
b347d13
Merge branch '5.x' into 5.3
nfourtythree Dec 4, 2024
5daeac9
WIP inventory item steamline
nfourtythree Dec 5, 2024
483fdb4
Merge branch '5.x' into 5.3
nfourtythree Dec 5, 2024
d8c2d48
Merge branch '5.3' into feature/com-271-improve-purchasable-stock-upd…
nfourtythree Dec 5, 2024
78e1f4b
Tidy
nfourtythree Dec 5, 2024
f5ebebf
Add `Purchasable::setStockLevel()`
nfourtythree Dec 5, 2024
f9b4fae
Added `Iventory::updateInventoryLevel()`
nfourtythree Dec 5, 2024
026b521
fix cs
nfourtythree Dec 5, 2024
4f007fa
fix default location
nfourtythree Dec 5, 2024
99bb3f8
Add exception to stop being able to set stock level on an unsaved pur…
nfourtythree Dec 5, 2024
134d83c
Tidy
nfourtythree Dec 5, 2024
4ffa9b6
Switch to just using service method for updating purchasable inventor…
nfourtythree Dec 6, 2024
f29a51a
Fix cs
nfourtythree Dec 6, 2024
71b377a
Merge branch '5.x' into 5.3
nfourtythree Dec 10, 2024
670336f
Merge branch '5.3' into feature/pt-2318-products-variants-card-view-d…
nfourtythree Dec 10, 2024
0d7ec5f
Move card attributes to purchasable class
nfourtythree Dec 10, 2024
ae5601c
fix cs
nfourtythree Dec 10, 2024
5e68d3f
Merge branch '5.x' into feature/5.3-teller
lukeholder Dec 11, 2024
27e8bf6
Add teller as public order function
lukeholder Dec 11, 2024
225c924
Added product condition rule for variant conditions
nfourtythree Dec 11, 2024
b6c5f03
fix cs
nfourtythree Dec 11, 2024
af0c5e5
fix rename
lukeholder Dec 11, 2024
7aa9cab
Merge branch '5.3' into feature/pt-2315-add-coupon-code-order-conditi…
nfourtythree Dec 11, 2024
e563b00
Merge pull request #3811 from craftcms/feature/pt-2343-product-condit…
nfourtythree Dec 11, 2024
27211fe
Merge branch '5.3' into feature/com-271-improve-purchasable-stock-upd…
nfourtythree Dec 11, 2024
c8105c9
Merge pull request #3801 from craftcms/feature/com-271-improve-purcha…
nfourtythree Dec 11, 2024
e83628d
Merge branch '5.3' into feature/5.3-teller
lukeholder Dec 11, 2024
ca0f88b
Merge branch '5.3' into feature/5.3-teller
lukeholder Dec 11, 2024
dd8b60f
float returns
lukeholder Dec 11, 2024
dfd4460
Merge branch '5.3' into feature/pt-2315-add-coupon-code-order-conditi…
nfourtythree Dec 11, 2024
6b584c5
Merge pull request #3777 from craftcms/feature/pt-2315-add-coupon-cod…
nfourtythree Dec 11, 2024
86d305b
Merge branch '5.3' into feature/5.3-teller
lukeholder Dec 11, 2024
ee8aea0
Merge branch '5.3' into feature/pt-2318-products-variants-card-view-d…
nfourtythree Dec 11, 2024
87db3ad
Merge pull request #3809 from craftcms/feature/pt-2318-products-varia…
nfourtythree Dec 11, 2024
27a3b34
Merge branch '5.3' into feature/5.x-purgeevent
lukeholder Dec 11, 2024
35311c0
Merge branch '5.3' into feature/enabled-tax-rates
lukeholder Dec 11, 2024
8d538c5
Release notes
lukeholder Dec 11, 2024
d89ccf9
Update lock file
lukeholder Dec 11, 2024
ff35432
Merge branch 'feature/5.x-purgeevent' into 5.3
lukeholder Dec 11, 2024
64f8da8
Merge branch '5.3' into feature/5.3-teller
lukeholder Dec 11, 2024
d46c4f0
Merge pull request #3798 from craftcms/feature/enabled-tax-rates
lukeholder Dec 11, 2024
e07bc7f
Merge pull request #3810 from craftcms/feature/5.3-teller
lukeholder Dec 11, 2024
362f473
release notes
lukeholder Dec 11, 2024
c91726a
Add variant restore
lukeholder Dec 17, 2024
70a4ba6
translations
lukeholder Dec 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions CHANGELOG-WIP.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Release Notes for Craft Commerce (WIP)

### Store Management
- It is now possible to design card views for Products and Variants. ([#3809](https://github.com/craftcms/commerce/pull/3809))
- 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))
- Variant conditions can now have a “Product” rule.
- Tax rates now have statuses. ([#3790](https://github.com/craftcms/commerce/discussions/3790))
- Soft-deleted variants can now be restored.

### Administration
- Added support for environment variables to the `to`, `bcc`, and `cc` email fields. ([#3738](https://github.com/craftcms/commerce/issues/3738))

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

### Extensibility
- Added `craft\commerce\base\InventoryItemTrait`.
- Added `craft\commerce\base\InventoryLocationTrait`.
- Added `craft\commerce\elements\conditions\orders\CouponCodeConditionRule`.
- Added `craft\commerce\elements\conditions\variants\ProductConditionRule`.
- Added `craft\commerce\elements\db\OrderQuery::$couponCode`.
- Added `craft\commerce\elements\db\OrderQuery::couponCode()`.
- Added `craft\commerce\events\CartPurgeEvent`.
- Added `craft\commerce\services\Inventory::updateInventoryLevel()`.
- Added `craft\commerce\services\Inventory::updatePurchasableInventoryLevel()`.

### System
- Craft Commerce now requires Craft CMS 5.5 or later.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"prefer-stable": true,
"require": {
"php": "^8.2",
"craftcms/cms": "^5.2.0",
"craftcms/cms": "^5.5.0",
"dompdf/dompdf": "^2.0.2",
"ibericode/vat": "^1.2.2",
"iio/libmergepdf": "^4.0",
Expand Down
Loading