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

4.7 #3629

Merged
merged 101 commits into from
Oct 16, 2024
Merged

4.7 #3629

merged 101 commits into from
Oct 16, 2024

Commits on Jun 21, 2024

  1. Add warning alert if upgrade command not completed

    @lukeholder
    lukeholder committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    3314d53 View commit details
    Browse the repository at this point in the history

  2. Code style

    @lukeholder
    lukeholder committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    77a1a59 View commit details
    Browse the repository at this point in the history

  3. Adjust language

    @AugustMiller
    AugustMiller committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    8023870 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. Start 4.7 WIP release notes

    @lukeholder
    lukeholder committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    0bccf5c View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. performance improvements

    @lukeholder
    lukeholder committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    9bd4047 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. #3132 Issue where it was impossible for store managers to remove all … 

    …coupon codes
    @nfourtythree
    nfourtythree committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    7137c70 View commit details
    Browse the repository at this point in the history

  2. #3132 Add “Require Coupon Code” lightswitch to discounts 

    This adds extra protection against discounts being accidentally applied when removing all coupon codes
    @nfourtythree
    nfourtythree committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    4489783 View commit details
    Browse the repository at this point in the history

  3. Changelog 

    [ci skip]
    @nfourtythree
    nfourtythree committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    374ae56 View commit details
    Browse the repository at this point in the history

  4. Run workflow for 4.7

    @nfourtythree
    nfourtythree committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    c08ce32 View commit details
    Browse the repository at this point in the history

  5. Merge branch '4.7' into feature/pt-1998-add-requires-coupon-code-ligh… 

    …tswitch-to-discounts
    @nfourtythree
    nfourtythree committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    ef8b0c3 View commit details
    Browse the repository at this point in the history

  6. fix cs

    @nfourtythree
    nfourtythree committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    c717c1e View commit details
    Browse the repository at this point in the history

  7. fix install typo

    @nfourtythree
    nfourtythree committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    9d91c3a View commit details
    Browse the repository at this point in the history

  8. No need for extra logic

    @nfourtythree
    nfourtythree committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    3ad5aa0 View commit details
    Browse the repository at this point in the history

  9. Merge branch '4.x' into 4.7

    @nfourtythree
    nfourtythree committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    76f1a3f View commit details
    Browse the repository at this point in the history

  10. Merge branch '4.7' into feature/pt-1998-add-requires-coupon-code-ligh… 

    …tswitch-to-discounts
    @nfourtythree
    nfourtythree committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    70a8c36 View commit details
    Browse the repository at this point in the history

  11. Fix tests

    @nfourtythree
    nfourtythree committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    46178fe View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. Merge branch '4.7' into feature/shipping-condition-performance

    @lukeholder
    lukeholder committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    dc130f3 View commit details
    Browse the repository at this point in the history

  2. Reapply "Performance improvement order condition on shipping" 

    This reverts commit b92e1be.
    @lukeholder
    lukeholder committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    dcd49a1 View commit details
    Browse the repository at this point in the history

  3. Improve cart performance

    @lukeholder
    lukeholder committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    165d875 View commit details
    Browse the repository at this point in the history

  4. Release notes

    @lukeholder
    lukeholder committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    ba3e1f8 View commit details
    Browse the repository at this point in the history

  5. Save if new in cart

    @lukeholder
    lukeholder committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    20323dc View commit details
    Browse the repository at this point in the history

  6. no need to save if it was forced saved

    @lukeholder
    lukeholder committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    c9f40f2 View commit details
    Browse the repository at this point in the history

  7. No need

    @lukeholder
    lukeholder committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    5daaf25 View commit details
    Browse the repository at this point in the history

  8. #3306 default new address creation on order edit to store’s country

    @nfourtythree
    nfourtythree committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    ddd7dd9 View commit details
    Browse the repository at this point in the history

  9. fix cs

    @nfourtythree
    nfourtythree committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    f60ac89 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Merge branch '4.x' into 4.7

    @nfourtythree
    nfourtythree committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    6dfad2b View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. Add events

    @lukeholder
    lukeholder committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    d301a62 View commit details
    Browse the repository at this point in the history

  2. Merge branch '4.7' into feature/upgrade-events

    @lukeholder
    lukeholder committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    50f3aab View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. Added “Variant Search” condition rule for product conditions #3689

    @nfourtythree
    nfourtythree committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    fac56cf View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3691 from craftcms/feature/pt-2164-4x5x-variant-s… 

    …earch-condition-rule-for-product-conditions

[4.7] Add "Variant Search" condition rule to product conditions
    @lukeholder
    lukeholder authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    76b8eaf View commit details
    Browse the repository at this point in the history

  3. Merge branch '4.7' into feature/pt-2142-4x-new-address-in-order-entry… 

    …-should-only-show-enabled

# Conflicts:
#	CHANGELOG-WIP.md
#	src/web/assets/commerceui/dist/js/app.js
#	src/web/assets/commerceui/dist/js/app.js.map
    @nfourtythree
    nfourtythree committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    74369f4 View commit details
    Browse the repository at this point in the history

  4. build JS

    @nfourtythree
    nfourtythree committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    98acbed View commit details
    Browse the repository at this point in the history

  5. Tidy changelog 

    [ci skip]
    @nfourtythree
    nfourtythree committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    7962a62 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3665 from craftcms/feature/pt-2142-4x-new-address… 

    …-in-order-entry-should-only-show-enabled

[4.7] Default selected country is the same as the store's location when creating a new address while editing an order
    @nfourtythree
    nfourtythree authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    cf23533 View commit details
    Browse the repository at this point in the history

  7. Merge branch '4.7' into feature/pt-1998-add-requires-coupon-code-ligh… 

    …tswitch-to-discounts

# Conflicts:
#	CHANGELOG-WIP.md
    @nfourtythree
    nfourtythree committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    69b8b21 View commit details
    Browse the repository at this point in the history

  8. Merge branch '4.x' into 4.7

    @nfourtythree
    nfourtythree committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    3f434d6 View commit details
    Browse the repository at this point in the history

  9. Merge branch '4.7' into feature/pt-1998-add-requires-coupon-code-ligh… 

    …tswitch-to-discounts
    @nfourtythree
    nfourtythree committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    c4818d2 View commit details
    Browse the repository at this point in the history

  10. fix cs

    @nfourtythree
    nfourtythree committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    cfe4ce3 View commit details
    Browse the repository at this point in the history

  11. Merge branch '4.7' into feature/pt-1998-add-requires-coupon-code-ligh… 

    …tswitch-to-discounts
    @nfourtythree
    nfourtythree committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    85c819d View commit details
    Browse the repository at this point in the history

  12. Merge pull request #3660 from craftcms/feature/pt-1998-add-requires-c… 

    …oupon-code-lightswitch-to-discounts

[4.7] Add require coupon code lightswitch to discounts
    @nfourtythree
    nfourtythree authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    1078f1e View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Merge branch '4.7' into feature/upgrade-events

    @nfourtythree
    nfourtythree authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    86c54b5 View commit details
    Browse the repository at this point in the history

  2. doc block tweak

    @nfourtythree
    nfourtythree committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    89062bb View commit details
    Browse the repository at this point in the history

  3. fix cs

    @nfourtythree
    nfourtythree committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    640b31a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3675 from craftcms/feature/upgrade-events 

    [4.7] Upgrade event
    @lukeholder
    lukeholder authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    4bc9cca View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. Merge branch '4.x' into feature/shipping-condition-performance

    @lukeholder
    lukeholder committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    895fb63 View commit details
    Browse the repository at this point in the history

  2. Fix php error

    @lukeholder
    lukeholder committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    f2d2c10 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Merge branch '4.7' into feature/shipping-condition-performance 

    # Conflicts:
#	CHANGELOG-WIP.md
    @lukeholder
    lukeholder committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    94bcfc9 View commit details
    Browse the repository at this point in the history

  2. Merge branch '4.x' into 4.7

    @lukeholder
    lukeholder committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    de7653e View commit details
    Browse the repository at this point in the history

  3. Merge branch '4.7' into feature/shipping-condition-performance

    @lukeholder
    lukeholder committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    d9f4239 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. Use teller class for order comparisons

    @lukeholder
    lukeholder committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    b33f689 View commit details
    Browse the repository at this point in the history

  2. cleanup

    @lukeholder
    lukeholder committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    55efd3c View commit details
    Browse the repository at this point in the history

  3. Use teller

    @lukeholder
    lukeholder committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    d2551dd View commit details
    Browse the repository at this point in the history

  4. release notes

    @lukeholder
    lukeholder committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    7261c91 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3712 from craftcms/feature/teller-rounding 

    [4.7] Use Teller for currency comparisons on the order
    @lukeholder
    lukeholder authored Oct 9, 2024
    Configuration menu
    Copy the full SHA
    0a11a07 View commit details
    Browse the repository at this point in the history

  6. Fix translation

    @lukeholder
    lukeholder committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    9ce7778 View commit details
    Browse the repository at this point in the history

  7. Merge branch '4.7' into feature/upgrade-warning

    @lukeholder
    lukeholder committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    1ec7779 View commit details
    Browse the repository at this point in the history

  8. More simple translations 

    Make v3 column map public
    @lukeholder
    lukeholder committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    e0739cc View commit details
    Browse the repository at this point in the history

  9. Merge branch '4.7' into feature/shipping-condition-performance

    @lukeholder
    lukeholder committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    94d518d View commit details
    Browse the repository at this point in the history

  10. Test

    @lukeholder
    lukeholder committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    9bfe91a View commit details
    Browse the repository at this point in the history

  11. Merge pull request #3550 from craftcms/feature/upgrade-warning 

    [4.7] Add warning alert if upgrade command is not completed
    @lukeholder
    lukeholder authored Oct 9, 2024
    Configuration menu
    Copy the full SHA
    72cd613 View commit details
    Browse the repository at this point in the history

  12. Add since tag

    @lukeholder
    lukeholder committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    2540239 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #3653 from craftcms/feature/shipping-condition-per… 

    …formance

[4.7] Performance improvements to shipping rule order condition formula matching
    @lukeholder
    lukeholder authored Oct 9, 2024
    Configuration menu
    Copy the full SHA
    a6efd8e View commit details
    Browse the repository at this point in the history

  14. Merge branch '4.x' into 4.7

    @lukeholder
    lukeholder committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    ebfe563 View commit details
    Browse the repository at this point in the history

  15. Release Notes 

    [ci skip]
    @lukeholder
    lukeholder committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    91cf9a3 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. Tweak

    @brandonkelly
    brandonkelly committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    fcc04a9 View commit details
    Browse the repository at this point in the history

  2. New translations commerce.php (French)

    @shinybrad
    shinybrad committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    3cb7de6 View commit details
    Browse the repository at this point in the history

  3. New translations commerce.php (German)

    @shinybrad
    shinybrad committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    353efc4 View commit details
    Browse the repository at this point in the history

  4. New translations commerce.php (Italian)

    @shinybrad
    shinybrad committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    cfcbdd8 View commit details
    Browse the repository at this point in the history

  5. New translations commerce.php (Japanese)

    @shinybrad
    shinybrad committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    7f5043d View commit details
    Browse the repository at this point in the history

  6. New translations commerce.php (Dutch)

    @shinybrad
    shinybrad committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    382e845 View commit details
    Browse the repository at this point in the history

  7. New translations commerce.php (Portuguese)

    @shinybrad
    shinybrad committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    d52a0f1 View commit details
    Browse the repository at this point in the history

  8. New translations commerce.php (Slovak)

    @shinybrad
    shinybrad committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    12ede84 View commit details
    Browse the repository at this point in the history

  9. New translations commerce.php (English, United Kingdom)

    @shinybrad
    shinybrad committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    dbd6316 View commit details
    Browse the repository at this point in the history

  10. New translations commerce.php (French, Canada)

    @shinybrad
    shinybrad committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    8a8c823 View commit details
    Browse the repository at this point in the history

  11. New translations commerce.php (Norwegian Bokmal)

    @shinybrad
    shinybrad committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    70aea9b View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. New translations commerce.php (Dutch)

    @shinybrad
    shinybrad committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    08a140e View commit details
    Browse the repository at this point in the history

  2. New translations commerce.php (French)

    @shinybrad
    shinybrad committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    36c0c94 View commit details
    Browse the repository at this point in the history

  3. New translations commerce.php (Slovak)

    @shinybrad
    shinybrad committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    7e79884 View commit details
    Browse the repository at this point in the history

  4. New translations commerce.php (French, Canada)

    @shinybrad
    shinybrad committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    01fbca5 View commit details
    Browse the repository at this point in the history

  5. New translations commerce.php (Italian)

    @shinybrad
    shinybrad committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    f5e15b9 View commit details
    Browse the repository at this point in the history

  6. New translations commerce.php (French, Canada)

    @shinybrad
    shinybrad committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    003f892 View commit details
    Browse the repository at this point in the history

  7. New translations commerce.php (Portuguese)

    @shinybrad
    shinybrad committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    7845a61 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Fixes duplicate carts created

    @lukeholder
    lukeholder committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    4caaaae View commit details
    Browse the repository at this point in the history

  2. oops

    @lukeholder
    lukeholder committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    ab45d9d View commit details
    Browse the repository at this point in the history

  3. Fix code style

    @lukeholder
    lukeholder committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    768a211 View commit details
    Browse the repository at this point in the history

  4. Merge branch '4.7' into feature/fix-extra-carts-created

    @lukeholder
    lukeholder committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    58b62a5 View commit details
    Browse the repository at this point in the history

  5. New translations commerce.php (Japanese)

    @shinybrad
    shinybrad committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    45d352d View commit details
    Browse the repository at this point in the history

  6. Better way

    @lukeholder
    lukeholder committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    8511332 View commit details
    Browse the repository at this point in the history

  7. Formatting

    @lukeholder
    lukeholder committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    83488b6 View commit details
    Browse the repository at this point in the history

  8. New translations commerce.php (Norwegian Bokmal)

    @shinybrad
    shinybrad committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    4fea406 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. cleanup

    @lukeholder
    lukeholder committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    1d3bc08 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3723 from craftcms/feature/fix-extra-carts-created 

    Fixes duplicate carts created
    @lukeholder
    lukeholder authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    7cb8d6f View commit details
    Browse the repository at this point in the history

  3. New translations commerce.php (German)

    @shinybrad
    shinybrad committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    9c9af70 View commit details
    Browse the repository at this point in the history

  4. Revert "Merge pull request #3723 from craftcms/feature/fix-extra-cart… 

    …s-created"

This reverts commit 7cb8d6f, reversing
changes made to 768a211.
    @lukeholder
    lukeholder committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    d5e0d83 View commit details
    Browse the repository at this point in the history

  5. Duplicate code

    @lukeholder
    lukeholder committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    f102342 View commit details
    Browse the repository at this point in the history

  6. code style

    @lukeholder
    lukeholder committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    0225837 View commit details
    Browse the repository at this point in the history

  7. Merge branch '4.x' into 4.7

    @lukeholder
    lukeholder committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    c8e7cdf View commit details
    Browse the repository at this point in the history

  8. Merge branch '4.x' into 4.7

    @lukeholder
    lukeholder committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    21adfa0 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #3717 from craftcms/t9n/4.7 

    New Crowdin updates
    @lukeholder
    lukeholder authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    f7afc78 View commit details
    Browse the repository at this point in the history

  10. Changelog tweaks 

    [ci skip]
    @brandonkelly
    brandonkelly committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    3a84c04 View commit details
    Browse the repository at this point in the history

  11. Merge branch '4.x' into 4.7

    @lukeholder
    lukeholder committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    f863c39 View commit details
    Browse the repository at this point in the history