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.

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

5.1 #3617

Merged
merged 242 commits into from
Sep 4, 2024
Merged

5.1 #3617

merged 242 commits into from
Sep 4, 2024

Conversation

nfourtythree
Copy link
Contributor

Description

nfourtythree and others added 30 commits March 5, 2024 07:48
@nfourtythree
WIP custom line items
85c9a64
@nfourtythree
Merge branch '5.0' into feature/5.x-custom-line-items
e25e18b
@nfourtythree
Update merge line items keys
b7810c4
@nfourtythree
WIp more custom line item editing
74390d2
@nfourtythree
adding a new custom line item on order edit
096bc5a
@nfourtythree
Merge branch '5.0' into feature/5.x-custom-line-items
d05b27a
@nfourtythree
Prep for 5.1
ac1dcf7
@nfourtythree
Merge branch '5.1' into feature/5.x-custom-line-items
9fe1473 
# Conflicts:
#	src/Plugin.php
#	src/controllers/OrdersController.php
#	src/web/assets/commerceui/dist/js/app.js
#	src/web/assets/commerceui/dist/js/app.js.map
@nfourtythree
Merge branch '5.x' into 5.1
73ada7e
@nfourtythree
Merge branch '5.1' into feature/5.x-custom-line-items
abb7d46
@nfourtythree
Merge branch '5.x' into 5.1
63e9612
@nfourtythree
Merge branch '5.1' into feature/5.x-custom-line-items
683e0e3
@nfourtythree
Merge branch '5.x' into 5.1
38a6aed
@nfourtythree
Merge branch '5.x' into feature/5.x-custom-line-items
782f87d
@lukeholder
New Permissions
d148ac6
@lukeholder
Translation strings
e296ae6
@lukeholder
Add Subscription Plans since we have other translations in this PR
e85e33e
@lukeholder
Fix errors
2b87706
@lukeholder
Merge branch '5.x' into feature/permissions-improvements
216715d 
# Conflicts:
#	CHANGELOG.md
@nfourtythree
Merge branch '5.x' into 5.1
93a562c
@nfourtythree
Merge branch '5.1' into feature/5.x-custom-line-items
af7a5ba
@nfourtythree
Switch line item type to enum
7142e7b
@lukeholder
Merge branch '5.1' into feature/permissions-improvements
e79fbcb 
# Conflicts:
#	CHANGELOG.md
@lukeholder
Move to WIP
ca5c328
@nfourtythree
Create isPromotable, hasFreeShipping properties on lineitems
7caf1d4 
Update core functionality to make sure we are always calling methods through the line item where applicable.
@nfourtythree
Changelog update
b1c9504
@lukeholder
Merge pull request #3502 from craftcms/feature/permissions-improvements
3f711e6 
[5.1] Additional Permissions
@nfourtythree
Adding hasFreeShipping and isPromotable props to line items
140797a
@nfourtythree
Use non-deprecated method
85462ff
@lukeholder
Remove user commerce field
b1dbd52
nfourtythree and others added 23 commits September 4, 2024 09:25
@nfourtythree
add SKU rule to variant condition
90e08a3
@nfourtythree
Add extra catalog pricing tests to ensure new min queries are working
09e1089
@nfourtythree
Add deprecator log
d2b6fcb
@nfourtythree
fix cs
3fe6b3d
@nfourtythree
changelog item
4c6fc41
@nfourtythree
Small purchasables table performance tweak
bd1af07
@nfourtythree
More purchasables table performance tweaks
ccd561d
@nfourtythree
Fix typo
285ee5f
@nfourtythree
tidy
af08825
@nfourtythree
Fix missing install keys
2e99e55
@lukeholder
Fix install migration
5117a65
@nfourtythree
Add pricing catalog querying by prices test
606adc1
@nfourtythree
Merge branch '5.x' into 5.1
4e57df3 
# Conflicts:
#	src/models/CatalogPricingRule.php
@nfourtythree
Merge branch '5.1' of github.com:craftcms/commerce into 5.1
efc9220
@nfourtythree
Merge branch '5.1' into bugfix/improve-purchasable-query-performance
f726606
@nfourtythree
fix cs
0184f6b
@nfourtythree
Merge branch '5.1' into bugfix/improve-purchasable-query-performance
d480180
@nfourtythree
More sane conditionals
24b533c
@nfourtythree
Merge pull request #3652 from craftcms/bugfix/improve-purchasable-que…
3c077b7 
…ry-performance

[5.1] Improve purchasable query performance
@nfourtythree
Make sure line items cannot have negative prices
ad930fb
@brandonkelly
Sort lines
baf6747 
[ci skip]
@nfourtythree
Merge branch '5.x' into 5.1
69000a0 
# Conflicts:
#	CHANGELOG.md
@lukeholder
Not padded
9aae421
@brandonkelly brandonkelly marked this pull request as ready for review September 4, 2024 18:39
@brandonkelly brandonkelly requested a review from a team as a code owner September 4, 2024 18:39
@brandonkelly brandonkelly merged commit 1651b3d into 5.x Sep 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@lukeholder lukeholder

@nfourtythree nfourtythree

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nfourtythree @brandonkelly @lukeholder @shinybrad