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

// Add PS_CONFIGURATION_AGREMENT to store if user is agree to send us some informations about its server stats

Browse Source
This commit is contained in:
rMalie
2012-02-02 13:52:06 +00:00
parent 91e038d5e1
commit 2fc77b91f2
2 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/controllers/http/process.php
+15 -14
View File
@@ -145,20 +145,21 @@ class InstallControllerHttpProcess extends InstallControllerHttp
$this->initializeContext(); $this->initializeContext();
$success = $this->model_install->configureShop(array( $success = $this->model_install->configureShop(array(
'shop_name' => $this->session->shop_name, 'shop_name' => $this->session->shop_name,
'shop_activity' => $this->session->shop_activity, 'shop_activity' => $this->session->shop_activity,
'shop_country' => $this->session->shop_country, 'shop_country' => $this->session->shop_country,
'shop_timezone' => $this->session->shop_timezone, 'shop_timezone' => $this->session->shop_timezone,
'use_smtp' => $this->session->use_smtp, 'use_smtp' => $this->session->use_smtp,
'smtp_server' => $this->session->smtp_server, 'smtp_server' => $this->session->smtp_server,
'smtp_login' => $this->session->smtp_login, 'smtp_login' => $this->session->smtp_login,
'smtp_password' => $this->session->smtp_password, 'smtp_password' => $this->session->smtp_password,
'smtp_encryption' =>$this->session->smtp_encryption, 'smtp_encryption' => $this->session->smtp_encryption,
'smtp_port' => $this->session->smtp_port, 'smtp_port' => $this->session->smtp_port,
'admin_firstname' =>$this->session->admin_firstname, 'admin_firstname' => $this->session->admin_firstname,
'admin_lastname' => $this->session->admin_lastname, 'admin_lastname' => $this->session->admin_lastname,
'admin_password' => $this->session->admin_password, 'admin_password' => $this->session->admin_password,
'admin_email' => $this->session->admin_email, 'admin_email' => $this->session->admin_email,
'configuration_agrement' => $this->session->configuration_agrement,
)); ));
if (!$success || $this->model_install->getErrors()) if (!$success || $this->model_install->getErrors())
install-dev/models/install.php
+10 -9
View File
@@ -348,15 +348,16 @@ class InstallModelInstall extends InstallAbstractModel
Configuration::loadConfiguration(); Configuration::loadConfiguration();
// Set default configuration // Set default configuration
Configuration::updateGlobalValue('PS_SHOP_DOMAIN', Tools::getHttpHost()); Configuration::updateGlobalValue('PS_SHOP_DOMAIN', Tools::getHttpHost());
Configuration::updateGlobalValue('PS_SHOP_DOMAIN_SSL', Tools::getHttpHost()); Configuration::updateGlobalValue('PS_SHOP_DOMAIN_SSL', Tools::getHttpHost());
Configuration::updateGlobalValue('PS_INSTALL_VERSION', _PS_INSTALL_VERSION_); Configuration::updateGlobalValue('PS_INSTALL_VERSION', _PS_INSTALL_VERSION_);
Configuration::updateGlobalValue('PS_LOCALE_LANGUAGE', $this->language->getLanguageIso()); Configuration::updateGlobalValue('PS_LOCALE_LANGUAGE', $this->language->getLanguageIso());
Configuration::updateGlobalValue('PS_SHOP_NAME', $data['shop_name']); Configuration::updateGlobalValue('PS_SHOP_NAME', $data['shop_name']);
Configuration::updateGlobalValue('PS_SHOP_ACTIVITY', $data['shop_activity']); Configuration::updateGlobalValue('PS_SHOP_ACTIVITY', $data['shop_activity']);
Configuration::updateGlobalValue('PS_COUNTRY_DEFAULT', Country::getByIso($data['shop_country'])); Configuration::updateGlobalValue('PS_COUNTRY_DEFAULT', Country::getByIso($data['shop_country']));
Configuration::updateGlobalValue('PS_LOCALE_COUNTRY', $data['shop_country']); Configuration::updateGlobalValue('PS_LOCALE_COUNTRY', $data['shop_country']);
Configuration::updateGlobalValue('PS_TIMEZONE', $data['shop_timezone']); Configuration::updateGlobalValue('PS_TIMEZONE', $data['shop_timezone']);
Configuration::updateGlobalValue('PS_CONFIGURATION_AGREMENT', (int)$data['configuration_agrement']);
// Set mails configuration // Set mails configuration
Configuration::updateGlobalValue('PS_MAIL_METHOD', ($data['use_smtp']) ? 2 : 1); Configuration::updateGlobalValue('PS_MAIL_METHOD', ($data['use_smtp']) ? 2 : 1);