Merge branch 'master' of github.com:thelia/thelia

Conflicts: composer.lock
2013-05-16 19:07:34 +02:00
parent 97817d6885 20d1655c9d
commit 5afc54096a
11 changed files with 7 additions and 7 deletions
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
    },
    "autoload": {
        "psr-0": { 
-            "": "local/plugins/",
+            "": "local/modules/",
            "Thelia" : "core/lib/"
        }
    },
--- 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",
--- 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";

--- 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) {

--- 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,
--- a/local/modules/.gitkeep
+++ b/local/modules/.gitkeep
--- a/local/modules/Test/Config/config.xml
+++ b/local/modules/Test/Config/config.xml
--- a/local/modules/Test/Loop/Doobitch.php
+++ b/local/modules/Test/Loop/Doobitch.php
--- a/local/modules/Test/Loop/Foo.php
+++ b/local/modules/Test/Loop/Foo.php
--- a/local/modules/Test/TestLoop/Equal.php
+++ b/local/modules/Test/TestLoop/Equal.php
--- a/templates/default/index.html
+++ b/templates/default/index.html
@@ -6,7 +6,7 @@
    </head>
    <body>
        <div>TODO write content<br />
-        <THELIA_cat type="category">
+            <THELIA_cat type="category">
            #__COUNT__ - #TITLE <br />
            nb child : #NB_CHILD <br /><br />
        </THELIA_cat>