TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Model/Product.php
This commit is contained in:
franck
2013-09-18 00:35:48 +02:00
parent de4767ef56 c659bc0e66
commit d02f13f021
45 changed files with 887 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/lib/Thelia/Action/Order.php
View File

@@ -61,9 +61,8 @@ class Order extends BaseAction implements EventSubscriberInterface
{
$order = $event->getOrder();
$deliveryAddress = $event->getDeliveryAddress();
$order->setDeliveryModuleId($event->getDeliveryModule());
$order->setPostage($event->getPostage());
$event->setOrder($order);
}

6
core/lib/Thelia/Action/Product.php
View File

@@ -41,6 +41,9 @@ use Thelia\Core\Event\ProductDeleteContentEvent;
use Thelia\Model\ProductAssociatedContent;
use Thelia\Model\ProductAssociatedContentQuery;
use Thelia\Model\ProductCategory;
use Thelia\Model\TaxRule;
use Thelia\Model\TaxRuleQuery;
use Thelia\Model\TaxQuery;
class Product extends BaseAction implements EventSubscriberInterface
{
@@ -61,6 +64,9 @@ class Product extends BaseAction implements EventSubscriberInterface
->setLocale($event->getLocale())
->setVisible($event->getVisible())
// Set the default tax rule to this product
->setTaxRule(TaxRuleQuery::create()->findOneByIsDefault(true))
->create($event->getDefaultCategory())
;