|
|
@@ -114,7 +114,7 @@ class DealType extends \common\components\ActiveRecord
|
|
|
* @return array|\yii\db\ActiveRecord[]
|
|
|
*/
|
|
|
public static function getAllTypes(){
|
|
|
- $data = self::find()->select('ID,TYPE_NAME,IS_PRESET')->where('IS_ENABLE=1')->indexBy('ID')->orderBy('IS_PRESET ASC,SORT_ORDER DESC')->asArray()->all();
|
|
|
+ $data = self::find()->select('ID,TYPE_NAME,IS_PRESET,LANGUAGE_KEY')->where('IS_ENABLE=1')->indexBy('ID')->orderBy('IS_PRESET ASC,SORT_ORDER DESC')->asArray()->all();
|
|
|
$data = Tool::convertLanguage($data, 'TYPE_NAME');
|
|
|
|
|
|
return $data;
|
|
|
@@ -125,7 +125,7 @@ class DealType extends \common\components\ActiveRecord
|
|
|
* @return array|\yii\db\ActiveRecord[]
|
|
|
*/
|
|
|
public static function getAllTypesForShow(){
|
|
|
- $data = self::find()->select('ID,TYPE_NAME,IS_PRESET')->indexBy('ID')->orderBy('IS_PRESET ASC,SORT_ORDER DESC')->asArray()->all();
|
|
|
+ $data = self::find()->select('ID,TYPE_NAME,IS_PRESET,LANGUAGE_KEY')->indexBy('ID')->orderBy('IS_PRESET ASC,SORT_ORDER DESC')->asArray()->all();
|
|
|
$data = Tool::convertLanguage($data, 'TYPE_NAME');
|
|
|
|
|
|
return $data;
|