Merge branch 'master' into tax

2013-09-10 12:29:08 +02:00
parent 1971240fca 9ef1b17ea5
commit affc6805c5
171 changed files with 17862 additions and 196 deletions
--- a/core/lib/Thelia/Model/Currency.php
+++ b/core/lib/Thelia/Model/Currency.php
@@ -13,6 +13,17 @@ class Currency extends BaseCurrency {

    use \Thelia\Model\Tools\PositionManagementTrait;

+    public static function getDefaultCurrency()
+    {
+        $currency = CurrencyQuery::create()->findOneByByDefault(1);
+
+        if (null === $currency) {
+            throw new \RuntimeException("No default currency is defined. Please define one.");
+        }
+
+        return $currency;
+    }
+
    /**
     * {@inheritDoc}
     */