From 372c8dac4e9c06dd867d0247468d154790d6e20a Mon Sep 17 00:00:00 2001 From: vChabot Date: Fri, 30 Sep 2011 15:48:20 +0000 Subject: [PATCH] [*] Registration type is now in 2 steps or all in one // refactoring AuthController.php (front) --- admin-dev/tabs/AdminPreferences.php | 12 + config/defines.inc.php | 4 + controllers/front/AddressController.php | 5 + controllers/front/AuthController.php | 799 ++++++++++++-------- controllers/front/ParentOrderController.php | 32 + themes/prestashop/address.tpl | 5 + themes/prestashop/authentication.tpl | 312 ++++---- themes/prestashop/lang/fr.php | 8 +- themes/prestashop/order-opc-new-account.tpl | 4 +- translations/fr/admin.php | 25 +- 10 files changed, 711 insertions(+), 495 deletions(-) diff --git a/admin-dev/tabs/AdminPreferences.php b/admin-dev/tabs/AdminPreferences.php index 15d13cc3d..3a2ea83a2 100644 --- a/admin-dev/tabs/AdminPreferences.php +++ b/admin-dev/tabs/AdminPreferences.php @@ -52,6 +52,17 @@ class AdminPreferences extends AdminTab ) ); + $registration_process_type = array( + array( + 'value' => PS_REGISTRATION_PROCESS_STANDARD, + 'name' => $this->l('2 steps (Account creation and address creation)') + ), + array( + 'value' => PS_REGISTRATION_PROCESS_AIO, + 'name' => $this->l('Standard (all in one)') + ) + ); + $round_mode = array( array( 'value' => PS_ROUND_UP, @@ -102,6 +113,7 @@ class AdminPreferences extends AdminTab 'PS_SHOW_NEW_ORDERS' => array('title' => $this->l('Show notifications for new orders'), 'desc' => $this->l('This will display notifications when new orders will be made on your shop'), 'validation' => 'isBool', 'cast' => 'intval', 'type' => 'bool'), 'PS_SHOW_NEW_CUSTOMERS' => array('title' => $this->l('Show notifications for new customers'), 'desc' => $this->l('This will display notifications when new customers will register on your shop'), 'validation' => 'isBool', 'cast' => 'intval', 'type' => 'bool'), 'PS_SHOW_NEW_MESSAGES' => array('title' => $this->l('Show notifications for new messages'), 'desc' => $this->l('This will display notifications when new messages will be posted on your shop'), 'validation' => 'isBool', 'cast' => 'intval', 'type' => 'bool'), + 'PS_REGISTRATION_PROCESS_TYPE' => array('title' => $this->l('Registration process type'), 'desc' => $this->l('The 2 steps register process allows the customer to register faster, and create his address later.'), 'validation' => 'isInt', 'cast' => 'intval', 'type' => 'select', 'list' => $registration_process_type, 'identifier' => 'value'), ); if (function_exists('date_default_timezone_set')) diff --git a/config/defines.inc.php b/config/defines.inc.php index ead3fcb41..61101cdf9 100755 --- a/config/defines.inc.php +++ b/config/defines.inc.php @@ -127,6 +127,10 @@ define('PS_ROUND_UP', 0); define('PS_ROUND_DOWN', 1); define('PS_ROUND_HALF', 2); +/* Registration behavior */ +define('PS_REGISTRATION_PROCESS_STANDARD', 0); +define('PS_REGISTRATION_PROCESS_AIO', 1); + /* Carrier::getCarriers() filter */ // these defines are DEPRECATED since 1.4.5 version define('PS_CARRIERS_ONLY', 1); diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php index 5411a9887..e02cd47ab 100644 --- a/controllers/front/AddressController.php +++ b/controllers/front/AddressController.php @@ -279,6 +279,11 @@ class AddressControllerCore extends FrontController $this->context->smarty->assign('back', Tools::safeOutput($back)); if ($mod = Tools::getValue('mod')) $this->context->smarty->assign('mod', Tools::safeOutput($mod)); + if (isset($this->context->cookie->account_created)) + { + $this->context->smarty->assign('account_created', 1); + unset($this->context->cookie->account_created); + } $this->setTemplate(_PS_THEME_DIR_.'address.tpl'); } diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php index 324a22e20..248385de1 100644 --- a/controllers/front/AuthController.php +++ b/controllers/front/AuthController.php @@ -30,269 +30,132 @@ class AuthControllerCore extends FrontController public $ssl = true; public $php_self = 'authentication'; + /** + * @var bool create_account + */ + protected $create_account; + + /** + * Initialize auth controller + * @see FrontController::init() + */ public function init() { parent::init(); - if ($this->context->customer->isLogged() AND !Tools::isSubmit('ajax')) + if (!Tools::getIsset('step') && $this->context->customer->isLogged() && !$this->ajax) Tools::redirect('index.php?controller=my-account'); if (Tools::getValue('create_account')) + $this->create_account = true; + } + + /** + * Set default medias for this controller + * @see FrontController::setMedia() + */ + public function setMedia() + { + parent::setMedia(); + $this->addCSS(_THEME_CSS_DIR_.'authentication.css'); + $this->addJqueryPlugin('typewatch'); + $this->addJS(_THEME_JS_DIR_.'tools/statesManagement.js'); + } + + /** + * Assign template vars related to page content + * @see FrontController::initContent() + */ + public function initContent() + { + $this->context->smarty->assign('genders', Gender::getGenders()); + + $this->assignDate(); + + $this->assignCountries(); + + $this->context->smarty->assign('newsletter', (int)Module::getInstanceByName('blocknewsletter')->active); + + $back = Tools::getValue('back'); + $key = Tools::safeOutput(Tools::getValue('key')); + if (!empty($key)) + $back .= (strpos($back, '?') !== false ? '&' : '?').'key='.$key; + if (!empty($back)) { - $create_account = 1; - $this->context->smarty->assign('email_create', 1); - } - - if (Tools::isSubmit('SubmitCreate')) - { - if (!Validate::isEmail($email = Tools::getValue('email_create')) OR empty($email)) - $this->errors[] = Tools::displayError('Invalid e-mail address'); - elseif (Customer::customerExists($email)) + $this->context->smarty->assign('back', Tools::safeOutput($back)); + if (strpos($back, 'order') !== false) { - $this->errors[] = Tools::displayError('An account is already registered with this e-mail, please fill in the password or request a new one.'); - $_POST['email'] = $_POST['email_create']; - unset($_POST['email_create']); - } - else - { - $create_account = 1; - $this->context->smarty->assign('email_create', Tools::safeOutput($email)); - $_POST['email'] = $email; - - } - } - - if (Tools::isSubmit('submitAccount') OR Tools::isSubmit('submitGuestAccount')) - { - $create_account = 1; - if (Tools::isSubmit('submitAccount')) - $this->context->smarty->assign('email_create', 1); - /* New Guest customer */ - if (!Tools::getValue('is_new_customer', 1) AND !Configuration::get('PS_GUEST_CHECKOUT_ENABLED')) - $this->errors[] = Tools::displayError('You cannot create a guest account.'); - if (!Tools::getValue('is_new_customer', 1)) - $_POST['passwd'] = md5(time()._COOKIE_KEY_); - if (isset($_POST['guest_email']) AND $_POST['guest_email']) - $_POST['email'] = $_POST['guest_email']; - - /* Preparing customer */ - $customer = new Customer(); - $lastnameAddress = $_POST['lastname']; - $firstnameAddress = $_POST['firstname']; - $_POST['lastname'] = $_POST['customer_lastname']; - $_POST['firstname'] = $_POST['customer_firstname']; - if (!Tools::getValue('phone') AND !Tools::getValue('phone_mobile')) - $this->errors[] = Tools::displayError('You must register at least one phone number'); - - if (!@checkdate(Tools::getValue('months'), Tools::getValue('days'), Tools::getValue('years')) && !(Tools::getValue('months') == '' && Tools::getValue('days') == '' && Tools::getValue('years') == '')) - $this->errors[] = Tools::displayError('Invalid date of birth'); - $customer->birthday = (empty($_POST['years']) ? '' : (int)$_POST['years'].'-'.(int)$_POST['months'].'-'.(int)$_POST['days']); - - $this->errors = array_unique(array_merge($this->errors, $customer->validateController())); - /* Preparing address */ - $address = new Address(); - $_POST['lastname'] = $lastnameAddress; - $_POST['firstname'] = $firstnameAddress; - $address->id_customer = 1; - $this->errors = array_unique(array_merge($this->errors, $address->validateController())); - - /* US customer: normalize the address */ - if($address->id_country == Country::getByIso('US')) - { - include_once(_PS_TAASC_PATH_.'AddressStandardizationSolution.php'); - $normalize = new AddressStandardizationSolution; - $address->address1 = $normalize->AddressLineStandardization($address->address1); - $address->address2 = $normalize->AddressLineStandardization($address->address2); - } - - $zip_code_format = Country::getZipCodeFormat((int)(Tools::getValue('id_country'))); - if (Country::getNeedZipCode((int)(Tools::getValue('id_country')))) - { - if (($postcode = Tools::getValue('postcode')) AND $zip_code_format) - { - $zip_regexp = '/^'.$zip_code_format.'$/ui'; - $zip_regexp = str_replace(' ', '( |)', $zip_regexp); - $zip_regexp = str_replace('-', '(-|)', $zip_regexp); - $zip_regexp = str_replace('N', '[0-9]', $zip_regexp); - $zip_regexp = str_replace('L', '[a-zA-Z]', $zip_regexp); - $zip_regexp = str_replace('C', Country::getIsoById((int)(Tools::getValue('id_country'))), $zip_regexp); - if (!preg_match($zip_regexp, $postcode)) - $this->errors[] = ''.Tools::displayError('Zip/ Postal code').' '.Tools::displayError('is invalid.').'
'.Tools::displayError('Must be typed as follows:').' '.str_replace('C', Country::getIsoById((int)(Tools::getValue('id_country'))), str_replace('N', '0', str_replace('L', 'A', $zip_code_format))); - } - elseif ($zip_code_format) - $this->errors[] = ''.Tools::displayError('Zip/ Postal code').' '.Tools::displayError('is required.'); - elseif ($postcode AND !preg_match('/^[0-9a-zA-Z -]{4,9}$/ui', $postcode)) - $this->errors[] = ''.Tools::displayError('Zip/ Postal code').' '.Tools::displayError('is invalid.'); - } - if (Country::isNeedDniByCountryId($address->id_country) AND (!Tools::getValue('dni') OR !Validate::isDniLite(Tools::getValue('dni')))) - $this->errors[] = Tools::displayError('Identification number is incorrect or has already been used.'); - elseif (!Country::isNeedDniByCountryId($address->id_country)) - $address->dni = NULL; - - if (!$this->errors) - { - if (Customer::customerExists(Tools::getValue('email'))) - $this->errors[] = Tools::displayError('An account is already registered with this e-mail, please fill in the password or request a new one.'); - if (Tools::isSubmit('newsletter')) - { - $customer->ip_registration_newsletter = pSQL(Tools::getRemoteAddr()); - $customer->newsletter_date_add = pSQL(date('Y-m-d H:i:s')); - } - - if (!sizeof($this->errors)) - { - if (!$country = new Country($address->id_country, Configuration::get('PS_LANG_DEFAULT')) OR !Validate::isLoadedObject($country)) - die(Tools::displayError()); - if ((int)($country->contains_states) AND !(int)($address->id_state)) - $this->errors[] = Tools::displayError('This country requires a state selection.'); - else - { - $customer->active = 1; - /* New Guest customer */ - if (Tools::isSubmit('is_new_customer')) - $customer->is_guest = !Tools::getValue('is_new_customer', 1); - else - $customer->is_guest = 0; - if (!$customer->add()) - $this->errors[] = Tools::displayError('An error occurred while creating your account.'); - else - { - $address->id_customer = (int)($customer->id); - if (!$address->add()) - $this->errors[] = Tools::displayError('An error occurred while creating your address.'); - else - { - if (!$customer->is_guest) - { - if (!Mail::Send($this->context->language->id, 'account', Mail::l('Welcome!'), - array('{firstname}' => $customer->firstname, '{lastname}' => $customer->lastname, '{email}' => $customer->email, '{passwd}' => Tools::getValue('passwd')), $customer->email, $customer->firstname.' '.$customer->lastname)) - $this->errors[] = Tools::displayError('Cannot send email'); - } - $this->context->smarty->assign('confirmation', 1); - $this->context->cookie->id_customer = (int)($customer->id); - $this->context->cookie->customer_lastname = $customer->lastname; - $this->context->cookie->customer_firstname = $customer->firstname; - $this->context->cookie->passwd = $customer->passwd; - $this->context->cookie->logged = 1; - $customer->logged = 1; - $this->context->cookie->email = $customer->email; - $this->context->cookie->is_guest = !Tools::getValue('is_new_customer', 1); - /* Update cart address */ - $this->context->cart->secure_key = $customer->secure_key; - $this->context->cart->id_address_delivery = Address::getFirstCustomerAddressId((int)($customer->id)); - $this->context->cart->id_address_invoice = Address::getFirstCustomerAddressId((int)($customer->id)); - - // If a logged guest logs in as a customer, the cart secure key was already set and needs to be updated - $this->context->cart->secure_key = $customer->secure_key; - $this->context->cart->update(); - Module::hookExec('createAccount', array( - '_POST' => $_POST, - 'newCustomer' => $customer - )); - if (Tools::isSubmit('ajax')) - { - $return = array( - 'hasError' => !empty($this->errors), - 'errors' => $this->errors, - 'isSaved' => true, - 'id_customer' => (int)$this->context->cookie->id_customer, - 'id_address_delivery' => $this->context->cart->id_address_delivery, - 'id_address_invoice' => $this->context->cart->id_address_invoice, - 'token' => Tools::getToken(false) - ); - die(Tools::jsonEncode($return)); - } - if ($back = Tools::getValue('back')) - Tools::redirect('index.php?controller='.$back); - Tools::redirect('index.php?controller=my-account'); - } - } - } - } - } - if (sizeof($this->errors)) - { - if (!Tools::getValue('is_new_customer')) - unset($_POST['passwd']); - if (Tools::isSubmit('ajax')) - { - $return = array( - 'hasError' => !empty($this->errors), - 'errors' => $this->errors, - 'isSaved' => false, - 'id_customer' => 0 - ); - die(Tools::jsonEncode($return)); - } - } - } - - if (Tools::isSubmit('SubmitLogin')) - { - Module::hookExec('beforeAuthentication'); - $passwd = trim(Tools::getValue('passwd')); - $email = trim(Tools::getValue('email')); - if (empty($email)) - $this->errors[] = Tools::displayError('E-mail address required'); - elseif (!Validate::isEmail($email)) - $this->errors[] = Tools::displayError('Invalid e-mail address'); - elseif (empty($passwd)) - $this->errors[] = Tools::displayError('Password is required'); - elseif (Tools::strlen($passwd) > 32) - $this->errors[] = Tools::displayError('Password is too long'); - elseif (!Validate::isPasswd($passwd)) - $this->errors[] = Tools::displayError('Invalid password'); - else - { - $customer = new Customer(); - $authentication = $customer->getByEmail(trim($email), trim($passwd)); - if (!$authentication OR !$customer->id) - { - /* Handle brute force attacks */ - sleep(1); - $this->errors[] = Tools::displayError('Authentication failed'); - } + if (Configuration::get('PS_RESTRICT_DELIVERED_COUNTRIES')) + $countries = Carrier::getDeliveredCountries($this->context->language->id, true, true); else - { - $this->context->cookie->id_customer = (int)($customer->id); - $this->context->cookie->customer_lastname = $customer->lastname; - $this->context->cookie->customer_firstname = $customer->firstname; - $this->context->cookie->logged = 1; - $customer->logged = 1; - $this->context->cookie->is_guest = $customer->isGuest(); - $this->context->cookie->passwd = $customer->passwd; - $this->context->cookie->email = $customer->email; - if (Configuration::get('PS_CART_FOLLOWING') AND (empty($this->context->cookie->id_cart) OR Cart::getNbProducts($this->context->cookie->id_cart) == 0)) - $this->context->cookie->id_cart = (int)Cart::lastNoneOrderedCart($this->context->customer->id); - /* Update cart address */ - $this->context->cart->id_carrier = 0; - $this->context->cart->id_address_delivery = Address::getFirstCustomerAddressId((int)($customer->id)); - $this->context->cart->id_address_invoice = Address::getFirstCustomerAddressId((int)($customer->id)); - $this->context->cart->update(); - Module::hookExec('authentication'); - if (!Tools::isSubmit('ajax')) - { - if ($back = Tools::getValue('back')) - Tools::redirect($back); - Tools::redirect('index.php?controller=my-account'); - } - } - } - if (Tools::isSubmit('ajax')) - { - $return = array( - 'hasError' => !empty($this->errors), - 'errors' => $this->errors, - 'token' => Tools::getToken(false) - ); - die(Tools::jsonEncode($return)); + $countries = Country::getCountries($this->context->language->id, true); + + $this->context->smarty->assign(array( + 'inOrderProcess' => true, + 'PS_GUEST_CHECKOUT_ENABLED' => Configuration::get('PS_GUEST_CHECKOUT_ENABLED'), + 'PS_REGISTRATION_PROCESS_TYPE' => Configuration::get('PS_REGISTRATION_PROCESS_TYPE'), + 'sl_country' => (int)Tools::getValue('id_country', Configuration::get('PS_COUNTRY_DEFAULT')), + 'countries' => $countries + )); } } - if (isset($create_account)) + // if account created with the 2 steps register process, remove 'accoun_created' from cookie + if (isset($this->context->cookie->account_created)) { - /* Select the most appropriate country */ - if (isset($_POST['id_country']) AND is_numeric($_POST['id_country'])) + $this->context->smarty->assign('account_created', 1); + unset($this->context->cookie->account_created); + } + + if (Tools::getValue('create_account')) + $this->context->smarty->assign('email_create', 1); + + $this->assignAddressFormat(); + + // Call a hook to display more information on form + $this->context->smarty->assign(array( + 'HOOK_CREATE_ACCOUNT_FORM' => Module::hookExec('createAccountForm'), + 'HOOK_CREATE_ACCOUNT_TOP' => Module::hookExec('createAccountTop') + )); + $this->setTemplate(_PS_THEME_DIR_.'authentication.tpl'); + } + + /** + * Assign date var to smarty + */ + protected function assignDate() + { + // Generate years, months and days + if (isset($_POST['years']) && is_numeric($_POST['years'])) + $selectedYears = (int)($_POST['years']); + $years = Tools::dateYears(); + if (isset($_POST['months']) && is_numeric($_POST['months'])) + $selectedMonths = (int)($_POST['months']); + $months = Tools::dateMonths(); + + if (isset($_POST['days']) && is_numeric($_POST['days'])) + $selectedDays = (int)($_POST['days']); + $days = Tools::dateDays(); + + $this->context->smarty->assign(array( + 'years' => $years, + 'sl_year' => (isset($selectedYears) ? $selectedYears : 0), + 'months' => $months, + 'sl_month' => (isset($selectedMonths) ? $selectedMonths : 0), + 'days' => $days, + 'sl_day' => (isset($selectedDays) ? $selectedDays : 0) + )); + } + + /** + * Assign countries var to smarty + */ + protected function assignCountries() + { + if (isset($this->create_account)) + { + // Select the most appropriate country + if (isset($_POST['id_country']) && is_numeric($_POST['id_country'])) $selectedCountry = (int)($_POST['id_country']); /* FIXME : language iso and country iso are not similar, * maybe an associative table with country an language can resolve it, @@ -318,82 +181,17 @@ class AuthControllerCore extends FrontController $countries = Country::getCountries($this->context->language->id, true); $this->context->smarty->assign(array( 'countries' => $countries, + 'PS_REGISTRATION_PROCESS_TYPE' => Configuration::get('PS_REGISTRATION_PROCESS_TYPE'), 'sl_country' => (isset($selectedCountry) ? $selectedCountry : 0), 'vat_management' => Configuration::get('VATNUMBER_MANAGEMENT') )); - - /* Call a hook to display more information on form */ - $this->context->smarty->assign(array( - 'HOOK_CREATE_ACCOUNT_FORM' => Module::hookExec('createAccountForm'), - 'HOOK_CREATE_ACCOUNT_TOP' => Module::hookExec('createAccountTop') - )); } - - $this->context->smarty->assign('genders', Gender::getGenders()); - - /* Generate years, months and days */ - if (isset($_POST['years']) AND is_numeric($_POST['years'])) - $selectedYears = (int)($_POST['years']); - $years = Tools::dateYears(); - if (isset($_POST['months']) AND is_numeric($_POST['months'])) - $selectedMonths = (int)($_POST['months']); - $months = Tools::dateMonths(); - - if (isset($_POST['days']) AND is_numeric($_POST['days'])) - $selectedDays = (int)($_POST['days']); - $days = Tools::dateDays(); - - $this->context->smarty->assign(array( - 'years' => $years, - 'sl_year' => (isset($selectedYears) ? $selectedYears : 0), - 'months' => $months, - 'sl_month' => (isset($selectedMonths) ? $selectedMonths : 0), - 'days' => $days, - 'sl_day' => (isset($selectedDays) ? $selectedDays : 0) - )); - $this->context->smarty->assign('newsletter', (int)Module::getInstanceByName('blocknewsletter')->active); } - public function setMedia() - { - parent::setMedia(); - $this->addCSS(_THEME_CSS_DIR_.'authentication.css'); - $this->addJqueryPlugin('typewatch'); - $this->addJS(_THEME_JS_DIR_.'tools/statesManagement.js'); - } - - public function initContent() - { - parent::process(); - - $back = Tools::getValue('back'); - $key = Tools::safeOutput(Tools::getValue('key')); - if (!empty($key)) - $back .= (strpos($back, '?') !== false ? '&' : '?').'key='.$key; - if (!empty($back)) - { - $this->context->smarty->assign('back', Tools::safeOutput($back)); - if (strpos($back, 'order') !== false) - { - if (Configuration::get('PS_RESTRICT_DELIVERED_COUNTRIES')) - $countries = Carrier::getDeliveredCountries($this->context->language->id, true, true); - else - $countries = Country::getCountries($this->context->language->id, true); - - $this->context->smarty->assign(array( - 'inOrderProcess' => true, - 'PS_GUEST_CHECKOUT_ENABLED' => Configuration::get('PS_GUEST_CHECKOUT_ENABLED'), - 'sl_country' => (int)Tools::getValue('id_country', Configuration::get('PS_COUNTRY_DEFAULT')), - 'countries' => $countries - )); - } - } - - $this->processAddressFormat(); - $this->setTemplate(_PS_THEME_DIR_.'authentication.tpl'); - } - - protected function processAddressFormat() + /** + * Assign address var to smarty + */ + protected function assignAddressFormat() { $addressItems = array(); $addressFormat = AddressFormat::getOrderedAddressFields(Configuration::get('PS_COUNTRY_DEFAULT'), false, true); @@ -410,6 +208,369 @@ class AuthControllerCore extends FrontController foreach (array('inv', 'dlv') as $addressType) $this->context->smarty->assign(array($addressType.'_adr_fields' => $addressFormat, $addressType.'_all_fields' => $addressItems)); + } + + /** + * Start forms process + * @see FrontController::postProcess() + */ + public function postProcess() + { + if (Tools::isSubmit('SubmitCreate')) + $this->processSubmitCreate(); + + if (Tools::isSubmit('submitAccount') || Tools::isSubmit('submitGuestAccount')) + $this->processSubmitAccount(); + + if (Tools::isSubmit('SubmitLogin')) + $this->processSubmitLogin(); + } + + /** + * Process login + */ + protected function processSubmitLogin() + { + Module::hookExec('beforeAuthentication'); + $passwd = trim(Tools::getValue('passwd')); + $email = trim(Tools::getValue('email')); + if (empty($email)) + $this->errors[] = Tools::displayError('E-mail address required'); + elseif (!Validate::isEmail($email)) + $this->errors[] = Tools::displayError('Invalid e-mail address'); + elseif (empty($passwd)) + $this->errors[] = Tools::displayError('Password is required'); + elseif (Tools::strlen($passwd) > 32) + $this->errors[] = Tools::displayError('Password is too long'); + elseif (!Validate::isPasswd($passwd)) + $this->errors[] = Tools::displayError('Invalid password'); + else + { + $customer = new Customer(); + $authentication = $customer->getByEmail(trim($email), trim($passwd)); + if (!$authentication || !$customer->id) + { + // Handle brute force attacks + sleep(1); + $this->errors[] = Tools::displayError('Authentication failed'); + } + else + { + $this->context->cookie->id_customer = (int)($customer->id); + $this->context->cookie->customer_lastname = $customer->lastname; + $this->context->cookie->customer_firstname = $customer->firstname; + $this->context->cookie->logged = 1; + $customer->logged = 1; + $this->context->cookie->is_guest = $customer->isGuest(); + $this->context->cookie->passwd = $customer->passwd; + $this->context->cookie->email = $customer->email; + if (Configuration::get('PS_CART_FOLLOWING') && (empty($this->context->cookie->id_cart) || Cart::getNbProducts($this->context->cookie->id_cart) == 0)) + $this->context->cookie->id_cart = (int)Cart::lastNoneOrderedCart($this->context->customer->id); + // Update cart address + $this->context->cart->id_carrier = 0; + $this->context->cart->id_address_delivery = Address::getFirstCustomerAddressId((int)($customer->id)); + $this->context->cart->id_address_invoice = Address::getFirstCustomerAddressId((int)($customer->id)); + $this->context->cart->update(); + Module::hookExec('authentication'); + if (!$this->ajax) + { + if ($back = Tools::getValue('back')) + Tools::redirect($back); + Tools::redirect('index.php?controller=my-account'); + } + } + } + if ($this->ajax) + { + $return = array( + 'hasError' => !empty($this->errors), + 'errors' => $this->errors, + 'token' => Tools::getToken(false) + ); + die(Tools::jsonEncode($return)); } } + /** + * Process submit on an account + */ + protected function processSubmitAccount() + { + $this->create_account = true; + if (Tools::isSubmit('submitAccount')) + $this->context->smarty->assign('email_create', 1); + // New Guest customer + if (!Tools::getValue('is_new_customer', 1) && !Configuration::get('PS_GUEST_CHECKOUT_ENABLED')) + $this->errors[] = Tools::displayError('You cannot create a guest account.'); + if (!Tools::getValue('is_new_customer', 1)) + $_POST['passwd'] = md5(time()._COOKIE_KEY_); + if (isset($_POST['guest_email']) && $_POST['guest_email']) + $_POST['email'] = $_POST['guest_email']; + + // Preparing customer + $customer = new Customer(); + $_POST['lastname'] = $_POST['customer_lastname']; + $_POST['firstname'] = $_POST['customer_firstname']; + if (!Tools::getValue('phone') && !Tools::getValue('phone_mobile') && Configuration::get('PS_REGISTRATION_PROCESS_TYPE')) + $this->errors[] = Tools::displayError('You must register at least one phone number'); + $this->errors = array_unique(array_merge($this->errors, $customer->validateController())); + if (!Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && !$this->ajax) + { + if (!count($this->errors)) + { + if (Tools::isSubmit('newsletter')) + { + $customer->ip_registration_newsletter = pSQL(Tools::getRemoteAddr()); + $customer->newsletter_date_add = pSQL(date('Y-m-d H:i:s')); + } + $customer->birthday = (empty($_POST['years']) ? '' : (int)$_POST['years'].'-'.(int)$_POST['months'].'-'.(int)$_POST['days']); + $customer->active = 1; + // New Guest customer + if (Tools::isSubmit('is_new_customer')) + $customer->is_guest = !Tools::getValue('is_new_customer', 1); + else + $customer->is_guest = 0; + if (!count($this->errors)) + if (!$customer->add()) + $this->errors[] = Tools::displayError('An error occurred while creating your account.'); + else + { + if (!$customer->is_guest) + { + if (!$this->sendConfirmationMail($customer)) + $this->errors[] = Tools::displayError('Cannot send email'); + } + + $this->updateContext($customer); + + $this->context->cart->update(); + Module::hookExec('createAccount', array( + '_POST' => $_POST, + 'newCustomer' => $customer + )); + if ($this->ajax) + { + $return = array( + 'hasError' => !empty($this->errors), + 'errors' => $this->errors, + 'isSaved' => true, + 'id_customer' => (int)$this->context->cookie->id_customer, + 'id_address_delivery' => $this->context->cart->id_address_delivery, + 'id_address_invoice' => $this->context->cart->id_address_invoice, + 'token' => Tools::getToken(false) + ); + die(Tools::jsonEncode($return)); + } + Tools::redirect('index.php?controller=address'); + } + } + + } + else // if registration type is in one step, we save the address + { + $lastnameAddress = $_POST['lastname']; + $firstnameAddress = $_POST['firstname']; + // Preparing address + $address = new Address(); + $_POST['lastname'] = $lastnameAddress; + $_POST['firstname'] = $firstnameAddress; + $address->id_customer = 1; + $this->errors = array_unique(array_merge($this->errors, $address->validateController())); + + // US customer: normalize the address + if($address->id_country == Country::getByIso('US')) + { + include_once(_PS_TAASC_PATH_.'AddressStandardizationSolution.php'); + $normalize = new AddressStandardizationSolution; + $address->address1 = $normalize->AddressLineStandardization($address->address1); + $address->address2 = $normalize->AddressLineStandardization($address->address2); + } + + $zip_code_format = Country::getZipCodeFormat((int)(Tools::getValue('id_country'))); + if (Country::getNeedZipCode((int)(Tools::getValue('id_country')))) + { + if (($postcode = Tools::getValue('postcode')) && $zip_code_format) + { + $zip_regexp = '/^'.$zip_code_format.'$/ui'; + $zip_regexp = str_replace(' ', '( |)', $zip_regexp); + $zip_regexp = str_replace('-', '(-|)', $zip_regexp); + $zip_regexp = str_replace('N', '[0-9]', $zip_regexp); + $zip_regexp = str_replace('L', '[a-zA-Z]', $zip_regexp); + $zip_regexp = str_replace('C', Country::getIsoById((int)(Tools::getValue('id_country'))), $zip_regexp); + if (!preg_match($zip_regexp, $postcode)) + $this->errors[] = ''.Tools::displayError('Zip/ Postal code').' '.Tools::displayError('is invalid.').'
'.Tools::displayError('Must be typed as follows:').' '.str_replace('C', Country::getIsoById((int)(Tools::getValue('id_country'))), str_replace('N', '0', str_replace('L', 'A', $zip_code_format))); + } + elseif ($zip_code_format) + $this->errors[] = ''.Tools::displayError('Zip/ Postal code').' '.Tools::displayError('is required.'); + elseif ($postcode && !preg_match('/^[0-9a-zA-Z -]{4,9}$/ui', $postcode)) + $this->errors[] = ''.Tools::displayError('Zip/ Postal code').' '.Tools::displayError('is invalid.'); + } + + if (Country::isNeedDniByCountryId($address->id_country) && (!Tools::getValue('dni') || !Validate::isDniLite(Tools::getValue('dni')))) + $this->errors[] = Tools::displayError('Identification number is incorrect or has already been used.'); + elseif (!Country::isNeedDniByCountryId($address->id_country)) + $address->dni = NULL; + } + + if (!@checkdate(Tools::getValue('months'), Tools::getValue('days'), Tools::getValue('years')) && !(Tools::getValue('months') == '' && Tools::getValue('days') == '' && Tools::getValue('years') == '')) + $this->errors[] = Tools::displayError('Invalid date of birth'); + + if (!count($this->errors)) + { + if (Customer::customerExists(Tools::getValue('email'))) + $this->errors[] = Tools::displayError('An account is already registered with this e-mail, please fill in the password or request a new one.'); + if (Tools::isSubmit('newsletter')) + { + $customer->ip_registration_newsletter = pSQL(Tools::getRemoteAddr()); + $customer->newsletter_date_add = pSQL(date('Y-m-d H:i:s')); + } + + $customer->birthday = (empty($_POST['years']) ? '' : (int)$_POST['years'].'-'.(int)$_POST['months'].'-'.(int)$_POST['days']); + if (!count($this->errors)) + { + // if registration type is in one step, we save the address + if (Configuration::get('PS_REGISTRATION_PROCESS_TYPE')) + if (!$country = new Country($address->id_country, Configuration::get('PS_LANG_DEFAULT')) || !Validate::isLoadedObject($country)) + die(Tools::displayError()); + $contains_state = isset($country) && is_object($country) ? (int)$country->contains_state: 0; + $id_state = isset($address) && is_object($address) ? (int)$address->id_state: 0; + if (Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && $contains_state && !$id_state) + $this->errors[] = Tools::displayError('This country requires a state selection.'); + else + { + $customer->active = 1; + // New Guest customer + if (Tools::isSubmit('is_new_customer')) + $customer->is_guest = !Tools::getValue('is_new_customer', 1); + else + $customer->is_guest = 0; + if (!$customer->add()) + $this->errors[] = Tools::displayError('An error occurred while creating your account.'); + else + { + $address->id_customer = (int)$customer->id; + if ((Configuration::get('PS_REGISTRATION_PROCESS_TYPE') || $this->ajax) && !$address->add()) + $this->errors[] = Tools::displayError('An error occurred while creating your address.'); + else + { + if (!$customer->is_guest) + { + if (!$this->sendConfirmationMail($customer)) + $this->errors[] = Tools::displayError('Cannot send email'); + } + $this->updateContext($customer); + $this->context->cart->id_address_delivery = Address::getFirstCustomerAddressId((int)$customer->id); + $this->context->cart->id_address_invoice = Address::getFirstCustomerAddressId((int)$customer->id); + + // If a logged guest logs in as a customer, the cart secure key was already set and needs to be updated + $this->context->cart->update(); + Module::hookExec('createAccount', array( + '_POST' => $_POST, + 'newCustomer' => $customer + )); + if ($this->ajax) + { + $return = array( + 'hasError' => !empty($this->errors), + 'errors' => $this->errors, + 'isSaved' => true, + 'id_customer' => (int)$this->context->cookie->id_customer, + 'id_address_delivery' => $this->context->cart->id_address_delivery, + 'id_address_invoice' => $this->context->cart->id_address_invoice, + 'token' => Tools::getToken(false) + ); + die(Tools::jsonEncode($return)); + } + // if registration type is in two steps, we redirect to register address + if (!Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && !$this->ajax) + Tools::redirect('index.php?controller=address'); + if ($back = Tools::getValue('back')) + Tools::redirect('index.php?controller='.$back); + Tools::redirect('index.php?controller=my-account'); + } + } + } + } + } + + if (count($this->errors)) + { + if (!Tools::getValue('is_new_customer')) + unset($_POST['passwd']); + if ($this->ajax) + { + $return = array( + 'hasError' => !empty($this->errors), + 'errors' => $this->errors, + 'isSaved' => false, + 'id_customer' => 0 + ); + die(Tools::jsonEncode($return)); + } + } + } + + /** + * Process submit on a creation + */ + protected function processSubmitCreate() + { + if (!Validate::isEmail($email = Tools::getValue('email_create')) || empty($email)) + $this->errors[] = Tools::displayError('Invalid e-mail address'); + elseif (Customer::customerExists($email)) + { + $this->errors[] = Tools::displayError('An account is already registered with this e-mail, please fill in the password or request a new one.'); + $_POST['email'] = $_POST['email_create']; + unset($_POST['email_create']); + } + else + { + $this->create_account = true; + $this->context->smarty->assign('email_create', Tools::safeOutput($email)); + $_POST['email'] = $email; + } + } + + /** + * Update context after customer creation + * @param Customer $customer Created customer + */ + protected function updateContext(Customer $customer) + { + $this->context->smarty->assign('confirmation', 1); + $this->context->cookie->id_customer = (int)$customer->id; + $this->context->cookie->customer_lastname = $customer->lastname; + $this->context->cookie->customer_firstname = $customer->firstname; + $this->context->cookie->passwd = $customer->passwd; + $this->context->cookie->logged = 1; + // if register process is in two steps, we display a message to confirm account creation + if (!Configuration::get('PS_REGISTRATION_PROCESS_TYPE')) + $this->context->cookie->account_created = 1; + $customer->logged = 1; + $this->context->cookie->email = $customer->email; + $this->context->cookie->is_guest = !Tools::getValue('is_new_customer', 1); + // Update cart address + $this->context->cart->secure_key = $customer->secure_key; + } + + /** + * sendConfirmationMail + * @param Customer $customer + * @return bool + */ + protected function sendConfirmationMail(Customer $customer) + { + return Mail::Send( + $this->context->language->id, + 'account', + Mail::l('Welcome!'), + array( + '{firstname}' => $customer->firstname, + '{lastname}' => $customer->lastname, + '{email}' => $customer->email, + '{passwd}' => Tools::getValue('passwd')), + $customer->email, + $customer->firstname.' '.$customer->lastname + ); + } +} \ No newline at end of file diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php index 927491d96..54d31eb79 100644 --- a/controllers/front/ParentOrderController.php +++ b/controllers/front/ParentOrderController.php @@ -454,5 +454,37 @@ class ParentOrderControllerCore extends FrontController return 0; } + /** + * Decides what the default carrier is and update the cart with it + * + * @param array $carriers + * @return number the id of the default carrier + */ + protected function _setDefaultCarrierSelection($carriers) + { + if (count($carriers)) + { + $defaultCarrierIsPresent = false; + if ((int)self::$cart->id_carrier != 0) + foreach ($carriers as $carrier) + if ($carrier['id_carrier'] == (int)self::$cart->id_carrier) + $defaultCarrierIsPresent = true; + if (!$defaultCarrierIsPresent) + foreach ($carriers as $carrier) + if ($carrier['id_carrier'] == (int)Configuration::get('PS_CARRIER_DEFAULT')) + { + $defaultCarrierIsPresent = true; + self::$cart->id_carrier = (int)$carrier['id_carrier']; + } + if (!$defaultCarrierIsPresent) + self::$cart->id_carrier = (int)$carriers[0]['id_carrier']; + } + else + self::$cart->id_carrier = 0; + if (self::$cart->update()) + return self::$cart->id_carrier; + return 0; + } + } diff --git a/themes/prestashop/address.tpl b/themes/prestashop/address.tpl index b255d03fd..eb066daca 100644 --- a/themes/prestashop/address.tpl +++ b/themes/prestashop/address.tpl @@ -115,6 +115,11 @@ $(function(){ldelim} {include file="$tpl_dir./errors.tpl"} +{if isset($account_created)} +

+ {l s='Your account is now created. You can create your first address, or surf on this website.'} +

+{/if}

{if isset($id_address)}{l s='Your address'}{else}{l s='New address'}{/if}

diff --git a/themes/prestashop/authentication.tpl b/themes/prestashop/authentication.tpl index bfb9051f1..e586e0495 100644 --- a/themes/prestashop/authentication.tpl +++ b/themes/prestashop/authentication.tpl @@ -342,114 +342,133 @@ $(function(){ldelim} {foreach from=$days item=day} {/foreach} - - {* - {l s='January'} - {l s='February'} - {l s='March'} - {l s='April'} - {l s='May'} - {l s='June'} - {l s='July'} - {l s='August'} - {l s='September'} - {l s='October'} - {l s='November'} - {l s='December'} - *} - - -

- {if isset($newsletter) && $newsletter} -

- - -

-

- - -

- {/if} -
- + {if isset($PS_REGISTRATION_PROCESS_TYPE) && $PS_REGISTRATION_PROCESS_TYPE} + + {/if} -

- - + {$HOOK_CREATE_ACCOUNT_FORM} +

+ + + {if isset($back)}{/if} + + *{l s='Required field'}

-

{l s='You must register at least one phone number'} *

-

- - -

-

- - -

-

- - - * -

- - - {$HOOK_CREATE_ACCOUNT_FORM} -

- - - {if isset($back)}{/if} - - *{l s='Required field'} -

- -
+ + {/if} \ No newline at end of file diff --git a/themes/prestashop/lang/fr.php b/themes/prestashop/lang/fr.php index 666d363e1..d50edbe65 100644 --- a/themes/prestashop/lang/fr.php +++ b/themes/prestashop/lang/fr.php @@ -11,6 +11,7 @@ $_LANG['404_8cf04a9734132302f96da8e113e80ce5'] = 'Accueil'; $_LANG['address_3908e1afa0ff22fbf112aff3c5ba55c1'] = 'Vos adresses'; $_LANG['address_e9b6b3aa3cab28048d3879710882e1de'] = 'Modifier cette adresse'; $_LANG['address_d7f172af352aa5232de5295afeaa68e5'] = 'Pour ajouter une nouvelle adresse, merci de remplir ce formulaire.'; +$_LANG['address_f5226f8494cf5f5b0f3f2257d47662c5'] = 'Votre compte est maintenant créé. Vous pouvez ajouter votre première adresse, ou surfer sur le site.'; $_LANG['address_455175f3f5be6306247babb349c0515a'] = 'Votre adresse'; $_LANG['address_393d8c6bc7a04264bd9523dc8c92b818'] = 'Nouvelle adresse'; $_LANG['address_b60bb13a87fe3ae5463aeb0980a5a8a1'] = 'Numéro d\'identification fiscale :'; @@ -89,6 +90,9 @@ $_LANG['authentication_b60bb13a87fe3ae5463aeb0980a5a8a1'] = 'Numéro d\'identifi $_LANG['authentication_ea318a4ad37f0c2d2c368e6c958ed551'] = 'DNI / NIF / NIE'; $_LANG['authentication_19f823c6453c2b1ffd09cb715214813d'] = 'Champs requis'; $_LANG['authentication_a0bfb8e59e6c13fc8d990781f77694fe'] = 'Continuer'; +$_LANG['authentication_6335a00a08fde0fbb8f6d6630cdadd92'] = 'Vos informations personnelles'; +$_LANG['authentication_1e884e3078d9978e216a027ecd57fb34'] = 'E-mail'; +$_LANG['authentication_bf2957630c4209f61a388a08c2154915'] = '(5 caractères min.)'; $_LANG['authentication_455175f3f5be6306247babb349c0515a'] = 'Votre adresse'; $_LANG['authentication_ae47812e00631626815f5f75ad1abbbd'] = 'Rue, adresse de boite postale, nom de compagnie, c / o'; $_LANG['authentication_846a54955f32846032981f8fe48c35ff'] = 'Adresse (2)'; @@ -99,9 +103,6 @@ $_LANG['authentication_fe66abce284ec8589e7d791185b5c442'] = 'Téléphone domicil $_LANG['authentication_41c2fff4867cc204120f001e7af20f7a'] = 'Téléphone portable'; $_LANG['authentication_6c1c4d5a22e3d6ed8385e7287233396f'] = 'Donnez un titre à cette adresse pour la retrouver plus facilement'; $_LANG['authentication_0ba7583639a274c434bbe6ef797115a4'] = 'S\'inscrire'; -$_LANG['authentication_6335a00a08fde0fbb8f6d6630cdadd92'] = 'Vos informations personnelles'; -$_LANG['authentication_1e884e3078d9978e216a027ecd57fb34'] = 'E-mail'; -$_LANG['authentication_bf2957630c4209f61a388a08c2154915'] = '(5 caractères min.)'; $_LANG['best-sales_3cb29f0ccc5fd220a97df89dafe46290'] = 'Meilleures ventes'; $_LANG['best-sales_32af07c9205de16855c50c3d20a51698'] = 'Pas de meilleure vente pour le moment.'; $_LANG['breadcrumb_157f518779095e8206908ff1268f10a7'] = 'retour à'; @@ -550,7 +551,6 @@ $_LANG['product_07d814a3df5cfd2d637e77b215519034'] = 'Vous devez ajouter au mini $_LANG['product_f3bbad73b35f19730399b3da21c3ef32'] = ' quantités pour acheter ce produit.'; $_LANG['product_8c751c4aab0db0b811cdfbddf0b4ea56'] = 'Disponibilité :'; $_LANG['product_100f1a22cb79da8d72ce3379a4e834ed'] = 'Produit disponible le: '; -$_LANG['product_0aaaa7c13d1b589640482d1e53135eb4'] = 'Réapprovisionnement le:'; $_LANG['product_4b98be16b76b0941840140f2043432a9'] = 'pièce disponible'; $_LANG['product_e16d56df08bbd47e53e153fc6dfc8ad8'] = 'pièces disponibles'; $_LANG['product_0d83f0026f6d2923b2aa3a208156918c'] = 'Attention : dernières pièces disponibles !'; diff --git a/themes/prestashop/order-opc-new-account.tpl b/themes/prestashop/order-opc-new-account.tpl index 5c77c9753..bbdb2d623 100644 --- a/themes/prestashop/order-opc-new-account.tpl +++ b/themes/prestashop/order-opc-new-account.tpl @@ -141,8 +141,8 @@

{l s='Title'} {foreach from=$genders key=k item=gender} - - + id_gender}checked="checked"{/if} /> + {/foreach}

diff --git a/translations/fr/admin.php b/translations/fr/admin.php index 70fdc29da..10397c371 100644 --- a/translations/fr/admin.php +++ b/translations/fr/admin.php @@ -1182,6 +1182,8 @@ $_LANGADM['AdminImporte1a5e653bc356ed6745d6814d50213eb'] = 'Afficher le prix'; $_LANGADM['AdminImport4d2589e1bcd4263cb99927b59f0f88d2'] = 'URLs des images (x,y,z...)'; $_LANGADM['AdminImport14913d7e9d486e77b5c8d085e3797f94'] = 'Supprimer les images existantes (0 = non, 1 = oui)'; $_LANGADM['AdminImporte6691747add3b37b9c381b8d9476fd4c'] = 'Si vous ne spécifiez pas cette colonne et vous spécifier la colonne images, toutes les images du produit seront remplacé par celle spécifié dans le fichier d\'import'; +$_LANGADM['AdminImportecde3e896afb64e9a48781b8363b9a03'] = 'Caractéristique(Nom:Valeur:Position)'; +$_LANGADM['AdminImport93b145201f52e9210402f4281ff8c188'] = 'Position de la caractéristique'; $_LANGADM['AdminImport71d0ceacdf562024f2d4c3a76d3b63e4'] = 'Uniquement disponible en ligne'; $_LANGADM['AdminImport9e2941b3c81256fac10392aaca4ccfde'] = 'Etat'; $_LANGADM['AdminImportf8a0fa3674c3336359b77bbe8e942a2c'] = 'ID ou nom de la boutique'; @@ -1913,6 +1915,8 @@ $_LANGADM['AdminPerformance8c489d0946f66d17d73f26366a4bf620'] = 'Poids'; $_LANGADM['AdminPreferences6adf97f83acf6453d4a6a4b1070f3754'] = 'Aucune'; $_LANGADM['AdminPreferencesc035796995e11f000835780bbadbd575'] = 'Standard (5 étapes)'; $_LANGADM['AdminPreferencesb563636fd3896671be0104bbc6783be4'] = 'One page checkout'; +$_LANGADM['AdminPreferences39ba9a766470c87b37859d13064190e1'] = '2 étapes (création du compte puis création de l\'adresse)'; +$_LANGADM['AdminPreferences031ef468e506a6001e58a06ce5746cc7'] = 'Standard (tout en un)'; $_LANGADM['AdminPreferences27f3765c3871cd5fe52f88f31dfe2c89'] = 'supérieur'; $_LANGADM['AdminPreferencesf8d23e159df67b2673d7c29166864453'] = 'inférieur'; $_LANGADM['AdminPreferences700e61469b84a66ddb24304a85b0c181'] = 'classique'; @@ -1966,6 +1970,8 @@ $_LANGADM['AdminPreferences8004e61ca76ff500d1e6ee92f7cb7f93'] = 'Affiche les not $_LANGADM['AdminPreferencesae1d865ef6ce7ebb9492ea7a7f1bc8a5'] = 'Afficher les notifications lorsque de nouveaux clients s\'inscriront sur votre boutique'; $_LANGADM['AdminPreferences4e7ff7ca556a7ac8329ab27834e9631b'] = 'Affiche les notifications pour les nouveaux messages'; $_LANGADM['AdminPreferences051fd283c29527d33402475333dfb1da'] = 'Afficher les notifications lorsque de nouveaux clients vous enverront de nouveaux messages sur votre boutique'; +$_LANGADM['AdminPreferencesbcb9adf1d2347258b5c65483e34cf86f'] = 'Type de processus d\'enregistrement.'; +$_LANGADM['AdminPreferencese371e5f8e710b133c839eee7d3765518'] = 'Le processus d\'enregistrement d\'un client en 2 étapes permet au client de s\'enregistrer plus rapidement, et de créer son adresse plus tard.'; $_LANGADM['AdminPreferencesd5bc5fd307b108537039b6b6f98889d5'] = 'Fuseau horaire :'; $_LANGADM['AdminPreferencesbbd6622dbbdf4bcb166f5e3f018a2351'] = 'Cliquez ici pour utiliser le protocole HTTPS avant d\'activer le mode SSL.'; $_LANGADM['AdminPreferences0db377921f4ce762c62526131097968f'] = 'Général'; @@ -2976,25 +2982,6 @@ $_LANGADM['AdminThemes93af5f35c247e0e814bd676249f60b62'] = 'Caractère de sépar $_LANGADM['AdminThemesf2284dabeee8efb9617fbb0f05883adb'] = 'Utilisé pour le chemin de navigation dans les catégories et les produits'; $_LANGADM['AdminThemesbbb572a770006c9e0e57c9e5d4bcda90'] = 'En direct de Prestashop Addons !'; $_LANGADM['AdminThemes0ac3a6bb56ca9b829859b5c12040e3a0'] = 'Trouvez de nouveaux thèmes sur Prestashop Addons !'; -$_LANGADM['AdminTrackinge53d0648d344037610407a88c1389ca1'] = 'Suivi du catalogue'; -$_LANGADM['AdminTracking428a70e43c5371126c0fb675e98c61d5'] = 'Liste des catégories vides :'; -$_LANGADM['AdminTracking1679821fd0e65d65924aa77e56068814'] = 'Liste des produits désactivés :'; -$_LANGADM['AdminTracking55406e92cd01b80132defa33f7957f45'] = 'Liste des produits hors stock sans attributs:'; -$_LANGADM['AdminTrackingd99d6bbc5dce58840c997fed8e739881'] = 'Liste des produits hors stock avec attributs:'; -$_LANGADM['AdminTracking6cfe61694ee1bb13ae719d47c2f80b7a'] = 'trouvé(s)'; -$_LANGADM['AdminTrackingb718adec73e04ce3ec720dd11a06a308'] = 'ID'; -$_LANGADM['AdminTrackingc0bd7654d5b278e65f21cf4e9153fdb4'] = 'Fabricants'; -$_LANGADM['AdminTracking63d5049791d9d79d86e9a108b0a999ca'] = 'Référence'; -$_LANGADM['AdminTracking49ee3087348e8d44e1feda1917443987'] = 'Nom'; -$_LANGADM['AdminTracking3601146c4e948c32b6424d2c0a7f0118'] = 'Prix'; -$_LANGADM['AdminTracking4b78ac8eb158840e9638a3aeb26c4a9d'] = 'Taxe'; -$_LANGADM['AdminTracking27ce7f8b5623b2e2df568d64cf051607'] = 'Stock'; -$_LANGADM['AdminTracking8c489d0946f66d17d73f26366a4bf620'] = 'Poids'; -$_LANGADM['AdminTrackingec53a8c4f07baed5d8825072c89799be'] = 'Statut'; -$_LANGADM['AdminTracking06df33001c1d7187fdd81ea1f5b277aa'] = 'Actions'; -$_LANGADM['AdminTrackingeadcead196002163653bd0e9be7b6d5e'] = 'Modifier ce produit'; -$_LANGADM['AdminTrackingdcc4db89d62ec3e757428a5811553c0b'] = 'Voulez-vous supprimer'; -$_LANGADM['AdminTracking0449f210068787074ce58175b1a2f5cf'] = 'Supprimer ce produit'; $_LANGADM['AdminTranslations91aaf01cad2d0dc0382edb323ed6e51a'] = 'Impossible de créer le dossier'; $_LANGADM['AdminTranslations1a80fb0a74eed828b2693f30e830a237'] = 'Vérifiez les permissions du dossier.'; $_LANGADM['AdminTranslationsd797353e4c5b71edce10d34557198b81'] = 'vous dever sélectionner 2 langages afin de copier les données de la source vers sa destination';