From 0a7b8f05d0f2fb66ce3c84fdcafa68dd62e86c28 Mon Sep 17 00:00:00 2001 From: Franck Allimant Date: Thu, 5 Dec 2013 13:01:09 +0100 Subject: [PATCH] Added checkAvailableStock(), changed getPassedUrlView() to getObsoleteRewrittenUrlView() --- core/lib/Thelia/Model/ConfigQuery.php | 9 +++++++-- core/lib/Thelia/Model/Product.php | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/core/lib/Thelia/Model/ConfigQuery.php b/core/lib/Thelia/Model/ConfigQuery.php index e2f6a3975..e34ae5e16 100755 --- a/core/lib/Thelia/Model/ConfigQuery.php +++ b/core/lib/Thelia/Model/ConfigQuery.php @@ -77,9 +77,9 @@ class ConfigQuery extends BaseConfigQuery { return self::read("page_not_found_view", '404.html'); } - public static function getPassedUrlView() + public static function getObsoleteRewrittenUrlView() { - return self::read('passed_url_view', 'passed-url'); + return self::read('obsolete_rewriten_url_view', 'obsolete-rewritten-url'); } public static function useTaxFreeAmounts() @@ -87,6 +87,11 @@ class ConfigQuery extends BaseConfigQuery { return self::read('use_tax_free_amounts', 'default') == 1; } + public static function checkAvailableStock() + { + return self::read('check-available-stock', 1) != 0; + } + /* smtp config */ public static function isSmtpEnable() { diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php index 1b3f1eefa..f2e838be2 100755 --- a/core/lib/Thelia/Model/Product.php +++ b/core/lib/Thelia/Model/Product.php @@ -267,7 +267,7 @@ class Product extends BaseProduct ->filterByView($this->getRewrittenUrlViewName()) ->filterByViewId($this->getId()) ->update(array( - "View" => ConfigQuery::getPassedUrlView() + "View" => ConfigQuery::getObsoleteRewrittenUrlView() )); $this->dispatchEvent(TheliaEvents::AFTER_DELETEPRODUCT, new ProductEvent($this)); }