From 4a3e0c50754d94a8f86ed70cacc92d8fe58b26c8 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Wed, 11 Sep 2013 16:11:16 +0200 Subject: [PATCH 1/3] // Updated README.md --- README.md | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 0d1f0df50..f11b82139 100644 --- a/README.md +++ b/README.md @@ -2,47 +2,48 @@ README ====== ![PrestaShop](http://www.prestashop.com/images/banners/general/prestashop_728x90.png "PrestaShop") -PREPARATION +ABOUT -------- -To install PrestaShop, you need a remote web server or on your computer (MAMP), with access to a database like MySQL. -You'll need access to phpMyAdmin to create a database and to indicate the information in the database in the installer. +PrestaShop is a free and open-source e-commerce web application, committed to providing the best shopping cart experience for both merchants and consumers. + + +SERVER CONFIGURATION +-------- + +To install PrestaShop, you need a web server running PHP5 and any flavor of MySQL5 (MySQL, MariaDB, Percona Server...). +You will also need a database administration tool, such as phpMyAdmin, in order to create a database for PrestaShop. +We recommend the Apache or Nginx web servers. + +If your host does not offer PHP5 by default, here are a few [explanations][2] about PHP5 or the .htaccess file for certain hosting services (1&1, Free, Lycos, OVH, Infomaniak, Amen, GoDaddy, etc). + +If you want your online store ready to go, visit [http://www.prestabox.com][1]: it lets you create your online store in less than 10 minutes without any technical knowledge. -If you do not host and unable to create your store, we offer a turnkey store, which lets you create your online store in less than 10 minutes without any technical knowledge. -We invite you to visit: [http://www.prestabox.com][1] INSTALLATION -------- -Simply go to your PrestaShop web directory and use installer :-) +With your web browser, go to the root of your PrestaShop directory, and the installer will start. Follow the instructions until PrestaShop is installed. -If you have any PHP error, perhaps you don't have PHP5 or you need to activate it on your web host. -Please go to our forum to find pre-installation settings (PHP 5, htaccess) for certain hosting services (1&1, Free, Lycos, OVH, Infomaniak, Amen, GoDaddy, etc). +If you have any PHP error, perhaps you don't have PHP5 or you need to activate it on your web host. See the page linked above. +If you don't find any solution to start the installer, please post on [the PrestaShop forums][3]. -English webhost [specifics settings][2] - - -If you don't find any solution to launch installer, please post on [our forum][3] - - -There are always solutions for your issues ;-) DOCUMENTATION -------- -For any extra documentation (how-to), please read our [Online documentation][4] +The official PrestaShop documentation is available online [on its own website][4]. FORUMS -------- -You can also discuss, help and contribute with PrestaShop community on [our forums][5] +You can discuss, help and contribute with PrestaShop community on [the PrestaShop forums][5]. - -Thanks for downloading and using PrestaShop e-commerce Open-source solution! +Thank you for downloading and using PrestaShop e-commerce Open-source solution! [1]: http://www.prestabox.com [2]: http://www.prestashop.com/forums/topic/2946-pre-installation-settings-php-5-htaccess-for-certain-hosting-services/ [3]: http://www.prestashop.com/forums/forum/7-installing-prestashop/ [4]: http://doc.prestashop.com -[5]: http://www.prestashop.com/forums/ \ No newline at end of file +[5]: http://www.prestashop.com/forums/ From 31c94caebc209cbeef7a772fa27551cc3db8b5a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Wed, 11 Sep 2013 16:22:13 +0200 Subject: [PATCH 2/3] [-] BO: Fix out of stock creation with multishop and stock sharing --- classes/stock/StockAvailable.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/classes/stock/StockAvailable.php b/classes/stock/StockAvailable.php index 12e23cd39..2e47abb49 100644 --- a/classes/stock/StockAvailable.php +++ b/classes/stock/StockAvailable.php @@ -305,11 +305,7 @@ class StockAvailableCore extends ObjectModel if (!Validate::isUnsignedId($id_product)) return false; - if ($id_shop === null) - $id_shop = Context::getContext()->shop->id; - $existing_id = StockAvailable::getStockAvailableIdByProductId((int)$id_product, (int)$id_product_attribute, (int)$id_shop); - if ($existing_id > 0) { Db::getInstance()->update( From a4d131eac9ee02b7dd30116c6069b63e70e9d0e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Wed, 11 Sep 2013 16:32:11 +0200 Subject: [PATCH 3/3] [-] WS: Fix entities retrieve for some cases --- classes/webservice/WebserviceRequest.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/classes/webservice/WebserviceRequest.php b/classes/webservice/WebserviceRequest.php index 546370998..2dca1bdb3 100644 --- a/classes/webservice/WebserviceRequest.php +++ b/classes/webservice/WebserviceRequest.php @@ -1289,9 +1289,8 @@ class WebserviceRequestCore $check = ' WHERE ('.implode('OR', $OR).') AND `'.bqSQL($this->resourceConfiguration['fields']['id']['sqlId']).'` = '.(int)$this->urlSegment[1]; if (!Db::getInstance()->getValue($sql.$check)) $this->setError(404, 'This '.$this->resourceConfiguration['retrieveData']['className'].' ('.(int)$this->urlSegment[1].') does not exists on this shop', 131); - else - return $objects; } + return $objects; } if (!count($this->errors)) {