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.3 #3740

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

5.3 #3740

wants to merge 181 commits into from

Conversation

lukeholder
Copy link
Member

@lukeholder lukeholder commented Oct 25, 2024 •
edited
Loading

@lukeholder lukeholder changed the title Add payment gateway order condition rule 5.3 Oct 25, 2024
lukeholder and others added 28 commits October 25, 2024 13:27
@lukeholder
Cleanup
01d6a44
@lukeholder
Add Cart purge event
0b60e60
@lukeholder
Use UID
c95eb01
@nfourtythree
Merge branch '5.x' into 5.3
fe7a7dc
@nfourtythree
Fix cs
1047f16
@nfourtythree
Don’t show “view customer” link on order edit if they don’t have perm…
643d287 
…ission
@lukeholder
Add env support for email email fields
2ef66f8
@lukeholder
Merge branch '5.x' into 5.3
842b6d4
@nfourtythree
Merge branch '5.x' into 5.3
ae351db
@nfourtythree
Merge branch '5.x' into 5.3
e98efbb
@nfourtythree
Add coupon code condition rule and element query param
9f0e2be
@nfourtythree
Fix order query coupon code, should be case-insensitive
ebf639b
@nfourtythree
CouponCodeConditionRule re-implements matchValue() method to be c…
664fc0f 
…ase insensitive
@nfourtythree
Make sure the discount order condition doesn’t have the coupon code rule
f372059
@nfourtythree
Add CouponCodeConditionRule to OrderConditionTest
597f93a
@nfourtythree
Add CouponCodeConditionRuleTest
609551c
@nfourtythree
Merge branch '5.x' into 5.3
df8d99e
@lukeholder
include the original cart if cart has errors
de72552
@lukeholder
FIx php docs
c881d80
@lukeholder
Merge branch '5.3' into feature/5.3-email-env-support
5d5b1b8
@lukeholder
Merge pull request #3761 from craftcms/feature/5.3-email-env-support
2b5e493 
[5.3] Add env support for email email fields
@lukeholder
cleanup
3c3b05f
@lukeholder
Merge branch '5.3' into feature/5.x-purgeevent
e7a1580
@lukeholder
release notes
a1fa1bf
@nfourtythree
Bump Craft requirement
714f74f
@nfourtythree
WIP Card layout designer
2420860
@nfourtythree
Changelog
7ca145f
@nfourtythree
Merge branch '5.x' into 5.3
2d14040
lukeholder and others added 30 commits January 22, 2025 16:50
@lukeholder
Add release notes
96f0d56
@lukeholder
Merge branch '4.8' into feature/4.8-tax-id-validators
0673e0b 
# Conflicts:
#	CHANGELOG-WIP.md
@lukeholder
Cleanup
9e672d9
@lukeholder
Fix tests
a6d080b
@lukeholder
Merge pull request #3857 from craftcms/feature/4.8-tax-id-validators
2a6092d 
Added tax ID validator interface
@lukeholder
Merge branch '4.8' into 5.3
b5fd51c 
# Conflicts:
#	.github/workflows/ci.yml
#	CHANGELOG-WIP.md
#	CHANGELOG.md
#	composer.lock
#	src/Plugin.php
#	src/behaviors/ValidateOrganizationTaxIdBehavior.php
#	src/controllers/CartController.php
#	src/controllers/GatewaysController.php
#	src/controllers/ProductsController.php
#	src/controllers/TaxRatesController.php
#	src/models/TaxRate.php
#	src/services/ShippingMethods.php
#	src/services/TaxRates.php
#	src/services/Taxes.php
#	src/templates/products/_edit.twig
#	src/templates/settings/gateways/index.twig
#	src/templates/store-management/tax/taxrates/_fields.twig
#	src/translations/en/commerce.php
#	tests/unit/adjusters/TaxTest.php
#	tests/unit/controllers/CartTest.php
@lukeholder
Fix install migration
b9b2021
@lukeholder
Fix missing safe attribute
b5059e0
@nfourtythree
Merge branch '5.3' into feature/back-order
d925c75 
# Conflicts:
#	CHANGELOG-WIP.md
#	src/Plugin.php
@nfourtythree
fix infinite loop
efd03a9
@nfourtythree
fix cs
57466e3
@nfourtythree
Fix merge issues
ab54925
@nfourtythree
Fix cart test
385b8e1
@nfourtythree
Fix cs
6355bff
@nfourtythree
Merge branch '5.3' into feature/show-read-only-settings-when-allowadm…
41511b3 
…inchanges-false

# Conflicts:
#	src/controllers/GatewaysController.php
#	src/templates/settings/gateways/index.twig
@nfourtythree
fixed test
3f94a28
@nfourtythree
Fix cs
0aafd9e
@nfourtythree
Fix tests
2301e1f
@lukeholder
Merge pull request #3832 from craftcms/feature/back-order
2c93b72 
Allow purchasing products that are out of stock
@nfourtythree
Merge branch '5.3' into feature/show-read-only-settings-when-allowadm…
36eac93 
…inchanges-false
@nfourtythree
bump lock file
2ce9219
@nfourtythree
Fix cs
f72f906
@lukeholder
Merge pull request #3846 from craftcms/feature/show-read-only-setting…
541f05f 
…s-when-allowadminchanges-false

[5.3] Read-only settings
@brandonkelly
Translation cleanup
b0d6a14 
[ci skip]
@brandonkelly
Merge branch '4.8' of https://github.com/craftcms/commerce into 5.3
c938cc1
@brandonkelly
Don't use the 'commerce' t9n category in example templates
e2418f0
@brandonkelly
Merge branch '4.8' of https://github.com/craftcms/commerce into 5.3
e12f1d5
@brandonkelly
Don't use the 'commerce' t9n category in example templates
765bbf1
@brandonkelly
Translation cleanup
9e1be53 
[ci skip]
@nfourtythree
Fixed a bug where promotional price could be calculated incorrectly w…
4635a22 
…hen using sales
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.
5 participants
@lukeholder @nfourtythree @boboldehampsink @i-just @brandonkelly