This repository has been archived by the owner on Feb 23, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 219
Mini-Cart: don't include shipping price #9914
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Aljullu
added
status: needs review
skip-changelog
PRs that you don't want to appear in the changelog.
block: mini-cart
Issues related to the Mini-Cart block.
labels
Jun 20, 2023
woocommercebot
requested review from
a team and
gigitux
and removed request for
a team
June 20, 2023 12:01
The release ZIP for this PR is accessible via:
Script Dependencies ReportThe
This comment was automatically generated by the TypeScript Errors Report
🎉 🎉 This PR does not introduce new TS errors. |
Size Change: +20 B (0%) Total Size: 1.1 MB
ℹ️ View Unchanged
|
Aljullu
force-pushed
the
fix/mini-cart-dont-include-shipping-in-total
branch
from
June 20, 2023 12:07
7e5c0b2
to
dd9299f
Compare
kmanijak
approved these changes
Jun 20, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch @Aljullu! Works correctly!
github-actions
bot
added
status: ready to merge
and removed
status: needs review
labels
Jun 20, 2023
gigitux
pushed a commit
that referenced
this pull request
Jun 20, 2023
gigitux
pushed a commit
that referenced
this pull request
Jun 20, 2023
gigitux
added a commit
that referenced
this pull request
Jun 21, 2023
* Empty commit for release pull request * Update Hero Product 3-split pattern image * Update Banner Pattern To Replace Unsplash Image (#9760) * Update Banner to replace Unsplash image. Replaces the Unsplash image with a CCO licensed image from Pxhere. Also updates the CTA button to link to the Shop page, by default. * Remove extra padding from top of test column. Vertical alignment was off on the text column due to 60px of top padding. This aligns everythign, as expected. * Update Chessboard pattern images (#9761) * Updathe the Hero Product Split (#9762) * Remove unused pattern image (#9763) * Update Images for the Product Details Patterns (#9764) * Update image for the Product Hero pattern. Replace the Unsplash image with a CCO licensed image from Pxhere. * Update images for Prod List Gallery Desc pattern Replace the Unsplash image with a CCO licensed image from Pxhere for the Product Listing with Gallery and Description pattern. * Remove unneeded Unsplash images. * Update copy for Prod Listing Gallery Desc pattern. * Optimize new image exports. * Update image for the Product Listing pattern. Replace the Unsplash image with a CCO licensed image from Pxhere. * Update images for Product Details pattern. Replace the Unsplash images with CCO licensed images from Pxhere. * Remove unneeded Unsplash image. * Use Relative URLs for Images in the Product Listing Pattern This commit replaces hardcoded URLs with dynamic ones for image placeholders in the `product-listing-with-gallery-and-description.php` pattern file. - The `plugins_url()` function is now used to generate URLs, which correctly points to the images folder within the WooCommerce Blocks plugin directory. This approach provides better flexibility and portability since it doesn't rely on a specific domain or path. The `esc_url()` function is used to ensure the URL is safe to use in the HTML context. - The change is made for a total of four images in the pattern. --------- Co-authored-by: Manish Menaria <the.manish.menaria@gmail.com> * Update/patterns featured category product collection (#9765) * Update image for featured category focus pattern * Update image for featured category cover image pattern * Update images for featured category triple pattern * Change to wide width * Update links to buttons * Fix typo in hex color value. There was an extra `f` in the hex color value, causing the text to unexpectedly render black. --------- Co-authored-by: Daniel W. Robert <danielwrobert@gmail.com> * Update/collection pattern images (#9766) * Update featured collections images * Add shop link to shop by price pattern * Update hero product pattern title (#9769) * Remove unused pattern image (#9770) * Add 10.4.2 changelog in readme.txt * Update version number to 10.4.2 * Add testing instructions for 10.4.2 * Add 9769 PR testing steps * WooCommerce Classic Template block: Fix error on clearing customizations on Woo Templates (#9759) * Fix Classic Template block error on clearing customizations on template * Add link to issue in JS Doc * Change the way of debug check of tests-mysql container (#9794) * Add alt text to images used in patterns describing their purpose (#9788) * Add alt text to images used in patterns describing their purpose * Replace 1/3 notation with 1 out of 3, so it's better handled byt screen readers * Update testing instructions to include 9759 PR * Update zip to include 9759 PR * Remove 9759 PR from testing instructions * Mini Cart Block: show the total price, including tax, according to the option (#9878) * Mini Cart Block: show the total price, including tax, according to the option * Fix tests in PR 9878 (#9880) * add unit test --------- Co-authored-by: Karol Manijak <karol.manijak@automattic.com> * Mini-Cart: don't include shipping price (#9914) * Products Block: fix grid view with Gutenberg 16 (#9916) * Revert "fix products block layout on gutenberg 16 (#9886)" This reverts commit f1e5dd7. * add post_template_has_support_for_grid_view setting * add testing instructions * bump version * update zip link * Empty commit for release pull request * update link --------- Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Alba Rincón <alba.rincon@automattic.com> Co-authored-by: Daniel W. Robert <danielwrobert@users.noreply.github.com> Co-authored-by: Alba Rincón <albarin@users.noreply.github.com> Co-authored-by: Manish Menaria <the.manish.menaria@gmail.com> Co-authored-by: Roy Ho <roykho77@gmail.com> Co-authored-by: Daniel W. Robert <danielwrobert@gmail.com> Co-authored-by: Tarun Vijwani <tarun.vijwani@automattic.com> Co-authored-by: Alexandre Lara <allexandrelara@gmail.com> Co-authored-by: Karol Manijak <karol.manijak@automattic.com> Co-authored-by: Luigi Teschio <gigitux@gmail.com> Co-authored-by: Albert Juhé Lluveras <contact@albertjuhe.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
block: mini-cart
Issues related to the Mini-Cart block.
skip-changelog
PRs that you don't want to appear in the changelog.
type: bug
The issue/PR concerns a confirmed bug.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR modifies the calculation added in #9878, so we use
total_items
+total_items_tax
instead of usingtotal_price
, which might include shipping or other values. This is aligned with what we are doing in the Mini-Cart block TSX code:woocommerce-blocks/assets/js/blocks/mini-cart/block.tsx
Lines 207 to 210 in d7652f3
Testing
User Facing Testing
These testing notes override the ones from #9878.
WooCommerce Visibility