Skip to content
This repository has been archived by the owner on Feb 23, 2024. It is now read-only.

Ensure package names display correctly if only one item is in package #6815

Merged
merged 4 commits into from
Aug 2, 2022
Merged

Ensure package names display correctly if only one item is in package #6815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b1281b
Check package length >= 1 to show package name
opr Aug 2, 2022
b8e3b8a
Check shipping rates length in order shipping packages slot
opr Aug 2, 2022
95488bb
Fix TS error where boolean value could be undefined
opr Aug 2, 2022
5125973
Show items if there is more than one shipping rate
opr Aug 2, 2022
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
6 changes: 4 additions & 2 deletions assets/js/base/components/cart-checkout/shipping-rates-control/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ const Packages = ( {
key={ packageId }
packageId={ packageId }
packageData={ packageData }
collapsible={ collapsible }
collapse={ collapse }
collapsible={ !! collapsible }
collapse={ !! collapse }
showItems={
showItems || packageData?.shipping_rates?.length > 1
}
Expand Down Expand Up @@ -167,6 +167,7 @@ const ShippingRatesControl = ( {
ShippingRatesControlPackage,
},
context,
shippingRates,
};
const { isEditor } = useEditorContext();

Expand All @@ -192,6 +193,7 @@ const ShippingRatesControl = ( {
/>
<ExperimentalOrderShippingPackages>
<Packages
showItems={ shippingRates.length > 1 }
packages={ shippingRates }
noResultsMessage={ noResultsMessage }
renderOption={ renderOption }
Expand Down
3 changes: 2 additions & 1 deletion packages/checkout/components/order-shipping-packages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ const Slot = ( {
cart,
components,
context,
shippingRates,
} ) => {
const { fills } = useSlot( slotName );
const hasMultiplePackages = fills.length > 1;
const hasMultiplePackages = fills.length > 1 || shippingRates?.length > 1;
return (
<OrderShippingPackagesSlot
className={ classnames(
Expand Down