Skip to content

5.3 #3740

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
Merged
merged 257 commits into from
Jan 30, 2025
Merged

5.3 #3740

merged 257 commits into from
Jan 30, 2025

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 29 commits November 13, 2024 15:43
@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
@shinybrad
New translations commerce.php (French)
990e85c
@shinybrad
New translations commerce.php (German)
ebf8c97
@shinybrad
New translations commerce.php (Italian)
9980699
@shinybrad
New translations commerce.php (Japanese)
91d808e
@shinybrad
New translations commerce.php (Dutch)
ddd12fa
@shinybrad
New translations commerce.php (Portuguese)
6856a44
@shinybrad
New translations commerce.php (Slovak)
78da604
@shinybrad
New translations commerce.php (English, United Kingdom)
e896a79
@shinybrad
New translations commerce.php (French, Canada)
77c7d14
@shinybrad
New translations commerce.php (Norwegian Bokmal)
3e302f8
@shinybrad
New translations commerce.php (French)
d16eae9
@shinybrad
New translations commerce.php (German)
d4cee17
@shinybrad
New translations commerce.php (Italian)
d7bab2d
@shinybrad
New translations commerce.php (Japanese)
68ff861
@shinybrad
New translations commerce.php (Dutch)
19953b2
@shinybrad
New translations commerce.php (Portuguese)
280f151
@shinybrad
New translations commerce.php (Slovak)
3a5ea4e
@shinybrad
New translations commerce.php (English, United Kingdom)
2fa8ba4
@shinybrad
New translations commerce.php (French, Canada)
a09a701
@shinybrad
New translations commerce.php (Norwegian Bokmal)
c66a51d
@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
shinybrad and others added 26 commits January 29, 2025 12:26
@shinybrad
New translations commerce.php (Dutch)
42cd8cf
@shinybrad
New translations commerce.php (Portuguese)
2a361a0
@shinybrad
New translations commerce.php (Slovak)
f74d4a5
@shinybrad
New translations commerce.php (English, United Kingdom)
fa118dd
@shinybrad
New translations commerce.php (French, Canada)
cb6eb6c
@shinybrad
New translations commerce.php (Norwegian Bokmal)
ff4069c
@nfourtythree
Make sure we permission check before adding the store to the selectab…
2aa213a 
…le stores
@nfourtythree
fix cs
f9ddcc9
@nfourtythree
Merge branch '5.x' into 5.3
f4e325c 
# Conflicts:
#	CHANGELOG.md
#	composer.lock
#	src/services/ShippingMethods.php
#	tests/unit/helpers/CurrencyHelperTest.php
@nfourtythree
Update workflow
43b4f1b
@nfourtythree
Added card view designers for subscription and transfer field layouts
6ed44bc 
[ci skip]
@shinybrad
Update source file commerce.php
7bb115a
@lukeholder
Keep you in the same settings section if possible
cf6a774
@lukeholder
Only show switcher if we have more than one store
91d6531
@lukeholder
Fix merge
a7850ae
@lukeholder
Add card designer to orders
3ea1727
@lukeholder
Fix transfers
fac9d51
@lukeholder
Cleanup
a479962
@lukeholder
inventory location could use a warehouse icon
fecff0f
@nfourtythree
Aria labels for future, tidy up nav/breadcrumb consistency
60f1c7f
@brandonkelly
Prep for 4.8.0
bd5b63d
@brandonkelly
Merge pull request #3865 from craftcms/4.8
75e8631 
4.8
@nfourtythree
Merge branch '4.x' into 5.3
695c1b2 
# Conflicts:
#	.github/workflows/ci.yml
#	CHANGELOG-WIP.md
#	CHANGELOG.md
#	src/templates/_layouts/store-settings.twig
#	src/templates/store-settings/paymentcurrencies/_edit.twig
#	src/templates/subscriptions/plans/_edit.twig
#	src/translations/en/commerce.php
@brandonkelly
Merge pull request #3869 from craftcms/t9n/5.3
2eaab6b 
New Crowdin updates
@brandonkelly
Prep for 5.3.0
83568bc
@brandonkelly
Merge branch '5.3' of https://github.com/craftcms/commerce into 5.3
33a4ecd
@brandonkelly brandonkelly marked this pull request as ready for review January 30, 2025 16:52
@brandonkelly brandonkelly requested a review from a team as a code owner January 30, 2025 16:52
@brandonkelly brandonkelly merged commit ce971ce into 5.x Jan 30, 2025
@brandonkelly brandonkelly deleted the 5.3 branch January 30, 2025 16:52
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.

6 participants

@lukeholder @brandonkelly @nfourtythree @shinybrad @i-just