diff --git a/classes/CartRule.php b/classes/CartRule.php
index b0f7fd4a5..be680011d 100644
--- a/classes/CartRule.php
+++ b/classes/CartRule.php
@@ -119,14 +119,20 @@ class CartRuleCore extends ObjectModel
/**
* @see ObjectModel::add()
*/
- public function add($autodate = true, $nullValues = false)
+ public function add($autodate = true, $null_values = false)
{
- if (!parent::add($autodate, $nullValues))
+ if (!parent::add($autodate, $null_values))
return false;
Configuration::updateGlobalValue('PS_CART_RULE_FEATURE_ACTIVE', '1');
return true;
}
+
+ public function update($null_values = false)
+ {
+ Cache::clean('getContextualValue_'.$this->id.'_*');
+ return parent::update($null_values);
+ }
/**
* @see ObjectModel::delete()
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index 3a7be5290..6c3581753 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -1472,9 +1472,6 @@ class AdminImportControllerCore extends AdminController
}
- if (Configuration::get('PS_SEARCH_INDEXATION'))
- Search::indexation(true);
-
$this->closeCsvFile($handle);
}
diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index d1c3dfeb8..c6dc37a88 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -208,6 +208,7 @@ class AdminModulesControllerCore extends AdminController
die ('KO');
if ($result == 'OK')
{
+ Configuration::updateValue('PS_LOGGED_ON_ADDONS', 1);
$this->context->cookie->username_addons = pSQL(trim(Tools::getValue('username_addons')));
$this->context->cookie->password_addons = pSQL(trim(Tools::getValue('password_addons')));
}
diff --git a/controllers/admin/AdminSearchConfController.php b/controllers/admin/AdminSearchConfController.php
index 34b294c5b..274543f5f 100644
--- a/controllers/admin/AdminSearchConfController.php
+++ b/controllers/admin/AdminSearchConfController.php
@@ -113,7 +113,7 @@ class AdminSearchConfControllerCore extends AdminController
'title' => $this->l('Blacklisted words'),
'size' => 35,
'validation' => 'isGenericName',
- 'desc' => $this->l('Please enter the index words separated by a "|".'|".'),
+ 'desc' => $this->l('Please enter the index words separated by a "|".'),
'type' => 'textLang'
)
),
diff --git a/install-dev/classes/controllerHttp.php b/install-dev/classes/controllerHttp.php
index 2375356a4..fea1b6d12 100644
--- a/install-dev/classes/controllerHttp.php
+++ b/install-dev/classes/controllerHttp.php
@@ -274,7 +274,10 @@ abstract class InstallControllerHttp
*/
public function findNextStep()
{
- return (isset(self::$steps[$this->getStepOffset($this->step) + 1])) ? self::$steps[$this->getStepOffset($this->step) + 1] : false;
+ $nextStep = (isset(self::$steps[$this->getStepOffset($this->step) + 1])) ? self::$steps[$this->getStepOffset($this->step) + 1] : false;
+ if ($nextStep == 'system' && self::$instances[$nextStep]->validate())
+ $nextStep = self::$instances[$nextStep]->findNextStep();
+ return $nextStep;
}
/**
diff --git a/install-dev/langs/br/install.php b/install-dev/langs/br/install.php
index e6724e2f2..0de7ae733 100644
--- a/install-dev/langs/br/install.php
+++ b/install-dev/langs/br/install.php
@@ -127,7 +127,7 @@ return array(
'Official forum' => 'Fórum oficial',
'Support' => 'Suporte',
'Documentation' => 'Documentação',
- 'Contact us!' => 'Entre em Contato !',
+ 'Contact us' => 'Entre em Contato',
'Forum' => 'Fórum',
'Blog' => 'Blog',
'Done!' => 'Feito !',
@@ -153,8 +153,8 @@ return array(
'If you need help, do not hesitate to check our documentation or to contact our support team: %2$s' => 'Se você precisar de ajuda, não deixe de visitar nossa documentação ou contatar nossa equipe de suporte : %2$s',
'Choose the installer language:' => 'Escolha a língua para instalação :',
'Did you know?' => 'Você sabia ?',
- 'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop e sua comunidade oferece mais de 40 diferentes idiomas de graça, acessível diretamente a partir da sua Área Administrativa na aba localização.',
- 'Licenses Agreement' => 'Acordo de licenças',
+ 'PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop e sua comunidade oferece mais de %d diferentes idiomas de graça, acessível diretamente a partir da sua Área Administrativa na aba localização.',
+ 'License Agreements' => 'Acordo de licença',
'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => 'O núcleo PrestaShop é publicado sob a OSL 3.0 enquanto os módulos e temas são publicados sob a AFL 3.0.',
'I agree to the above terms and conditions.' => 'Eu concordo com os termos e condições acima.',
'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'Eu concordo em participar na melhoria da solução enviando informações anônimas sobre a minha configuração.',
diff --git a/install-dev/langs/de/install.php b/install-dev/langs/de/install.php
index 0b1e1fbac..56757e8df 100644
--- a/install-dev/langs/de/install.php
+++ b/install-dev/langs/de/install.php
@@ -121,7 +121,7 @@
'Official forum' => 'Offizielles Forum',
'Support' => 'Support',
'Documentation' => 'Tutotrials',
- 'Contact us!' => 'Kontaktieren Sie uns! Persönlicher Support',
+ 'Contact us' => 'Kontaktieren Sie uns',
'Forum' => 'Forum',
'Blog' => 'Blog',
'Done!' => 'Erfolgreich abgeschlossen',
@@ -146,8 +146,8 @@
'The installation process should take only few minutes!' => 'Der Installationsprozess dauert nur ein paar Minuten!',
'If you need help, do not hesitate to check our documentation or to contact our support team: %2$s' => 'Falls Sie Hilfe benötigen, haben Sie folgende Möglichkeiten: unsere Dokumentation einsehenoder unser Support-Team zu kontaktieren: %2$s',
'Did you know?' => 'Wussten Sie schon?',
- 'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop und Community bietet Ihnen den kostenlosen Zugang zu über 40 verschiedenen Sprachen direkt aus Ihrem Back-office im Tabreiter "Tools"',
- 'Licenses Agreement' => 'Lizenzvertrag',
+ 'PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop und Community bietet Ihnen den kostenlosen Zugang zu über %d verschiedenen Sprachen direkt aus Ihrem Back-office im Tabreiter "Tools"',
+ 'License Agreements' => 'Lizenzvertrag',
'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => 'PrestaShop core is unter der Lizenz OSL 3.0 herausgegeben. PrestaShop modules und Themes werden unter der Lizenz AFL 3.0. herausgegeben',
'I agree to the above terms and conditions.' => 'Ich stimme den oben genannten Vertragsbedingungen zu.',
'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'Ich möchte Prestashop in der verbesserung von Fehlern helfen, und stimme zu, dass bei groben Fehlern meine Konfigurationsdaten an Prestashop gesandt werden',
diff --git a/install-dev/langs/es/install.php b/install-dev/langs/es/install.php
index 719039b28..e1f9aae5c 100644
--- a/install-dev/langs/es/install.php
+++ b/install-dev/langs/es/install.php
@@ -121,7 +121,7 @@
'Official forum' => NULL,
'Support' => NULL,
'Documentation' => NULL,
- 'Contact us!' => '¡Contacte con nosotros!',
+ 'Contact us' => 'Contacte con nosotros',
'Forum' => NULL,
'Blog' => 'El blog',
'Done!' => NULL,
@@ -146,8 +146,8 @@
'The installation process should take only few minutes!' => 'El proceso de instalación tardará solo unos minutos.',
'If you need help, do not hesitate to check our documentation or to contact our support team: %2$s' => NULL,
'Did you know?' => '¿Sabía que?',
- 'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => NULL,
- 'Licenses Agreement' => 'Contrato de Licencia',
+ 'PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.' => NULL,
+ 'License Agreements' => 'Contrato de Licencia',
'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => NULL,
'I agree to the above terms and conditions.' => 'Estoy de acuerdo con los términos y condiciones.',
'I agree to participate in improving the solution by sending anonymous information about my configuration.' => NULL,
diff --git a/install-dev/langs/fr/install.php b/install-dev/langs/fr/install.php
index 28b0d1f40..080c09701 100644
--- a/install-dev/langs/fr/install.php
+++ b/install-dev/langs/fr/install.php
@@ -127,7 +127,7 @@ return array(
'Official forum' => 'Forum officiel',
'Support' => 'Support',
'Documentation' => 'Documentation',
- 'Contact us!' => 'Nous contacter !',
+ 'Contact us' => 'Nous contacter',
'Forum' => 'Forum',
'Blog' => 'Blog',
'Done!' => 'Fin !',
@@ -153,8 +153,8 @@ return array(
'If you need help, do not hesitate to check our documentation or to contact our support team: %2$s' => 'Si vous avez besoin d\'aide, n\'hésitez pas à visiter notre documentation ou à contacter notre équipe de support : %2$s',
'Choose the installer language:' => 'Choisissez la langue pour l\'installation :',
'Did you know?' => 'Le saviez vous ?',
- 'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop et sa communauté vous proposent plus de 40 langues gratuites directement accessibles depuis votre administration',
- 'Licenses Agreement' => 'Contrat de licences',
+ 'PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop et sa communauté vous proposent gratuitement des traductions dans %d langues directement accessibles depuis votre administration.',
+ 'License Agreements' => 'Contrats de licence',
'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => 'Le cœur de PrestaShop est publié sous licence OSL 3.0 tandis que les modules et thèmes sont publiés sous licence AFL 3.0.',
'I agree to the above terms and conditions.' => 'J\'approuve les termes et conditions du contrat ci-dessus.',
'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'J\'accepte de participer à l\'amélioration de la solution en envoyant des informations anonymes sur ma configuration',
diff --git a/install-dev/langs/it/install.php b/install-dev/langs/it/install.php
index 994f45997..40b4bc925 100644
--- a/install-dev/langs/it/install.php
+++ b/install-dev/langs/it/install.php
@@ -121,7 +121,7 @@
'Official forum' => 'Forum ufficiale',
'Support' => 'Supporto',
'Documentation' => 'Documentazione',
- 'Contact us!' => 'Contattaci!',
+ 'Contact us' => 'Contattaci',
'Forum' => 'Forum',
'Blog' => 'Il blog',
'Done!' => 'Fatto!',
@@ -146,8 +146,8 @@
'The installation process should take only few minutes!' => 'Il processo di installazione dovrebbe durare solo pochi minuti!',
'If you need help, do not hesitate to check our documentation or to contact our support team: %2$s' => 'Se hai bisogno di aiuto non asitare a guardare our documentation o contattare il nostro supporto: %2$s',
'Did you know?' => 'Lo sapevi?',
- 'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop e la sua comunità offre 40 diverse lingue gratuite, direttamente accessibile nel tuo back office nel tab Traduzioni',
- 'Licenses Agreement' => 'Contratto di Licenza',
+ 'PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop e la sua comunità offre %d diverse lingue gratuite, direttamente accessibile nel tuo back office nel tab Traduzioni',
+ 'License Agreements' => 'Contratto di Licenza',
'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => 'Il core di PrestaShop è rilasicata sollo licenza OSL 3.0 mentre i moduli e i temi prestashop sono rilasciati sotto licenza AFL 3.0',
'I agree to the above terms and conditions.' => 'Accetto i termini e le condizioni del contratto seguente.',
'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'Accetto di partecipare nell\'implementare la soluzione inviando informazioni anonime sulla mia configurazione',
diff --git a/install-dev/theme/js/welcome.js b/install-dev/theme/js/welcome.js
index fa2a9c467..69b8fd351 100644
--- a/install-dev/theme/js/welcome.js
+++ b/install-dev/theme/js/welcome.js
@@ -22,4 +22,9 @@ $(document).ready(function()
else
$('#btNext').addClass('disabled').attr('disabled', true);
});
+
+ if ($('#set_license').prop('checked'))
+ $('#btNext').removeClass('disabled').attr('disabled', false);
+ else
+ $('#btNext').addClass('disabled').attr('disabled', true);
});
\ No newline at end of file
diff --git a/install-dev/theme/views/footer.phtml b/install-dev/theme/views/footer.phtml
index 4107ab37a..f07434609 100644
--- a/install-dev/theme/views/footer.phtml
+++ b/install-dev/theme/views/footer.phtml
@@ -25,7 +25,7 @@
PrestaShop.com |
l('Support'); ?> |
l('Documentation'); ?> |
- l('Contact us!'); ?> |
+ l('Contact us'); ?> |
© 2005-