dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : #PSTEST-573

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12655 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mBertholino
2012-01-24 17:15:49 +00:00
parent 85042f653d
commit de4c0733fb
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/orders/form.tpl
+22
View File
@@ -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+'<br />';
address_del += res.addresses[x].address1+'<br />';
address_del += res.addresses[x].address2+'<br />';
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+'<br />';
address_inv += res.addresses[x].address1+'<br />';
address_inv += res.addresses[x].address2+'<br />';
address_inv += res.addresses[x].postcode+' '+res.addresses[x].city+' '+res.addresses[x].country;
$('#address_invoice_detail').html(address_inv);
}
}
}
});
}
controllers/admin/AdminCartsController.php
+5
View File
@@ -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')