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] Custom line items (non-purchasable dependent) #3541

Merged
merged 40 commits into from
Aug 14, 2024
Merged

[5.1] Custom line items (non-purchasable dependent) #3541

merged 40 commits into from
Aug 14, 2024

Conversation

nfourtythree
Copy link
Contributor

Description

@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
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.1' into feature/5.x-custom-line-items
abb7d46
@nfourtythree
Merge branch '5.1' into feature/5.x-custom-line-items
683e0e3
@nfourtythree
Merge branch '5.x' into feature/5.x-custom-line-items
782f87d
@nfourtythree
Merge branch '5.1' into feature/5.x-custom-line-items
af7a5ba
@nfourtythree
Switch line item type to enum
7142e7b
@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
@nfourtythree
Adding hasFreeShipping and isPromotable props to line items
140797a
@nfourtythree
Use non-deprecated method
85462ff
@nfourtythree
Merge branch '5.1' into feature/5.x-custom-line-items
f746dbf 
# Conflicts:
#	CHANGELOG-WIP.md
@nfourtythree
WIP is taxable is shippable
a00c390
@nfourtythree
Add taxable and shippable to line items
609b8e8
@nfourtythree
Rework creating and refreshing line items
10954fe
@nfourtythree
fix cs
77e43c5
@nfourtythree
No need for todo will be removed at next breaking change
04b7d9b
@nfourtythree
Update LineItems::create() signature, update deprecated uses of `cr…
4732a21 
…eateLineItem()`
@nfourtythree
Safe attributes
e0c6768
@nfourtythree
Make sure default qty in create()
31c0cdd
@nfourtythree
Merge branch '5.1' into feature/5.x-custom-line-items
18d9e99
@nfourtythree
Fix missing columns on install
7e52ce9
@nfourtythree
WIP front end add custom line item
c9e3a8f
@nfourtythree
Ability to add custom line items to the cart from the front end
4572f4e
@nfourtythree
fix cs
4be292f
@nfourtythree nfourtythree self-assigned this Jun 11, 2024
@nfourtythree
Merge branch '5.1' into feature/5.x-custom-line-items
43a2d7d
@nfourtythree
Fixed a bug in TopProducts stat
9ac1d52
@nfourtythree
Merge branch '5.1' into feature/5.x-custom-line-items
bebbb0c 
# Conflicts:
#	CHANGELOG-WIP.md
#	src/web/assets/commerceui/dist/js/app.js
#	src/web/assets/commerceui/dist/js/app.js.map
@nfourtythree
Build files
0bd060f
@nfourtythree
Merge branch '5.1' into feature/5.x-custom-line-items
70b17a4 
# Conflicts:
#	src/Plugin.php
#	src/controllers/OrdersController.php
@nfourtythree
Fix cs
7d52e19
@nfourtythree
Merge branch '5.1' into feature/5.x-custom-line-items
2055466 
# Conflicts:
#	CHANGELOG-WIP.md
@nfourtythree
Typo fixes
79098a0
@nfourtythree nfourtythree marked this pull request as ready for review August 14, 2024 13:30
@nfourtythree nfourtythree requested a review from a team as a code owner August 14, 2024 13:30
@nfourtythree nfourtythree merged commit 0ef702f into 5.1 Aug 14, 2024
2 of 3 checks passed
@nfourtythree nfourtythree deleted the feature/5.x-custom-line-items branch August 14, 2024 13:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nfourtythree nfourtythree

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@nfourtythree