From 622d0396225c54c607485cd89413b4de497ec394 Mon Sep 17 00:00:00 2001 From: Yarik Date: Thu, 1 Jun 2017 14:09:43 +0300 Subject: [PATCH] Artbox great prepairings --- composer.json | 3 ++- controllers/OrderController.php | 2 -- models/Customer.php | 5 ++--- models/DeliverySearch.php | 2 -- models/LabelSearch.php | 2 -- models/OrderProductSearch.php | 2 -- models/OrderSearch.php | 2 -- models/PasswordForm.php | 22 ++++++++++++++++------ models/Payment.php | 3 ++- models/PaymentLang.php | 5 +++-- models/PaymentSearch.php | 2 -- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index 1a0f7a9..87cb397 100755 --- a/composer.json +++ b/composer.json @@ -6,7 +6,8 @@ "type": "yii2-extension", "require": { "php": ">=7.0", - "yiisoft/yii2": "~2.0" + "yiisoft/yii2": "~2.0", + "artweb/artbox-core": "~0.0.1" }, "autoload": { "psr-4": { diff --git a/controllers/OrderController.php b/controllers/OrderController.php index 6cf5f27..6319945 100755 --- a/controllers/OrderController.php +++ b/controllers/OrderController.php @@ -2,7 +2,6 @@ namespace artbox\order\controllers; - use artbox\catalog\models\Product; use artbox\catalog\models\Variant; use artbox\order\models\Delivery; use artbox\order\models\Label; @@ -12,7 +11,6 @@ use artbox\order\models\Order; use artbox\order\models\OrderSearch; use yii\base\InvalidParamException; - use yii\base\Model; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; diff --git a/models/Customer.php b/models/Customer.php index 77d8891..9a5e64c 100755 --- a/models/Customer.php +++ b/models/Customer.php @@ -13,9 +13,8 @@ /** * This is the model class for table "customer". - -* -*@property integer $id + * + * @property integer $id * @property string $username * @property string $auth_key * @property string $password_hash diff --git a/models/DeliverySearch.php b/models/DeliverySearch.php index 83951f1..a4b1ffd 100755 --- a/models/DeliverySearch.php +++ b/models/DeliverySearch.php @@ -2,10 +2,8 @@ namespace artbox\order\models; - use Yii; use yii\base\Model; use yii\data\ActiveDataProvider; - use artbox\order\models\Delivery; /** * DeliverySearch represents the model behind the search form about `artbox\order\models\Delivery`. diff --git a/models/LabelSearch.php b/models/LabelSearch.php index de3b2fa..ae2919d 100755 --- a/models/LabelSearch.php +++ b/models/LabelSearch.php @@ -2,10 +2,8 @@ namespace artbox\order\models; - use Yii; use yii\base\Model; use yii\data\ActiveDataProvider; - use artbox\order\models\Label; /** * LabelSearch represents the model behind the search form about `artbox\order\models\Label`. diff --git a/models/OrderProductSearch.php b/models/OrderProductSearch.php index 785d9ab..bc35b2c 100755 --- a/models/OrderProductSearch.php +++ b/models/OrderProductSearch.php @@ -2,10 +2,8 @@ namespace artbox\order\models; - use Yii; use yii\base\Model; use yii\data\ActiveDataProvider; - use artbox\order\models\OrderProduct; /** * OrderProductSearch represents the model behind the search form about `artbox\order\models\OrderProduct`. diff --git a/models/OrderSearch.php b/models/OrderSearch.php index 92888b6..5fd8740 100755 --- a/models/OrderSearch.php +++ b/models/OrderSearch.php @@ -2,10 +2,8 @@ namespace artbox\order\models; - use Yii; use yii\base\Model; use yii\data\ActiveDataProvider; - use artbox\order\models\Order; /** * OrderSearch represents the model behind the search form about `artbox\order\models\Order`. diff --git a/models/PasswordForm.php b/models/PasswordForm.php index 7b68342..1f22e16 100755 --- a/models/PasswordForm.php +++ b/models/PasswordForm.php @@ -10,7 +10,10 @@ public $oldpass; public $newpass; public $repeatnewpass; - + + /** + * @inheritdoc + */ public function rules() { return [ @@ -36,22 +39,29 @@ public function validatePassword($attribute) { + /** + * @var \artbox\core\models\User $identity + */ + $identity = \Yii::$app->user->identity; if (!Yii::$app->getSecurity() ->validatePassword( $this->oldpass, - \Yii::$app->user->identity->password_hash + $identity->password_hash ) ) { $this->addError($attribute, 'Old password is incorrect'); } } - + + /** + * @inheritdoc + */ public function attributeLabels() { return [ - 'oldpass' => \Yii::t('app', 'Старый пароль'), - 'newpass' => \Yii::t('app', 'Новый пароль'), - 'repeatnewpass' => \Yii::t('app', 'Повторите новый пароль'), + 'oldpass' => \Yii::t('order', 'Старый пароль'), + 'newpass' => \Yii::t('order', 'Новый пароль'), + 'repeatnewpass' => \Yii::t('order', 'Повторите новый пароль'), ]; } } \ No newline at end of file diff --git a/models/Payment.php b/models/Payment.php index 6ae1251..88095c2 100755 --- a/models/Payment.php +++ b/models/Payment.php @@ -6,6 +6,7 @@ use artbox\core\models\Language; use Yii; use yii\db\ActiveQuery; + use yii\db\ActiveRecord; use yii\web\Request; /** @@ -41,7 +42,7 @@ * * End language behavior * * @see LanguageBehavior */ - class Payment extends \yii\db\ActiveRecord + class Payment extends ActiveRecord { /** * @inheritdoc diff --git a/models/PaymentLang.php b/models/PaymentLang.php index 16c8d36..6edb7d3 100755 --- a/models/PaymentLang.php +++ b/models/PaymentLang.php @@ -4,7 +4,8 @@ use artbox\core\models\Language; use Yii; - + use yii\db\ActiveRecord; + /** * This is the model class for table "payment_lang". * @@ -15,7 +16,7 @@ * @property Language $language * @property Payment $payment */ - class PaymentLang extends \yii\db\ActiveRecord + class PaymentLang extends ActiveRecord { /** * @inheritdoc diff --git a/models/PaymentSearch.php b/models/PaymentSearch.php index 0f21432..0d70969 100755 --- a/models/PaymentSearch.php +++ b/models/PaymentSearch.php @@ -2,10 +2,8 @@ namespace artbox\order\models; - use Yii; use yii\base\Model; use yii\data\ActiveDataProvider; - use artbox\order\models\Payment; /** * PaymentSearch represents the model behind the search form about `artbox\order\models\Payment`. -- libgit2 0.21.4