Merge remote-tracking branch 'origin/master'

Alexey Boroda
2 parents 7da2c3f9 c96be096
Showing 3 changed files with 31 additions and 1 deletions Show diff stats
console/migrations/m161228_121804_play_count_type.php
frontend/models/IntellectualProperty.php
frontend/views/cabinet/sales.php
+<?php
+
+use yii\db\Migration;
+
+class m161228_121804_play_count_type extends Migration
+{
+    public function up()
+    {
+        $this->alterColumn('intellectual_property', 'play_count', 'integer USING (play_count::integer)');
+    }
+
+    public function down()
+    {
+        
+    }
+}
@@ -39,6 +39,7 @@
                 [
                     [
                         'user_id',
+                        'play_count',
                     ],
                     'integer',
                 ],
@@ -59,7 +60,6 @@
                         'contract',
                         'type',
                         'author_role',
-                        'play_count',
                     ],
                     'string',
                     'max' => 255,
@@ -97,6 +97,20 @@
                 <?php
                     echo $form->field(
                         $property,
+                        'percent',
+                        [
+                            'options' => [
+                                'class' => 'input-wrapp-320',
+                            ],
+                        ]
+                    )
+                              ->textInput();
+                ?>
+            </div>
+            <div class="style">
+                <?php
+                    echo $form->field(
+                        $property,
                         'registration_date',
                         [
                             'options' => [