Skip to content

5.5 #4070

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 217 commits into
base: 5.x
Choose a base branch
from
Open

5.5 #4070

wants to merge 217 commits into from
+4,843 −1,619

Conversation

@lukeholder
Copy link
Member

@lukeholder lukeholder commented Jul 7, 2025 •
edited by nfourtythree
Loading

Description

Maybe:

Related issues

lukeholder and others added 30 commits May 27, 2025 13:19
@lukeholder
Resave the variants since product doesnt store shipping category in 5.0
36ab956
@lukeholder
Make sure the shipping category is set to one that is available only
015ec34
@lukeholder
Release note
86ee6d9
@lukeholder
Merge branch '5.x' into feature/pt-2792-5x-update-a-purchasables-ship…
b4cfc7c 
…pingcategoryid-when-a-shipping
@lukeholder
fixes
219a992
@lukeholder
Merge branch '5.x' into feature/pt-2792-5x-update-a-purchasables-ship…
c64c921 
…pingcategoryid-when-a-shipping
@lukeholder
Cleanup
4b980de
@lukeholder
Doesnt make sense for an ID query
bd280cd
@lukeholder
Fix tests expectations for specific shipping categories
4f1999c
@nfourtythree
Fixed emails not rendering in the site the order was placed in
d55ab12
@nfourtythree
Merge branch '5.x' into bugfix/send-email-with-current-site-set-to-or…
2ea5185 
…der-site
@nfourtythree
fix merge
f8764f5
@nfourtythree
WIP email render site
5e792eb
@nfourtythree
Merge branch '5.4' into bugfix/send-email-with-current-site-set-to-or…
9396659 
…der-site
@nfourtythree
Further email render site updates
2af05ac
@nfourtythree
translations + changelog
cfe75a8
@nfourtythree
Merge branch '5.4' into bugfix/send-email-with-current-site-set-to-or…
9360c48 
…der-site
@nfourtythree
fix cs
f297438
@lukeholder
Inventory movement events
3256d96
@lukeholder
Merge branch '5.x' into 5.5
659e810
@lukeholder
Merge branch '5.x' into 5.5
77f6c2e
@lukeholder
Merge branch '5.x' into feature/pt-2792-5x-update-a-purchasables-ship…
2b2293e 
…pingcategoryid-when-a-shipping
@lukeholder
Merge branch '5.x' into 5.5
13db36b
@lukeholder
Add appendCouponCode
cd855e0
@lukeholder
Merge branch '5.x' into feature/pt-2792-5x-update-a-purchasables-ship…
52087b8 
…pingcategoryid-when-a-shipping
@lukeholder
WIP
f9503d4
@lukeholder
Save and query correctly
357fa2e
@lukeholder
Migrations to add columns
0612190
@lukeholder
update the shipping categorie to the default if no longer available t…
b281ed1 
…o product type
@lukeholder
All product types must be able to have the default shipping category,…
312d44d 
… just like an external purchasable
nfourtythree and others added 16 commits November 10, 2025 09:04
@nfourtythree
Shipping methods as screen
219a5c2
@nfourtythree
Catalog pricing rules index as screen
dd63574
@nfourtythree
fix cs
5871def
@brandonkelly
Fix message
f226a6b
@brandonkelly
Merge branch '4.10' of https://github.com/craftcms/commerce into 5.5
52850f9 
# Conflicts:
#	CHANGELOG-WIP.md
#	src/templates/_layouts/store-settings.twig
#	src/translations/en/commerce.php
@brandonkelly
Merge branch '4.10' of https://github.com/craftcms/commerce into 5.5
aca99e3 
# Conflicts:
#	src/templates/settings/emails/_edit.twig
#	src/translations/en/commerce.php
@brandonkelly
Sort lines
fd714c1
@brandonkelly
Message cleanup
7c353ee
@lukeholder
Move resave to job
3c0adc4
@lukeholder
Merge branch '5.5' into feature/variant-title-format-regen-conditional
50e66eb
@lukeholder
Release note
ebafa0e
@lukeholder
Merge pull request #4173 from craftcms/feature/variant-title-format-r…
c678e9d 
…egen-conditional

Conditionally resave variants (with a title format) in a Job
@lukeholder
Merge branch '5.5' into feature/as-screen
ab9626e
@lukeholder
Release note fix
fe39fd7
@lukeholder
Merge branch '5.x' into 5.5
6bba894
@lukeholder
Merge branch '5.x' into 5.5
6d799be
@lukeholder lukeholder marked this pull request as ready for review November 11, 2025 06:59
@lukeholder lukeholder requested a review from a team as a code owner November 11, 2025 06:59
lukeholder and others added 12 commits November 11, 2025 14:59
@lukeholder
Merge branch '5.5' of github.com:craftcms/commerce into 5.5
d11abfb
@lukeholder
Cleanup release notes
69d20da 
[ci skip]
@lukeholder
Merge branch '5.5' into feature/as-screen
2a2dfe8
@nfourtythree
Discounts index as screen
d36ae2b
@nfourtythree
Tidy
4d355b3
@nfourtythree
Discounts edit as cp screen
ded2c08
@nfourtythree
Merge branch 'feature/as-screen' of github.com:craftcms/commerce into…
91baa1f 
… feature/as-screen
@lukeholder
Merge pull request #4161 from craftcms/feature/as-screen
8d25691 
[5.5] Cleanup tax zone and category edit page modals to use CpScreens
@nfourtythree
#4167 Add variant and customer specific rules to catalog pricing rule…
d5d9fda 
… condition builders
@lukeholder
Fixes #4172
4d82683 
There should have been a migration when the condition was added. There actually were TWO migrations (m250301_120000 and m250721_130616), but the type signature issue prevented loading gateways with null values even after the migration ran, creating a chicken-and-egg problem.

Also fixed the shipping method and rules null assignment
@nfourtythree
Merge pull request #4176 from craftcms/nathaniel/com-496-5x-allow-the…
0334e0c 
…-selection-of-the-specific-element-in-the-match

[5.5] Add variant and customer specific rules to catalog pricing rule condition builders
@nfourtythree
Merge branch '5.x' into 5.5
2c5a98a 
# Conflicts:
#	src/Plugin.php
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@lukeholder @nfourtythree @brandonkelly