Commit 56e665efba5a653aecfe3128167092783328ea9e
1 parent
ccd591b1
big commti
Showing
2 changed files
with
3 additions
and
3 deletions
Show diff stats
common/modules/rubrication/models/TaxOption.php
| @@ -158,7 +158,7 @@ class TaxOption extends \yii\db\ActiveRecord | @@ -158,7 +158,7 @@ class TaxOption extends \yii\db\ActiveRecord | ||
| 158 | 158 | ||
| 159 | 159 | ||
| 160 | public function getTaxValueString(){ | 160 | public function getTaxValueString(){ |
| 161 | - return $this->hasOne(TaxValueString::className(), ['tax_option_id' => 'tax_option_id']); | 161 | + return $this->name; |
| 162 | } | 162 | } |
| 163 | 163 | ||
| 164 | 164 |
common/modules/rubrication/models/TaxOptionQuery.php
| @@ -23,7 +23,7 @@ class TaxOptionQuery extends \yii\db\ActiveQuery | @@ -23,7 +23,7 @@ class TaxOptionQuery extends \yii\db\ActiveQuery | ||
| 23 | */ | 23 | */ |
| 24 | public function all($db = null) | 24 | public function all($db = null) |
| 25 | { | 25 | { |
| 26 | - $this->with('value'); | 26 | + |
| 27 | return parent::all($db); | 27 | return parent::all($db); |
| 28 | } | 28 | } |
| 29 | 29 | ||
| @@ -33,7 +33,7 @@ class TaxOptionQuery extends \yii\db\ActiveQuery | @@ -33,7 +33,7 @@ class TaxOptionQuery extends \yii\db\ActiveQuery | ||
| 33 | */ | 33 | */ |
| 34 | public function one($db = null) | 34 | public function one($db = null) |
| 35 | { | 35 | { |
| 36 | - $this->with('value'); | 36 | + |
| 37 | return parent::one($db); | 37 | return parent::one($db); |
| 38 | } | 38 | } |
| 39 | } | 39 | } |