Merge pull request #2128 from graphcommerce-org/bug/GCOM-1291-cannot-…

…delete-selected-region Bug/gcom 1291 cannot delete selected region
graphcommerce-org · Jan 4, 2024 · 65902f6 · 65902f6 · vercel · Jan 4, 2024
2 parents ba6b27b + 32880d9
commit 65902f6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/.changeset/perfect-pumas-invent.md b/.changeset/perfect-pumas-invent.md
@@ -0,0 +1,5 @@
+---
+'@graphcommerce/magento-customer': patch
+---
+
+Fixed bug which caused region to not be set properly if user swapped countries in the checkout process.
diff --git a/...to-cart-shipping-address/components/ShippingAddressForm/SetShippingBillingAddress.graphql b/...to-cart-shipping-address/components/ShippingAddressForm/SetShippingBillingAddress.graphql
@@ -7,6 +7,7 @@ mutation SetShippingBillingAddress(
   $city: String!
   $countryCode: String!
   $regionId: Int
+  $region: String
   $street: String!
   $houseNumber: String!
   $addition: String
@@ -26,6 +27,7 @@ mutation SetShippingBillingAddress(
             postcode: $postcode
             city: $city
             country_code: $countryCode
+            region: $region
             region_id: $regionId
             street: [$street, $houseNumber, $addition]
             telephone: $telephone
@@ -54,6 +56,7 @@ mutation SetShippingBillingAddress(
           postcode: $postcode
           city: $city
           country_code: $countryCode
+          region: $region
           region_id: $regionId
           street: [$street, $houseNumber, $addition]
           telephone: $telephone

diff --git a/...ages/magento-cart-shipping-address/components/ShippingAddressForm/ShippingAddressForm.tsx b/...ages/magento-cart-shipping-address/components/ShippingAddressForm/ShippingAddressForm.tsx
@@ -112,6 +112,7 @@ export const ShippingAddressForm = React.memo<ShippingAddressFormProps>((props)
       return {
         ...variables,
         telephone: variables.telephone || '000 - 000 0000',
+        region: regionId ? variables.region : '',
         regionId,
         customerNote: '',
         addition: variables.addition ?? '',