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.

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

5.3 #3740

Merged
merged 257 commits into from
Jan 30, 2025
Merged

5.3 #3740

Changes from 1 commit
Commits
Show all changes
257 commits
Select commit Hold shift + click to select a range
2ef66f8
Add env support for email email fields
lukeholder Nov 13, 2024
842b6d4
Merge branch '5.x' into 5.3
lukeholder Nov 13, 2024
ae351db
Merge branch '5.x' into 5.3
nfourtythree Nov 14, 2024
990e85c
New translations commerce.php (French)
shinybrad Nov 15, 2024
ebf8c97
New translations commerce.php (German)
shinybrad Nov 15, 2024
9980699
New translations commerce.php (Italian)
shinybrad Nov 15, 2024
91d808e
New translations commerce.php (Japanese)
shinybrad Nov 15, 2024
ddd12fa
New translations commerce.php (Dutch)
shinybrad Nov 15, 2024
6856a44
New translations commerce.php (Portuguese)
shinybrad Nov 15, 2024
78da604
New translations commerce.php (Slovak)
shinybrad Nov 15, 2024
e896a79
New translations commerce.php (English, United Kingdom)
shinybrad Nov 15, 2024
77c7d14
New translations commerce.php (French, Canada)
shinybrad Nov 15, 2024
3e302f8
New translations commerce.php (Norwegian Bokmal)
shinybrad Nov 15, 2024
d16eae9
New translations commerce.php (French)
shinybrad Nov 15, 2024
d4cee17
New translations commerce.php (German)
shinybrad Nov 15, 2024
d7bab2d
New translations commerce.php (Italian)
shinybrad Nov 15, 2024
68ff861
New translations commerce.php (Japanese)
shinybrad Nov 15, 2024
19953b2
New translations commerce.php (Dutch)
shinybrad Nov 15, 2024
280f151
New translations commerce.php (Portuguese)
shinybrad Nov 15, 2024
3a5ea4e
New translations commerce.php (Slovak)
shinybrad Nov 15, 2024
2fa8ba4
New translations commerce.php (English, United Kingdom)
shinybrad Nov 15, 2024
a09a701
New translations commerce.php (French, Canada)
shinybrad Nov 15, 2024
c66a51d
New translations commerce.php (Norwegian Bokmal)
shinybrad Nov 15, 2024
e98efbb
Merge branch '5.x' into 5.3
nfourtythree Nov 18, 2024
9f0e2be
Add coupon code condition rule and element query param
nfourtythree Nov 18, 2024
ebf639b
Fix order query coupon code, should be case-insensitive
nfourtythree Nov 19, 2024
664fc0f
`CouponCodeConditionRule` re-implements `matchValue()` method to be c…
nfourtythree Nov 19, 2024
f372059
Make sure the discount order condition doesn’t have the coupon code rule
nfourtythree Nov 19, 2024
597f93a
Add `CouponCodeConditionRule` to `OrderConditionTest`
nfourtythree Nov 19, 2024
609551c
Add `CouponCodeConditionRuleTest`
nfourtythree Nov 19, 2024
df8d99e
Merge branch '5.x' into 5.3
nfourtythree Nov 19, 2024
de72552
include the original cart if cart has errors
lukeholder Nov 20, 2024
c881d80
FIx php docs
lukeholder Nov 20, 2024
5d5b1b8
Merge branch '5.3' into feature/5.3-email-env-support
lukeholder Nov 20, 2024
2b5e493
Merge pull request #3761 from craftcms/feature/5.3-email-env-support
lukeholder Nov 20, 2024
3c3b05f
cleanup
lukeholder Nov 20, 2024
e7a1580
Merge branch '5.3' into feature/5.x-purgeevent
lukeholder Nov 20, 2024
a1fa1bf
release notes
lukeholder Nov 20, 2024
714f74f
Bump Craft requirement
nfourtythree Nov 21, 2024
2420860
WIP Card layout designer
nfourtythree Nov 21, 2024
7ca145f
Changelog
nfourtythree Nov 21, 2024
2d14040
Merge branch '5.x' into 5.3
nfourtythree Nov 28, 2024
c4079f8
Merge branch '5.3' into feature/pt-2318-products-variants-card-view-d…
nfourtythree Nov 28, 2024
92fc28f
WIP variant card attributes
nfourtythree Nov 28, 2024
c69ca44
Merge branch '5.x' into 5.3
lukeholder Dec 3, 2024
50161cb
Enabled option for taxrates
lukeholder Dec 4, 2024
7a7fb15
updates
lukeholder Dec 4, 2024
b347d13
Merge branch '5.x' into 5.3
nfourtythree Dec 4, 2024
5daeac9
WIP inventory item steamline
nfourtythree Dec 5, 2024
483fdb4
Merge branch '5.x' into 5.3
nfourtythree Dec 5, 2024
d8c2d48
Merge branch '5.3' into feature/com-271-improve-purchasable-stock-upd…
nfourtythree Dec 5, 2024
78e1f4b
Tidy
nfourtythree Dec 5, 2024
f5ebebf
Add `Purchasable::setStockLevel()`
nfourtythree Dec 5, 2024
f9b4fae
Added `Iventory::updateInventoryLevel()`
nfourtythree Dec 5, 2024
026b521
fix cs
nfourtythree Dec 5, 2024
4f007fa
fix default location
nfourtythree Dec 5, 2024
99bb3f8
Add exception to stop being able to set stock level on an unsaved pur…
nfourtythree Dec 5, 2024
134d83c
Tidy
nfourtythree Dec 5, 2024
4ffa9b6
Switch to just using service method for updating purchasable inventor…
nfourtythree Dec 6, 2024
f29a51a
Fix cs
nfourtythree Dec 6, 2024
71b377a
Merge branch '5.x' into 5.3
nfourtythree Dec 10, 2024
670336f
Merge branch '5.3' into feature/pt-2318-products-variants-card-view-d…
nfourtythree Dec 10, 2024
0d7ec5f
Move card attributes to purchasable class
nfourtythree Dec 10, 2024
ae5601c
fix cs
nfourtythree Dec 10, 2024
5e68d3f
Merge branch '5.x' into feature/5.3-teller
lukeholder Dec 11, 2024
27e8bf6
Add teller as public order function
lukeholder Dec 11, 2024
225c924
Added product condition rule for variant conditions
nfourtythree Dec 11, 2024
b6c5f03
fix cs
nfourtythree Dec 11, 2024
af0c5e5
fix rename
lukeholder Dec 11, 2024
7aa9cab
Merge branch '5.3' into feature/pt-2315-add-coupon-code-order-conditi…
nfourtythree Dec 11, 2024
e563b00
Merge pull request #3811 from craftcms/feature/pt-2343-product-condit…
nfourtythree Dec 11, 2024
27211fe
Merge branch '5.3' into feature/com-271-improve-purchasable-stock-upd…
nfourtythree Dec 11, 2024
c8105c9
Merge pull request #3801 from craftcms/feature/com-271-improve-purcha…
nfourtythree Dec 11, 2024
e83628d
Merge branch '5.3' into feature/5.3-teller
lukeholder Dec 11, 2024
ca0f88b
Merge branch '5.3' into feature/5.3-teller
lukeholder Dec 11, 2024
dd8b60f
float returns
lukeholder Dec 11, 2024
dfd4460
Merge branch '5.3' into feature/pt-2315-add-coupon-code-order-conditi…
nfourtythree Dec 11, 2024
6b584c5
Merge pull request #3777 from craftcms/feature/pt-2315-add-coupon-cod…
nfourtythree Dec 11, 2024
86d305b
Merge branch '5.3' into feature/5.3-teller
lukeholder Dec 11, 2024
ee8aea0
Merge branch '5.3' into feature/pt-2318-products-variants-card-view-d…
nfourtythree Dec 11, 2024
87db3ad
Merge pull request #3809 from craftcms/feature/pt-2318-products-varia…
nfourtythree Dec 11, 2024
27a3b34
Merge branch '5.3' into feature/5.x-purgeevent
lukeholder Dec 11, 2024
35311c0
Merge branch '5.3' into feature/enabled-tax-rates
lukeholder Dec 11, 2024
8d538c5
Release notes
lukeholder Dec 11, 2024
d89ccf9
Update lock file
lukeholder Dec 11, 2024
ff35432
Merge branch 'feature/5.x-purgeevent' into 5.3
lukeholder Dec 11, 2024
64f8da8
Merge branch '5.3' into feature/5.3-teller
lukeholder Dec 11, 2024
d46c4f0
Merge pull request #3798 from craftcms/feature/enabled-tax-rates
lukeholder Dec 11, 2024
e07bc7f
Merge pull request #3810 from craftcms/feature/5.3-teller
lukeholder Dec 11, 2024
362f473
release notes
lukeholder Dec 11, 2024
c91726a
Add variant restore
lukeholder Dec 17, 2024
70a4ba6
translations
lukeholder Dec 17, 2024
2250f99
WIP
lukeholder Dec 31, 2024
c534f9a
Remove this from the available flag which is seperate from the stock …
lukeholder Dec 31, 2024
db4c592
WIP
lukeholder Dec 31, 2024
ec4aa8b
Leave as is
lukeholder Dec 31, 2024
e44f839
Cleanup
lukeholder Jan 3, 2025
38f291c
fixes
lukeholder Jan 3, 2025
bb90895
Small tidy
nfourtythree Jan 3, 2025
42931fe
Add missing install column
nfourtythree Jan 3, 2025
6ab43d6
fix install migration
lukeholder Jan 3, 2025
fef9ec0
rename things
lukeholder Jan 3, 2025
11a5614
release notes
lukeholder Jan 3, 2025
447644c
Merge branch '5.x' into 5.3
lukeholder Jan 8, 2025
2f95e79
rebuild js
lukeholder Jan 8, 2025
a2bdcb4
Merge branch '5.3' into feature/back-order
lukeholder Jan 8, 2025
8df0c77
update
lukeholder Jan 8, 2025
53ab687
add changelog WIP
nfourtythree Jan 13, 2025
abee563
Update CI
nfourtythree Jan 13, 2025
9e71fd9
Merge branch '4.x' into 4.8
nfourtythree Jan 13, 2025
d2d6765
Start of ready only settings
lukeholder Jan 14, 2025
9b6dc50
cleanup
lukeholder Jan 14, 2025
f6f1dd8
General settings readonly
lukeholder Jan 14, 2025
697cfe4
Show archived gateways table
nfourtythree Jan 14, 2025
27877db
Changelog
nfourtythree Jan 14, 2025
887818b
WIP
lukeholder Jan 15, 2025
e7668df
WIP
lukeholder Jan 15, 2025
5066932
WIP
lukeholder Jan 15, 2025
0676517
remove debug
lukeholder Jan 15, 2025
6e87607
not needed
lukeholder Jan 15, 2025
cb1a5ea
Leave this css
lukeholder Jan 15, 2025
b16ff8c
Override the ownerType to speed up nested element trait lookup
lukeholder Jan 15, 2025
f585991
added disabled class to the settings > emails > email > recipients field
i-just Jan 16, 2025
ff64c27
moved the disabled attr for the order/line item status colour field
i-just Jan 16, 2025
2c676e3
WIP
lukeholder Jan 22, 2025
ff57179
Merge branch '4.x' into feature/4.8-tax-id-validators
lukeholder Jan 22, 2025
0420bc5
reenabled cache
lukeholder Jan 22, 2025
703e77c
Update address validator
lukeholder Jan 22, 2025
57ec5d3
Remove uneeded
lukeholder Jan 22, 2025
dab6281
Remove uneeded
lukeholder Jan 22, 2025
c74daf1
fix comments
lukeholder Jan 22, 2025
7c0f2a5
validator should be format first
lukeholder Jan 22, 2025
0bc175f
code comments
lukeholder Jan 22, 2025
918c99c
use non deprecated method
lukeholder Jan 22, 2025
e1ea047
Cleanup
lukeholder Jan 22, 2025
bab522b
cleanup
lukeholder Jan 22, 2025
a4b93f7
Missing translation
lukeholder Jan 22, 2025
3c4f28f
Not needed
lukeholder Jan 22, 2025
7b72043
fixes
lukeholder Jan 22, 2025
1e464b8
Cleanup
lukeholder Jan 22, 2025
259e662
Merge branch '4.x' into 4.8
nfourtythree Jan 22, 2025
d3b05d6
Merge branch '4.8' into feature/4.8-tax-id-validators
lukeholder Jan 22, 2025
b542f43
Merge pull request #3847 from craftcms/feature/pt-2373-4x-getgatewayb…
nfourtythree Jan 22, 2025
96f0d56
Add release notes
lukeholder Jan 22, 2025
0673e0b
Merge branch '4.8' into feature/4.8-tax-id-validators
lukeholder Jan 22, 2025
9e672d9
Cleanup
lukeholder Jan 22, 2025
a6d080b
Fix tests
lukeholder Jan 22, 2025
2a6092d
Merge pull request #3857 from craftcms/feature/4.8-tax-id-validators
lukeholder Jan 22, 2025
b5fd51c
Merge branch '4.8' into 5.3
lukeholder Jan 22, 2025
b9b2021
Fix install migration
lukeholder Jan 22, 2025
b5059e0
Fix missing safe attribute
lukeholder Jan 22, 2025
d925c75
Merge branch '5.3' into feature/back-order
nfourtythree Jan 22, 2025
efd03a9
fix infinite loop
nfourtythree Jan 22, 2025
57466e3
fix cs
nfourtythree Jan 22, 2025
ab54925
Fix merge issues
nfourtythree Jan 22, 2025
385b8e1
Fix cart test
nfourtythree Jan 22, 2025
6355bff
Fix cs
nfourtythree Jan 22, 2025
41511b3
Merge branch '5.3' into feature/show-read-only-settings-when-allowadm…
nfourtythree Jan 22, 2025
3f94a28
fixed test
nfourtythree Jan 22, 2025
0aafd9e
Fix cs
nfourtythree Jan 22, 2025
2301e1f
Fix tests
nfourtythree Jan 22, 2025
2c93b72
Merge pull request #3832 from craftcms/feature/back-order
lukeholder Jan 22, 2025
36eac93
Merge branch '5.3' into feature/show-read-only-settings-when-allowadm…
nfourtythree Jan 22, 2025
2ce9219
bump lock file
nfourtythree Jan 22, 2025
f72f906
Fix cs
nfourtythree Jan 22, 2025
541f05f
Merge pull request #3846 from craftcms/feature/show-read-only-setting…
lukeholder Jan 22, 2025
b0d6a14
Translation cleanup
brandonkelly Jan 22, 2025
c938cc1
Merge branch '4.8' of https://github.com/craftcms/commerce into 5.3
brandonkelly Jan 22, 2025
e2418f0
Don't use the 'commerce' t9n category in example templates
brandonkelly Jan 22, 2025
e12f1d5
Merge branch '4.8' of https://github.com/craftcms/commerce into 5.3
brandonkelly Jan 22, 2025
765bbf1
Don't use the 'commerce' t9n category in example templates
brandonkelly Jan 22, 2025
9e1be53
Translation cleanup
brandonkelly Jan 22, 2025
687912a
New translations commerce.php (French)
shinybrad Jan 22, 2025
b5db2e0
New translations commerce.php (German)
shinybrad Jan 22, 2025
c834e32
New translations commerce.php (Italian)
shinybrad Jan 22, 2025
3652941
New translations commerce.php (Japanese)
shinybrad Jan 22, 2025
f186aea
New translations commerce.php (Dutch)
shinybrad Jan 22, 2025
364502a
New translations commerce.php (Portuguese)
shinybrad Jan 22, 2025
f8d0d64
New translations commerce.php (Slovak)
shinybrad Jan 22, 2025
f0fde27
New translations commerce.php (English, United Kingdom)
shinybrad Jan 22, 2025
afe04f9
New translations commerce.php (French, Canada)
shinybrad Jan 22, 2025
42f96fb
New translations commerce.php (Norwegian Bokmal)
shinybrad Jan 22, 2025
4635a22
Fixed a bug where promotional price could be calculated incorrectly w…
nfourtythree Jan 23, 2025
731dcb7
New translations commerce.php (French)
shinybrad Jan 27, 2025
e05bf5a
New translations commerce.php (German)
shinybrad Jan 27, 2025
4e7a18e
New translations commerce.php (Dutch)
shinybrad Jan 27, 2025
b136f41
New translations commerce.php (Portuguese)
shinybrad Jan 27, 2025
b732b61
New translations commerce.php (French, Canada)
shinybrad Jan 27, 2025
f7c6697
New translations commerce.php (Japanese)
shinybrad Jan 28, 2025
d1b9f3e
New translations commerce.php (Norwegian Bokmal)
shinybrad Jan 28, 2025
114d18d
New translations commerce.php (French)
shinybrad Jan 28, 2025
dac8561
New translations commerce.php (Italian)
shinybrad Jan 28, 2025
b815b4f
Persist `makePrimaryShippingAddress` and `makePrimaryBillingAddress` …
lukeholder Jan 28, 2025
85a7c7d
release notes
lukeholder Jan 28, 2025
8ae11a2
New translations commerce.php (Slovak)
shinybrad Jan 28, 2025
b4c3f32
Always clear the flags
lukeholder Jan 28, 2025
9dd91a8
Merge pull request #3770 from craftcms/t9n/4.x
brandonkelly Jan 28, 2025
8043901
Merge pull request #3861 from craftcms/t9n/5.3
brandonkelly Jan 28, 2025
89d1cc2
notes field should be text on upgrade
lukeholder Jan 28, 2025
0d19235
Cleaup
lukeholder Jan 28, 2025
334d748
Merge branch '4.x' into 4.8
lukeholder Jan 28, 2025
002b523
Fix install migration
lukeholder Jan 29, 2025
3576492
Merge pull request #3864 from craftcms/feature/5.3-persist-make-primary
lukeholder Jan 29, 2025
a845385
Fix #3844
lukeholder Jan 29, 2025
9e0d322
Release notes
lukeholder Jan 29, 2025
0233631
Use discount storeId
lukeholder Jan 29, 2025
ee1f225
Tidy example templates
nfourtythree Jan 29, 2025
5814d26
Merge branch '4.x' of github.com:craftcms/commerce into 4.x
nfourtythree Jan 29, 2025
5ec9b8f
Fix pay static template
nfourtythree Jan 29, 2025
46e83a1
Merge pull request #3866 from craftcms/feature/fix-discount-condition
lukeholder Jan 29, 2025
56b3060
Changelog tweaks
brandonkelly Jan 29, 2025
fab5dfa
Changelog tweaks
brandonkelly Jan 29, 2025
6225172
Fix alignment
lukeholder Jan 29, 2025
d9f27e0
Improved navigation and breadcrumb labels
nfourtythree Jan 29, 2025
c133fea
Merge branch '4.x' into 4.8
nfourtythree Jan 29, 2025
842172a
Changelog item
nfourtythree Jan 29, 2025
cd05250
Merge branch '4.8' into 5.3
nfourtythree Jan 29, 2025
9274d74
Update breadcrumbs and nav
nfourtythree Jan 29, 2025
79eedb9
Orders selected subnav
nfourtythree Jan 29, 2025
71d6da2
Create proper store switcher in store management
nfourtythree Jan 29, 2025
2ddfae6
New translations commerce.php (French)
shinybrad Jan 29, 2025
7f66d9d
New translations commerce.php (German)
shinybrad Jan 29, 2025
33468ea
New translations commerce.php (Italian)
shinybrad Jan 29, 2025
d466a76
New translations commerce.php (Japanese)
shinybrad Jan 29, 2025
42cd8cf
New translations commerce.php (Dutch)
shinybrad Jan 29, 2025
2a361a0
New translations commerce.php (Portuguese)
shinybrad Jan 29, 2025
f74d4a5
New translations commerce.php (Slovak)
shinybrad Jan 29, 2025
fa118dd
New translations commerce.php (English, United Kingdom)
shinybrad Jan 29, 2025
cb6eb6c
New translations commerce.php (French, Canada)
shinybrad Jan 29, 2025
ff4069c
New translations commerce.php (Norwegian Bokmal)
shinybrad Jan 29, 2025
2aa213a
Make sure we permission check before adding the store to the selectab…
nfourtythree Jan 29, 2025
f9ddcc9
fix cs
nfourtythree Jan 29, 2025
f4e325c
Merge branch '5.x' into 5.3
nfourtythree Jan 29, 2025
43b4f1b
Update workflow
nfourtythree Jan 29, 2025
6ed44bc
Added card view designers for subscription and transfer field layouts
nfourtythree Jan 29, 2025
7bb115a
Update source file commerce.php
shinybrad Jan 29, 2025
cf6a774
Keep you in the same settings section if possible
lukeholder Jan 30, 2025
91d6531
Only show switcher if we have more than one store
lukeholder Jan 30, 2025
a7850ae
Fix merge
lukeholder Jan 30, 2025
3ea1727
Add card designer to orders
lukeholder Jan 30, 2025
fac9d51
Fix transfers
lukeholder Jan 30, 2025
a479962
Cleanup
lukeholder Jan 30, 2025
fecff0f
inventory location could use a warehouse icon
lukeholder Jan 30, 2025
60f1c7f
Aria labels for future, tidy up nav/breadcrumb consistency
nfourtythree Jan 30, 2025
bd5b63d
Prep for 4.8.0
brandonkelly Jan 30, 2025
75e8631
Merge pull request #3865 from craftcms/4.8
brandonkelly Jan 30, 2025
695c1b2
Merge branch '4.x' into 5.3
nfourtythree Jan 30, 2025
2eaab6b
Merge pull request #3869 from craftcms/t9n/5.3
brandonkelly Jan 30, 2025
83568bc
Prep for 5.3.0
brandonkelly Jan 30, 2025
33a4ecd
Merge branch '5.3' of https://github.com/craftcms/commerce into 5.3
brandonkelly Jan 30, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix cs
nfourtythree committed Jan 22, 2025
commit 57466e35fa01c406d53ea129f91e6a6156dd155f
1 change: 0 additions & 1 deletion src/behaviors/ValidateOrganizationTaxIdBehavior.php
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@
use craft\commerce\Plugin;
use craft\elements\Address;
use craft\events\DefineRulesEvent;
use Exception;
use RuntimeException;
use yii\base\Behavior;
use yii\base\InvalidConfigException;