diff --git a/application/common/components/Sheets.php b/application/common/components/Sheets.php index c96b4b28..3c989847 100644 --- a/application/common/components/Sheets.php +++ b/application/common/components/Sheets.php @@ -49,12 +49,6 @@ class Sheets extends Component */ public function init() { - $this->applicationName = \Yii::$app->params['google']['applicationName']; - $this->jsonAuthFilePath = \Yii::$app->params['google']['jsonAuthFilePath']; - $this->jsonAuthString = \Yii::$app->params['google']['jsonAuthString']; - $this->delegatedAdmin = \Yii::$app->params['google']['delegatedAdmin']; - $this->spreadsheetId = \Yii::$app->params['google']['spreadsheetId']; - if (!empty($this->jsonAuthFilePath)) { if (file_exists($this->jsonAuthFilePath)) { $this->jsonAuthString = \file_get_contents($this->jsonAuthFilePath); diff --git a/application/common/models/User.php b/application/common/models/User.php index 5507f89c..553f77f2 100644 --- a/application/common/models/User.php +++ b/application/common/models/User.php @@ -1536,7 +1536,13 @@ public static function exportToSheets() 'status' => 'start', ]); - $googleSheetsClient = new Sheets(); + $googleSheetsClient = new Sheets([ + 'applicationName' => Yii::$app->params['google']['applicationName'], + 'jsonAuthFilePath' => Yii::$app->params['google']['jsonAuthFilePath'], + 'jsonAuthString' => Yii::$app->params['google']['jsonAuthString'], + 'delegatedAdmin' => Yii::$app->params['google']['delegatedAdmin'], + 'spreadsheetId' => Yii::$app->params['google']['spreadsheetId'], + ]); $activeUsers = User::find()->where(['active' => 'yes'])->all(); $table = [];