diff --git a/composer.json b/composer.json index 536e71e68..3cb4e6bf1 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ }, "autoload": { "psr-0": { - "": "local/plugins/", + "": "local/modules/", "Thelia" : "core/lib/" } }, diff --git a/composer.lock b/composer.lock index 8da40d8f2..03f55c3bd 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "d0aa87e405dbeb21f65d8d8321b7cca7", + "hash": "fed0f90bca039760e3021c1febd59371", "packages": [ { "name": "ezyang/htmlpurifier", diff --git a/core/bootstrap.php b/core/bootstrap.php index 46ac5e9e4..923d029e5 100644 --- a/core/bootstrap.php +++ b/core/bootstrap.php @@ -7,7 +7,7 @@ */ define('THELIA_ROOT', realpath(__DIR__ .'/../') . "/"); define('THELIA_CONF_DIR', THELIA_ROOT . '/local/config'); -define('THELIA_PLUGIN_DIR', THELIA_ROOT . '/local/plugins'); +define('THELIA_MODULE_DIR', THELIA_ROOT . '/local/modules'); define('THELIA_TEMPLATE_DIR', THELIA_ROOT . 'templates/'); $loader = require __DIR__ . "/vendor/autoload.php"; diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php index 076d66e5c..a5a24532a 100644 --- a/core/lib/Thelia/Core/Thelia.php +++ b/core/lib/Thelia/Core/Thelia.php @@ -122,7 +122,7 @@ class Thelia extends Kernel foreach ($modules as $module) { try { - $loader = new XmlFileLoader($container, new FileLocator(THELIA_PLUGIN_DIR . "/" . ucfirst($module->getCode()) . "/Config")); + $loader = new XmlFileLoader($container, new FileLocator(THELIA_MODULE_DIR . "/" . ucfirst($module->getCode()) . "/Config")); $loader->load("config.xml"); } catch(\InvalidArgumentException $e) { diff --git a/install/thelia.sql b/install/thelia.sql index 98bab447d..46a934a3b 100644 --- a/install/thelia.sql +++ b/install/thelia.sql @@ -40,7 +40,7 @@ CREATE TABLE `product` `ecotax` FLOAT, `newness` TINYINT DEFAULT 0, `promo` TINYINT DEFAULT 0, - `stock` INTEGER DEFAULT 0, + `quantity` INTEGER DEFAULT 0, `visible` TINYINT DEFAULT 0 NOT NULL, `weight` FLOAT, `position` INTEGER NOT NULL, @@ -1748,7 +1748,7 @@ CREATE TABLE `product_version` `ecotax` FLOAT, `newness` TINYINT DEFAULT 0, `promo` TINYINT DEFAULT 0, - `stock` INTEGER DEFAULT 0, + `quantity` INTEGER DEFAULT 0, `visible` TINYINT DEFAULT 0 NOT NULL, `weight` FLOAT, `position` INTEGER NOT NULL, diff --git a/local/plugins/.gitkeep b/local/modules/.gitkeep similarity index 100% rename from local/plugins/.gitkeep rename to local/modules/.gitkeep diff --git a/local/plugins/Test/Config/config.xml b/local/modules/Test/Config/config.xml similarity index 100% rename from local/plugins/Test/Config/config.xml rename to local/modules/Test/Config/config.xml diff --git a/local/plugins/Test/Loop/Doobitch.php b/local/modules/Test/Loop/Doobitch.php similarity index 100% rename from local/plugins/Test/Loop/Doobitch.php rename to local/modules/Test/Loop/Doobitch.php diff --git a/local/plugins/Test/Loop/Foo.php b/local/modules/Test/Loop/Foo.php similarity index 100% rename from local/plugins/Test/Loop/Foo.php rename to local/modules/Test/Loop/Foo.php diff --git a/local/plugins/Test/TestLoop/Equal.php b/local/modules/Test/TestLoop/Equal.php similarity index 100% rename from local/plugins/Test/TestLoop/Equal.php rename to local/modules/Test/TestLoop/Equal.php diff --git a/templates/default/index.html b/templates/default/index.html index 1fba3e475..0023dd36b 100644 --- a/templates/default/index.html +++ b/templates/default/index.html @@ -6,7 +6,7 @@
TODO write content
- + #__COUNT__ - #TITLE
nb child : #NB_CHILD