Fix the local pickup price in the shipping type selector and pickup options (#8623)

* Fix local pickup price in the shipping type selector

- While calculating min and max value for local pickup, if the rate is not for local pickup, it will take already calculated lowest value instead of comparing it with the value of other shipping rate.

* Add the typecasting for price and tax to fix tax calculation

- We were concatenating the two strings instead of adding the integers. Add the typecasting for price and tax to fix it in local pickup.

---------

Co-authored-by: Saad Tarhi <[email protected]>

Author: 2 people

assets/js/blocks/checkout/inner-blocks/checkout-pickup-options-block/block.tsx

@@ -65,7 +65,7 @@ const renderPickupLocation = (
 	packageCount: number
 ): RadioControlOption => {
 	const priceWithTaxes = getSetting( 'displayCartPricesIncludingTax', false )
-		? option.price + option.taxes
+		? parseInt( option.price, 10 ) + parseInt( option.taxes, 10 )
 		: option.price;
 	const location = getPickupLocation( option );
 	const address = getPickupAddress( option );

assets/js/blocks/checkout/inner-blocks/checkout-shipping-method-block/shared/helpers.ts

@@ -84,7 +84,7 @@ export function getLocalPickupPrices(
 					lowestRate: CartShippingPackageShippingRate | undefined,
 					currentRate: CartShippingPackageShippingRate
 				) => {
-					if ( hasCollectableRate( currentRate.method_id ) ) {
+					if ( ! hasCollectableRate( currentRate.method_id ) ) {
 						return lowestRate;
 					}
 					if (
@@ -102,7 +102,7 @@ export function getLocalPickupPrices(
 					highestRate: CartShippingPackageShippingRate | undefined,
 					currentRate: CartShippingPackageShippingRate
 				) => {
-					if ( hasCollectableRate( currentRate.method_id ) ) {
+					if ( ! hasCollectableRate( currentRate.method_id ) ) {
 						return highestRate;
 					}
 					if (