after marge

Administrator
1 parent e687688f
Showing 7 changed files with 98 additions and 125 deletions Show diff stats
backend/controllers/AccountsController.php
common/models/WDicCities.php → backend/models/Margins.php
backend/models/User.php
common/models/WAccounts.php → backend/models/WAccounts.php
backend/views/accounts/_form.php
common/models/Accounts.php
common/models/WAccountsSearch.php
@@ -2,6 +2,8 @@
 namespace backend\controllers;
+use backend\models\Margins;
+use backend\models\User;
 use common\models\DicCities;
 use Yii;
 use common\models\Accounts;
@@ -65,13 +67,17 @@ class AccountsController extends Controller
         $model = new Accounts();
         $cities = DicCities::find()->all();
+        $margin = Margins::find()->all();
+        $users = User::find()->all();
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
             return $this->render('create', [
+                'users'  => $users,
+                'margin' => $margin,
                 'cities' => $cities,
-                'model' => $model,
+                'model'  => $model,
             ]);
         }
     }
@@ -87,6 +93,8 @@ class AccountsController extends Controller
         $model = $this->findModel($id);
         $cities = DicCities::find()->all();
+        $margin = Margins::find()->all();
+        $users = User::find()->all();
         $model->dt = date("Y.m.d" , $model->dt);
@@ -94,8 +102,10 @@ class AccountsController extends Controller
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
             return $this->render('update', [
+                'users'  => $users,
+                'margin' => $margin,
                 'cities' => $cities,
-                'model' => $model,
+                'model'  => $model,
             ]);
         }
     }
 <?php
-namespace common\models;
+namespace backend\models;
 use Yii;
 /**
- * This is the model class for table "w_dic_cities".
+ * This is the model class for table "w_margins".
  *
  * @property integer $id
  * @property string $name
- * @property integer $is_active
- * @property integer $parent
+ * @property double $koef
  */
-class WDicCities extends \yii\db\ActiveRecord
+class Margins extends \yii\db\ActiveRecord
 {
     /**
      * @inheritdoc
      */
     public static function tableName()
     {
-        return 'w_dic_cities';
+        return 'w_margins';
     }
     /**
@@ -28,10 +27,10 @@ class WDicCities extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['name', 'parent'], 'required'],
-            [['is_active', 'parent'], 'integer'],
-            [['name'], 'string', 'max' => 254],
-            [['parent', 'name'], 'unique', 'targetAttribute' => ['parent', 'name'], 'message' => 'The combination of Name and Parent has already been taken.']
+            [['name', 'koef'], 'required'],
+            [['koef'], 'number'],
+            [['name'], 'string', 'max' => 100],
+            [['name'], 'unique']
         ];
     }
@@ -41,10 +40,9 @@ class WDicCities extends \yii\db\ActiveRecord
     public function attributeLabels()
     {
         return [
-            'id' => Yii::t('app', 'ID'),
-            'name' => Yii::t('app', 'Name'),
-            'is_active' => Yii::t('app', 'Is Active'),
-            'parent' => Yii::t('app', 'Parent'),
+            'id' => 'ID',
+            'name' => 'Name',
+            'koef' => 'Koef',
         ];
     }
 }
+<?php
+
+namespace backend\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "w__user".
+ *
+ * @property integer $id
+ * @property string $login
+ * @property string $password
+ * @property string $email
+ * @property integer $is_super
+ * @property string $name
+ * @property integer $office_id
+ * @property string $photo
+ * @property string $contacts
+ * @property integer $acl_accounts_access
+ * @property integer $active
+ */
+class User extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'w__user';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['login', 'password', 'email', 'name', 'office_id', 'acl_accounts_access'], 'required'],
+            [['is_super', 'office_id', 'acl_accounts_access', 'active'], 'integer'],
+            [['login', 'password', 'email', 'name', 'photo'], 'string', 'max' => 255],
+            [['contacts'], 'string', 'max' => 100],
+            [['login'], 'unique']
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => 'ID',
+            'login' => 'Login',
+            'password' => 'Password',
+            'email' => 'Email',
+            'is_super' => 'Is Super',
+            'name' => 'Name',
+            'office_id' => 'Office ID',
+            'photo' => 'Photo',
+            'contacts' => 'Contacts',
+            'acl_accounts_access' => 'Acl Accounts Access',
+            'active' => 'Active',
+        ];
+    }
+}
 <?php
-namespace common\models;
+namespace backend\models;
 use Yii;
@@ -35,7 +35,7 @@ use Yii;
  * @property integer $mod
  * @property string $snumb
  * @property integer $deliveries
- * @property integer $scode
+ * @property integer $1scode
  * @property string $firm_ur_adr
  * @property string $firm_fiz_adr
  * @property string $firm_code_eg
@@ -60,7 +60,7 @@ class WAccounts extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['if_manager', 'margin_id', 'country', 'city', 'rating', 'dt', 'is_active', 'is_firm', 'office_id', 'is_scribe', 'set_manager_id', 'car', 'mod', 'deliveries', 'scode'], 'integer'],
+            [['if_manager', 'margin_id', 'country', 'city', 'rating', 'dt', 'is_active', 'is_firm', 'office_id', 'is_scribe', 'set_manager_id', 'car', 'mod', 'deliveries', '1scode'], 'integer'],
             [['email', 'pass', 'name', 'phones', 'comment', 'dt', 'set_manager_id'], 'required'],
             [['comment'], 'string'],
             [['balance'], 'number'],
@@ -108,7 +108,7 @@ class WAccounts extends \yii\db\ActiveRecord
             'mod' => Yii::t('app', 'Mod'),
             'snumb' => Yii::t('app', 'Snumb'),
             'deliveries' => Yii::t('app', 'Deliveries'),
-            'scode' => Yii::t('app', 'Scode'),
+            '1scode' => Yii::t('app', '1scode'),
             'firm_ur_adr' => Yii::t('app', 'Firm Ur Adr'),
             'firm_fiz_adr' => Yii::t('app', 'Firm Fiz Adr'),
             'firm_code_eg' => Yii::t('app', 'Firm Code Eg'),
@@ -39,9 +39,10 @@ use yii\helpers\ArrayHelper;
     <?= $form->field($model, 'is_scribe')->checkbox() ?>
-    <?= $form->field($model, 'margin_id')->textInput() ?>
-    <?= $form->field($model, 'set_manager_id')->textInput() ?>
+    <?= $form->field($model, 'margin_id')->dropDownList(ArrayHelper::map($margin, 'id', 'name'), ['prompt' => 'Выберие город']) ?>
+
+    <?= $form->field($model, 'set_manager_id')->dropDownList(ArrayHelper::map($users, 'id', 'name'), ['prompt' => 'Выберие город']) ?>
     <?= $form->field($model, 'scode')->textInput() ?>
@@ -107,9 +107,9 @@ class Accounts extends \yii\db\ActiveRecord
             'phones3' => 'Телефоны 3',
             'car' => Yii::t('app', 'Car'),
             'mod' => Yii::t('app', 'Mod'),
-            'snumb' => 'Код в 1С',
+            'snumb' => 'snumb',
             'deliveries' => Yii::t('app', 'Deliveries'),
-            'scode' => Yii::t('app', 'Scode'),
+            'scode' => 'Код в 1С',
             'firm_ur_adr' => Yii::t('app', 'Firm Ur Adr'),
             'firm_fiz_adr' => Yii::t('app', 'Firm Fiz Adr'),
             'firm_code_eg' => Yii::t('app', 'Firm Code Eg'),
-<?php
-
-namespace common\models;
-
-use Yii;
-use yii\base\Model;
-use yii\data\ActiveDataProvider;
-use common\models\WAccounts;
-
-/**
- * WAccountsSearch represents the model behind the search form about `common\models\WAccounts`.
- */
-class WAccountsSearch extends WAccounts
-{
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['id', 'if_manager', 'margin_id', 'country', 'city', 'rating', 'dt', 'is_active', 'is_firm', 'office_id', 'is_scribe', 'set_manager_id', 'car', 'mod', 'deliveries', 'scode'], 'integer'],
-            [['email', 'pass', 'name', 'phones', 'address', 'comment', 'last_loginin', 'firm_inn', 'firm_bank', 'phones2', 'phones3', 'snumb', 'firm_ur_adr', 'firm_fiz_adr', 'firm_code_eg', 'firm_rs', 'firm_mfo', 'firm_site', 'company'], 'safe'],
-            [['balance'], 'number'],
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function scenarios()
-    {
-        // bypass scenarios() implementation in the parent class
-        return Model::scenarios();
-    }
-
-    /**
-     * Creates data provider instance with search query applied
-     *
-     * @param array $params
-     *
-     * @return ActiveDataProvider
-     */
-    public function search($params)
-    {
-        $query = WAccounts::find();
-
-        $dataProvider = new ActiveDataProvider([
-            'query' => $query,
-        ]);
-
-        $this->load($params);
-
-        if (!$this->validate()) {
-            // uncomment the following line if you do not want to return any records when validation fails
-            // $query->where('0=1');
-            return $dataProvider;
-        }
-
-        $query->andFilterWhere([
-            'id' => $this->id,
-            'if_manager' => $this->if_manager,
-            'margin_id' => $this->margin_id,
-            'country' => $this->country,
-            'city' => $this->city,
-            'rating' => $this->rating,
-            'dt' => $this->dt,
-            'is_active' => $this->is_active,
-            'is_firm' => $this->is_firm,
-            'balance' => $this->balance,
-            'office_id' => $this->office_id,
-            'is_scribe' => $this->is_scribe,
-            'set_manager_id' => $this->set_manager_id,
-            'car' => $this->car,
-            'mod' => $this->mod,
-            'deliveries' => $this->deliveries,
-            'scode' => $this->scode,
-        ]);
-
-        $query->andFilterWhere(['like', 'email', $this->email])
-            ->andFilterWhere(['like', 'pass', $this->pass])
-            ->andFilterWhere(['like', 'name', $this->name])
-            ->andFilterWhere(['like', 'phones', $this->phones])
-            ->andFilterWhere(['like', 'address', $this->address])
-            ->andFilterWhere(['like', 'comment', $this->comment])
-            ->andFilterWhere(['like', 'last_loginin', $this->last_loginin])
-            ->andFilterWhere(['like', 'firm_inn', $this->firm_inn])
-            ->andFilterWhere(['like', 'firm_bank', $this->firm_bank])
-            ->andFilterWhere(['like', 'phones2', $this->phones2])
-            ->andFilterWhere(['like', 'phones3', $this->phones3])
-            ->andFilterWhere(['like', 'snumb', $this->snumb])
-            ->andFilterWhere(['like', 'firm_ur_adr', $this->firm_ur_adr])
-            ->andFilterWhere(['like', 'firm_fiz_adr', $this->firm_fiz_adr])
-            ->andFilterWhere(['like', 'firm_code_eg', $this->firm_code_eg])
-            ->andFilterWhere(['like', 'firm_rs', $this->firm_rs])
-            ->andFilterWhere(['like', 'firm_mfo', $this->firm_mfo])
-            ->andFilterWhere(['like', 'firm_site', $this->firm_site])
-            ->andFilterWhere(['like', 'company', $this->company]);
-
-        return $dataProvider;
-    }
-}