@wearejh/m2-pwa-checkout 0.30.0 → 0.31.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.31.0](https://github.com/WeareJH/mage-mono/compare/v0.30.0...v0.31.0) (2024-12-02)
+
+
+### Bug Fixes
+
+* **m2-pwa-checkout:** sned the city with the shipping estimation query (WOOD-2149) ([73d5341](https://github.com/WeareJH/mage-mono/commit/73d5341a9216b37eba5c6c1c69f4691f011206f5))
+
+
+
+
+
 # [0.30.0](https://github.com/WeareJH/mage-mono/compare/v0.29.0...v0.30.0) (2024-09-27)
 
 **Note:** Version bump only for package @wearejh/m2-pwa-checkout

package/lib/checkout.actions.ts

@@ -29,6 +29,7 @@ export type PaymentPendingParams = {
 };
 
 export type EstimateShippingParams = {
+    city?: string;
     country_id: string;
     postcode?: string;
     region?: string;

package/lib/hooks/useAddressChanges.ts

@@ -11,6 +11,7 @@ import { EstimateShippingByIdParams, EstimateShippingParams } from '../checkout.
 type PostcodeEvent = {
     type: 'postcode';
     payload: {
+        city: string | undefined;
         postcode: string | undefined;
         country_id: string | undefined;
         region: string | undefined;
@@ -44,13 +45,13 @@ export function useAddressChanges({ fetchDates, fetchDatesById, postcodeValidati
             filter((event) => event.type === 'select'),
             tap((event) => {
                 if (event.type === 'select') {
-                    const { id, postcode, country_id = 'GB' } = event.payload;
+                    const { city, id, postcode, country_id = 'GB' } = event.payload;
                     if (id && id !== -1 && id !== -2) {
                         fetchDatesById({ address_id: id });
                         return;
                     }
                     if (postcode) {
-                        fetchDates({ postcode, country_id });
+                        fetchDates({ city, postcode, country_id });
                     }
                 }
             }),
@@ -60,17 +61,18 @@ export function useAddressChanges({ fetchDates, fetchDatesById, postcodeValidati
             filter((event) => event.type === 'postcode'),
             debounceTime(300),
             filter((x) => {
-                const { postcode, country_id, region, region_id } = x.payload;
+                const { city, postcode, country_id, region, region_id } = x.payload;
                 if (postcode) {
                     return !postcodeValidation()(x.payload.postcode);
                 }
-                if (country_id || region || region_id) {
+                if (city || country_id || region || region_id) {
                     return true;
                 }
                 return false;
             }),
             tap((event) => {
                 fetchDates({
+                    city: event.payload.city,
                     postcode: event.payload.postcode,
                     country_id: event.payload.country_id || 'GB',
                     region: event.payload.region,
@@ -104,6 +106,7 @@ export const useAddressEvents = (props: InnerProps) => {
 
     const address_id = useFieldValue(Fields.address_id);
     const postcode = useFieldValue(Fields.postcode);
+    const city = useFieldValue(Fields.city);
     const country_id = useFieldValue(Fields.country_id);
     const region = useFieldValue(Fields.region);
     const region_id = useFieldValue(Fields.region_id);
@@ -136,10 +139,10 @@ export const useAddressEvents = (props: InnerProps) => {
         const send = () =>
             events.next({
                 type: 'postcode',
-                payload: { postcode: postcode, country_id: country_id, region, region_id },
+                payload: { city, postcode: postcode, country_id: country_id, region, region_id },
             });
 
-        if ((postcode || country_id || region || region_id) && !initial.current) {
+        if ((city || postcode || country_id || region || region_id) && !initial.current) {
             initial.current = true;
             setTimeout(send, 0);
         } else {
@@ -147,5 +150,5 @@ export const useAddressEvents = (props: InnerProps) => {
                 send();
             }
         }
-    }, [events, initial, postcode, country_id, region, region_id]);
+    }, [events, initial, city, postcode, country_id, region, region_id]);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wearejh/m2-pwa-checkout",
-    "version": "0.30.0",
+    "version": "0.31.0",
     "description": "> TODO: description",
     "author": "Shane Osbourne <shane.osbourne8@gmail.com>",
     "homepage": "",
@@ -18,15 +18,15 @@
     ],
     "scripts": {},
     "dependencies": {
-        "@wearejh/m2-pwa-addresses": "^0.30.0",
-        "@wearejh/m2-pwa-cart": "^0.30.0",
-        "@wearejh/m2-pwa-engine": "^0.30.0",
-        "@wearejh/m2-pwa-user": "^0.30.0",
-        "@wearejh/rx-form": "^0.30.0",
-        "@wearejh/swagger-rxjs": "^0.30.0"
+        "@wearejh/m2-pwa-addresses": "^0.31.0",
+        "@wearejh/m2-pwa-cart": "^0.31.0",
+        "@wearejh/m2-pwa-engine": "^0.31.0",
+        "@wearejh/m2-pwa-user": "^0.31.0",
+        "@wearejh/rx-form": "^0.31.0",
+        "@wearejh/swagger-rxjs": "^0.31.0"
     },
     "devDependencies": {
         "@reach/dialog": "0.8.2"
     },
-    "gitHead": "f8e8f2cf23751858479e7127ce0143ca11b149e9"
+    "gitHead": "5b654ab21cf7d6ad199e579e8b62d9f4dd67dbd7"
 }