Merge remote-tracking branch 'origin/master'

Administrator
2 parents 5a89cabd df45665b
Showing 11 changed files with 150 additions and 32 deletions Show diff stats
common/config/main-local.php
common/models/UserInfo.php
common/widgets/views/phone_field.php
composer.lock
console/migrations/m160202_090343_user_add_fields.php
console/migrations/m160204_103008_add_payment_connections.php
frontend/assets/AppAsset.php
frontend/controllers/AccountsController.php
frontend/views/accounts/contacts.php
frontend/views/accounts/employment.php
frontend/views/accounts/general.php
@@ -3,9 +3,9 @@ return [
     'components' => [
         'db' => [
             'class' => 'yii\db\Connection',
-            'dsn' => 'pgsql:host=195.248.225.149;port=5432;dbname=mfp',
-            'username' => 'test33',
-            'password' => 'E4q2N7i9',
+            'dsn' => 'pgsql:host=localhost;port=5432;dbname=mfp_local',
+            'username' => 'postgres',
+            'password' => '',
             'schemaMap' => [
                 'pgsql'=> [
                     'class'=>'yii\db\pgsql\Schema',
@@ -63,7 +63,7 @@ class UserInfo extends \yii\db\ActiveRecord
         return [
             [['user_id', 'view_count', 'contract', 'estimate', 'purchase', 'delivery'], 'integer'],
             [['date_visit'], 'safe'],
-            [['experience', 'soft', 'guarantee', 'about', 'city', 'country'], 'string'],
+            [['experience', 'soft', 'guarantee', 'about', 'city', 'country', 'image', 'poster'], 'string'],
             [['prepayment'], 'number'],
             [['rank', 'location'], 'string', 'max' => 50],
+<?php
+use yii\helpers\Html;
+?>
+<fieldset>
+
+    <legend>Образование</legend>
+
+    <p class="btn btn-success add_field">Добавить поле</p>
+
+
+    <?php for($i=1; $i <= count($model); $i++):
+        $row = $i;
+        ?>
+
+        <?= Html::beginTag('div',['class'=>'form-group','id'=>isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ])?>
+            <input type="text" placeholder="Телефон" class="form-control" value="<?= isset($model[$i]['value']) ? $model[$i]['value'] : '' ?>" name="Fields[phone][<?=$row?>][0][phone]" />
+            <span data-id="<?= isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
+        <?= Html::endTag('div')?>
+    <?php endfor; ?>
+
+
+
+</fieldset>
+<script>
+    $( document ).ready(function(){
+        var start_i = <?=$i?>;
+        $('.add_field').click(function(){
+            var block = $(this).parent('fieldset');
+            var block_id =  $(this).parent('fieldset');
+            var sub_block = '<div class="form-group" >'+
+                '<input type="text" placeholder="Телефон" class="form-control" value="" name="Fields[phone]['+ start_i++ +'][0][phone]" />'+
+                '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>'+
+                '<div>';
+            block.append(sub_block);
+
+        });
+    });
+</script>
+
+
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "d07e2c10b604fb6b814d10b2de6dcd2f",
+    "hash": "5f5473586959d0912177c3dace19c844",
     "content-hash": "2d0acd792b2e28f03338a962c2923bbe",
     "packages": [
         {
@@ -8,8 +8,8 @@ class m160202_090343_user_add_fields extends Migration
     public function up()
     {
         $this->addColumn('user', 'type', $this->smallInteger());
-        $this->addColumn('user_info', 'image', $this->integer());
-        $this->addColumn('user_info', 'poster', $this->integer());
+        $this->addColumn('user_info', 'image', $this->string());
+        $this->addColumn('user_info', 'poster', $this->string());
         $this->addColumn('user_info', 'member', $this->smallInteger());
         $this->createTable('{{%company_info}}', [
+<?php
+    use yii\db\Migration;
+
+    class m160204_103008_add_payment_connections extends Migration
+    {
+        public function up ()
+        {
+            $this->createTable (
+                '{{%payment}}', [
+                'payment_id' => $this->primaryKey (), 'name' => $this->string (255)
+                                                                     ->notNull (), 'status' => $this->integer ()
+                                                                                                    ->defaultValue (1),
+            ], null
+            );
+            $this->batchInsert ('{{%payment}}', ['name'], [['Наличный расчет'], ['Безналичный расчет'], ['Электронные деньги']]);
+            $this->createTable (
+                '{{%user_payment}}', [
+                    'user_payment_id' => $this->primaryKey (), 'user_id' => $this->integer (), 'payment_id' => $this->integer (),
+                ]
+            );
+            $this->createTable (
+                '{{%user_specialization}}', [
+                    'user_specialization_id' => $this->primaryKey (), 'user_id' => $this->integer (), 'specialization_id' => $this->integer (),
+                ]
+            );
+            $this->addForeignKey ('user_speialization_specialization', '{{%user_specialization}}', 'specialization_id', '{{%specialization}}', 'specialization_id', 'CASCADE', 'CASCADE');
+            $this->addForeignKey ('user_payment_payment', '{{%user_payment}}', 'payment_id', '{{%payment}}', 'payment_id', 'CASCADE', 'CASCADE');
+        }
+
+        public function down ()
+        {
+            $this->dropTable ('{{%payment}}');
+            $this->dropTable('{{%user_specialization}}');
+            $this->dropTable('{{%user_payment}}');
+        }
+        /*
+        // Use safeUp/safeDown to run migration code within a transaction
+        public function safeUp()
+        {
+        }
+
+        public function safeDown()
+        {
+        }
+        */
+    }
@@ -6,7 +6,6 @@
  */
 namespace frontend\assets;
-
 use yii\web\AssetBundle;
 /**
@@ -39,6 +38,7 @@ class AppAsset extends AssetBundle
     ];
     public $depends = [
         'yii\web\YiiAsset',
+        'backend\assets\FileUploadAsset'
     ];
     public $jsOptions = array(
         'position' => \yii\web\View::POS_HEAD
@@ -150,6 +150,7 @@ class AccountsController extends Controller
     public function actionContacts()
     {
+        var_dump(\Yii::$app->request->post());
         $user_info = UserInfo::find()->where(['user_id' => \Yii::$app->user->getId()])->one();
         if(empty($user_info)) {
             $user_info = new UserInfo(['user_id' => \Yii::$app->user->getId()]);
@@ -169,16 +170,29 @@ class AccountsController extends Controller
     public function actionEmployment()
     {
-        $job = Job::find()->where(['user_id' => \Yii::$app->user->getId()])->orderBy(['current' => SORT_DESC])->all();
-        if(empty($job)) {
-            $job[] = new Job(['user_id' => \Yii::$app->user->getId(), 'current' => 0]);
-        }
-        if(!$job[0]->current) {
-            array_unshift($job, new Job(['user_id' => \Yii::$app->user->getId(), 'current' => 1]));
-        }
-        if(!empty(\Yii::$app->request->post())) {
-            var_dump(\Yii::$app->request->post());
-            die();
+        $post = \Yii::$app->request->post();
+        if(!empty($post)) {
+            $job = [];
+            for($i = 0; $i < count($post['Job']); $i++) {
+                $job[$i] = new Job(['user_id' => \Yii::$app->user->getId(), 'current' => 0]);
+            }
+            if(Job::loadMultiple($job, $post)) {
+                $job[0]->current = 1;
+                if(Job::validateMultiple($job)) {
+                    Job::deleteAll(['user_id' => \Yii::$app->user->getId()]);
+                    foreach($job as $onejob) {
+                        $onejob->save(false);
+                    }
+                }
+            }
+        } else {
+            $job = Job::find()->where(['user_id' => \Yii::$app->user->getId()])->orderBy(['current' => SORT_DESC])->all();
+            if(empty($job)) {
+                $job[] = new Job(['user_id' => \Yii::$app->user->getId(), 'current' => 0]);
+            }
+            if(!$job[0]->current) {
+                array_unshift($job, new Job(['user_id' => \Yii::$app->user->getId(), 'current' => 1]));
+            }
         }
         return $this->render('employment', ['job' => $job]);
     }
@@ -6,21 +6,22 @@ use \common\widgets\MultiLangForm;
     $this->title = 'Мой профиль';
     $this->params['breadcrumbs'][] = $this->title;
+    $user = \Yii::$app->user->identity;
 ?>
 <h1><?=  $this->title ?></h1>
-
-
-
 <?php
-
-$form = $this->render('_form', [
-    'user' => $user,
-    'user_info' => $user_info,
-]);
-
-echo MultiLangForm::widget(['form'=>$form]);
-
+$form = ActiveForm::begin();
+?>
+<?= \common\widgets\FieldEditor::widget([
+    'template'=>'phone',
+    'item_id'=> $user->id,
+    'model'=>'common\models\User',
+    'language'=>'0'
+]); ?>
+<?php
+    echo Html::submitButton('submit');
+    $form->end();
 ?>
@@ -19,9 +19,6 @@
         <p>Текущее место работы:</p>
         <div class="current_job_inputs">
             <?php
-                echo $form->field ($current, '[0]current')
-                          ->label (false)
-                          ->hiddenInput (['value' => 1]);
                 echo $form->field ($current, '[0]name')
                           ->label ('Название')
                           ->textInput ();
@@ -76,6 +73,7 @@
     </div>
 <?php
     echo Html::button('Добавить место работы', ['id' => 'add_job_button']);
+    echo Html::submitButton('Обновить');
     $form->end ();
 ?>
 <script>
@@ -8,6 +8,7 @@
     use common\models\Option;
     use common\models\User;
     use common\models\UserInfo;
+    use common\widgets\ImageUploader;
     use yii\helpers\Html;
     use yii\widgets\ActiveForm;
     use \common\widgets\MultiLangForm;
@@ -68,6 +69,24 @@
                   ->label ('Членство в МФП')
                   ->hint ('Выберите если хотите стать членом МФП и наш менеджер свяжется с Вами.')
                   ->radioList ([0 => 'Не хочу', 1 => 'Хочу стать']);
+        echo ImageUploader::widget([
+            'model'=> $user_info,
+            'field'=>'image',
+            'width'=>100,
+            'height'=>100,
+            'multi'=>false,
+            'gallery' =>$user_info->image,
+            'name' => 'Загрузить аватар'
+        ]);
+        echo ImageUploader::widget([
+            'model'=> $user_info,
+            'field'=>'poster',
+            'width'=>1200,
+            'height'=>600,
+            'multi'=>false,
+            'gallery' =>$user_info->poster,
+            'name' => 'Загрузить постер'
+        ]);
         echo Html::submitButton('Обновить', ['class' => 'btn btn-primary']);
         $form->end ();
     ?>