diff --git a/models/Event.php b/models/Event.php index c9495f4..c7f1abc 100755 --- a/models/Event.php +++ b/models/Event.php @@ -16,18 +16,14 @@ use yii\web\Request; * This is the model class for table "event". * * @property integer $id - * @property string $name - * @property string $alias - * @property string $body * @property string $image - * @property string $meta_title - * @property string $description - * @property string $h1 - * @property string $seo_text * @property integer $created_at * @property integer $updated_at * @property integer $end_at * @property integer $status + * @property integer $is_sale + * @property integer $is_event + * @property integer $percent * @property integer $banner * * From language behavior * * @property EventLang $lang @@ -61,7 +57,8 @@ class Event extends \yii\db\ActiveRecord { public $imageUpload; public $products_file; - + const ACTIVE = 1; + const INACTIVE = 2; /** * @inheritdoc */ @@ -117,9 +114,9 @@ class Event extends \yii\db\ActiveRecord public function rules() { return [ - [['created_at', 'updated_at','percent','status','sale','is_event','percent' ], 'integer'], + [['created_at', 'updated_at','percent','status','is_sale','is_event','percent' ], 'integer'], [['image', 'end_at','banner'], 'string', 'max' => 255], - [['imageUpload','sale','is_event'], 'safe'], + [['imageUpload','is_sale','is_event'], 'safe'], [['imageUpload'], 'file', 'extensions' => 'jpg, gif, png'], [['products_file'], 'file'], ]; @@ -145,7 +142,7 @@ class Event extends \yii\db\ActiveRecord 'end_at' => Yii::t('app', 'end_at'), 'status' => Yii::t('app', 'Статус акции'), 'products_file' => Yii::t('app', 'Загрузка файла'), - 'sale' => Yii::t('app', 'Распродажа'), + 'is_sale' => Yii::t('app', 'Распродажа'), 'percent' => Yii::t('app', 'Процент'), 'is_event' => Yii::t('app', 'Акция'), ]; @@ -197,7 +194,7 @@ class Event extends \yii\db\ActiveRecord } public static function getSaleEvents(){ - return ArrayHelper::toArray(self::find()->select('percent')->distinct('percent')->where('sale=true AND percent IS NOT NULL')->orderBy('percent')->all()); + return ArrayHelper::toArray(self::find()->select('percent')->distinct('percent')->where('is_sale=true AND percent IS NOT NULL')->orderBy('percent')->all()); } } diff --git a/models/EventsToProducts.php b/models/EventsToProducts.php index 7b54445..a8389fe 100755 --- a/models/EventsToProducts.php +++ b/models/EventsToProducts.php @@ -33,8 +33,8 @@ class EventsToProducts extends \yii\db\ActiveRecord return [ [['event_id', 'product_id'], 'required'], [['event_id', 'product_id'], 'integer'], - [['event_id'], 'exist', 'skipOnError' => true, 'targetClass' => Event::className(), 'targetAttribute' => ['event_id' => 'event_id']], - [['product_id'], 'exist', 'skipOnError' => true, 'targetClass' => Product::className(), 'targetAttribute' => ['product_id' => 'product_id']], + [['event_id'], 'exist', 'skipOnError' => true, 'targetClass' => Event::className(), 'targetAttribute' => ['event_id' => 'id']], + [['product_id'], 'exist', 'skipOnError' => true, 'targetClass' => Product::className(), 'targetAttribute' => ['product_id' => 'id']], ]; } diff --git a/views/event/_form.php b/views/event/_form.php index a6a6490..115853d 100755 --- a/views/event/_form.php +++ b/views/event/_form.php @@ -5,6 +5,7 @@ use artweb\artbox\event\models\Event; use artweb\artbox\event\models\EventLang; use artweb\artbox\language\widgets\LanguageForm; use kartik\date\DatePicker; +use kartik\select2\Select2; use yii\helpers\Html; use yii\widgets\ActiveForm; @@ -74,9 +75,21 @@ use yii\widgets\ActiveForm; - field($model, 'status')->checkbox() ?> + field($model, 'status') + ->widget(Select2::className(), ( [ + 'name' => 'status', + 'hideSearch' => true, + 'data' => [ + 1 => \Yii::t('app', 'Active'), + 2 => \Yii::t('app', 'Inactive'), + ], + 'options' => [ 'placeholder' => \Yii::t('app', 'Select status...') ], + 'pluginOptions' => [ + 'allowClear' => true, + ], + ] )) ?> - field($model, 'sale')->checkbox() ?> + field($model, 'is_sale')->checkbox() ?> field($model, 'is_event')->checkbox() ?> -- libgit2 0.21.4