From 56e665efba5a653aecfe3128167092783328ea9e Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Thu, 18 Aug 2016 16:27:44 +0300 Subject: [PATCH] big commti --- common/modules/rubrication/models/TaxOption.php | 2 +- common/modules/rubrication/models/TaxOptionQuery.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/modules/rubrication/models/TaxOption.php b/common/modules/rubrication/models/TaxOption.php index ad650e6..71d773f 100755 --- a/common/modules/rubrication/models/TaxOption.php +++ b/common/modules/rubrication/models/TaxOption.php @@ -158,7 +158,7 @@ class TaxOption extends \yii\db\ActiveRecord public function getTaxValueString(){ - return $this->hasOne(TaxValueString::className(), ['tax_option_id' => 'tax_option_id']); + return $this->name; } diff --git a/common/modules/rubrication/models/TaxOptionQuery.php b/common/modules/rubrication/models/TaxOptionQuery.php index 9dbc6c2..323c24c 100755 --- a/common/modules/rubrication/models/TaxOptionQuery.php +++ b/common/modules/rubrication/models/TaxOptionQuery.php @@ -23,7 +23,7 @@ class TaxOptionQuery extends \yii\db\ActiveQuery */ public function all($db = null) { - $this->with('value'); + return parent::all($db); } @@ -33,7 +33,7 @@ class TaxOptionQuery extends \yii\db\ActiveQuery */ public function one($db = null) { - $this->with('value'); + return parent::one($db); } } -- libgit2 0.21.4