Merge branch 'catalog'

2013-09-26 19:07:06 +02:00
parent 9c80120383 0cdd960cb1
commit 62ce7db882
140 changed files with 12926 additions and 2494 deletions
--- a/install/faker.php
+++ b/install/faker.php
@@ -422,6 +422,7 @@ try {
            $stock->setPromo($faker->randomNumber(0,1));
            $stock->setNewness($faker->randomNumber(0,1));
            $stock->setWeight($faker->randomFloat(2, 100,10000));
+            $stock->setIsDefault($i == 0);
            $stock->save();

            $productPrice = new \Thelia\Model\ProductPrice();
@@ -460,7 +461,7 @@ try {
                    $featureAvId[array_rand($featureAvId, 1)]
                );
            } else { //no av
-                $featureProduct->setByDefault($faker->text(10));
+                $featureProduct->setFreeTextValue($faker->text(10));
            }

            $featureProduct->save();