From fbbb1509ce87e8946021a3a1380fbc86f831f240 Mon Sep 17 00:00:00 2001
From: Lorenz Meyer <lm@bible.ch>
Date: Wed, 23 Nov 2022 09:23:28 +0100
Subject: [PATCH] Fix: changing the country creates a new address

---
 templates/checkout/_partials/address-form.tpl    | 2 +-
 templates/checkout/_partials/steps/addresses.tpl | 2 +-
 templates/customer/_partials/address-form.tpl    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/checkout/_partials/address-form.tpl b/templates/checkout/_partials/address-form.tpl
index b634873e..8ed915b5 100644
--- a/templates/checkout/_partials/address-form.tpl
+++ b/templates/checkout/_partials/address-form.tpl
@@ -13,7 +13,7 @@
       method="POST"
       action="{url entity='order' params=['id_address' => $id_address]}"
       data-id-address="{$id_address}"
-      data-refresh-url="{url entity='order' params=['ajax' => 1, 'action' => 'addressForm']}"
+      data-refresh-url="{url entity='order' params=['ajax' => 1, 'action' => 'addressForm', 'id_address' => $id_address]}"
       class="needs-validation"
       novalidate
     >
diff --git a/templates/checkout/_partials/steps/addresses.tpl b/templates/checkout/_partials/steps/addresses.tpl
index bdc85951..28d53f88 100644
--- a/templates/checkout/_partials/steps/addresses.tpl
+++ b/templates/checkout/_partials/steps/addresses.tpl
@@ -29,7 +29,7 @@
     <form
       method="POST"
       action="{url entity='order' params=['id_address' => $id_address]}"
-      data-refresh-url="{url entity='order' params=['ajax' => 1, 'action' => 'addressForm']}"
+      data-refresh-url="{url entity='order' params=['ajax' => 1, 'action' => 'addressForm', 'id_address' => $id_address]}"
       {if $show_delivery_address_form || ($show_invoice_address_form && !$use_same_address)}class="needs-validation" autocomplete="false" novalidate{/if}
     >
       {if !$use_same_address}
diff --git a/templates/customer/_partials/address-form.tpl b/templates/customer/_partials/address-form.tpl
index 0c0386db..3ddc49b9 100644
--- a/templates/customer/_partials/address-form.tpl
+++ b/templates/customer/_partials/address-form.tpl
@@ -35,7 +35,7 @@
       class="needs-validation"
       action="{url entity='address' params=['id_address' => $id_address]}"
       data-id-address="{$id_address}"
-      data-refresh-url="{url entity='address' params=['ajax' => 1, 'action' => 'addressForm']}"
+      data-refresh-url="{url entity='address' params=['ajax' => 1, 'action' => 'addressForm', 'id_address' => $id_address]}"
       novalidate
       autocomplete="false"
     >