[-] FO : BugFix #PSCFV-1450 The Alias "My Address" is already used, please chose another one.

This commit is contained in:
vChabot
2012-04-30 15:06:07 +00:00
parent 9bd48dea6c
commit 0d52bd516e
36 changed files with 209 additions and 212 deletions
+1 -3
View File
@@ -64,8 +64,6 @@ class AddressControllerCore extends FrontController
else if (Tools::getValue('type') == 'invoice' && isset($this->context->cart->id_address_invoice) else if (Tools::getValue('type') == 'invoice' && isset($this->context->cart->id_address_invoice)
&& $this->context->cart->id_address_invoice != $this->context->cart->id_address_delivery) && $this->context->cart->id_address_invoice != $this->context->cart->id_address_delivery)
$id_address = (int)$this->context->cart->id_address_invoice; $id_address = (int)$this->context->cart->id_address_invoice;
else
exit;
} }
else else
$id_address = (int)Tools::getValue('id_address', 0); $id_address = (int)Tools::getValue('id_address', 0);
@@ -189,7 +187,7 @@ class AddressControllerCore extends FrontController
$this->errors[] = sprintf(Tools::displayError('The alias "%s" is already used, please chose another one.'), Tools::safeOutput($_POST['alias'])); $this->errors[] = sprintf(Tools::displayError('The alias "%s" is already used, please chose another one.'), Tools::safeOutput($_POST['alias']));
// Don't continue this process if we have errors ! // Don't continue this process if we have errors !
if ($this->errors && !Tools::isSubmit('ajax')) if ($this->errors && !$this->ajax)
return; return;
// If we edit this address, delete old address and create a new one // If we edit this address, delete old address and create a new one
+2 -2
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<module> <module>
<name>blockcurrencies</name> <name>blockcurrencies</name>
<displayName><![CDATA[Currency block]]></displayName> <displayName><![CDATA[Bloc devises]]></displayName>
<version><![CDATA[0.1]]></version> <version><![CDATA[0.1]]></version>
<description><![CDATA[Adds a block for selecting a currency.]]></description> <description><![CDATA[Ajoute un bloc permettant au client de choisir sa devise]]></description>
<author><![CDATA[PrestaShop]]></author> <author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab> <tab><![CDATA[front_office_features]]></tab>
<is_configurable>0</is_configurable> <is_configurable>0</is_configurable>
+2 -2
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<module> <module>
<name>blocklayered</name> <name>blocklayered</name>
<displayName><![CDATA[Layered navigation block]]></displayName> <displayName><![CDATA[Bloc navigation &agrave; facettes]]></displayName>
<version><![CDATA[1.8.4]]></version> <version><![CDATA[1.8.4]]></version>
<description><![CDATA[Displays a block with layered navigation filters.]]></description> <description><![CDATA[Affiche un bloc avec les filtres de la navigation &agrave; facettes]]></description>
<author><![CDATA[PrestaShop]]></author> <author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab> <tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable> <is_configurable>1</is_configurable>
+2 -2
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<module> <module>
<name>blocktopmenu</name> <name>blocktopmenu</name>
<displayName><![CDATA[Top horizontal menu]]></displayName> <displayName><![CDATA[Menu Haut horizontal]]></displayName>
<version><![CDATA[1.4]]></version> <version><![CDATA[1.4]]></version>
<description><![CDATA[Add a new menu on top of your shop.]]></description> <description><![CDATA[Ajouter un nouveau menu en haut de votre boutique.]]></description>
<author><![CDATA[PrestaShop]]></author> <author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab> <tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable> <is_configurable>1</is_configurable>
+2 -2
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<module> <module>
<name>homeslider</name> <name>homeslider</name>
<displayName><![CDATA[Image slider for your homepage]]></displayName> <displayName><![CDATA[Carousel d&#039;image (slider) pour votre page d&#039;accueil]]></displayName>
<version><![CDATA[1.2]]></version> <version><![CDATA[1.2]]></version>
<description><![CDATA[Adds an image slider to your homepage.]]></description> <description><![CDATA[Ajouter un carousel d&#039;images &agrave; votre page d&#039;accueil]]></description>
<author><![CDATA[PrestaShop]]></author> <author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab> <tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable> <is_configurable>1</is_configurable>
+2 -2
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<module> <module>
<name>themeinstallator</name> <name>themeinstallator</name>
<displayName><![CDATA[Import/export a theme]]></displayName> <displayName><![CDATA[Importer / Exporter un th&egrave;me]]></displayName>
<version><![CDATA[1.4]]></version> <version><![CDATA[1.4]]></version>
<description><![CDATA[Export or Install a theme and its modules on your shop.]]></description> <description><![CDATA[Exporter ou importer un th&egrave;me et ses modules sur votre boutique.]]></description>
<author><![CDATA[PrestaShop]]></author> <author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[administration]]></tab> <tab><![CDATA[administration]]></tab>
<is_configurable>1</is_configurable> <is_configurable>1</is_configurable>
+1 -2
View File
@@ -276,7 +276,6 @@ function saveAddress(type)
// update addresses id // update addresses id
$('input#opc_id_address_delivery').val(jsonData.id_address_delivery); $('input#opc_id_address_delivery').val(jsonData.id_address_delivery);
$('input#opc_id_address_invoice').val(jsonData.id_address_invoice); $('input#opc_id_address_invoice').val(jsonData.id_address_invoice);
result = true; result = true;
} }
}, },
@@ -471,7 +470,7 @@ $(function() {
var params = 'method=editCustomer&'; var params = 'method=editCustomer&';
} }
$('#opc_account_form input:visible').each(function() { $('#opc_account_form input:visible, #opc_account_form input[type=hidden]').each(function() {
if ($(this).is('input[type=checkbox]')) if ($(this).is('input[type=checkbox]'))
{ {
if ($(this).is(':checked')) if ($(this).is(':checked'))
+1 -1
View File
@@ -25,7 +25,7 @@
</div> </div>
</fieldset> </fieldset>
</form> </form>
<form action="#" method="post" id="new_account_form" class="std" autocomplete="on" autofill="on"> <form action="javascript:;" method="post" id="new_account_form" class="std" autocomplete="on" autofill="on">
<fieldset> <fieldset>
<h3 id="new_account_title">{l s='New Customer'}</h3> <h3 id="new_account_title">{l s='New Customer'}</h3>
<div id="opc_account_choice"> <div id="opc_account_choice">