Artbox great prepairings

Yarik
1 parent c616c474
Showing 11 changed files with 25 additions and 25 deletions Show diff stats
composer.json
controllers/OrderController.php
models/Customer.php
models/DeliverySearch.php
models/LabelSearch.php
models/OrderProductSearch.php
models/OrderSearch.php
models/PasswordForm.php
models/Payment.php
models/PaymentLang.php
models/PaymentSearch.php
@@ -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": {
@@ -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;
@@ -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
@@ -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`.
@@ -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`.
@@ -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`.
@@ -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`.
@@ -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
@@ -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
@@ -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
@@ -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`.