diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl
index 3babcd2e0..2dda93aac 100755
--- a/admin-dev/themes/default/template/controllers/orders/form.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/form.tpl
@@ -788,6 +788,28 @@
else
$('#send_email_feedback').removeClass('error').addClass('conf');
$('#send_email_feedback').html(res.result);
+ var x, address_del, address_inv;
+ for(x in res.addresses)
+ {
+ if (res.addresses[x].id_address == $('#id_address_delivery option:selected').val())
+ {
+ address_del = res.addresses[x].company+' '+res.addresses[x].firstname+' '+res.addresses[x].lastname+'
';
+ address_del += res.addresses[x].address1+'
';
+ address_del += res.addresses[x].address2+'
';
+ address_del += res.addresses[x].postcode+' '+res.addresses[x].city+' '+res.addresses[x].country;
+ $('#address_delivery_detail').html(address_del);
+ }
+ else if (res.addresses[x].id_address == $('#id_address_invoice option:selected').val())
+ {
+ address_inv = res.addresses[x].company+' '+res.addresses[x].firstname+' '+res.addresses[x].lastname+'
';
+ address_inv += res.addresses[x].address1+'
';
+ address_inv += res.addresses[x].address2+'
';
+ address_inv += res.addresses[x].postcode+' '+res.addresses[x].city+' '+res.addresses[x].country;
+ $('#address_invoice_detail').html(address_inv);
+ }
+ }
+
+
}
});
}
diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index b37ef90d1..500251db0 100755
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -368,6 +368,11 @@ class AdminCartsControllerCore extends AdminController
}
}
+ public function ajaxProcessUpdateAddress()
+ {
+ echo Tools::jsonEncode(array('addresses' => $this->context->customer->getAddresses((int)$this->context->cart->id_lang)));
+ }
+
public function ajaxProcessUpdateAddresses()
{
if ($this->tabAccess['edit'] === '1')