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

[-] FO : Fix #PSCFV-9414 submitGuestAccount is not submitAccount

Browse Source
This commit is contained in:
gRoussac committed 2013-06-21 10:39:58 +02:00
1 parent 21d04cb423
commit 2e8c89e543
4 files changed
+2 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

controllers/front/AuthController.php
+1 -1
View File
@@ -537,7 +537,7 @@ class AuthControllerCore extends FrontController
$contains_state = isset($country) && is_object($country) ? (int)$country->contains_states: 0; $contains_state = isset($country) && is_object($country) ? (int)$country->contains_states: 0;
$id_state = isset($address) && is_object($address) ? (int)$address->id_state: 0; $id_state = isset($address) && is_object($address) ? (int)$address->id_state: 0;
if ((Configuration::get('PS_REGISTRATION_PROCESS_TYPE') || Tools::isSubmit('submitGuestAccount')) && $contains_state && !$id_state) if ((Configuration::get('PS_REGISTRATION_PROCESS_TYPE') || Tools::isSubmit('submitGuestAccount')) && $contains_state && !$id_state)
$this->errors[] = Tools::displayError('This country requires you to chose a State.'); $this->errors[] = Tools::displayError('This country requires you to choose a State.');
else else
{ {
$customer->active = 1; $customer->active = 1;
themes/default/js/order-opc.js
+1
View File
@@ -445,6 +445,7 @@ $(function() {
$('#is_new_customer').val('0'); $('#is_new_customer').val('0');
$('#opc_account_choice, #opc_invoice_address').hide(); $('#opc_account_choice, #opc_invoice_address').hide();
$('#new_account_title').html(txtInstantCheckout); $('#new_account_title').html(txtInstantCheckout);
$('#submitAccount').prop({id : 'submitGuestAccount', name : 'submitGuestAccount'});
updateState(); updateState();
updateNeedIDNumber(); updateNeedIDNumber();
updateZipCode(); updateZipCode();
themes/default/order-address.tpl
-1
View File
@@ -104,7 +104,6 @@
}; };
} }
function buildAddressBlock(id_address, address_type, dest_comp) function buildAddressBlock(id_address, address_type, dest_comp)
{ {
var adr_titles_vals = getAddressesTitles(); var adr_titles_vals = getAddressesTitles();
themes/default/order-opc-new-account.tpl
-1
View File
@@ -215,7 +215,6 @@
<p class="required text"> <p class="required text">
<label for="city">{l s='City'} <sup>*</sup></label> <label for="city">{l s='City'} <sup>*</sup></label>
<input type="text" class="text" name="city" id="city" value="{if isset($guestInformations) && $guestInformations.city}{$guestInformations.city}{/if}" /> <input type="text" class="text" name="city" id="city" value="{if isset($guestInformations) && $guestInformations.city}{$guestInformations.city}{/if}" />
</p> </p>
{elseif $field_name eq "country" || $field_name eq "Country:name"} {elseif $field_name eq "country" || $field_name eq "Country:name"}
<p class="required select"> <p class="required select">