diff --git a/backend/controllers/CheckPriceController.php b/backend/controllers/CheckPriceController.php index 3525ab3..a5a13f9 100644 --- a/backend/controllers/CheckPriceController.php +++ b/backend/controllers/CheckPriceController.php @@ -8,6 +8,7 @@ use yii\filters\AccessControl; use backend\components\base\BaseController; use yii\filters\VerbFilter; use backend\models\Details; +use common\models\DetailsCurrency; use backend\models\ImportersFiles; use backend\models\Importers; use yii\base\ErrorException; @@ -61,7 +62,7 @@ class CheckPriceController extends BaseController public function actionIndex() { - //$query = (new Query())->select('*')->from('{{%importer_files}}')->where(['not', ['time_end' => null]])->orderBy(['upload_time' => SORT_DESC]); + $query = Importers::find()->where(['active' => true])->orderBy(['price_date_update' => SORT_DESC]); $provider = new ActiveDataProvider([ 'query' => $query, @@ -79,11 +80,12 @@ class CheckPriceController extends BaseController public function actionView ($id, $date_update) { - $query = Details::find()->where(['IMPORT_ID' => $id, 'timestamp' => $date_update])->limit(20); + $query = DetailsCurrency::find()->where(['IMPORT_ID' => $id, 'timestamp' => $date_update])->limit(20); - $importer = Importers::findOne($id)->name; + $importer = Importers::findOne( $id ); $date = Yii::$app->formatter->asDate( $date_update, 'yyyy-MM-dd' ); + $provider = new ActiveDataProvider([ 'query' => $query, 'pagination' => false, diff --git a/backend/models/Currency.php b/backend/models/Currency.php index 819067c..fcb6570 100644 --- a/backend/models/Currency.php +++ b/backend/models/Currency.php @@ -15,13 +15,6 @@ use Yii; */ class Currency extends \yii\db\ActiveRecord { - /** - * @inheritdoc - */ - public static function tableName() - { - return 'w_currency'; - } /** * @inheritdoc diff --git a/backend/models/Importers.php b/backend/models/Importers.php index 221b09e..b07db1d 100644 --- a/backend/models/Importers.php +++ b/backend/models/Importers.php @@ -5,6 +5,7 @@ namespace backend\models; use common\components\CustomVarDamp; use Yii; use backend\components\base\BaseActiveRecord; +use backend\models\Currency; /** * @@ -89,6 +90,15 @@ class Importers extends BaseActiveRecord ]; } + public function getCurrency () + { + return $this->hasOne(Currency::className(), ['id' => 'currency_id'])->one()->name; + } + + public function getCurrencyRate () + { + return $this->hasOne(Currency::className(), ['id' => 'currency_id'])->one()->rate; + } public function getKeys () { diff --git a/backend/views/check-price/view.php b/backend/views/check-price/view.php index 680f946..9bcf7bd 100644 --- a/backend/views/check-price/view.php +++ b/backend/views/check-price/view.php @@ -8,24 +8,29 @@ use yii\bootstrap\Modal; /* @var $this yii\web\View */ /* @var $searchModel backend\models\CatalogSearch */ /* @var $dataProvider yii\data\ActiveDataProvider */ -$this->title = 'Прайс ' . Html::encode( "{$importer} от {$date}" ); +$this->title = 'Прайс ' . Html::encode("{$importer->name} от {$date}"); $this->params['breadcrumbs'][] = $this->title; ?> -